[gentoo-commits] gentoo-x86 commit in app-shells/bash: bash-4.1_p2.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      10/02/04 00:46:28

  Modified:             bash-4.1_p2.ebuild ChangeLog
  Log:
  Move USE=bashlogger from custom patch to supported define #303333 by cosmih.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-shells/bash/bash-4.1_p2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-4.1_p2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-4.1_p2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-4.1_p2.ebuild?r1=1.1&r2=1.2

Index: bash-4.1_p2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-4.1_p2.ebuild	21 Jan 2010 05:43:22 -0000	1.1
+++ bash-4.1_p2.ebuild	4 Feb 2010 00:46:27 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p2.ebuild,v 1.1 2010/01/21 05:43:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p2.ebuild,v 1.2 2010/02/04 00:46:27 vapier Exp $
 
 EAPI="1"
 
@@ -54,6 +54,10 @@
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
 }
 
 src_unpack() {
@@ -68,14 +72,6 @@
 
 	if ! use vanilla ; then
 		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-		# Log bash commands to syslog #91327
-		if use bashlogger ; then
-			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-			ewarn "This will log ALL output you enter into the shell, you have been warned."
-			ebeep
-			epause
-			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
-		fi
 		epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
 	fi
 }
@@ -91,7 +87,8 @@
 		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
 		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
 		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
 	# Always use the buildin readline, else if we update readline
 	# bash gets borked as readline is usually not binary compadible



1.246                app-shells/bash/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.246&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.246&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?r1=1.245&r2=1.246

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- ChangeLog	21 Jan 2010 05:43:22 -0000	1.245
+++ ChangeLog	4 Feb 2010 00:46:27 -0000	1.246
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.245 2010/01/21 05:43:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.246 2010/02/04 00:46:27 vapier Exp $
+
+  04 Feb 2010; Mike Frysinger <vapier@g.o> bash-4.1_p2.ebuild:
+  Move USE=bashlogger from custom patch to supported define #303333 by
+  cosmih.
 
 *bash-4.1_p2 (21 Jan 2010)
 *bash-4.0_p37 (21 Jan 2010)