diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-02-04 00:46:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-02-04 00:46:27 +0000 |
| commit | 09a799180a7402ce9470152b1ad783eca6e4729a (patch) | |
| tree | 6780665c1494933c2d348204379705adcd2d7f87 /app-shells | |
| parent | Stable for HPPA (bug #301259). (diff) | |
| download | historical-09a799180a7402ce9470152b1ad783eca6e4729a.tar.gz historical-09a799180a7402ce9470152b1ad783eca6e4729a.tar.bz2 historical-09a799180a7402ce9470152b1ad783eca6e4729a.zip | |
Move USE=bashlogger from custom patch to supported define #303333 by cosmih.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/bash/Manifest | 10 | ||||
| -rw-r--r-- | app-shells/bash/bash-4.1_p2.ebuild | 17 |
3 files changed, 17 insertions, 16 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index f30070c5475c..4de861e8bcae 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -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@gentoo.org> 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) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index c3c99c13f873..642ce43bcbbe 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -143,13 +143,13 @@ EBUILD bash-3.1_p17.ebuild 4643 RMD160 46f3d1fe569cc0b5f23cb3f1c06244caf090fbd6 EBUILD bash-3.2_p50.ebuild 6146 RMD160 13f3957af7bc8763d431846802dfcdd8455f14cf SHA1 283ec5975998e5cf7128a9a0e889d6f54d506922 SHA256 703287cd42028c99c5a4f610042732f9af27a971d5728878fba12f8a25020515 EBUILD bash-4.0_p35.ebuild 5784 RMD160 0d3f12c317794f751da33ab6e51926aafde10694 SHA1 120e55091bc67363214967fbf02fcb373905aef7 SHA256 be228bea883c3b952851959f27f206777bfe571a575ee3b6202f9db5b4517ac8 EBUILD bash-4.0_p37.ebuild 5793 RMD160 f85841f1042b14820632491fbb6fc6c2724910e7 SHA1 395469b960072db40dd671dedb1a1a7142372a7b SHA256 e52487614d05c9bca31e9d3c4ed5e94ed504c33bf4451d8c617d8f302bd48e47 -EBUILD bash-4.1_p2.ebuild 5559 RMD160 e3ccac09309081edc10ede0734e300f221a7b518 SHA1 339109f747194a51b7a8a732367a53120a1cb6b1 SHA256 14454a2aeab210ca568e6b35416a2cbca0956534c400024bc151ae3ae93169c6 -MISC ChangeLog 39024 RMD160 8e2644a10d2b71a2f426a982edfcf64187e22a3e SHA1 09a322f85df45d0d9867b9fe79bd97e7d412902c SHA256 82ceb3a092db2c73bf7125505c6b95d869b7c77691a092d1d50fe842b10290ce +EBUILD bash-4.1_p2.ebuild 5492 RMD160 9b7a330b2a5898491c157ca5314bd98f9e1872b6 SHA1 43d46a870ffdc2d46a298b0e7d09bae03387e77a SHA256 bf33502155f1f9fe6e6c4e58d1b604f5c91b53bf8582efd00d931655d136c493 +MISC ChangeLog 39176 RMD160 65cc95f1462067acb785db8de5398c1b62196cf2 SHA1 152d3dbfdcc172518badb63ece3e959ec5d49daf SHA256 915c34b663b0056430acd48c2bccbe4573f8a790fce5669b0a9b36152221aad6 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iF4EAREIAAYFAktX6YUACgkQTwhj9JtAlp6iwQD/UTNgD5dXT6HSscZQxyf+sBrM -uUKx7ceeMbR+eV8+n6cBAK3Z4ausTgMc3/cj3jRpmf60NUUT2aQ0XTa13l1yArtT -=dTtW +iF4EAREIAAYFAktqGQgACgkQTwhj9JtAlp4PEAD+J/mY8yHQNses5rWRjjRWjcjf +I05ETcjL96f38k8kWNQA/0pP1qWJ/0OVPdCtlq1VrllJwjk50tOKp1btspm4oLf7 +=zppu -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.1_p2.ebuild b/app-shells/bash/bash-4.1_p2.ebuild index e71bc99cdc04..74970a60e145 100644 --- a/app-shells/bash/bash-4.1_p2.ebuild +++ b/app-shells/bash/bash-4.1_p2.ebuild @@ -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 @@ pkg_setup() { 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 @@ src_unpack() { 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 @@ src_compile() { -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 |