From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../bastille/files/bastille-3.0.9-openrc.patch | 12 ++++++ app-admin/bastille/files/bastille-3.0.9-perl.patch | 25 +++++++++++ .../files/bastille-3.0.9-renamewidgets.patch | 48 ++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 app-admin/bastille/files/bastille-3.0.9-openrc.patch create mode 100644 app-admin/bastille/files/bastille-3.0.9-perl.patch create mode 100644 app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch (limited to 'app-admin/bastille/files') 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 -- cgit v1.2.3