Package: src:libjpeg6b
Version: 6b1-4
Tags: patch
User: debian-powe...@lists.debian.org
Usertags: ppc64el
User: debian-de...@lists.debian.org
Usertags: autoreconf
Hi Bill,
This patch runs dh-autoreconf when building libjpeg6b.
It is required for generating shared libraries on ppc64el and probably
other new ports as well.
It includes a patch to add -Wno-obsolete in AM_INIT_AUTOMAKE, due to
ansi2knr being deprecated in automake1.11.
(for the reader: reasoning for automake1.11 documented in #751424)
Before:
$ dpkg-deb -c libjpeg62_6b1-4_ppc64el.deb | fgrep .so
$
After:
$ dpkg-deb -c libjpeg62_6b1-4.1_ppc64el.deb | fgrep .so
-rw-r--r-- root/root 167528 2014-06-30 18:21
./usr/lib/powerpc64le-linux-gnu/libjpeg.so.62.0.0
lrwxrwxrwx root/root 0 2014-06-30 18:21
./usr/lib/powerpc64le-linux-gnu/libjpeg.so.62 -> libjpeg.so.62.0.0
Thanks!
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
diff -Nru libjpeg6b-6b1/debian/changelog libjpeg6b-6b1/debian/changelog
--- libjpeg6b-6b1/debian/changelog 2013-12-05 20:43:54.000000000 -0200
+++ libjpeg6b-6b1/debian/changelog 2014-06-30 18:20:38.000000000 -0300
@@ -1,3 +1,10 @@
+libjpeg6b (6b1-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Run dh-autoreconf (requires automake1.11 -Wno-obsolete, see
automake-Wno-obsolete.patch).
+
+ -- Mauricio Faria de Oliveira <mauri...@linux.vnet.ibm.com> Mon, 30 Jun 2014
18:18:08 -0300
+
libjpeg6b (6b1-4) unstable; urgency=high
* Apply upstream patch to fix CVE-2013-6629 and CVE-2013-6630.
diff -Nru libjpeg6b-6b1/debian/control libjpeg6b-6b1/debian/control
--- libjpeg6b-6b1/debian/control 2012-06-02 11:18:18.000000000 -0300
+++ libjpeg6b-6b1/debian/control 2014-06-30 18:05:51.000000000 -0300
@@ -2,7 +2,7 @@
Maintainer: Bill Allombert <ballo...@debian.org>
Section: graphics
Priority: optional
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, dh-autoreconf, automake1.11
Standards-Version: 3.9.3
Package: libjpeg62
diff -Nru libjpeg6b-6b1/debian/patches/automake-Wno-obsolete.patch
libjpeg6b-6b1/debian/patches/automake-Wno-obsolete.patch
--- libjpeg6b-6b1/debian/patches/automake-Wno-obsolete.patch 1969-12-31
21:00:00.000000000 -0300
+++ libjpeg6b-6b1/debian/patches/automake-Wno-obsolete.patch 2014-06-30
18:17:36.000000000 -0300
@@ -0,0 +1,19 @@
+Description: automake 1.11 needs -Wno-obsolete due to ansi2knr (for autoreconf)
+ or fails with message 'automatic de-ANSI-fication support is deprecated'.
+Forwarded: not-needed
+Last-Update: 2014-06-30
+Author: Mauricio Faria de Oliveira <mauri...@linux.vnet.ibm.com>
+
+Index: libjpeg6b-6b1/configure.ac
+===================================================================
+--- libjpeg6b-6b1.orig/configure.ac 2010-05-15 16:28:51.000000000 -0300
++++ libjpeg6b-6b1/configure.ac 2014-06-30 18:07:36.000000000 -0300
+@@ -21,7 +21,7 @@
+
+ # Initialize Automake
+ # Don't require all the GNU mandated files
+-AM_INIT_AUTOMAKE([-Wall -Werror ansi2knr no-dist foreign])
++AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
+
+ # Make --enable-silent-rules the default.
+ # To get verbose build output you may configure
diff -Nru libjpeg6b-6b1/debian/patches/series
libjpeg6b-6b1/debian/patches/series
--- libjpeg6b-6b1/debian/patches/series 2013-12-03 19:54:02.000000000 -0200
+++ libjpeg6b-6b1/debian/patches/series 2014-06-30 18:06:35.000000000 -0300
@@ -1,3 +1,4 @@
extern_C-jpeglib.h
use-autotools-dev
fix-CVE-2013-6629_6630
+automake-Wno-obsolete.patch
diff -Nru libjpeg6b-6b1/debian/rules libjpeg6b-6b1/debian/rules
--- libjpeg6b-6b1/debian/rules 2013-12-05 08:24:59.000000000 -0200
+++ libjpeg6b-6b1/debian/rules 2014-06-30 18:05:51.000000000 -0300
@@ -15,10 +15,14 @@
endif
#export DH_VERBOSE=1
+export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
+export AUTOHEADER = true
build: build-stamp
build-stamp:
dh_testdir
+ dh_autoreconf
./configure --prefix=/usr --mandir=/usr/share/man \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--enable-static --enable-shared --enable-maxmem=1024 \
@@ -36,6 +40,7 @@
-rm -f build-stamp stamp-h1
if [ -f Makefile ]; then $(MAKE) clean; fi
-rm -f Makefile jconfig.h config.log config.status libtool
+ dh_autoreconf_clean
dh_clean
binary-indep:
