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

[Felix Yan]

    Date: Thursday, June 18, 2020 @ 20:38:01
  Author: felixonmars
Revision: 647572

upgpkg: dd_rescue 1.99.8-3: enable openssl support (FS#64928)

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

--------------------------------------+
 PKGBUILD                             |   13 ++++---------
 dd_rescue-1.99-disable-openssl.patch |   21 ---------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-18 20:30:22 UTC (rev 647571)
+++ PKGBUILD	2020-06-18 20:38:01 UTC (rev 647572)
@@ -5,18 +5,16 @@
 
 pkgname=dd_rescue
 pkgver=1.99.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A dd version that is very useful for data-recovery"
 url="http://www.garloff.de/kurt/linux/ddrescue/"
 license=("GPL")
-depends=('glibc')
+depends=('openssl')
 optdepends=('lzo: for libddr_lzo')
 arch=('x86_64')
-source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.bz2"{,.asc}
-        'dd_rescue-1.99-disable-openssl.patch')
+source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.bz2"{,.asc})
 sha512sums=('a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d'
-            'SKIP'
-            'fff318506e57a6737f523ecebd90751a35e908ca71fb29985132c9c2e6b476f341c241a2abb8a86b86bf24d03e185f15d2bc89f3c3d834cbb34aecb8e5e85d55')
+            'SKIP')
 validpgpkeys=('6669F7340D31E95EC5565490DE4F1B3A2BFFC5BF') # Kurt Garloff <kurt at garloff.de>
 
 prepare() {
@@ -25,9 +23,6 @@
 
   # 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() {

Deleted: dd_rescue-1.99-disable-openssl.patch
===================================================================
--- dd_rescue-1.99-disable-openssl.patch	2020-06-18 20:30:22 UTC (rev 647571)
+++ dd_rescue-1.99-disable-openssl.patch	2020-06-18 20:38:01 UTC (rev 647572)
@@ -1,21 +0,0 @@
-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)"