pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
tcl-expect is updated to expect5.45.4 see COMMIT_MSG.
Module Name: pkgsrc-wip
Committed By: Boyd Lynn Gerber <gerberb%zenez.com@localhost>
Pushed By: gerberb
Date: Fri Jun 17 12:30:59 2022 -0600
Changeset: 7fb74c19330e6df48112cc577709cba18e2107e5
Modified Files:
tcl-expect/DESCR
tcl-expect/distinfo
tcl-expect/patches/patch-Makefile.in
tcl-expect/patches/patch-configure
tcl-expect/patches/patch-tclconfig_tcl.m4
Added Files:
tcl-expect/COMMIT_MSG
Log Message:
tcl-expect is updated to expect5.45.4 see COMMIT_MSG.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7fb74c19330e6df48112cc577709cba18e2107e5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
tcl-expect/COMMIT_MSG | 59 +++++++++++++++++++++++++++++
tcl-expect/DESCR | 2 +
tcl-expect/distinfo | 6 +--
tcl-expect/patches/patch-Makefile.in | 6 ++-
tcl-expect/patches/patch-configure | 62 ++++++++++++++++++++++++-------
tcl-expect/patches/patch-tclconfig_tcl.m4 | 24 +++---------
6 files changed, 122 insertions(+), 37 deletions(-)
diffs:
diff --git a/tcl-expect/COMMIT_MSG b/tcl-expect/COMMIT_MSG
new file mode 100644
index 0000000000..d109b0e9f8
--- /dev/null
+++ b/tcl-expect/COMMIT_MSG
@@ -0,0 +1,59 @@
+Update tcl-expect to expect5.45.4 from expect5.45.0
+
+Expect is a tool for automating interactive applications such as telnet, ftp, passwd,
+fsck, rlogin, tip, etc. Expect really makes this stuff trivial. Expect is also useful
+for testing these same applications.
+
+See: https://core.tcl-lang.org/expect/index
+
+Note: Many of the links on the above do not work.
+
+There is a bug tracker:
+
+ https://core.tcl-lang.org/expect/rptview?rn=1
+
+Emails were sent to them but on notes were added to the bug tracking system, no
+activity on fixing bugs is reported since the release.
+
+Open issues
+3d63349f14 2019-03-29 18:12:38 Code_Defect Open
+
+1bf384f309 2019-07-12 15:48:24 Code_Defect Open CONST84 macro in tcl is deprecated.
+
+2c0992205c 2019-10-13 22:08:43 Code_Defect Open overlay command doesn't work as documented
+
+7a6a0da886 2020-04-08 11:53:25 Incident Open Not picking up variable values when running remote bash script with for loop
+
+ee5c5aad7d 2020-11-30 19:47:01 Code_Defect Open interact does not work under expect -c
+
+0d5b33c00e 2020-12-05 19:20:05 Build_Problem Open build issues with Xcode 12
+
+094d670f62 2022-04-19 21:52:02 Code_Defect Open -Werror=format-security failures with building expect 5.45.4
+
+be7d99dcc2 2022-06-16 15:05:31 Code_Defect Open core dump while generating glob-gate for expanded syntax with trailing whitespace
+
+
+patch-Makefile.in from expect5.45.0 needed to be modified to define a @SHLIB_VERSION@.
+
+Rather than teaching PLIST about .@SHLIB_VERSION@ in which many said "felt wrong"
+a patch-Makefile.in has .1.0 hard-coded instead of the previous .@SHLIB_VERSION@.
+
+In patch-configure:
+
+We are patching configure and not generarting it.
+
+The patches to add MirBSD and DragonFly are not in upstream. They don't appear
+to have not been applied upstream...
+
+patch-tclconfig_tcl.m4
+
+Added support for UnixWare/svr5 to tclconfig/tcl.m4
+
+SCO OpenServer 5 needs linking done with gcc, gcc is use to link because there is
+no gnu ld. The native compiler uses ld which comes with OS and doesn't work with
+gcc.
+
+patch-retoglob.c
+
+SVR5/UnixWare has a name space clash
+
diff --git a/tcl-expect/DESCR b/tcl-expect/DESCR
index ed772c3264..49953da8d4 100644
--- a/tcl-expect/DESCR
+++ b/tcl-expect/DESCR
@@ -3,3 +3,5 @@ interactive programs. It is briefly described by its man page, expect(1).
It uses pseudo-tty's to control the child processes, so it is not affected
by programs that refuse to read from stdin or pipes. (eg: passwd(1) etc).
+
+"This program is not maintained upstream."
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index 6d21dc9f07..7531146e8b 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.22 2021/10/26 10:51:57 nia Exp $
BLAKE2s (expect5.45.4.tar.gz) = 41310882c3658679f60911aca1a3cf9c353784f164410abf919ce7adefdc73e0
SHA512 (expect5.45.4.tar.gz) = a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
Size (expect5.45.4.tar.gz) = 632363 bytes
-SHA1 (patch-Makefile.in) = 7e6841ed49bd6242442a491b8228afbd93f8a6bb
-SHA1 (patch-configure) = 8478bbe10fc35718cd9a4b76757f8500c38b0ffe
+SHA1 (patch-Makefile.in) = 1efb1bdd0d3a80a8ad2d66aaf1a6b0a344df9c3d
+SHA1 (patch-configure) = be1c1ca1d274c824077988a67005050e4814354f
SHA1 (patch-retoglob.c) = 4406f9e5d7622f393e35e7a1f70a700a98d6e981
-SHA1 (patch-tclconfig_tcl.m4) = 45d1f405ca1b506c0a0fe60492b13ada111fa813
+SHA1 (patch-tclconfig_tcl.m4) = 8da471800dcc5f110858dd0af36ad5e924232976
diff --git a/tcl-expect/patches/patch-Makefile.in b/tcl-expect/patches/patch-Makefile.in
index 10e8cd5ccc..3d3f940ed2 100644
--- a/tcl-expect/patches/patch-Makefile.in
+++ b/tcl-expect/patches/patch-Makefile.in
@@ -4,7 +4,8 @@ $NetBSD: patch-Makefile.in,v 1.4 2018/08/27 07:12:08 wiz Exp $
comment included "no libtool", but there is no hint of libtool
upstream and this patch does not remove it.)
-Define SHLIB_VERSION, mysteriously.
+Define SHLIB_VERSION, Complaints about teaching PLIST about using SHLIB_VERSION
+required it to be defined.
Add a variable for a static library version, build and install it.
@@ -14,7 +15,8 @@ Include LDFLAGS when linking (for RELRO).
Version the shlib and the expect binary.
-\todo Push changes upstream, or explain why that's not appropriate.
+Changes were sent upstream by email but were never added to the bug tracking system,
+No activity since the release.
--- Makefile.in.orig 2018-02-02 12:15:52.000000000 -0700
+++ Makefile.in 2022-06-09 06:35:29.261652426 -0600
diff --git a/tcl-expect/patches/patch-configure b/tcl-expect/patches/patch-configure
index 6cfef13164..84267a1b65 100644
--- a/tcl-expect/patches/patch-configure
+++ b/tcl-expect/patches/patch-configure
@@ -4,27 +4,50 @@ $NetBSD$
comment included "no libtool", but there is no hint of libtool
upstream and this patch does not remove it.)
-Add support for MirBSD as OpenBSD and DragonFly as FreeBSD.
-
Upstream has support to use the version with or without dots as the
shlib suffix. This patch forces that to be the "NODOTS" flavor
always, perhaps for PLIST consistency.
-\todo Expain why PVNODOTS isn't the PACKAGE_VERSION_NO_DOTS that
-upstream configure already computes.
+PVNODOTS isn't the PACKAGE_VERSION_NO_DOTS that upstream configure already computes.
-\todo Push changes upstream, or explain why that's not appropriate.
+The bug tracking system has no activity on fixing bugs reported since the release.
Add support for SVR5 and OpenServer 5. Sent upstream by email
September 2019.
--- configure.orig 2018-02-04 03:43:58.000000000 +0000
+++ configure 2022-06-08 07:03:02.940051201 -0600
-@@ -6941,6 +6941,52 @@
+@@ -6480,7 +6480,8 @@
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ fi
+ ;;
+- OpenBSD-*)
++ OpenBSD-*|MirBSD-*)
++ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+ SHLIB_SUFFIX=".so"
+@@ -6563,11 +6564,11 @@
+ ;;
+ esac
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+- TCL_SHLIB_LD_EXTRAS="-soname \$@"
++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
+ SHLIB_SUFFIX=".so"
+ LDFLAGS=""
+ if test $doRpath = yes; then :
+@@ -6941,6 +6942,54 @@
LD_SEARCH_FLAGS=""
;;
SCO_SV-3.2*)
+ # SCO UNIX/OpenServer 5 gcc use -melf for full feature ELF binanaries.
++ # gcc is use to link there is no gnu ld.
++ # native compiler uses ld which comes with OS
+if test "$GCC" = yes; then :
+
+ SHLIB_CFLAGS="-fPIC -melf"
@@ -73,7 +96,18 @@ September 2019.
if test "$GCC" = yes; then :
SHLIB_CFLAGS="-fPIC -melf"
-@@ -9597,14 +9643,9 @@
+@@ -7150,9 +7199,9 @@
+ BSD/OS*) ;;
+ CYGWIN_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
+ *) SHLIB_CFLAGS="-fPIC" ;;
+ esac
+@@ -9597,14 +9647,9 @@
PACKAGE_VERSION_NODOTS="`echo $PACKAGE_VERSION | sed -e 's/\.//g'`"
@@ -83,14 +117,14 @@ September 2019.
- EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
-fi
-if test $iunix -eq 1 ; then
-+# taken from the pervious pkgsrc tcl-expect
++# pkgsrc tcl-expect additions from 2012 added.
+
EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
-fi
# also remove dots on systems that don't support filenames > 14
# (are there systems which support shared libs and restrict filename lengths!?)
-@@ -9659,11 +9700,8 @@
+@@ -9659,11 +9704,8 @@
$as_echo "#define EXP_FRAMEWORK 1" >>confdefs.h
else
@@ -99,27 +133,27 @@ September 2019.
- else
- EXP_LIB_FLAG="-lexpect`echo ${EXP_LIB_VERSION} | tr -d .`"
- fi
-+# taken from the previous tcl-expect
++# pkgsrc tcl-expect additions from 2012 added.
+ EXP_LIB_FLAG="-lexpect`echo ${EXP_LIB_VERSION} | tr -d .`"
EXP_BUILD_LIB_SPEC="-L`pwd` ${EXP_LIB_FLAG}"
EXP_LIB_SPEC="-L${libdir} ${EXP_LIB_FLAG}"
fi
-@@ -9965,6 +10003,10 @@
+@@ -9965,6 +10007,10 @@
# substituted. (@@@ Might not be necessary anymore)
#--------------------------------------------------------------------
-+ # taken from the previous pkgsrc tcl-expect
++ # pkgsrc tcl-expect additions from 2012 added.
+ PVNODOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+ SHARED_LIB_SUFFIX=${PVNODOTS}.so
+ UNSHARED_LIB_SUFFIX=${PVNODOTS}.a
if test "${TEA_PLATFORM}" = "windows" ; then
if test "${SHARED_BUILD}" = "1" ; then
# We force the unresolved linking of symbols that are really in
-@@ -10711,6 +10753,11 @@
+@@ -10711,6 +10757,11 @@
case $ac_option in
# Handling of the options.
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ # taken from the previous pkgsrc tcl-expect
++ # pkgsrc tcl-expect additions from 2012 added.
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
diff --git a/tcl-expect/patches/patch-tclconfig_tcl.m4 b/tcl-expect/patches/patch-tclconfig_tcl.m4
index 750de32f59..983b1e71e5 100644
--- a/tcl-expect/patches/patch-tclconfig_tcl.m4
+++ b/tcl-expect/patches/patch-tclconfig_tcl.m4
@@ -7,11 +7,14 @@ $NetBSD$
--- tclconfig/tcl.m4.orig 2018-02-04 06:55:43.000000000 +0000
+++ tclconfig/tcl.m4 2022-06-07 08:37:43.412809932 -0600
-@@ -1814,19 +1814,47 @@
+@@ -1814,19 +1814,50 @@
LD_SEARCH_FLAGS=""
;;
SCO_SV-3.2*)
+ # fix SCO OpenServer 5 linking with gcc
++ # gcc is use to link, there is no gnu ld.
++ # native compiler uses ld which comes with OS
++
AS_IF([test "$GCC" = yes], [
SHLIB_CFLAGS="-fPIC -melf"
LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
@@ -56,7 +59,7 @@ $NetBSD$
SunOS-5.[[0-6]])
# Careful to not let 5.10+ fall into this case
-@@ -1961,6 +1989,7 @@
+@@ -1961,6 +1992,7 @@
# If we're running gcc, then change the C flags for compiling shared
# libraries to the right flags for gcc, instead of those for the
# standard manufacturer compiler.
@@ -64,7 +67,7 @@ $NetBSD$
AS_IF([test "$GCC" = yes], [
case $system in
-@@ -1971,6 +2000,7 @@
+@@ -1971,6 +2003,7 @@
NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
Darwin-*) ;;
SCO_SV-3.2*) ;;
@@ -72,18 +75,3 @@ $NetBSD$
windows) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
esac])
- AS_IF([test "$GCC" = yes], [
- SHLIB_CFLAGS="-fPIC -melf"
- LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
-+ SHLIB_LD="gcc"
- ], [
- SHLIB_CFLAGS="-Kpic -belf"
- LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
-- ])
- SHLIB_LD="ld -G"
-+ ])
- SHLIB_LD_LIBS=""
- SHLIB_SUFFIX=".so"
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
Home |
Main Index |
Thread Index |
Old Index