Bug#751796: gnutls26: dh-autoreconf (patch available)
Mauricio Faria de Oliveira
mauricfo at linux.vnet.ibm.com
Mon Jun 30 20:10:08 UTC 2014
Hi Andreas,
>> I will take a look at using a newer automake, and the implied
>> changes/fixes it might need.
>
> Thank you.
Nicely, only a few minor changes were required.
>> Would you be OK with carrying a patch for that matter?
>
> Yes, sure. Given that it probably will not be big and gnutls26 does
> not get new upstream releases there should not be a maintainance cost.
Cool. I added a patch with more documentation in its description field.
With it applied, gnutls26 builds fine on ppc64el, with no difference
to the packages from powerpc (other than build-id, sure); details below.
Is the attached patch OK for a new upload?
> Please note that I will try very hard to get rid of gnutls26 in
> jessie.
Ok. I see gnutls28 already runs dh-autoreconf, so it would be OK on
the ppc64el side, AFAICT.
Thank you.
Details:
--------
Comparison of gnutls26's binary packages (powerpc and ppc64el):
$ for arch in powerpc ppc64el; do
mkdir -p contents/$arch &&
cd $arch &&
for deb in *.deb; do
dpkg-deb -c $deb
| sed 's,\(powerpc\)\|\(powerpc64le\),GNU_ARCH,g'
| cut -d. -f2-
| sort
> ../contents/$arch/${deb%%_*}.contents;
done &&
cd ..;
done
$ diff -r contents/*
diff -r contents/powerpc/libgnutls26-dbg.contents
contents/ppc64el/libgnutls26-dbg.contents
15,20c15,20
< /usr/lib/debug/.build-id/b5/
< /usr/lib/debug/.build-id/b5/5a9ca34e104923db1e02451bc4279884af6bf1.debug
< /usr/lib/debug/.build-id/e3/
< /usr/lib/debug/.build-id/e3/2523acc3a59567161fd1048e2d6f1058bfd0c9.debug
< /usr/lib/debug/.build-id/ef/
< /usr/lib/debug/.build-id/ef/aa8275a54ac989b6b86bf1dc21688b45063446.debug
---
> /usr/lib/debug/.build-id/6b/
> /usr/lib/debug/.build-id/6b/e3020e7fa04aacce93d5b27639fadf4bb9c580.debug
> /usr/lib/debug/.build-id/de/
> /usr/lib/debug/.build-id/de/f9f14b8787bbe79f40703f1ae57b46a594e774.debug
> /usr/lib/debug/.build-id/f6/
> /usr/lib/debug/.build-id/f6/fd796c7c0ec15e54ed16d8bf5bc8d85a85621b.debug
$
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
-------------- next part --------------
diff -Nru gnutls26-2.12.23/debian/changelog gnutls26-2.12.23/debian/changelog
--- gnutls26-2.12.23/debian/changelog 2014-05-31 11:14:33.000000000 -0300
+++ gnutls26-2.12.23/debian/changelog 2014-06-30 15:10:04.000000000 -0300
@@ -1,3 +1,10 @@
+gnutls26 (2.12.23-16.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Run dh-autoreconf on build; add fixes for automake (30_fix_automake_oldies.patch). (Closes: #751796)
+
+ -- Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com> Mon, 30 Jun 2014 12:56:42 -0300
+
gnutls26 (2.12.23-16) unstable; urgency=high
* Drop libgnutls26-dbg Conflicts with libgnutls13-dbg, libgnutls28-dbg.
diff -Nru gnutls26-2.12.23/debian/control gnutls26-2.12.23/debian/control
--- gnutls26-2.12.23/debian/control 2014-05-25 03:32:12.000000000 -0300
+++ gnutls26-2.12.23/debian/control 2014-06-30 15:10:07.000000000 -0300
@@ -9,7 +9,8 @@
Build-Depends: debhelper (>= 9), libgcrypt11-dev (>= 1.4.0), zlib1g-dev,
cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
libtasn1-6-dev, autotools-dev, datefudge,
- libp11-kit-dev (>= 0.11) [!or1k], pkg-config, chrpath
+ libp11-kit-dev (>= 0.11) [!or1k], pkg-config, chrpath,
+ dh-autoreconf
Build-Conflicts: libgnutls-dev
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/pkg-gnutls/gnutls.git -b gnutls26-master
diff -Nru gnutls26-2.12.23/debian/patches/30_fix_automake_oldies.patch gnutls26-2.12.23/debian/patches/30_fix_automake_oldies.patch
--- gnutls26-2.12.23/debian/patches/30_fix_automake_oldies.patch 1969-12-31 21:00:00.000000000 -0300
+++ gnutls26-2.12.23/debian/patches/30_fix_automake_oldies.patch 2014-06-30 15:10:15.000000000 -0300
@@ -0,0 +1,125 @@
+Description: Fix warnings from automake oldies
+ This patch fixes the following automake warnings (treated as errors) in order
+ to run dh_autoreconf successfully with current versions of automake (e.g., 1.14.1):
+ - The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged.
+ You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
+ and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
+ - warning: 'lib*.la': linking libtool libraries using a non-POSIX
+ archiver requires 'AM_PROG_AR' in 'configure.ac'
+ while processing Libtool library 'lib*.la'
+ - warning: source file '*' is in a subdirectory,
+ but option 'subdir-objects' is disabled
+Forwarded: not-needed
+Last-Update: 2014-06-30
+Author: Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com>
+
+Index: gnutls26-2.12.23/aclocal.m4
+===================================================================
+--- gnutls26-2.12.23.orig/aclocal.m4 2013-02-04 06:46:27.000000000 -0200
++++ gnutls26-2.12.23/aclocal.m4 2014-06-30 12:36:03.000000000 -0300
+@@ -495,7 +495,7 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+Index: gnutls26-2.12.23/lib/aclocal.m4
+===================================================================
+--- gnutls26-2.12.23.orig/lib/aclocal.m4 2013-02-04 06:45:48.000000000 -0200
++++ gnutls26-2.12.23/lib/aclocal.m4 2014-06-30 12:37:09.000000000 -0300
+@@ -655,7 +655,7 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+Index: gnutls26-2.12.23/lib/gl/m4/po.m4
+===================================================================
+--- gnutls26-2.12.23.orig/lib/gl/m4/po.m4 2012-03-01 12:53:12.000000000 -0300
++++ gnutls26-2.12.23/lib/gl/m4/po.m4 2014-06-30 12:37:22.000000000 -0300
+@@ -24,7 +24,7 @@
+ [
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
+Index: gnutls26-2.12.23/lib/m4/po.m4
+===================================================================
+--- gnutls26-2.12.23.orig/lib/m4/po.m4 2009-11-01 07:42:59.000000000 -0200
++++ gnutls26-2.12.23/lib/m4/po.m4 2014-06-30 12:37:16.000000000 -0300
+@@ -24,7 +24,7 @@
+ [
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
+Index: gnutls26-2.12.23/libextra/aclocal.m4
+===================================================================
+--- gnutls26-2.12.23.orig/libextra/aclocal.m4 2013-02-04 06:46:10.000000000 -0200
++++ gnutls26-2.12.23/libextra/aclocal.m4 2014-06-30 12:37:34.000000000 -0300
+@@ -655,7 +655,7 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+Index: gnutls26-2.12.23/configure.ac
+===================================================================
+--- gnutls26-2.12.23.orig/configure.ac 2013-02-04 06:33:52.000000000 -0200
++++ gnutls26-2.12.23/configure.ac 2014-06-30 12:24:14.000000000 -0300
+@@ -26,7 +26,7 @@
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override subdir-objects])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AC_CONFIG_HEADERS([config.h])
+
+@@ -36,6 +36,7 @@
+
+ dnl Checks for programs.
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_LN_S
+ GTK_DOC_CHECK(1.1)
+ AC_PATH_PROG([GAA], [gaa])
+Index: gnutls26-2.12.23/lib/configure.ac
+===================================================================
+--- gnutls26-2.12.23.orig/lib/configure.ac 2013-02-04 06:34:03.000000000 -0200
++++ gnutls26-2.12.23/lib/configure.ac 2014-06-30 12:24:22.000000000 -0300
+@@ -31,6 +31,7 @@
+ AC_CONFIG_HEADERS([config.h])
+
+ AC_PROG_CC
++AM_PROG_AR
+ lgl_EARLY
+
+ AC_LIBTOOL_WIN32_DLL
+Index: gnutls26-2.12.23/libextra/configure.ac
+===================================================================
+--- gnutls26-2.12.23.orig/libextra/configure.ac 2013-02-04 06:34:05.000000000 -0200
++++ gnutls26-2.12.23/libextra/configure.ac 2014-06-30 12:24:18.000000000 -0300
+@@ -31,6 +31,7 @@
+ AC_CONFIG_HEADERS([config.h])
+
+ AC_PROG_CC
++AM_PROG_AR
+ xgl_EARLY
+
+ AC_LIBTOOL_WIN32_DLL
diff -Nru gnutls26-2.12.23/debian/patches/series gnutls26-2.12.23/debian/patches/series
--- gnutls26-2.12.23/debian/patches/series 2014-05-31 11:03:06.000000000 -0300
+++ gnutls26-2.12.23/debian/patches/series 2014-06-30 15:10:15.000000000 -0300
@@ -9,3 +9,4 @@
27_CVE-2014-0092.diff
28_use_gnutls_global_set_time.diff
29_Prevent-memory-corruption.diff
+30_fix_automake_oldies.patch
diff -Nru gnutls26-2.12.23/debian/rules gnutls26-2.12.23/debian/rules
--- gnutls26-2.12.23/debian/rules 2014-04-27 03:56:11.000000000 -0300
+++ gnutls26-2.12.23/debian/rules 2014-06-30 15:10:07.000000000 -0300
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
--without-lzo --disable-guile \
More information about the Pkg-gnutls-maint
mailing list