diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-06 15:15:42 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-06 15:15:42 +0100 |
| commit | 9437cdbc03cb103235fa0b043f4cf73882f10f34 (patch) | |
| tree | 5dba8834685e18222c996b3cd4c728958ed3a49b /community/ebtables | |
| parent | 7cfa9860fb15a4bf5066e33255da1a9b09cc95b1 (diff) | |
| parent | a110e74fe4a31aebb09e0da6e407af69ed996837 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/drbd/PKGBUILD
community/dumb/PKGBUILD
community/echat/PKGBUILD
community/librcc/PKGBUILD
community/linux-tools/PKGBUILD
community/python2-pysqlite-legacy/PKGBUILD
community/python2-pyxmpp/PKGBUILD
core/libksba/PKGBUILD
core/ncurses/PKGBUILD
extra/libbonobo/PKGBUILD
extra/libmpeg2/PKGBUILD
extra/qt/PKGBUILD
extra/rarian/PKGBUILD
extra/wpa_supplicant_gui/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'community/ebtables')
| -rw-r--r-- | community/ebtables/PKGBUILD | 22 | ||||
| -rw-r--r-- | community/ebtables/ebtables.systemd | 3 |
2 files changed, 9 insertions, 16 deletions
diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD index 19acd60f5..f62fd575c 100644 --- a/community/ebtables/PKGBUILD +++ b/community/ebtables/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 71322 2012-05-26 15:04:32Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 83705 2013-02-04 14:45:58Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=ebtables pkgver=2.0.10_4 -pkgrel=2 +pkgrel=3 pkgdesc='Ethernet bridge filtering utilities' arch=('i686' 'x86_64' 'mips64el') url='http://ebtables.sourceforge.net/' +depends=('perl' 'bash') license=('GPL2') -backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") +backup=("etc/$pkgname.conf") # ebtables segfault with --as-needed options=('!buildflags') install=$pkgname.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" - "$pkgname.conf" - "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") md5sums=('506742a3d44b9925955425a659c1a8d0' - 'c6f0838de4429af68d21b4d61f00db59' - 'd0e340f2cefe91b1569c0e87c2a1288f' - '5a49ea09af202cb438c8a1b15abf9147' + 'b4c329060809e5b290ae49fbd0ad61f2' 'baf923443c3b16277e50d60d2e68f534') build() { @@ -41,10 +38,7 @@ package() { popd # rm package ebtables rc.d scripts rm "$pkgdir/etc/ebtables-config" - # 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 \ @@ -53,4 +47,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/ebtables/ebtables.systemd b/community/ebtables/ebtables.systemd index 4c51e9b6f..7c21ff967 100644 --- a/community/ebtables/ebtables.systemd +++ b/community/ebtables/ebtables.systemd @@ -1,13 +1,12 @@ #!/bin/bash -. /etc/conf.d/ebtables +CONFIG_FILE='/etc/ebtables.conf' case $1 in start) ebtables-restore < "$CONFIG_FILE" ;; stop) - [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save ebtables -F ;; save) |