Date: Wednesday, March 15, 2017 @ 09:13:32
Author: jsteel
Revision: 216402
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
isync/repos/community-staging-i686/
isync/repos/community-staging-i686/PKGBUILD
(from rev 216401, isync/trunk/PKGBUILD)
isync/repos/community-staging-i686/openssl1.1.patch
(from rev 216401, isync/trunk/openssl1.1.patch)
isync/repos/community-staging-x86_64/
isync/repos/community-staging-x86_64/PKGBUILD
(from rev 216401, isync/trunk/PKGBUILD)
isync/repos/community-staging-x86_64/openssl1.1.patch
(from rev 216401, isync/trunk/openssl1.1.patch)
-------------------------------------------+
community-staging-i686/PKGBUILD | 38 ++++++++++++++++++++++++++++
community-staging-i686/openssl1.1.patch | 31 ++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 38 ++++++++++++++++++++++++++++
community-staging-x86_64/openssl1.1.patch | 31 ++++++++++++++++++++++
4 files changed, 138 insertions(+)
Copied: isync/repos/community-staging-i686/PKGBUILD (from rev 216401,
isync/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-03-15 09:13:32 UTC (rev 216402)
@@ -0,0 +1,38 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Mark Pustjens <[email protected]>
+# Contributor: Geoffroy Carrier <[email protected]>
+# Contributor: Giorgio Lando <[email protected]>
+# Contributor: Leslie P. Polzer <[email protected]>
+
+pkgname=isync
+pkgver=1.2.1
+pkgrel=3
+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')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../openssl1.1.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Copied: isync/repos/community-staging-i686/openssl1.1.patch (from rev 216401,
isync/trunk/openssl1.1.patch)
===================================================================
--- community-staging-i686/openssl1.1.patch (rev 0)
+++ community-staging-i686/openssl1.1.patch 2017-03-15 09:13:32 UTC (rev
216402)
@@ -0,0 +1,31 @@
+--- 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 ) );
Copied: isync/repos/community-staging-x86_64/PKGBUILD (from rev 216401,
isync/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-03-15 09:13:32 UTC (rev 216402)
@@ -0,0 +1,38 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Mark Pustjens <[email protected]>
+# Contributor: Geoffroy Carrier <[email protected]>
+# Contributor: Giorgio Lando <[email protected]>
+# Contributor: Leslie P. Polzer <[email protected]>
+
+pkgname=isync
+pkgver=1.2.1
+pkgrel=3
+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')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../openssl1.1.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Copied: isync/repos/community-staging-x86_64/openssl1.1.patch (from rev 216401,
isync/trunk/openssl1.1.patch)
===================================================================
--- community-staging-x86_64/openssl1.1.patch (rev 0)
+++ community-staging-x86_64/openssl1.1.patch 2017-03-15 09:13:32 UTC (rev
216402)
@@ -0,0 +1,31 @@
+--- 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 ) );
