diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-26 10:54:14 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-26 10:54:14 -0300 |
| commit | 38e7e59a562c5f8ea83719e4dfd5cd4c9917d5b1 (patch) | |
| tree | 8097f94554cc6e2c64d19db24e56e70e041e7757 /community/ipset | |
| parent | 328b5407de9f088d32c429b1b37f6efde3da06f8 (diff) | |
| parent | 7d3e94229ca9849421d263542eb2c61f64a91c10 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/gmic/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.systemd
community/linux-tools/usbipd.service
community/macchanger/PKGBUILD
community/ndisc6/PKGBUILD
community/nemiver/PKGBUILD
core/gpgme/PKGBUILD
extra/amarok/PKGBUILD
extra/java-commons-daemon/PKGBUILD
extra/libao/PKGBUILD
extra/liblastfm/PKGBUILD
Diffstat (limited to 'community/ipset')
| -rw-r--r-- | community/ipset/PKGBUILD | 23 | ||||
| -rw-r--r-- | community/ipset/ipset.systemd | 3 |
2 files changed, 10 insertions, 16 deletions
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 30f3e07e4..93dfedb16 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 80651 2012-11-28 16:13:35Z seblu $ +# $Id: PKGBUILD 82785 2013-01-24 12:55:11Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset pkgver=6.16.1 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') url='http://ipset.netfilter.org' license=('GPL2') -depends=('libmnl') -backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") +depends=('libmnl' 'bash') +backup=("etc/$pkgname.conf") options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" - "$pkgname.conf" - "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") md5sums=('9fd70c825f052db7dc9d5ba0562b7083' - '3e606a2823a700b4e9c5f17511a6f6a5' - 'de89b054d967036e08b13bc6a7235286' - 'dfc3105b89ed41fc4a1feb4f4f13f2a3' + '7daa4f163eef9db216cb4c428e0342a3' 'b032241b96b5802975fe4321cc511c6b') build() { @@ -34,11 +30,10 @@ package() { # install doc install -dm755 "$pkgdir/usr/share/doc/$pkgname" install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname" + # install pkgconfig file + install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc" popd - # install initscripts - install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" - # install systemd service + # systemd install -Dm 755 $pkgname.systemd \ "$pkgdir/usr/lib/systemd/scripts/$pkgname" install -Dm 644 $pkgname.service \ @@ -47,4 +42,4 @@ package() { install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd index 92397f3a7..c28086322 100644 --- a/community/ipset/ipset.systemd +++ b/community/ipset/ipset.systemd @@ -1,13 +1,12 @@ #!/bin/bash -. /etc/conf.d/ipset +CONFIG_FILE='/etc/ipset.conf' case $1 in start) ipset restore < "$CONFIG_FILE" ;; stop) - [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save ipset destroy ;; save) |