From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 11 Jan 2009 04:32:55 +0000 (+0000)
Subject: refresh patches before upcoming fix
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=410740e499c12b454c766a4cbcbad0be5dd12d92

refresh patches before upcoming fix


SVN-Revision: 13975
---

diff --git a/net/peerguardian/patches/001-no_host_includes.patch b/net/peerguardian/patches/001-no_host_includes.patch
index 61e4aa8a60..11a63f07d1 100644
--- a/net/peerguardian/patches/001-no_host_includes.patch
+++ b/net/peerguardian/patches/001-no_host_includes.patch
@@ -1,7 +1,6 @@
-diff -ruN pglinux-1.5beta-old/Makefile.in pglinux-1.5beta-new/Makefile.in
---- pglinux-1.5beta-old/Makefile.in	2005-03-31 09:40:29.000000000 +0200
-+++ pglinux-1.5beta-new/Makefile.in	2006-10-31 17:04:22.000000000 +0100
-@@ -74,8 +74,8 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -74,8 +74,8 @@ peerguardnf_SOURCES = Main.cpp PeerGuard
  pgtext_SOURCES = pgtext.cpp
  peerguardnf_LDADD = -lipq -lpthread
  pgtext_LDADD = -lncurses -lpthread
diff --git a/net/peerguardian/patches/002-new_libipq.patch b/net/peerguardian/patches/002-new_libipq.patch
index 9361ba5e67..f5c79d62b7 100644
--- a/net/peerguardian/patches/002-new_libipq.patch
+++ b/net/peerguardian/patches/002-new_libipq.patch
@@ -1,7 +1,6 @@
-diff -urN pglinux-1.5beta/Makefile.am pglinux-1.5beta.new/Makefile.am
---- pglinux-1.5beta/Makefile.am	2005-04-02 07:39:56.000000000 +0200
-+++ pglinux-1.5beta.new/Makefile.am	2008-12-14 18:25:45.000000000 +0100
-@@ -3,7 +3,7 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@ man_MANS=peerguardnf.1
  mybin_PROGRAMS = peerguardnf pgtext
  peerguardnf_SOURCES=Main.cpp PeerGuard.cpp BlockList.cpp Blocker_Linux.cpp Blocker_BSD.cpp HttpServer.cpp HttpRequest.cpp sha1.cpp
  pgtext_SOURCES=pgtext.cpp
@@ -10,15 +9,14 @@ diff -urN pglinux-1.5beta/Makefile.am pglinux-1.5beta.new/Makefile.am
  pgtext_LDADD=-lncurses -lpthread
  peerguardnf_LDFLAGS=$(all_includes) -I/usr/include/libipq
  AM_CPPFLAGS=$(ALL_INCLUDES) -I/usr/include/libipq
-diff -urN pglinux-1.5beta/Makefile.in pglinux-1.5beta.new/Makefile.in
---- pglinux-1.5beta/Makefile.in	2005-03-31 09:40:29.000000000 +0200
-+++ pglinux-1.5beta.new/Makefile.in	2008-12-14 18:25:25.000000000 +0100
-@@ -72,7 +72,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -72,7 +72,7 @@ man_MANS = peerguardnf.1
  mybin_PROGRAMS = peerguardnf pgtext
  peerguardnf_SOURCES = Main.cpp PeerGuard.cpp BlockList.cpp Blocker_Linux.cpp Blocker_BSD.cpp HttpServer.cpp HttpRequest.cpp sha1.cpp
  pgtext_SOURCES = pgtext.cpp
 -peerguardnf_LDADD = -lipq -lpthread
 +peerguardnf_LDADD = -lnetfilter_queue_libipq -lnetfilter_queue -lnfnetlink -lpthread
  pgtext_LDADD = -lncurses -lpthread
- peerguardnf_LDFLAGS = $(all_includes) -I/usr/include/libipq
- AM_CPPFLAGS = $(ALL_INCLUDES) -I/usr/include/libipq
+ peerguardnf_LDFLAGS = $(all_includes)
+ AM_CPPFLAGS = $(ALL_INCLUDES)