[Glibc-bsd-commits] r3954 - in trunk/freebsd-libs/debian: . local local/include local/include/asm local/include/bits local/include/linux local/include/netinet local/include/sys patches
Robert Millan
rmh at alioth.debian.org
Sun Jan 1 15:21:21 UTC 2012
Author: rmh
Date: 2012-01-01 15:21:21 +0000 (Sun, 01 Jan 2012)
New Revision: 3954
Added:
trunk/freebsd-libs/debian/libalias-dev.install
trunk/freebsd-libs/debian/libalias7.install
trunk/freebsd-libs/debian/local/
trunk/freebsd-libs/debian/local/include/
trunk/freebsd-libs/debian/local/include/aio.h
trunk/freebsd-libs/debian/local/include/asm/
trunk/freebsd-libs/debian/local/include/asm/stat.h
trunk/freebsd-libs/debian/local/include/bits/
trunk/freebsd-libs/debian/local/include/bits/stat.h
trunk/freebsd-libs/debian/local/include/bits/utmp.h
trunk/freebsd-libs/debian/local/include/bits/utmpx.h
trunk/freebsd-libs/debian/local/include/linux/
trunk/freebsd-libs/debian/local/include/linux/icmp.h
trunk/freebsd-libs/debian/local/include/linux/sysctl.h
trunk/freebsd-libs/debian/local/include/netdb.h
trunk/freebsd-libs/debian/local/include/netinet/
trunk/freebsd-libs/debian/local/include/netinet/tcp.h
trunk/freebsd-libs/debian/local/include/netinet/udp.h
trunk/freebsd-libs/debian/local/include/sys/
trunk/freebsd-libs/debian/local/include/sys/cdefs.h
trunk/freebsd-libs/debian/patches/14_alias.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
Add libalias, using patch from Christoph Egger with some adjustments. (Closes: #653193)
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2011-12-29 14:48:21 UTC (rev 3953)
+++ trunk/freebsd-libs/debian/changelog 2012-01-01 15:21:21 UTC (rev 3954)
@@ -1,3 +1,10 @@
+freebsd-libs (8.2+ds2-1) unstable; urgency=low
+
+ * Add libalias, using patch from Christoph Egger with some adjustments.
+ (Closes: #653193)
+
+ -- Robert Millan <rmh at debian.org> Sun, 01 Jan 2012 15:37:48 +0100
+
freebsd-libs (8.2+ds1-4) unstable; urgency=low
* Include <stdint.h> in a few more headers that use uintxx_t types.
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2011-12-29 14:48:21 UTC (rev 3953)
+++ trunk/freebsd-libs/debian/control 2012-01-01 15:21:21 UTC (rev 3954)
@@ -259,3 +259,19 @@
Description: Development files for libjail
This package contains the header files and static library needed to
compile applications that use libjail.
+
+Package: libalias7
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD packet aliasing library
+ The libalias library is a collection of functions for aliasing and
+ dealiasing of IP packets, intended for masquerading and network address
+ translation (NAT).
+
+Package: libalias-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libalias7 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libalias
+ This package contains the header files and static library needed to
+ compile applications that use libalias.
Added: trunk/freebsd-libs/debian/libalias-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libalias-dev.install (rev 0)
+++ trunk/freebsd-libs/debian/libalias-dev.install 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,4 @@
+usr/include/alias.h
+usr/lib/libalias.a
+usr/lib/libalias.so
+usr/share/man/man3/libalias.3.gz
Added: trunk/freebsd-libs/debian/libalias7.install
===================================================================
--- trunk/freebsd-libs/debian/libalias7.install (rev 0)
+++ trunk/freebsd-libs/debian/libalias7.install 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1 @@
+usr/lib/libalias.so.*
Added: trunk/freebsd-libs/debian/local/include/aio.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/aio.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/aio.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <aio.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/asm/stat.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/asm/stat.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/asm/stat.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <asm/stat.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/bits/stat.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/bits/stat.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/bits/stat.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <bits/stat.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/bits/utmp.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/bits/utmp.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/bits/utmp.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <bits/utmp.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/bits/utmpx.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/bits/utmpx.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/bits/utmpx.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <bits/utmpx.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/linux/icmp.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/linux/icmp.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/linux/icmp.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <linux/icmp.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/linux/sysctl.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/linux/sysctl.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/linux/sysctl.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <linux/sysctl.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/netdb.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/netdb.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/netdb.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <netdb.h>
+#include <sys/cdefs.h>
Added: trunk/freebsd-libs/debian/local/include/netinet/tcp.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/netinet/tcp.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/netinet/tcp.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,8 @@
+#include <features.h>
+#if __FAVOR_BSD
+# include_next <netinet/tcp.h>
+#else
+# define __FAVOR_BSD 1
+# include_next <netinet/tcp.h>
+# undef __FAVOR_BSD
+#endif
Added: trunk/freebsd-libs/debian/local/include/netinet/udp.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/netinet/udp.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/netinet/udp.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,8 @@
+#include <features.h>
+#if __FAVOR_BSD
+# include_next <netinet/udp.h>
+#else
+# define __FAVOR_BSD 1
+# include_next <netinet/udp.h>
+# undef __FAVOR_BSD
+#endif
Added: trunk/freebsd-libs/debian/local/include/sys/cdefs.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/sys/cdefs.h (rev 0)
+++ trunk/freebsd-libs/debian/local/include/sys/cdefs.h 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,4 @@
+#include_next <sys/cdefs.h>
+#ifndef __unused
+#define __unused __attribute__((unused))
+#endif
Added: trunk/freebsd-libs/debian/patches/14_alias.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_alias.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/14_alias.diff 2012-01-01 15:21:21 UTC (rev 3954)
@@ -0,0 +1,9 @@
+--- a/lib/libalias/libalias/Makefile
++++ b/lib/libalias/libalias/Makefile
+@@ -10,5 +10,6 @@
+ INCS= alias.h
+ WARNS?= 6
+ NO_WERROR=
++LDADD= -ldl -lbsd
+
+ .include <bsd.lib.mk>
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2011-12-29 14:48:21 UTC (rev 3953)
+++ trunk/freebsd-libs/debian/patches/series 2012-01-01 15:21:21 UTC (rev 3954)
@@ -12,3 +12,4 @@
11_netgraph.diff
12_usb.diff
13_jail.diff
+14_alias.diff
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2011-12-29 14:48:21 UTC (rev 3953)
+++ trunk/freebsd-libs/debian/rules 2012-01-01 15:21:21 UTC (rev 3954)
@@ -30,7 +30,7 @@
PATH := /usr/lib/freebsd:$(PATH)
DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) make
export SHLIB_MAJOR = 0
kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -44,6 +44,7 @@
lib/libkiconv lib/libnetgraph lib/libjail \
lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
lib/libusbhid sys/cam \
+ lib/libalias sys/netinet/libalias sys/modules/libalias \
sys/kern/subr_sbuf.c \
sys/sys/sbuf.h \
share/misc/usb_hid_usages ; do \
@@ -57,7 +58,7 @@
rm -rf $(ORIGDIR)
ifeq ($(kernel), kfreebsd)
-build: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph build-jail
+build: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph build-jail build-alias
else
build: build-sbuf
endif
@@ -122,6 +123,11 @@
$(PMAKE) -C $(CURDIR)/lib/libjail SHLIBDIR=./
touch $@
+build-alias: build-alias-stamp
+build-alias-stamp:
+ $(PMAKE) -C $(CURDIR)/lib/libalias SHLIBDIR=./
+ touch $@
+
clean:
dh_testdir
dh_testroot
@@ -138,6 +144,7 @@
$(PMAKE) -C $(CURDIR)/lib/libusbhid clean
$(PMAKE) -C $(CURDIR)/lib/libusb clean
$(PMAKE) -C $(CURDIR)/lib/libjail clean
+ $(PMAKE) -C $(CURDIR)/lib/libalias clean
endif
rm -f *stamp
dh_clean
@@ -162,6 +169,7 @@
$(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib
$(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libalias install SHLIBDIR=/usr/lib
mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
install -m644 debian/libusb*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
More information about the Glibc-bsd-commits
mailing list