diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-02 09:03:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-02 09:05:16 +0000 |
| commit | 9e4527c340db04a335460d71b9c9fb7b758b7e75 (patch) | |
| tree | 724e1af0d53042547b102259e6070f15799fcf62 | |
| parent | 98fab2ebcb2e11db33670f72b74a9d009ba41d0a (diff) | |
| parent | 20313a4d0e4cbe767df8408e32046c642ea59465 (diff) | |
| download | aports-9e4527c340db04a335460d71b9c9fb7b758b7e75.tar.bz2 aports-9e4527c340db04a335460d71b9c9fb7b758b7e75.tar.xz | |
Merge git://git.alpinelinux.org/kunkku/aports
move awall with deps to main
| -rw-r--r-- | main/awall/APKBUILD (renamed from testing/awall/APKBUILD) | 13 | ||||
| -rw-r--r-- | main/ipset/APKBUILD (renamed from testing/ipset/APKBUILD) | 2 | ||||
| -rw-r--r-- | main/ipset/ipset.initd (renamed from testing/ipset/ipset.initd) | 0 | ||||
| -rw-r--r-- | main/lua-signal/APKBUILD (renamed from testing/lua-signal/APKBUILD) | 2 | ||||
| -rw-r--r-- | main/lua-sleep/APKBUILD (renamed from testing/lua-sleep/APKBUILD) | 2 |
5 files changed, 13 insertions, 6 deletions
diff --git a/testing/awall/APKBUILD b/main/awall/APKBUILD index a4d70fc6f..df7d371f7 100644 --- a/testing/awall/APKBUILD +++ b/main/awall/APKBUILD @@ -26,16 +26,23 @@ package() { cd "$_builddir" local dir=$pkgdir/$_luadir/awall local bindir=$pkgdir/usr/sbin - local poldir=$pkgdir/usr/share/awall/mandatory + local poldir=$pkgdir/usr/share/awall + + install -d "$poldir/mandatory" + install -d "$poldir/optional" + install -d "$poldir/sample" + install -d "$bindir" - install -d "$poldir" install -d "$dir/modules" install -d "$pkgdir/etc/awall" install -d "$pkgdir/var/run/awall" + install awall-cli "$bindir/awall" - install -m 644 json/services.json "$poldir" install -m 644 awall/*.lua "$dir" install -m 644 awall/modules/filter.lua "$dir/modules" + + install -m 644 json/services.json "$poldir/mandatory" + install -m 644 sample-policy.json "$poldir/sample" } nat() { diff --git a/testing/ipset/APKBUILD b/main/ipset/APKBUILD index 296839381..e8b88ef82 100644 --- a/testing/ipset/APKBUILD +++ b/main/ipset/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -# Maintainer: +# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=ipset pkgver=6.11 pkgrel=1 diff --git a/testing/ipset/ipset.initd b/main/ipset/ipset.initd index 6e3294c8e..6e3294c8e 100644 --- a/testing/ipset/ipset.initd +++ b/main/ipset/ipset.initd diff --git a/testing/lua-signal/APKBUILD b/main/lua-signal/APKBUILD index 37de2ccc2..2c9f10576 100644 --- a/testing/lua-signal/APKBUILD +++ b/main/lua-signal/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -# Maintainer: +# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=lua-signal pkgver=1.200 pkgrel=0 diff --git a/testing/lua-sleep/APKBUILD b/main/lua-sleep/APKBUILD index 716d63e74..22d135483 100644 --- a/testing/lua-sleep/APKBUILD +++ b/main/lua-sleep/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -# Maintainer: +# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=lua-sleep pkgver=0.1 pkgrel=0 |