libtinfow.5, libtinfow.6: New binary packages

8 files changed, 34 insertions, 0 deletions

diff --git a/build b/build
index beacb0a..aecd1b7 100755
--- a/build
+++ b/build
@@ -55,6 +55,16 @@ install: build
 	rm dest*/usr/lib/$(OPK_HOST_ARCH)/*.a
 	mv dest-ncurses/usr/bin/clear dest-ncurses/usr/bin/clear.ncurses
 	mv dest-ncurses/usr/bin/reset dest-ncurses/usr/bin/reset.ncurses
+	@# Rename wide-char libtinfo to libtinfow.
+	set -e; pc=usr/lib/$(OPK_HOST_ARCH)/pkgconfig/ncursesw.pc; \
+	for d in dest-ncursesw dest-ncursesw-legacy; do \
+		(cd $${d}/usr/lib/$(OPK_HOST_ARCH); \
+		for f in libtinfo*; do \
+			mv "$${f}" "libtinfow$${f#libtinfo}"; \
+		done); \
+		mv $${d}/$${pc} $${d}/$${pc}.orig; \
+		sed 's/-ltinfo/-ltinfow/' $${d}/$${pc}.orig 1>$${d}/$${pc}; \
+	done
 	rm dest*/usr/bin/ncurses*-config
 	rm dest-ncurses/usr/share/man/man1/ncurses*-config.1
 	@# Extract a few individual terminal type definitions.  This would be
diff --git a/changelog b/changelog
index 0760348..11b74f3 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ ncurses (6.1+20190630-2) trunk
 
   * ncurses-dbg: Actually include debugging symbols (normally always excluded
     from the shared libraries by upstream).
+  * libtinfow.5, libtinfow.6: New binary packages to provide wide-character
+    terminfo libraries.  Fixes segmentation fault in termattrs_sp() with
+    libncursesw.6.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sat, 06 Jul 2019 16:24:35 -0400
 
diff --git a/libncurses.5-dev.pkg/control b/libncurses.5-dev.pkg/control
index c3cd4d0..7b19d13 100644
--- a/libncurses.5-dev.pkg/control
+++ b/libncurses.5-dev.pkg/control
@@ -6,6 +6,7 @@ Depends: ncurses-common (= ${Source-Version}),
  libncurses++.5 (= ${Binary-Version}),
  libncurses++w.5 (= ${Binary-Version}),
  libtinfo.5 (= ${Binary-Version}),
+ libtinfow.5 (= ${Binary-Version}),
 Description: curses library (legacy ABI) - development files
  ${Common-Description}
  .
diff --git a/libncurses.6-dev.pkg/control b/libncurses.6-dev.pkg/control
index 318a0f6..6df7928 100644
--- a/libncurses.6-dev.pkg/control
+++ b/libncurses.6-dev.pkg/control
@@ -6,6 +6,7 @@ Depends: ncurses-common (= ${Source-Version}),
  libncurses++.6 (= ${Binary-Version}),
  libncurses++w.6 (= ${Binary-Version}),
  libtinfo.6 (= ${Binary-Version}),
+ libtinfow.6 (= ${Binary-Version}),
 Description: curses library - development files
  ${Common-Description}
  .
diff --git a/libtinfow.5.pkg/control b/libtinfow.5.pkg/control
new file mode 100644
index 0000000..7c2be40
--- /dev/null
+++ b/libtinfow.5.pkg/control
@@ -0,0 +1,9 @@
+Architecture: any
+Platform: all
+Depends: ncurses-common (= ${Source-Version}), libtinfo.5 (= ${Binary-Version}),
+ terminfo-linux [any-linux-any], ${Shlib-Depends}
+Description: curses terminfo library with wide character support (legacy ABI)
+ ${Common-Description}
+ .
+ This package provides the terminfo (legacy ABI) shared library with wide
+ character support.
diff --git a/libtinfow.5.pkg/files b/libtinfow.5.pkg/files
new file mode 100644
index 0000000..0edcd49
--- /dev/null
+++ b/libtinfow.5.pkg/files
@@ -0,0 +1 @@
+/usr/lib/*/libtinfow.so.*
diff --git a/libtinfow.6.pkg/control b/libtinfow.6.pkg/control
new file mode 100644
index 0000000..7ba43f8
--- /dev/null
+++ b/libtinfow.6.pkg/control
@@ -0,0 +1,8 @@
+Architecture: any
+Platform: all
+Depends: ncurses-common (= ${Source-Version}), libtinfo.5 (= ${Binary-Version}),
+ terminfo-linux [any-linux-any], ${Shlib-Depends}
+Description: curses terminfo library with wide character support
+ ${Common-Description}
+ .
+ This package provides the terminfo shared library with wide character support.
diff --git a/libtinfow.6.pkg/files b/libtinfow.6.pkg/files
new file mode 100644
index 0000000..0edcd49
--- /dev/null
+++ b/libtinfow.6.pkg/files
@@ -0,0 +1 @@
+/usr/lib/*/libtinfow.so.*