diff options
| -rw-r--r-- | fetchmail/PKGBUILD | 16 | ||||
| -rw-r--r-- | fetchmail/disable-sslv3.patch | 32 |
2 files changed, 22 insertions, 26 deletions
diff --git a/fetchmail/PKGBUILD b/fetchmail/PKGBUILD index 802a5c261..c7c14658c 100644 --- a/fetchmail/PKGBUILD +++ b/fetchmail/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Erich Eckner <arch at eckner dot net> pkgname=fetchmail -pkgver=6.3.26 -pkgrel=8 +pkgver=6.4.1 +pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('x86_64') url="http://www.fetchmail.info" @@ -12,13 +12,13 @@ makedepends=('python2') optdepends=('tk: for using fetchmailconf' 'python2: for using fetchmailconf') options=('!makeflags') -source=("https://sourceforge.net/projects/fetchmail/files/branch_6.3/${pkgname}-${pkgver}.tar.xz" +source=("https://sourceforge.net/projects/fetchmail/files/branch_${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'disable-sslv3.patch' 'fetchmail.tmpfiles' 'fetchmail.sysusers' 'fetchmail.service') -sha1sums=('de8dbe62a8edfa232ee4278257a1fe67aa1c797a' - 'dab3bf46b033e8ee7cadc020c1fb4ce325f46693' - '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' - 'b113cb61a866eff53cd8f113d084a99f01bf5d77' - '0fc1870a33d1e0efb70169ddf1b6adc9d253e076') +sha512sums=('940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0' + '1425f3655c8fe7c6ca32b6fc876fd7f0ecfb24a86f63d9ee123fe710ebbdd8fbf5b5ef0f1831cd9702de56cc707a2361a427cf2ed840b63a39beda71a18dfba3' + 'f6e3eb409a1d88bcfb02012491fdbbf859803dbee45998879525fd35a2377bae95504da8aafcb24bcc2e695e15c96f6ec6f7e6521d28012370a4ec5e2a25a351' + 'c1169c54b70be53e3093d65a2d0f1e251fadf24a8008484583d79dd3cedea13782137c0db5f9052b2d02fdbd6bd0fdcb78c6403fe39926ac636b45a44d452b29' + '49c2843ddb06f587611f838bc9dab3fe04af991d70c27f8ffdd6351d8d6401683a356a03401e232a53e44ee43f6d85aa520f233f256974d07972913145fdf0f5') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/fetchmail/disable-sslv3.patch b/fetchmail/disable-sslv3.patch index 2edc41e2b..7c4833aff 100644 --- a/fetchmail/disable-sslv3.patch +++ b/fetchmail/disable-sslv3.patch @@ -1,20 +1,16 @@ -diff -u -r fetchmail-6.3.26/socket.c fetchmail-6.3.26-nossl3/socket.c ---- fetchmail-6.3.26/socket.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26-nossl3/socket.c 2016-03-03 18:18:46.688881618 +0100 -@@ -907,14 +907,11 @@ - _ssl_context[sock] = NULL; - if(myproto) { - if(!strcasecmp("ssl2",myproto)) { --#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 -- _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); +--- fetchmail-6.4.1/socket.c 2019-09-15 17:48:53.000000000 +0200 ++++ fetchmail-6.4.1/socket.c 2019-09-30 07:13:58.260770910 +0200 +@@ -905,13 +905,8 @@ + } + + if (!strcasecmp("ssl3", *myproto)) { +-#if (HAVE_DECL_SSLV3_CLIENT_METHOD > 0) && (0 == OPENSSL_NO_SSL3 + 0) +- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); +- *avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; -#else - report(stderr, GT_("Your operating system does not support SSLv2.\n")); - return -1; + report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); + return -1; -#endif - } else if(!strcasecmp("ssl3",myproto)) { -- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+ report(stderr, GT_("Your operating system does not support SSLv3.\n")); -+ return -1; - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { + } else if (!strcasecmp("ssl3+", *myproto)) { + *avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; + *myproto = NULL; |