[arch-commits] Commit in httrack/trunk (2 files)

[Jelle van der Waa]

    Date: Friday, March 3, 2017 @ 20:55:12
  Author: jelle
Revision: 214707

upgpkg: httrack 3.48.22-3

openssl 1.1.0 rebuild

Added:
  httrack/trunk/514c308ec71074228e7a32356646a7ea18576377.patch
Modified:
  httrack/trunk/PKGBUILD

------------------------------------------------+
 514c308ec71074228e7a32356646a7ea18576377.patch |   22 ++++++++++++++++++++++
 PKGBUILD                                       |   14 +++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

Added: 514c308ec71074228e7a32356646a7ea18576377.patch
===================================================================
--- 514c308ec71074228e7a32356646a7ea18576377.patch	                        (rev 0)
+++ 514c308ec71074228e7a32356646a7ea18576377.patch	2017-03-03 20:55:12 UTC (rev 214707)
@@ -0,0 +1,22 @@
+From 514c308ec71074228e7a32356646a7ea18576377 Mon Sep 17 00:00:00 2001
+From: Xavier Roche <roche at httrack.com>
+Date: Sun, 26 Jun 2016 14:26:37 +0200
+Subject: [PATCH] Fixed FTBFS with openssl 1.1.0
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3f43580..4268cb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,7 +160,7 @@ AC_CHECK_LIB(crypto, EVP_get_digestbyname,
+ 	]
+ 	)
+ LIBS="$LIBS $OPENSSL_LIBS"
+-AC_CHECK_LIB(ssl, SSL_library_init,
++AC_CHECK_LIB(ssl, SSL_CTX_new,
+ 	[
+ 	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
+ 	AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-03 20:48:12 UTC (rev 214706)
+++ PKGBUILD	2017-03-03 20:55:12 UTC (rev 214707)
@@ -9,17 +9,25 @@
 
 pkgname=httrack
 pkgver=3.48.22
-pkgrel=2
+pkgrel=3
 pkgdesc="An easy-to-use offline browser utility"
 arch=('i686' 'x86_64')
 url="http://www.httrack.com/"
 license=('GPL3')
 depends=('bash' 'xdg-utils' 'hicolor-icon-theme' 'openssl')
-source=(http://mirror.httrack.com/historical/$pkgname-$pkgver.tar.gz{,.asc})
+source=(http://mirror.httrack.com/historical/$pkgname-$pkgver.tar.gz{,.asc} 514c308ec71074228e7a32356646a7ea18576377.patch)
 validpgpkeys=('BB71C7E6CB1AD8FAF53FE42A60C3AA7180598EFB') # Xavier Roche
 sha256sums=('b2831ad7b48e933959f83a9de8a72bcaa0f8eb87e9453ad85debd50d33a9c48f'
-            'SKIP')
+            'SKIP'
+            '8c5129ed281a6468238d09f83c2fe5fe8a6e77bc7998d119eb40b8034ff95307')
 
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/514c308ec71074228e7a32356646a7ea18576377.patch
+  autoconf -i
+
+}
+
 build() {
   cd "${srcdir}"/$pkgname-$pkgver