diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 07:46:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:16 +0000 |
| commit | d2e4cecc82a64cf72ff60d2b8fd189aa61307712 (patch) | |
| tree | 89809ada61dca074d605643514fa26f0a70862d6 /testing/imapfilter | |
| parent | 0225c0e1f5612c8875ff117e2eb41552805efcf1 (diff) | |
| download | aports-d2e4cecc82a64cf72ff60d2b8fd189aa61307712.tar.bz2 aports-d2e4cecc82a64cf72ff60d2b8fd189aa61307712.tar.xz | |
testing/imapfilter: upgrade to 2.6.12 and modernize
Diffstat (limited to 'testing/imapfilter')
| -rw-r--r-- | testing/imapfilter/APKBUILD | 43 | ||||
| -rw-r--r-- | testing/imapfilter/io-flush.patch | 12 | ||||
| -rw-r--r-- | testing/imapfilter/libressl.patch | 53 |
3 files changed, 10 insertions, 98 deletions
diff --git a/testing/imapfilter/APKBUILD b/testing/imapfilter/APKBUILD index f4cb9c6d72..a7a989b109 100644 --- a/testing/imapfilter/APKBUILD +++ b/testing/imapfilter/APKBUILD @@ -1,53 +1,30 @@ # Contributor: Andrew Hills <ahills@ednos.net> # Maintainer: Andrew Hills <ahills@ednos.net> pkgname=imapfilter -pkgver=2.5.7 -pkgrel=5 +pkgver=2.6.12 +pkgrel=0 pkgdesc="Lua-based filtering for IMAP mailboxes" url="https://github.com/lefcha/imapfilter" arch="all" license="MIT" -depends="" -depends_dev= -makedepends="$depends_dev lua-dev libressl-dev pcre-dev libc-dev" -install= +makedepends="$depends_dev lua-dev openssl-dev pcre-dev libc-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/lefcha/$pkgname/archive/v${pkgver}.tar.gz - io-flush.patch - libressl.patch " -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - +builddir="$srcdir"/$pkgname-$pkgver build() { cd "$_builddir" - make PREFIX=/usr all || return 1 + make PREFIX=/usr all } package() { cd "$_builddir" make \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - DESTDIR="$pkgdir" \ - install + PREFIX=/usr \ + MANDIR=/usr/share/man \ + DESTDIR="$pkgdir" \ + install } -md5sums="5af01afcca4a24b46f113f36bc3eaef8 imapfilter-2.5.7.tar.gz -c005e65cae202f8f6779380996d51ee1 io-flush.patch -27ba5b28471fe3c401353d3a46b5caa3 libressl.patch" -sha256sums="c792d6a3a187cdc14fc38470837b45722a3750dabd2c6f71672806eeef79fad0 imapfilter-2.5.7.tar.gz -14c49fd8ced2a0730a0b21e20e5b2149ad3a65eca55e258d591fef3f06befb59 io-flush.patch -c57570be4d854615d9b466af594c10bda6e2819640b197e7ae183838cfb362ff libressl.patch" -sha512sums="9297e98812312fbf2c92aa5477bdfecb522048e45b4bc4922e312bd89a72b020a98f5547e3f0882ae665c24db21e6995eda839b762947adc48bc413ab0c882f1 imapfilter-2.5.7.tar.gz -ab11ad7b52f0b56119e6da636bf4c53f09ca9f2fe8a7083fc9af9528ba0d67657b639283a3100868c919b3958c812ae7169d8879af4b7205f43207458e0b8073 io-flush.patch -416614d44f64627f9e3dbbf0b11972618dde5129dbfd494289b63db491b8c9b8c1fee44112237af88ea42bd9a803c0b7a64de16d33b81d3d775b237bcc6a8626 libressl.patch" +sha512sums="1425041c288ac46833af6119fd0169cf783a1fec61bf07dfad6f732ec74834ec3beb4e81c3b19f7436310324d9a4369c4ec61aa3a83eef203d7897ea0fc26528 imapfilter-2.6.12.tar.gz" diff --git a/testing/imapfilter/io-flush.patch b/testing/imapfilter/io-flush.patch deleted file mode 100644 index ee42978b77..0000000000 --- a/testing/imapfilter/io-flush.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/auxiliary.lua b/src/auxiliary.lua -index 9284d25..d59bf71 100644 ---- a/src/auxiliary.lua -+++ b/src/auxiliary.lua -@@ -14,6 +14,7 @@ function get_password(prompt) - else - io.write('Enter password: ') - end -+ io.flush() - ifsys.noecho() - local p = io.read() - ifsys.echo() diff --git a/testing/imapfilter/libressl.patch b/testing/imapfilter/libressl.patch deleted file mode 100644 index e8b0de6ced..0000000000 --- a/testing/imapfilter/libressl.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/src/imapfilter.c.orig 2014-11-17 00:36:40.000000000 +0000 -+++ b/src/imapfilter.c 2015-12-27 11:04:14.643145411 +0000 -@@ -21,7 +21,10 @@ - - extern buffer ibuf, obuf, nbuf, cbuf; - extern regexp responses[]; --extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx; -+extern SSL_CTX *ssl23ctx, *tls1ctx; -+#ifndef OPENSSL_NO_SSL3_METHOD -+extern SSL_CTX *ssl3ctx; -+#endif - #if OPENSSL_VERSION_NUMBER >= 0x01000100fL - extern SSL_CTX *tls11ctx, *tls12ctx; - #endif -@@ -51,7 +54,7 @@ - opts.config = NULL; - opts.oneline = NULL; - opts.debug = NULL; -- opts.truststore = "/etc/ssl/certs"; -+ opts.truststore = "/etc/ssl/cert.pem"; - - env.home = NULL; - env.pathmax = -1; -@@ -108,7 +111,9 @@ - - SSL_library_init(); - SSL_load_error_strings(); -+#ifndef OPENSSL_NO_SSL3_METHOD - ssl3ctx = SSL_CTX_new(SSLv3_client_method()); -+#endif - ssl23ctx = SSL_CTX_new(SSLv23_client_method()); - tls1ctx = SSL_CTX_new(TLSv1_client_method()); - #if OPENSSL_VERSION_NUMBER >= 0x01000100fL -@@ -116,7 +121,9 @@ - tls12ctx = SSL_CTX_new(TLSv1_2_client_method()); - #endif - if (exists_dir(opts.truststore)) { -+#ifndef OPENSSL_NO_SSL3_METHOD - SSL_CTX_load_verify_locations(ssl3ctx, NULL, opts.truststore); -+#endif - SSL_CTX_load_verify_locations(ssl23ctx, NULL, opts.truststore); - SSL_CTX_load_verify_locations(tls1ctx, NULL, opts.truststore); - #if OPENSSL_VERSION_NUMBER >= 0x01000100fL -@@ -142,7 +149,9 @@ - #endif - stop_lua(); - -+#ifndef OPENSSL_NO_SSL3_METHOD - SSL_CTX_free(ssl3ctx); -+#endif - SSL_CTX_free(ssl23ctx); - SSL_CTX_free(tls1ctx); - #if OPENSSL_VERSION_NUMBER >= 0x01000100fL |