Add hlist one-liner patch, bump for fixins. Hopefully closes bug #62965.

(Portage version: 2.0.51.19)

7 files changed, 135 insertions, 7 deletions

diff --git a/app-admin/bastille/ChangeLog b/app-admin/bastille/ChangeLog
index 7058b93fd195..22b6393dcaeb 100644
--- a/app-admin/bastille/ChangeLog
+++ b/app-admin/bastille/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/bastille
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.13 2005/01/01 10:56:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.14 2005/04/05 18:02:56 battousai Exp $
+
+*bastille-2.1.1-r3 (05 Apr 2005)
+
+  05 Apr 2005; Bryan Stine <battousai@gentoo.org>
+  +files/bastille-2.1.1-hlist-fix.patch, bastille-2.1.1-r1.ebuild,
+  bastille-2.1.1-r2.ebuild, +bastille-2.1.1-r3.ebuild:
+  Added a patch to hopefully fix the left-panel click bug that I've finally
+  been able to track down. This is a one-liner based on Bastille CVS. This
+  hopefully fixes bug #62965.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   bastille-2.1.1-r1.ebuild, bastille-2.1.1-r2.ebuild:
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index 7c7f74990c7a..6ffc5d9d24b7 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -1,8 +1,11 @@
-MD5 27d44c1c6daecae1733056cf486611f1 ChangeLog 2772
-MD5 9140e344e513aea664f192717193383b bastille-2.1.1-r1.ebuild 2495
-MD5 370cf0e8bde55ff9bcd64ff0f42d75e0 bastille-2.1.1-r2.ebuild 2622
+MD5 cb7b3439f0ceb2ab23df61050cd58af2 ChangeLog 3160
+MD5 468cc1d4a59fc71b653508f0da09dc8c bastille-2.1.1-r1.ebuild 2536
+MD5 fbf35c7f9bf826c2e8c129f02bee1dd7 bastille-2.1.1-r2.ebuild 2662
 MD5 6866ae7fe991fa80eed96fc6c6fbb339 metadata.xml 353
+MD5 fbf35c7f9bf826c2e8c129f02bee1dd7 bastille-2.1.1-r3.ebuild 2662
 MD5 d04d71a1248455115ddc73e14c8d8ddd files/bastille-2.1.1-firewall.init 1340
 MD5 674111485907adeed35fee21192e18f8 files/bastille-firewall-imap.patch 8660
 MD5 5952693da32f1292a5b6013e8e755799 files/digest-bastille-2.1.1-r1 146
 MD5 5952693da32f1292a5b6013e8e755799 files/digest-bastille-2.1.1-r2 146
+MD5 bd6fc4e444132bd3bc1588a763b8e816 files/bastille-2.1.1-hlist-fix.patch 463
+MD5 5952693da32f1292a5b6013e8e755799 files/digest-bastille-2.1.1-r3 146
diff --git a/app-admin/bastille/bastille-2.1.1-r1.ebuild b/app-admin/bastille/bastille-2.1.1-r1.ebuild
index c00070c86954..329729bcaa09 100644
--- a/app-admin/bastille/bastille-2.1.1-r1.ebuild
+++ b/app-admin/bastille/bastille-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r1.ebuild,v 1.9 2005/01/01 10:56:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r1.ebuild,v 1.10 2005/04/05 18:02:56 battousai Exp $
 
 inherit perl-module eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
 	epatch ${FILESDIR}/bastille-firewall-imap.patch
