Force compile with openssl 1.0

3 files changed, 34 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6c44568cd2a..a6b9d160cb90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Mar 20 20:03:56 UTC 2017
+# Wed May 10 12:14:25 UTC 2017
 pkgbase = quickbms
 	pkgdesc = Files extractor and reimporter, archives and file formats parser, advanced tool for reversers and power users and much more.
 	pkgver = 0.8.0
@@ -11,13 +11,15 @@ pkgbase = quickbms
 	depends = lzo
 	depends = bzip2
 	depends = zlib
-	depends = openssl
+	depends = openssl-1.0
 	source = quickbms_0.8.0.zip::http://aluigi.altervista.org/papers/quickbms_src.zip
+	source = ldflags.patch
 	sha512sums = b2f686faf335d3df3a46cb9e04c7067eaae0ce7bbb66e464744d8b74d61ca180cffe19b90ac39882aff90b112ded18b9cab2da592de90f634da6bfa9be8a0ea9
+	sha512sums = cd1ad206f64d0a23342a620ec719c4fae79b61f9226dcd1a34a9527b21186b1d46911588ad9bc9cb4bc2bb3b02a9a748ee8f3371b7deb1efc5be294bb6d968ef
 	depends_x86_64 = lib32-lzo
 	depends_x86_64 = lib32-bzip2
 	depends_x86_64 = lib32-zlib
-	depends_x86_64 = lib32-openssl
+	depends_x86_64 = lib32-openssl-1.0
 	depends_x86_64 = lib32-gcc-libs
 	makedepends_x86_64 = gcc-multilib
 
diff --git a/PKGBUILD b/PKGBUILD
index c18d7834cb6f..d81fe08c54e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,25 @@ pkgdesc="Files extractor and reimporter, archives and file formats parser, advan
 url="http://aluigi.altervista.org/quickbms.htm"
 arch=('x86_64' 'i686')
 license=('GPL2')
-depends=('lzo' 'bzip2' 'zlib' 'openssl')
-depends_x86_64=('lib32-lzo' 'lib32-bzip2' 'lib32-zlib' 'lib32-openssl' 'lib32-gcc-libs')
+depends=('lzo' 'bzip2' 'zlib' 'openssl-1.0')
+depends_x86_64=('lib32-lzo' 'lib32-bzip2' 'lib32-zlib' 'lib32-openssl-1.0' 'lib32-gcc-libs')
 makedepends_x86_64=('gcc-multilib')
-source=("quickbms_${pkgver}.zip::http://aluigi.altervista.org/papers/quickbms_src.zip")
-sha512sums=('b2f686faf335d3df3a46cb9e04c7067eaae0ce7bbb66e464744d8b74d61ca180cffe19b90ac39882aff90b112ded18b9cab2da592de90f634da6bfa9be8a0ea9')
+source=("quickbms_${pkgver}.zip::http://aluigi.altervista.org/papers/quickbms_src.zip" "ldflags.patch")
+sha512sums=('b2f686faf335d3df3a46cb9e04c7067eaae0ce7bbb66e464744d8b74d61ca180cffe19b90ac39882aff90b112ded18b9cab2da592de90f634da6bfa9be8a0ea9'
+            'cd1ad206f64d0a23342a620ec719c4fae79b61f9226dcd1a34a9527b21186b1d46911588ad9bc9cb4bc2bb3b02a9a748ee8f3371b7deb1efc5be294bb6d968ef')
+
+prepare() {
+  cd $srcdir/src
+  patch -p1 < $srcdir/ldflags.patch
+}
 
 build() {
+  export CFLAGS+=" -I/usr/include/openssl-1.0"
+  if [ "$CARCH" = "x86_64" ]; then
+    export LDFLAGS+=" -L/usr/lib32/openssl-1.0"
+  else
+    export LDFLAGS+=" -L/usr/lib/openssl-1.0"
+  fi
   cd $srcdir/src
   make
 }
