[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: suggested fix



On 20/06/12 11:56, Nicholas Bamber wrote:
> Jamie,
> 
> I have a proposed  fix as attached. It's built, signed and ready to go.
> If you have intentions to fix it yourself please reply and do so
> promptly. I'll run my fix past a few people for feedback but after that
> I'll upload with a 2-day delay.

Hmm, it seems I got the debdiff the wrong way round. Resent.
diff -Nru pmacct-0.14.0/debian/changelog pmacct-0.14.0/debian/changelog
--- pmacct-0.14.0/debian/changelog	2012-05-24 08:11:21.000000000 +0100
+++ pmacct-0.14.0/debian/changelog	2012-06-20 11:15:49.000000000 +0100
@@ -1,3 +1,10 @@
+pmacct (0.14.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Added special include of net/if_dl.h on kfreebsd (Closes: #675836)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Wed, 20 Jun 2012 11:15:42 +0100
+
 pmacct (0.14.0-1) unstable; urgency=low
 
   * New upstream release
diff -Nru pmacct-0.14.0/debian/control pmacct-0.14.0/debian/control
--- pmacct-0.14.0/debian/control	2012-02-10 02:33:51.000000000 +0000
+++ pmacct-0.14.0/debian/control	2012-06-20 10:37:48.000000000 +0100
@@ -2,7 +2,8 @@
 Section: net
 Priority: optional
 Maintainer: Jamie Wilkinson <jaq@debian.org>
-Build-Depends: debhelper (>= 7), zlib1g-dev, libpcap-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 7), zlib1g-dev, libpcap-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev,
+ kfreebsd-kernel-headers[kfreebsd-any]
 Standards-Version: 3.8.3
 
 Package: pmacct
diff -Nru pmacct-0.14.0/debian/patches/kfreebsd.patch pmacct-0.14.0/debian/patches/kfreebsd.patch
--- pmacct-0.14.0/debian/patches/kfreebsd.patch	1970-01-01 01:00:00.000000000 +0100
+++ pmacct-0.14.0/debian/patches/kfreebsd.patch	2012-06-20 11:15:27.000000000 +0100
@@ -0,0 +1,17 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: FTBS on kfreebsd
+Last-Update: 2012-06-20
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675836
+--- a/src/isis/sockunion.c
++++ b/src/isis/sockunion.c
+@@ -27,6 +27,10 @@
+ #include "prefix.h"
+ #include "sockunion.h"
+ 
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#include <net/if_dl.h>
++#endif
++
+ const char *
+ inet_sutop (union sockunion *su, char *str)
+ {
diff -Nru pmacct-0.14.0/debian/patches/series pmacct-0.14.0/debian/patches/series
--- pmacct-0.14.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ pmacct-0.14.0/debian/patches/series	2012-06-20 10:44:37.000000000 +0100
@@ -0,0 +1 @@
+kfreebsd.patch

Reply to: