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>

2 files changed, 6 insertions, 7 deletions

diff --git a/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch b/meta/packages/portmap/portmap-6.0/tcpd-config.patch
index da55f3799d..da55f3799d 100644
--- a/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch
+++ b/meta/packages/portmap/portmap-6.0/tcpd-config.patch
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index 7f580a7676..49ac1d8332 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() {