| 1 |
commit: 577850dc1337f51ad9e152a891d812d151f8000c |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 30 23:39:31 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 30 23:39:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577850dc |
| 7 |
|
| 8 |
net-firewall/shorewall: Rev bump to support systemd's... |
| 9 |
|
| 10 |
...changed rootprefix |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.26, Repoman-2.3.7 |
| 13 |
RepoMan-Options: --force |
| 14 |
|
| 15 |
net-firewall/shorewall/files/shorewallrc-r2 | 24 ++++++++++++++++++++++ |
| 16 |
....1.12.3.ebuild => shorewall-5.1.12.3-r1.ebuild} | 5 ++++- |
| 17 |
2 files changed, 28 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/net-firewall/shorewall/files/shorewallrc-r2 b/net-firewall/shorewall/files/shorewallrc-r2 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..ecc21a23875 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-firewall/shorewall/files/shorewallrc-r2 |
| 24 |
@@ -0,0 +1,24 @@ |
| 25 |
+# |
| 26 |
+# Gentoo Shorewall 5.1 rc file |
| 27 |
+# |
| 28 |
+BUILD=gentoo #Default is to detect the build system |
| 29 |
+HOST=gentoo #Gentoo GNU Linux |
| 30 |
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. |
| 31 |
+SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. |
| 32 |
+LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. |
| 33 |
+PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory |
| 34 |
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed |
| 35 |
+SBINDIR=${PREFIX}/sbin #Directory where system administration programs are installed |
| 36 |
+MANDIR=${PREFIX}/share/man #Directory where manpages are installed. |
| 37 |
+INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. |
| 38 |
+INITFILE=${PRODUCT} #Name of the product's installed SysV init script |
| 39 |
+INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script |
| 40 |
+ANNOTATED= #If non-zero, annotated configuration files are installed |
| 41 |
+SERVICEDIR=tbs #Directory where .service files are installed (systems running systemd only) |
| 42 |
+SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file |
| 43 |
+SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR |
| 44 |
+SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed |
| 45 |
+SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR |
| 46 |
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. |
| 47 |
+VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. |
| 48 |
+DEFAULT_PAGER=${PAGER} #Pager to use if none specified in shorewall[6].conf |
| 49 |
|
| 50 |
diff --git a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild |
| 51 |
similarity index 98% |
| 52 |
rename from net-firewall/shorewall/shorewall-5.1.12.3.ebuild |
| 53 |
rename to net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild |
| 54 |
index 0f6140661fb..d7c5285f28b 100644 |
| 55 |
--- a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild |
| 56 |
+++ b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild |
| 57 |
@@ -156,8 +156,11 @@ src_prepare() { |
| 58 |
# This allows us to use patches from upstream and keeps epatch_user working |
| 59 |
|
| 60 |
einfo "Preparing shorewallrc ..." |
| 61 |
- cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" |
| 62 |
+ cp "${FILESDIR}"/shorewallrc-r2 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" |
| 63 |
eprefixify "${S}"/shorewallrc.gentoo |
| 64 |
+ sed -i \ |
| 65 |
+ -e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \ |
| 66 |
+ "${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc" |
| 67 |
|
| 68 |
# shorewall-core |
| 69 |
mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'" |
Archives