From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 13 Dec 2010 00:36:29 +0000 (+0000)
Subject: [packages] peerguardian: libnetfilter-queue-libipq has been dropped upstream, switch... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=8c03192aa6819815bcd4a1adde742162d76e351f

[packages] peerguardian: libnetfilter-queue-libipq has been dropped upstream, switch back to libipq


SVN-Revision: 24531
---

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index 8b4e25d666..7044d0b7a7 100644
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +libncurses +libpthread +libnetfilter-queue
+  DEPENDS:=@BROKEN +libncurses +libpthread +libnetfilter-queue
   TITLE:=PeerGuardian for Linux
   URL:=http://phoenixlabs.org/
 endef
diff --git a/net/peerguardian/patches/002-new_libipq.patch b/net/peerguardian/patches/002-new_libipq.patch
index 386f6454d5..c7ca959924 100644
--- a/net/peerguardian/patches/002-new_libipq.patch
+++ b/net/peerguardian/patches/002-new_libipq.patch
@@ -5,7 +5,7 @@
  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
++peerguardnf_LDADD=-lipq -lnetfilter_queue -lnfnetlink -lpthread
  pgtext_LDADD=-lncurses -lpthread
  peerguardnf_LDFLAGS=$(all_includes) -I/usr/include/libipq
  AM_CPPFLAGS=$(ALL_INCLUDES) -I/usr/include/libipq
@@ -16,7 +16,7 @@
  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
++peerguardnf_LDADD = -lipq -lnetfilter_queue -lnfnetlink -lpthread
  pgtext_LDADD = -lncurses -lpthread
  peerguardnf_LDFLAGS = $(all_includes)
  AM_CPPFLAGS = $(ALL_INCLUDES)
diff --git a/net/peerguardian/patches/003-gcc_4_3-compile-fix.patch b/net/peerguardian/patches/003-gcc_4_3-compile-fix.patch
index fb750dade3..aaa72c3647 100644
--- a/net/peerguardian/patches/003-gcc_4_3-compile-fix.patch
+++ b/net/peerguardian/patches/003-gcc_4_3-compile-fix.patch
@@ -1,5 +1,3 @@
-diff --git a/Main.cpp b/Main.cpp
-index 0a5ae59..0c5274c 100755
 --- a/Main.cpp
 +++ b/Main.cpp
 @@ -25,6 +25,7 @@
@@ -10,8 +8,6 @@ index 0a5ae59..0c5274c 100755
  
  using namespace PG;
  using namespace std;
-diff --git a/PeerGuard.h b/PeerGuard.h
-index 3d0d31c..7e1d0f7 100755
 --- a/PeerGuard.h
 +++ b/PeerGuard.h
 @@ -24,6 +24,7 @@