gentoo resync : 14.07.2018

7 files changed, 254 insertions, 0 deletions

diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
new file mode 100644
index 000000000000..1a138d4e6ab0
--- /dev/null
+++ b/app-admin/bastille/Manifest
@@ -0,0 +1,8 @@
+AUX bastille-3.0.9-openrc.patch 650 BLAKE2B de676aa353116cfb2297b5d08dbb4bc38ab9706d696be53d42941c5f5c198d1ea197a3f9c0db7635819f588ec64b9fe24e2fbf55d77833b1229a5a5af0bd19e2 SHA512 fe880f40185d129fef192a5a4e98e891691087958382d7ac8fa05612fea7f24d8116f0787796b1a1a1dab31d54d1bef52a59cdcf3213feae384e7c838a9801cf
+AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123035479ce7c30451e37e30b2890db7f14fa0451c5a7d68f88b49f97dc7945f886071bae16a9a20508aa886d6e99a SHA512 23446f6ca65fa4b164b6dd688eb31a957cf76ce5017c4b74b4bcf402091811e1b2b51a55957c6bf6de5b7f6b7f58a9f651c7f85b760b5d270ec9280eab405dfd
+AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
+DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
+DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
+EBUILD bastille-3.0.9-r1.ebuild 1526 BLAKE2B 09328a348bb79902ca551d56126bc8631cf56bf1922f82ddca4a446037412819d87761557e0d41ea9f92ca414f0abfec84a73144e800d1176de09ad3b1d1b4f4 SHA512 0230bf041a3845924250baf7046b0c3ec76daa36c47768075a57f792925ad5af958e6a912b88e0ac087d7f8dffd0d1c81651965861ceefd01698177dd605f728
+EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 4315e54117b2fab2d2e485ffd8e5df4a4abeca702c8fa3483745adfa0013d2de43fa0e96a5baaa4e2e27129285f806a3aa1608094e419aeeb22e3adedf06d435 SHA512 42259f52dd049db2686deffa101cdaf71d2ad29321a057b4c2e7578f369199d9d2bdf53ffa04d83deaa81629dca535870e905680f91f5ffba290daef69f874aa
+MISC metadata.xml 459 BLAKE2B ef04f8221c3a19d7efded571376315032035b3ba4e4cb9cb9e3ecf2930e1ecfbf8bddec92485d8bd91655a68afb3f29aaae88f3a017bc5b56a083dcd31ce0257 SHA512 5c339c93e1aba939528018b1b4a6f21b3f87c93efc60471300064c85c9c0723474fcd5092d6367b02ac1d21564451b319f4ba6c261fa890def1e58a1647f4fc9
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..cfdc9cf09dcd
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module
+
+PATCHVER=0.2
+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/Tk )
+	virtual/logger
+"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+	# make sure the Perl modules go into vendor dir
+	epatch "${FILESDIR}/${P}-perl.patch"
+	perl_set_version
+
+	cd "${S}"
+	chmod a+x Install.sh bastille-ipchains bastille-netfilter
+}
+
+src_install() {
+	perl_set_version
+	export VENDOR_LIB
+
+	cd "${S}"
+	DESTDIR="${D}" ./Install.sh
+
+	# Example configs
+	cd "${S}"
+	insinto /usr/share/Bastille
+	doins *.config
+
+	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+	# Documentation
+	cd "${S}"
+	dodoc *.txt BUGS Change* README*
+	cd "${S}"/docs
+	doman *.1m
+}
+
+pkg_postinst() {
+	elog "Please be aware that when using the Server Lax, Server Moderate, or"
+	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+	elog "to set any advanced network information, such as masquerading and"
+	elog "internal interfaces, if you plan to use them."
+}
diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild
new file mode 100644
index 000000000000..0e2b22c76c1a
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-functions
+
+PATCHVER=0.2
+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-lang/perl:=
+	dev-perl/Curses
+	net-firewall/psad
+	X? ( dev-perl/Tk )
+	virtual/logger
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+	# make sure the Perl modules go into vendor dir
+	"${FILESDIR}/${P}-perl.patch"
+
+	# prevent file collision, bug 536292
+	"${FILESDIR}/${P}-renamewidgets.patch"
+
+	# openrc runscript rename
+	"${FILESDIR}/${P}-openrc.patch"
+)
+
+src_prepare() {
+	perl_set_version
+
+	default
+
+	cd "${S}" || die
+	chmod a+x Install.sh bastille-ipchains bastille-netfilter || die
+}
+
+src_install() {
+	perl_set_version
+	export VENDOR_LIB
+
+	cd "${S}" || die
+	DESTDIR="${D}" ./Install.sh || die
+
+	# Example configs
+	cd "${S}" || die
+	insinto /usr/share/Bastille
+	doins *.config
+
+	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+	# Documentation
+	cd "${S}" || die
+	dodoc *.txt BUGS Change* README*
+	cd "${S}"/docs || die
+	doman *.1m
+}
+
+pkg_postinst() {
+	elog "Please be aware that when using the Server Lax, Server Moderate, or"
+	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+	elog "to set any advanced network information, such as masquerading and"
+	elog "internal interfaces, if you plan to use them."
+}
diff --git a/app-admin/bastille/files/bastille-3.0.9-openrc.patch b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
new file mode 100644
index 000000000000..08d0a04fa480
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
@@ -0,0 +1,12 @@
+diff -ruN Bastille.orig/bastille-firewall.gentoo-init Bastille/bastille-firewall.gentoo-init
+--- Bastille.orig/bastille-firewall.gentoo-init	2017-01-02 09:47:33.144433650 +0100
++++ Bastille/bastille-firewall.gentoo-init	2017-01-02 09:49:05.396431757 +0100
+@@ -1,6 +1,6 @@
+-#!/sbin/runscript
++#!/sbin/openrc-run
+ # Copyright 1999-2004 Gentoo Foundation
+-# Distributed under the terms of the GNU General Public License v2         
++# Distributed under the terms of the GNU General Public License v2
+ # $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/files/bastille-3.0.2-firewall.init,v 1.1 2005/07/31 05:21:10 battousai Exp $
+ 
+ opts="start stop"
diff --git a/app-admin/bastille/files/bastille-3.0.9-perl.patch b/app-admin/bastille/files/bastille-3.0.9-perl.patch
new file mode 100644
index 000000000000..ab109093bc14
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-perl.patch
@@ -0,0 +1,25 @@
+diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh
+--- Bastille-gentoo-2/Install.sh	2014-12-09 23:05:55.674808824 +0100
++++ Bastille/Install.sh	2014-12-09 23:17:25.907847419 +0100
+@@ -3,7 +3,7 @@
+ umask 077
+ 
+ mkdir -p ${DESTDIR}/usr/sbin
+-mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses
++mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses
+ mkdir -p ${DESTDIR}/usr/lib/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap
+@@ -13,9 +13,9 @@
+  
+ cp AutomatedBastille ${DESTDIR}/usr/sbin/
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+-cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses
++cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
++cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
++cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
new file mode 100644
index 000000000000..2cf303a548dc
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
@@ -0,0 +1,48 @@
+diff -ruN Bastille.orig/AutomatedBastille Bastille/AutomatedBastille
+--- Bastille.orig/AutomatedBastille	2017-01-02 09:39:20.720443755 +0100
++++ Bastille/AutomatedBastille	2017-01-02 09:40:54.293441835 +0100
+@@ -77,7 +77,7 @@
+ 
+ # Use the Curses interface
+ use Curses;
+-use Curses::Widgets;
++use Curses::Widgets_Bastille;
+ 
+ # Hardcoded List of configurations -- to be replaced by list read from file
+ @list = ("WorkstationLax","WorkstationModerate","WorkstationParanoia","ServerLax","ServerModerate","ServerParanoia","Quit");
+diff -ruN Bastille.orig/Bastille_Curses.pm Bastille/Bastille_Curses.pm
+--- Bastille.orig/Bastille_Curses.pm	2005-04-18 14:32:10.000000000 +0200
++++ Bastille/Bastille_Curses.pm	2017-01-02 09:41:24.470441216 +0100
+@@ -34,7 +34,7 @@
+ sub do_Bastille {
+ 
+     use Curses;
+-    use Curses::Widgets;
++    use Curses::Widgets_Bastille;
+ 
+     # Number_Modules is the number of modules loaded in by Load_Questions
+     $Number_Modules=0;
+diff -ruN Bastille.orig/Curses/Widgets.pm Bastille/Curses/Widgets.pm
+--- Bastille.orig/Curses/Widgets.pm	2005-04-06 01:18:11.000000000 +0200
++++ Bastille/Curses/Widgets.pm	2017-01-02 09:42:31.145439848 +0100
+@@ -11,7 +11,7 @@
+ #
+ ########################################################################
+ 
+-package Curses::Widgets;
++package Curses::Widgets_Bastille;
+ 
+ use strict;
+ use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
+diff -ruN Bastille.orig/Install.sh Bastille/Install.sh
+--- Bastille.orig/Install.sh	2017-01-02 09:39:20.767443754 +0100
++++ Bastille/Install.sh	2017-01-02 09:41:05.537441604 +0100
+@@ -15,7 +15,7 @@
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+ cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
+ cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
+-cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
++cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses/Widgets_Bastille.pm
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
new file mode 100644
index 000000000000..fb9c3ca6f9ff
--- /dev/null
+++ b/app-admin/bastille/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bastille-linux</remote-id>
+	</upstream>
+</pkgmetadata>