From 47d02f68113eaacd7a9f76f79b7716810a33865f Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 14 Aug 2004 10:49:27 +0000 Subject: [PATCH] Alejandro Mery: * improved portmap to only need tcpwrapper if available [2004072101543001957] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3813 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/portmap/no_wrapper.diff | 22 ++++++++++++++++++++++ package/base/portmap/portmap.conf | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 package/base/portmap/no_wrapper.diff diff --git a/package/base/portmap/no_wrapper.diff b/package/base/portmap/no_wrapper.diff new file mode 100644 index 000000000..58ea2c60c --- /dev/null +++ b/package/base/portmap/no_wrapper.diff @@ -0,0 +1,22 @@ +--- ./Makefile.orig 2004-07-20 19:23:44.000000000 -0400 ++++ ./Makefile 2004-07-20 19:28:48.000000000 -0400 +@@ -16,7 +16,7 @@ + # tables. The local system, since it runs the portmap daemon, is always + # treated as an authorized host. + +-HOSTS_ACCESS= -DHOSTS_ACCESS ++#HOSTS_ACCESS= -DHOSTS_ACCESS + + # Comment out if your RPC library does not allocate privileged ports for + # requests from processes with root privilege, or the new portmap will +@@ -75,8 +75,8 @@ + + all: portmap pmap_dump pmap_set + +-portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a +- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_DIR)/libwrap.a $(LIBS) ++portmap: $(OBJECTS) ++ $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) + + pmap_dump: pmap_dump.c + $(CC) $(CFLAGS) -o $@ $? $(LIBS) diff --git a/package/base/portmap/portmap.conf b/package/base/portmap/portmap.conf index 100ec9e84..2702cdead 100644 --- a/package/base/portmap/portmap.conf +++ b/package/base/portmap/portmap.conf @@ -31,3 +31,5 @@ pm_main() { custmain="pm_main" +pkginstalled tcpwrapper || var_append patchfiles ' ' $confdir/no_wrapper.diff +