ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

Revert "libnl: update to 3.2.17"

Browse Source 
This reverts commit 8e99773fbe.
This commit is contained in:
Juergen Daubert 2013-01-25 21:54:41 +01:00
parent ca8de06212
commit 3b27d95fb0
6 changed files with 83 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libnl/.footprint
View File

@ -59,7 +59,6 @@ drwxr-xr-x root/root usr/include/libnl3/netlink/route/cls/ematch/
drwxr-xr-x root/root usr/include/libnl3/netlink/route/link/
-rw-r--r-- root/root usr/include/libnl3/netlink/route/link/api.h
-rw-r--r-- root/root usr/include/libnl3/netlink/route/link/bonding.h
-rw-r--r-- root/root usr/include/libnl3/netlink/route/link/can.h
-rw-r--r-- root/root usr/include/libnl3/netlink/route/link/inet.h
-rw-r--r-- root/root usr/include/libnl3/netlink/route/link/info-api.h
-rw-r--r-- root/root usr/include/libnl3/netlink/route/link/vlan.h
@ -91,24 +90,24 @@ drwxr-xr-x root/root usr/include/libnl3/netlink/route/qdisc/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libnl-3.a
-rwxr-xr-x root/root usr/lib/libnl-3.la
lrwxrwxrwx root/root usr/lib/libnl-3.so -> libnl-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-3.so.200 -> libnl-3.so.200.13.0
-rwxr-xr-x root/root usr/lib/libnl-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-3.so -> libnl-3.so.200.12.1
lrwxrwxrwx root/root usr/lib/libnl-3.so.200 -> libnl-3.so.200.12.1
-rwxr-xr-x root/root usr/lib/libnl-3.so.200.12.1
-rw-r--r-- root/root usr/lib/libnl-genl-3.a
-rwxr-xr-x root/root usr/lib/libnl-genl-3.la
lrwxrwxrwx root/root usr/lib/libnl-genl-3.so -> libnl-genl-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-genl-3.so.200 -> libnl-genl-3.so.200.13.0
-rwxr-xr-x root/root usr/lib/libnl-genl-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-genl-3.so -> libnl-genl-3.so.200.12.1
lrwxrwxrwx root/root usr/lib/libnl-genl-3.so.200 -> libnl-genl-3.so.200.12.1
-rwxr-xr-x root/root usr/lib/libnl-genl-3.so.200.12.1
-rw-r--r-- root/root usr/lib/libnl-nf-3.a
-rwxr-xr-x root/root usr/lib/libnl-nf-3.la
lrwxrwxrwx root/root usr/lib/libnl-nf-3.so -> libnl-nf-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-nf-3.so.200 -> libnl-nf-3.so.200.13.0
-rwxr-xr-x root/root usr/lib/libnl-nf-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-nf-3.so -> libnl-nf-3.so.200.12.1
lrwxrwxrwx root/root usr/lib/libnl-nf-3.so.200 -> libnl-nf-3.so.200.12.1
-rwxr-xr-x root/root usr/lib/libnl-nf-3.so.200.12.1
-rw-r--r-- root/root usr/lib/libnl-route-3.a
-rwxr-xr-x root/root usr/lib/libnl-route-3.la
lrwxrwxrwx root/root usr/lib/libnl-route-3.so -> libnl-route-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-route-3.so.200 -> libnl-route-3.so.200.13.0
-rwxr-xr-x root/root usr/lib/libnl-route-3.so.200.13.0
lrwxrwxrwx root/root usr/lib/libnl-route-3.so -> libnl-route-3.so.200.12.1
lrwxrwxrwx root/root usr/lib/libnl-route-3.so.200 -> libnl-route-3.so.200.12.1
-rwxr-xr-x root/root usr/lib/libnl-route-3.so.200.12.1
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libnl-3.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libnl-genl-3.0.pc

2
libnl/.md5sum
View File

@ -1 +1 @@
2e57ef6ced666b0288a8a205b9a0ad00 libnl-3.2.17.tar.gz
f06e6de102abb2cef71ed671957ee099 libnl-3.2.16.tar.gz

2
libnl/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=libnl
version=3.2.17
version=3.2.16
release=1
source=(http://www.infradead.org/~tgr/$name/files/$name-$version.tar.gz)

27
libnl/libnl-1.1-fix_port_tracking.patch Normal file
View File

@ -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);
}
/**

12
libnl/libnl-1.1-limits.patch Normal file
View File

@ -0,0 +1,12 @@
Index: libnl-1.1/include/netlink-local.h
===================================================================
--- libnl-1.1.orig/include/netlink-local.h 2008-10-08 19:58:47.000000000 +0200
+++ libnl-1.1/include/netlink-local.h 2008-10-08 19:58:51.000000000 +0200
@@ -26,6 +26,7 @@
#include <sys/socket.h>
#include <inttypes.h>
#include <assert.h>
+#include <limits.h>
#include <arpa/inet.h>
#include <netdb.h>

30
libnl/libnl-1.1-remove_inline_specifier.patch Normal file
View File

@ -0,0 +1,30 @@
Origin: http://bugs.gentoo.org/attachment.cgi?id=272585&action=diff
Description: libnl headers incompatible with gcc -std=gnu99
Ubuntu-Bug: https://launchpad.net/bugs/780044
Index: libnl-1.1/include/netlink/object.h
===================================================================
--- libnl-1.1.orig/include/netlink/object.h 2011-06-16 13:15:28.000000000 -0500
+++ libnl-1.1/include/netlink/object.h 2011-06-16 13:16:22.000000000 -0500
@@ -55,7 +55,7 @@
/* Access Functions */
extern int nl_object_get_refcnt(struct nl_object *);
extern struct nl_cache * nl_object_get_cache(struct nl_object *);
-extern inline void * nl_object_priv(struct nl_object *);
+extern void * nl_object_priv(struct nl_object *);
#ifdef __cplusplus
}
Index: libnl-1.1/lib/object.c
===================================================================
--- libnl-1.1.orig/lib/object.c 2011-06-16 13:16:55.000000000 -0500
+++ libnl-1.1/lib/object.c 2011-06-16 13:17:15.000000000 -0500
@@ -376,7 +376,7 @@
return obj->ce_cache;
}
-inline void *nl_object_priv(struct nl_object *obj)
+void *nl_object_priv(struct nl_object *obj)
{
return obj;
}