rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=77
This commit is contained in:
Dr. Werner Fink 2012-03-05 12:04:16 +00:00 committed by Git OBS Bridge
parent be67c41ce6
commit 8422e7707f
13 changed files with 95 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ncurses-5.6-fallback.dif
View File

@ -1,11 +0,0 @@
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2008-11-14 18:54:38.539715994 +0100
@@ -566,7 +566,7 @@ _nc_setupterm(NCURSES_CONST char *tname,
const TERMTYPE *fallback = _nc_fallback(tname);
if (fallback) {
- termp->type = *fallback;
+ _nc_copy_termtype(&(termp->type),fallback);
status = TGETENT_YES;
}
}

26
ncurses-5.7-gpm.dif
View File

@ -1,26 +0,0 @@
--- ncurses/base/lib_mouse.c
+++ ncurses/base/lib_mouse.c 2010-01-12 10:24:16.223429669 +0000
@@ -380,6 +380,11 @@ allow_gpm_mouse(void)
{
bool result = FALSE;
+#ifdef weak_symbol
+ /* Danger Robinson: do not use dlopen for libgpm if already loaded */
+ if ((Gpm_Wgetch))
+ return FALSE;
+#endif
/* GPM does printf's without checking if stdout is a terminal */
if (isatty(fileno(stdout))) {
char *list = getenv("NCURSES_GPM_TERMS");
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2008-04-11 15:33:59.000000000 +0000
@@ -608,6 +608,9 @@ typedef struct {
#if USE_GPM_SUPPORT
#undef buttons /* term.h defines this, and gpm uses it! */
#include <gpm.h>
+#ifdef weak_symbol
+weak_symbol(Gpm_Wgetch);
+#endif
#ifdef HAVE_LIBDL
/* link dynamically to GPM */

66
ncurses-5.7-printw.dif
View File

@ -1,66 +0,0 @@
--- ncurses/base/lib_printw.c
+++ ncurses/base/lib_printw.c 2010-01-12 10:51:29.975429869 +0100
@@ -48,10 +48,12 @@ printw(const char *fmt,...)
int code;
#ifdef TRACE
- va_start(argp, fmt);
+ va_list argq;
+ va_copy(argq, argp);
+ va_start(argq, fmt);
T((T_CALLED("printw(%s%s)"),
- _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
- va_end(argp);
+ _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+ va_end(argq);
#endif
va_start(argp, fmt);
@@ -68,10 +70,12 @@ wprintw(WINDOW *win, const char *fmt,...
int code;
#ifdef TRACE
- va_start(argp, fmt);
+ va_list argq;
+ va_copy(argq, argp);
+ va_start(argq, fmt);
T((T_CALLED("wprintw(%p,%s%s)"),
- (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
- va_end(argp);
+ (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+ va_end(argq);
#endif
va_start(argp, fmt);
@@ -88,10 +92,12 @@ mvprintw(int y, int x, const char *fmt,.
int code;
#ifdef TRACE
- va_start(argp, fmt);
+ va_list argq;
+ va_copy(argq, argp);
+ va_start(argq, fmt);
T((T_CALLED("mvprintw(%d,%d,%s%s)"),
- y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
- va_end(argp);
+ y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+ va_end(argq);
#endif
if ((code = move(y, x)) != ERR) {
@@ -109,10 +115,12 @@ mvwprintw(WINDOW *win, int y, int x, con
int code;
#ifdef TRACE
- va_start(argp, fmt);
+ va_list argq;
+ va_copy(argq, argp);
+ va_start(argq, fmt);
T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"),
- y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
- va_end(argp);
+ y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+ va_end(argq);
#endif
if ((code = wmove(win, y, x)) != ERR) {

6
ncurses-5.7-tack.dif
View File

@ -1,11 +1,11 @@
--- tack/Makefile.in
+++ tack/Makefile.in 2008-08-14 13:57:00.930682483 +0200
+++ tack/Makefile.in 2012-03-05 11:30:45.001933741 +0000
@@ -98,7 +98,7 @@ ABI_VERSION = @cf_cv_abi_version@
LOCAL_LIBDIR = @top_builddir@/lib
LD = @LD@
-LINK = @LINK_PROGS@ $(LIBTOOL_LINK)
+LINK = @LINK_PROGS@ $(CC)
LDFLAGS = @EXTRA_LDFLAGS@ \
@TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
LDFLAGS = @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \
@LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@

23
ncurses-5.9-fortify.dif Normal file
View File

@ -0,0 +1,23 @@
--- progs/infocmp.c
+++ progs/infocmp.c 2012-03-05 11:11:08.300796156 +0000
@@ -1089,9 +1089,10 @@ dump_initializers(TERMTYPE *term)
if (VALID_STRING(term->Strings[n])) {
tp = buf;
+#define TP_LIMIT ((MAX_STRING - 4) - (size_t)(tp - buf))
*tp++ = '"';
for (sp = term->Strings[n];
- *sp != 0 && (tp - buf) < MAX_STRING - 6;
+ *sp != 0 && TP_LIMIT > 2;
sp++) {
if (isascii(UChar(*sp))
&& isprint(UChar(*sp))
@@ -1099,7 +1100,7 @@ dump_initializers(TERMTYPE *term)
&& *sp != '"')
*tp++ = *sp;
else {
- _nc_SPRINTF(tp, _nc_SLIMIT(MAX_STRING) "\\%03o", UChar(*sp));
+ _nc_SPRINTF(tp, _nc_SLIMIT(TP_LIMIT) "\\%03o", UChar(*sp));
tp += 4;
}
}

6
ncurses-5.9-overwrite.dif
View File

@ -10,11 +10,11 @@
AC_ARG_ENABLE(database,
--- configure
+++ configure 2012-01-30 16:19:43.071146239 +0000
@@ -6336,6 +6336,7 @@ else
@@ -6368,6 +6368,7 @@ else
fi;
echo "$as_me:6338: result: $with_overwrite" >&5
echo "$as_me:6369: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite"
echo "$as_me:6341: checking if external terminfo-database is used" >&5
echo "$as_me:6372: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6

4
ncurses-5.9-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:765452b4eb8dd9948136da58e4554209a5ba688458a3df55587e52bbbef10a7b
size 914424
oid sha256:d9a2e11c5683b5af8cb02693d573aea1aa1c1bc37789313e671cf007f023e9c4
size 1033359

65
ncurses-5.9-tack-tinfo.dif
View File

@ -1,65 +0,0 @@
--- tack/Makefile.in
+++ tack/Makefile.in 2011-11-17 14:06:49.191147158 +0000
@@ -99,8 +99,8 @@ LOCAL_LIBDIR = @top_builddir@/lib
LD = @LD@
LINK = @LINK_PROGS@ $(CC)
-LDFLAGS = @EXTRA_LDFLAGS@ \
- @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
+LDFLAGS = @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \
+ @LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@
LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
--- tack/configure
+++ tack/configure 2011-11-17 13:51:32.283146036 +0000
@@ -2360,8 +2360,10 @@ LIB_SUFFIX=""
LIB_UNINSTALL=""
LINK_PROGS=""
LOCAL_LDFLAGS=""
-TICS_ARGS=""
-TINFO_ARGS='$(LIBS_CURSES)'
+TICS_LDFLAGS=""
+TICS_LIBS=""
+TINFO_LDFLAGS=""
+TINFO_LIBS='$(LIBS_CURSES)'
cf_cv_abi_version=""
cf_cv_rel_version=""
@@ -9241,8 +9243,10 @@ s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t
s,@LINK_PROGS@,$LINK_PROGS,;t t
s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
-s,@TICS_ARGS@,$TICS_ARGS,;t t
-s,@TINFO_ARGS@,$TINFO_ARGS,;t t
+s,@TICS_LDFLAGS@,$TICS_LDFLAGS,;t t
+s,@TICS_LIBS@,$TICS_LIBS,;t t
+s,@TINFO_LIBS@,$TINFO_LIBS,;t t
+s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t
s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t
s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t
s,@NCURSES_TREE@,$NCURSES_TREE,;t t
--- tack/configure.in
+++ tack/configure.in 2011-11-17 13:46:07.751146206 +0000
@@ -75,8 +75,10 @@ LIB_SUFFIX="" AC_SUBST(LIB_SUFFIX)
LIB_UNINSTALL="" AC_SUBST(LIB_UNINSTALL)
LINK_PROGS="" AC_SUBST(LINK_PROGS)
LOCAL_LDFLAGS="" AC_SUBST(LOCAL_LDFLAGS)
-TICS_ARGS="" AC_SUBST(TICS_ARGS)
-TINFO_ARGS='$(LIBS_CURSES)' AC_SUBST(TINFO_ARGS)
+TICS_LDFLAGS="" AC_SUBST(TICS_LDFLAGS)
+TICS_LIBS="" AC_SUBST(TICS_LIBS)
+TINFO_LDFLAGS="" AC_SUBST(TINFO_LDFLAGS)
+TINFO_LIBS='$(LIBS_CURSES)' AC_SUBST(TINFO_LIBS)
cf_cv_abi_version="" AC_SUBST(cf_cv_abi_version)
cf_cv_rel_version="" AC_SUBST(cf_cv_rel_version)
@@ -160,7 +162,7 @@ strstr \
CF_SYS_TIME_SELECT
CF_SIG_ATOMIC_T
-TICS_ARGS="$LIBS"
+TICS_LIBS="$LIBS"
LIBS=
dnl ---------------------------------------------------------------------------

20
ncurses-5.9.dif
View File

@ -266,24 +266,6 @@
;;
esac
done
@@ -18611,7 +18615,7 @@ else
#line 18610 "configure"
#include "confdefs.h"
-#include <stdlib.h>
+/* #include <stdlib.h> conflict with exit declaration */
#include <stdio.h>
#if defined(__cplusplus)
@@ -18973,7 +18977,7 @@ else
#line 18972 "configure"
#include "confdefs.h"
-#include <stdlib.h>
+/* #include <stdlib.h> conflict with exit declaration */
#include <stdio.h>
#if defined(__cplusplus)
@@ -19924,6 +19928,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
@ -809,7 +791,7 @@
+# include <sys/fsuid.h>
+#endif
MODULE_ID("$Id: access.c,v 1.20 2011/06/05 00:48:00 tom Exp $")
MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $")
@@ -112,6 +115,30 @@ _nc_basename(char *path)
return path + _nc_pathlast(path);

53
ncurses.changes
View File

@ -1,3 +1,56 @@
-------------------------------------------------------------------
Mon Mar 5 11:33:17 UTC 2012 - werner@suse.de
- Add tack patch 1.07.20120303
+ fix many compilerv warnings
+ update auto configure
+ update copyright date
+ Update configure-script and makefile template to work with this
post-5.9 change, allowing build of tack within the ncurses
source-tree 20110924. The change is prompted by review of
OpenSUSE package by Werner Fink, using a patch from the rpm
source file: ncurses-5.9-tack-tinfo.dif (2011-11-18)
-------------------------------------------------------------------
Mon Mar 5 10:36:49 UTC 2012 - werner@suse.de
- Add ncurses patch 5.9.20120303
+ minor tidying of terminfo.tail, clarify reason for limitation
regarding mapping of \0 to \200
+ minor improvement to _nc_copy_termtype(), using memcpy to replace
loops.
+ fix no-leaks checking in test/demo_termcap.c to account for multiple
calls to setupterm().
+ modified the libgpm change to show previous load as a problem in the
debug-trace.
> merge some patches from OpenSUSE rpm (Werner Fink):
+ ncurses-5.7-printw.dif, fixes for varargs handling in lib_printw.c
+ ncurses-5.7-gpm.dif, do not dlopen libgpm if already loaded by
runtime linker
+ ncurses-5.6-fallback.dif, do not free arrays and strings from static
fallback entries
-------------------------------------------------------------------
Thu Mar 1 14:02:05 UTC 2012 - werner@suse.de
- Add ncurses patch 5.9.20120228
+ fix breakage in tic/infocmp from 20120225 (report by Werner Fink).
-------------------------------------------------------------------
Mon Feb 27 12:14:14 UTC 2012 - werner@suse.de
- Add ncurses patch 5.9.20120225
+ modify configure script to allow creating dll's for MinGW when
cross-compiling.
+ add --enable-string-hacks option to control whether strlcat and
strlcpy may be used. The same issue applies to OpenBSD's warnings
about snprintf, noting that this function is weakly standardized.
+ add configure checks for strlcat, strlcpy and snprintf, to help
reduce bogus warnings with OpenBSD builds.
+ build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration
(cf:20111231)
+ update config.guess, config.sub
-------------------------------------------------------------------
Tue Feb 14 18:17:28 UTC 2012 - werner@suse.de

17
ncurses.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ncurses
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@ -15,6 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: ncurses
#!BuildIgnore: terminfo
BuildRequires: gcc-c++
@ -41,16 +43,13 @@ Source1: ncurses-%{version}-patches.tar.bz2
Source2: handle.linux
Source3: README.devel
Source4: ncurses-rpmlintrc
Source5: tack-1.07-20110626.tar.bz2
Source5: tack-1.07-20120303.tar.bz2
Source6: edit.sed
Source7: baselibs.conf
Patch0: ncurses-%{version}.dif
Patch1: ncurses-5.7-printw.dif
Patch1: ncurses-5.9-fortify.dif
Patch3: ncurses-5.9-overwrite.dif
Patch4: ncurses-5.7-tack.dif
Patch5: ncurses-5.7-gpm.dif
Patch6: ncurses-5.6-fallback.dif
Patch7: ncurses-5.9-tack-tinfo.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -262,12 +261,9 @@ rm -f mkinstalldirs
tar Oxfj %{S:1} | patch -p1 -s
tar xfj %{S:5}
mv tack-* tack
%patch -P 1 -p0 -b .va
%patch -P 1 -p0 -b .ovf
%patch -P 3 -p0 -b .ow
%patch -P 4 -p0 -b .hs
%patch -P 5 -p0 -b .gpm
%patch -P 6 -p0 -b .fb
%patch -P 7 -p0 -b .tc
%patch -P 0 -p0 -b .p0
rm -vf include/ncurses_dll.h
rm -vf mkdirs.sh
@ -404,6 +400,7 @@ rm -vf mk-dlls.sh
--enable-weak-symbols \
--enable-wgetch-events \
--enable-pthreads-eintr \
--enable-string-hacks \
--prefix=%{_prefix} \
--exec-prefix=%{_prefix}\
--libdir=%{_libdir} \

3
tack-1.07-20110626.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:794d6475af531d75f68c1e16e7a13feb7dbe5906abdd5b0d02e9fed486f901a0
size 146020

3
tack-1.07-20120303.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35516f06d38fdfaeb5ef2bc18050fa9c8873a69f7ac2de6e9fed712276da1306
size 151089