diff --git a/ldflags.patch b/ldflags.patch
new file mode 100644
index 000000000000..1d3059a28d0a
--- /dev/null
+++ b/ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 2232d4f..cbeab5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ all:
+ 	\
+ 	compression/*.c* encryption/*.c* extra/mem2mem.c libs/lzma/LzmaDec.c libs/lzma/Lzma2Dec.c libs/lzma/Bra86.c libs/lzma/LzFind.c libs/lzma/LzmaEnc.c libs/lzma/Lzma2Enc.c libs/mspack/*.c libs/ppmd/*.cpp libs/aplib/depacks.c libs/brieflz/depacks.c libs/brieflz/brieflz.c compression/jcalg1_static.lib libs/zziplib/*.c libs/bcl/*.c libs/szip/*.c libs/lzhl/*.cpp libs/tdcb/*.c libs/libkirk/*.c libs/7z_advancecomp/*.cc libs/iris/*.cpp libs/old_cabextract/lzx.c libs/mrci/*.cpp libs/lz4/*.c libs/snappy/snappy.cc libs/snappy/snappy-c.cc libs/snappy/snappy-stubs-internal.cc libs/snappy/snappy-sinksource.cc libs/mmini/mmini_huffman.c libs/mmini/mmini_lzl.c libs/clzw/lzw-dec.c libs/clzw/lzw-enc.c libs/lzlib/lzlib.c libs/blosc/blosclz.c libs/gipfeli/*.cc libs/liblzg/src/lib/decode.c libs/liblzg/src/lib/encode.c libs/liblzg/src/lib/checksum.c libs/doboz/*.cpp libs/amiga/* libs/sphlib/c/*.c libs/shadowforce/*.cpp libs/zstd/common/*.c libs/zstd/compress/*.c libs/zstd/decompress/*.c libs/zstd/dictBuilder/*.c libs/zstd/legacy/*.c -Ilibs/zstd -Ilibs/zstd/common -Ilibs/zstd/legacy libs/azo/unAZO.cpp libs/azo/Decoder/MainCodeD.cpp libs/azo/Common/x86Filter.cpp libs/nintendo_ds/*.c libs/ctw/*.c libs/grzip/libgrzip.c libs/heatshrink/heatshrink_decoder.c libs/heatshrink/heatshrink_encoder.c libs/libzling/*.cpp  -Ilibs/ecrypt/include -Ilibs/libcsc -D_7Z_TYPES_ libs/libcsc/csc_dec.cpp libs/libcsc/csc_default_alloc.cpp libs/libcsc/csc_filters.cpp libs/libcsc/csc_memio.cpp -DDENSITY_FORCE_INLINE=inline -Drestrict=__restrict__ libs/density/src/*.c libs/density/src/spookyhash/src/*.c libs/brotli/dec/*.c libs/brotli/common/*.c libs/libbsc/adler32/adler32.cpp libs/libbsc/bwt/bwt.cpp libs/libbsc/coder/coder.cpp libs/libbsc/coder/qlfc/qlfc.cpp libs/libbsc/coder/qlfc/qlfc_model.cpp libs/libbsc/filters/detectors.cpp libs/libbsc/filters/preprocessing.cpp libs/libbsc/libbsc/libbsc.cpp libs/libbsc/lzp/lzp.cpp libs/libbsc/platform/platform.cpp libs/libbsc/st/st.cpp libs/shoco/shoco.c libs/ms-compress/src/*.cpp libs/lzjody/lzjody.c libs/lzjody/byteplane_xfrm.c disasm/disasm.c disasm/cmdlist.c disasm/assembl/assembl.c libs/mydownlib/mydownlib.c libs/TurboRLE/trlec.c libs/TurboRLE/trled.c libs/TurboRLE/ext/mrle.c libs/lhasa/lib/*_decoder.c libs/lhasa/lib/crc16.c libs/dipperstein/*.c libs/liblzf/lzf_d.c libs/liblzf/lzf_c_best.c libs/zopfli/*.c libs/lzham_codec/lzhamcomp/*.cpp libs/lzham_codec/lzhamdecomp/*.cpp libs/lzham_codec/lzhamlib/*.cpp -Ilibs/lzham_codec/include -Ilibs/lzham_codec/lzhamcomp -Ilibs/lzham_codec/lzhamdecomp -DLZHAM_ANSI_CPLUSPLUS libs/dmsdos/*.c libs/tornado/Tornado.cpp libs/tornado/Common.cpp libs/PKLib/*.c extra/mybits.c libs/lz5/lz5*.c libs/lizard/*.c libs/ppmz2/*.c* libs/libdivsufsort/*.c libs/xxhash/*.c extra/xalloc.c libs/lzfse/src/*.c  libs/hsel/myhsel.cpp libs/hsel/HSEL.cpp libs/glza/GLZAmodel.c libs/minilzo/minilzo.c  \
+ 	\
+-	$(CLIBS) $(CDEFS)
++	$(CLIBS) $(CDEFS) $(LDFLAGS)
+ 
+ install:
+ 	install -m 755 -d $(BINDIR)