Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
xar PKGBUILD fixes
diff --git a/.SRCINFO b/.SRCINFO
index e458be3..83480e7 100644
--- a/.SRCINFO
diff --git a/.SRCINFO b/.SRCINFO
index e458be3..83480e7 100644
--- a/.SRCINFO
diff --git a/.SRCINFO b/.SRCINFO
index e458be3..83480e7 100644
--- a/.SRCINFO
--- a/.SRCINFO
diff --git a/.SRCINFO b/.SRCINFO
index e458be3..83480e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
pkgbase = xar
pkgdesc = eXtensible ARchive format
pkgver = 1.6.1
- pkgrel = 4
+ pkgrel = 5
url = http://mackyle.github.io/xar/
arch = i686
arch = x86_64
license = custom:BSD
depends = libxml2
- depends = openssl-1.0
+ depends = openssl
depends = bzip2
options = !libtool
source = https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz
source = xar-ext2-bug-workaround.patch
+ source = init-crypto.patch
md5sums = a624535d6a1e8fdf420b36a6b334047b
md5sums = 4d4c52b9fbd8861e1322257a1b365f01
+ md5sums = f25390b29e07ed7fa072fcb04b28cfb7
pkgname = xar
diff --git a/PKGBUILD b/PKGBUILD
index e850e91..40ba71f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,23 @@
pkgname=xar
pkgver=1.6.1
-pkgrel=4
+pkgrel=5
pkgdesc='eXtensible ARchive format'
arch=('i686' 'x86_64')
url='http://mackyle.github.io/xar/'
license=('custom:BSD')
-depends=('libxml2' 'openssl-1.0' 'bzip2')
+depends=('libxml2' 'openssl' 'bzip2')
options=('!libtool')
-source=('https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz' 'xar-ext2-bug-workaround.patch')
-md5sums=('a624535d6a1e8fdf420b36a6b334047b' '4d4c52b9fbd8861e1322257a1b365f01')
+source=('https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz' xar-ext2-bug-workaround.patch init-crypto.patch)
+md5sums=('a624535d6a1e8fdf420b36a6b334047b'
+ '4d4c52b9fbd8861e1322257a1b365f01'
+ 'f25390b29e07ed7fa072fcb04b28cfb7')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
patch -p1 < "$srcdir/xar-ext2-bug-workaround.patch"
- ./autogen.sh --prefix=/usr --mandir=/usr/share/man CFLAGS="-I/usr/include/openssl-1.0" LDFLAGS="-L/usr/lib/openssl-1.0"
+ patch -p1 < "$srcdir/init-crypto.patch"
+ ./autogen.sh --prefix=/usr --mandir=/usr/share/man
make
}
diff --git a/init-crypto.patch b/init-crypto.patch
new file mode 100644
index 0000000..d2ed41e
--- /dev/null
+++ b/init-crypto.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -329,7 +329,7 @@ dnl Configure libcrypto (part of OpenSSL).
+ dnl
+ have_libcrypto="1"
+ AC_CHECK_HEADERS([openssl/evp.h], , [have_libcrypto="0"])
+-AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto="0"])
++AC_CHECK_LIB([crypto], [OPENSSL_init_crypto], , [have_libcrypto="0"])
+ if test "x${have_libcrypto}" = "x0" ; then
+ AC_MSG_ERROR([Cannot build without libcrypto (OpenSSL)])
+ fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment