From: Michael Tremer Date: Tue, 3 Feb 2015 19:54:51 +0000 (-0500) Subject: readline: Update to version 6.3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5a8b321bd51bd66e58228bc335d96458b423cf;p=people%2Famarx%2Fipfire-3.x.git readline: Update to version 6.3 --- diff --git a/readline/patches/readline-6.1-audit.patch b/readline/patches/readline-6.1-audit.patch deleted file mode 100644 index 38f8adfac..000000000 --- a/readline/patches/readline-6.1-audit.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -up readline-6.1/config.h.in.audit readline-6.1/config.h.in ---- readline-6.1/config.h.in.audit 2009-03-10 15:57:45.000000000 +0100 -+++ readline-6.1/config.h.in 2011-01-18 15:14:51.199219895 +0100 -@@ -29,6 +29,9 @@ - - #undef __CHAR_UNSIGNED__ - -+/* Define if you have and it defines AUDIT_USER_TTY */ -+#undef HAVE_DECL_AUDIT_USER_TTY -+ - /* Define if the `S_IS*' macros in do not work properly. */ - #undef STAT_MACROS_BROKEN - -diff -up readline-6.1/configure.audit readline-6.1/configure ---- readline-6.1/configure.audit 2009-12-29 23:33:49.000000000 +0100 -+++ readline-6.1/configure 2011-01-18 15:21:20.571330373 +0100 -@@ -6602,7 +6602,9 @@ _ACEOF - - fi - -- -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_AUDIT_USER_TTY 1 -+_ACEOF - - { $as_echo "$as_me:$LINENO: checking if signal handlers must be reinstalled when invoked" >&5 - $as_echo_n "checking if signal handlers must be reinstalled when invoked... " >&6; } -diff -up readline-6.1/configure.in.audit readline-6.1/configure.in ---- readline-6.1/configure.in.audit 2009-10-12 16:12:15.000000000 +0200 -+++ readline-6.1/configure.in 2011-01-18 15:14:51.199219895 +0100 -@@ -159,6 +159,8 @@ AC_CHECK_HEADERS(sys/ptem.h,,, - - AC_SYS_LARGEFILE - -+AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include ]]) -+ - BASH_SYS_SIGNAL_VINTAGE - BASH_SYS_REINSTALL_SIGHANDLERS - -diff -up readline-6.1/readline.c.audit readline-6.1/readline.c ---- readline-6.1/readline.c.audit 2009-08-31 14:45:31.000000000 +0200 -+++ readline-6.1/readline.c 2011-01-18 15:14:51.200219841 +0100 -@@ -55,6 +55,12 @@ - extern int errno; - #endif /* !errno */ - -+#if defined (HAVE_DECL_AUDIT_USER_TTY) -+# include -+# include -+# include -+#endif -+ - /* System-specific feature definitions and include files. */ - #include "rldefs.h" - #include "rlmbutil.h" -@@ -301,7 +307,47 @@ rl_set_prompt (prompt) - rl_visible_prompt_length = rl_expand_prompt (rl_prompt); - return 0; - } -- -+ -+#if defined (HAVE_DECL_AUDIT_USER_TTY) -+/* Report STRING to the audit system. */ -+static void -+audit_tty (char *string) -+{ -+ struct sockaddr_nl addr; -+ struct msghdr msg; -+ struct nlmsghdr nlm; -+ struct iovec iov[2]; -+ size_t size; -+ int fd; -+ -+ size = strlen (string) + 1; -+ fd = socket (AF_NETLINK, SOCK_RAW, NETLINK_AUDIT); -+ if (fd < 0) -+ return; -+ nlm.nlmsg_len = NLMSG_LENGTH (size); -+ nlm.nlmsg_type = AUDIT_USER_TTY; -+ nlm.nlmsg_flags = NLM_F_REQUEST; -+ nlm.nlmsg_seq = 0; -+ nlm.nlmsg_pid = 0; -+ iov[0].iov_base = &nlm; -+ iov[0].iov_len = sizeof (nlm); -+ iov[1].iov_base = string; -+ iov[1].iov_len = size; -+ addr.nl_family = AF_NETLINK; -+ addr.nl_pid = 0; -+ addr.nl_groups = 0; -+ msg.msg_name = &addr; -+ msg.msg_namelen = sizeof (addr); -+ msg.msg_iov = iov; -+ msg.msg_iovlen = 2; -+ msg.msg_control = NULL; -+ msg.msg_controllen = 0; -+ msg.msg_flags = 0; -+ (void)sendmsg (fd, &msg, 0); -+ close (fd); -+} -+#endif -+ - /* Read a line of input. Prompt with PROMPT. An empty PROMPT means - none. A return value of NULL means that EOF was encountered. */ - char * -@@ -352,6 +398,11 @@ readline (prompt) - RL_SETSTATE (RL_STATE_CALLBACK); - #endif - -+#if defined (HAVE_DECL_AUDIT_USER_TTY) -+ if (value != NULL) -+ audit_tty (value); -+#endif -+ - return (value); - } - diff --git a/readline/patches/readline-6.2-shlib.patch b/readline/patches/readline-6.2-shlib.patch deleted file mode 100644 index 914b2602c..000000000 --- a/readline/patches/readline-6.2-shlib.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in ---- readline-6.2/shlib/Makefile.in.shlib 2010-12-28 21:56:21.000000000 +0100 -+++ readline-6.2/shlib/Makefile.in 2011-02-14 17:34:38.821537496 +0100 -@@ -170,7 +170,7 @@ $(SHARED_READLINE): $(SHARED_OBJ) - - $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so - $(RM) $@ -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS) -+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so - - # Since tilde.c is shared between readline and bash, make sure we compile - # it with the right flags when it's built as part of readline -diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-install ---- readline-6.2/support/shlib-install.shlib 2009-10-28 14:30:18.000000000 +0100 -+++ readline-6.2/support/shlib-install 2011-02-14 17:33:07.611768164 +0100 -@@ -72,7 +72,7 @@ fi - case "$host_os" in - hpux*|darwin*|macosx*|linux*) - if [ -z "$uninstall" ]; then -- chmod 555 ${INSTALLDIR}/${LIBNAME} -+ chmod 755 ${INSTALLDIR}/${LIBNAME} - fi ;; - cygwin*|mingw*) - IMPLIBNAME=`echo ${LIBNAME} \ -diff -up readline-6.2/support/shobj-conf.shlib readline-6.2/support/shobj-conf ---- readline-6.2/support/shobj-conf.shlib 2009-10-28 14:20:21.000000000 +0100 -+++ readline-6.2/support/shobj-conf 2011-02-14 17:33:07.612767986 +0100 -@@ -112,10 +112,11 @@ sunos5*|solaris2*) - linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' -- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -+ SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@' - -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' -+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -+ SHLIB_LIBS='-ltinfo' - ;; - - freebsd2*) diff --git a/readline/readline.nm b/readline/readline.nm index 4b8c226bd..70f40cd72 100644 --- a/readline/readline.nm +++ b/readline/readline.nm @@ -4,8 +4,8 @@ ############################################################################### name = readline -version = 6.2 -release = 6 +version = 6.3 +release = 1 groups = System/Libraries url = ftp://ftp.gnu.org/gnu/readline/