ncurses 6.0 - patch 20171209

+ modify misc/ncurses-config.in to make output with --includedir
  consistent with --cflags, i.e., when --disable-overwrite option was
  configured the output should show the subdirectory where headers
  are.
+ modify MKlib_gen.sh to suppress macros when calling an "implemented"
  function in link_test.c
+ updated ftp-url used in test-packages, etc.
+ modify order of -pie/-shared options in configure script in case
  LDFLAGS uses "-pie", working around a defect or limitation in the GNU
  linker (prompted by patch by Yogesh Prasad, forwarded by Jay Shah).
+ add entry in man_db.renames for user_caps.5

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index d86b9ec523699a4c958fc5233644e07541525713..f4e98639ff388fa2d2b7270a391a3dcf31438afd 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.120 2017/09/30 19:48:36 tom Exp $
+dnl $Id: aclocal.m4,v 1.121 2017/12/02 23:57:36 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -2944,7 +2944,7 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 90 updated: 2017/02/11 14:48:57
+dnl CF_SHARED_OPTS version: 91 updated: 2017/12/02 18:43:13
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -3045,15 +3045,15 @@ AC_DEFUN([CF_SHARED_OPTS],
        (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
-                       MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
                else
                        CC_SHARED_OPTS='-brtl'
                        # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
-                       MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
                fi
                ;;
        (beos*)
-               MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
                ;;
        (cygwin*)
                CC_SHARED_OPTS=
@@ -3073,7 +3073,7 @@ AC_DEFUN([CF_SHARED_OPTS],
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -3095,14 +3095,14 @@ CF_EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
        (darwin*)
                cf_try_cflags="no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
-               MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
@@ -3119,7 +3119,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='+Z'
                fi
-               MK_SHARED_LIB='${LD} -b -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -b -o $[@]'
                INSTALL_LIB="-m 555"
                ;;
        (hpux*)
@@ -3130,7 +3130,7 @@ CF_EOF
                        CC_SHARED_OPTS='+Z'
                        LD_SHARED_OPTS='-Wl,+b,${libdir}'
                fi
-               MK_SHARED_LIB='${LD} +b ${libdir} -b -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} +b ${libdir} -b -o $[@]'
                # HP-UX shared libraries must be executable, and should be
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
@@ -3138,12 +3138,12 @@ CF_EOF
        (interix*)
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                if test "$cf_cv_shlib_version" = rel; then
-                       cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+                       cf_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
                else
-                       cf_shared_soname='`basename $@`'
+                       cf_shared_soname='`basename $[@]`'
                fi
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
                ;;
        (irix*)
                if test "$cf_cv_enable_rpath" = yes ; then
@@ -3152,9 +3152,9 @@ CF_EOF
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
-                       MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
                else
-                       MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
                fi
                cf_cv_rm_so_locs=yes
                ;;
@@ -3167,7 +3167,7 @@ CF_EOF
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        (mingw*)
                cf_cv_shlib_version=mingw
@@ -3192,7 +3192,7 @@ CF_EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -3206,11 +3206,11 @@ CF_EOF
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        (nto-qnx*|openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-               MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (dragonfly*|freebsd*)
@@ -3221,7 +3221,7 @@ CF_EOF
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        (netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -3237,16 +3237,16 @@ CF_EOF
                        fi
                        fi
                        CF_SHARED_SONAME
-                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
-                       MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
                fi
                ;;
        (osf*|mls+*)
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
-               MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
                case $host_os in
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
@@ -3264,7 +3264,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
-               MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
                if test "$cf_cv_enable_rpath" = yes ; then
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
@@ -3278,7 +3278,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -assert pure-text -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -assert pure-text -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (solaris2*)
@@ -3301,9 +3301,9 @@ CF_EOF
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
-                       MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
                else
-                       MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
                fi
                ;;
        (sysv5uw7*|unix_sv*)
@@ -3311,7 +3311,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -d y -G -o [$]@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -d y -G -o [$]@'
                ;;
        (*)
                CC_SHARED_OPTS='unknown'

diff --git a/Ada95/configure b/Ada95/configure
index de0e5404e9f7e3acb5d2edd4a87b66a4a9ea54d2..4e692389eb7f8287c1b06d59c91a947ae121f920 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -9500,15 +9500,15 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
        (aix4.3-9*|aix[5-7]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
-                       MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
                else
                        CC_SHARED_OPTS='-brtl'
                        # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
-                       MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
                fi
                ;;
        (beos*)
-               MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
                ;;
        (cygwin*)
                CC_SHARED_OPTS=
@@ -9528,7 +9528,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                ** SHARED_LIB \$SHARED_LIB
                ** IMPORT_LIB \$IMPORT_LIB
 EOF
-               exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+               exec \$* ${LDFLAGS} -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -9550,14 +9550,14 @@ CF_EOF
                ** SHARED_LIB \$SHARED_LIB
                ** IMPORT_LIB \$IMPORT_LIB
 EOF
-               exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+               exec \$* ${LDFLAGS} -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
        (darwin*)
                cf_try_cflags="no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
-               MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                echo "$as_me:9563: checking if ld -search_paths_first works" >&5
@@ -9612,7 +9612,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='+Z'
                fi
-               MK_SHARED_LIB='${LD} -b -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -b -o $@'
                INSTALL_LIB="-m 555"
                ;;
        (hpux*)
@@ -9623,7 +9623,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                        CC_SHARED_OPTS='+Z'
                        LD_SHARED_OPTS='-Wl,+b,${libdir}'
                fi
-               MK_SHARED_LIB='${LD} +b ${libdir} -b -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} +b ${libdir} -b -o $@'
                # HP-UX shared libraries must be executable, and should be
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
@@ -9631,12 +9631,12 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
        (interix*)
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                if test "$cf_cv_shlib_version" = rel; then
-                       cf_shared_soname='`basename  .${REL_VERSION}`.${ABI_VERSION}'
+                       cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
                else
-                       cf_shared_soname='`basename `'
+                       cf_shared_soname='`basename $@`'
                fi
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o '
+               MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
                ;;
        (irix*)
                if test "$cf_cv_enable_rpath" = yes ; then
@@ -9645,9 +9645,9 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
-                       MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $@` -o $@'
                else
-                       MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $@` -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $@` -o $@'
                fi
                cf_cv_rm_so_locs=yes
                ;;
@@ -9667,7 +9667,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        (mingw*)
                cf_cv_shlib_version=mingw
@@ -9692,7 +9692,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                ** SHARED_LIB \$SHARED_LIB
                ** IMPORT_LIB \$IMPORT_LIB
 EOF
-               exec \$* -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+               exec \$* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -9713,11 +9713,11 @@ CF_EOF
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        (nto-qnx*|openbsd*|freebsd[12].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-               MK_SHARED_LIB='${LD} -Bshareable -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (dragonfly*|freebsd*)
@@ -9735,7 +9735,7 @@ CF_EOF
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        (netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -9758,16 +9758,16 @@ CF_EOF
                cf_cv_shared_soname='`basename $@`'
        fi
 
-                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
                else
-                       MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $@'
                fi
                ;;
        (osf*|mls+*)
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
-               MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
                case $host_os in
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
@@ -9785,7 +9785,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
-               MK_SHARED_LIB='${LD} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@'
                if test "$cf_cv_enable_rpath" = yes ; then
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
@@ -9799,7 +9799,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -assert pure-text -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -assert pure-text -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (solaris2*)
@@ -9858,9 +9858,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
-                       MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@'
                else
-                       MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
                fi
                ;;
        (sysv5uw7*|unix_sv*)
@@ -9868,7 +9868,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -d y -G -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -d y -G -o $@'
                ;;
        (*)
                CC_SHARED_OPTS='unknown'

diff --git a/Ada95/include/ncurses_cfg.hin b/Ada95/include/ncurses_cfg.hin
index 3f8a482a5d84c53ae4d1f7b9913be59be8eef8e9..8609860a7aac031910ad60c9f9ee2735e4d5e1af 100644 (file)
--- a/Ada95/include/ncurses_cfg.hin
+++ b/Ada95/include/ncurses_cfg.hin
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -30,7 +30,7 @@
  *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
  ****************************************************************************/
 /*
- * $Id: ncurses_cfg.hin,v 1.7 2005/01/02 01:26:58 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.8 2017/12/09 20:46:26 tom Exp $
  *
  * This is a template-file used to generate the "ncurses_cfg.h" file.
  *
@@ -40,7 +40,7 @@
  *
  * See:
  *     http://invisible-island.net/autoconf/
- *     ftp://invisible-island.net/autoconf/
+ *     ftp://ftp.invisible-island.net/autoconf/
  */
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H

diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec
index 92c96aced25f68ffc34b67296fc1a67398224c4c..c8d11338962a970a722712be4f02723b2fe40504 100644 (file)
--- a/Ada95/package/AdaCurses-doc.spec
+++ b/Ada95/package/AdaCurses-doc.spec
@@ -3,13 +3,13 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
 %define AppPackage %{AppProgram}-doc
-# $Id: AdaCurses-doc.spec,v 1.3 2015/04/26 23:39:31 tom Exp $
+# $Id: AdaCurses-doc.spec,v 1.4 2017/12/09 20:41:39 tom Exp $
 Name: %{AppPackage}
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: MIT
 Group: Applications/Development
-URL: ftp://invisible-island.net/%{AppProgram}
+URL: ftp://ftp.invisible-island.net/%{AppProgram}
 Source0: %{AppProgram}-%{AppRelease}.tgz
 Packager: Thomas Dickey <dickey@invisible-island.net>
 

diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec
index 4e2354c94e1a2589034acea68be133f6699d45ae..bc1c92b91f2af2d8e9f06ffa2ea759ee07a75b52 100644 (file)
--- a/Ada95/package/AdaCurses.spec
+++ b/Ada95/package/AdaCurses.spec
@@ -2,13 +2,13 @@ Summary: AdaCurses - Ada95 binding for ncurses
 %define AppProgram AdaCurses
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
-# $Id: AdaCurses.spec,v 1.15 2015/04/26 23:55:55 tom Exp $
+# $Id: AdaCurses.spec,v 1.16 2017/12/09 20:41:28 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: MIT
 Group: Applications/Development
-URL: ftp://invisible-island.net/%{AppProgram}
+URL: ftp://ftp.invisible-island.net/%{AppProgram}
 Source0: %{AppProgram}-%{AppRelease}.tgz
 Packager: Thomas Dickey <dickey@invisible-island.net>
 

diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch
index 4794ae38527634d0431413e492ebf18d85a11fc3..1b870ba1946f99d86c32b2f21bc52eed79745922 100644 (file)
--- a/Ada95/package/debian/watch
+++ b/Ada95/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \
+opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \
  debian  uupdate

diff --git a/NEWS b/NEWS
index fff49e183cfe7d44afe6e0009810f6ead77d292b..17aacd2c32c075559498239d5f96113dc52ed8af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3014 2017/11/25 23:04:42 tom Exp $
+-- $Id: NEWS,v 1.3021 2017/12/09 22:45:01 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,19 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20171209
+       + modify misc/ncurses-config.in to make output with --includedir
+         consistent with --cflags, i.e., when --disable-overwrite option was
+         configured the output should show the subdirectory where headers
+         are.
+       + modify MKlib_gen.sh to suppress macros when calling an "implemented"
+         function in link_test.c
+       + updated ftp-url used in test-packages, etc.
+       + modify order of -pie/-shared options in configure script in case
+         LDFLAGS uses "-pie", working around a defect or limitation in the GNU
+         linker (prompted by patch by Yogesh Prasad, forwarded by Jay Shah).
+       + add entry in man_db.renames for user_caps.5
+
 20171125
        + modify MKlib_gen.sh to avoid tracing result from getstr/getnstr
          before initialized.

diff --git a/VERSION b/VERSION
index 21acfd6987d0e448c6635abf3e72b3982afac318..4544bc8c288e97ad1ae3ad0e1a07426d0dc18074 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20171125
+5:0:9  6.0     20171209

diff --git a/aclocal.m4 b/aclocal.m4
index 9a0697f678e6c3aa309bf0703a42ad390eec4152..d763d70630b9f4d665e5a6b7132736c863be7686 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.816 2017/11/25 22:33:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.818 2017/12/02 23:46:25 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5778,7 +5778,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 90 updated: 2017/02/11 14:48:57
+dnl CF_SHARED_OPTS version: 91 updated: 2017/12/02 18:43:13
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -5879,15 +5879,15 @@ AC_DEFUN([CF_SHARED_OPTS],
        (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
-                       MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
                else
                        CC_SHARED_OPTS='-brtl'
                        # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
-                       MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
                fi
                ;;
        (beos*)
-               MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
                ;;
        (cygwin*)
                CC_SHARED_OPTS=
@@ -5907,7 +5907,7 @@ AC_DEFUN([CF_SHARED_OPTS],
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -5929,14 +5929,14 @@ CF_EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
        (darwin*)
                cf_try_cflags="no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
-               MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
@@ -5953,7 +5953,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='+Z'
                fi
-               MK_SHARED_LIB='${LD} -b -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -b -o $[@]'
                INSTALL_LIB="-m 555"
                ;;
        (hpux*)
@@ -5964,7 +5964,7 @@ CF_EOF
                        CC_SHARED_OPTS='+Z'
                        LD_SHARED_OPTS='-Wl,+b,${libdir}'
                fi
-               MK_SHARED_LIB='${LD} +b ${libdir} -b -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} +b ${libdir} -b -o $[@]'
                # HP-UX shared libraries must be executable, and should be
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
@@ -5972,12 +5972,12 @@ CF_EOF
        (interix*)
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                if test "$cf_cv_shlib_version" = rel; then
-                       cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+                       cf_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
                else
-                       cf_shared_soname='`basename $@`'
+                       cf_shared_soname='`basename $[@]`'
                fi
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
                ;;
        (irix*)
                if test "$cf_cv_enable_rpath" = yes ; then
@@ -5986,9 +5986,9 @@ CF_EOF
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
-                       MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
                else
-                       MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
                fi
                cf_cv_rm_so_locs=yes
                ;;
@@ -6001,7 +6001,7 @@ CF_EOF
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        (mingw*)
                cf_cv_shlib_version=mingw
@@ -6026,7 +6026,7 @@ CF_EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -6040,11 +6040,11 @@ CF_EOF
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        (nto-qnx*|openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-               MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (dragonfly*|freebsd*)
@@ -6055,7 +6055,7 @@ CF_EOF
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        (netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -6071,16 +6071,16 @@ CF_EOF
                        fi
                        fi
                        CF_SHARED_SONAME
-                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
-                       MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
                fi
                ;;
        (osf*|mls+*)
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
-               MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
                case $host_os in
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
@@ -6098,7 +6098,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
-               MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
                if test "$cf_cv_enable_rpath" = yes ; then
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
@@ -6112,7 +6112,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -assert pure-text -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -assert pure-text -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (solaris2*)
@@ -6135,9 +6135,9 @@ CF_EOF
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
-                       MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
                else
-                       MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
                fi
                ;;
        (sysv5uw7*|unix_sv*)
@@ -6145,7 +6145,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -d y -G -o [$]@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -d y -G -o [$]@'
                ;;
        (*)
                CC_SHARED_OPTS='unknown'

diff --git a/configure b/configure
index 2805fd5a693b00681b163c629e64680518dd0de1..d17b292c215c18a825d801f5499ae1937b603e29 100755 (executable)
--- a/configure
+++ b/configure
@@ -6146,15 +6146,15 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
        (aix4.3-9*|aix[5-7]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
-                       MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
                else
                        CC_SHARED_OPTS='-brtl'
                        # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
-                       MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
                fi
                ;;
        (beos*)
-               MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
                ;;
        (cygwin*)
                CC_SHARED_OPTS=
@@ -6174,7 +6174,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                ** SHARED_LIB \$SHARED_LIB
                ** IMPORT_LIB \$IMPORT_LIB
 EOF
-               exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+               exec \$* ${LDFLAGS} -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -6196,14 +6196,14 @@ CF_EOF
                ** SHARED_LIB \$SHARED_LIB
                ** IMPORT_LIB \$IMPORT_LIB
 EOF
-               exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+               exec \$* ${LDFLAGS} -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
        (darwin*)
                cf_try_cflags="no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
-               MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                echo "$as_me:6209: checking if ld -search_paths_first works" >&5
@@ -6258,7 +6258,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='+Z'
                fi
-               MK_SHARED_LIB='${LD} -b -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -b -o $@'
                INSTALL_LIB="-m 555"
                ;;
        (hpux*)
@@ -6269,7 +6269,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                        CC_SHARED_OPTS='+Z'
                        LD_SHARED_OPTS='-Wl,+b,${libdir}'
                fi
-               MK_SHARED_LIB='${LD} +b ${libdir} -b -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} +b ${libdir} -b -o $@'
                # HP-UX shared libraries must be executable, and should be
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
@@ -6277,12 +6277,12 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
        (interix*)
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                if test "$cf_cv_shlib_version" = rel; then
-                       cf_shared_soname='`basename  .${REL_VERSION}`.${ABI_VERSION}'
+                       cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
                else
-                       cf_shared_soname='`basename `'
+                       cf_shared_soname='`basename $@`'
                fi
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o '
+               MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
                ;;
        (irix*)
                if test "$cf_cv_enable_rpath" = yes ; then
@@ -6291,9 +6291,9 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
-                       MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $@` -o $@'
                else
-                       MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $@` -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $@` -o $@'
                fi
                cf_cv_rm_so_locs=yes
                ;;
@@ -6313,7 +6313,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        (mingw*)
                cf_cv_shlib_version=mingw
@@ -6338,7 +6338,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                ** SHARED_LIB \$SHARED_LIB
                ** IMPORT_LIB \$IMPORT_LIB
 EOF
-               exec \$* -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+               exec \$* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
@@ -6359,11 +6359,11 @@ CF_EOF
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        (nto-qnx*|openbsd*|freebsd[12].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-               MK_SHARED_LIB='${LD} -Bshareable -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (dragonfly*|freebsd*)
@@ -6381,7 +6381,7 @@ CF_EOF
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        (netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -6404,16 +6404,16 @@ CF_EOF
                cf_cv_shared_soname='`basename $@`'
        fi
 
-                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
                else
-                       MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $@'
                fi
                ;;
        (osf*|mls+*)
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
-               MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
                case $host_os in
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
@@ -6431,7 +6431,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
-               MK_SHARED_LIB='${LD} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@'
                if test "$cf_cv_enable_rpath" = yes ; then
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
@@ -6445,7 +6445,7 @@ CF_EOF
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -assert pure-text -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -assert pure-text -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
        (solaris2*)
@@ -6504,9 +6504,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
-                       MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@'
                else
-                       MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
                fi
                ;;
        (sysv5uw7*|unix_sv*)
@@ -6514,7 +6514,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -d y -G -o $@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -d y -G -o $@'
                ;;
        (*)
                CC_SHARED_OPTS='unknown'

diff --git a/dist.mk b/dist.mk
index 8b7ac275927e26a07537d4d092cd51cd42979817..85bd3393d25c29f5a8db1d1093f37d7f1e8f0cb2 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1193 2017/11/19 20:12:11 tom Exp $
+# $Id: dist.mk,v 1.1195 2017/12/09 12:38:04 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0
-NCURSES_PATCH = 20171125
+NCURSES_PATCH = 20171209
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/include/ncurses_cfg.hin b/include/ncurses_cfg.hin
index 91270d06dcf660a544c7d80765fbc666a01462a3..fb89e76257b89a7ed557e92dab5a76dfb689598e 100644 (file)
--- a/include/ncurses_cfg.hin
+++ b/include/ncurses_cfg.hin
@@ -30,7 +30,7 @@
  *  Author: Thomas E. Dickey      1997-on                                   *
  ****************************************************************************/
 /*
- * $Id: ncurses_cfg.hin,v 1.10 2017/07/22 17:01:10 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.11 2017/12/09 20:41:54 tom Exp $
  *
  * Both ncurses_cfg.h and ncurses_def.h are internal header-files used when
  * building ncurses.
@@ -43,7 +43,7 @@
  *
  * See:
  *     http://invisible-island.net/autoconf/
- *     ftp://invisible-island.net/autoconf/
+ *     ftp://ftp.invisible-island.net/autoconf/
  */
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H

diff --git a/man/man_db.renames b/man/man_db.renames
index ad4b079f1371681e281f272090729d3beb92badc..652666c90e3c7d0e476e7907dcd54c7fd9e1edc5 100644 (file)
--- a/man/man_db.renames
+++ b/man/man_db.renames
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames,v 1.51 2017/04/21 23:57:09 tom Exp $
+# $Id: man_db.renames,v 1.52 2017/12/02 20:21:14 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -167,6 +167,7 @@ tic.1m                              tic.1
 toe.1m                         toe.1
 tput.1                         tput.1
 tset.1                         tset.1
+user_caps.5                    user_caps.5
 wresize.3x                     wresize.3ncurses
 #
 # Other:

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 73cbfff6bfbf2f684abfeded2cfb0f866a2aa1ce..476d384e3ef34f23ad99f26ca3e823d914eaf367 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.35 2015/04/22 00:54:19 tom Exp $
+# $Id: ncurses-config.in,v 1.36 2017/12/09 22:45:44 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2012,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-2015,2017 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -145,7 +145,13 @@ ENDECHO
                echo "${datadir}"
                ;;
        --includedir)
-               echo "${includedir}"
+               INCS=
+               if test "x@WITH_OVERWRITE@" = xno ; then
+                       INCS="${includesubdir}"
+               elif test "${includedir}" != /usr/include ; then
+                       INCS="${includedir}"
+               fi
+               echo $INCS
                ;;
        --libdir)
                echo "${libdir}"

diff --git a/mk-1st.awk b/mk-1st.awk
index 8e924331eca18843b31122b1fb71d3a3157fcf76..afa0c5ad5e988c706d54d5d4c2824233c1a242fc 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,4 +1,4 @@
-# $Id: mk-1st.awk,v 1.99 2016/12/31 17:04:34 tom Exp $
+# $Id: mk-1st.awk,v 1.100 2017/12/02 23:29:29 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -170,7 +170,7 @@ function removelinks(directory) {
                }
        }
 function make_shlib(objs, shlib_list) {
-               printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list
+               printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s)\n", objs, shlib_list
        }
 function sharedlinks(directory) {
                if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "msysdll" && ShlibVer != "mingw" ) {

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 643a53d47c6299c80d9a17f98bb1691331ecab4b..c7877bfcd863d325bc4292fa3c87cff8364cfc37 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.59 2017/11/25 23:05:56 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.60 2017/12/09 22:27:41 tom Exp $)
 #
 ##############################################################################
 # Copyright (c) 1998-2017,2017 Free Software Foundation, Inc.                #
@@ -242,6 +242,9 @@ $0 !~ /^P_/ {
                        break;
                }
        }
+       if (using == "implemented") {
+               printf "#undef %s\n", $myfunc;
+       }
        print $0;
        print "{";
        argcount = 1;
@@ -408,7 +411,7 @@ EOF1
 
 cat >$AW2 <<EOF1
 BEGIN          {
-               printf "/* This file was generated by $0 */\n"
+               printf "/* This file was generated by $0 $USE */\n"
                print ""
                print "/*"
                print " * DO NOT EDIT THIS FILE BY HAND!"

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 548173035dcc635ba1057f34b3bd517489f0ff03..b269df5dcc51b33ccf091bee2985a4445d97408e 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20171125) unstable; urgency=low
+ncurses6 (6.0+20171209) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 Nov 2017 15:12:11 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Dec 2017 07:37:54 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw/watch b/package/debian-mingw/watch
index 945a9962419fad8bf13c30c44341d3a5b7c8fc5b..f6b3987e0dda0f9475482632e30d660407138444 100644 (file)
--- a/package/debian-mingw/watch
+++ b/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
  debian  uupdate

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 548173035dcc635ba1057f34b3bd517489f0ff03..b269df5dcc51b33ccf091bee2985a4445d97408e 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20171125) unstable; urgency=low
+ncurses6 (6.0+20171209) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 Nov 2017 15:12:11 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Dec 2017 07:37:54 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/watch b/package/debian-mingw64/watch
index 945a9962419fad8bf13c30c44341d3a5b7c8fc5b..f6b3987e0dda0f9475482632e30d660407138444 100644 (file)
--- a/package/debian-mingw64/watch
+++ b/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
  debian  uupdate

diff --git a/package/debian/changelog b/package/debian/changelog
index cde1ffc8ae94d2613f8d7b85fe7e88d0dc05c5ec..9b6b01864c1cacc5a731077b90e9ae60286908d1 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20171125) unstable; urgency=low
+ncurses6 (6.0+20171209) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 Nov 2017 15:12:11 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Dec 2017 07:37:54 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/debian/watch b/package/debian/watch
index 945a9962419fad8bf13c30c44341d3a5b7c8fc5b..f6b3987e0dda0f9475482632e30d660407138444 100644 (file)
--- a/package/debian/watch
+++ b/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
  debian  uupdate

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 14e334b23ca3252054cd3c84269e2646f9101b69..76749d928d48d3c056cbc02c1b9dc47a4a61db62 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.241 2017/11/19 20:12:11 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.243 2017/12/09 12:38:04 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
-!define VERSION_MMDD  "1125"\r
+!define VERSION_MMDD  "1209"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 108e48cab11afb18a9cd6d9114b91a8bc2f84a2b..603e91a9d8d422fb82b8fe0fd9ceac493da6e2bc 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
-Release: 20171125
+Release: 20171209
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index b7d1786f7bdfd7b3e34d720b127e973fb2f5e7bc..54a0b6a25647706c4b769ced20172a0a00d82d9b 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
-Release: 20171125
+Release: 20171209
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index ef077ab23d21d06da85327b2dbfa4f8761945d47..f86cd8d16b3318c9fbf096c02e517720e4b60a26 100644 (file)
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_xcurses.c,v 1.13 2017/11/24 19:25:45 tom Exp $
+ * $Id: dots_xcurses.c,v 1.14 2017/12/09 21:04:41 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
@@ -245,7 +245,7 @@ main(int argc, char *argv[])
                napms(s_option);
            }
        }
-       wch[0] = p;
+       wch[0] = (wchar_t) p;
        addnwstr(wch, 1);
        refresh();
        ++total_chars;

diff --git a/test/key_names.c b/test/key_names.c
index f770edba4ade2d06fd194a528a9c68171bde5c23..074a1f0ab758ede729805e87bdc4e3f4e217c129 100644 (file)
--- a/test/key_names.c
+++ b/test/key_names.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: key_names.c,v 1.6 2017/09/29 09:16:42 tom Exp $
+ * $Id: key_names.c,v 1.7 2017/12/09 21:05:01 tom Exp $
  */
 
 #include <test.priv.h>
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
        endwin();
     }
     for (n = -1; n < KEY_MAX + 512; n++) {
-       int check = wcwidth(n);
+       int check = wcwidth((wchar_t) n);
        const char *result = check >= 0 ? key_name((wchar_t) n) : "?";
        if (result != 0)
            printf("%d(%5o):%s\n", n, n, result);

diff --git a/test/package/debian-mingw/watch b/test/package/debian-mingw/watch
index 1d080986dafe3eecf016ced98225ad1ddb4aafaf..ec075b189b0163f6536bc2b5bdbfda29eb0538fb 100644 (file)
--- a/test/package/debian-mingw/watch
+++ b/test/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate

diff --git a/test/package/debian-mingw64/watch b/test/package/debian-mingw64/watch
index 1d080986dafe3eecf016ced98225ad1ddb4aafaf..ec075b189b0163f6536bc2b5bdbfda29eb0538fb 100644 (file)
--- a/test/package/debian-mingw64/watch
+++ b/test/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate

diff --git a/test/package/debian/watch b/test/package/debian/watch
index 1d080986dafe3eecf016ced98225ad1ddb4aafaf..ec075b189b0163f6536bc2b5bdbfda29eb0538fb 100644 (file)
--- a/test/package/debian/watch
+++ b/test/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate

diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec
index a182c40c8de56f5b5790df41c1f25df180b9fe43..1918777aaf0f419a8f19707ef21657eed44e072e 100644 (file)
--- a/test/package/ncurses-examples.spec
+++ b/test/package/ncurses-examples.spec
@@ -2,13 +2,13 @@ Summary: ncurses-examples - example/test programs from ncurses
 %define AppProgram ncurses-examples
 %define AppVersion 6.0
 %define AppRelease 20171111
-# $Id: ncurses-examples.spec,v 1.7 2017/11/11 15:21:19 tom Exp $
+# $Id: ncurses-examples.spec,v 1.8 2017/12/09 20:41:16 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: MIT
 Group: Applications/Development
-URL: ftp://invisible-island.net/%{AppProgram}
+URL: ftp://ftp.invisible-island.net/%{AppProgram}
 Source0: %{AppProgram}-%{AppRelease}.tgz
 Packager: Thomas Dickey <dickey@invisible-island.net>