From 623a7e282e0a27e689b5718569a108da8d1f1dcb Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 14 Dec 2008 17:31:17 +0000 Subject: [PATCH] Fix peeguardian compilation against libipq other programs should also use those libraries instead of the old libipq (#4307) git-svn-id: svn://svn.openwrt.org/openwrt/packages@13629 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/peerguardian/Makefile | 4 ++-- net/peerguardian/patches/002-new_libipq.patch | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 net/peerguardian/patches/002-new_libipq.patch diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile index 95b96056b..36ec034aa 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:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx + DEPENDS:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx +libnetfilter-queue +libnfnetlink TITLE:=PeerGuardian for Linux URL:=http://phoenixlabs.org/ endef @@ -41,7 +41,7 @@ define Package/peerguardian/conffiles endef CONFIGURE_VARS+= \ - CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \ + CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/" \ LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lgcc" \ define Build/Compile diff --git a/net/peerguardian/patches/002-new_libipq.patch b/net/peerguardian/patches/002-new_libipq.patch new file mode 100644 index 000000000..9361ba5e6 --- /dev/null +++ b/net/peerguardian/patches/002-new_libipq.patch @@ -0,0 +1,24 @@ +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 @@ + 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 +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 @@ + 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 -- 2.11.0