[arch-commits] Commit in ipset/trunk (PKGBUILD ipset.service ipset.systemd)

[Sébastien Luttringer]

    Date: Saturday, May 11, 2013 @ 01:17:58
  Author: seblu
Revision: 90286

upgpkg: ipset 6.19-1

Modified:
  ipset/trunk/PKGBUILD
  ipset/trunk/ipset.service
Deleted:
  ipset/trunk/ipset.systemd

---------------+
 PKGBUILD      |   10 +++-------
 ipset.service |    6 +++---
 ipset.systemd |   21 ---------------------
 3 files changed, 6 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-10 22:41:56 UTC (rev 90285)
+++ PKGBUILD	2013-05-10 23:17:58 UTC (rev 90286)
@@ -2,7 +2,7 @@
 # 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 @@
 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 @@
   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

Modified: ipset.service
===================================================================
--- ipset.service	2013-05-10 22:41:56 UTC (rev 90285)
+++ ipset.service	2013-05-10 23:17:58 UTC (rev 90286)
@@ -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

Deleted: ipset.systemd
===================================================================
--- ipset.systemd	2013-05-10 22:41:56 UTC (rev 90285)
+++ ipset.systemd	2013-05-10 23:17:58 UTC (rev 90286)
@@ -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: