summaryrefslogtreecommitdiff
path: root/dev-tcltk/expect/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
commit1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch)
treee48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-tcltk/expect/files
parentd87262dd706fec50cd150aab3e93883b6337466d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-tcltk/expect/files')
-rw-r--r--dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch13
-rw-r--r--dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch13
-rw-r--r--dev-tcltk/expect/files/expect-5.45-format-security.patch18
-rw-r--r--dev-tcltk/expect/files/expect-5.45-gfbsd.patch26
-rw-r--r--dev-tcltk/expect/files/expect-5.45-headers.patch92
5 files changed, 0 insertions, 162 deletions
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch b/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch
deleted file mode 100644
index be3641c2105c..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index cc2c79b..1083eaf 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -148,7 +148,7 @@ OBJEXT = @OBJEXT@
- RANLIB = @RANLIB@
- RANLIB_STUB = @RANLIB_STUB@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
--SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS)
- SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
- STLIB_LD = @STLIB_LD@
- TCL_DEFS = @TCL_DEFS@
diff --git a/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch b/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch
deleted file mode 100644
index f5470aadb88e..000000000000
--- a/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Add install_name (soname)
-
---- tclconfig/tcl.m4
-+++ tclconfig/tcl.m4
-@@ -1703,7 +1703,7 @@
- ])
- # TEA specific: link shlib with current and compatiblity version flags
- vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
-- SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
-+ SHLIB_LD="${SHLIB_LD} -install_name \$(pkglibdir)/\$(PKG_LIB_FILE) -current_version ${vers:-0} -compatibility_version ${vers:-0}"
- SHLIB_SUFFIX=".dylib"
- # Don't use -prebind when building for Mac OS X 10.4 or later only:
- AS_IF([test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \
diff --git a/dev-tcltk/expect/files/expect-5.45-format-security.patch b/dev-tcltk/expect/files/expect-5.45-format-security.patch
deleted file mode 100644
index c623264be27a..000000000000
--- a/dev-tcltk/expect/files/expect-5.45-format-security.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- exp_clib.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/exp_clib.c b/exp_clib.c
-index 172c05e..c86dda4 100644
---- a/exp_clib.c
-+++ b/exp_clib.c
-@@ -1476,8 +1476,8 @@ expDiagLogU(str)
- char *str;
- {
- if (exp_is_debugging) {
-- fprintf(stderr,str);
-- if (exp_logfile) fprintf(exp_logfile,str);
-+ fprintf(stderr,"%s", str);
-+ if (exp_logfile) fprintf(exp_logfile,"%s", str);
- }
- }
-
diff --git a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
deleted file mode 100644
index 5ae9c26adb88..000000000000
--- a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/tclconfig/tcl.m4
-+++ b/tclconfig/tcl.m4
-@@ -1634,20 +1634,15 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
- SHLIB_SUFFIX=".so"
-- LDFLAGS=""
-+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- AS_IF([test $doRpath = yes], [
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
-+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- AS_IF([test "${TCL_THREADS}" = "1"], [
- # The -pthread needs to go in the LDFLAGS, not LIBS
- LIBS=`echo $LIBS | sed s/-pthread//`
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
-- # Version numbers are dot-stripped by system policy.
-- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-- TCL_LIB_VERSIONS_OK=nodots
- ;;
- Darwin-*)
- CFLAGS_OPTIMIZE="-Os"
diff --git a/dev-tcltk/expect/files/expect-5.45-headers.patch b/dev-tcltk/expect/files/expect-5.45-headers.patch
deleted file mode 100644
index 98330211b328..000000000000
--- a/dev-tcltk/expect/files/expect-5.45-headers.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
---- a/configure.in
-+++ b/configure.in
-@@ -133,6 +133,8 @@ AC_CHECK_HEADER(sys/fcntl.h, AC_DEFINE(HAVE_SYS_FCNTL_H))
- AC_CHECK_HEADER(sys/ptem.h, AC_DEFINE(HAVE_SYS_PTEM_H))
- AC_CHECK_HEADER(sys/strredir.h, AC_DEFINE(HAVE_STRREDIR_H))
- AC_CHECK_HEADER(sys/strpty.h, AC_DEFINE(HAVE_STRPTY_H))
-+AC_CHECK_HEADER(pty.h, AC_DEFINE(HAVE_PTY_H))
-+AC_CHECK_HEADER(libutil.h, AC_DEFINE(HAVE_LIBUTIL_H))
-
- AC_MSG_CHECKING([for sys/bsdtypes.h])
- if test "ISC_${ISC}" = "ISC_1" ; then
---- a/exp_clib.c
-+++ b/exp_clib.c
-@@ -15,6 +15,12 @@
- #endif
- #include <sys/types.h>
- #include <sys/ioctl.h>
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
-+#ifdef HAVE_SYS_WAIT_H
-+#include <sys/wait.h>
-+#endif
-
- #ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
---- a/exp_trap.c
-+++ b/exp_trap.c
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <sys/types.h>
-+#include <string.h>
-
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
---- a/pty_termios.c
-+++ b/pty_termios.c
-@@ -9,6 +9,14 @@
-
- #include <stdio.h>
- #include <signal.h>
-+#include <string.h>
-+#ifdef HAVE_PTY_H
-+#include <pty.h>
-+#endif
-+#ifdef HAVE_LIBUTIL_H
-+#include <sys/types.h>
-+#include <libutil.h>
-+#endif
-
- #if defined(SIGCLD) && !defined(SIGCHLD)
- #define SIGCHLD SIGCLD
-@@ -100,6 +100,7 @@
-
- #include "exp_tty_in.h"
- #include "exp_rename.h"
-+#include "exp_int.h"
- #include "exp_pty.h"
-
- void expDiagLog();
---- a/exp_chan.c
-+++ b/exp_chan.c
-@@ -34,6 +34,7 @@
- #include "exp_rename.h"
- #include "exp_prog.h"
- #include "exp_command.h"
-+#include "exp_event.h"
- #include "exp_log.h"
- #include "tcldbg.h" /* Dbg_StdinMode */
-
---- a/exp_clib.c
-+++ b/exp_clib.c
-@@ -1955,6 +1955,7 @@
-
- #include "expect.h"
- #include "exp_int.h"
-+EXTERN void exp_init_tty _ANSI_ARGS_((void));
-
- /* exp_glob.c - expect functions for doing glob
- *
---- a/exp_tty.h
-+++ b/exp_tty.h
-@@ -17,6 +17,7 @@
-
- void exp_tty_raw(int set);
- void exp_tty_echo(int set);
-+int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
- void exp_tty_break(Tcl_Interp *interp, int fd);
- int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
- int exp_israw(void);