From 22ae6b193d2af1cd11a84937cc2432767782fa14 Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Wed, 11 Aug 2010 10:23:16 +0800
Subject: portmap: enable tcp-wrappers support

this enables the hosts access control facility (i.e. /etc/hosts.allow
and /etc/hosts.deny)

changes:
  - enable tcp-wrappers by change make flags and cppflags
  - rename patch no-tcpd-support to avoid confusion
  - minor cleanups

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../portmap/portmap-6.0/no-tcpd-support.patch      | 28 ----------------------
 .../packages/portmap/portmap-6.0/tcpd-config.patch | 28 ++++++++++++++++++++++
 meta/packages/portmap/portmap_6.0.bb               | 13 +++++-----
 3 files changed, 34 insertions(+), 35 deletions(-)
 delete mode 100644 meta/packages/portmap/portmap-6.0/no-tcpd-support.patch
 create mode 100644 meta/packages/portmap/portmap-6.0/tcpd-config.patch

diff --git a/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch b/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch
deleted file mode 100644
index da55f3799..000000000
--- a/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 13 May 2007 21:17:32 +0000 (-0400)
-Subject: fix building with tcpd support disabled
-X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5
-
-fix building with tcpd support disabled
-
-Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined.
-
-Signed-off-by: Timothy Redaelli <drizzt@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Neil Brown <neilb@suse.de>
----
-
-diff --git a/pmap_check.c b/pmap_check.c
-index 84f2c12..443a822 100644
---- a/pmap_check.c
-+++ b/pmap_check.c
-@@ -44,7 +44,9 @@
- #include <netinet/in.h>
- #include <rpc/rpcent.h>
- #endif
-+#ifdef HOSTS_ACCESS
- #include <tcpd.h>
-+#endif
- #include <arpa/inet.h>
- #include <grp.h>
- 
diff --git a/meta/packages/portmap/portmap-6.0/tcpd-config.patch b/meta/packages/portmap/portmap-6.0/tcpd-config.patch
new file mode 100644
index 000000000..da55f3799
--- /dev/null
+++ b/meta/packages/portmap/portmap-6.0/tcpd-config.patch
@@ -0,0 +1,28 @@
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 13 May 2007 21:17:32 +0000 (-0400)
+Subject: fix building with tcpd support disabled
+X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5
+
+fix building with tcpd support disabled
+
+Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined.
+
+Signed-off-by: Timothy Redaelli <drizzt@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Neil Brown <neilb@suse.de>
+---
+
+diff --git a/pmap_check.c b/pmap_check.c
+index 84f2c12..443a822 100644
+--- a/pmap_check.c
++++ b/pmap_check.c
+@@ -44,7 +44,9 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
++#ifdef HOSTS_ACCESS
+ #include <tcpd.h>
++#endif
+ #include <arpa/inet.h>
+ #include <grp.h>
+ 
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index 7f580a767..49ac1d833 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -1,17 +1,16 @@
 require portmap.inc
 
-PR = "r6"
+DEPENDS += "tcp-wrappers"
+PR = "r7"
 
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
-           file://destdir-no-strip.patch;apply=yes \
-           file://no-tcpd-support.patch;apply=yes \
+           file://destdir-no-strip.patch \
+           file://tcpd-config.patch \
            file://portmap.init"
 
-S = "${WORKDIR}/${PN}_${PV}/"
+S = "${WORKDIR}/${BPN}_${PV}/"
 
-EXTRA_OEMAKE_append = " NO_TCP_WRAPPER=1 "
-
-CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
+CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS"
 CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
 
 fakeroot do_install() {
-- 
cgit v1.2.3