pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel
Module Name: pkgsrc
Committed By: spz
Date: Mon Apr 2 16:26:04 UTC 2018
Modified Files:
pkgsrc/devel/ncurses: Makefile Makefile.common PLIST distinfo
pkgsrc/devel/ncurses/patches: patch-aa patch-ab patch-ac
patch-c++_Makefile.in
pkgsrc/devel/ncursesw: Makefile
Removed Files:
pkgsrc/devel/ncurses/patches: patch-ncurses_tinfo_alloc__entry.c
patch-ncurses_tinfo_lib__baudrate.c
patch-ncurses_tinfo_parse__entry.c
Log Message:
update ncurses(w) to version 6.1, which fixes CVE-2017-13728 and
CVE-2017-16879
summary relnotes:
This release is designed to be source-compatible with ncurses 5.0
through 6.0; providing extensions to the application binary interface (ABI).
Although the source can still be configured to support the ncurses 5 ABI,
the intent of the release is to provide extensions to the ncurses 6 ABI:
improve integration of tput and tset
provide support for extended numeric capabilities.
The lengthy details are at http://invisible-island.net/ncurses/announce.html
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/ncurses/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/ncurses/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/ncurses/patches/patch-aa
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/ncurses/patches/patch-ab
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/ncurses/patches/patch-ac
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in
cvs rdiff -u -r1.1 -r0 \
pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_alloc__entry.c \
pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_parse__entry.c
cvs rdiff -u -r1.2 -r0 \
pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib__baudrate.c
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ncursesw/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.96 pkgsrc/devel/ncurses/Makefile:1.97
--- pkgsrc/devel/ncurses/Makefile:1.96 Fri Feb 2 17:32:58 2018
+++ pkgsrc/devel/ncurses/Makefile Mon Apr 2 16:26:03 2018
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.96 2018/02/02 17:32:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.97 2018/04/02 16:26:03 spz Exp $
-PKGREVISION= 5
.include "Makefile.common"
COMMENT= CRT screen handling and optimization package
Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.34 pkgsrc/devel/ncurses/Makefile.common:1.35
--- pkgsrc/devel/ncurses/Makefile.common:1.34 Thu Jan 19 18:52:07 2017
+++ pkgsrc/devel/ncurses/Makefile.common Mon Apr 2 16:26:03 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.34 2017/01/19 18:52:07 agc Exp $
+# $NetBSD: Makefile.common,v 1.35 2018/04/02 16:26:03 spz Exp $
#
# used by devel/ncurses/Makefile
# used by devel/ncursesw/Makefile
DISTNAME= ncurses-${NC_VERS}
-NC_VERS= 6.0
+NC_VERS= 6.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/}
MASTER_SITES+= ftp://dickey.his.com/ncurses/
Index: pkgsrc/devel/ncurses/PLIST
diff -u pkgsrc/devel/ncurses/PLIST:1.23 pkgsrc/devel/ncurses/PLIST:1.24
--- pkgsrc/devel/ncurses/PLIST:1.23 Mon Jan 1 22:29:25 2018
+++ pkgsrc/devel/ncurses/PLIST Mon Apr 2 16:26:03 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2018/01/01 22:29:25 rillig Exp $
+@comment $NetBSD: PLIST,v 1.24 2018/04/02 16:26:03 spz Exp $
bin/captoinfo
bin/clear
bin/infocmp
@@ -66,6 +66,7 @@ man/man3/TYPE_NUMERIC.3
man/man3/TYPE_REGEXP.3
man/man3/UP.3
man/man3/_nc_free_and_exit.3
+man/man3/_nc_free_tinfo.3
man/man3/_nc_freeall.3
man/man3/_nc_tracebits.3
man/man3/_traceattr.3
@@ -89,6 +90,8 @@ man/man3/addnstr.3
man/man3/addnwstr.3
man/man3/addstr.3
man/man3/addwstr.3
+man/man3/alloc_pair.3
+man/man3/alloc_pair_sp.3
man/man3/assume_default_colors.3
man/man3/assume_default_colors_sp.3
man/man3/attr_get.3
@@ -230,6 +233,12 @@ man/man3/erase.3
man/man3/erasechar.3
man/man3/erasechar_sp.3
man/man3/erasewchar.3
+man/man3/extended_color_content.3
+man/man3/extended_color_content_sp.3
+man/man3/extended_pair_content.3
+man/man3/extended_pair_content_sp.3
+man/man3/extended_slk_color.3
+man/man3/extended_slk_color_sp.3
man/man3/field_arg.3
man/man3/field_back.3
man/man3/field_buffer.3
@@ -249,6 +258,8 @@ man/man3/field_type.3
man/man3/field_userptr.3
man/man3/filter.3
man/man3/filter_sp.3
+man/man3/find_pair.3
+man/man3/find_pair_sp.3
man/man3/flash.3
man/man3/flash_sp.3
man/man3/flushinp.3
@@ -291,6 +302,8 @@ man/man3/free_fieldtype.3
man/man3/free_form.3
man/man3/free_item.3
man/man3/free_menu.3
+man/man3/free_pair.3
+man/man3/free_pair_sp.3
man/man3/get_escdelay.3
man/man3/get_escdelay_sp.3
man/man3/get_wch.3
@@ -347,6 +360,10 @@ man/man3/inchnstr.3
man/man3/inchstr.3
man/man3/init_color.3
man/man3/init_color_sp.3
+man/man3/init_extended_color.3
+man/man3/init_extended_color_sp.3
+man/man3/init_extended_pair.3
+man/man3/init_extended_pair_sp.3
man/man3/init_pair.3
man/man3/init_pair_sp.3
man/man3/initscr.3
@@ -412,6 +429,7 @@ man/man3/legacy_coding.3
man/man3/link_field.3
man/man3/link_fieldtype.3
man/man3/longname.3
+man/man3/longname_sp.3
man/man3/mcprint.3
man/man3/mcprint_sp.3
man/man3/menu.3
@@ -552,6 +570,7 @@ man/man3/new_item.3
man/man3/new_menu.3
man/man3/new_menu_sp.3
man/man3/new_page.3
+man/man3/new_pair.3
man/man3/new_panel.3
man/man3/new_prescr.3
man/man3/newpad.3
@@ -610,6 +629,7 @@ man/man3/raw_sp.3
man/man3/redrawwin.3
man/man3/refresh.3
man/man3/replace_panel.3
+man/man3/reset_color_pairs.3
man/man3/reset_prog_mode.3
man/man3/reset_prog_mode_sp.3
man/man3/reset_shell_mode.3
@@ -778,6 +798,7 @@ man/man3/typeahead.3
man/man3/typeahead_sp.3
man/man3/unctrl.3
man/man3/unctrl_sp.3
+man/man3/unfocus_current_field.3
man/man3/unget_wch.3
man/man3/unget_wch_sp.3
man/man3/ungetch.3
@@ -898,8 +919,10 @@ man/man3/wunctrl.3
man/man3/wunctrl_sp.3
man/man3/wvline.3
man/man3/wvline_set.3
+man/man5/scr_dump.5
man/man5/term.5
man/man5/terminfo.5
+man/man5/user_caps.5
man/man7/term.7
share/examples/ncurses++demo.cc
share/tabset/std
Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.33 pkgsrc/devel/ncurses/distinfo:1.34
--- pkgsrc/devel/ncurses/distinfo:1.33 Fri Feb 2 17:32:58 2018
+++ pkgsrc/devel/ncurses/distinfo Mon Apr 2 16:26:03 2018
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.33 2018/02/02 17:32:58 jperkin Exp $
+$NetBSD: distinfo,v 1.34 2018/04/02 16:26:03 spz Exp $
-SHA1 (ncurses-6.0.tar.gz) = acd606135a5124905da770803c05f1f20dd3b21c
-RMD160 (ncurses-6.0.tar.gz) = 4d9e5938f00b400bfb0d37f3c54f2f36c4157d48
-SHA512 (ncurses-6.0.tar.gz) = 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
-Size (ncurses-6.0.tar.gz) = 3131891 bytes
-SHA1 (patch-aa) = 6acf84077e84fd693bb2b52377774db3d15b4f8f
-SHA1 (patch-ab) = 5a64bd1e591fa253d71bbdec1a4dc330c4c50e9e
-SHA1 (patch-ac) = b0b0eac0be624240330da852d7e5d35ff5f060c4
+SHA1 (ncurses-6.1.tar.gz) = 57acf6bc24cacd651d82541929f726f4def780cc
+RMD160 (ncurses-6.1.tar.gz) = 938235f3922f9c6ef0f1081d643ecb2da1347a17
+SHA512 (ncurses-6.1.tar.gz) = e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
+Size (ncurses-6.1.tar.gz) = 3365395 bytes
+SHA1 (patch-aa) = 4523f87f39d2aa3eea07a0e55595eb9e50b74a6c
+SHA1 (patch-ab) = f4573e7a161c2f59d9828d163abe2a5ba2e4d56f
+SHA1 (patch-ac) = 08e5fa8179c7f5c65c617a55c9693745b89b42de
SHA1 (patch-aclocal.m4) = efb1a966687d2c35fc3e3e1d5345e80aaf2822f6
-SHA1 (patch-c++_Makefile.in) = 974f89c75737a8079977fc35a924b54d32e98df2
+SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5
SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa
SHA1 (patch-misc_ncurses-config.in) = 43e4dc8abe85804513da1189aeffa5c7746ffcca
SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527
-SHA1 (patch-ncurses_tinfo_alloc__entry.c) = b9f3ab1ba347f9725a97874b0020e14b56341195
-SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = e383a11530a3045e729ab8c738e57a9e217a994f
-SHA1 (patch-ncurses_tinfo_parse__entry.c) = c99eb89dcdbf0ad4e05eea9b7f9820a0d4328173
Index: pkgsrc/devel/ncurses/patches/patch-aa
diff -u pkgsrc/devel/ncurses/patches/patch-aa:1.18 pkgsrc/devel/ncurses/patches/patch-aa:1.19
--- pkgsrc/devel/ncurses/patches/patch-aa:1.18 Mon Aug 17 17:10:32 2015
+++ pkgsrc/devel/ncurses/patches/patch-aa Mon Apr 2 16:26:03 2018
@@ -1,17 +1,29 @@
-$NetBSD: patch-aa,v 1.18 2015/08/17 17:10:32 wiz Exp $
+$NetBSD: patch-aa,v 1.19 2018/04/02 16:26:03 spz Exp $
---- misc/run_tic.in.orig 2012-10-06 19:00:51.000000000 +0000
-+++ misc/run_tic.in
-@@ -123,7 +123,7 @@ fi
+--- ./misc/run_tic.in.orig 2017-10-24 00:16:22.000000000 +0000
++++ ./misc/run_tic.in
+@@ -124,13 +124,13 @@ fi
# would generate a lot of confusing error messages if we tried to overwrite it.
# We explicitly remove its contents rather than the directory itself, in case
# the directory is actually a symbolic link.
--( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
-+#( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
+-if test -d "$TERMINFO"
+-then
+- ( cd "$TERMINFO" && rm -fr ? 2>/dev/null )
+-elif test -f "$TERMINFO.db"
+-then
+- ( rm -f "$TERMINFO.db" 2>/dev/null )
+-fi
++#if test -d "$TERMINFO"
++#then
++# ( cd "$TERMINFO" && rm -fr ? 2>/dev/null )
++#elif test -f "$TERMINFO.db"
++#then
++# ( rm -f "$TERMINFO.db" 2>/dev/null )
++#fi
if test "$ext_funcs" = 1 ; then
cat <<EOF
-@@ -165,6 +165,9 @@ else
+@@ -172,6 +172,9 @@ else
fi
fi
Index: pkgsrc/devel/ncurses/patches/patch-ab
diff -u pkgsrc/devel/ncurses/patches/patch-ab:1.20 pkgsrc/devel/ncurses/patches/patch-ab:1.21
--- pkgsrc/devel/ncurses/patches/patch-ab:1.20 Fri Dec 30 11:28:19 2016
+++ pkgsrc/devel/ncurses/patches/patch-ab Mon Apr 2 16:26:03 2018
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.20 2016/12/30 11:28:19 wiz Exp $
+$NetBSD: patch-ab,v 1.21 2018/04/02 16:26:03 spz Exp $
---- mk-1st.awk.orig 2014-12-20 23:54:22.000000000 +0000
-+++ mk-1st.awk
+--- ./mk-1st.awk.orig 2017-12-02 23:29:29.000000000 +0000
++++ ./mk-1st.awk
@@ -67,6 +67,9 @@ function is_termlib() {
}
# see lib_name
@@ -12,17 +12,6 @@ $NetBSD: patch-ab,v 1.20 2016/12/30 11:2
return sprintf("%s%s%s", prefix, a_name, suffix)
}
# see imp_name
-@@ -447,8 +450,8 @@ END {
- which_list = "SHLIB_LIST";
- }
- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
-- printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
-- printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
-+ printf "\t\t-o %s $(%s_OBJS:.o=.lo) \\\n", lib_name, OBJS;
-+ printf "\t\t-rpath $(libdir) \\\n";
- printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
- print ""
- print "install \\"
@@ -471,7 +474,7 @@ END {
printf "\t$(RANLIB) $@\n"
if ( host == "vxworks" )
Index: pkgsrc/devel/ncurses/patches/patch-ac
diff -u pkgsrc/devel/ncurses/patches/patch-ac:1.25 pkgsrc/devel/ncurses/patches/patch-ac:1.26
--- pkgsrc/devel/ncurses/patches/patch-ac:1.25 Fri Dec 30 11:28:19 2016
+++ pkgsrc/devel/ncurses/patches/patch-ac Mon Apr 2 16:26:03 2018
@@ -1,26 +1,11 @@
-$NetBSD: patch-ac,v 1.25 2016/12/30 11:28:19 wiz Exp $
+$NetBSD: patch-ac,v 1.26 2018/04/02 16:26:03 spz Exp $
-Allow ncurses to build with compiler from pkgsrc by dropping the use of
--no-cpp-precomp which is specific to Apple's supplied toolchain.
-Don't rename man pages on Debian.
-Include local paths before utilising flags from build env
-
---- configure.orig 2015-08-05 09:20:32.000000000 +0000
-+++ configure
-@@ -4930,7 +4930,7 @@ test -z "$cf_cv_libtool_version" && unse
- echo "$as_me: error: Cannot find libtool" >&2;}
- { (exit 1); exit 1; }; }
- fi
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -11090,12 +11090,7 @@ case ".$MANPAGE_RENAMES" in
- (.no)
+--- ./configure.orig 2018-01-20 00:27:18.000000000 +0000
++++ ./configure
+@@ -11770,11 +11770,7 @@ case ".$MANPAGE_RENAMES" in
;;
(.|.yes)
-- # Debian 'man' program?
+ # Debian 'man' program?
- if test -f /etc/debian_version ; then
- MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
- else
@@ -30,7 +15,7 @@ Include local paths before utilising fla
;;
esac
-@@ -21894,8 +21889,16 @@ EOF
+@@ -23263,8 +23259,17 @@ EOF
#define HAVE_LIB${cf_have_include} 1
EOF
@@ -46,10 +31,11 @@ Include local paths before utilising fla
+ TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2"
+ ;;
+ esac
++
if test "$DFT_LWR_MODEL" = "libtool"; then
TEST_ARGS="${TEST_DEPS}"
TEST_ARG2="${TEST_DEP2}"
-@@ -22181,9 +22184,9 @@ fi
+@@ -23567,9 +23572,9 @@ fi
ADAHTML_DIR=../../doc/html/ada
# these could be configurable, but are not currently
@@ -61,8 +47,8 @@ Include local paths before utilising fla
+FORM_NAME=gnuform
CXX_NAME=ncurses++
- # workaround for g++ versus Solaris (20131116)
-@@ -23565,7 +23568,14 @@ CF_EOF
+ # workaround for OS/2 (20151017)
+@@ -25011,7 +25016,15 @@ CF_EOF
cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}"
fi
@@ -75,6 +61,7 @@ Include local paths before utilising fla
+ cf_libname=$cf_dir
+ ;;
+ esac
++
test "$cf_dir" = c++ && cf_libname=ncurses++
if test $cf_item = shared ; then
if test -n "${LIB_SUFFIX}"
Index: pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in
diff -u pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in:1.1 pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in:1.2
--- pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in:1.1 Sun Dec 18 23:30:34 2016
+++ pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in Mon Apr 2 16:26:03 2018
@@ -1,7 +1,7 @@
-$NetBSD: patch-c++_Makefile.in,v 1.1 2016/12/18 23:30:34 joerg Exp $
+$NetBSD: patch-c++_Makefile.in,v 1.2 2018/04/02 16:26:03 spz Exp $
---- c++/Makefile.in.orig 2015-08-05 23:15:41.000000000 +0000
-+++ c++/Makefile.in
+--- ./c++/Makefile.in.orig 2016-05-21 23:26:12.000000000 +0000
++++ ./c++/Makefile.in
@@ -84,7 +84,7 @@ RANLIB = @LIB_PREP@
CXX = @CXX@
CPP = @CXXCPP@
@@ -10,7 +10,7 @@ $NetBSD: patch-c++_Makefile.in,v 1.1 201
+CXXLIBS =
INCDIR = ../include
- CPPFLAGS = -DHAVE_CONFIG_H @CPPFLAGS@
+ CPPFLAGS = -DHAVE_CONFIG_H -I../c++ @CPPFLAGS@
@@ -112,7 +112,7 @@ LOCAL_LIBDIR = @top_builddir@/lib
LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
Index: pkgsrc/devel/ncursesw/Makefile
diff -u pkgsrc/devel/ncursesw/Makefile:1.15 pkgsrc/devel/ncursesw/Makefile:1.16
--- pkgsrc/devel/ncursesw/Makefile:1.15 Fri Feb 2 17:33:36 2018
+++ pkgsrc/devel/ncursesw/Makefile Mon Apr 2 16:26:04 2018
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.15 2018/02/02 17:33:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2018/04/02 16:26:04 spz Exp $
-PKGREVISION= 4
.include "../../devel/ncurses/Makefile.common"
PKGNAME= ${DISTNAME:S/ncurses/ncursesw/}
Home |
Main Index |
Thread Index |
Old Index