diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-30 10:25:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:11 +0000 |
| commit | 8623682b8b306e297293f47399e2cdfe7f6ddbc2 (patch) | |
| tree | d0950e086af1ed1046454e3aac462bb5e0cefa08 | |
| parent | e83662181d2ff78a69b643eaea1453955190fa56 (diff) | |
| download | aports-8623682b8b306e297293f47399e2cdfe7f6ddbc2.tar.bz2 aports-8623682b8b306e297293f47399e2cdfe7f6ddbc2.tar.xz | |
main/perdition: upgrade to 2.2
| -rw-r--r-- | main/perdition/APKBUILD | 51 | ||||
| -rw-r--r-- | main/perdition/gdbm-version.patch | 26 |
2 files changed, 18 insertions, 59 deletions
diff --git a/main/perdition/APKBUILD b/main/perdition/APKBUILD index 5277b64245..e28cfacbc5 100644 --- a/main/perdition/APKBUILD +++ b/main/perdition/APKBUILD @@ -1,36 +1,26 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perdition -pkgver=1.18 -pkgrel=11 +pkgver=2.2 +pkgrel=0 pkgdesc="A Mail retrieval proxy" url="http://horms.net/projects/perdition/" arch="all" license="LGPL" depends= -depends_dev="gdbm-dev libressl-dev popt-dev vanessa_adt-dev vanessa_logger-dev +depends_dev="gdbm-dev openssl-dev popt-dev vanessa_adt-dev vanessa_logger-dev vanessa_socket-dev" makedepends="$depends_dev" install=$pkgname.pre-install subpackages="$pkgname-doc" -source="http://horms.net/projects/perdition/download/$pkgver/$pkgname-$pkgver.tar.bz2 - gdbm-version.patch" +source="http://horms.net/projects/perdition/download/$pkgver/perdition-$pkgver.tar.xz + perdition.initd + perdition.confd + " - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - return 0 -} +builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -47,23 +37,18 @@ build() { --disable-nis \ --disable-posix-regex \ --disable-ldap \ - --disable-daemon-map \ - || return 1 - - make || return 1 + --disable-daemon-map + make } package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + cd "$builddir" + make DESTDIR="$pkgdir" install - install -m755 -D ../../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="df84d5fc4ab78b94a9baf17c5790ba38 perdition-1.18.tar.bz2 -cfdd151cb92d2283151b8e48caf04337 gdbm-version.patch" -sha256sums="0a8793898fc20f1391092550cbbeb808cea73c110fe0aeee172ed73fe0775263 perdition-1.18.tar.bz2 -551c993e4a77cca29a293c293dcf2f47a4c0eeb1e0e0f992b6b9d4b5934e6a19 gdbm-version.patch" -sha512sums="02ed3db23746c0b371bc546151d15bfc956df36251cb386731a0381fceb564f72271379e5afca7469d80edb88bc2f6fb43c640f8ad76a46d6f11e9ab72d213d3 perdition-1.18.tar.bz2 -6adfac02fdbbdfff779693204819ea7d931400161517782dac7765a34d075ba0492b2be8f0160acc68fa83aabdbb728288eb462bb2e95b594a7fffdbce39b069 gdbm-version.patch" +sha512sums="1ee64505ffe5ad11893fe61a37343fd004d5c15ea88b3dd18e790482248d4b68adc57f2b9c4a1fc12b06087fa7fa01f913db6d1e44bd7e82fd549fd85937a866 perdition-2.2.tar.xz +02edb024edf1684efc3be1d9019b654e14f23d81f3746336f4a9699559fdac5e4874d775997454b87e8ddeec3cd7bcc954cb8ee61d358c85fd7e7ce75a944633 perdition.initd +49c765a24d828be9a0e8032778a5430028e41de18fa83bbe10806f454283e91fdda7f7cb62cfab4778501582597228806d3a86984cb9f2cb3254cf2d989a08ea perdition.confd" diff --git a/main/perdition/gdbm-version.patch b/main/perdition/gdbm-version.patch deleted file mode 100644 index ae33fd92ae..0000000000 --- a/main/perdition/gdbm-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -gdbm.h has a conficting declaration of gdbm_version - -diff --git a/makegdbm/options.h b/makegdbm/options.h -index 51597d1..9019af7 100644 ---- a/makegdbm/options.h -+++ b/makegdbm/options.h -@@ -39,7 +39,6 @@ - #endif - - extern gdbm_error gdbm_errno; --extern char *gdbm_version; - - #define COPYRIGHT \ - "(c) 1999 Horms <horms@verge.net.au>\nReleased under the GNU GPL\n" -diff --git a/perdition/db/gdbm/perditiondb_gdbm.h b/perdition/db/gdbm/perditiondb_gdbm.h -index 4047025..c23a8db 100644 ---- a/perdition/db/gdbm/perditiondb_gdbm.h -+++ b/perdition/db/gdbm/perditiondb_gdbm.h -@@ -31,7 +31,6 @@ - #include <gdbm.h> - - extern gdbm_error gdbm_errno; --extern char *gdbm_version; - - #ifndef PERDITIONDB_GDBM_SYSCONFDIR - #define PERDITIONDB_GDBM_SYSCONFDIR "/usr/local/etc/perdition" |