[weasel-commit] Source: libnl=1.1-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sat, 23 Jan 2010 08:46:36 -0500
================================
libnl:source=1.1-2 (previous: 1.1-1)
cvc rdiff libnl -1 /weasel.rpath.org@wgl:3-devel/1.1-2
================================
1.1-2 Filip Brcic (brcha@xxxxxxx) Sat Jan 23 08:46:27 2010
fixed recipe and metadata
libnl-1.1-vlan-header.patch: new
--- /dev/null
+++ libnl-1.1-vlan-header.patch
@@ -0,0 +80 @@
+From: Patrick McHardy <kaber@xxxxxxxxx>
+Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
+Subject: [LIBNL]: Add if_vlan.h
+X-Git-Url:
http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
+
+[LIBNL]: Add if_vlan.h
+
+vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
+older if_vlan.h versions. Add the current version from the kernel.
+
+Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
+---
+
+diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
+new file mode 100644
+index 0000000..068cd7b
+--- /dev/null
++++ include/linux/if_vlan.h
+@@ -0,0 +1,61 @@
++/*
++ * VLAN An implementation of 802.1Q VLAN tagging.
++ *
++ * Authors: Ben Greear <greearb@xxxxxxxxxxxxxxx>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ */
++
++#ifndef _LINUX_IF_VLAN_H_
++#define _LINUX_IF_VLAN_H_
++
++
++/* VLAN IOCTLs are found in sockios.h */
++
++/* Passed in vlan_ioctl_args structure to determine behaviour. */
++enum vlan_ioctl_cmds {
++ ADD_VLAN_CMD,
++ DEL_VLAN_CMD,
++ SET_VLAN_INGRESS_PRIORITY_CMD,
++ SET_VLAN_EGRESS_PRIORITY_CMD,
++ GET_VLAN_INGRESS_PRIORITY_CMD,
++ GET_VLAN_EGRESS_PRIORITY_CMD,
++ SET_VLAN_NAME_TYPE_CMD,
++ SET_VLAN_FLAG_CMD,
++ GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN
device, btw */
++ GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
++};
++
++enum vlan_flags {
++ VLAN_FLAG_REORDER_HDR = 0x1,
++};
++
++enum vlan_name_types {
++ VLAN_NAME_TYPE_PLUS_VID, /* Name will look like: vlan0005 */
++ VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like: eth1.0005 */
++ VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like: vlan5 */
++ VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like: eth0.5 */
++ VLAN_NAME_TYPE_HIGHEST
++};
++
++struct vlan_ioctl_args {
++ int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
++ char device1[24];
++
++ union {
++ char device2[24];
++ int VID;
++ unsigned int skb_priority;
++ unsigned int name_type;
++ unsigned int bind_type;
++ unsigned int flag; /* Matches vlan_dev_info flags */
++ } u;
++
++ short vlan_qos;
++};
++
++#endif /* !(_LINUX_IF_VLAN_H_) */
libnl-1.1-minor-leaks.patch: new
--- /dev/null
+++ libnl-1.1-minor-leaks.patch
@@ -0,0 +40 @@
+From: Patrick McHardy <kaber@xxxxxxxxx>
+Date: Fri, 18 Jan 2008 16:55:49 +0000 (+0100)
+Subject: [LIBNL]: Fix minor memleaks on exit
+X-Git-Url:
http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=b64f15d6f947839236fa276d473d238f8c9b9d57;hp=e91bb2ffb090955d443e643a25b250bf3d33534a
+
+[LIBNL]: Fix minor memleaks on exit
+
+Make valgrind happy ...
+
+Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
+---
+
+diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
+index a12d169..1386cda 100644
+--- a/lib/route/route_utils.c
++++ b/lib/route/route_utils.c
+@@ -63,6 +63,11 @@ static void __init init_routing_table_names(void)
+ add_routing_table_name(RT_TABLE_LOCAL, "local");
+ };
+
++static void __exit release_routing_table_names(void)
++{
++ __trans_list_clear(&table_names);
++}
++
+ int rtnl_route_read_table_names(const char *path)
+ {
+ __trans_list_clear(&table_names);
+@@ -104,6 +109,11 @@ static void __init init_proto_names(void)
+ add_proto_name(RTPROT_STATIC, "static");
+ };
+
++static void __exit release_proto_names(void)
++{
++ __trans_list_clear(&proto_names);
++}
++
+ int rtnl_route_read_protocol_names(const char *path)
+ {
+ __trans_list_clear(&proto_names);
libnl-1.1-glibc-2.8-ULONG_MAX.patch: new
--- /dev/null
+++ libnl-1.1-glibc-2.8-ULONG_MAX.patch
@@ -0,0 +13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=225393
+
+--- include/netlink-local.h 2008-06-09 07:54:20 +0000
++++ include/netlink-local.h 2008-06-09 07:54:47 +0000
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
libnl-1.1.tar.gz: new
libnl.recipe: changed
Index: libnl.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libnl.recipe /weasel.rpath.org@wgl:3-devel/1.1-1
+++ libnl.recipe /weasel.rpath.org@wgl:3-devel/1.1-2
@@ -1,45 +1,27 @@
#
-# Copyright (c) 2006 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
-loadSuperClass('rpmpackage')
-class Libnl(RPMPackageRecipe, AutoPackageRecipe):
+class Libnl(AutoPackageRecipe):
name = 'libnl'
version = '1.1'
buildRequires = []
- rpmRelease = '5.fc10'
+ shortDesc = 'Convenience library for kernel netlink sockets'
+ longDesc = """
+This package contains a convenience library to simplify using the
+Linux kernel's netlink sockets interface for network manipulation.
+"""
+ url = 'http://people.suug.ch/~tgr/libnl/'
+ licenses = [ 'LGPL-2.1' ]
+ categories = [ 'Development/Libraries' ]
- rpmPatches = [
- 'libnl-1.0-pre5-static.patch',
- 'libnl-1.0-pre5-debuginfo.patch',
- 'libnl-1.0-pre8-use-vasprintf-retval.patch',
- 'libnl-1.0-pre8-more-build-output.patch',
- 'libnl-1.1-include-limits-h.patch',
- 'libnl-1.1-doc-inlinesrc.patch'
- ]
+ def unpack(r):
+ r.addArchive(('http://people.suug.ch/~tgr/libnl/files/',
+ 'mirror://gentoo/'))
- packageSummary = 'Convenience library for kernel netlink sockets'
- packageDescription = """
-This package contains a convenience library to simplify
-using the Linux kernel's netlink sockets interface for
-network manipulation
-"""
-
- def unpack(r):
- RPMPackageRecipe.unpack(r)
-
- if Arch.x86_64:
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
- r.Configure(dir='../32bit', overrideMacros=macros32)
- r.Make(dir='../32bit', overrideMacros=macros32)
- r.MakeInstall(dir='../32bit', overrideMacros=macros32)
- r.NormalizePkgConfig(exceptions='.*')
+ r.addPatch('libnl-1.1-vlan-header.patch')
+ r.addPatch('libnl-1.1-minor-leaks.patch')
+ r.addPatch('libnl-1.1-glibc-2.8-ULONG_MAX.patch')
libnl-1.0-pre5-static.patch: removed
libnl-1.0-pre8-more-build-output.patch: removed
libnl-1.0-pre5-debuginfo.patch: removed
libnl-1.1-doc-inlinesrc.patch: removed
libnl-1.0-pre8-use-vasprintf-retval.patch: removed
libnl-1.1-include-limits-h.patch: removed
libnl-1.1-5.fc10.src.rpm: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: libnl=1.1-2 - rbuilder
