refresh patches before upcoming fix

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13975 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-01-11 04:32:55 +00:00
parent 44a08acd67
commit 8e3921434f
2 changed files with 11 additions and 14 deletions

View File

@ -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

View File

@ -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)