[arch-commits] Commit in isync/repos (6 files)
Jonathan Steel
jsteel at archlinux.org
Mon Aug 7 13:04:22 UTC 2017
Date: Monday, August 7, 2017 @ 13:04:21
Author: jsteel
Revision: 249441
archrelease: copy trunk to community-i686, community-x86_64
Added:
isync/repos/community-i686/PKGBUILD
(from rev 249440, isync/trunk/PKGBUILD)
isync/repos/community-x86_64/PKGBUILD
(from rev 249440, isync/trunk/PKGBUILD)
Deleted:
isync/repos/community-i686/PKGBUILD
isync/repos/community-i686/openssl1.1.patch
isync/repos/community-x86_64/PKGBUILD
isync/repos/community-x86_64/openssl1.1.patch
-----------------------------------+
/PKGBUILD | 66 ++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 38 --------------------
community-i686/openssl1.1.patch | 31 ----------------
community-x86_64/PKGBUILD | 38 --------------------
community-x86_64/openssl1.1.patch | 31 ----------------
5 files changed, 66 insertions(+), 138 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-08-07 13:04:05 UTC (rev 249440)
+++ community-i686/PKGBUILD 2017-08-07 13:04:21 UTC (rev 249441)
@@ -1,38 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Mark Pustjens <pustjens at dds.nl>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-# Contributor: Giorgio Lando <patroclo7 at gmail.com>
-# Contributor: Leslie P. Polzer <polzer at gnu.org>
-
-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-i686/PKGBUILD (from rev 249440, isync/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-08-07 13:04:21 UTC (rev 249441)
@@ -0,0 +1,33 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Mark Pustjens <pustjens at dds.nl>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Giorgio Lando <patroclo7 at gmail.com>
+# Contributor: Leslie P. Polzer <polzer at gnu.org>
+
+pkgname=isync
+pkgver=1.2.2
+pkgrel=1
+pkgdesc="IMAP and MailDir mailbox synchronizer"
+arch=('i686' 'x86_64')
+url="http://isync.sourceforge.net"
+license=('GPL2')
+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')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/openssl1.1.patch
===================================================================
--- community-i686/openssl1.1.patch 2017-08-07 13:04:05 UTC (rev 249440)
+++ community-i686/openssl1.1.patch 2017-08-07 13:04:21 UTC (rev 249441)
@@ -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 ) );
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-08-07 13:04:05 UTC (rev 249440)
+++ community-x86_64/PKGBUILD 2017-08-07 13:04:21 UTC (rev 249441)
@@ -1,38 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Mark Pustjens <pustjens at dds.nl>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-# Contributor: Giorgio Lando <patroclo7 at gmail.com>
-# Contributor: Leslie P. Polzer <polzer at gnu.org>
-
-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-x86_64/PKGBUILD (from rev 249440, isync/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-08-07 13:04:21 UTC (rev 249441)
@@ -0,0 +1,33 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Mark Pustjens <pustjens at dds.nl>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Giorgio Lando <patroclo7 at gmail.com>
+# Contributor: Leslie P. Polzer <polzer at gnu.org>
+
+pkgname=isync
+pkgver=1.2.2
+pkgrel=1
+pkgdesc="IMAP and MailDir mailbox synchronizer"
+arch=('i686' 'x86_64')
+url="http://isync.sourceforge.net"
+license=('GPL2')
+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')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/openssl1.1.patch
===================================================================
--- community-x86_64/openssl1.1.patch 2017-08-07 13:04:05 UTC (rev 249440)
+++ community-x86_64/openssl1.1.patch 2017-08-07 13:04:21 UTC (rev 249441)
@@ -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 ) );
More information about the arch-commits
mailing list