From 90e34b5bef3a3b3b895166087a04cf0dd7d02f14af2515c946a397d4e74454e8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 8 Jan 2015 08:43:24 +0000 Subject: [PATCH 1/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=181 --- ncurses-5.9-overwrite.dif | 6 +++--- ncurses-5.9-patches.tar.bz2 | 4 ++-- ncurses.changes | 24 ++++++++++++++++++++++++ ncurses.spec | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index 74465b4..a6cff04 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -15,11 +15,11 @@ AC_ARG_ENABLE(database, --- configure +++ configure 2013-09-30 09:17:52.000000000 +0000 -@@ -6526,6 +6526,7 @@ else +@@ -6799,6 +6799,7 @@ else fi; - echo "$as_me:6797: result: $with_overwrite" >&5 + echo "$as_me:6800: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6800: checking if external terminfo-database is used" >&5 + echo "$as_me:6803: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 1b87813..2d92832 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ab879122039f7b1528ddf86d38f435134146022e85633c99c2e8ab39cf9c83a -size 4152720 +oid sha256:38d26777892aa619e583755bc64077f4dc3b5f0dcf728f0d4d7737994dbca620 +size 4221720 diff --git a/ncurses.changes b/ncurses.changes index 6886b49..2a85f97 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Jan 7 14:39:03 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150103 + + modify_nc_flush() to retry if interrupted (patch by Stian Skjelstad). + + change map files to make _nc_freeall a global, since it may be used + via the Ada95 binding when checking for memory leaks. + + improve sed script used in 20141220 to account for wide-, threaded- + variations in ABI 6. +- Add ncurses patch 20141227 + + regenerate ".map" files, using step overlooked in 20141213 to use + the same patch-dates across each file to match ncurses.map (report by + Sven Joachim). +- Add ncurses patch 20141221 + + fix an incorrect variable assignment in 20141220 changes (report by + Sven Joachim). +- Add ncurses patch 20141220 + + updated Ada95/configure with macro changes from 20141213 + + tie configure options --with-abi-version and --with-versioned-syms + together, so that ABI 6 libraries have distinct symbol versions from + the ABI 5 libraries. + + replace obsolete/nonworking link to man2html with current one, + regenerate html-manpages. + ------------------------------------------------------------------- Tue Dec 16 11:14:35 UTC 2014 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index a53dfb8..7654fcd 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 0a4c9186ba062df2a66275526e80489a3a56292db882f3772ccbf1dfa4dd4284 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 12 Jan 2015 15:12:55 +0000 Subject: [PATCH 2/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=182 --- ncurses-5.9-overwrite.dif | 4 ++-- ncurses-5.9-patches.tar.bz2 | 4 ++-- ncurses.changes | 19 +++++++++++++++++++ ncurses.spec | 16 ++++++++++++---- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index a6cff04..aa6424e 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -17,9 +17,9 @@ +++ configure 2013-09-30 09:17:52.000000000 +0000 @@ -6799,6 +6799,7 @@ else fi; - echo "$as_me:6800: result: $with_overwrite" >&5 + echo "$as_me:6811: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6803: checking if external terminfo-database is used" >&5 + echo "$as_me:6814: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 2d92832..e930c37 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38d26777892aa619e583755bc64077f4dc3b5f0dcf728f0d4d7737994dbca620 -size 4221720 +oid sha256:22a07850327668d4730b2f8fc63ad640791ea9a9ad9c9826fb16c6f6120eecc2 +size 4255024 diff --git a/ncurses.changes b/ncurses.changes index 2a85f97..a2130be 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jan 12 08:49:11 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150110 + + add a step to generating ".map" files, to declare any remaining + symbols beginning with "_" as local, at the last version node. + + improve configure checks for pkg-config, addressing a variant found + with FreeBSD ports. + + modify win_driver.c to provide characters for special keys, like + ansi.sys, when keypad mode is off, rather than returning nothing at + all (discussion with Eli Zaretskii). + + add "broken_linker" and "hashed-db" configure options to combinations + use for generating the ".map" and ".sym" files. + + avoid using "ld" directly when creating shared library, to simplify + cross-compiles. Also drop "-Bsharable" option from shared-library + rules for FreeBSD and DragonFly (FreeBSD #196592). + + fix a memory leak in form library Free_RegularExpression_Type() + (report by Pavel Balaev). + ------------------------------------------------------------------- Wed Jan 7 14:39:03 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 7654fcd..99f451e 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -16,8 +16,14 @@ # +%bcond_with hasheddb +%bcond_with symversion + Name: ncurses #!BuildIgnore: terminfo +%if %{with hasheddb} +BuildRequires: db-devel +%endif BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: screen @@ -379,10 +385,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # No --enable-xmc-glitch because this seems to break yast2 # on console/konsole (no magic cookie support on those?) # - # No --with-termlib=tinfo because libncurses depend on - # libtinfo (is linked with) and therefore there is no - # advantage about splitting of a libtinfo (IMHO). - # %if 0%{?suse_version} > 1310 SO=$(rpm -ql gpm-devel|grep %{_libdir}) SO=%{_libdir}/$(readlink $SO) @@ -456,6 +458,12 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --with-ticlib=tic \ --with-pc-suffix \ --enable-pc-files \ +%if %{with symversion} + --with-versioned-syms \ +%endif +%if %{with hasheddb} + --with-hashed-db \ +%endif --with-pkg-config-libdir=%{_libdir}/pkgconfig kill $pid # From 0f4e57551642fe9b98c4a5855e45f1af0865c1ae5dbc295edb6d28aa3529fb60 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 21 Jan 2015 12:57:53 +0000 Subject: [PATCH 3/6] Accepting request 282217 from home:rguenther:branches:Base:System - Add ncurses-5.9-avoid-line-markers.dif to pass -P to the preprocessor when generating lib_gen.c to avoid breaking the parsing with AWK of the preprocessor output of GCC 4.9 and up. OBS-URL: https://build.opensuse.org/request/show/282217 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=183 --- ncurses-5.9-avoid-line-markers.dif | 11 +++++++++++ ncurses.changes | 7 +++++++ ncurses.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 ncurses-5.9-avoid-line-markers.dif diff --git a/ncurses-5.9-avoid-line-markers.dif b/ncurses-5.9-avoid-line-markers.dif new file mode 100644 index 0000000..8cea752 --- /dev/null +++ b/ncurses-5.9-avoid-line-markers.dif @@ -0,0 +1,11 @@ +--- ncurses/Makefile.in.orig 2015-01-21 13:27:02.427199242 +0100 ++++ ncurses/Makefile.in 2015-01-21 13:27:11.946311063 +0100 +@@ -219,7 +219,7 @@ + sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ + + ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h +- sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ ++ sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@ + + init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list + ./make_keys$(BUILD_EXEEXT) keys.list > $@ diff --git a/ncurses.changes b/ncurses.changes index a2130be..2b264ab 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 21 12:22:05 UTC 2015 - rguenther@suse.com + +- Add ncurses-5.9-avoid-line-markers.dif to pass -P to the preprocessor + when generating lib_gen.c to avoid breaking the parsing with AWK + of the preprocessor output of GCC 4.9 and up. + ------------------------------------------------------------------- Mon Jan 12 08:49:11 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 99f451e..94480ea 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -59,6 +59,7 @@ Patch1: ncurses-5.9-ibm327x.dif Patch3: ncurses-5.9-overwrite.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif +Patch6: ncurses-5.9-avoid-line-markers.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -279,6 +280,7 @@ mv tack-* tack %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .lc %patch -P 0 -p0 -b .p0 +%patch -P 6 -p0 -b .p6 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh From 7ec70cbd61e33173be2c2a89fbe03ac5735d2f8d15e60a61a26314b835f5a425 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 21 Jan 2015 13:38:10 +0000 Subject: [PATCH 4/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=184 --- ncurses-5.9-patches.tar.bz2 | 4 ++-- ncurses.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index e930c37..e820a86 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22a07850327668d4730b2f8fc63ad640791ea9a9ad9c9826fb16c6f6120eecc2 -size 4255024 +oid sha256:22383b63c79e9f834a11f5a56c2374b030394236296f90e7ea6385bb54acfa07 +size 4257493 diff --git a/ncurses.changes b/ncurses.changes index 2b264ab..107e520 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 21 13:24:17 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150117 + + improve description in INSTALL of the --with-versioned-syms option. + + add combination of --with-hashed-db and --with-ticlib to + configurations for ".map" files (report by Werner Fink). + ------------------------------------------------------------------- Wed Jan 21 12:22:05 UTC 2015 - rguenther@suse.com From dae1d44a9a652107aeb13eef03dd3c6d64c0501af1a1b2569d1aac12cc28e57d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 21 Jan 2015 15:59:35 +0000 Subject: [PATCH 5/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=185 --- ncurses-5.9.dif | 20 +++++++++++++++++++ ncurses.changes | 5 +++++ ncurses.spec | 53 +++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index a21093f..1c3f9ba 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -990,3 +990,23 @@ #define CANCELLED_NUMERIC (-2) #define CANCELLED_STRING (char *)(-1) +--- package/ncursest.map ++++ package/ncursest.map 2015-01-21 14:41:45.809518532 +0000 +@@ -345,6 +345,7 @@ NCURSES_TINFO_5.7.20081102 { + _nc_screen_of; + _nc_set_no_padding; + _nc_set_tputs_trace; ++ _nc_sigprocmask; + _nc_stdscr; + _nc_strcodes; + _nc_strfnames; +--- package/ncursestw.map ++++ package/ncursestw.map 2015-01-21 14:42:04.281518331 +0000 +@@ -346,6 +346,7 @@ NCURSES_TINFO_5.7.20081102 { + _nc_screen_of; + _nc_set_no_padding; + _nc_set_tputs_trace; ++ _nc_sigprocmask; + _nc_stdscr; + _nc_strcodes; + _nc_strfnames; diff --git a/ncurses.changes b/ncurses.changes index 107e520..66f6185 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 21 15:58:08 UTC 2015 - werner@suse.de + +- Now with symbol version control + ------------------------------------------------------------------- Wed Jan 21 13:24:17 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 94480ea..1f21b69 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -17,7 +17,7 @@ %bcond_with hasheddb -%bcond_with symversion +%bcond_without symversion Name: ncurses #!BuildIgnore: terminfo @@ -454,19 +454,23 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --mandir=%{_mandir} \ --includedir=%{_incdir} \ "${WITHCHTYPE}" \ - --disable-widec \ --disable-tic-depends \ --with-cxx-shared \ --with-ticlib=tic \ --with-pc-suffix \ --enable-pc-files \ %if %{with symversion} - --with-versioned-syms \ +%if %abi >= 6 + --with-versioned-syms=${PWD}/package/ncursest.map \ +%else + --with-versioned-syms=${PWD}/package/ncurses.map \ +%endif %endif %if %{with hasheddb} --with-hashed-db \ %endif --with-pkg-config-libdir=%{_libdir}/pkgconfig + sleep 1 kill $pid # # The configure line @@ -551,7 +555,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --disable-widec \ + --disable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursest.map \ +%endif + --without-progs + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c @@ -582,10 +595,25 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! %if %abi >= 6 - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs -%else - eval screen -L -D -m ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --enable-widec \ + --enable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ %endif + --without-progs +%else + eval screen -L -D -m ./${c#*./} --disable-ext-mouse \ + --enable-widec \ + --disable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursesw.map \ +%endif + --without-progs +%endif + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c @@ -613,7 +641,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --enable-widec \ + --enable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ +%endif + --without-progs + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c From 5724230a00b2a121fb6937bae70ada303612db70a6279eddb319acaaf3d7d1ec Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 26 Jan 2015 09:45:35 +0000 Subject: [PATCH 6/6] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=186 --- ncurses-5.9-overwrite.dif | 4 ++-- ncurses-5.9-patches.tar.bz2 | 4 ++-- ncurses.changes | 11 +++++++++++ ncurses.spec | 4 ++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index aa6424e..1dcc52c 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -17,9 +17,9 @@ +++ configure 2013-09-30 09:17:52.000000000 +0000 @@ -6799,6 +6799,7 @@ else fi; - echo "$as_me:6811: result: $with_overwrite" >&5 + echo "$as_me:6892: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6814: checking if external terminfo-database is used" >&5 + echo "$as_me:6895: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index e820a86..96a4230 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22383b63c79e9f834a11f5a56c2374b030394236296f90e7ea6385bb54acfa07 -size 4257493 +oid sha256:6567b617700c9c45af605504142b45f6988e89f4621fae055021c53de32cc7a5 +size 4297826 diff --git a/ncurses.changes b/ncurses.changes index 66f6185..91d547b 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 26 09:44:16 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150124 + + add configure check to determine if "local: _*;" can be used in the + ".map" files to selectively omit symbols beginning with "_". On at + least recent FreeBSD, the wildcard applies to all "_" symbols. + + remove obsolete/conflicting rule for ncurses.map from + ncurses/Makefile.in (cf: 20130706). +- Apply symbol versioning only for SUSE version greater that 1320 + ------------------------------------------------------------------- Wed Jan 21 15:58:08 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 1f21b69..ba45a4a 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -17,7 +17,11 @@ %bcond_with hasheddb +%if 0%{?suse_version} > 1320 %bcond_without symversion +%else +%bcond_with symversion +%endif Name: ncurses #!BuildIgnore: terminfo