tags 654285 + patch
tags 654285 + pending
thanks
Dear maintainer,
I've prepared an NMU for isakmpd (versioned as 20041012-7.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
Hector Oron
diff -Nru isakmpd-20041012/debian/changelog isakmpd-20041012/debian/changelog
--- isakmpd-20041012/debian/changelog 2011-03-18 03:40:04.000000000 +0100
+++ isakmpd-20041012/debian/changelog 2012-02-22 01:43:13.000000000 +0100
@@ -1,3 +1,11 @@
+isakmpd (20041012-7.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS, fix for multiarched gmp (Closes: #654285)
+ - Thanks to Philippe De Swert for patch.
+
+ -- Hector Oron <zu...@debian.org> Wed, 22 Feb 2012 00:35:49 +0000
+
isakmpd (20041012-7.1) unstable; urgency=low
* NMU. Change dependency libgmp3-dev --> libgmp-dev.
diff -Nru isakmpd-20041012/debian/patches/01_makefile.patch isakmpd-20041012/debian/patches/01_makefile.patch
--- isakmpd-20041012/debian/patches/01_makefile.patch 2009-10-30 17:25:23.000000000 +0100
+++ isakmpd-20041012/debian/patches/01_makefile.patch 2012-02-22 01:41:34.000000000 +0100
@@ -116,12 +116,19 @@
+ rm -f ${PROG}
--- isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
+++ isakmpd-20041012/sysdep/linux/GNUmakefile.sysdep
-@@ -30,28 +30,28 @@
+@@ -25,33 +25,33 @@
+ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #
+
+-LIBGMP:= /usr/lib/libgmp.a
+-LIBCRYPTO:= /usr/lib/libcrypto.a
++#LIBGMP:= /usr/lib/libgmp.a
++#LIBCRYPTO:= /usr/lib/libcrypto.a
LIBSYSDEPDIR:= ${.CURDIR}/sysdep/common/libsysdep
LIBSYSDEP:= ${LIBSYSDEPDIR}/libsysdep.a
-LDADD+= -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
-+LDADD+= -lgmp -ldl ${LIBSYSDEP} ${LIBCRYPTO}
++LDADD+= -lgmp -ldl -lcrypto ${LIBSYSDEP} ${LIBCRYPTO}
DPADD+= ${LIBGMP} ${LIBSYSDEP}
-CFLAGS+= -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
