.

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=321
2017-08-01 08:50:29 +00:00 · 2017-08-01 08:50:29 +00:00 · aba658666b
commit aba658666b
parent 930d5e59ab
3 changed files with 75 additions and 21 deletions
--- a/ncurses-5.7-tack.dif
+++ b/ncurses-5.7-tack.dif
@ -1,5 +1,18 @@
+---
+ tack/Makefile.in |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- tack/Makefile.in
-+++ tack/Makefile.in	2012-03-05 11:30:45.000000000 +0000
+++ tack/Makefile.in	2017-08-01 08:31:12.368616475 +0000
+@@ -84,7 +84,7 @@ CFLAGS_LIBTOOL	= $(CCFLAGS)
+ CFLAGS_NORMAL	= $(CCFLAGS)
+ CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
+ CFLAGS_PROFILE	= $(CCFLAGS) -pg
+-CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
+CFLAGS_SHARED	= $(CCFLAGS) -fPIE
+ 
+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
+ 
@@ -93,7 +93,7 @@ ABI_VERSION	= @cf_cv_abi_version@
 LOCAL_LIBDIR	= @top_builddir@/lib
 
@ -9,3 +22,21 @@
 LDFLAGS		= @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \
 		  @LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@
 
+@@ -101,7 +101,7 @@ LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LI
+ LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
+ LDFLAGS_DEBUG	= $(LDFLAGS) $(CFLAGS_DEBUG)
+ LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
+-LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
+LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) -pie
+ 
+ LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
+ 
+@@ -165,7 +165,7 @@ DEPS_TACK = \
+ 	$(MODEL)/tack$o
+ 
+ tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES)
+-	@ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
+	$(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
+ 
+ #
+ # Utility productions start here
--- a/ncurses-6.0.dif
+++ b/ncurses-6.0.dif
@ -17,11 +17,12 @@
 ncurses/tinfo/lib_setup.c    |    3 
 ncurses/tinfo/read_entry.c   |    2 
 ncurses/tinfo/read_termcap.c |   21 ++++--
+ progs/Makefile.in            |    4 -
 test/test.priv.h             |    4 -
- 19 files changed, 247 insertions(+), 80 deletions(-)
+ 20 files changed, 249 insertions(+), 82 deletions(-)

 --- aclocal.m4
-+++ aclocal.m4	2017-07-31 12:13:25.217204635 +0000
+++ aclocal.m4	2017-08-01 08:37:09.362094788 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
 AC_CACHE_VAL(cf_cv_type_of_bool,[
 	rm -f cf_test.out
@ -150,7 +151,7 @@
 esac
 done
 --- configure
-+++ configure	2017-07-31 12:13:25.221204562 +0000
+++ configure	2017-08-01 08:37:09.362094788 +0000
@@ -5950,7 +5950,7 @@ case $cf_cv_system_name in
 	fi
 	;;
@ -287,7 +288,7 @@
 	# the next lines are needed for linking libtic over libncurses
 	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2017-07-31 12:13:25.221204562 +0000
+++ include/curses.h.in	2017-08-01 08:37:09.366094714 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
 typedef @cf_cv_typeof_mmask_t@ mmask_t;
 #endif
@ -299,7 +300,7 @@
  * We need FILE, etc.  Include this before checking any feature symbols.
  */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2017-07-31 12:13:25.221204562 +0000
+++ include/termcap.h.in	2017-08-01 08:37:09.366094714 +0000
@@ -46,6 +46,8 @@ extern "C"
 {
 #endif /* __cplusplus */
@ -310,7 +311,7 @@
 
 #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2017-07-31 12:13:25.221204562 +0000
+++ include/tic.h	2017-08-01 08:37:09.366094714 +0000
@@ -207,12 +207,12 @@ struct alias
  */
 
@ -327,7 +328,7 @@
 #define CANCELLED_STRING	(char *)(-1)
 
 --- man/man_db.renames
-+++ man/man_db.renames	2017-07-31 12:13:25.221204562 +0000
+++ man/man_db.renames	2017-08-01 08:37:09.366094714 +0000
@@ -163,6 +163,7 @@ term.7				term.7
 term_variables.3x		terminfo_variables.3ncurses
 terminfo.5			terminfo.5
@ -345,7 +346,7 @@
 #
 getty.1				getty.8
 --- man/ncurses.3x
-+++ man/ncurses.3x	2017-07-31 12:13:25.221204562 +0000
+++ man/ncurses.3x	2017-08-01 08:37:09.366094714 +0000
@@ -137,6 +137,10 @@ after the shell environment variable \fB
 [See \fBterminfo\fR(\*n) for further details.]
 .SS Datatypes
@ -358,7 +359,7 @@
 called \fIwindows\fR, which can be thought of as two-dimensional
 arrays of characters representing all or part of a CRT screen.
 --- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in	2017-07-31 12:13:25.221204562 +0000
+++ misc/gen-pkgconfig.in	2017-08-01 08:37:09.366094714 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
 fi
 
@ -398,7 +399,7 @@
 
 	echo "** creating ${name}${suffix}.pc"
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2017-07-31 12:13:25.221204562 +0000
+++ misc/ncurses-config.in	2017-08-01 08:37:09.366094714 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
 	# compile/link
 	--cflags)
@ -409,7 +410,7 @@
 		fi
 		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2017-07-31 12:13:25.225204490 +0000
+++ misc/terminfo.src	2017-08-01 08:37:09.370094642 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
 	am,
 	cols#80,
@ -803,7 +804,7 @@
 	s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
 ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
-+++ ncurses/Makefile.in	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/Makefile.in	2017-08-01 08:37:09.370094642 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
 ../lib : ; mkdir $@
 
@ -814,7 +815,7 @@
 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
 	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 --- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/curses.priv.h	2017-08-01 08:37:09.370094642 +0000
@@ -2130,6 +2130,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
 extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
 extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@ -825,7 +826,7 @@
 extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
 extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
 --- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/run_cmd.sh	2017-08-01 08:37:09.370094642 +0000
@@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@ -839,7 +840,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/tinfo/MKfallback.sh	2017-08-01 08:37:09.370094642 +0000
@@ -68,6 +68,12 @@ else
 	tmp_info=
 fi
@ -872,7 +873,7 @@
 	done
 
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/tinfo/access.c	2017-08-01 08:37:09.370094642 +0000
@@ -35,6 +35,9 @@
 #include <ctype.h>
 
@ -915,7 +916,7 @@
 _nc_access(const char *path, int mode)
 {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/tinfo/lib_setup.c	2017-08-01 08:37:09.370094642 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
     } else if ((value = tigetnum("U8")) >= 0) {
 	result = value;		/* use extension feature */
@ -927,7 +928,7 @@
 	    result = 1;		/* always broken */
 	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/tinfo/read_entry.c	2017-08-01 08:37:09.370094642 +0000
@@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi
     FILE *fp = 0;
     int code;
@ -945,7 +946,7 @@
     return (code);
 }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2017-07-31 12:13:25.225204490 +0000
+++ ncurses/tinfo/read_termcap.c	2017-08-01 08:37:09.370094642 +0000
@@ -322,14 +322,18 @@ _nc_getent(
 	     */
 	    if (fd >= 0) {
@ -991,8 +992,28 @@
 	}
     }
     if (copied != 0)
+--- progs/Makefile.in
+++ progs/Makefile.in	2017-08-01 08:37:41.133514443 +0000
+@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL	= $(CCFLAGS)
+ CFLAGS_NORMAL	= $(CCFLAGS)
+ CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
+ CFLAGS_PROFILE	= $(CCFLAGS) -pg
+-CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
+CFLAGS_SHARED	= $(CCFLAGS) -fPIE
+ 
+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
+ 
+@@ -117,7 +117,7 @@ LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LI
+ LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
+ LDFLAGS_DEBUG	= $(LDFLAGS) $(CFLAGS_DEBUG)
+ LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
+-LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
+LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) -pie
+ 
+ LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
+ 
 --- test/test.priv.h
-+++ test/test.priv.h	2017-07-31 12:13:25.225204490 +0000
+++ test/test.priv.h	2017-08-01 08:37:09.370094642 +0000
@@ -805,12 +805,12 @@ extern char *strnames[], *strcodes[], *s
 #endif
 
--- a/ncurses.changes
+++ b/ncurses.changes
@ -30,6 +30,8 @@ Mon Jul 31 12:14:36 UTC 2017 - werner@suse.de
    curses.  It still uses term_entry.h for the definitions of the
    extended capability arrays.
  + add an overlooked null-pointer check in mvcur changes from 20170722
+- Modify patch ncurses-5.7-tack.dif and ncurses-6.0.dif to get
+  position independent executables as well

 -------------------------------------------------------------------
 Mon Jul 24 07:17:59 UTC 2017 - werner@suse.de