diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-07-14 06:51:50 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-07-14 07:40:25 +0000 |
| commit | e3042106c1e1fc1df2455968a6f0ca10a4566da3 (patch) | |
| tree | 4374fe63d12f205eb95423fcf6eb1855e9d30148 /main | |
| parent | d9d1089663d3b68f600845967fc4906d852452b5 (diff) | |
| download | aports-e3042106c1e1fc1df2455968a6f0ca10a4566da3.tar.bz2 aports-e3042106c1e1fc1df2455968a6f0ca10a4566da3.tar.xz | |
main/xtables-addons-grsec: upgrade to 1.37 and use install_if
Diffstat (limited to 'main')
| -rw-r--r-- | main/xtables-addons-grsec/APKBUILD | 8 | ||||
| -rw-r--r-- | main/xtables-addons/APKBUILD | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 898230188b..bdc4e3b87c 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -12,8 +12,8 @@ _kpkgrel=$pkgrel pkgname=${_realname}-${_flavor} pkgver=${pkgver} -_realver=1.36 -_mypkgrel=1 +_realver=1.37 +_mypkgrel=2 pkgrel=$(($_kpkgrel + $_mypkgrel)) pkgdesc="Iptables extensions kernel modules" url="http://xtables-addons.sourceforge.net/" @@ -22,6 +22,7 @@ license="GPL" depends="linux-${_flavor}=${_kernelver}" makedepends="linux-${_flavor}-dev=${_kernelver} iptables-dev pkgconfig" install= +install_if="linux-$_flavor=$_kernelver $_realname" subpackages= source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.xz" @@ -36,6 +37,7 @@ build() { --with-kbuild=/usr/src/linux-headers-${_abi_release} cd extensions + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make CC="${CC:-gcc}" modules || return 1 } @@ -44,4 +46,4 @@ package() { make DESTDIR="$pkgdir" modules_install } -md5sums="2b976f502f626ed2245d276d83efc451 xtables-addons-1.36.tar.xz" +md5sums="bfb0adba948fa885fffa6443eeaee28a xtables-addons-1.37.tar.xz" diff --git a/main/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD index ab72e6a844..8352692518 100644 --- a/main/xtables-addons/APKBUILD +++ b/main/xtables-addons/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xtables-addons -pkgver=1.36 +pkgver=1.37 pkgrel=0 pkgdesc="Netfilter userspace extensions for iptables" url="http://xtables-addons.sourceforge.net/" arch="all" license="GPL" depends= -makedepends="iptables-dev pkgconfig bash" +makedepends="iptables-dev pkgconfig bash coreutils" install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz" @@ -24,7 +24,8 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make builddir= DESTDIR="$pkgdir" install + make builddir= DESTDIR="$pkgdir" install || return 1 + rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="2b976f502f626ed2245d276d83efc451 xtables-addons-1.36.tar.xz" +md5sums="bfb0adba948fa885fffa6443eeaee28a xtables-addons-1.37.tar.xz" |