summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-11-27 22:51:38 +0100
committerThomas Deutschmann <whissi@gentoo.org>2019-11-27 22:52:32 +0100
commitf7e482662bc47f098378f99aca0a04fdac6f9c5e (patch)
tree8bfe520791fa67715e8ae7df234c2cfacb1ac139 /net-firewall/ipset/files
parentnet-libs/nodejs: Fix build on PAX enable kernel (bug 694100) (diff)
downloadgentoo-f7e482662bc47f098378f99aca0a04fdac6f9c5e.tar.gz
gentoo-f7e482662bc47f098378f99aca0a04fdac6f9c5e.tar.bz2
gentoo-f7e482662bc47f098378f99aca0a04fdac6f9c5e.zip
net-firewall/ipset: bump to v7.4
- Add systemd unit Closes: https://bugs.gentoo.org/680438 Closes: https://bugs.gentoo.org/558038 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'net-firewall/ipset/files')
-rw-r--r--net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch11
-rw-r--r--net-firewall/ipset/files/ipset.systemd15
2 files changed, 26 insertions, 0 deletions
diff --git a/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch
new file mode 100644
index 000000000000..b10ddbd4fae0
--- /dev/null
+++ b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch
@@ -0,0 +1,11 @@
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -46,7 +46,7 @@ EXTRA_libipset_la_SOURCES = \
+
+ EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map
+
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/$(libdir)/pkgconfig
+ pkgconfig_DATA = libipset.pc
+
+ dist_man_MANS = libipset.3
diff --git a/net-firewall/ipset/files/ipset.systemd b/net-firewall/ipset/files/ipset.systemd
new file mode 100644
index 000000000000..f7a5eb510a0a
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.systemd
@@ -0,0 +1,15 @@
+[Unit]
+Description=ipset service
+Before=network-pre.target iptables.service ip6tables.service firewalld.service
+Wants=network-pre.target
+ConditionFileNotEmpty=/var/lib/ipset/rules-save
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
+ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
+ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save
+
+[Install]
+WantedBy=multi-user.target