summaryrefslogtreecommitdiff
path: root/community/ipset
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-12 01:16:13 -0700
committerroot <root@rshg054.dnsready.net>2013-05-12 01:16:13 -0700
commit5b9e0d821dd428792bd51ed03af2b800924ce69d (patch)
treee789152a7a0fd6ae4eb0a7d0e572d392f81beca4 /community/ipset
parent207b7c7b0d7bc0db898a2386a665bdb20495fb19 (diff)
Sun May 12 01:15:39 PDT 2013
Diffstat (limited to 'community/ipset')
-rw-r--r--community/ipset/PKGBUILD12
-rw-r--r--community/ipset/ipset.service6
-rw-r--r--community/ipset/ipset.systemd21
3 files changed, 7 insertions, 32 deletions
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index cff3a8b96..ff50f148f 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88370 2013-04-16 20:03:40Z seblu $
+# $Id: PKGBUILD 90287 2013-05-10 23:18:07Z seblu $
# Maintainer: Sébastien Luttringer
pkgname=ipset
-pkgver=6.18
+pkgver=6.19
pkgrel=1
pkgdesc='Administration tool for IP sets'
arch=('i686' 'x86_64')
@@ -12,11 +12,9 @@ depends=('libmnl' 'bash')
backup=("etc/$pkgname.conf")
options=('!libtool')
source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
- "$pkgname.systemd"
"$pkgname.service")
-md5sums=('776de6afe32ae386e6827a51c025464f'
- '7daa4f163eef9db216cb4c428e0342a3'
- 'b032241b96b5802975fe4321cc511c6b')
+md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
+ 'f74642f7bb88056103c63a62a91c782c')
build() {
cd $pkgname-$pkgver
@@ -34,8 +32,6 @@ package() {
install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
popd
# systemd
- install -Dm 755 $pkgname.systemd \
- "$pkgdir/usr/lib/systemd/scripts/$pkgname"
install -Dm 644 $pkgname.service \
"$pkgdir/usr/lib/systemd/system/$pkgname.service"
# default config file
diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service
index 8c4889d3c..1af453668 100644
--- a/community/ipset/ipset.service
+++ b/community/ipset/ipset.service
@@ -1,12 +1,12 @@
[Unit]
-Description=IP Sets
+Description=Loading IP Sets
Before=iptables.service
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/scripts/ipset start
-ExecStop=/usr/lib/systemd/scripts/ipset stop
+ExecStart=/usr/sbin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/sbin/ipset destroy
[Install]
WantedBy=multi-user.target
diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd
deleted file mode 100644
index c28086322..000000000
--- a/community/ipset/ipset.systemd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-CONFIG_FILE='/etc/ipset.conf'
-
-case $1 in
- start)
- ipset restore < "$CONFIG_FILE"
- ;;
- stop)
- ipset destroy
- ;;
- save)
- ipset save > "$CONFIG_FILE"
- ;;
- *)
- echo "usage: ${0##*/} {start|stop|save}" >&2
- exit 1
- ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et: