[arch-commits] Commit in isync/trunk (PKGBUILD openssl1.1.patch)

[Jonathan Steel]

    Date: Monday, August 7, 2017 @ 13:04:05
  Author: jsteel
Revision: 249440

upgpkg: isync 1.2.2-1

Modified:
  isync/trunk/PKGBUILD
Deleted:
  isync/trunk/openssl1.1.patch

------------------+
 PKGBUILD         |   21 ++++++++-------------
 openssl1.1.patch |   31 -------------------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2017-08-07 12:58:27 UTC (rev 249439)
+++ PKGBUILD    2017-08-07 13:04:05 UTC (rev 249440)
@@ -5,24 +5,19 @@
 # Contributor: Leslie P. Polzer <pol...@gnu.org>
 
 pkgname=isync
-pkgver=1.2.1
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="IMAP and MailDir mailbox synchronizer"
 arch=('i686' 'x86_64')
 url="http://isync.sourceforge.net";
 license=('GPL2')
-depends=('openssl' 'libsasl')
-source=(http://downloads.sourceforge.net/sourceforge/isync/$pkgname-$pkgver.tar.gz
-        openssl1.1.patch)
-md5sums=('7ba1a07c7b487a3ab5fef54d0071f1dd'
-         '1ce3b3bec49ed33bc259456429c76ff6')
+depends=('libsasl' 'zlib')
+source=(https://downloads.sourceforge.net/sourceforge/isync/$pkgname-$pkgver.tar.gz
+        
https://downloads.sourceforge.net/sourceforge/isync/$pkgname-$pkgver.tar.gz.asc)
+md5sums=('f7b63f10dd6ab9c7d03d813cb6325a99'
+         'SKIP')
+validpgpkeys=('96DD32BFBF9FAB04B0D95305AA283E0B2F1BB1D1')
 
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../openssl1.1.patch
-}
-
 build() {
   cd $pkgname-$pkgver
 

Deleted: openssl1.1.patch
===================================================================
--- openssl1.1.patch    2017-08-07 12:58:27 UTC (rev 249439)
+++ openssl1.1.patch    2017-08-07 13:04:05 UTC (rev 249440)
@@ -1,31 +0,0 @@
---- a/src/socket.c     2017-03-15 09:00:48.547537432 +0000
-+++ b/src/socket.c     2017-03-15 09:02:10.091354912 +0000
-@@ -41,6 +41,10 @@
- # include <openssl/err.h>
- # include <openssl/hmac.h>
- # include <openssl/x509v3.h>
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
-+#  define X509_STORE_get0_objects(o) ((o)->objs)
-+# endif
- #endif
- 
- enum {
-@@ -172,7 +176,7 @@
- 
-       trusted = (STACK_OF(X509_OBJECT) *)sock->conf->trusted_certs;
-       for (i = 0; i < sk_X509_OBJECT_num( trusted ); i++) {
--              if (!X509_cmp( cert, sk_X509_OBJECT_value( trusted, i 
)->data.x509 ))
-+              if (!X509_cmp( cert, X509_OBJECT_get0_X509( 
sk_X509_OBJECT_value( trusted, i ) ) ))
-                       return 0;
-       }
- 
-@@ -223,7 +227,7 @@
-                      conf->cert_file, ERR_error_string( ERR_get_error(), 0 ) 
);
-               return 0;
-       }
--      mconf->trusted_certs = (_STACK *)sk_X509_OBJECT_dup( 
SSL_CTX_get_cert_store( mconf->SSLContext )->objs );
-+      mconf->trusted_certs = (_STACK *)sk_X509_OBJECT_dup( 
X509_STORE_get0_objects( SSL_CTX_get_cert_store( mconf->SSLContext ) ) );
-       if (mconf->system_certs && !SSL_CTX_set_default_verify_paths( 
mconf->SSLContext ))
-               warn( "Warning: Unable to load default certificate files: %s\n",
-                     ERR_error_string( ERR_get_error(), 0 ) );