Package: quota
Version: 4.00-1
Severity: minor

Dear Maintainer,

libnl3 3.2.3 is now in unstable. It would be nice if quota could be rebuilt
against it.

Seems like the rebuild (from testing it on Ubuntu) will require patching the
source to take into account changes in the name of the development libraries
for libnl3, as well as the split of the netlink modules into separate
libraries.

I've attached the debdiff of the changes I'm proposing for Ubuntu, which patch
the configure script to take into account the changes.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages quota depends on:
ii  debconf [debconf-2.0]  1.5.41ubuntu1
ii  e2fslibs               1.42~WIP-2011-10-16-1ubuntu1
ii  libc6                  2.13-23ubuntu1
ii  libdbus-1-3            1.4.16-1ubuntu1
ii  libldap-2.4-2          2.4.25-4ubuntu1
ii  libnl-3-200            3.2.3-2
ii  libnl-genl-3-200       3.2.3-2
ii  libwrap0               7.6.q-21
ii  lsb-base               4.0-0ubuntu17

quota recommends no packages.

Versions of packages quota suggests:
pn  libnet-ldap-perl   <none>
pn  rpcbind | portmap  <none>
diff -u quota-4.00/debian/control quota-4.00/debian/control
--- quota-4.00/debian/control
+++ quota-4.00/debian/control
@@ -1,9 +1,11 @@
 Source: quota
 Section: admin
 Priority: optional
-Maintainer: Michael Meskes <mes...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Meskes <mes...@debian.org>
 Build-Depends: debhelper (>= 6.0.7~), gettext, libwrap0-dev, e2fslibs-dev,
-               po-debconf (>= 0.5.0), libldap2-dev, libssl-dev, quilt (>= 0.46-7), libnl3-dev,
+               po-debconf (>= 0.5.0), libldap2-dev, libssl-dev, quilt (>= 0.46-7),
+               libnl-3-dev, libnl-genl-3-dev,
                libdbus-1-dev
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/linuxquota
diff -u quota-4.00/debian/changelog quota-4.00/debian/changelog
--- quota-4.00/debian/changelog
+++ quota-4.00/debian/changelog
@@ -1,3 +1,12 @@
+quota (4.00-1ubuntu1) UNRELEASED; urgency=low
+
+  * debian/patches/port-to-libnl3-3.2.patch: make sure we support building
+    against libnl3 3.2.x; which now splits the different netlink modules.
+  * debian/control: update Build-Depends: libnl3-dev -> libnl-3-dev,
+    libnl-genl-3-dev.
+
+ -- Mathieu Trudel-Lapierre <mathieu...@ubuntu.com>  Fri, 23 Dec 2011 11:24:35 -0500
+
 quota (4.00-1) unstable; urgency=low
 
   * New Upstream version 4.00
diff -u quota-4.00/debian/patches/series quota-4.00/debian/patches/series
--- quota-4.00/debian/patches/series
+++ quota-4.00/debian/patches/series
@@ -3,0 +4 @@
+port-to-libnl3-3.2.patch
only in patch2:
unchanged:
--- quota-4.00.orig/debian/patches/port-to-libnl3-3.2.patch
+++ quota-4.00/debian/patches/port-to-libnl3-3.2.patch
@@ -0,0 +1,72 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapie...@canonical.com>
+Subject: Allow building against libnl3 3.2.x, which splits the netlink modules
+
+Index: quota/configure.in
+===================================================================
+--- quota.orig/configure.in	2011-12-23 11:47:16.999487574 -0500
++++ quota/configure.in	2011-12-23 11:47:17.027487575 -0500
+@@ -123,7 +123,7 @@
+ if test "x$enable_netlink" != "xno"; then
+ 	PKG_CHECK_MODULES([DBUS], [dbus-1])
+ 
+-	PKG_CHECK_MODULES([NL], [libnl-3.0], [NETLINKLIBS="$NL_LIBS $DBUS_LIBS"], [NETLINKLIBS=])
++	PKG_CHECK_MODULES([NL], [libnl-3.0 libnl-genl-3.0], [NETLINKLIBS="$NL_LIBS $DBUS_LIBS" CPPFLAGS="$NL_CFLAGS $CPPFLAGS"], [NETLINKLIBS=])
+ 	if test -z "$NETLINKLIBS" -o -z "$DBUS_LIBS"; then
+ 		if test "x$enable_netlink" = "xyes"; then
+ 			AC_MSG_ERROR([Required libraries for quota netlink daemon not found.])
+Index: quota/configure
+===================================================================
+--- quota.orig/configure	2011-12-23 11:47:17.003487574 -0500
++++ quota/configure	2011-12-23 11:48:40.903492443 -0500
+@@ -3962,12 +3962,12 @@
+     pkg_cv_NL_CFLAGS="$NL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-genl-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libnl-3.0 libnl-genl-3.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_NL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0" 2>/dev/null`
++  pkg_cv_NL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 libnl-genl-3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -3978,12 +3978,12 @@
+     pkg_cv_NL_LIBS="$NL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-genl-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libnl-3.0 libnl-genl-3.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_NL_LIBS=`$PKG_CONFIG --libs "libnl-3.0" 2>/dev/null`
++  pkg_cv_NL_LIBS=`$PKG_CONFIG --libs "libnl-3.0 libnl-genl-3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -4001,9 +4001,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        NL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0" 2>&1`
++	        NL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0 libnl-genl-3.0" 2>&1`
+         else
+-	        NL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0" 2>&1`
++	        NL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0 libnl-genl-3.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$NL_PKG_ERRORS" >&5
+@@ -4019,6 +4019,7 @@
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	NETLINKLIBS="$NL_LIBS $DBUS_LIBS"
++	CPPFLAGS="$NL_CFLAGS $CPPFALGS"
+ fi
+ 	if test -z "$NETLINKLIBS" -o -z "$DBUS_LIBS"; then
+ 		if test "x$enable_netlink" = "xyes"; then

Reply via email to