+	epatch ${FILESDIR}/${P}-hlist-fix.patch
 }
 
 src_compile() {
diff --git a/app-admin/bastille/bastille-2.1.1-r2.ebuild b/app-admin/bastille/bastille-2.1.1-r2.ebuild
index 3ac84df2fa96..5bbde74937be 100644
--- a/app-admin/bastille/bastille-2.1.1-r2.ebuild
+++ b/app-admin/bastille/bastille-2.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r2.ebuild,v 1.8 2005/01/01 10:56:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r2.ebuild,v 1.9 2005/04/05 18:02:56 battousai Exp $
 
 inherit perl-module eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc ~sparc alpha ~amd64"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
 IUSE="X"
 
 RDEPEND="net-firewall/iptables
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
 	epatch ${FILESDIR}/bastille-firewall-imap.patch
+	epatch ${FILESDIR}/${P}-hlist-fix.patch
 }
 
 src_compile() {
diff --git a/app-admin/bastille/bastille-2.1.1-r3.ebuild b/app-admin/bastille/bastille-2.1.1-r3.ebuild
new file mode 100644
index 000000000000..c1a28db4abc3
--- /dev/null
+++ b/app-admin/bastille/bastille-2.1.1-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r3.ebuild,v 1.1 2005/04/05 18:02:56 battousai Exp $
+
+inherit perl-module eutils
+
+PATCHVER=0.1
+MY_PN=${PN/b/B}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Bastille-Linux is a security hardening tool"
+HOMEPAGE="http://bastille-linux.org/"
+SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
+IUSE="X"
+
+RDEPEND="net-firewall/iptables
+	app-admin/logrotate
+	dev-perl/Curses
+	net-firewall/psad
+	X? ( dev-perl/perl-tk )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
+	epatch ${FILESDIR}/bastille-firewall-imap.patch
+	epatch ${FILESDIR}/${P}-hlist-fix.patch
+}
+
+src_compile() {
+	cd ${S}
+	cp ${FILESDIR}/bastille-${PV}-firewall.init ./bastille-firewall
+
+	cd ${S}/psad/Psad.pm
+	perl-module_src_compile
+}
+
+src_install() {
+
+	keepdir /var/lock/subsys/${PN}
+	dodir /etc/Bastille
+
+	cd ${S}
+	into /usr
+	dosbin bastille AutomatedBastille InteractiveBastille \
+		BastilleBackEnd RevertBastille *.pl
+
+	dosym RevertBastille /usr/sbin/UndoBastille
+
+	insinto /usr/share/Bastille
+	doins Questions* Credits bastille-* *.xbm *.config
+
+	insinto /usr/share/Bastille
+	doins Questions.txt Credits complete.xbm incomplete.xbm \
+		ifup-local hosts.allow
+
+	exeinto /usr/share/Bastille
+	doexe bastille-firewall* bastille-tmpdir* \
+		bastille-ipchains bastille-netfilter \
+		firewall/*.sh
+
+	perlinfo
+	insinto ${SITE_LIB}
+	doins Bastille_Curses.pm
+	use X && doins Bastille_Tk.pm
+	insinto ${SITE_LIB}/Curses
+	doins Curses/Widgets.pm
+
+	doman docs/bastille.1m
+	dodoc docs/* firewall/*.txt
+
+	cd ${S}/Bastille
+
+	insinto /usr/lib/Bastille
+	doins AccountSecurity.pm Apache.pm API.pm OSX_API.pm BootSecurity.pm \
+		ConfigureMiscPAM.pm DisableUserTools.pm DNS.pm \
+		FilePermissions.pm FTP.pm Firewall.pm HP_API.pm HP_UX.pm \
+		IOLoader.pm Patches.pm Logging.pm \
+		MiscellaneousDaemons.pm PatchDownload.pm Printing.pm \
+		RemoteAccess.pm SecureInetd.pm Sendmail.pm TMPDIR.pm  \
+		test_AccountSecurity.pm test_Apache.pm test_DNS.pm \
+		test_FTP.pm test_HP_UX.pm test_MiscellaneousDaemons.pm \
+		test_SecureInetd.pm test_Sendmail.pm TestAPI.pm IPFilter.pm
+
+	# psad interface module
+	cd ${S}/psad/Psad.pm
+	newins Psad.pm PSAD.pm
+
+	# Documentation
+	cd ${S}
+	dodoc *.txt BUGS Change* README*
+}
+
+pkg_postinst() {
+	use X || einfo "When not using the Tk interface you will need to start use the -c flag when calling ${PN} from command line. example ${PN} -c --os GE1.4"
+}
diff --git a/app-admin/bastille/files/bastille-2.1.1-hlist-fix.patch b/app-admin/bastille/files/bastille-2.1.1-hlist-fix.patch
new file mode 100644
index 000000000000..ad4de0abb836
--- /dev/null
+++ b/app-admin/bastille/files/bastille-2.1.1-hlist-fix.patch
@@ -0,0 +1,12 @@
+diff -urN Bastille.orig/Bastille_Tk.pm Bastille/Bastille_Tk.pm
+--- Bastille.orig/Bastille_Tk.pm	2005-04-05 12:28:47.000000000 -0400
++++ Bastille/Bastille_Tk.pm	2005-04-05 12:27:19.000000000 -0400
+@@ -734,7 +734,7 @@
+ # This is the listbox callback
+ #
+ sub hlist_callback {
+-    my $sel = $list->info(selection);
++    my ($sel) = $list->info(selection);
+     if($sel ne ""){
+ 	$list->selectionClear('0', $reverse_module_index{"End"});
+ 	$list->selectionSet($sel);
diff --git a/app-admin/bastille/files/digest-bastille-2.1.1-r3 b/app-admin/bastille/files/digest-bastille-2.1.1-r3
new file mode 100644
index 000000000000..bd17a91ead93
--- /dev/null
+++ b/app-admin/bastille/files/digest-bastille-2.1.1-r3
@@ -0,0 +1,2 @@
+MD5 67b4d6a110fbe833bfc14dc46e75fa83 Bastille-2.1.1.tar.bz2 338227
+MD5 4742d81524cfe07f00c4bab66b17371f bastille-2.1.1-gentoo-0.1.patch.bz2 15312