Your message dated Fri, 30 Dec 2011 00:47:31 +0000
with message-id <[email protected]>
and subject line Bug#653198: fixed in libgphoto2 2.4.11-4
has caused the Debian Bug report #653198,
regarding please build for Multi-Arch
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
653198: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653198
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: libgphoto2
Version: 2.4.11-3.1
Severity: normal
Tags: patch
Hello!
In an effort to reach the Multi-Arch release goal, here is a patch to
build libgphoto2 for Multi-Arch, along with a few other subtle fixes. :)
Thanks!
-Kees
--
Kees Cook @debian.org
diff -Nru libgphoto2-2.4.11/debian/changelog libgphoto2-2.4.11/debian/changelog
--- libgphoto2-2.4.11/debian/changelog 2011-09-10 08:11:31.000000000 -0700
+++ libgphoto2-2.4.11/debian/changelog 2011-12-24 17:25:34.000000000 -0800
@@ -1,3 +1,14 @@
+libgphoto2 (2.4.11-3.2) UNRELEASED; urgency=low
+
+ * debian/{control,rules,compat,*.install}: Build for Multi-arch, fix
+ CFLAGS handling, move "print-camera-list" ELF from libgphoto2-2 to
+ libgphoto2-2-dev.
+ * debian/libgphoto2-2-dev.install:
+ - drop use of {}, since it is not technically supported.
+ * debian/patches/71_format-security.patch: fix missing "%s" in printf().
+
+ -- Kees Cook <[email protected]> Sat, 24 Dec 2011 16:25:52 -0800
+
libgphoto2 (2.4.11-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru libgphoto2-2.4.11/debian/compat libgphoto2-2.4.11/debian/compat
--- libgphoto2-2.4.11/debian/compat 2011-02-26 04:08:20.000000000 -0800
+++ libgphoto2-2.4.11/debian/compat 2011-12-24 16:28:51.000000000 -0800
@@ -1 +1 @@
-7
+9
diff -Nru libgphoto2-2.4.11/debian/control libgphoto2-2.4.11/debian/control
--- libgphoto2-2.4.11/debian/control 2011-09-10 07:54:54.000000000 -0700
+++ libgphoto2-2.4.11/debian/control 2011-12-24 17:10:25.000000000 -0800
@@ -6,7 +6,7 @@
, David Paleino <[email protected]>
, Gürkan Sengün <[email protected]>
Build-Depends:
- debhelper (>= 7.0.50)
+ debhelper (>= 8.1.3~)
, libtool
, libltdl-dev
, zlib1g-dev
@@ -35,6 +35,8 @@
, libc-dev
, pkg-config
, ${misc:Depends}
+Breaks: libgphoto2-2 (<< 2.4.11-3.2)
+Replaces: libgphoto2-2 (<< 2.4.11-3.2)
Description: gphoto2 digital camera library (development files)
The gphoto2 library can be used by applications to access various
digital camera models, via standard protocols such as USB Mass Storage
@@ -55,10 +57,12 @@
Package: libgphoto2-port0
Architecture: any
+Multi-Arch: same
Provides: libgphoto2port
Replaces: libgphoto2port
Conflicts: libgphoto2port
Breaks: gphoto2 (<= 2.1.1)
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends}
, ${misc:Depends}
@@ -72,7 +76,9 @@
Package: libgphoto2-2
Architecture: any
+Multi-Arch: same
Breaks: gphoto2 (<= 2.1.1)
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends}
, ${misc:Depends}
@@ -93,6 +99,7 @@
Package: libgphoto2-l10n
Section: localization
Architecture: all
+Multi-Arch: foreign
Breaks: libgphoto2-2 (<= 2.4.10.1-4)
Replaces: libgphoto2-2 (<= 2.4.10.1-4)
Depends: ${misc:Depends}
diff -Nru libgphoto2-2.4.11/debian/libgphoto2-2-dev.install
libgphoto2-2.4.11/debian/libgphoto2-2-dev.install
--- libgphoto2-2.4.11/debian/libgphoto2-2-dev.install 2011-04-13
02:32:26.000000000 -0700
+++ libgphoto2-2.4.11/debian/libgphoto2-2-dev.install 2011-12-24
17:09:37.000000000 -0800
@@ -1,11 +1,17 @@
usr/share/man/man3/libgphoto2.3
usr/share/man/man3/libgphoto2_port.3
-usr/lib/libgphoto2_port.{so,a}
-usr/lib/libgphoto2_port/*/{serial,usb,disk,ptpip}.a
-usr/lib/libgphoto2.{so,a}
-usr/lib/pkgconfig/libgphoto2.pc
-usr/lib/pkgconfig/libgphoto2_port.pc
-usr/lib/libgphoto2/*/*.a
+usr/lib/*/libgphoto2_port.so
+usr/lib/*/libgphoto2_port.a
+usr/lib/*/libgphoto2_port/*/serial.a
+usr/lib/*/libgphoto2_port/*/usb.a
+usr/lib/*/libgphoto2_port/*/disk.a
+usr/lib/*/libgphoto2_port/*/ptpip.a
+usr/lib/*/libgphoto2.so
+usr/lib/*/libgphoto2.a
+usr/lib/*/pkgconfig/libgphoto2.pc
+usr/lib/*/pkgconfig/libgphoto2_port.pc
+usr/lib/*/libgphoto2/*/*.a
+usr/lib/*/libgphoto2/print-camera-list
usr/include/gphoto2/*.h
usr/bin/gphoto2-port-config
usr/bin/gphoto2-config
diff -Nru libgphoto2-2.4.11/debian/libgphoto2-2.install
libgphoto2-2.4.11/debian/libgphoto2-2.install
--- libgphoto2-2.4.11/debian/libgphoto2-2.install 2011-02-27
08:03:30.000000000 -0800
+++ libgphoto2-2.4.11/debian/libgphoto2-2.install 2011-12-24
17:09:05.000000000 -0800
@@ -4,6 +4,5 @@
usr/share/doc/libgphoto2/README usr/share/doc/libgphoto2-2
usr/share/doc/libgphoto2/camlibs/ usr/share/doc/libgphoto2-2
usr/share/libgphoto2/*/konica/*
-usr/lib/libgphoto2/*/*.so
-usr/lib/libgphoto2.so.*
-usr/lib/libgphoto2/print-camera-list
+usr/lib/*/libgphoto2/*/*.so
+usr/lib/*/libgphoto2.so.*
diff -Nru libgphoto2-2.4.11/debian/libgphoto2-port0.install
libgphoto2-2.4.11/debian/libgphoto2-port0.install
--- libgphoto2-2.4.11/debian/libgphoto2-port0.install 2011-04-18
09:04:58.000000000 -0700
+++ libgphoto2-2.4.11/debian/libgphoto2-port0.install 2011-12-24
16:31:21.000000000 -0800
@@ -2,5 +2,5 @@
usr/share/doc/libgphoto2_port/AUTHORS usr/share/doc/libgphoto2-port0
usr/share/doc/libgphoto2_port/README usr/share/doc/libgphoto2-port0
usr/share/doc/libgphoto2_port/NEWS usr/share/doc/libgphoto2-port0
-usr/lib/libgphoto2_port.so.*
-usr/lib/libgphoto2_port/*/*.so
+usr/lib/*/libgphoto2_port.so.*
+usr/lib/*/libgphoto2_port/*/*.so
diff -Nru libgphoto2-2.4.11/debian/patches/71_format-security.patch
libgphoto2-2.4.11/debian/patches/71_format-security.patch
--- libgphoto2-2.4.11/debian/patches/71_format-security.patch 1969-12-31
16:00:00.000000000 -0800
+++ libgphoto2-2.4.11/debian/patches/71_format-security.patch 2011-12-24
17:25:02.000000000 -0800
@@ -0,0 +1,16 @@
+Description: avoid -Wformat-security warnings.
+Author: Kees Cook <[email protected]>
+
+Index: libgphoto2-2.4.11/packaging/generic/print-camera-list.c
+===================================================================
+--- libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c
2011-12-24 17:24:28.081326412 -0800
++++ libgphoto2-2.4.11/packaging/generic/print-camera-list.c 2011-12-24
17:24:39.841493885 -0800
+@@ -506,7 +506,7 @@
+ version_str);
+ print_version_comment(stdout, "# ", "\n", NULL, "#\n");
+ printf ("# this file is autogenerated, local changes will be
LOST on upgrades\n");
+- printf (pdata->begin_string);
++ printf ("%s", pdata->begin_string);
+
+ if (pdata->version == UDEV_136) {
+ if (pdata->mode != NULL || pdata->owner != NULL ||
pdata->group != NULL) {
diff -Nru libgphoto2-2.4.11/debian/patches/series
libgphoto2-2.4.11/debian/patches/series
--- libgphoto2-2.4.11/debian/patches/series 2011-04-18 08:33:31.000000000
-0700
+++ libgphoto2-2.4.11/debian/patches/series 2011-12-24 17:24:23.000000000
-0800
@@ -1,3 +1,4 @@
#10_disable_cache
#11_hurd_no_path_max_bsdsource
70_increase_max_entries
+71_format-security.patch
diff -Nru libgphoto2-2.4.11/debian/rules libgphoto2-2.4.11/debian/rules
--- libgphoto2-2.4.11/debian/rules 2011-02-26 04:08:20.000000000 -0800
+++ libgphoto2-2.4.11/debian/rules 2011-12-24 17:15:52.000000000 -0800
@@ -9,22 +9,11 @@
ifeq ($(DEB_HOST_ARCH_OS),hurd)
CONFIGURE_OPTIONS += --without-libusb
endif
-
-### CFLAGS handling:
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
### Overrides:
override_dh_auto_configure:
- CFLAGS="$(CFLAGS)" dh_auto_configure -- --with-drivers=all
--enable-static $(CONFIGURE_OPTIONS)
+ dh_auto_configure -- --with-drivers=all --enable-static
$(CONFIGURE_OPTIONS)
override_dh_auto_install:
LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib $(MAKE) install
prefix=$(CURDIR)/debian/tmp/usr
@@ -49,7 +38,7 @@
# No longer needed with current udev. But check with non-Linux
architectures stuff:
# rm debian/libgphoto2-2/lib/udev/check-ptp-camera
# Generate the udev file, get it installed, and clean:
- CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/libgphoto2/2*`
./packaging/generic/print-camera-list udev-rules version 136 mode 0664 group
plugdev > debian/libgphoto2-$(major).udev
+ CAMLIBS=`ls -d
debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*`
./packaging/generic/print-camera-list udev-rules version 136 mode 0664 group
plugdev > debian/libgphoto2-$(major).udev
dh_installudev
rm debian/libgphoto2-$(major).udev
endif
--- End Message ---
--- Begin Message ---
Source: libgphoto2
Source-Version: 2.4.11-4
We believe that the bug you reported is fixed in the latest version of
libgphoto2, which is due to be installed in the Debian FTP archive:
libgphoto2-2-dev_2.4.11-4_i386.deb
to main/libg/libgphoto2/libgphoto2-2-dev_2.4.11-4_i386.deb
libgphoto2-2_2.4.11-4_i386.deb
to main/libg/libgphoto2/libgphoto2-2_2.4.11-4_i386.deb
libgphoto2-dev-doc_2.4.11-4_all.deb
to main/libg/libgphoto2/libgphoto2-dev-doc_2.4.11-4_all.deb
libgphoto2-l10n_2.4.11-4_all.deb
to main/libg/libgphoto2/libgphoto2-l10n_2.4.11-4_all.deb
libgphoto2-port0_2.4.11-4_i386.deb
to main/libg/libgphoto2/libgphoto2-port0_2.4.11-4_i386.deb
libgphoto2_2.4.11-4.debian.tar.gz
to main/libg/libgphoto2/libgphoto2_2.4.11-4.debian.tar.gz
libgphoto2_2.4.11-4.dsc
to main/libg/libgphoto2/libgphoto2_2.4.11-4.dsc
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
David Paleino <[email protected]> (supplier of updated libgphoto2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Fri, 30 Dec 2011 01:30:11 +0100
Source: libgphoto2
Binary: libgphoto2-2-dev libgphoto2-dev-doc libgphoto2-port0 libgphoto2-2
libgphoto2-l10n
Architecture: source i386 all
Version: 2.4.11-4
Distribution: unstable
Urgency: low
Maintainer: Debian PhotoTools Maintainers
<[email protected]>
Changed-By: David Paleino <[email protected]>
Description:
libgphoto2-2 - gphoto2 digital camera library
libgphoto2-2-dev - gphoto2 digital camera library (development files)
libgphoto2-dev-doc - gphoto2 digital camera library (development documentation)
libgphoto2-l10n - gphoto2 digital camera library - localized messages
libgphoto2-port0 - gphoto2 digital camera port library
Closes: 649137 653198
Changes:
libgphoto2 (2.4.11-4) unstable; urgency=low
.
* Acknowledge NMU.
* Avoid -Wformat-security warnings, thanks to Kees Cook.
* Multi-Archified package, thanks to Kees Cook and Steve Langasek
(Closes: #653198)
* Support (and recommend) udev >= 175 (Closes: #649137)
Checksums-Sha1:
7076248d732236bbc8535464d7cd02adfecddeb2 1871 libgphoto2_2.4.11-4.dsc
7c16cfe6bbf41589e10fda30721d8d5685564c91 27192
libgphoto2_2.4.11-4.debian.tar.gz
823a34909cc3515e036dc14ab215271f9d96d7f9 2476790
libgphoto2-2-dev_2.4.11-4_i386.deb
56fe85ed5d87e4e8a877a5edff07f1665e4ad6d2 2965878
libgphoto2-dev-doc_2.4.11-4_all.deb
0fa88afc10903d0dec79669ee164de51f4540195 153738
libgphoto2-port0_2.4.11-4_i386.deb
c9972610159a21a6cadcf73777b60c4d27414523 1028476 libgphoto2-2_2.4.11-4_i386.deb
c4fc1b7d5a043155a4151b47168a8c4c01821bd5 743712
libgphoto2-l10n_2.4.11-4_all.deb
Checksums-Sha256:
4f6019b42c7cde709e67fbe47b583816cf3b755321c4199fee3c1a2122ed71a3 1871
libgphoto2_2.4.11-4.dsc
ec33bddf2aeba2875a1e7e1a6d598874b010f4cc0ae5f49ad7d9c74545da417e 27192
libgphoto2_2.4.11-4.debian.tar.gz
606b6c19fb315def6d822fd09750f9749ea238dd0409881e9446653d7db661a2 2476790
libgphoto2-2-dev_2.4.11-4_i386.deb
fe87cd783600a7091fc22a0f9a2700e7de7d29e5894acff5a99a4f8a32795993 2965878
libgphoto2-dev-doc_2.4.11-4_all.deb
8d9774f7304540b329797979e27ed0b5d42099faac48509783b28679c8fa8746 153738
libgphoto2-port0_2.4.11-4_i386.deb
776acffdfe20b0e1d78a77aed731449ae4d78693d5977f928aca2acdf1cbb904 1028476
libgphoto2-2_2.4.11-4_i386.deb
76b1ceab23e4c463d3f32aa9c86d12ae07539ba53946faaf6840a5cdf8991003 743712
libgphoto2-l10n_2.4.11-4_all.deb
Files:
516736d9a7abcdef112769480b0db6df 1871 libs optional libgphoto2_2.4.11-4.dsc
9e8b9d966cf511e02fd3d35df8e9c7ad 27192 libs optional
libgphoto2_2.4.11-4.debian.tar.gz
e301222b0e934ce35376788a9c1eef53 2476790 libdevel optional
libgphoto2-2-dev_2.4.11-4_i386.deb
9d453ce9231632429caed952c54c1a4c 2965878 doc optional
libgphoto2-dev-doc_2.4.11-4_all.deb
48f59d37763be6d77abb556d08ee74e9 153738 libs optional
libgphoto2-port0_2.4.11-4_i386.deb
4c6cbd87b76f63302cfbde360b78ee7f 1028476 libs optional
libgphoto2-2_2.4.11-4_i386.deb
cbac8f8e1cf702afdc6e723dbf315d02 743712 localization optional
libgphoto2-l10n_2.4.11-4_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk79CGwACgkQ5qqQFxOSsXTtzgCgh+e7Y6MzR8Gtz2VkEfIJlTD3
BfsAnin+7jIRL2FlTUE1Xk9uljY54lNS
=6mV1
-----END PGP SIGNATURE-----
--- End Message ---
