Bug#653193: Missing patch
Hi!
seems svn diff didn't include the new patch 14_alias.diff. Here it is.
Regards
Christoph
diff -x debian -ur diff/freebsd-libs-8.2+ds1/lib/libalias/libalias/Makefile freebsd-libs-patches/lib/libalias/libalias/Makefile
--- diff/freebsd-libs-8.2+ds1/lib/libalias/libalias/Makefile 2009-07-19 19:25:24.000000000 +0200
+++ freebsd-libs-patches/lib/libalias/libalias/Makefile 2011-12-24 14:31:48.000000000 +0100
@@ -10,5 +10,6 @@
INCS= alias.h
WARNS?= 6
NO_WERROR=
+LDADD= -ldl -lbsd
.include <bsd.lib.mk>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias.c freebsd-libs-patches/sys/netinet/libalias/alias.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias.c 2010-11-22 23:41:43.000000000 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias.c 2011-12-24 14:31:45.000000000 +0100
@@ -126,12 +126,14 @@
#include <string.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_cuseeme.c freebsd-libs-patches/sys/netinet/libalias/alias_cuseeme.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_cuseeme.c 2009-04-08 13:56:49.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_cuseeme.c 2011-12-24 14:31:45.000000000 +0100
@@ -39,10 +39,12 @@
#include <stdio.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/udp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_ftp.c freebsd-libs-patches/sys/netinet/libalias/alias_ftp.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_ftp.c 2009-04-08 13:56:49.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_ftp.c 2011-12-24 14:31:45.000000000 +0100
@@ -83,10 +83,12 @@
#include <string.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_irc.c freebsd-libs-patches/sys/netinet/libalias/alias_irc.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_irc.c 2009-04-08 13:56:49.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_irc.c 2011-12-24 14:31:45.000000000 +0100
@@ -65,10 +65,12 @@
#include <limits.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_mod.c freebsd-libs-patches/sys/netinet/libalias/alias_mod.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_mod.c 2010-02-11 19:34:06.000000000 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias_mod.c 2011-12-24 14:31:45.000000000 +0100
@@ -219,7 +219,7 @@
}
int
-find_handler(int8_t dir, int8_t proto, struct libalias *la, __unused struct ip *pip,
+find_handler(int8_t dir, int8_t proto, struct libalias *la, struct ip *pip,
struct alias_data *ad)
{
struct proto_handler *p;
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_nbt.c freebsd-libs-patches/sys/netinet/libalias/alias_nbt.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_nbt.c 2009-04-11 17:19:09.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_nbt.c 2011-12-24 14:31:45.000000000 +0100
@@ -53,10 +53,12 @@
#include <strings.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/udp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias_local.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_pptp.c freebsd-libs-patches/sys/netinet/libalias/alias_pptp.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_pptp.c 2009-04-08 13:56:49.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_pptp.c 2011-12-24 14:31:45.000000000 +0100
@@ -52,7 +52,9 @@
#include <stdio.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/tcp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_proxy.c freebsd-libs-patches/sys/netinet/libalias/alias_proxy.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_proxy.c 2009-11-22 17:04:49.000000000 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias_proxy.c 2011-12-24 14:31:45.000000000 +0100
@@ -68,7 +68,9 @@
#include <string.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/tcp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_skinny.c freebsd-libs-patches/sys/netinet/libalias/alias_skinny.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_skinny.c 2009-04-08 13:56:49.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_skinny.c 2011-12-24 14:31:45.000000000 +0100
@@ -40,10 +40,12 @@
#include <unistd.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias_local.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_smedia.c freebsd-libs-patches/sys/netinet/libalias/alias_smedia.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_smedia.c 2009-04-08 13:56:49.000000000 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_smedia.c 2011-12-24 14:31:45.000000000 +0100
@@ -110,10 +110,12 @@
#include <string.h>
#endif
+#define __FAVOR_BSD 1
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#undef __FAVOR_BSD
#ifdef _KERNEL
#include <netinet/libalias/alias.h>
diff -x debian -ur diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_util.c freebsd-libs-patches/sys/netinet/libalias/alias_util.c
--- diff/freebsd-libs-8.2+ds1/sys/netinet/libalias/alias_util.c 2007-12-06 10:31:13.000000000 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias_util.c 2011-12-24 14:31:45.000000000 +0100
@@ -71,7 +71,7 @@
* purposes);
*/
u_short
-LibAliasInternetChecksum(struct libalias *la __unused, u_short * ptr,
+LibAliasInternetChecksum(struct libalias *la, u_short * ptr,
int nbytes)
{
int sum, oddbyte;
Reply to: