tags 713689 patch
thanks

On 2013-06-22 David Suárez <[email protected]> wrote:
> Source: libimobiledevice
> Version: 1.1.1-4
[...]
> During a rebuild of all packages in sid, your package failed to build on
> amd64.
[...]
> >   CCLD     idevicebackup
> > /usr/bin/ld: idevicebackup-idevicebackup.o: undefined reference to symbol 
> > 'gcry_md_hash_buffer@@GCRYPT_1.2'
> > /lib/x86_64-linux-gnu/libgcrypt.so.11: error adding symbols: DSO missing 
> > from command line
> > collect2: error: ld returned 1 exit status
[...]

Good morning,

find attached a patch to let libimobiledevice build again.

On a sidenote: Could you perhaps cluebat^W kindly nudge upstream: It
is not the smartest idea to *add* dependencies on gcrypt if the main
focus in gnutls, which does not use gcrypt anymore in 3.x.

Thanks, cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru libimobiledevice-1.1.1/debian/changelog libimobiledevice-1.1.1/debian/changelog
--- libimobiledevice-1.1.1/debian/changelog	2012-03-18 16:26:17.000000000 +0100
+++ libimobiledevice-1.1.1/debian/changelog	2013-06-30 08:32:33.000000000 +0200
@@ -1,3 +1,16 @@
+libimobiledevice (1.1.1-4.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Disable 05_remove_gcry_need.patch. src/userpref.c directly invokes
+    gcry_control() nowadays.
+  * [07_moregcryptlinkage.diff] tools/idevicebackup.c 
+    directly invokes gcrypt functions, link it against libgcrypt.
+    Closes: #713689
+  * Explicitely disable silent-rules, the newer automake seems to use them
+    by default.
+
+ -- Andreas Metzler <[email protected]>  Sun, 30 Jun 2013 08:19:10 +0200
+
 libimobiledevice (1.1.1-4) unstable; urgency=low
 
   [ Robert Hooker ]
diff -Nru libimobiledevice-1.1.1/debian/patches/07_moregcryptlinkage.diff libimobiledevice-1.1.1/debian/patches/07_moregcryptlinkage.diff
--- libimobiledevice-1.1.1/debian/patches/07_moregcryptlinkage.diff	1970-01-01 01:00:00.000000000 +0100
+++ libimobiledevice-1.1.1/debian/patches/07_moregcryptlinkage.diff	2013-06-30 08:31:29.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Link tools/idevicebackup.c against libgcrypt
+ tools/idevicebackup.c 
+ directly invokes gcrypt functions, link it against libgcrypt.
+Author: Andreas Metzler <[email protected]>
+Bug-Debian: http://bugs.debian.org/713689
+
+--- libimobiledevice-1.1.1.orig/tools/Makefile.am
++++ libimobiledevice-1.1.1/tools/Makefile.am
+@@ -28,7 +28,7 @@ idevice_id_LDADD = ../src/libimobiledevi
+ idevicebackup_SOURCES = idevicebackup.c
+ idevicebackup_CFLAGS = $(AM_CFLAGS)
+ idevicebackup_LDFLAGS = $(AM_LDFLAGS)
+-idevicebackup_LDADD = ../src/libimobiledevice.la
++idevicebackup_LDADD = ../src/libimobiledevice.la $(libgcrypt_LIBS)
+ 
+ idevicebackup2_SOURCES = idevicebackup2.c
+ idevicebackup2_CFLAGS = $(AM_CFLAGS)
diff -Nru libimobiledevice-1.1.1/debian/patches/series libimobiledevice-1.1.1/debian/patches/series
--- libimobiledevice-1.1.1/debian/patches/series	2012-03-18 16:26:17.000000000 +0100
+++ libimobiledevice-1.1.1/debian/patches/series	2013-06-30 08:26:46.000000000 +0200
@@ -3,5 +3,5 @@
 02-add-missing-linking.patch
 03_ac_pkg_swig_m4_fixed.patch
 04_libplist_DSO_linking.patch
-05_remove_gcry_need.patch
 06_git_ios5_handle_error.patch
+07_moregcryptlinkage.diff
diff -Nru libimobiledevice-1.1.1/debian/rules libimobiledevice-1.1.1/debian/rules
--- libimobiledevice-1.1.1/debian/rules	2012-03-18 16:26:17.000000000 +0100
+++ libimobiledevice-1.1.1/debian/rules	2013-06-30 08:33:12.000000000 +0200
@@ -15,7 +15,7 @@
 		--prefix=/usr \
 		--sysconfdir=/etc --host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
-		--enable-dev-tools
+		--enable-dev-tools --disable-silent-rules
 
 %:
 	dh --with python2 --with autoreconf $@

Reply via email to