[arch-commits] Commit in polarssl/repos (10 files)
Kyle Keen
kkeen at archlinux.org
Tue Jan 20 12:05:54 UTC 2015
Date: Tuesday, January 20, 2015 @ 13:05:53
Author: kkeen
Revision: 126299
archrelease: copy trunk to community-i686, community-x86_64
Added:
polarssl/repos/community-i686/CVE-2015-1182.patch
(from rev 126298, polarssl/trunk/CVE-2015-1182.patch)
polarssl/repos/community-i686/PKGBUILD
(from rev 126298, polarssl/trunk/PKGBUILD)
polarssl/repos/community-i686/programs.makefile.patch
(from rev 126298, polarssl/trunk/programs.makefile.patch)
polarssl/repos/community-x86_64/CVE-2015-1182.patch
(from rev 126298, polarssl/trunk/CVE-2015-1182.patch)
polarssl/repos/community-x86_64/PKGBUILD
(from rev 126298, polarssl/trunk/PKGBUILD)
polarssl/repos/community-x86_64/programs.makefile.patch
(from rev 126298, polarssl/trunk/programs.makefile.patch)
Deleted:
polarssl/repos/community-i686/PKGBUILD
polarssl/repos/community-i686/programs.makefile.patch
polarssl/repos/community-x86_64/PKGBUILD
polarssl/repos/community-x86_64/programs.makefile.patch
------------------------------------------+
/PKGBUILD | 96 +++++++++++++++++++++++++++++
/programs.makefile.patch | 44 +++++++++++++
community-i686/CVE-2015-1182.patch | 13 +++
community-i686/PKGBUILD | 41 ------------
community-i686/programs.makefile.patch | 22 ------
community-x86_64/CVE-2015-1182.patch | 13 +++
community-x86_64/PKGBUILD | 41 ------------
community-x86_64/programs.makefile.patch | 22 ------
8 files changed, 166 insertions(+), 126 deletions(-)
Copied: polarssl/repos/community-i686/CVE-2015-1182.patch (from rev 126298, polarssl/trunk/CVE-2015-1182.patch)
===================================================================
--- community-i686/CVE-2015-1182.patch (rev 0)
+++ community-i686/CVE-2015-1182.patch 2015-01-20 12:05:53 UTC (rev 126299)
@@ -0,0 +1,13 @@
+diff --git a/library/asn1parse.c b/library/asn1parse.c
+index a3a2b56..e2117bf 100644
+--- a/library/asn1parse.c
++++ b/library/asn1parse.c
+@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char **p,
+ if( cur->next == NULL )
+ return( POLARSSL_ERR_ASN1_MALLOC_FAILED );
+
++ memset( cur->next, 0, sizeof( asn1_sequence ) );
++
+ cur = cur->next;
+ }
+ }
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-20 12:04:44 UTC (rev 126298)
+++ community-i686/PKGBUILD 2015-01-20 12:05:53 UTC (rev 126299)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Mihai Militaru <mihai militaru at xmpp dot ro>
-# Contributor: carstene1ns <arch carsten-teibes.de>
-
-pkgname=polarssl
-pkgver=1.3.9
-pkgrel=1
-pkgdesc="Portable cryptographic and SSL/TLS library"
-arch=('i686' 'x86_64')
-url="https://www.polarssl.org/"
-license=('GPL2')
-source=("https://polarssl.org/download/polarssl-$pkgver-gpl.tgz"
- "programs.makefile.patch")
-sha1sums=('3462b4455e1443ac1a1007fbd69861ebfb5c5506'
- '1e9e7d3dcdd6932b02d6dcabdf45041a3726f1be')
-depends=('glibc')
-options=('staticlibs')
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch
-# https://github.com/alucryd/aur-alucryd/blob/master/personal/polarssl/PKGBUILD
-# https://aur.archlinux.org/packages/po/polarssl-git/PKGBUILD
-
-build() {
- cd "$pkgname-$pkgver"
- sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h
- sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h
- # enable cert_write
- patch -p1 -d programs -i "$srcdir/programs.makefile.patch"
- LDFLAGS+=" -I../include " make SHARED=1 no_test
-}
-
-check() {
- cd "$pkgname-$pkgver"
- make SHARED=1 check
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir/usr" install
-}
Copied: polarssl/repos/community-i686/PKGBUILD (from rev 126298, polarssl/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-20 12:05:53 UTC (rev 126299)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Mihai Militaru <mihai militaru at xmpp dot ro>
+# Contributor: carstene1ns <arch carsten-teibes.de>
+
+pkgname=polarssl
+pkgver=1.3.9
+pkgrel=2
+pkgdesc="Portable cryptographic and SSL/TLS library"
+arch=('i686' 'x86_64')
+url="https://www.polarssl.org/"
+license=('GPL2')
+source=("https://polarssl.org/download/polarssl-$pkgver-gpl.tgz"
+ "programs.makefile.patch"
+ "CVE-2015-1182.patch")
+sha1sums=('3462b4455e1443ac1a1007fbd69861ebfb5c5506'
+ '1e9e7d3dcdd6932b02d6dcabdf45041a3726f1be'
+ '94317c4757063d006fb4e666b522b581326ba708')
+depends=('glibc')
+options=('staticlibs')
+
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch
+# https://github.com/alucryd/aur-alucryd/blob/master/personal/polarssl/PKGBUILD
+# https://aur.archlinux.org/packages/po/polarssl-git/PKGBUILD
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/CVE-2015-1182.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h
+ sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h
+ # enable cert_write
+ patch -p1 -d programs -i "$srcdir/programs.makefile.patch"
+ LDFLAGS+=" -I../include " make SHARED=1 no_test
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ make SHARED=1 check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/usr" install
+}
Deleted: community-i686/programs.makefile.patch
===================================================================
--- community-i686/programs.makefile.patch 2015-01-20 12:04:44 UTC (rev 126298)
+++ community-i686/programs.makefile.patch 2015-01-20 12:05:53 UTC (rev 126299)
@@ -1,22 +0,0 @@
---- programs/Makefile 2014-07-31 12:20:17.748459143 -0400
-+++ programs/Makefile 2014-07-31 12:21:35.388454356 -0400
-@@ -43,7 +43,7 @@
- test/selftest test/ssl_test \
- util/pem2der util/strerror \
- x509/cert_app x509/crl_app \
-- x509/cert_req
-+ x509/cert_req x509/cert_write
-
- ifdef OPENSSL
- APPS += test/o_p_test
-@@ -241,6 +241,10 @@
- echo " CC x509/cert_req.c"
- $(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@
-
-+x509/cert_write: x509/cert_write.c ../library/libpolarssl.a
-+ echo " CC x509/cert_write.c"
-+ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_write.c $(LDFLAGS) -o $@
-+
- clean:
- ifndef WINDOWS
- rm -f $(APPS)
Copied: polarssl/repos/community-i686/programs.makefile.patch (from rev 126298, polarssl/trunk/programs.makefile.patch)
===================================================================
--- community-i686/programs.makefile.patch (rev 0)
+++ community-i686/programs.makefile.patch 2015-01-20 12:05:53 UTC (rev 126299)
@@ -0,0 +1,22 @@
+--- programs/Makefile 2014-07-31 12:20:17.748459143 -0400
++++ programs/Makefile 2014-07-31 12:21:35.388454356 -0400
+@@ -43,7 +43,7 @@
+ test/selftest test/ssl_test \
+ util/pem2der util/strerror \
+ x509/cert_app x509/crl_app \
+- x509/cert_req
++ x509/cert_req x509/cert_write
+
+ ifdef OPENSSL
+ APPS += test/o_p_test
+@@ -241,6 +241,10 @@
+ echo " CC x509/cert_req.c"
+ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@
+
++x509/cert_write: x509/cert_write.c ../library/libpolarssl.a
++ echo " CC x509/cert_write.c"
++ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_write.c $(LDFLAGS) -o $@
++
+ clean:
+ ifndef WINDOWS
+ rm -f $(APPS)
Copied: polarssl/repos/community-x86_64/CVE-2015-1182.patch (from rev 126298, polarssl/trunk/CVE-2015-1182.patch)
===================================================================
--- community-x86_64/CVE-2015-1182.patch (rev 0)
+++ community-x86_64/CVE-2015-1182.patch 2015-01-20 12:05:53 UTC (rev 126299)
@@ -0,0 +1,13 @@
+diff --git a/library/asn1parse.c b/library/asn1parse.c
+index a3a2b56..e2117bf 100644
+--- a/library/asn1parse.c
++++ b/library/asn1parse.c
+@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char **p,
+ if( cur->next == NULL )
+ return( POLARSSL_ERR_ASN1_MALLOC_FAILED );
+
++ memset( cur->next, 0, sizeof( asn1_sequence ) );
++
+ cur = cur->next;
+ }
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-20 12:04:44 UTC (rev 126298)
+++ community-x86_64/PKGBUILD 2015-01-20 12:05:53 UTC (rev 126299)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Mihai Militaru <mihai militaru at xmpp dot ro>
-# Contributor: carstene1ns <arch carsten-teibes.de>
-
-pkgname=polarssl
-pkgver=1.3.9
-pkgrel=1
-pkgdesc="Portable cryptographic and SSL/TLS library"
-arch=('i686' 'x86_64')
-url="https://www.polarssl.org/"
-license=('GPL2')
-source=("https://polarssl.org/download/polarssl-$pkgver-gpl.tgz"
- "programs.makefile.patch")
-sha1sums=('3462b4455e1443ac1a1007fbd69861ebfb5c5506'
- '1e9e7d3dcdd6932b02d6dcabdf45041a3726f1be')
-depends=('glibc')
-options=('staticlibs')
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch
-# https://github.com/alucryd/aur-alucryd/blob/master/personal/polarssl/PKGBUILD
-# https://aur.archlinux.org/packages/po/polarssl-git/PKGBUILD
-
-build() {
- cd "$pkgname-$pkgver"
- sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h
- sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h
- # enable cert_write
- patch -p1 -d programs -i "$srcdir/programs.makefile.patch"
- LDFLAGS+=" -I../include " make SHARED=1 no_test
-}
-
-check() {
- cd "$pkgname-$pkgver"
- make SHARED=1 check
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir/usr" install
-}
Copied: polarssl/repos/community-x86_64/PKGBUILD (from rev 126298, polarssl/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-20 12:05:53 UTC (rev 126299)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Mihai Militaru <mihai militaru at xmpp dot ro>
+# Contributor: carstene1ns <arch carsten-teibes.de>
+
+pkgname=polarssl
+pkgver=1.3.9
+pkgrel=2
+pkgdesc="Portable cryptographic and SSL/TLS library"
+arch=('i686' 'x86_64')
+url="https://www.polarssl.org/"
+license=('GPL2')
+source=("https://polarssl.org/download/polarssl-$pkgver-gpl.tgz"
+ "programs.makefile.patch"
+ "CVE-2015-1182.patch")
+sha1sums=('3462b4455e1443ac1a1007fbd69861ebfb5c5506'
+ '1e9e7d3dcdd6932b02d6dcabdf45041a3726f1be'
+ '94317c4757063d006fb4e666b522b581326ba708')
+depends=('glibc')
+options=('staticlibs')
+
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch
+# https://github.com/alucryd/aur-alucryd/blob/master/personal/polarssl/PKGBUILD
+# https://aur.archlinux.org/packages/po/polarssl-git/PKGBUILD
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/CVE-2015-1182.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h
+ sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h
+ # enable cert_write
+ patch -p1 -d programs -i "$srcdir/programs.makefile.patch"
+ LDFLAGS+=" -I../include " make SHARED=1 no_test
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ make SHARED=1 check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/usr" install
+}
Deleted: community-x86_64/programs.makefile.patch
===================================================================
--- community-x86_64/programs.makefile.patch 2015-01-20 12:04:44 UTC (rev 126298)
+++ community-x86_64/programs.makefile.patch 2015-01-20 12:05:53 UTC (rev 126299)
@@ -1,22 +0,0 @@
---- programs/Makefile 2014-07-31 12:20:17.748459143 -0400
-+++ programs/Makefile 2014-07-31 12:21:35.388454356 -0400
-@@ -43,7 +43,7 @@
- test/selftest test/ssl_test \
- util/pem2der util/strerror \
- x509/cert_app x509/crl_app \
-- x509/cert_req
-+ x509/cert_req x509/cert_write
-
- ifdef OPENSSL
- APPS += test/o_p_test
-@@ -241,6 +241,10 @@
- echo " CC x509/cert_req.c"
- $(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@
-
-+x509/cert_write: x509/cert_write.c ../library/libpolarssl.a
-+ echo " CC x509/cert_write.c"
-+ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_write.c $(LDFLAGS) -o $@
-+
- clean:
- ifndef WINDOWS
- rm -f $(APPS)
Copied: polarssl/repos/community-x86_64/programs.makefile.patch (from rev 126298, polarssl/trunk/programs.makefile.patch)
===================================================================
--- community-x86_64/programs.makefile.patch (rev 0)
+++ community-x86_64/programs.makefile.patch 2015-01-20 12:05:53 UTC (rev 126299)
@@ -0,0 +1,22 @@
+--- programs/Makefile 2014-07-31 12:20:17.748459143 -0400
++++ programs/Makefile 2014-07-31 12:21:35.388454356 -0400
+@@ -43,7 +43,7 @@
+ test/selftest test/ssl_test \
+ util/pem2der util/strerror \
+ x509/cert_app x509/crl_app \
+- x509/cert_req
++ x509/cert_req x509/cert_write
+
+ ifdef OPENSSL
+ APPS += test/o_p_test
+@@ -241,6 +241,10 @@
+ echo " CC x509/cert_req.c"
+ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@
+
++x509/cert_write: x509/cert_write.c ../library/libpolarssl.a
++ echo " CC x509/cert_write.c"
++ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_write.c $(LDFLAGS) -o $@
++
+ clean:
+ ifndef WINDOWS
+ rm -f $(APPS)
More information about the arch-commits
mailing list