Package: elfsign
Version: 0.2.2-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmps5JSlR
In Ubuntu, the attached patch was applied to achieve the following:
Hi! This package now fails to build from source in sid, because openssl
is now installed multiarch.
This patch solves the problem.
Regards
* Fix SSL libs in multiarch location (LP: #831275)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-11-generic (SMP w/1 CPU core)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u elfsign-0.2.2/debian/control elfsign-0.2.2/debian/control
--- elfsign-0.2.2/debian/control
+++ elfsign-0.2.2/debian/control
@@ -1,8 +1,9 @@
Source: elfsign
Section: devel
Priority: optional
-Maintainer: Andrew Pollock <apoll...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.8-1)
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andrew Pollock <apoll...@debian.org>
+Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.8-1), dh-autoreconf
Standards-Version: 3.6.2
Package: elfsign
diff -u elfsign-0.2.2/debian/changelog elfsign-0.2.2/debian/changelog
diff -u elfsign-0.2.2/debian/rules elfsign-0.2.2/debian/rules
--- elfsign-0.2.2/debian/rules
+++ elfsign-0.2.2/debian/rules
@@ -26,8 +26,9 @@
config.status: configure
dh_testdir
+ dh_autoreconf
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-openssl=/usr
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-openssl=/usr --with-openssl-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH)
build: build-stamp
@@ -44,16 +45,17 @@
clean:
dh_testdir
dh_testroot
+ dh_autoreconf_clean
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+# cp -f /usr/share/misc/config.sub config.sub
+#endif
+#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+# cp -f /usr/share/misc/config.guess config.guess
+#endif
dh_clean
only in patch2:
unchanged:
--- elfsign-0.2.2.orig/configure.in
+++ elfsign-0.2.2/configure.in
@@ -36,7 +36,7 @@
AC_CHECK_FILE("$with_openssl/include/openssl/pem.h",,[AC_MSG_ERROR([required openssl header missing])])
AC_CHECK_FILE("$with_openssl/include/openssl/bio.h",,[AC_MSG_ERROR([required openssl header missing])])
-AC_CHECK_FILE("$with_openssl/lib/libcrypto.so",,[AC_MSG_ERROR([required openssl library missing])])
+AC_CHECK_FILE("$with_openssl_lib_dir/libcrypto.so",,[AC_MSG_ERROR([required openssl library missing])])
INCLUDES="$INCLUDES -I$with_openssl/include"
LIBPATH="$LIBPATH -L$with_openssl/lib"
