Bug#653193: Missing patch

2012-01-01 Thread Robert Millan 
El 31 de desembre de 2011 23:33, Guillem Jover guil...@debian.org ha escrit:
 the
 source should be using _BSD_SOURCE instead of _GNU_SOURCE, currently
 passed through CFLAGS in debian/rules.

Actually, that's not possible.  _BSD_SOURCE disables some facilities
which are assumed to be present on *BSD.

-- 
Robert Millan



-- 
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/caofdtxorhavkubi-nhh2bk3f1yvd6zqgjatfzsezjpid-xb...@mail.gmail.com

Bug#653193: Missing patch

2011-12-31 Thread Guillem Jover 
On Sun, 2011-12-25 at 11:56:45 +0100, Robert Millan wrote:
  +#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
 
 Shouldn't this kind of fix be in libbsd-dev?  E.g. in overlay netinet/in.h:
 
 #if __FAVOR_BSD
 #  include_next netinet/in.h
 #else
 #  define __FAVOR_BSD 1
 #  include_next netinet/in.h
 #  undef __FAVOR_BSD
 #endif

I'd rather not, libbsd is there to help in porting by making embedded
sources unnecessary and adding missing declarations and similar, but
there's a limit to what extent it should include major hacks like this,
some times the source just need to be made more portable or fixed some
other way. In this case __FAVOR_BSD is an internal glibc macro, the
source should be using _BSD_SOURCE instead of _GNU_SOURCE, currently
passed through CFLAGS in debian/rules.

regards,
guillem



-- 
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20111231223353.ga11...@gaara.hadrons.org

Bug#653193: Missing patch

2011-12-30 Thread Robert Millan 
El 25 de desembre de 2011 0:16, Christoph Egger christ...@debian.org
ha escrit:
 Hi!

 seems svn diff didn't include the new patch 14_alias.diff. Here it is.

The get-orig-source bits are also missing from the patch.

Btw, do you receive my mail also directly or only via list/BTS?  I
suspect my direct mails to you are being lost.

-- 
Robert Millan



-- 
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/caofdtxon5x0_aurfp-curr3mwoq8cac8g6ogr0a3fdg7m2t...@mail.gmail.com

Bug#653193: Missing patch

2011-12-25 Thread Robert Millan 
 +#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

Shouldn't this kind of fix be in libbsd-dev?  E.g. in overlay netinet/in.h:

#if __FAVOR_BSD
#  include_next netinet/in.h
#else
#  define __FAVOR_BSD 1
#  include_next netinet/in.h
#  undef __FAVOR_BSD
#endif

-- 
Robert Millan



-- 
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/CAOfDtXNEGh0UBLAfVkUzf3EjR2RJA84_kTfQLwqUdvUdLx=m...@mail.gmail.com

Bug#653193: Missing patch

2011-12-24 Thread Christoph Egger 
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.0 +0200
+++ freebsd-libs-patches/lib/libalias/libalias/Makefile	2011-12-24 14:31:48.0 +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.0 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias.c	2011-12-24 14:31:45.0 +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.0 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_cuseeme.c	2011-12-24 14:31:45.0 +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.0 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_ftp.c	2011-12-24 14:31:45.0 +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.0 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_irc.c	2011-12-24 14:31:45.0 +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.0 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias_mod.c	2011-12-24 14:31:45.0 +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.0 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_nbt.c	2011-12-24 14:31:45.0 +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.0 +0200
+++ freebsd-libs-patches/sys/netinet/libalias/alias_pptp.c	2011-12-24 14:31:45.0 +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.0 +0100
+++ freebsd-libs-patches/sys/netinet/libalias/alias_proxy.c	2011-12-24 14:31:45.0 +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