Accepting request 126183 from Base:System
license update: GPL-3.0+ Upstream declares the bash license to be GPL-3.0+ - not GPL-2.0+ (forwarded request 126173 from babelworx) OBS-URL: https://build.opensuse.org/request/show/126183 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=97
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
2d9392c328
107
audit-patch
Normal file
107
audit-patch
Normal file
@ -0,0 +1,107 @@
|
||||
diff -up bash-4.0/config.h.in.audit bash-4.0/config.h.in
|
||||
--- bash-4.0/config.h.in.audit 2009-01-21 11:34:34.000000000 -0500
|
||||
+++ bash-4.0/config.h.in 2009-01-21 11:34:35.000000000 -0500
|
||||
@@ -1077,6 +1077,14 @@
|
||||
|
||||
/* End additions for lib/intl */
|
||||
|
||||
+
|
||||
+/* Additions for lib/readline */
|
||||
+
|
||||
+/* Define if you have <linux/audit.h> and it defines AUDIT_USER_TTY */
|
||||
+#undef HAVE_DECL_AUDIT_USER_TTY
|
||||
+
|
||||
+/* End additions for lib/readline */
|
||||
+
|
||||
#include "config-bot.h"
|
||||
|
||||
#endif /* _CONFIG_H_ */
|
||||
diff -up bash-4.0/configure.in.audit bash-4.0/configure.in
|
||||
--- bash-4.0/configure.in.audit 2009-01-21 11:34:34.000000000 -0500
|
||||
+++ bash-4.0/configure.in 2009-01-21 11:34:35.000000000 -0500
|
||||
@@ -875,6 +875,8 @@ BASH_FUNC_DUP2_CLOEXEC_CHECK
|
||||
BASH_SYS_PGRP_SYNC
|
||||
BASH_SYS_SIGNAL_VINTAGE
|
||||
|
||||
+AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]])
|
||||
+
|
||||
dnl checking for the presence of certain library symbols
|
||||
BASH_SYS_ERRLIST
|
||||
BASH_SYS_SIGLIST
|
||||
diff -up bash-4.0/lib/readline/readline.c.audit bash-4.0/lib/readline/readline.c
|
||||
--- bash-4.0/lib/readline/readline.c.audit 2009-01-21 11:34:34.000000000 -0500
|
||||
+++ bash-4.0/lib/readline/readline.c 2009-01-21 11:40:12.000000000 -0500
|
||||
@@ -55,6 +55,12 @@
|
||||
extern int errno;
|
||||
#endif /* !errno */
|
||||
|
||||
+#if defined (HAVE_DECL_AUDIT_USER_TTY)
|
||||
+# include <sys/socket.h>
|
||||
+# include <linux/audit.h>
|
||||
+# include <linux/netlink.h>
|
||||
+#endif
|
||||
+
|
||||
/* System-specific feature definitions and include files. */
|
||||
#include "rldefs.h"
|
||||
#include "rlmbutil.h"
|
||||
@@ -297,7 +303,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 *
|
||||
@@ -348,6 +394,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);
|
||||
}
|
||||
|
||||
17
bash.changes
17
bash.changes
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 26 12:49:53 UTC 2012 - cfarrell@suse.com
|
||||
|
||||
- license update: GPL-3.0+
|
||||
Upstream declares the bash license to be GPL-3.0+ - not GPL-2.0+
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 11 11:51:12 UTC 2012 - werner@suse.de
|
||||
|
||||
- Enable auditing patch by simply applying it
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 23 23:37:53 UTC 2012 - meissner@suse.com
|
||||
|
||||
- added auditing patch from
|
||||
http://git.savannah.gnu.org/cgit/bash.git/plain/CWRU/audit-patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 5 11:48:02 UTC 2012 - werner@suse.de
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
|
||||
|
||||
Name: bash
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: bison
|
||||
BuildRequires: ncurses-devel
|
||||
@ -37,7 +38,7 @@ Recommends: bash-doc = %bash_vers
|
||||
Version: 4.2
|
||||
Release: 0
|
||||
Summary: The GNU Bourne-Again Shell
|
||||
License: GPL-2.0+
|
||||
License: GPL-3.0+
|
||||
Group: System/Shells
|
||||
Url: http://www.gnu.org/software/bash/bash.html
|
||||
# Git: http://git.savannah.gnu.org/cgit/bash.git
|
||||
@ -81,6 +82,7 @@ Patch24: readline-6.2-metamode.patch
|
||||
Patch25: readline-6.2-endpw.dif
|
||||
Patch30: readline-6.2-destdir.patch
|
||||
Patch40: bash-4.1-bash.bashrc.dif
|
||||
Patch42: audit-patch
|
||||
Patch46: man2html-no-timestamp.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global _sysconfdir /etc
|
||||
@ -287,6 +289,7 @@ unset p
|
||||
%patch24 -p0 -b .metamode
|
||||
#%patch25 -p0 -b .endpw
|
||||
%patch40 -p0 -b .bashrc
|
||||
%patch42 -p1 -b .audit
|
||||
%patch46 -p0 -b .notimestamp
|
||||
%patch0 -p0 -b .0
|
||||
pushd ../readline-%{rl_vers}%{extend}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user