diff options
| -rw-r--r-- | main/shorewall-core/APKBUILD | 7 | ||||
| -rw-r--r-- | main/shorewall6/APKBUILD | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/main/shorewall-core/APKBUILD b/main/shorewall-core/APKBUILD index 96b5abeb89..21fa4cda35 100644 --- a/main/shorewall-core/APKBUILD +++ b/main/shorewall-core/APKBUILD @@ -3,10 +3,11 @@ pkgname=shorewall-core pkgver=5.2.2 -_ver=$pkgver +_maj_min_patch=$pkgver case $pkgver in - *.*.*.*) _ver=${pkgver%.*};; + *.*.*.*) _maj_min_patch=${pkgver%.*};; esac +_maj_min=${_maj_min_patch%.*} pkgrel=0 pkgdesc="Core libraries for Shorewall" @@ -18,7 +19,7 @@ depends="" # coreutils for install -T makedepends="coreutils bash" subpackages="$pkgname-doc" -source="http://www.shorewall.net/pub/shorewall/${_ver%.*}/shorewall-$_ver/shorewall-core-$pkgver.tar.bz2 +source="http://www.shorewall.net/pub/shorewall/$_maj_min/shorewall-$_maj_min_patch/$pkgname-$pkgver.tar.bz2 shorewallrc.alpine " builddir="$srcdir/$pkgname-$pkgver" diff --git a/main/shorewall6/APKBUILD b/main/shorewall6/APKBUILD index efb1a381f5..bd0de5fdd0 100644 --- a/main/shorewall6/APKBUILD +++ b/main/shorewall6/APKBUILD @@ -3,10 +3,11 @@ pkgname=shorewall6 pkgver=5.2.2 -_ver=$pkgver +_maj_min_patch=$pkgver case $pkgver in - *.*.*.*) _ver=${pkgver%.*};; + *.*.*.*) _maj_min_patch=${pkgver%.*};; esac +_maj_min=${_maj_min_patch%.*} pkgrel=0 pkgdesc="Files for the IPV6 Shorewall Firewall" @@ -18,7 +19,7 @@ depends="shorewall-core perl ip6tables iproute2" # coreutils for install -T makedepends="coreutils bash" subpackages="$pkgname-doc" -source="http://www.shorewall.net/pub/shorewall/${_ver%.*}/shorewall-$_ver/$pkgname-$pkgver.tar.bz2 +source="http://www.shorewall.net/pub/shorewall/$_maj_min/shorewall-$_maj_min_patch/$pkgname-$pkgver.tar.bz2 shorewall6.initd shorewallrc.alpine " @@ -27,7 +28,7 @@ builddir="$srcdir/$pkgname-$pkgver" prepare() { cd "$builddir" - default_prepare + default_prepare cp "$srcdir"/shorewallrc.alpine . } |