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

[Bartłomiej Piotrowski]

    Date: Monday, March 13, 2017 @ 18:48:37
  Author: bpiotrowski
Revision: 216119

Disable OpenSSL support completely

Added:
  dd_rescue/trunk/dd_rescue-1.99-disable-openssl.patch
Modified:
  dd_rescue/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   16 ++++++++++------
 dd_rescue-1.99-disable-openssl.patch |   21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-13 18:44:42 UTC (rev 216118)
+++ PKGBUILD	2017-03-13 18:48:37 UTC (rev 216119)
@@ -11,23 +11,27 @@
 url="http://www.garloff.de/kurt/linux/ddrescue/"
 license=("GPL")
 depends=('glibc')
-makedepends=('openssl-1.0')
-optdepends=('lzo: for libddr_lzo'
-            'openssl-1.0: for libddr_crypt')
+optdepends=('lzo: for libddr_lzo')
 arch=('x86_64' 'i686')
-source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.bz2")
-sha512sums=('b33f6118fc996252ceafa90d43ff01cd5b54dd03eec9c852d006f15192cbffa99e289ea81c5c10ac91cfa2a26ab2f9e32a70e73d6a5183f9e2d973a75de45b85')
+source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.bz2"
+        'dd_rescue-1.99-disable-openssl.patch')
+sha512sums=('b33f6118fc996252ceafa90d43ff01cd5b54dd03eec9c852d006f15192cbffa99e289ea81c5c10ac91cfa2a26ab2f9e32a70e73d6a5183f9e2d973a75de45b85'
+            'fff318506e57a6737f523ecebd90751a35e908ca71fb29985132c9c2e6b476f341c241a2abb8a86b86bf24d03e185f15d2bc89f3c3d834cbb34aecb8e5e85d55')
 
 prepare() {
   cd $pkgname-$pkgver
+  autoreconf -fi
 
   # Don't install to /usr/lib64
   sed -i '/LIB = lib64/d' Makefile
+
+  # Disable OpenSSL support
+  patch -p1 -i ../dd_rescue-1.99-disable-openssl.patch
 }
 
 build() {
   cd $pkgname-$pkgver
-  ./autogen.sh
+  ./configure
   make
 }
 

Added: dd_rescue-1.99-disable-openssl.patch
===================================================================
--- dd_rescue-1.99-disable-openssl.patch	                        (rev 0)
+++ dd_rescue-1.99-disable-openssl.patch	2017-03-13 18:48:37 UTC (rev 216119)
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index f891255..1899f34 100644
+--- a/Makefile
++++ b/Makefile
+@@ -50,15 +50,7 @@ else
+   HAVE_LZO=0
+ endif
+ 
+-ifeq ($(shell grep 'HAVE_LIBCRYPTO 1' config.h >/dev/null 2>&1 && echo 1), 1)
+-  OTHTARGETS += pbkdf2
+-  AES_OSSL_PO = aes_ossl.po
+-  AES_OSSL_O = aes_ossl.o
+-  CRYPTOLIB = -lcrypto
+-  HAVE_OPENSSL=1
+-else
+-  HAVE_OPENSSL=0
+-endif
++HAVE_OPENSSL=0
+ 
+ ifeq ($(CC),wcl386)
+   CFLAGS = "-ox -wx $(EXTRA_CFLAGS)"