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

2015-05-28 Thread Sébastien Luttringer
Date: Thursday, May 28, 2015 @ 23:41:06
  Author: seblu
Revision: 239861

upgpkg: ipset 6.24-2

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

---+
 PKGBUILD  |4 ++--
 ipset.service |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-28 21:40:54 UTC (rev 239860)
+++ PKGBUILD2015-05-28 21:41:06 UTC (rev 239861)
@@ -3,7 +3,7 @@
 
 pkgname=ipset
 pkgver=6.24
-pkgrel=1
+pkgrel=2
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
@@ -13,7 +13,7 @@
 source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
 $pkgname.service)
 md5sums=('8831b8f01458bf2abacc222884195a62'
- '60ebe10f071314fc9e8647440a02467c')
+ 'e20fe62881993078591f1bb8b2fa22bb')
 
 build() {
   cd $pkgname-$pkgver

Modified: ipset.service
===
--- ipset.service   2015-05-28 21:40:54 UTC (rev 239860)
+++ ipset.service   2015-05-28 21:41:06 UTC (rev 239861)
@@ -1,6 +1,7 @@
 [Unit]
 Description=Loading IP Sets
-Before=iptables.service ip6tables.service
+Before=network-pre.target iptables.service ip6tables.service
+Wants=network-pre.target
 
 [Service]
 Type=oneshot


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

2014-05-15 Thread Sébastien Luttringer
Date: Friday, May 16, 2014 @ 00:33:02
  Author: seblu
Revision: 111271

upgpkg: ipset 6.21.1-2

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

---+
 PKGBUILD  |4 ++--
 ipset.service |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-15 22:26:04 UTC (rev 111270)
+++ PKGBUILD2014-05-15 22:33:02 UTC (rev 111271)
@@ -3,7 +3,7 @@
 
 pkgname=ipset
 pkgver=6.21.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
@@ -13,7 +13,7 @@
 source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
 $pkgname.service)
 md5sums=('9c136fd51694eb0ef259cda085145da0'
- '4b195827996c6012a801e21f869c385d')
+ '60ebe10f071314fc9e8647440a02467c')
 
 build() {
   cd $pkgname-$pkgver

Modified: ipset.service
===
--- ipset.service   2014-05-15 22:26:04 UTC (rev 111270)
+++ ipset.service   2014-05-15 22:33:02 UTC (rev 111271)
@@ -1,6 +1,6 @@
 [Unit]
 Description=Loading IP Sets
-Before=iptables.service
+Before=iptables.service ip6tables.service
 
 [Service]
 Type=oneshot



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

2014-02-01 Thread Sébastien Luttringer
Date: Sunday, February 2, 2014 @ 01:46:49
  Author: seblu
Revision: 105160

upgpkg: ipset 6.20.1-2

- Add reload to service. Don't try to destroy set before restore from conf file.

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

---+
 PKGBUILD  |4 ++--
 ipset.service |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-02 00:22:45 UTC (rev 105159)
+++ PKGBUILD2014-02-02 00:46:49 UTC (rev 105160)
@@ -3,7 +3,7 @@
 
 pkgname=ipset
 pkgver=6.20.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
@@ -13,7 +13,7 @@
 source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
 $pkgname.service)
 md5sums=('8af741492752fbf24d3a28a9d1473d40'
- '6be6a2b34c1f38fc8ad60828403e2077')
+ '4b195827996c6012a801e21f869c385d')
 
 build() {
   cd $pkgname-$pkgver

Modified: ipset.service
===
--- ipset.service   2014-02-02 00:22:45 UTC (rev 105159)
+++ ipset.service   2014-02-02 00:46:49 UTC (rev 105160)
@@ -6,6 +6,7 @@
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore
 ExecStop=/usr/bin/ipset destroy
 
 [Install]



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

2013-05-12 Thread Sébastien Luttringer
Date: Monday, May 13, 2013 @ 01:43:02
  Author: seblu
Revision: 90511

upgpkg: ipset 6.19-2

https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/

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

---+
 PKGBUILD  |6 +++---
 ipset.service |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-12 23:41:52 UTC (rev 90510)
+++ PKGBUILD2013-05-12 23:43:02 UTC (rev 90511)
@@ -3,7 +3,7 @@
 
 pkgname=ipset
 pkgver=6.19
-pkgrel=1
+pkgrel=2
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
@@ -14,11 +14,11 @@
 source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
 $pkgname.service)
 md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
- 'f74642f7bb88056103c63a62a91c782c')
+ '6be6a2b34c1f38fc8ad60828403e2077')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-kmod=no
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
   make
 }
 

Modified: ipset.service
===
--- ipset.service   2013-05-12 23:41:52 UTC (rev 90510)
+++ ipset.service   2013-05-12 23:43:02 UTC (rev 90511)
@@ -5,8 +5,8 @@
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/ipset -f /etc/ipset.conf restore
-ExecStop=/usr/sbin/ipset destroy
+ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/bin/ipset destroy
 
 [Install]
 WantedBy=multi-user.target



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

2013-05-10 Thread 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
===
--- PKGBUILD2013-05-10 22:41:56 UTC (rev 90285)
+++ PKGBUILD2013-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: