tags 674391 + patch tags 674391 + pending thanks Dear maintainer,
I've prepared an NMU for autofs (versioned as 5.0.6-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -Nru autofs-5.0.6/debian/changelog autofs-5.0.6/debian/changelog --- autofs-5.0.6/debian/changelog 2012-04-25 08:20:20.000000000 +0100 +++ autofs-5.0.6/debian/changelog 2012-05-31 13:56:56.000000000 +0100 @@ -1,3 +1,14 @@ +autofs (5.0.6-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/18ftbfs_autoreconf.patch: Fix FTBFS due to autoconf run + at clean target. (Closes: #674391) + * debian/rules, debian/control: Run autoconf and autotools with dh + helper instead. + * debian/patches/17ld.patch: FTBFS with gold / ld --no-add-needed + + -- Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com> Thu, 31 May 2012 13:51:39 +0100 + autofs (5.0.6-1) unstable; urgency=low * New upstream release diff -Nru autofs-5.0.6/debian/control autofs-5.0.6/debian/control --- autofs-5.0.6/debian/control 2012-04-25 05:38:18.000000000 +0100 +++ autofs-5.0.6/debian/control 2012-05-31 13:55:14.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Dmitry Smirnov <only...@member.fsf.org> Uploaders: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de> Standards-Version: 3.9.3 -Build-Depends: debhelper (>= 9), autoconf, lsb-base, +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, lsb-base, bison, flex, libhesiod-dev, libkrb5-dev, libldap-dev, libsasl2-dev, libssl-dev, libxml2-dev Homepage: http://www.kernel.org/pub/linux/daemons/autofs/v5/ diff -Nru autofs-5.0.6/debian/patches/17ld.patch autofs-5.0.6/debian/patches/17ld.patch --- autofs-5.0.6/debian/patches/17ld.patch 1970-01-01 01:00:00.000000000 +0100 +++ autofs-5.0.6/debian/patches/17ld.patch 2012-05-31 13:57:26.000000000 +0100 @@ -0,0 +1,68 @@ +Description: FTBFS with gold / ld --no-add-needed + +diff -Naurp autofs5-5.0.6.orig//aclocal.m4 autofs5-5.0.6//aclocal.m4 +--- autofs5-5.0.6.orig//aclocal.m4 2011-06-28 03:34:35.000000000 -0400 ++++ autofs5-5.0.6//aclocal.m4 2011-07-03 21:44:22.090944882 -0400 +@@ -241,9 +241,9 @@ dnl ------------------------------------ + AC_DEFUN([AF_CHECK_LIBHESIOD], + [AC_MSG_CHECKING(for libhesiod) + +-# save current ldflags +-af_check_hesiod_save_ldflags="$LDFLAGS" +-LDFLAGS="$LDFLAGS -lhesiod -lresolv" ++# save current libs ++af_check_hesiod_save_libs="$LIBS" ++LIBS="$LIBS -lhesiod -lresolv" + + AC_TRY_LINK( + [ #include <hesiod.h> ], +@@ -253,8 +253,8 @@ AC_TRY_LINK( + AC_MSG_RESULT(yes) ], + [ AC_MSG_RESULT(no) ]) + +-# restore ldflags +-LDFLAGS="$af_check_hesiod_save_ldflags" ++# restore libs ++LIBS="$af_check_hesiod_save_ldflags" + ]) + + dnl -------------------------------------------------------------------------- +diff -Naurp autofs5-5.0.6.orig//configure autofs5-5.0.6//configure +--- autofs5-5.0.6.orig//configure 2011-06-28 03:34:35.000000000 -0400 ++++ autofs5-5.0.6//configure 2011-07-03 21:44:22.100944883 -0400 +@@ -4030,9 +4030,9 @@ then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhesiod" >&5 + $as_echo_n "checking for libhesiod... " >&6; } + +-# save current ldflags +-af_check_hesiod_save_ldflags="$LDFLAGS" +-LDFLAGS="$LDFLAGS -lhesiod -lresolv" ++# save current libs ++af_check_hesiod_save_ldflags="$LIBS" ++LIBS="$LIBS -lhesiod -lresolv" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -4057,8 +4057,8 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +-# restore ldflags +-LDFLAGS="$af_check_hesiod_save_ldflags" ++# restore libs ++LIBS="$af_check_hesiod_save_ldflags" + + if test "$HAVE_HESIOD" == "1"; then + +diff -Naurp autofs5-5.0.6.orig//daemon/Makefile autofs5-5.0.6//daemon/Makefile +--- autofs5-5.0.6.orig//daemon/Makefile 2011-06-28 03:34:35.000000000 -0400 ++++ autofs5-5.0.6//daemon/Makefile 2011-07-03 21:44:22.100944883 -0400 +@@ -20,7 +20,7 @@ CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfi + CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" + CFLAGS += -DVERSION_STRING=\"$(version)\" + LDFLAGS += -rdynamic +-LIBS = -ldl ++LIBS = -ldl -lpthread + + ifeq ($(LDAP), 1) + CFLAGS += $(XML_FLAGS) diff -Nru autofs-5.0.6/debian/patches/18ftbfs_autoreconf.patch autofs-5.0.6/debian/patches/18ftbfs_autoreconf.patch --- autofs-5.0.6/debian/patches/18ftbfs_autoreconf.patch 1970-01-01 01:00:00.000000000 +0100 +++ autofs-5.0.6/debian/patches/18ftbfs_autoreconf.patch 2012-05-31 13:33:30.000000000 +0100 @@ -0,0 +1,30 @@ +Description: Fix FTBFS. Remove unconditional autoreconf in clean target. +Author: Dmitrijs Ledkovs <dmitrijs.ledk...@canonical.com> +Bug-Debian: http://bugs.debian.org/674391 +Last-Update: 2012-05-31 + +=== modified file 'Makefile' +--- old/Makefile 2008-04-28 15:55:37 +0000 ++++ new/Makefile 2012-05-31 12:32:27 +0000 +@@ -38,8 +38,6 @@ + echo x > .autofs-`cat .version` + sed -e "s/(\.autofs-[0-9.]\+)/(.autofs-`cat .version`)/" < configure.in > configure.in.tmp + mv -f configure.in.tmp configure.in +- rm -f configure +- $(MAKE) configure + + TODAY := $(shell date +'%Y%m%d') + PKGDIR := $(shell basename `pwd`) +@@ -48,11 +46,6 @@ + backup: mrproper + cd .. ; tar zcf - $(PKGDIR) | gzip -9 > autofs-$(VERSION)-bu-$(TODAY).tar.gz + +-configure: configure.in aclocal.m4 +- autoconf +- autoheader +- rm -rf config.* *.cache +- + configure.in: .version + -rm -f .autofs-* + echo x > .autofs-`cat .version` + diff -Nru autofs-5.0.6/debian/patches/series autofs-5.0.6/debian/patches/series --- autofs-5.0.6/debian/patches/series 2012-04-24 22:41:59.000000000 +0100 +++ autofs-5.0.6/debian/patches/series 2012-05-31 13:58:56.000000000 +0100 @@ -57,3 +57,6 @@ manpages.patch manpages-hyphen.patch lsb_initscript.patch +17ld.patch +18ftbfs_autoreconf.patch + diff -Nru autofs-5.0.6/debian/rules autofs-5.0.6/debian/rules --- autofs-5.0.6/debian/rules 2012-04-23 16:13:10.000000000 +0100 +++ autofs-5.0.6/debian/rules 2012-05-31 13:53:17.000000000 +0100 @@ -4,10 +4,9 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with autotools-dev,autoreconf override_dh_auto_configure: - #autoconf --force dh_auto_configure -- \ --enable-forced-shutdown \ --enable-ignore-busy \ -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/debian-bugs-rc
