oops forgot to actually push the patch out to a file and attatch it to the mail

peter green wrote:
tags 494216 +patch
thanks

the following patch fixes the ftbfs, I haven't tested if the resulting package actually works or not though.




diff -ur shaperd-0.2.1/debian/control shaperd-0.2.1.new/debian/control
--- shaperd-0.2.1/debian/control	2008-08-14 02:16:50.000000000 +0100
+++ shaperd-0.2.1.new/debian/control	2008-08-14 02:16:01.000000000 +0100
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: RISKO Gergely <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 2.0.0), iptables-dev
+Build-Depends: debhelper (>> 2.0.0), iptables-dev, libnetfilter-queue-dev
 Standards-Version: 3.5.8.0
 
 Package: shaperd
diff -ur shaperd-0.2.1/src/main.cpp shaperd-0.2.1.new/src/main.cpp
--- shaperd-0.2.1/src/main.cpp	2008-08-14 02:16:50.000000000 +0100
+++ shaperd-0.2.1.new/src/main.cpp	2008-08-14 02:15:24.000000000 +0100
@@ -26,6 +26,7 @@
 	#ifdef WITH_IPQ
 	#include <linux/netfilter.h>
 	#include <libipq.h>
+	#include <libnetfilter_queue.h>
 	#endif //WITH_IPQ
 }
 
@@ -638,7 +639,7 @@
 		goto __err_ipq_mode;
 	}
 
-	kernel_sock = ipq_h->fd;
+	kernel_sock = nfq_fd(ipq_h->nfqnlh);
 	log_info(LL_DEBUG1, "using netlink socket %d {%s:%d}",
 		kernel_sock, __FILE__, __LINE__);
 
diff -ur shaperd-0.2.1/src/makefile shaperd-0.2.1.new/src/makefile
--- shaperd-0.2.1/src/makefile	2008-08-14 02:16:50.000000000 +0100
+++ shaperd-0.2.1.new/src/makefile	2008-08-14 02:03:51.000000000 +0100
@@ -9,8 +9,8 @@
 objs = classifier.o bwadm.o classdef.o config.o packet.o main.o sched.o log.o
 deps = $(objs:.o=.d)
 libs =
-dopt = -I/usr/src/linux/include -I/usr/include/libipq
-copt = -Wall -O2 -I/usr/src/linux/include -I/usr/include/libipq
+dopt = -I/usr/src/linux/include -I/usr/include/libnetfilter_queue
+copt = -Wall -O2 -I/usr/src/linux/include -I/usr/include/libnetfilter_queue
 lopt = -Wall -O2
 GCC  = gcc
 G++  = g++
@@ -29,7 +29,7 @@
 ifeq ($(with_ipq), yes)
   dopt += -DWITH_IPQ
   copt += -DWITH_IPQ
-  libs += -lipq
+  libs += -lnetfilter_queue -lnetfilter_queue_libipq
   ifneq ($(MAKECMDGOALS), clean)
     -include $(deps)
   endif

Reply via email to