Control: tag -1 + patch

On Thu, 20 Jun 2013 23:51:25 +0100, Dominic Hargreaves wrote:

> > > > cc -c  -I/usr/include/libipq -D_REENTRANT -D_GNU_SOURCE -DDEBIAN 
> > > > -fstack-protector -fno-strict-aliasing -pipe -I/usr/local/include 
> > > > -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g   -DVERSION=\"1.25\" 
> > > > -DXS_VERSION=\"1.25\" -fPIC "-I/usr/lib/perl/5.14/CORE"   IPQueue.c
> > > > In file included from IPQueue.xs:11:0:
> > > > /usr/include/libipq.h:33:43: fatal error: 
> > > > linux/netfilter_ipv4/ip_queue.h: No such file or directory
> > > > compilation terminated.
> > 
> > It seems linux/netfilter_ipv4/ip_queue.h has disappeared from 
> > linux-libc-dev 3.8 and /usr/include/libipq.h needs a fix.
> > 
> > When this is fixed perlipq will need a versioned build-dependency on 
> > iptabled-dev.
> 
> The header has been included into the iptables package[1] but is not
> installed in iptables-dev so is not usable by other packages. The fix,
> therefore, would appear to be install the file into iptables-dev.
> 
> [1] 
> <https://git.netfilter.org/iptables/commit/?id=a624e0a1b2d075253b599ababd4ea1351ef42b2a>

I'm attaching a patch which installs the header (and adds a Breaks on
older linux-libc-dev which also contained the file).

perlipq builds fine against the patches iptables-dev afterwards.


Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Tom Jones: Delilah
diff -Nru iptables-1.4.18/debian/changelog iptables-1.4.18/debian/changelog
--- iptables-1.4.18/debian/changelog	2013-03-24 22:52:00.000000000 +0100
+++ iptables-1.4.18/debian/changelog	2013-06-24 22:26:36.000000000 +0200
@@ -1,3 +1,13 @@
+iptables (1.4.18-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "libipq.h includes non-existing linux/netfilter_ipv4/ip_queue.h":
+    ship /usr/include/linux/netfilter_ipv4/ip_queue.h in iptables-dev;
+    add Breaks on linux-libc-dev << 3.5
+    (Closes: #707535)
+
+ -- gregor herrmann <gre...@debian.org>  Mon, 24 Jun 2013 21:41:00 +0200
+
 iptables (1.4.18-1) unstable; urgency=low
 
   * New upstream release
diff -Nru iptables-1.4.18/debian/control iptables-1.4.18/debian/control
--- iptables-1.4.18/debian/control	2013-03-24 22:13:18.000000000 +0100
+++ iptables-1.4.18/debian/control	2013-06-24 22:26:28.000000000 +0200
@@ -33,6 +33,7 @@
 Priority: optional
 Depends: ${misc:Depends}, iptables (=${binary:Version})
 Conflicts: iptables (<<1.4.2-2)
+Breaks: linux-libc-dev (<< 3.5)
 Section: devel
 Description: iptables development files
  iptables is used to setup, maintain, and inspect the tables of
diff -Nru iptables-1.4.18/debian/iptables-dev.install iptables-1.4.18/debian/iptables-dev.install
--- iptables-1.4.18/debian/iptables-dev.install	2011-06-19 20:35:53.000000000 +0200
+++ iptables-1.4.18/debian/iptables-dev.install	2013-06-24 22:32:41.000000000 +0200
@@ -2,4 +2,5 @@
 usr/share/man/man3
 lib/lib*.so
 lib/pkgconfig usr/lib
+include/linux/netfilter_ipv4/ip_queue.h usr/include/linux/netfilter_ipv4/
 

Attachment: signature.asc
Description: Digital signature

Reply via email to