tags 688163 + patch thanks Hi Alexander,
I've attached the full debdiff from the Ubuntu 1.26-1ubuntu1 version and also the patch itself. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
#! /bin/sh /usr/share/dpatch/dpatch-run ## 99_ubuntu_libnl-3-linking.dpatch by Andres Rodriguez <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ipvsadm-1.26~/Makefile ipvsadm-1.26/Makefile --- ipvsadm-1.26~/Makefile 2012-05-31 18:22:39.000000000 -0400 +++ ipvsadm-1.26/Makefile 2012-05-31 18:22:39.000000000 -0400 @@ -82,7 +82,8 @@ OBJS = ipvsadm.o config_stream.o dynamic_array.o LIBS = $(POPT_LIB) ifneq (0,$(HAVE_NL)) -LIBS += -lnl +INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0) +LIBS += $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0) endif DEFINES = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \ -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE) diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ipvsadm-1.26~/libipvs/Makefile ipvsadm-1.26/libipvs/Makefile --- ipvsadm-1.26~/libipvs/Makefile 2008-09-21 06:02:03.000000000 -0400 +++ ipvsadm-1.26/libipvs/Makefile 2012-05-31 18:22:39.000000000 -0400 @@ -4,6 +4,7 @@ CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ifneq (0,$(HAVE_NL)) CFLAGS += -DLIBIPVS_USE_NL +INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0) endif INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ipvsadm-1.26~/libipvs/libipvs.c ipvsadm-1.26/libipvs/libipvs.c --- ipvsadm-1.26~/libipvs/libipvs.c 2011-02-06 21:38:57.000000000 -0500 +++ ipvsadm-1.26/libipvs/libipvs.c 2012-05-31 18:24:11.176032999 -0400 @@ -32,7 +32,7 @@ struct ip_vs_getinfo ipvs_info; #ifdef LIBIPVS_USE_NL -static struct nl_handle *sock = NULL; +static struct nl_sock *sock = NULL; static int family, try_nl = 1; #endif @@ -73,7 +73,7 @@ { int err = EINVAL; - sock = nl_handle_alloc(); + sock = nl_socket_alloc(); if (!sock) { nlmsg_free(msg); return -1; @@ -88,7 +88,7 @@ /* To test connections and set the family */ if (msg == NULL) { - nl_handle_destroy(sock); + nl_socket_free(sock); sock = NULL; return 0; } @@ -104,12 +104,12 @@ nlmsg_free(msg); - nl_handle_destroy(sock); + nl_socket_free(sock); return 0; fail_genl: - nl_handle_destroy(sock); + nl_socket_free(sock); sock = NULL; nlmsg_free(msg); errno = err;
diff -u ipvsadm-1.26/debian/changelog ipvsadm-1.26/debian/changelog --- ipvsadm-1.26/debian/changelog +++ ipvsadm-1.26/debian/changelog @@ -1,3 +1,15 @@ +ipvsadm (1:1.26-1ubuntu1) quantal; urgency=low + + * Merge from Debian testing (LP: #1007160). Remaining changes: + - Build-depend on pkg-config. + - Port to libnl3. + + debian/control: update Build-Depends libnl3-dev -> libnl-3-dev, + libnl-genl-3-dev. + * debian/patches/99_ubuntu_libnl-3-linking.dpatch: Convert quilt patch + 'libnl-3-linking.patch' to dpatch. + + -- Andres Rodriguez <[email protected]> Thu, 31 May 2012 18:05:42 -0400 + ipvsadm (1:1.26-1) unstable; urgency=low * [084f2b6] Imported Upstream version 1.26 @@ -16,6 +28,55 @@ -- Alexander Wirt <[email protected]> Wed, 22 Feb 2012 22:03:47 +0100 +ipvsadm (1:1.25.clean-1ubuntu5) precise; urgency=low + + * debian/control: update Build-Depends: libnl3-dev -> libnl-3-dev, + libnl-genl-3-dev. + * debian/patches/libnl-3-linking.patch: fix linking (and cflags) to properly + build against libnl3 now that the modules are split. + + -- Mathieu Trudel-Lapierre <[email protected]> Wed, 21 Dec 2011 15:26:24 -0500 + +ipvsadm (1:1.25.clean-1ubuntu4) precise; urgency=low + + * Makefile: test for poptGetContext by piping some test C code using + poptGetContext to $(CC) -include popt.h rather than searching for + libpopt.a in a set of hardcoded directories as that didn't work with + multiarch anymore and caused the package to FTBFS. + + -- Loïc Minier <[email protected]> Thu, 01 Dec 2011 17:21:44 +0100 + +ipvsadm (1:1.25.clean-1ubuntu3) oneiric; urgency=low + + * Build-depend on pkg-config. + + -- Colin Watson <[email protected]> Tue, 09 Aug 2011 14:16:09 +0100 + +ipvsadm (1:1.25.clean-1ubuntu2) oneiric; urgency=low + + * Port to libnl3. + + -- Colin Watson <[email protected]> Mon, 08 Aug 2011 17:23:22 +0100 + +ipvsadm (1:1.25.clean-1ubuntu1) natty; urgency=low + + * libipvs/libipvs.c: upstream patch (r64) to fix incorrect activeconns, + (Debian bug 574587), (LP: #663564) + + -- Clint Byrum <[email protected]> Tue, 16 Nov 2010 15:25:39 -0800 + +ipvsadm (1:1.25.clean-1) unstable; urgency=low + + * New upstream version (Closes: #540423) + - Build depend on libnl-dev + * Fix pending l10n issues. Debconf translations: + * Vietnamese (Clytie Siddall). Closes: #513582 + * Spanish (Francisco Javier Cuadrado). Closes: #529727 + * Arabic (Ossama M. Khayat). Closes: #552384 + * Japanese (Hideki Yamane (Debian-JP)). Closes: #553028 + + -- Alexander Wirt <[email protected]> Tue, 10 Nov 2009 07:35:04 +0100 + ipvsadm (1:1.25) unstable; urgency=low * New upstream version (Closes: #540423) diff -u ipvsadm-1.26/debian/control ipvsadm-1.26/debian/control --- ipvsadm-1.26/debian/control +++ ipvsadm-1.26/debian/control @@ -1,9 +1,10 @@ Source: ipvsadm Section: net Priority: extra -Maintainer: Alexander Wirt <[email protected]> +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Alexander Wirt <[email protected]> Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 7.0.50~), libpopt-dev, po-debconf, libnl-dev, dpatch (>= 2.0.32~) +Build-Depends: debhelper (>= 7.0.50~), libpopt-dev, po-debconf, libnl-3-dev, libnl-genl-3-dev, pkg-config, dpatch (>= 2.0.32~) Package: ipvsadm Architecture: any diff -u ipvsadm-1.26/debian/patches/00list ipvsadm-1.26/debian/patches/00list --- ipvsadm-1.26/debian/patches/00list +++ ipvsadm-1.26/debian/patches/00list @@ -2,0 +3 @@ +99_ubuntu_libnl-3-linking only in patch2: unchanged: --- ipvsadm-1.26.orig/debian/patches/99_ubuntu_libnl-3-linking.dpatch +++ ipvsadm-1.26/debian/patches/99_ubuntu_libnl-3-linking.dpatch @@ -0,0 +1,76 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_ubuntu_libnl-3-linking.dpatch by Andres Rodriguez <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ipvsadm-1.26~/Makefile ipvsadm-1.26/Makefile +--- ipvsadm-1.26~/Makefile 2012-05-31 18:22:39.000000000 -0400 ++++ ipvsadm-1.26/Makefile 2012-05-31 18:22:39.000000000 -0400 +@@ -82,7 +82,8 @@ + OBJS = ipvsadm.o config_stream.o dynamic_array.o + LIBS = $(POPT_LIB) + ifneq (0,$(HAVE_NL)) +-LIBS += -lnl ++INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0) ++LIBS += $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0) + endif + DEFINES = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \ + -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE) +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ipvsadm-1.26~/libipvs/Makefile ipvsadm-1.26/libipvs/Makefile +--- ipvsadm-1.26~/libipvs/Makefile 2008-09-21 06:02:03.000000000 -0400 ++++ ipvsadm-1.26/libipvs/Makefile 2012-05-31 18:22:39.000000000 -0400 +@@ -4,6 +4,7 @@ + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC + ifneq (0,$(HAVE_NL)) + CFLAGS += -DLIBIPVS_USE_NL ++INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0) + endif + + INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ipvsadm-1.26~/libipvs/libipvs.c ipvsadm-1.26/libipvs/libipvs.c +--- ipvsadm-1.26~/libipvs/libipvs.c 2011-02-06 21:38:57.000000000 -0500 ++++ ipvsadm-1.26/libipvs/libipvs.c 2012-05-31 18:24:11.176032999 -0400 +@@ -32,7 +32,7 @@ + struct ip_vs_getinfo ipvs_info; + + #ifdef LIBIPVS_USE_NL +-static struct nl_handle *sock = NULL; ++static struct nl_sock *sock = NULL; + static int family, try_nl = 1; + #endif + +@@ -73,7 +73,7 @@ + { + int err = EINVAL; + +- sock = nl_handle_alloc(); ++ sock = nl_socket_alloc(); + if (!sock) { + nlmsg_free(msg); + return -1; +@@ -88,7 +88,7 @@ + + /* To test connections and set the family */ + if (msg == NULL) { +- nl_handle_destroy(sock); ++ nl_socket_free(sock); + sock = NULL; + return 0; + } +@@ -104,12 +104,12 @@ + + nlmsg_free(msg); + +- nl_handle_destroy(sock); ++ nl_socket_free(sock); + + return 0; + + fail_genl: +- nl_handle_destroy(sock); ++ nl_socket_free(sock); + sock = NULL; + nlmsg_free(msg); + errno = err;
signature.asc
Description: OpenPGP digital signature
