summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-03-31 01:39:31 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-03-31 01:39:31 +0200
commit577850dc1337f51ad9e152a891d812d151f8000c (patch)
treea9894d912b0334f2a1ce314d2c08225eebed35c2 /net-firewall
parentapp-admin/collectd: Fix pkg_postinst... (diff)
downloadgentoo-577850dc1337f51ad9e152a891d812d151f8000c.tar.gz
gentoo-577850dc1337f51ad9e152a891d812d151f8000c.tar.bz2
gentoo-577850dc1337f51ad9e152a891d812d151f8000c.zip
net-firewall/shorewall: Rev bump to support systemd's...
...changed rootprefix Package-Manager: Portage-2.3.26, Repoman-2.3.7 RepoMan-Options: --force
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/shorewall/files/shorewallrc-r224
-rw-r--r--net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild (renamed from net-firewall/shorewall/shorewall-5.1.12.3.ebuild)5
2 files changed, 28 insertions, 1 deletions
diff --git a/net-firewall/shorewall/files/shorewallrc-r2 b/net-firewall/shorewall/files/shorewallrc-r2
new file mode 100644
index 000000000000..ecc21a23875a
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewallrc-r2
@@ -0,0 +1,24 @@
+#
+# Gentoo Shorewall 5.1 rc file
+#
+BUILD=gentoo #Default is to detect the build system
+HOST=gentoo #Gentoo GNU Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed
+SBINDIR=${PREFIX}/sbin #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT} #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script
+ANNOTATED= #If non-zero, annotated configuration files are installed
+SERVICEDIR=tbs #Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file
+SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed
+SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored.
+DEFAULT_PAGER=${PAGER} #Pager to use if none specified in shorewall[6].conf
diff --git a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
index 0f6140661fb1..d7c5285f28b0 100644
--- a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
@@ -156,8 +156,11 @@ src_prepare() {
# This allows us to use patches from upstream and keeps epatch_user working
einfo "Preparing shorewallrc ..."
- cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+ cp "${FILESDIR}"/shorewallrc-r2 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
eprefixify "${S}"/shorewallrc.gentoo
+ sed -i \
+ -e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
+ "${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
# shorewall-core
mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"