diff options
-rw-r--r-- | main/spamassassin/APKBUILD | 12 | ||||
-rw-r--r-- | main/wpa_supplicant/APKBUILD | 25 |
2 files changed, 22 insertions, 15 deletions
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index a8744cb9fa..c82a4a2f8c 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -1,19 +1,22 @@ +# Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=spamassassin _realname=Mail-SpamAssassin -pkgver=3.3.0 +pkgver=3.2.5 pkgrel=1 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="http://spamassassin.apache.org" license="Apache" -depends="perl perl-digest-sha1 perl-time-hires perl-netaddr-ip perl-mail-dkim perl-html-parser perl-net-dns perl-db_file" +depends="perl perl-digest-sha1 perl-html-parser perl-net-dns perl-db_file" makedepends="perl-dev zlib-dev" install= subpackages="$pkgname-doc" -source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz" +source="http://www.apache.org/dist/spamassassin/source/$_realname-3.2.5.tar.gz + spamassassin-3.2.5-DESTDIR.patch" prepare() { cd "$srcdir/$_realname-$pkgver" + patch -p1 -i ../spamassassin-3.2.5-DESTDIR.patch || return 1 } build() { @@ -34,4 +37,5 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="38078b07396c0ab92b46386bc70ef086 Mail-SpamAssassin-3.3.0.tar.gz" +md5sums="7fdc1651d0371c4a7f95ac9ae6f828a6 Mail-SpamAssassin-3.2.5.tar.gz +45885134199c9427add4d9bcb46311cf spamassassin-3.2.5-DESTDIR.patch" diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index 6a2f978c84..bdcbd9bff1 100644 --- a/main/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wpa_supplicant -pkgver=0.6.10 +pkgver=0.7.1 pkgrel=0 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" @@ -88,12 +88,12 @@ prepare() { build() { cd "$_builddir" - make || return 1 + make LIBDIR=/lib BINDIR=/sbin || return 1 } package() { cd "$_builddir" - make PREFIX=/usr DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" LIBDIR=/lib BINDIR=/sbin install || return 1 install -Dm644 wpa_supplicant.conf "$pkgdir"/etc/wpa_supplicant.conf install -Dm644 doc/docbook/wpa_supplicant.conf.5 \ "$pkgdir"/usr/share/man/man5/wpa_supplicant.conf.5 || return 1 @@ -102,12 +102,15 @@ package() { install -Dm644 doc/docbook/$i.8 \ "$pkgdir"/usr/share/man/man8/$i.8 || return 1 done - install -m755 -d "$pkgdir"/usr/share/dbus-1/system-services - sed -e 's/sbin/usr\/sbin/' -i dbus-wpa_supplicant.service - install -m644 dbus-wpa_supplicant.service \ - "$pkgdir"/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service || return 1 - install -m755 -d "$pkgdir"/etc/dbus-1/system.d - install -m644 dbus-wpa_supplicant.conf \ - "$pkgdir"/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf || return 1 + + # dbus + cd dbus || return 1 + install -d "$pkgdir"/etc/dbus-1/system.d + install dbus-wpa_supplicant.conf \ + "$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf || return 1 + install -d "$pkgdir"/usr/share/dbus-1/system-services + install fi.epitest.hostap.WPASupplicant.service \ + "$pkgdir"/usr/share/dbus-1/system-services || return 1 + install -d "$pkgdir"/var/run/wpa_supplicant } -md5sums="8985b1030d753e5f74f8acfc34e591bb wpa_supplicant-0.6.10.tar.gz" +md5sums="02c475f949e5c131856915bbb87fa55d wpa_supplicant-0.7.1.tar.gz" |