[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-12-11 Thread Pierre Schmitz via arch-commits
Date: Saturday, December 12, 2020 @ 06:41:25
  Author: pierre
Revision: 404003

upgpkg: openssl 1.1.1.i-2: FS#54887: Revert split package

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   60 +---
 1 file changed, 17 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-12 04:27:42 UTC (rev 404002)
+++ PKGBUILD2020-12-12 06:41:25 UTC (rev 404003)
@@ -1,25 +1,29 @@
 # Maintainer: Pierre Schmitz 
 
-pkgbase=openssl
-pkgname=(openssl openssl-doc openssl-perl)
+pkgname=openssl
 _ver=1.1.1i
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
+pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
+depends=('glibc')
 makedepends=('perl')
+optdepends=('ca-certificates' 'perl')
+replaces=('openssl-perl' 'openssl-doc')
+backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
-'ca-dir.patch')
+   'ca-dir.patch')
 sha256sums=('e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242'
-'SKIP'
-'75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
+   'SKIP'
+   '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
-  '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
+   '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
 
 prepare() {
-   cd "$srcdir/$pkgbase-$_ver"
+   cd "$srcdir/$pkgname-$_ver"
 
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
@@ -26,7 +30,7 @@
 }
 
 build() {
-   cd "$srcdir/$pkgbase-$_ver"
+   cd "$srcdir/$pkgname-$_ver"
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
@@ -45,46 +49,16 @@
patch -p0 -R -i "$srcdir/ca-dir.patch"
 
make test
-   
+
patch -p0 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from th patched .in file.
make apps/CA.pl
 }
 
-package_openssl() {
-   pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport 
Layer Security'
-   depends=('glibc')
-   optdepends=('ca-certificates')
-   backup=('etc/ssl/openssl.cnf')
+package() {
+   cd "$srcdir/$pkgname-$_ver"
 
-   cd "$srcdir/$pkgbase-$_ver"
+   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw 
install_ssldirs install_man_docs
 
-   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw 
install_ssldirs
-
-   rm -rf $pkgdir/etc/ssl/misc $pkgdir/usr/bin/c_rehash
install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-
-package_openssl-doc() {
-   pkgdesc='Documentation provided with OpenSSL'
-   depends=('openssl')
-
-   cd "$srcdir/$pkgbase-$_ver"
-
-   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl 
install_man_docs
-
-   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_openssl-perl() {
-   pkgdesc='Perl scripts provided with OpenSSL'
-   depends=('openssl' 'perl')
-
-   cd "$srcdir/$pkgbase-$_ver"
-
-   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl 
install_programs install_ssldirs
-
-   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-   mv $pkgdir/etc/ssl/misc/* $pkgdir/usr/bin/
-   rm -rf $pkgdir/{etc,usr/lib} $pkgdir/usr/bin/openssl
-}


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-12-09 Thread Pierre Schmitz via arch-commits
Date: Wednesday, December 9, 2020 @ 14:33:32
  Author: pierre
Revision: 403203

upgpkg: openssl 1.1.1.i-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-09 10:34:24 UTC (rev 403202)
+++ PKGBUILD2020-12-09 14:33:32 UTC (rev 403203)
@@ -2,10 +2,10 @@
 
 pkgbase=openssl
 pkgname=(openssl openssl-doc openssl-perl)
-_ver=1.1.1h
+_ver=1.1.1i
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=1
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
@@ -12,7 +12,7 @@
 makedepends=('perl')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9'
+sha256sums=('e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242'
 'SKIP'
 '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'


[arch-commits] Commit in openssl/trunk (PKGBUILD ca-dir.patch)

2020-11-21 Thread Pierre Schmitz via arch-commits
Date: Saturday, November 21, 2020 @ 08:35:28
  Author: pierre
Revision: 401600

upgpkg: openssl 1.1.1.h-2: FS#54887: Split package to drop Perl dependency

Modified:
  openssl/trunk/PKGBUILD
  openssl/trunk/ca-dir.patch

--+
 PKGBUILD |   59 -
 ca-dir.patch |   12 +--
 2 files changed, 52 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-21 07:07:08 UTC (rev 401599)
+++ PKGBUILD2020-11-21 08:35:28 UTC (rev 401600)
@@ -1,27 +1,25 @@
 # Maintainer: Pierre Schmitz 
 
-pkgname=openssl
+pkgbase=openssl
+pkgname=(openssl openssl-doc openssl-perl)
 _ver=1.1.1h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
+pkgrel=2
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=('perl')
-optdepends=('ca-certificates')
-backup=('etc/ssl/openssl.cnf')
+makedepends=('perl')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
 sha256sums=('5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9'
 'SKIP'
-'0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
+'75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
   '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
 
 prepare() {
-   cd "$srcdir/$pkgname-$_ver"
+   cd "$srcdir/$pkgbase-$_ver"
 
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
@@ -28,7 +26,7 @@
 }
 
 build() {
-   cd "$srcdir/$pkgname-$_ver"
+   cd "$srcdir/$pkgbase-$_ver"
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
@@ -40,18 +38,53 @@
 }
 
 check() {
-   cd "$srcdir/$pkgname-$_ver"
+   cd "$srcdir/$pkgbase-$_ver"
+
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i "$srcdir/ca-dir.patch"
+
make test
+   
patch -p0 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from th patched .in file.
make apps/CA.pl
 }
 
-package() {
-   cd "$srcdir/$pkgname-$_ver"
-   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw 
install_ssldirs install_man_docs
+package_openssl() {
+   pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport 
Layer Security'
+   depends=('glibc')
+   optdepends=('ca-certificates')
+   backup=('etc/ssl/openssl.cnf')
+
+   cd "$srcdir/$pkgbase-$_ver"
+
+   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw 
install_ssldirs
+
+   rm -rf $pkgdir/etc/ssl/misc $pkgdir/usr/bin/c_rehash
install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
+
+package_openssl-doc() {
+   pkgdesc='Documentation provided with OpenSSL'
+   depends=('openssl')
+
+   cd "$srcdir/$pkgbase-$_ver"
+
+   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl 
install_man_docs
+
+   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_openssl-perl() {
+   pkgdesc='Perl scripts provided with OpenSSL'
+   depends=('openssl' 'perl')
+
+   cd "$srcdir/$pkgbase-$_ver"
+
+   make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl 
install_programs install_ssldirs
+
+   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+   mv $pkgdir/etc/ssl/misc/* $pkgdir/usr/bin/
+   rm -rf $pkgdir/{etc,usr/lib} $pkgdir/usr/bin/openssl
+}

Modified: ca-dir.patch
===
--- ca-dir.patch2020-11-21 07:07:08 UTC (rev 401599)
+++ ca-dir.patch2020-11-21 08:35:28 UTC (rev 401600)
@@ -1,5 +1,5 @@
 apps/CA.pl.in  2018-09-11 14:48:19.0 +0200
-+++ apps/CA.pl.in  2018-09-11 16:16:32.125629435 +0200
+--- apps/CA.pl.in  2019-09-10 15:13:07.0 +0200
 apps/CA.pl.in  2019-10-06 09:34:23.960864556 +0200
 @@ -33,7 +33,7 @@
  my $PKCS12 = "$openssl pkcs12";
  
@@ -9,9 +9,9 @@
  my $CAKEY = "cakey.pem";
  my $CAREQ = "careq.pem";
  my $CACERT = "cacert.pem";
 apps/openssl.cnf   2018-09-11 14:48:20.0 +0200
-+++ apps/openssl.cnf   2018-09-11 16:16:32.125629435 +0200
-@@ -43,7 +43,7 @@
+--- apps/openssl.cnf   2019-09-10 15:13:07.0 +0200
 apps/openssl.cnf   2019-10-06 09:34:23.960864556 +0200
+@@ -42,7 +42,7 @@
  
  [ CA_default ]
  
@@ -20,7 +20,7 @@
  certs = $dir/certs# Where the issued certs are kept
  crl_dir   = 

[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-09-22 Thread Pierre Schmitz via arch-commits
Date: Tuesday, September 22, 2020 @ 15:04:45
  Author: pierre
Revision: 396422

upgpkg: openssl 1.1.1.h-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-22 12:17:49 UTC (rev 396421)
+++ PKGBUILD2020-09-22 15:04:45 UTC (rev 396422)
@@ -1,10 +1,10 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1g
+_ver=1.1.1h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('x86_64')
 url='https://www.openssl.org'
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46'
+sha256sums=('5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-05-24 Thread Jelle van der Waa via arch-commits
Date: Sunday, May 24, 2020 @ 19:30:56
  Author: jelle
Revision: 387506

Fix CA.pl not being re-generated in check()

Thanks to reproducible builds a bug was uncovered when building without check()
which showed a difference in "/etc/ssl/misc/CA.pl" as check() reverses the patch
and runs make check which re-generates CA.pl without our change.

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-24 18:18:39 UTC (rev 387505)
+++ PKGBUILD2020-05-24 19:30:56 UTC (rev 387506)
@@ -4,7 +4,7 @@
 _ver=1.1.1g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('x86_64')
 url='https://www.openssl.org'
@@ -46,6 +46,8 @@
patch -p0 -R -i "$srcdir/ca-dir.patch"
make test
patch -p0 -i "$srcdir/ca-dir.patch"
+   # re-run make to re-generate CA.pl from th patched .in file.
+   make apps/CA.pl
 }
 
 package() {


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-04-21 Thread Jelle van der Waa via arch-commits
Date: Tuesday, April 21, 2020 @ 14:39:10
  Author: jelle
Revision: 380682

Security update for CVE-2020-1967

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-21 13:48:18 UTC (rev 380681)
+++ PKGBUILD2020-04-21 14:39:10 UTC (rev 380682)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1f
+_ver=1.1.1g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35'
+sha256sums=('ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-03-31 Thread Pierre Schmitz via arch-commits
Date: Tuesday, March 31, 2020 @ 18:02:15
  Author: pierre
Revision: 379003

upgpkg: openssl 1.1.1.f-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-31 17:40:13 UTC (rev 379002)
+++ PKGBUILD2020-03-31 18:02:15 UTC (rev 379003)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1e
+_ver=1.1.1f
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe'
+sha256sums=('186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2020-03-17 Thread Pierre Schmitz via arch-commits
Date: Wednesday, March 18, 2020 @ 05:07:17
  Author: pierre
Revision: 377829

upgpkg: openssl 1.1.1.e-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-18 04:56:35 UTC (rev 377828)
+++ PKGBUILD2020-03-18 05:07:17 UTC (rev 377829)
@@ -1,10 +1,10 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1d
+_ver=1.1.1e
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('x86_64')
 url='https://www.openssl.org'
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2'
+sha256sums=('694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2019-11-13 Thread Felix Yan via arch-commits
Date: Wednesday, November 13, 2019 @ 16:19:27
  Author: felixonmars
Revision: 368204

[core] mass rebuild

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 16:19:26 UTC (rev 368203)
+++ PKGBUILD2019-11-13 16:19:27 UTC (rev 368204)
@@ -4,7 +4,7 @@
 _ver=1.1.1d
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('x86_64')
 url='https://www.openssl.org'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2019-09-10 Thread Pierre Schmitz via arch-commits
Date: Tuesday, September 10, 2019 @ 16:03:51
  Author: pierre
Revision: 362108

upgpkg: openssl 1.1.1.d-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-10 15:35:46 UTC (rev 362107)
+++ PKGBUILD2019-09-10 16:03:51 UTC (rev 362108)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1c
+_ver=1.1.1d
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90'
+sha256sums=('1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2019-05-28 Thread Pierre Schmitz via arch-commits
Date: Tuesday, May 28, 2019 @ 16:36:04
  Author: pierre
Revision: 354447

upgpkg: openssl 1.1.1.c-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-28 15:37:41 UTC (rev 354446)
+++ PKGBUILD2019-05-28 16:36:04 UTC (rev 354447)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1b
+_ver=1.1.1c
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -14,10 +14,11 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
+sha256sums=('f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
+  '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
 
 prepare() {
cd "$srcdir/$pkgname-$_ver"


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2019-02-26 Thread Pierre Schmitz via arch-commits
Date: Tuesday, February 26, 2019 @ 16:20:35
  Author: pierre
Revision: 346874

upgpkg: openssl 1.1.1.b-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-26 16:13:40 UTC (rev 346873)
+++ PKGBUILD2019-02-26 16:20:35 UTC (rev 346874)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1a
+_ver=1.1.1b
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41'
+sha256sums=('5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2018-11-20 Thread Pierre Schmitz via arch-commits
Date: Tuesday, November 20, 2018 @ 17:49:32
  Author: pierre
Revision: 340157

upgpkg: openssl 1.1.1.a-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-20 15:54:23 UTC (rev 340156)
+++ PKGBUILD2018-11-20 17:49:32 UTC (rev 340157)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.1
+_ver=1.1.1a
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -14,7 +14,7 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d'
+sha256sums=('fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41'
 'SKIP'
 '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')


[arch-commits] Commit in openssl/trunk (PKGBUILD ca-dir.patch)

2018-09-11 Thread Pierre Schmitz via arch-commits
Date: Tuesday, September 11, 2018 @ 19:41:57
  Author: pierre
Revision: 334388

upgpkg: openssl 1.1.1-1

Modified:
  openssl/trunk/PKGBUILD
  openssl/trunk/ca-dir.patch

--+
 PKGBUILD |   21 +
 ca-dir.patch |   12 ++--
 2 files changed, 11 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-11 19:31:01 UTC (rev 334387)
+++ PKGBUILD2018-09-11 19:41:57 UTC (rev 334388)
@@ -1,10 +1,9 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.0i
+_ver=1.1.1
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
 pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('x86_64')
@@ -13,12 +12,11 @@
 depends=('perl')
 optdepends=('ca-certificates')
 backup=('etc/ssl/openssl.cnf')
-source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
-"https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
+source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
 'ca-dir.patch')
-sha256sums=('ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99'
+sha256sums=('2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d'
 'SKIP'
-'90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790')
+'0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
@@ -31,18 +29,9 @@
 build() {
cd "$srcdir/$pkgname-$_ver"
 
-   if [ "${CARCH}" == 'x86_64' ]; then
-   openssltarget='linux-x86_64'
-   optflags='enable-ec_nistp_64_gcc_128'
-   elif [ "${CARCH}" == 'i686' ]; then
-   openssltarget='linux-elf'
-   optflags=''
-   fi
-
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared no-ssl3-method ${optflags} \
-   "${openssltarget}" \
+   shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 
make depend

Modified: ca-dir.patch
===
--- ca-dir.patch2018-09-11 19:31:01 UTC (rev 334387)
+++ ca-dir.patch2018-09-11 19:41:57 UTC (rev 334388)
@@ -1,5 +1,5 @@
 apps/CA.pl.in  2016-09-26 11:46:04.0 +0200
-+++ apps/CA.pl.in  2016-11-01 16:02:16.709616823 +0100
+--- apps/CA.pl.in  2018-09-11 14:48:19.0 +0200
 apps/CA.pl.in  2018-09-11 16:16:32.125629435 +0200
 @@ -33,7 +33,7 @@
  my $PKCS12 = "$openssl pkcs12";
  
@@ -9,9 +9,9 @@
  my $CAKEY = "cakey.pem";
  my $CAREQ = "careq.pem";
  my $CACERT = "cacert.pem";
 apps/openssl.cnf   2016-09-26 11:46:04.0 +0200
-+++ apps/openssl.cnf   2016-11-01 16:02:48.378503427 +0100
-@@ -39,7 +39,7 @@
+--- apps/openssl.cnf   2018-09-11 14:48:20.0 +0200
 apps/openssl.cnf   2018-09-11 16:16:32.125629435 +0200
+@@ -43,7 +43,7 @@
  
  [ CA_default ]
  
@@ -20,7 +20,7 @@
  certs = $dir/certs# Where the issued certs are kept
  crl_dir   = $dir/crl  # Where the issued crl are kept
  database  = $dir/index.txt# database index file.
-@@ -323,7 +323,7 @@
+@@ -327,7 +327,7 @@
  [ tsa_config1 ]
  
  # These are used by the TSA reply generation only.


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2018-08-14 Thread Pierre Schmitz via arch-commits
Date: Tuesday, August 14, 2018 @ 16:02:21
  Author: pierre
Revision: 331511

upgpkg: openssl 1.1.0.i-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-14 15:57:33 UTC (rev 331510)
+++ PKGBUILD2018-08-14 16:02:21 UTC (rev 331511)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.0h
+_ver=1.1.0i
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -17,7 +17,7 @@
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'ca-dir.patch')
-sha256sums=('5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517'
+sha256sums=('ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99'
 'SKIP'
 '90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2018-03-28 Thread Pierre Schmitz via arch-commits
Date: Wednesday, March 28, 2018 @ 14:39:43
  Author: pierre
Revision: 320551

upgpkg: openssl 1.1.0.h-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-28 13:35:45 UTC (rev 320550)
+++ PKGBUILD2018-03-28 14:39:43 UTC (rev 320551)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.0g
+_ver=1.1.0h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -17,7 +17,7 @@
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'ca-dir.patch')
-sha256sums=('de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af'
+sha256sums=('5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517'
 'SKIP'
 '90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')


[arch-commits] Commit in openssl/trunk (PKGBUILD fs54205.patch)

2017-11-02 Thread Pierre Schmitz
Date: Thursday, November 2, 2017 @ 17:41:24
  Author: pierre
Revision: 308864

upgpkg: openssl 1.1.0.g-1

Modified:
  openssl/trunk/PKGBUILD
Deleted:
  openssl/trunk/fs54205.patch

---+
 PKGBUILD  |   14 +-
 fs54205.patch |   41 -
 2 files changed, 5 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-02 16:46:29 UTC (rev 308863)
+++ PKGBUILD2017-11-02 17:41:24 UTC (rev 308864)
@@ -2,11 +2,11 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.0f
+_ver=1.1.0g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -16,12 +16,10 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
-'ca-dir.patch'
-   'fs54205.patch')
-sha256sums=('12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765'
+'ca-dir.patch')
+sha256sums=('de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af'
 'SKIP'
-'90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790'
-'04de0feaaa81b5fb1c70a00c9f46670eb748f6d6795bd228d613c5f15c92af15')
+'90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
@@ -29,8 +27,6 @@
 
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
-
-   patch -Np1 -i "$srcdir/fs54205.patch"
 }
 
 build() {

Deleted: fs54205.patch
===
--- fs54205.patch   2017-11-02 16:46:29 UTC (rev 308863)
+++ fs54205.patch   2017-11-02 17:41:24 UTC (rev 308864)
@@ -1,41 +0,0 @@
-From 6831138ced3804f8ebd2079b671a40c74794a8c4 Mon Sep 17 00:00:00 2001
-From: Rich Salz 
-Date: Wed, 31 May 2017 12:14:55 -0400
-Subject: [PATCH] Only release thread-local key if we created it.
-
-Thanks to Jan Alexander Steffens for finding the bug and confirming the
-fix.

- crypto/err/err.c | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/err/err.c b/crypto/err/err.c
-index f866f2fdd0a..c55f849590b 100644
 a/crypto/err/err.c
-+++ b/crypto/err/err.c
-@@ -122,6 +122,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = {
- #endif
- 
- static CRYPTO_ONCE err_init = CRYPTO_ONCE_STATIC_INIT;
-+static int set_err_thread_local;
- static CRYPTO_THREAD_LOCAL err_thread_local;
- 
- static CRYPTO_ONCE err_string_init = CRYPTO_ONCE_STATIC_INIT;
-@@ -260,7 +261,8 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
- 
- void err_cleanup(void)
- {
--CRYPTO_THREAD_cleanup_local(_thread_local);
-+if (set_err_thread_local != 0)
-+CRYPTO_THREAD_cleanup_local(_thread_local);
- CRYPTO_THREAD_lock_free(err_string_lock);
- err_string_lock = NULL;
- }
-@@ -639,6 +641,7 @@ void ERR_remove_state(unsigned long pid)
- 
- DEFINE_RUN_ONCE_STATIC(err_do_init)
- {
-+set_err_thread_local = 1;
- return CRYPTO_THREAD_init_local(_thread_local, NULL);
- }
- 


[arch-commits] Commit in openssl/trunk (PKGBUILD fs54205.patch)

2017-07-19 Thread Jan de Groot
Date: Wednesday, July 19, 2017 @ 08:44:14
  Author: jgc
Revision: 300818

upgpkg: openssl 1.1.0.f-2

Fix FS#54205
Use upstream provided SHA256 checksum
Add quotes for $srcdir

Added:
  openssl/trunk/fs54205.patch
Modified:
  openssl/trunk/PKGBUILD

---+
 PKGBUILD  |   28 
 fs54205.patch |   41 +
 2 files changed, 57 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-19 08:22:07 UTC (rev 300817)
+++ PKGBUILD2017-07-19 08:44:14 UTC (rev 300818)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -16,21 +16,25 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
-'ca-dir.patch')
-md5sums=('7b521dea79ab159e8ec879d269fa'
- 'SKIP'
- '02b53865fb70faef763e262b4971aa4b')
+'ca-dir.patch'
+   'fs54205.patch')
+sha256sums=('12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765'
+'SKIP'
+'90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790'
+'04de0feaaa81b5fb1c70a00c9f46670eb748f6d6795bd228d613c5f15c92af15')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
-   cd $srcdir/$pkgname-$_ver
+   cd "$srcdir/$pkgname-$_ver"
 
# set ca dir to /etc/ssl by default
-   patch -p0 -i $srcdir/ca-dir.patch
+   patch -p0 -i "$srcdir/ca-dir.patch"
+
+   patch -Np1 -i "$srcdir/fs54205.patch"
 }
 
 build() {
-   cd $srcdir/$pkgname-$_ver
+   cd "$srcdir/$pkgname-$_ver"
 
if [ "${CARCH}" == 'x86_64' ]; then
openssltarget='linux-x86_64'
@@ -51,16 +55,16 @@
 }
 
 check() {
-   cd $srcdir/$pkgname-$_ver
+   cd "$srcdir/$pkgname-$_ver"
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
-   patch -p0 -R -i $srcdir/ca-dir.patch
+   patch -p0 -R -i "$srcdir/ca-dir.patch"
make test
-   patch -p0 -i $srcdir/ca-dir.patch
+   patch -p0 -i "$srcdir/ca-dir.patch"
 }
 
 package() {
-   cd $srcdir/$pkgname-$_ver
+   cd "$srcdir/$pkgname-$_ver"
make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw 
install_ssldirs install_man_docs
install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }

Added: fs54205.patch
===
--- fs54205.patch   (rev 0)
+++ fs54205.patch   2017-07-19 08:44:14 UTC (rev 300818)
@@ -0,0 +1,41 @@
+From 6831138ced3804f8ebd2079b671a40c74794a8c4 Mon Sep 17 00:00:00 2001
+From: Rich Salz 
+Date: Wed, 31 May 2017 12:14:55 -0400
+Subject: [PATCH] Only release thread-local key if we created it.
+
+Thanks to Jan Alexander Steffens for finding the bug and confirming the
+fix.
+---
+ crypto/err/err.c | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/err/err.c b/crypto/err/err.c
+index f866f2fdd0a..c55f849590b 100644
+--- a/crypto/err/err.c
 b/crypto/err/err.c
+@@ -122,6 +122,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = {
+ #endif
+ 
+ static CRYPTO_ONCE err_init = CRYPTO_ONCE_STATIC_INIT;
++static int set_err_thread_local;
+ static CRYPTO_THREAD_LOCAL err_thread_local;
+ 
+ static CRYPTO_ONCE err_string_init = CRYPTO_ONCE_STATIC_INIT;
+@@ -260,7 +261,8 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
+ 
+ void err_cleanup(void)
+ {
+-CRYPTO_THREAD_cleanup_local(_thread_local);
++if (set_err_thread_local != 0)
++CRYPTO_THREAD_cleanup_local(_thread_local);
+ CRYPTO_THREAD_lock_free(err_string_lock);
+ err_string_lock = NULL;
+ }
+@@ -639,6 +641,7 @@ void ERR_remove_state(unsigned long pid)
+ 
+ DEFINE_RUN_ONCE_STATIC(err_do_init)
+ {
++set_err_thread_local = 1;
+ return CRYPTO_THREAD_init_local(_thread_local, NULL);
+ }
+ 


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2017-05-25 Thread Pierre Schmitz
Date: Thursday, May 25, 2017 @ 16:55:25
  Author: pierre
Revision: 296578

upgpkg: openssl 1.1.0.f-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-25 15:54:46 UTC (rev 296577)
+++ PKGBUILD2017-05-25 16:55:25 UTC (rev 296578)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.0e
+_ver=1.1.0f
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -17,7 +17,7 @@
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'ca-dir.patch')
-md5sums=('51c42d152122e474754aea96f66928c6'
+md5sums=('7b521dea79ab159e8ec879d269fa'
  'SKIP'
  '02b53865fb70faef763e262b4971aa4b')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2017-02-16 Thread Pierre Schmitz
Date: Thursday, February 16, 2017 @ 14:57:42
  Author: pierre
Revision: 289053

upgpkg: openssl 1.1.0.e-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-16 12:33:44 UTC (rev 289052)
+++ PKGBUILD2017-02-16 14:57:42 UTC (rev 289053)
@@ -2,11 +2,11 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.1.0d
+_ver=1.1.0e
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -17,7 +17,7 @@
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'ca-dir.patch')
-md5sums=('711ce3cd5f53a99c0e12a7d5804f0f63'
+md5sums=('51c42d152122e474754aea96f66928c6'
  'SKIP'
  '02b53865fb70faef763e262b4971aa4b')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2017-02-11 Thread Pierre Schmitz
Date: Saturday, February 11, 2017 @ 16:29:51
  Author: pierre
Revision: 288679

upgpkg: openssl 1.1.0.d-2

Remove bootstrap hack

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-11 15:08:34 UTC (rev 288678)
+++ PKGBUILD2017-02-11 16:29:51 UTC (rev 288679)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -63,11 +63,4 @@
cd $srcdir/$pkgname-$_ver
make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw 
install_ssldirs install_man_docs
install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-   # bootstrap hack
-   pushd $pkgdir/usr/lib
-   for lib in crypto ssl; do
-   ln -s lib${lib}.so.1.1 lib${lib}.so.1.0.0
-   done
-   popd
 }


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2017-01-26 Thread Pierre Schmitz
Date: Thursday, January 26, 2017 @ 17:11:58
  Author: pierre
Revision: 287519

upgpkg: openssl 1.0.2.k-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-26 16:32:54 UTC (rev 287518)
+++ PKGBUILD2017-01-26 17:11:58 UTC (rev 287519)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2j
+_ver=1.0.2k
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,7 +20,7 @@
 'no-rpath.patch'
 'ssl3-test-failure.patch'
 'ca-dir.patch')
-md5sums=('96322138f0b69e61b7212bc53d5e912b'
+md5sums=('f965fc0bf01bf882b31314b61391ae65'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '62fc492252edd3283871632bb77fadbe'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-09-27 Thread Pierre Schmitz
Date: Tuesday, September 27, 2016 @ 13:56:52
  Author: pierre
Revision: 277042

upgpkg: openssl 1.0.2.j-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-27 12:13:56 UTC (rev 277041)
+++ PKGBUILD2016-09-27 13:56:52 UTC (rev 277042)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2i
+_ver=1.0.2j
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,7 +20,7 @@
 'no-rpath.patch'
 'ssl3-test-failure.patch'
 'ca-dir.patch')
-md5sums=('678374e63f8df456a697d3e5e5a931fb'
+md5sums=('96322138f0b69e61b7212bc53d5e912b'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '62fc492252edd3283871632bb77fadbe'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-09-22 Thread Pierre Schmitz
Date: Thursday, September 22, 2016 @ 12:48:17
  Author: pierre
Revision: 276829

upgpkg: openssl 1.0.2.i-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-22 12:34:05 UTC (rev 276828)
+++ PKGBUILD2016-09-22 12:48:17 UTC (rev 276829)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2h
+_ver=1.0.2i
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,7 +20,7 @@
 'no-rpath.patch'
 'ssl3-test-failure.patch'
 'ca-dir.patch')
-md5sums=('9392e65072ce4b614c1392eefc1f23d0'
+md5sums=('678374e63f8df456a697d3e5e5a931fb'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '62fc492252edd3283871632bb77fadbe'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-05-03 Thread Pierre Schmitz
Date: Tuesday, May 3, 2016 @ 18:17:08
  Author: pierre
Revision: 266816

upgpkg: openssl 1.0.2.h-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-03 16:09:23 UTC (rev 266815)
+++ PKGBUILD2016-05-03 16:17:08 UTC (rev 266816)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=3
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-05-03 Thread Pierre Schmitz
Date: Tuesday, May 3, 2016 @ 18:09:23
  Author: pierre
Revision: 266815

upgpkg: openssl 1.0.2.h-3

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-03 11:00:29 UTC (rev 266814)
+++ PKGBUILD2016-05-03 16:09:23 UTC (rev 266815)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2g
+_ver=1.0.2h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,7 +20,7 @@
 'no-rpath.patch'
 'ssl3-test-failure.patch'
 'ca-dir.patch')
-md5sums=('f3c710c045cdee5fd114feb69feba7aa'
+md5sums=('9392e65072ce4b614c1392eefc1f23d0'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '62fc492252edd3283871632bb77fadbe'


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-03-02 Thread Pierre Schmitz
Date: Wednesday, March 2, 2016 @ 18:12:55
  Author: pierre
Revision: 260510

Disable zlib support

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-02 13:39:14 UTC (rev 260509)
+++ PKGBUILD2016-03-02 17:12:55 UTC (rev 260510)
@@ -6,12 +6,12 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=3
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=('zlib' 'perl')
+depends=('perl')
 optdepends=('ca-certificates')
 options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
@@ -53,7 +53,7 @@
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib no-ssl3 no-ssl3-method ${optflags} \
+   shared no-ssl3-method ${optflags} \
"${openssltarget}" \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 


[arch-commits] Commit in openssl/trunk (PKGBUILD ssl3-test-failure.patch)

2016-03-01 Thread Jan Steffens
Date: Tuesday, March 1, 2016 @ 21:00:13
  Author: heftig
Revision: 260494

Let's try without SSLv3, too

Added:
  openssl/trunk/ssl3-test-failure.patch
Modified:
  openssl/trunk/PKGBUILD

-+
 PKGBUILD|   10 --
 ssl3-test-failure.patch |   26 ++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-01 18:45:42 UTC (rev 260493)
+++ PKGBUILD2016-03-01 20:00:13 UTC (rev 260494)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -18,10 +18,12 @@
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
+'ssl3-test-failure.patch'
 'ca-dir.patch')
 md5sums=('f3c710c045cdee5fd114feb69feba7aa'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
+ '62fc492252edd3283871632bb77fadbe'
  '3bf51be3a1bbd262be46dc619f92aa90')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
@@ -30,6 +32,10 @@
 
# remove rpath: http://bugs.archlinux.org/task/14367
patch -p0 -i $srcdir/no-rpath.patch
+
+   # disable a test that fails when ssl3 is disabled
+   patch -p1 -i $srcdir/ssl3-test-failure.patch
+
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
 }
@@ -47,7 +53,7 @@
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib ${optflags} \
+   shared zlib no-ssl3 no-ssl3-method ${optflags} \
"${openssltarget}" \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 

Added: ssl3-test-failure.patch
===
--- ssl3-test-failure.patch (rev 0)
+++ ssl3-test-failure.patch 2016-03-01 20:00:13 UTC (rev 260494)
@@ -0,0 +1,26 @@
+From: Kurt Roeckx 
+Date: Sun, 6 Sep 2015 16:04:11 +0200
+Subject: Disable SSLv3 test in test suite
+
+When testing SSLv3 the test program returns 0 for skip.  The test for weak DH
+expects a failure, but gets success.
+
+It should probably be changed to return something other than 0 for a skipped
+test.
+---
+ test/testssl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/testssl b/test/testssl
+index 747e4ba..1e4370b 100644
+--- a/test/testssl
 b/test/testssl
+@@ -160,7 +160,7 @@ test_cipher() {
+ }
+ 
+ echo "Testing ciphersuites"
+-for protocol in TLSv1.2 SSLv3; do
++for protocol in TLSv1.2; do
+   echo "Testing ciphersuites for $protocol"
+   for cipher in `../util/shlib_wrap.sh ../apps/openssl ciphers 
"RSA+$protocol" | tr ':' ' '`; do
+ test_cipher $cipher $protocol


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-03-01 Thread Pierre Schmitz
Date: Tuesday, March 1, 2016 @ 15:49:04
  Author: pierre
Revision: 260443

Upstreaam update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-01 12:29:25 UTC (rev 260442)
+++ PKGBUILD2016-03-01 14:49:04 UTC (rev 260443)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2f
+_ver=1.0.2g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('b3bf73f507172be9292ea2a8c28b659d'
+md5sums=('f3c710c045cdee5fd114feb69feba7aa'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2016-01-28 Thread Pierre Schmitz
Date: Thursday, January 28, 2016 @ 18:29:41
  Author: pierre
Revision: 258677

upgpkg: openssl 1.0.2.f-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-28 17:13:05 UTC (rev 258676)
+++ PKGBUILD2016-01-28 17:29:41 UTC (rev 258677)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2e
+_ver=1.0.2f
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('5262bfa25b60ed9de9f28d5d52d77fc5'
+md5sums=('b3bf73f507172be9292ea2a8c28b659d'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-12-03 Thread Pierre Schmitz
Date: Thursday, December 3, 2015 @ 17:13:46
  Author: pierre
Revision: 252145

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-03 16:06:22 UTC (rev 252144)
+++ PKGBUILD2015-12-03 16:13:46 UTC (rev 252145)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=openssl
-_ver=1.0.2d
+_ver=1.0.2e
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('38dd619b2e77cbac69b99f52a053d25a'
+md5sums=('2218c1a6f807f7206c11eb3ee3a5ec80'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-12-03 Thread Pierre Schmitz
Date: Thursday, December 3, 2015 @ 20:27:08
  Author: pierre
Revision: 252150

upgpkg: openssl 1.0.2.e-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-03 18:33:02 UTC (rev 252149)
+++ PKGBUILD2015-12-03 19:27:08 UTC (rev 252150)
@@ -19,7 +19,7 @@
 "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('2218c1a6f807f7206c11eb3ee3a5ec80'
+md5sums=('5262bfa25b60ed9de9f28d5d52d77fc5'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-07-09 Thread Evangelos Foutras
Date: Thursday, July 9, 2015 @ 16:01:05
  Author: foutrelis
Revision: 241908

upgpkg: openssl 1.0.2.d-1

New upstream release.

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-09 13:40:15 UTC (rev 241907)
+++ PKGBUILD2015-07-09 14:01:05 UTC (rev 241908)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.2c
+_ver=1.0.2d
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('8c8d81a9ae7005276e486702edbcd4b6'
+md5sums=('38dd619b2e77cbac69b99f52a053d25a'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-06-12 Thread Evangelos Foutras
Date: Friday, June 12, 2015 @ 17:43:21
  Author: foutrelis
Revision: 240623

upgpkg: openssl 1.0.2.c-1

New upstream release.

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-12 11:36:14 UTC (rev 240622)
+++ PKGBUILD2015-06-12 15:43:21 UTC (rev 240623)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.2b
+_ver=1.0.2c
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('7729b259e2dea7d60b32fc3934d6984b'
+md5sums=('8c8d81a9ae7005276e486702edbcd4b6'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-06-11 Thread Evangelos Foutras
Date: Thursday, June 11, 2015 @ 17:32:22
  Author: foutrelis
Revision: 240585

upgpkg: openssl 1.0.2.b-1

New upstream release.

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-11 15:12:32 UTC (rev 240584)
+++ PKGBUILD2015-06-11 15:32:22 UTC (rev 240585)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.2a
+_ver=1.0.2b
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('a06c547dac9044161a477211049f60ef'
+md5sums=('7729b259e2dea7d60b32fc3934d6984b'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-03-19 Thread Felix Yan
Date: Thursday, March 19, 2015 @ 15:46:24
  Author: fyan
Revision: 234165

upgpkg: openssl 1.0.2.a-1

upstream new release

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-19 14:25:53 UTC (rev 234164)
+++ PKGBUILD2015-03-19 14:46:24 UTC (rev 234165)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.2
+_ver=1.0.2a
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('38373013fc85c790aabf8837969c5eba'
+md5sums=('a06c547dac9044161a477211049f60ef'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-01-22 Thread Pierre Schmitz
Date: Thursday, January 22, 2015 @ 18:39:55
  Author: pierre
Revision: 229654

upgpkg: openssl 1.0.2-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-22 17:36:41 UTC (rev 229653)
+++ PKGBUILD2015-01-22 17:39:55 UTC (rev 229654)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1l
+_ver=1.0.2
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('cdb22925fc9bc97ccbf1e007661f2aa6'
+md5sums=('38373013fc85c790aabf8837969c5eba'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-01-15 Thread Pierre Schmitz
Date: Thursday, January 15, 2015 @ 17:57:46
  Author: pierre
Revision: 229090

upgpkg: openssl 1.0.1.l-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-15 16:53:35 UTC (rev 229089)
+++ PKGBUILD2015-01-15 16:57:46 UTC (rev 229090)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1k
+_ver=1.0.1l
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('d4f002bd22a56881340105028842ae1f'
+md5sums=('cdb22925fc9bc97ccbf1e007661f2aa6'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2015-01-08 Thread Pierre Schmitz
Date: Thursday, January 8, 2015 @ 18:28:03
  Author: pierre
Revision: 228756

upgpkg: openssl 1.0.1.k-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-08 17:04:15 UTC (rev 228755)
+++ PKGBUILD2015-01-08 17:28:03 UTC (rev 228756)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1j
+_ver=1.0.1k
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,10 +19,11 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('f7175c9cd3c39bb1907ac8bba9df8ed3'
+md5sums=('d4f002bd22a56881340105028842ae1f'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
cd $srcdir/$pkgname-$_ver


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2014-10-15 Thread Pierre Schmitz
Date: Wednesday, October 15, 2014 @ 16:47:59
  Author: pierre
Revision: 224429

upgpkg: openssl 1.0.1.j-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-15 14:21:20 UTC (rev 224428)
+++ PKGBUILD2014-10-15 14:47:59 UTC (rev 224429)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1i
+_ver=1.0.1j
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('c8dc151a671b9b92ff3e4c118b174972'
+md5sums=('f7175c9cd3c39bb1907ac8bba9df8ed3'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')


[arch-commits] Commit in openssl/trunk (PKGBUILD)

2014-08-06 Thread Pierre Schmitz
Date: Thursday, August 7, 2014 @ 05:39:48
  Author: pierre
Revision: 219361

upgpkg: openssl 1.0.1.i-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-06 21:47:48 UTC (rev 219360)
+++ PKGBUILD2014-08-07 03:39:48 UTC (rev 219361)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1h
+_ver=1.0.1i
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('8d6d684a9430d5cc98a62a5d8fbda8cf'
+md5sums=('c8dc151a671b9b92ff3e4c118b174972'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2014-06-06 Thread Sébastien Luttringer
Date: Friday, June 6, 2014 @ 09:28:47
  Author: seblu
Revision: 214321

upgpkg: openssl 1.0.1.h-1

- fix FS#40727

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-06 06:08:17 UTC (rev 214320)
+++ PKGBUILD2014-06-06 07:28:47 UTC (rev 214321)
@@ -22,8 +22,7 @@
 md5sums=('8d6d684a9430d5cc98a62a5d8fbda8cf'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90'
- 'ea2a61c8bd43788d81d98f1ac36c98ac')
+ '3bf51be3a1bbd262be46dc619f92aa90')
 
 prepare() {
cd $srcdir/$pkgname-$_ver



[arch-commits] Commit in openssl/trunk (PKGBUILD openssl-1.0.1f-perl-5.18.patch)

2014-06-05 Thread Sébastien Luttringer
Date: Thursday, June 5, 2014 @ 14:46:09
  Author: seblu
Revision: 214299

upgpkg: openssl 1.0.1.h-1

Modified:
  openssl/trunk/PKGBUILD
Deleted:
  openssl/trunk/openssl-1.0.1f-perl-5.18.patch

+
 PKGBUILD   |9 
 openssl-1.0.1f-perl-5.18.patch |  356 ---
 2 files changed, 3 insertions(+), 362 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-05 12:34:40 UTC (rev 214298)
+++ PKGBUILD2014-06-05 12:46:09 UTC (rev 214299)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1g
+_ver=1.0.1h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -18,9 +18,8 @@
 source=(https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'no-rpath.patch'
-'ca-dir.patch'
-'openssl-1.0.1f-perl-5.18.patch')
-md5sums=('de62b43dfcd858e66a74bee1c834e959'
+'ca-dir.patch')
+md5sums=('8d6d684a9430d5cc98a62a5d8fbda8cf'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90'
@@ -33,8 +32,6 @@
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
-
-   patch -p1 -i $srcdir/openssl-1.0.1f-perl-5.18.patch
 }
 
 build() {

Deleted: openssl-1.0.1f-perl-5.18.patch
===
--- openssl-1.0.1f-perl-5.18.patch  2014-06-05 12:34:40 UTC (rev 214298)
+++ openssl-1.0.1f-perl-5.18.patch  2014-06-05 12:46:09 UTC (rev 214299)
@@ -1,356 +0,0 @@
-Forward-ported from openssl-1.0.1e-perl-5.18.patch
-Fixes install with perl-5.18.
-
-https://bugs.gentoo.org/show_bug.cgi?id=497286
-
-Signed-off-by: Lars Wendler polynomia...@gentoo.org
-
 openssl-1.0.1f/doc/apps/cms.pod
-+++ openssl-1.0.1f/doc/apps/cms.pod
-@@ -450,28 +450,28 @@
- 
- =over 4
- 
--=item 0
-+=item C0
- 
- the operation was completely successfully.
- 
--=item 1 
-+=item C1
- 
- an error occurred parsing the command options.
- 
--=item 2
-+=item C2
- 
- one of the input files could not be read.
- 
--=item 3
-+=item C3
- 
- an error occurred creating the CMS file or when reading the MIME
- message.
- 
--=item 4
-+=item C4
- 
- an error occurred decrypting or verifying the message.
- 
--=item 5
-+=item C5
- 
- the message was verified correctly but an error occurred writing out
- the signers certificates.
 openssl-1.0.1f/doc/apps/smime.pod
-+++ openssl-1.0.1f/doc/apps/smime.pod
-@@ -308,28 +308,28 @@
- 
- =over 4
- 
--=item 0
-+=item C0
- 
- the operation was completely successfully.
- 
--=item 1 
-+=item C1
- 
- an error occurred parsing the command options.
- 
--=item 2
-+=item C2
- 
- one of the input files could not be read.
- 
--=item 3
-+=item C3
- 
- an error occurred creating the PKCS#7 file or when reading the MIME
- message.
- 
--=item 4
-+=item C4
- 
- an error occurred decrypting or verifying the message.
- 
--=item 5
-+=item C5
- 
- the message was verified correctly but an error occurred writing out
- the signers certificates.
 openssl-1.0.1f/doc/ssl/SSL_accept.pod
-+++ openssl-1.0.1f/doc/ssl/SSL_accept.pod
-@@ -44,13 +44,13 @@
- 
- =over 4
- 
--=item 0
-+=item C0
- 
- The TLS/SSL handshake was not successful but was shut down controlled and
- by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
- return value Bret to find out the reason.
- 
--=item 1
-+=item C1
- 
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has 
been
- established.
 openssl-1.0.1f/doc/ssl/SSL_clear.pod
-+++ openssl-1.0.1f/doc/ssl/SSL_clear.pod
-@@ -56,12 +56,12 @@
- 
- =over 4
- 
--=item 0
-+=item C0
- 
- The SSL_clear() operation could not be performed. Check the error stack to
- find out the reason.
- 
--=item 1
-+=item C1
- 
- The SSL_clear() operation was successful.
- 
 openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
-+++ openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
-@@ -53,11 +53,11 @@
- 
- =over 4
- 
--=item 0
-+=item C0
- 
- The operation succeeded.
- 
--=item 1
-+=item C1
- 
- The operation failed. Check the error queue to find out the reason.
- 
 openssl-1.0.1f/doc/ssl/SSL_connect.pod
-+++ openssl-1.0.1f/doc/ssl/SSL_connect.pod
-@@ -41,13 +41,13 @@
- 
- =over 4
- 
--=item 0
-+=item C0
- 
- The TLS/SSL handshake was not successful but was shut down controlled and
- by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
- return value Bret to find out the reason.
- 
--=item 1
-+=item C1
- 
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has 
been
- established.
 openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
-+++ openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
-@@ -52,13 +52,13 @@
- 
- =over 4
- 
--=item 0

[arch-commits] Commit in openssl/trunk (PKGBUILD)

2014-04-07 Thread Pierre Schmitz
Date: Monday, April 7, 2014 @ 22:36:26
  Author: pierre
Revision: 209885

upgpkg: openssl 1.0.1.g-1

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-07 20:12:36 UTC (rev 209884)
+++ PKGBUILD2014-04-07 20:36:26 UTC (rev 209885)
@@ -2,11 +2,11 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1f
+_ver=1.0.1g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -20,7 +20,7 @@
 'no-rpath.patch'
 'ca-dir.patch'
 'openssl-1.0.1f-perl-5.18.patch')
-md5sums=('f26b09c028a0541cab33da697d522b25'
+md5sums=('de62b43dfcd858e66a74bee1c834e959'
  'SKIP'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90'



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2014-03-14 Thread Pierre Schmitz
Date: Friday, March 14, 2014 @ 22:55:53
  Author: pierre
Revision: 207764

upgpkg: openssl 1.0.1.f-2

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-14 20:27:44 UTC (rev 207763)
+++ PKGBUILD2014-03-14 21:55:53 UTC (rev 207764)
@@ -6,12 +6,12 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=('perl')
+depends=('zlib' 'perl')
 optdepends=('ca-certificates')
 options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
@@ -52,7 +52,7 @@
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib ${optflags} \
${openssltarget} \
-   -Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
+   -Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}
 
make depend
make



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2013-10-20 Thread Pierre Schmitz
Date: Sunday, October 20, 2013 @ 15:08:47
  Author: pierre
Revision: 196850

upgpkg: openssl 1.0.1.e-4

remove static libs

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-20 13:06:24 UTC (rev 196849)
+++ PKGBUILD2013-10-20 13:08:47 UTC (rev 196850)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=3
+pkgrel=4
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -26,6 +26,17 @@
  '3bf51be3a1bbd262be46dc619f92aa90'
  '88d3bef4bbdc640b0412315d8d347bdf')
 
+prepare() {
+   cd $srcdir/$pkgname-$_ver
+
+   # remove rpath: http://bugs.archlinux.org/task/14367
+   patch -p0 -i $srcdir/no-rpath.patch
+   # set ca dir to /etc/ssl by default
+   patch -p0 -i $srcdir/ca-dir.patch
+
+   patch -p1 -i $srcdir/openssl-1.0.1e-fix_pod_syntax-1.patch
+}
+
 build() {
cd $srcdir/$pkgname-$_ver
 
@@ -37,13 +48,6 @@
optflags=''
fi
 
-   # remove rpath: http://bugs.archlinux.org/task/14367
-   patch -p0 -i $srcdir/no-rpath.patch
-   # set ca dir to /etc/ssl by default
-   patch -p0 -i $srcdir/ca-dir.patch
-
-   patch -p1 -i $srcdir/openssl-1.0.1e-fix_pod_syntax-1.patch
-
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib ${optflags} \



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2013-02-17 Thread Pierre Schmitz
Date: Sunday, February 17, 2013 @ 13:51:07
  Author: pierre
Revision: 178160

Remove all workarounds for broken servers as this breaks more than it helps

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-17 10:57:26 UTC (rev 178159)
+++ PKGBUILD2013-02-17 12:51:07 UTC (rev 178160)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=3
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -41,14 +41,10 @@
patch -p0 -i $srcdir/ca-dir.patch
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
-   # workaround for https://rt.openssl.org/Ticket/Display.html?id=2771
-   # See Changes file Changes between 1.0.1 and 1.0.1a [19 Apr 2012]
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \
${openssltarget} \
-   -Wa,--noexecstack ${CFLAGS} ${LDFLAGS} \
-   -DOPENSSL_NO_TLS1_2_CLIENT \
-   -DOPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50
+   -Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
 
make depend
make
@@ -59,8 +55,6 @@
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i $srcdir/ca-dir.patch
-   # Do not test TLS1.2 as we disabled it above using 
OPENSSL_NO_TLS1_2_CLIENT
-   sed 's/TLSv1.2 //g' -i test/testssl
make test
patch -p0 -i $srcdir/ca-dir.patch
 }



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2013-02-17 Thread Pierre Schmitz
Date: Sunday, February 17, 2013 @ 15:25:57
  Author: pierre
Revision: 178162

remove md2 support for future builds as compatibility with old libs is 
hopefully no longer needed

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-17 12:51:35 UTC (rev 178161)
+++ PKGBUILD2013-02-17 14:25:57 UTC (rev 178162)
@@ -42,7 +42,7 @@
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib enable-md2 ${optflags} \
+   shared zlib ${optflags} \
${openssltarget} \
-Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
 



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2013-02-16 Thread Pierre Schmitz
Date: Saturday, February 16, 2013 @ 21:31:04
  Author: pierre
Revision: 178117

Apparently the TLS1.2 workarounds are not exclusive; so enable both

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-16 16:58:25 UTC (rev 178116)
+++ PKGBUILD2013-02-16 20:31:04 UTC (rev 178117)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -41,11 +41,13 @@
patch -p0 -i $srcdir/ca-dir.patch
 
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
-   # workaround for https://rt.openssl.org/Ticket/Display.html?id=2771: 
OPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50
+   # workaround for https://rt.openssl.org/Ticket/Display.html?id=2771
+   # See Changes file Changes between 1.0.1 and 1.0.1a [19 Apr 2012]
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \
${openssltarget} \
-Wa,--noexecstack ${CFLAGS} ${LDFLAGS} \
+   -DOPENSSL_NO_TLS1_2_CLIENT \
-DOPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50
 
make depend
@@ -57,6 +59,8 @@
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i $srcdir/ca-dir.patch
+   # Do not test TLS1.2 as we disabled it above using 
OPENSSL_NO_TLS1_2_CLIENT
+   sed 's/TLSv1.2 //g' -i test/testssl
make test
patch -p0 -i $srcdir/ca-dir.patch
 }



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-05-10 Thread Pierre Schmitz
Date: Thursday, May 10, 2012 @ 12:33:14
  Author: pierre
Revision: 158806

upgpkg: openssl 1.0.1.c-1

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-10 14:07:20 UTC (rev 158805)
+++ PKGBUILD2012-05-10 16:33:14 UTC (rev 158806)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1b
+_ver=1.0.1c
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,8 +20,8 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('a1da58ce63baef3812004714fa302c47'
- 'ca6bcd8641957df69c6c0bb4b93785aa'
+md5sums=('ae412727c8c15b67880aef7bd2999b2e'
+ 'a3d90bc42253def61cd1c4237f1ce5f7'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-04-26 Thread Pierre Schmitz
Date: Thursday, April 26, 2012 @ 07:36:13
  Author: pierre
Revision: 157230

upgpkg: openssl 1.0.1.b-1

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-26 10:12:29 UTC (rev 157229)
+++ PKGBUILD2012-04-26 11:36:13 UTC (rev 157230)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.1a
+_ver=1.0.1b
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,8 +20,8 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('a0104320c0997cd33e18b8ea798609d1'
- 'df6d2432d3ff03f72fa6744d6f1a7f34'
+md5sums=('a1da58ce63baef3812004714fa302c47'
+ 'ca6bcd8641957df69c6c0bb4b93785aa'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-04-21 Thread Pierre Schmitz
Date: Saturday, April 21, 2012 @ 09:32:16
  Author: pierre
Revision: 156596

readd comment about PR#2771

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-21 12:52:22 UTC (rev 156595)
+++ PKGBUILD2012-04-21 13:32:16 UTC (rev 156596)
@@ -45,6 +45,7 @@
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+   # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \
${openssltarget} \



[arch-commits] Commit in openssl/trunk (PKGBUILD vpaes.patch)

2012-04-12 Thread Pierre Schmitz
Date: Thursday, April 12, 2012 @ 15:33:55
  Author: pierre
Revision: 156070

Fix FS#29384

Added:
  openssl/trunk/vpaes.patch
Modified:
  openssl/trunk/PKGBUILD

-+
 PKGBUILD|   10 +---
 vpaes.patch |   69 ++
 2 files changed, 76 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-12 18:41:47 UTC (rev 156069)
+++ PKGBUILD2012-04-12 19:33:55 UTC (rev 156070)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgver=$_ver
-pkgrel=2
+pkgrel=3
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -20,13 +20,15 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch'
-'disable-tls12-client.patch')
+'disable-tls12-client.patch'
+'vpaes.patch')
 md5sums=('134f168bc2a8333f19f81d684841710b'
  'efbe93c11747fed52e60567819409d8a'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90'
- '26432b9d7af63c63828b6405c9185400')
+ '26432b9d7af63c63828b6405c9185400'
+ '55ad53e8ec3db1db6978af55e3ce1b5d')
 
 build() {
cd $srcdir/$pkgname-$_ver
@@ -48,6 +50,8 @@
patch -p0 -i $srcdir/ca-dir.patch
# workaround for PR#2771
patch -p1 -i $srcdir/disable-tls12-client.patch
+   # fix for PR#2775
+   patch -p1 -i $srcdir/vpaes.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \

Added: vpaes.patch
===
--- vpaes.patch (rev 0)
+++ vpaes.patch 2012-04-12 19:33:55 UTC (rev 156070)
@@ -0,0 +1,69 @@
+Index: openssl/crypto/aes/asm/vpaes-x86.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
+rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u 
'/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2/dev/null
+--- vpaes-x86.pl   2011/12/15 22:20:26 1.5.4.4
 vpaes-x86.pl   2012/03/31 16:55:18 1.5.4.5
+@@ -843,6 +843,8 @@
+   mov($out,wparam(1));  # out
+   mov($round,wparam(2));# len
+   mov($key,wparam(3));  # key
++  sub($round,16);
++  jc (label(cbc_abort));
+   lea($base,DWP(-56,esp));
+   mov($const,wparam(4));# ivp
+   and($base,-16);
+@@ -853,7 +855,6 @@
+   mov(DWP(48,esp),$base);
+ 
+   mov(DWP(0,esp),$out);   # save out
+-  sub($round,16);
+   mov(DWP(4,esp),$key)# save key
+   mov(DWP(8,esp),$const); # save ivp
+   mov($out,$round);  # $out works as $len
+@@ -896,6 +897,7 @@
+   mov($base,DWP(8,esp));  # restore ivp
+   mov(esp,DWP(48,esp));
+   movdqu (QWP(0,$base),xmm1); # write IV
++set_label(cbc_abort);
+ function_end(${PREFIX}_cbc_encrypt);
+ 
+ asm_finish();
+Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
+rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u 
'/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2/dev/null
+--- vpaes-x86_64.pl2011/11/14 21:01:17 1.4.4.2
 vpaes-x86_64.pl2012/03/31 16:55:18 1.4.4.3
+@@ -263,7 +263,7 @@
+   pshufb  %xmm2,  %xmm4   # 4 = sbou
+   pxor%xmm0,  %xmm4   # 4 = sb1u + k
+   movdqa  0x70(%r10), %xmm0   # 0 : sbot
+-  movdqa  .Lk_sr-.Lk_dsbd(%r11), %xmm2
++  movdqa  -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160
+   pshufb  %xmm3,  %xmm0   # 0 = sb1t
+   pxor%xmm4,  %xmm0   # 0 = A
+   pshufb  %xmm2,  %xmm0
+@@ -869,6 +869,8 @@
+ ___
+ ($len,$key)=($key,$len);
+ $code.=___;
++  sub \$16,$len
++  jc  .Lcbc_abort
+ ___
+ $code.=___ if ($win64);
+   lea -0xb8(%rsp),%rsp
+@@ -887,7 +889,6 @@
+ $code.=___;
+   movdqu  ($ivp),%xmm6# load IV
+   sub $inp,$out
+-  sub \$16,$len
+   call_vpaes_preheat
+   cmp \$0,${enc}d
+   je  .Lcbc_dec_loop
+@@ -932,6 +933,7 @@
+ .Lcbc_epilogue:
+ ___
+ $code.=___;
++.Lcbc_abort:
+   ret
+ .size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
+ ___



[arch-commits] Commit in openssl/trunk (PKGBUILD disable-tls12-client.patch)

2012-03-30 Thread Pierre Schmitz
Date: Friday, March 30, 2012 @ 04:24:08
  Author: pierre
Revision: 154553

upgpkg: openssl 1.0.1-2

workaround for PR#2771

Added:
  openssl/trunk/disable-tls12-client.patch
Modified:
  openssl/trunk/PKGBUILD

+
 PKGBUILD   |   13 +
 disable-tls12-client.patch |   36 
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-30 08:09:32 UTC (rev 154552)
+++ PKGBUILD2012-03-30 08:24:08 UTC (rev 154553)
@@ -6,7 +6,7 @@
 # use a pacman compatible version scheme
 # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -19,12 +19,14 @@
 https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'fix-manpages.patch'
 'no-rpath.patch'
-'ca-dir.patch')
+'ca-dir.patch'
+'disable-tls12-client.patch')
 md5sums=('134f168bc2a8333f19f81d684841710b'
  'efbe93c11747fed52e60567819409d8a'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90')
+ '3bf51be3a1bbd262be46dc619f92aa90'
+ '26432b9d7af63c63828b6405c9185400')
 
 build() {
cd $srcdir/$pkgname-$_ver
@@ -44,11 +46,14 @@
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
+   # workaround for PR#2771
+   patch -p1 -i $srcdir/disable-tls12-client.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \
${openssltarget} \
-   -Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
+   -Wa,--noexecstack ${CFLAGS} ${LDFLAGS} \
+   -DOPENSSL_NO_TLS1_2_CLIENT
 
make depend
make

Added: disable-tls12-client.patch
===
--- disable-tls12-client.patch  (rev 0)
+++ disable-tls12-client.patch  2012-03-30 08:24:08 UTC (rev 154553)
@@ -0,0 +1,36 @@
+Index: openssl/ssl/t1_lib.c
+RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
+rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u 
'/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2/dev/null
+--- t1_lib.c   2012/02/27 16:38:10 1.64.2.14.2.31
 t1_lib.c   2012/03/21 21:32:57 1.64.2.14.2.32
+@@ -544,7 +544,7 @@
+   }
+   skip_ext:
+ 
+-  if (TLS1_get_version(s) = TLS1_2_VERSION)
++  if (TLS1_get_client_version(s) = TLS1_2_VERSION)
+   {
+   if ((size_t)(limit - ret)  sizeof(tls12_sigalgs) + 6)
+   return NULL; 
+Index: openssl/ssl/s23_clnt.c
+RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v
+rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u 
'/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2/dev/null
+--- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5
 s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6
+@@ -287,12 +287,14 @@
+ 
+   if (ssl2_compat  ssl23_no_ssl2_ciphers(s))
+   ssl2_compat = 0;
+-
++#ifndef OPENSSL_NO_TLS1_2_CLIENT
+   if (!(s-options  SSL_OP_NO_TLSv1_2))
+   {
+   version = TLS1_2_VERSION;
+   }
+-  else if (!(s-options  SSL_OP_NO_TLSv1_1))
++  else
++#endif
++  if (!(s-options  SSL_OP_NO_TLSv1_1))
+   {
+   version = TLS1_1_VERSION;
+   }



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-03-14 Thread Pierre Schmitz
Date: Wednesday, March 14, 2012 @ 13:38:18
  Author: pierre
Revision: 153459

upgpkg: openssl 1.0.1-1

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-14 17:35:56 UTC (rev 153458)
+++ PKGBUILD2012-03-14 17:38:18 UTC (rev 153459)
@@ -2,9 +2,10 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0h
+_ver=1.0.1
 # use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+pkgver=$_ver
 pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
@@ -19,8 +20,8 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('a5bc483c570f2ac3758ce5c19b667fab'
- 'ed51bb7b3ed58f5e1e1b642050bdd7c1'
+md5sums=('134f168bc2a8333f19f81d684841710b'
+ 'efbe93c11747fed52e60567819409d8a'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')
@@ -30,8 +31,10 @@
 
if [ ${CARCH} == 'x86_64' ]; then
openssltarget='linux-x86_64'
+   optflags='enable-ec_nistp_64_gcc_128'
elif [ ${CARCH} == 'i686' ]; then
openssltarget='linux-elf'
+   optflags=''
fi
 
# avoid conflicts with other man pages
@@ -43,7 +46,7 @@
patch -p0 -i $srcdir/ca-dir.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib enable-md2 \
+   shared zlib enable-md2 ${optflags} \
${openssltarget} \
-Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
 



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-03-12 Thread Pierre Schmitz
Date: Monday, March 12, 2012 @ 16:23:30
  Author: pierre
Revision: 153274

upgpkg: openssl 1.0.0.h-1

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-12 20:17:00 UTC (rev 153273)
+++ PKGBUILD2012-03-12 20:23:30 UTC (rev 153274)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0g
+_ver=1.0.0h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -19,8 +19,8 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('07ecbe4324f140d157478637d6beccf1'
- '34315cf0fbbd1d18435948eb9712fcdf'
+md5sums=('a5bc483c570f2ac3758ce5c19b667fab'
+ 'ed51bb7b3ed58f5e1e1b642050bdd7c1'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-01-18 Thread Pierre Schmitz
Date: Wednesday, January 18, 2012 @ 11:08:37
  Author: pierre
Revision: 146799

upgpkg: openssl 1.0.0.g-1

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-18 16:03:15 UTC (rev 146798)
+++ PKGBUILD2012-01-18 16:08:37 UTC (rev 146799)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0f
+_ver=1.0.0g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -19,8 +19,8 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('e358705fb4a8827b5e9224a73f442025'
- 'fc1673f53946f1e7b408465f272484d8'
+md5sums=('07ecbe4324f140d157478637d6beccf1'
+ '34315cf0fbbd1d18435948eb9712fcdf'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2012-01-04 Thread Pierre Schmitz
Date: Wednesday, January 4, 2012 @ 13:14:37
  Author: pierre
Revision: 146053

upgpkg: openssl 1.0.0.f-1

upstream update:

  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f:

  o Fix for DTLS plaintext recovery attack CVE-2011-4108
  o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
  o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
  o Check parameters are not NULL in GOST ENGINE CVE-2012-0027
  o Check for malformed RFC3779 data CVE-2011-4577

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-04 17:56:55 UTC (rev 146052)
+++ PKGBUILD2012-01-04 18:14:37 UTC (rev 146053)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0e
+_ver=1.0.0f
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -19,8 +19,8 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('7040b89c4c58c7a1016c0dfa6e821c86'
- '5ff2e5da38aae454d7bae060c1e3fb67'
+md5sums=('e358705fb4a8827b5e9224a73f442025'
+ 'fc1673f53946f1e7b408465f272484d8'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2011-10-29 Thread Pierre Schmitz
Date: Saturday, October 29, 2011 @ 14:36:29
  Author: pierre
Revision: 141356

Add gpg key for sources

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-29 18:34:46 UTC (rev 141355)
+++ PKGBUILD2011-10-29 18:36:29 UTC (rev 141356)
@@ -15,10 +15,12 @@
 options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
 source=(https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
+https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc;
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
 md5sums=('7040b89c4c58c7a1016c0dfa6e821c86'
+ '5ff2e5da38aae454d7bae060c1e3fb67'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2011-09-06 Thread Pierre Schmitz
Date: Tuesday, September 6, 2011 @ 13:21:45
  Author: pierre
Revision: 137204

upgpkg: openssl 1.0.0.e-1

upstream update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-06 17:17:14 UTC (rev 137203)
+++ PKGBUILD2011-09-06 17:21:45 UTC (rev 137204)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0d
+_ver=1.0.0e
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -18,7 +18,7 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e'
+md5sums=('7040b89c4c58c7a1016c0dfa6e821c86'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')
@@ -48,7 +48,7 @@
${openssltarget} \
-Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
 
-   make depend
+   make depend
make
 }
 



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2011-05-08 Thread Pierre Schmitz
Date: Sunday, May 8, 2011 @ 05:33:27
  Author: pierre
Revision: 123093

Respect CFLAGS and LDFLAGS; see FS#24145

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-08 07:57:27 UTC (rev 123092)
+++ PKGBUILD2011-05-08 09:33:27 UTC (rev 123093)
@@ -29,6 +29,12 @@
 build() {
cd $srcdir/$pkgname-$_ver
 
+   if [ ${CARCH} == 'x86_64' ]; then
+   openssltarget='linux-x86_64'
+   elif [ ${CARCH} == 'i686' ]; then
+   openssltarget='linux-elf'
+   fi
+
# avoid conflicts with other man pages
# see http://www.linuxfromscratch.org/patches/downloads/openssl/
patch -p1 -i $srcdir/fix-manpages.patch
@@ -37,16 +43,22 @@
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
-   ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib enable-md2 -Wa,--noexecstack
+   ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
+   shared zlib enable-md2 \
+   ${openssltarget} \
+   -Wa,--noexecstack ${CFLAGS} ${LDFLAGS}
 
+   make depend
make
+}
 
+check() {
+   cd $srcdir/$pkgname-$_ver
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
-   #patch -p0 -R -i $srcdir/ca-dir.patch
-   #make test
-   #patch -p0 -i $srcdir/ca-dir.patch
+   patch -p0 -R -i $srcdir/ca-dir.patch
+   make test
+   patch -p0 -i $srcdir/ca-dir.patch
 }
 
 package() {



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2011-02-08 Thread Pierre Schmitz
Date: Tuesday, February 8, 2011 @ 14:05:04
  Author: pierre
Revision: 109351

upgpkg: openssl 1.0.0.d-1
upstream release

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-08 18:57:30 UTC (rev 109350)
+++ PKGBUILD2011-02-08 19:05:04 UTC (rev 109351)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0c
+_ver=1.0.0d
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -18,7 +18,7 @@
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('ff8fb85610aef328315a9decbb2712e4'
+md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')



[arch-commits] Commit in openssl/trunk (PKGBUILD fix-t1_lib.patch)

2010-12-02 Thread Pierre Schmitz
Date: Thursday, December 2, 2010 @ 14:59:34
  Author: pierre
Revision: 101931

upgpkg: openssl 1.0.0.c-1
upstream update

Modified:
  openssl/trunk/PKGBUILD
Deleted:
  openssl/trunk/fix-t1_lib.patch

--+
 PKGBUILD |   14 +-
 fix-t1_lib.patch |   16 
 2 files changed, 5 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-02 19:12:09 UTC (rev 101930)
+++ PKGBUILD2010-12-02 19:59:34 UTC (rev 101931)
@@ -2,10 +2,10 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-_ver=1.0.0b
+_ver=1.0.0c
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -17,13 +17,11 @@
 source=(https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 'fix-manpages.patch'
 'no-rpath.patch'
-'ca-dir.patch'
-'fix-t1_lib.patch')
-md5sums=('104deb3b7e6820cae6de3f49ba0ff2b0'
+'ca-dir.patch')
+md5sums=('ff8fb85610aef328315a9decbb2712e4'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90'
- 'e2fd8f26386defadc7d93d11c9b90e05')
+ '3bf51be3a1bbd262be46dc619f92aa90')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -38,8 +36,6 @@
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
-   # See http://cvs.openssl.org/chngview?cn=19998
-   patch -p1 -i $srcdir/fix-t1_lib.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 -Wa,--noexecstack

Deleted: fix-t1_lib.patch
===
--- fix-t1_lib.patch2010-12-02 19:12:09 UTC (rev 101930)
+++ fix-t1_lib.patch2010-12-02 19:59:34 UTC (rev 101931)
@@ -1,16 +0,0 @@
-Index: openssl/ssl/t1_lib.c
-RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
-rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u 
'/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2/dev/null
 t1_lib.c   2010/11/16 13:26:24 1.64.2.15
-+++ t1_lib.c   2010/11/16 22:41:07 1.64.2.16
-@@ -779,8 +779,8 @@
-   {
-   if(s-session-tlsext_ecpointformatlist)
-   {
--  *al = TLS1_AD_DECODE_ERROR;
--  return 0;
-+  
OPENSSL_free(s-session-tlsext_ecpointformatlist);
-+  s-session-tlsext_ecpointformatlist = 
NULL;
-   }
-   s-session-tlsext_ecpointformatlist_length = 0;
-   if ((s-session-tlsext_ecpointformatlist = 
OPENSSL_malloc(ecpointformatlist_length)) == NULL)



[arch-commits] Commit in openssl/trunk (PKGBUILD fix-t1_lib.patch)

2010-11-16 Thread Pierre Schmitz
Date: Wednesday, November 17, 2010 @ 01:40:11
  Author: pierre
Revision: 99737

upgpkg: openssl 1.0.0.b-2
fix the fix

Added:
  openssl/trunk/fix-t1_lib.patch
Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 fix-t1_lib.patch |   16 
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-16 22:57:18 UTC (rev 99736)
+++ PKGBUILD2010-11-17 06:40:11 UTC (rev 99737)
@@ -5,7 +5,7 @@
 _ver=1.0.0b
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -17,11 +17,13 @@
 source=(https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 'fix-manpages.patch'
 'no-rpath.patch'
-'ca-dir.patch')
+'ca-dir.patch'
+'fix-t1_lib.patch')
 md5sums=('104deb3b7e6820cae6de3f49ba0ff2b0'
  '5bbc0655bda2af95bc8eb568963ce8ba'
  'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90')
+ '3bf51be3a1bbd262be46dc619f92aa90'
+ 'e2fd8f26386defadc7d93d11c9b90e05')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -36,6 +38,8 @@
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
+   # See http://cvs.openssl.org/chngview?cn=19998
+   patch -p1 -i $srcdir/fix-t1_lib.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 -Wa,--noexecstack

Added: fix-t1_lib.patch
===
--- fix-t1_lib.patch(rev 0)
+++ fix-t1_lib.patch2010-11-17 06:40:11 UTC (rev 99737)
@@ -0,0 +1,16 @@
+Index: openssl/ssl/t1_lib.c
+RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
+rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u 
'/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2/dev/null
+--- t1_lib.c   2010/11/16 13:26:24 1.64.2.15
 t1_lib.c   2010/11/16 22:41:07 1.64.2.16
+@@ -779,8 +779,8 @@
+   {
+   if(s-session-tlsext_ecpointformatlist)
+   {
+-  *al = TLS1_AD_DECODE_ERROR;
+-  return 0;
++  
OPENSSL_free(s-session-tlsext_ecpointformatlist);
++  s-session-tlsext_ecpointformatlist = 
NULL;
+   }
+   s-session-tlsext_ecpointformatlist_length = 0;
+   if ((s-session-tlsext_ecpointformatlist = 
OPENSSL_malloc(ecpointformatlist_length)) == NULL)



[arch-commits] Commit in openssl/trunk (PKGBUILD fix-double-free.patch)

2010-08-10 Thread Pierre Schmitz
Date: Tuesday, August 10, 2010 @ 06:56:06
  Author: pierre
Revision: 87052

fix double free issue in ssl3

see http://archives.neohapsis.com/archives/fulldisclosure/2010-08/0085.html

Added:
  openssl/trunk/fix-double-free.patch
Modified:
  openssl/trunk/PKGBUILD

---+
 PKGBUILD  |   24 +++-
 fix-double-free.patch |   10 ++
 2 files changed, 25 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-10 02:33:33 UTC (rev 87051)
+++ PKGBUILD2010-08-10 10:56:06 UTC (rev 87052)
@@ -5,7 +5,7 @@
 _ver=1.0.0a
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=3
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -17,11 +17,13 @@
 source=(https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 'fix-manpages.patch'
 'no-rpath.patch'
-'ca-dir.patch')
+'ca-dir.patch'
+'fix-double-free.patch')
 md5sums=('e3873edfffc783624cfbdb65e2249cbd'
  'f540cd9e0e3047d589d0581fe7a2d0f2'
  'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90')
+ '3bf51be3a1bbd262be46dc619f92aa90'
+ 'ccb896e23a44b89a3c93ac094c592c1f')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -31,21 +33,25 @@
 
# avoid conflicts with other man pages
# see http://www.linuxfromscratch.org/patches/downloads/openssl/
-   patch -p0 -i $srcdir/fix-manpages.patch || return 1
+   patch -p0 -i $srcdir/fix-manpages.patch
# remove rpath: http://bugs.archlinux.org/task/14367
-   patch -p0 -i $srcdir/no-rpath.patch || return 1
+   patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
-   patch -p0 -i $srcdir/ca-dir.patch || return 1
+   patch -p0 -i $srcdir/ca-dir.patch
+   # fix double free
+   # see http://marc.info/?l=openssl-devm=128118163216952w=2
+   # and http://marc.info/?l=openssl-devm=128128256314328w=2
+   patch -p0 -i $srcdir/fix-double-free.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib enable-md2 -Wa,--noexecstack || return 1
+   shared zlib enable-md2 -Wa,--noexecstack
 
-   make || return 1
+   make
 
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
#patch -p0 -R -i $srcdir/ca-dir.patch
-   #make test || return 1
+   #make test
#patch -p0 -i $srcdir/ca-dir.patch
 }
 

Added: fix-double-free.patch
===
--- fix-double-free.patch   (rev 0)
+++ fix-double-free.patch   2010-08-10 10:56:06 UTC (rev 87052)
@@ -0,0 +1,10 @@
+--- ssl/s3_clnt.c.orig Sun Feb 28 01:24:24 2010
 ssl/s3_clnt.c  Sun Aug  8 14:49:30 2010
+@@ -1508,6 +1508,7 @@
+   s-session-sess_cert-peer_ecdh_tmp=ecdh;
+   ecdh=NULL;
+   BN_CTX_free(bn_ctx);
++  bn_ctx = NULL;
+   EC_POINT_free(srvr_ecpoint);
+   srvr_ecpoint = NULL;
+   }



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2010-06-02 Thread Pierre Schmitz
Date: Wednesday, June 2, 2010 @ 07:00:36
  Author: pierre
Revision: 81714

simplify pkgver

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-02 10:49:29 UTC (rev 81713)
+++ PKGBUILD2010-06-02 11:00:36 UTC (rev 81714)
@@ -4,7 +4,7 @@
 pkgname=openssl
 _ver=1.0.0a
 # use a pacman compatible version scheme
-pkgver=$(echo $_ver|sed -E 's/([a-z])$/.\1/')
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2010-06-01 Thread Pierre Schmitz
Date: Tuesday, June 1, 2010 @ 13:41:53
  Author: pierre
Revision: 81585

upgpkg: openssl 1.0.0a-1
security update

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-01 16:03:30 UTC (rev 81584)
+++ PKGBUILD2010-06-01 17:41:53 UTC (rev 81585)
@@ -2,21 +2,21 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.0.0a
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
 depends=('perl')
 optdepends=('ca-certificates')
-options=('!makeflags')
+options=('!makeflags' 'force')
 backup=('etc/ssl/openssl.cnf')
 source=(https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz;
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
-md5sums=('89eaa86e25b2845f920ec00ae4c864ed'
+md5sums=('e3873edfffc783624cfbdb65e2249cbd'
  'f540cd9e0e3047d589d0581fe7a2d0f2'
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')
@@ -43,7 +43,7 @@
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
#patch -p0 -R -i $srcdir/ca-dir.patch
-   # make test || return 1
+   #make test || return 1
#patch -p0 -i $srcdir/ca-dir.patch
 }
 



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2010-06-01 Thread Pierre Schmitz
Date: Tuesday, June 1, 2010 @ 20:53:20
  Author: pierre
Revision: 81609

upgpkg: openssl 1.0.0.a-2
use a pacman compatible version scheme

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-02 00:17:06 UTC (rev 81608)
+++ PKGBUILD2010-06-02 00:53:20 UTC (rev 81609)
@@ -2,17 +2,19 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-pkgver=1.0.0a
-pkgrel=1
+_ver=1.0.0a
+# use a pacman compatible version scheme
+pkgver=$(echo $_ver|sed -E 's/([a-z])$/.\1/')
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
 depends=('perl')
 optdepends=('ca-certificates')
-options=('!makeflags' 'force')
+options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
-source=(https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz;
+source=(https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz;
 'fix-manpages.patch'
 'no-rpath.patch'
 'ca-dir.patch')
@@ -25,7 +27,7 @@
 PKGEXT='.pkg.tar.gz'
 
 build() {
-   cd $srcdir/$pkgname-$pkgver
+   cd $srcdir/$pkgname-$_ver
 
# avoid conflicts with other man pages
# see http://www.linuxfromscratch.org/patches/downloads/openssl/
@@ -48,7 +50,7 @@
 }
 
 package() {
-   cd $srcdir/$pkgname-$pkgver
+   cd $srcdir/$pkgname-$_ver
make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man install
install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2010-03-31 Thread Pierre Schmitz
Date: Wednesday, March 31, 2010 @ 20:44:27
  Author: pierre
Revision: 75166

enable md2 for backwards compatibility

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-31 23:52:49 UTC (rev 75165)
+++ PKGBUILD2010-04-01 00:44:27 UTC (rev 75166)
@@ -33,7 +33,7 @@
patch -p0 -i $srcdir/ca-dir.patch || return 1
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-   shared zlib -Wa,--noexecstack || return 1
+   shared zlib enable-md2 -Wa,--noexecstack || return 1
 
make || return 1
 



[arch-commits] Commit in openssl/trunk (PKGBUILD)

2010-03-31 Thread Pierre Schmitz
Date: Wednesday, March 31, 2010 @ 23:17:37
  Author: pierre
Revision: 75223

upgpkg: openssl 1.0.0-2
use gz as this version is needed by recent versions of pacman

Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 02:43:33 UTC (rev 75222)
+++ PKGBUILD2010-04-01 03:17:37 UTC (rev 75223)
@@ -3,7 +3,7 @@
 
 pkgname=openssl
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -21,6 +21,9 @@
  'dc78d3d06baffc16217519242ce92478'
  '3bf51be3a1bbd262be46dc619f92aa90')
 
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
 build() {
cd $srcdir/$pkgname-$pkgver
 



[arch-commits] Commit in openssl/trunk (PKGBUILD openssl-0.9.8m-cfb.patch)

2010-03-24 Thread Pierre Schmitz
Date: Wednesday, March 24, 2010 @ 10:24:17
  Author: pierre
Revision: 73290

upgpkg: openssl 0.9.8n-1
upstream update

Modified:
  openssl/trunk/PKGBUILD
Deleted:
  openssl/trunk/openssl-0.9.8m-cfb.patch

--+
 PKGBUILD |   17 +
 openssl-0.9.8m-cfb.patch |   15 ---
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-24 13:29:54 UTC (rev 73289)
+++ PKGBUILD2010-03-24 14:24:17 UTC (rev 73290)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=openssl
-pkgver=0.9.8m
-pkgrel=2
+pkgver=0.9.8n
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='http://www.openssl.org'
@@ -15,13 +15,11 @@
 source=(http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz;
 'openssl-0.9.8l-fix_manpages-1.patch'
 'openssl-0.9.8a-no-rpath.patch'
-'openssl-0.9.8m-ca-dir.patch'
-'openssl-0.9.8m-cfb.patch')
-md5sums=('898bf125370926d5f692a2201124f8ec'
+'openssl-0.9.8m-ca-dir.patch')
+md5sums=('076d8efc3ed93646bd01f04e23c07066'
  '04a6a88c2ee4badd4f8649792b73eaf3'
  '4738d1eaff4e9975e9a26e4f76e48318'
- '1216688f46de6948ed2175e58e75c043'
- 'd7ead9cc459e5d0233d5b1e1d24380a7')
+ '1216688f46de6948ed2175e58e75c043')
 
 build() {
cd $srcdir/$pkgname-$pkgver
@@ -35,11 +33,6 @@
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl shared zlib 
-Wa,--noexecstack
 
-   # see http://bugs.archlinux.org/task/18564
-   # and http://cvs.openssl.org/chngview?cn=19336
-   # will be in 0.9.8n
-   patch -p0 -i $srcdir/openssl-0.9.8m-cfb.patch || return 1
-
make || return 1
 
# the test fails due to missing write permissions in /etc/ssl

Deleted: openssl-0.9.8m-cfb.patch
===
--- openssl-0.9.8m-cfb.patch2010-03-24 13:29:54 UTC (rev 73289)
+++ openssl-0.9.8m-cfb.patch2010-03-24 14:24:17 UTC (rev 73290)
@@ -1,15 +0,0 @@
 crypto/evp/evp_locl.h  2010/02/15 19:40:45 1.10.2.7
-+++ crypto/evp/evp_locl.h  2010/02/26 14:41:38 1.10.2.8
-@@ -127,9 +127,9 @@
- #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
-iv_len, cbits, flags, init_key, cleanup, \
-set_asn1, get_asn1, ctrl) \
--BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \
--  (cbits + 7)/8, key_len, iv_len, \
--  flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
-+BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
-+key_len, iv_len, flags, init_key, cleanup, set_asn1, \
-+get_asn1, ctrl)
- 
- #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
-iv_len, cbits, flags, init_key, cleanup, \



[arch-commits] Commit in openssl/trunk (PKGBUILD openssl-0.9.8m-cfb.patch)

2010-03-04 Thread Pierre Schmitz
Date: Thursday, March 4, 2010 @ 17:09:11
  Author: pierre
Revision: 71159

upgpkg: openssl 0.9.8m-2
fix decoding problem with encfs

Added:
  openssl/trunk/openssl-0.9.8m-cfb.patch
Modified:
  openssl/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 openssl-0.9.8m-cfb.patch |   15 +++
 2 files changed, 26 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-04 21:36:29 UTC (rev 71158)
+++ PKGBUILD2010-03-04 22:09:11 UTC (rev 71159)
@@ -3,7 +3,7 @@
 
 pkgname=openssl
 pkgver=0.9.8m
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer 
Security'
 arch=('i686' 'x86_64')
 url='http://www.openssl.org'
@@ -12,20 +12,21 @@
 optdepends=('ca-certificates')
 options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
-# fix_manpages.patch from http://www.linuxfromscratch.org/patches/blfs/svn/
 source=(http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz;
 'openssl-0.9.8l-fix_manpages-1.patch'
 'openssl-0.9.8a-no-rpath.patch'
-'openssl-0.9.8m-ca-dir.patch')
+'openssl-0.9.8m-ca-dir.patch'
+'openssl-0.9.8m-cfb.patch')
 md5sums=('898bf125370926d5f692a2201124f8ec'
  '04a6a88c2ee4badd4f8649792b73eaf3'
  '4738d1eaff4e9975e9a26e4f76e48318'
- '1216688f46de6948ed2175e58e75c043')
+ '1216688f46de6948ed2175e58e75c043'
+ 'd7ead9cc459e5d0233d5b1e1d24380a7')
 
 build() {
cd $srcdir/$pkgname-$pkgver
 
-   # avoid conflicts with other man pages
+   # avoid conflicts with other man pages: 
http://www.linuxfromscratch.org/patches/blfs/svn/
patch -p1 -i $srcdir/openssl-0.9.8l-fix_manpages-1.patch
# remove rpath: http://bugs.archlinux.org/task/14367
patch -p1 -i $srcdir/openssl-0.9.8a-no-rpath.patch
@@ -34,6 +35,11 @@
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl shared zlib 
-Wa,--noexecstack
 
+   # see http://bugs.archlinux.org/task/18564
+   # and http://cvs.openssl.org/chngview?cn=19336
+   # will be in 0.9.8n
+   patch -p0 -i $srcdir/openssl-0.9.8m-cfb.patch || return 1
+
make || return 1
 
# the test fails due to missing write permissions in /etc/ssl

Added: openssl-0.9.8m-cfb.patch
===
--- openssl-0.9.8m-cfb.patch(rev 0)
+++ openssl-0.9.8m-cfb.patch2010-03-04 22:09:11 UTC (rev 71159)
@@ -0,0 +1,15 @@
+--- crypto/evp/evp_locl.h  2010/02/15 19:40:45 1.10.2.7
 crypto/evp/evp_locl.h  2010/02/26 14:41:38 1.10.2.8
+@@ -127,9 +127,9 @@
+ #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
+iv_len, cbits, flags, init_key, cleanup, \
+set_asn1, get_asn1, ctrl) \
+-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \
+-  (cbits + 7)/8, key_len, iv_len, \
+-  flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
++BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
++key_len, iv_len, flags, init_key, cleanup, set_asn1, \
++get_asn1, ctrl)
+ 
+ #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
+iv_len, cbits, flags, init_key, cleanup, \