Bug#604063: unblock: libnl/1.1-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock package libnl
I contains a one-line patch cherry-picked from upstream git to fix an
important bug and does some house keeping (cleaning up obsolete,
pre-lenny conflicts, correct homepage url).
Changelog:
libnl (1.1-6) unstable; urgency=low
.
* debian/control
- Bump Standards-Version to 3.9.1. No further changes.
- Update homepage URL.
- Remove obsolete Conflicts/Replaces (pre-lenny).
* debian/watch
- Update for new upstream location.
* debian/patches/fix_port_tracking.patch
- release_local_port: properly compute bitmap position. Closes: #594328
Patch cherry-picked from upstream Git.
-- Michael Biebl <biebl@debian.org> Fri, 19 Nov 2010 11:10:38 +0100
complete debdiff is attached.
unblock libnl/1.1-6
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libnl-1.1/debian/libnl-dev.install libnl-1.1/debian/libnl-dev.install
--- libnl-1.1/debian/libnl-dev.install
+++ libnl-1.1/debian/libnl-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/libnl.so
+usr/include/*
+usr/lib/pkgconfig/*
+usr/lib/libnl.so
diff -u libnl-1.1/debian/changelog libnl-1.1/debian/changelog
--- libnl-1.1/debian/changelog
+++ libnl-1.1/debian/changelog
@@ -1,3 +1,17 @@
+libnl (1.1-6) unstable; urgency=low
+
+ * debian/control
+ - Bump Standards-Version to 3.9.1. No further changes.
+ - Update homepage URL.
+ - Remove obsolete Conflicts/Replaces (pre-lenny).
+ * debian/watch
+ - Update for new upstream location.
+ * debian/patches/fix_port_tracking.patch
+ - release_local_port: properly compute bitmap position. Closes: #594328
+ Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl@debian.org> Wed, 17 Nov 2010 03:03:41 +0100
+
libnl (1.1-5) unstable; urgency=low
* Add symbols file for libnl1.
diff -u libnl-1.1/debian/copyright libnl-1.1/debian/copyright
--- libnl-1.1/debian/copyright
+++ libnl-1.1/debian/copyright
@@ -7,11 +7,11 @@
Thomas Graf <tgraf@suug.ch>
-Copyright:
+Copyright:
-lib/route/addr.c
+lib/route/addr.c
include/netlink/route/addr.h
-
+
Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
Baruch Even <baruch@ev-en.org>,
Mediatrix Telecom, inc. <ericb@mediatrix.com>
@@ -22,7 +22,7 @@
lib/route/sch/htb.c
include/netlink/route/cls/fw.h
include/netlink/route/sch/htb.h
-
+
Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
Copyright (c) 2006 Petr Gotthard <petr.gotthard@siemens.com>
Copyright (c) 2006 Siemens AG Oesterreich
diff -u libnl-1.1/debian/libnl1.install libnl-1.1/debian/libnl1.install
--- libnl-1.1/debian/libnl1.install
+++ libnl-1.1/debian/libnl1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libnl.so.*
+usr/lib/libnl.so.*
diff -u libnl-1.1/debian/watch libnl-1.1/debian/watch
--- libnl-1.1/debian/watch
+++ libnl-1.1/debian/watch
@@ -2,2 +2 @@
-opts="uversionmangle=s/-pre/~pre/" \
-http://people.suug.ch/~tgr/libnl/files/libnl-(\d+.*)\.tar\.gz
+http://www.infradead.org/~tgr/libnl/ .*libnl-(\d+.*)\.tar\.gz
diff -u libnl-1.1/debian/control libnl-1.1/debian/control
--- libnl-1.1/debian/control
+++ libnl-1.1/debian/control
@@ -3,17 +3,15 @@
Priority: optional
Maintainer: Michael Biebl <biebl@debian.org>
Build-Depends: debhelper (>= 7), cdbs, doxygen, texlive-latex-base, graphviz, ghostscript, quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/libnl
Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/libnl
-Homepage: http://people.suug.ch/~tgr/libnl/
+Homepage: http://www.infradead.org/~tgr/libnl/
Package: libnl1
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libnl1-pre6, libnl1-pre8
-Replaces: libnl1-pre6, libnl1-pre8
Description: library for dealing with netlink sockets
This is a library for applications dealing with netlink sockets.
The library provides an interface for raw netlink messaging and various
diff -u libnl-1.1/debian/patches/series libnl-1.1/debian/patches/series
--- libnl-1.1/debian/patches/series
+++ libnl-1.1/debian/patches/series
@@ -1,0 +2 @@
+fix_port_tracking.patch
only in patch2:
unchanged:
--- libnl-1.1.orig/debian/patches/fix_port_tracking.patch
+++ libnl-1.1/debian/patches/fix_port_tracking.patch
@@ -0,0 +1,27 @@
+From ef8ba32e0ca7ac7bbbaf87f6fd7b197af18aed25 Mon Sep 17 00:00:00 2001
+From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
+Date: Mon, 27 Apr 2009 14:46:08 -0700
+Subject: [PATCH] release_local_port: properly compute the bitmap position
+
+Current calculation is always off, not reflecting the right position
+in the bitmap, which results in failures due to conflicts (detected at
+the kernel level) when trying to open a new handle.
+
+Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
+---
+ lib/socket.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: libnl-1.1/lib/socket.c
+===================================================================
+--- libnl-1.1.orig/lib/socket.c 2010-11-17 02:55:53.070669985 +0100
++++ libnl-1.1/lib/socket.c 2010-11-17 02:58:07.970667329 +0100
+@@ -153,7 +153,7 @@
+ return;
+
+ nr = port >> 22;
+- used_ports_map[nr / 32] &= ~((nr % 32) + 1);
++ used_ports_map[nr / 32] &= ~(1 << nr % 32);
+ }
+
+ /**
Reply to: