Commit e0cab383 authored by Ted Trask's avatar Ted Trask

Merge branch 'master' of git://dev.alpinelinux.org/aports

parents 2df6fa5c bee68ae8
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apcupsd
pkgver=3.14.7
pkgrel=0
pkgrel=1
pkgdesc="A Daemon to control APC UPSes"
subpackages="$pkgname-doc"
url="http://www.apcupsd.org"
license="GPL-2"
depends="util-linux-ng"
makedepends=
makedepends="net-snmp-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
apcupsd.initd
apcupsd-alpine.patch
......@@ -20,7 +20,8 @@ build() {
ac_cv_path_SHUTDOWN="/sbin/poweroff" \
./configure --prefix=/usr \
--mandir=/usr/share/man \
--enable-usb
--enable-usb \
--enable-snmp
make || return 1
make DESTDIR=$pkgdir install
install -D -m755 "$srcdir"/apcupsd.initd "$pkgdir"/etc/init.d/apcupsd
......
--- asterisk-1.6.0-beta7.1/configure.ac.orig 2008-04-04 07:31:06 +0000
+++ asterisk-1.6.0-beta7.1/configure.ac 2008-04-04 07:36:14 +0000
@@ -522,9 +522,11 @@
--- asterisk-1.6.0.18/configure.ac.orig Mon Oct 26 23:13:28 2009
+++ asterisk-1.6.0.18/configure.ac Fri Nov 27 21:42:36 2009
@@ -627,9 +627,11 @@
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
-if test "x${host_os}" = "xlinux-gnu" ; then
-if test "x${OSARCH}" = "xlinux-gnu" ; then
- AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
-fi
+case "${host_os}" in
+ linux*)
+case "${OSARCH}" in
+ linux*)
+ AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
+ ;;
+esac
+ ;;
+esac
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
# BSD might not have exp2, and/or log2
AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
Index: configure.ac
===================================================================
--- a/configure.ac.orig Fri Nov 27 22:58:39 2009
+++ b/configure.ac Sat Nov 28 00:14:40 2009
@@ -261,11 +261,11 @@
AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])
+#AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri])
+#AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
+#AST_EXT_LIB_SETUP_DEPENDENT([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI], [pri])
+#AST_EXT_LIB_SETUP_DEPENDENT([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])
+#AST_EXT_LIB_SETUP_DEPENDENT([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])
AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=1.6.0.15
pkgrel=2
pkgver=1.6.0.19
pkgrel=0
pkgdesc="Asterisk: A Module Open Source PBX System"
url="http://www.asterisk.org/"
license="GPL"
......@@ -19,6 +19,7 @@ source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.g
102-gsm-pic.patch
103-rundir.patch
201-incomplete.patch
301-libpri-autoconf.patch
asterisk.initd
asterisk.confd
asterisk.logrotate"
......@@ -88,12 +89,13 @@ tds() {
_find_and_move '*_tds*'
}
md5sums="d319f52d8d1d70f69583901e56720c30 asterisk-1.6.0.15.tar.gz
md5sums="0cc80b05d2af374fb5e397513959a206 asterisk-1.6.0.19.tar.gz
b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch
929f740db7043b4553544ebcc7315c91 101-caps-uclibc.patch
6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch
5008f51c737ec91f5047519bc9f25b85 103-rundir.patch
57825b74526187075ff7cb6816c55467 201-incomplete.patch
5771a5ab34b187dbfe8e23950b04213b 301-libpri-autoconf.patch
0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
3e65172275684373e1a25c8a11224411 asterisk.logrotate"
......@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=iptraf
pkgver=3.0.0
pkgrel=0
pkgrel=1
pkgdesc="IP Network Monitoring Software"
url="http://iptraf.seoul.org"
license="GPL"
......@@ -10,10 +10,12 @@ depends=
makedepends="ncurses-dev"
install=
subpackages="$pkgname-doc"
source="ftp://iptraf.seul.org/pub/$pkgname/$pkgname-$pkgver.tar.gz"
source="ftp://iptraf.seul.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
iptraf-3.0.0-vlan.patch"
build() {
cd "$srcdir/$pkgname-$pkgver/src"
patch -p1 -i "$srcdir"/iptraf-3.0.0-vlan.patch || return 1
sed -i -e s:/var/local/iptraf:/var/lib/iptraf: \
-e s:/usr/local/bin:/usr/sbin: dirs.h
......@@ -34,4 +36,5 @@ build() {
done
}
md5sums="377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz"
md5sums="377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz
4136483b9e41c8789c629c42f9a67d07 iptraf-3.0.0-vlan.patch"
--- src/packet.c.orig 2008-03-07 17:56:48.000000000 +0200
+++ src/packet.c 2008-03-07 18:05:41.000000000 +0200
@@ -101,8 +101,8 @@
result = LINK_ETHERNET;
else if (strncmp(ifname, "tun", 3) == 0)
result = LINK_ETHERNET;
- else if (strncmp(ifname, "vlan", 3) == 0)
- result = LINK_VLAN;
+ else if (strncmp(ifname, "vlan", 4) == 0)
+ result = LINK_ETHERNET;
else if (strncmp(ifname, "brg", 3) == 0)
result = LINK_ETHERNET;
else if (strncmp(ifname, "tap", 3) == 0)
@@ -231,14 +231,6 @@
case LINK_IPIP:
*packet = tpacket;
break;
- case LINK_VLAN:
- *packet = tpacket + VLAN_ETH_HLEN;
- readlen -= VLAN_ETH_HLEN;
- /*
- * Move IP datagram into an aligned buffer.
- */
- memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen));
- *packet = aligned_buf;
default:
*packet = (char *) NULL; /* return a NULL packet to signal */
break; /* an unrecognized link protocol */
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=libpri
pkgver=1.4.9
pkgrel=1
pkgver=1.4.11_alpha1
_pkgver=1.4.10.2
pkgrel=0
pkgdesc="Primary Rate ISDN (PRI) library"
url="http://www.asterisk.orig"
license="GPL"
......@@ -10,12 +11,11 @@ depends=""
makedepends=""
install=
subpackages="$pkgname-dev"
source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$pkgver.tar.gz
libpri-cflags.patch
libpri-1.4.9-i14292.patch"
source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$_pkgver.tar.gz
libpri-1.4-r1357.patch"
build() {
cd "$srcdir/$pkgname-$pkgver"
cd "$srcdir/$pkgname-$_pkgver"
for i in ../*.patch; do
msg "Applying $i"
patch -p1 < $i || return 1;
......@@ -28,6 +28,5 @@ build() {
# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
md5sums="97332edeaa2de0320d85fda88afb96f9 libpri-1.4.9.tar.gz
8df2ca48ce7db4f1a8604b0904bc9394 libpri-cflags.patch
240e4057980c88f2c2576c5c25744c70 libpri-1.4.9-i14292.patch"
md5sums="dc1523d8ee027cd62f20fc6cc9727489 libpri-1.4.10.2.tar.gz
61a245689a40e456643ed654441a280d libpri-1.4-r1357.patch"
This diff is collapsed.
This diff is collapsed.
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mercurial
pkgver=1.4.1
pkgrel=0
pkgdesc="A scalable distributed SCM tool"
url="http://www.selenic.com/mercurial"
license="GPL"
depends="python"
makedepends="python-dev"
subpackages="$pkgname-doc"
source="http://www.selenic.com/$pkgname/release/$pkgname-$pkgver.tar.gz"
build() {
cd "$srcdir"/$pkgname-$pkgver
python setup.py install --root="$pkgdir" || return 1
install -d "$pkgdir"/usr/share/man/man1 "$pkgdir"/usr/share/man/man5
install -m644 doc/hg.1 ""$pkgdir"/usr/share/man/man1" || return 1
install -m644 doc/hgrc.5 doc/hgignore.5 "$pkgdir"/usr/share/man/man5 \
|| return 1
install -m755 contrib/hgk "$pkgdir"/usr/bin || return 1
install -m644 -D contrib/bash_completion \
"$pkgdir"/etc/bash_completion.d/hg || return 1
vimpath="$pkgdir"/usr/share/vim/vimfiles
install -Dm644 contrib/vim/HGAnnotate.vim \
"${vimpath}/syntax/HGAnnotate.vim" || return 1
}
md5sums="eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squashfs-tools
pkgver=4.0
pkgrel=0
pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
url="http://squashfs.sourceforge.net"
license="GPL"
depends=
makedepends="zlib-dev"
source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz
squashfs-tools-4.0-uclibc-get_nprocs.patch"
build() {
cd "$srcdir"/squashfs$pkgver/$pkgname
patch -p2 -i "$srcdir"/squashfs-tools-4.0-uclibc-get_nprocs.patch \
|| return 1
make
}
package() {
cd "$srcdir"/squashfs$pkgver/$pkgname
mkdir -p "$pkgdir"/sbin
cp -a mksquashfs unsquashfs "$pkgdir"/sbin
}
md5sums="a3c23391da4ebab0ac4a75021ddabf96 squashfs4.0.tar.gz
761580c100eeffb60ebbda62d724bd3f squashfs-tools-4.0-uclibc-get_nprocs.patch"
--- a/squashfs-tools/mksquashfs.c Wed Dec 2 10:30:31 2009
+++ b/squashfs-tools/mksquashfs.c Wed Dec 2 10:31:34 2009
@@ -3705,7 +3705,7 @@
processors = 1;
}
#else
- processors = get_nprocs();
+ processors = sysconf(_SC_NPROCESSORS_ONLN);
#endif
}
--- a/squashfs-tools/unsquashfs.c Wed Dec 2 10:30:31 2009
+++ b/squashfs-tools/unsquashfs.c Wed Dec 2 10:31:34 2009
@@ -1811,7 +1811,7 @@
processors = 1;
}
#else
- processors = get_nprocs();
+ processors = sysconf(_SC_NPROCESSORS_ONLN);
#endif
}
......@@ -2,7 +2,7 @@
# Maintainer: Natananael Copa <ncopa@alpinelinux.org>
pkgname=ssmtp
pkgver=2.63
pkgver=2.64
pkgrel=0
pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
subpackages="$pkgname-doc"
......@@ -12,7 +12,7 @@ license="GPL-2"
depends=
makedepends="openssl-dev"
install=
source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
generate_config.patch
"
......@@ -35,5 +35,5 @@ package() {
mandir="$pkgdir"/usr/share/man \
install
}
md5sums="8f3686f492374f4c5d7be4ea52ee2f7a ssmtp_2.63.orig.tar.gz
md5sums="65b4e0df4934a6cd08c506cabcbe584f ssmtp_2.64.orig.tar.bz2
c70c395fe71589ca8b10b666455d5071 generate_config.patch"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hostapd
pkgver=0.6.9
pkgrel=0
pkgdesc="daemon for wireless software access points"
url="http://hostap.epitest.fi/hostapd/"
license="custom"
depends=
makedepends="openssl-dev libnl-dev"
install=
source="http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
$pkgname.initd
$pkgname.confd"
_builddir="$srcdir"/$pkgname-$pkgver/hostapd
prepare() {
local conf="$_builddir/.config"
cd "$_builddir"
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
hostapd.conf
# toolchain setup
echo "CC = $CC" > $conf
# EAP authentication methods
echo "CONFIG_EAP=y" >> $conf
echo "CONFIG_EAP_MD5=y" >> $conf
# SSL authentication methods
echo "CONFIG_EAP_TLS=y" >> $conf
echo "CONFIG_EAP_TTLS=y" >> $conf
echo "CONFIG_EAP_MSCHAPV2=y" >> $conf
echo "CONFIG_EAP_PEAP=y" >> $conf
# Enable Wi-Fi Protected Setup
echo "CONFIG_WPS=y" >> $conf
echo "CONFIG_WPS_UPNP=y" >> $conf
echo "CONFIG_EAP_GTC=y" >> $conf
echo "CONFIG_EAP_SIM=y" >> $conf
echo "CONFIG_EAP_AKA=y" >> $conf
echo "CONFIG_EAP_PAX=y" >> $conf
echo "CONFIG_EAP_PSK=y" >> $conf
echo "CONFIG_EAP_SAKE=y" >> $conf
echo "CONFIG_EAP_GPSK=y" >> $conf
echo "CONFIG_EAP_GPSK_SHA256=y" >> $conf
# drivers
echo "CONFIG_DRIVER_HOSTAP=y" >> $conf
echo "CONFIG_DRIVER_WIRED=y" >> $conf
echo "CONFIG_DRIVER_PRISM54=y" >> $conf
# Add include path for madwifi-driver headers
# echo "CFLAGS += -I/usr/include/madwifi" >> $conf
# echo "CONFIG_DRIVER_MADWIFI=y" >> $conf
# enable nl80211 driver"
echo "CONFIG_DRIVER_NL80211=y" >> $conf
echo "CFLAGS += -I/usr/include/netlink" >> $conf
echo "LIBS += -L/usr/lib" >> $conf
# misc
echo "CONFIG_PKCS12=y" >> $conf
echo "CONFIG_RADIUS_SERVER=y" >> $conf
echo "CONFIG_IAPP=y" >> $conf
echo "CONFIG_IEEE80211R=y" >> $conf
echo "CONFIG_IEEE80211W=y" >> $conf
echo "CONFIG_IEEE80211N=y" >> $conf
echo "CONFIG_PEERKEY=y" >> $conf
echo "CONFIG_RSN_PREAUTH=y" >> $conf
# IPv6 support
echo "CONFIG_IPV6=y" >> $conf
}
build() {
cd "$_builddir"
make || return 1
make nt_password_hash || return 1
make hlr_auc_gw || return 1
}
package() {
cd "$_builddir"
install -d "$pkgdir"/etc/hostapd
install hostapd.conf hostapd.accept hostapd.deny hostapd.eap_user \
hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk \
"$pkgdir"/etc/hostapd/
install -Dm755 hostapd "$pkgdir"/sbin/hostapd
install -Dm755 hostapd_cli "$pkgdir"/bin/hostapd_cli
install -Dm755 nt_password_hash "$pkgdir"/bin/nt_password_hash
install -Dm755 hlr_auc_gw "$pkgdir"/bin/hlr_auc_gw
install -Dm755 "$srcdir"/hostapd.initd "$pkgdir"/etc/init.d/hostapd
install -Dm644 "$srcdir"/hostapd.confd "$pkgdir"/etc/conf.d/hostapd
install -Dm644 hostapd.8 "$pkgdir"/usr/share/man/man8/hostapd.8
install -Dm644 hostapd_cli.1 "$pkgdir"/usr/share/man/man1/hostapd_cli
}
md5sums="83630d11fa66ade9091f1b304fccd74c hostapd-0.6.9.tar.gz
fdbc94a99eca18f51294b5a96136ffdf hostapd.initd
c91382209042defa04e79d0ae841a29e hostapd.confd"
# Space separated list of configuration files
CONFIGS="/etc/hostapd/hostapd.conf"
# Extra options to pass to hostapd, see hostapd(8)
OPTIONS=""
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.9-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $
opts="start stop reload"
depend() {
need net
after firewall
use logger
}
checkconfig() {
local file
for file in ${CONFIGS}; do
if [ ! -r "${file}" ]; then
eerror "hostapd configuration file (${CONFIG}) not found"
return 1
fi
done
}
start() {
checkconfig || return 1
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --exec /usr/sbin/hostapd \
-- -B ${OPTIONS} ${CONFIGS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --exec /usr/sbin/hostapd
eend $?
}
reload() {
checkconfig || return 1
ebegin "Reloading ${SVCNAME} configuration"
kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
eend $?
}
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnl
pkgver=1.1
pkgrel=0
pkgdesc="Library for applications dealing with netlink sockets"
url="http://people.suug.ch/~tgr/libnl"
license="GPL"
depends=
makedepends=
subpackages="$pkgname-dev"
source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.gz
libnl-1.1-flags.patch
libnl-1.1-minor-leaks.patch
libnl-1.1-vlan-header.patch
libnl-1.1-glibc-2.8-ULONG_MAX.patch
"
_builddir="$srcdir"/libnl-$pkgver
prepare () {
cd "$_builddir"
for i in "$srcdir"/*.patch; do
[ -r "$i" ] || continue
msg "Applying $i"
patch -s -p1 -i $i || return 1
done
}
build () {
cd "$_builddir"
./configure --prefix=/usr || return 1
make || return 1
}
package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
}
md5sums="ae970ccd9144e132b68664f98e7ceeb1 libnl-1.1.tar.gz
9c9072ac8b74135798e0ebcf2d90290d libnl-1.1-flags.patch
3a42f98cfb353f2469ac3c44b7c0a027 libnl-1.1-minor-leaks.patch
d757127e7af3bd3c82cdb51b1b09d2e0 libnl-1.1-vlan-header.patch
9169c7eec8a2b4b2556dd26ac73c6020 libnl-1.1-glibc-2.8-ULONG_MAX.patch"
--- libnl-1.1/lib/Makefile.orig 2008-01-14 16:48:45.000000000 +0100
+++ libnl-1.1/lib/Makefile 2009-05-26 09:47:42.000000000 +0200
@@ -48,7 +48,7 @@
$(OUT_SLIB): ../Makefile.opts $(OBJ)
@echo " LD $(OUT_SLIB)"; \
- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
@echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \
rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
@echo " LN $(LN1_SLIB) $(LN_SLIB)"; \
https://bugs.gentoo.org/show_bug.cgi?id=225393
--- a/include/netlink-local.h 2008-06-09 07:54:20 +0000
+++ b/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>
From: Patrick McHardy <kaber@trash.net>
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@trash.net>
---
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);
From: Patrick McHardy <kaber@trash.net>
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@trash.net>
---
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@candelatech.com>
+ *
+ * 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 */
+