[Lunar-commits] CVS: moonbase/net/portmap BUILD, 1.3, 1.4 DEPENDS, 1.1.1.1, 1.2

[Terry Chan]

Update of /var/cvs/lunar/moonbase/net/portmap
In directory dbguin.lunar-linux.org:/tmp/cvs-serv5136

Modified Files:
	BUILD DEPENDS 
Log Message:
Fixed the test correctly now for passing whether or not tcp_wrappers should
be supported in portmap.  The old test was incorrect.  Also changed the
OPTS passed from YES/NO to --with-tcpwrappers/--without-tcpwrappers to clarify
what was being passed.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/portmap/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	16 Feb 2004 03:26:11 -0000	1.3
+++ BUILD	16 Feb 2004 04:17:46 -0000	1.4
@@ -1,11 +1,9 @@
 (
-
-#  sed  s/"const char \*what"/"__const char \*what"/ portmap.c > portmap.c~  &&
-#  mv  portmap.c~  portmap.c  &&
-  if [ "$OPTS" == "NO" ]
-  then
-   sedit "s|\$(WRAP_DIR)/libwrap.a||" Makefile &&
-   sedit "s|^HOSTS_ACCESS=|#HOSTS_ACCESS=|" Makefile
+  
+  # yes the double brackets are needed and NO quotes are needed in the following test!!!
+  if [[ $OPTS == *--without-tcpwrappers* ]];  then
+    sedit "s:\$(WRAP_DIR)/libwrap.a::" Makefile &&
+    sedit "s:^HOSTS_ACCESS=:#HOSTS_ACCESS=:" Makefile
   fi &&
   sedit  "s/const char \*what/__const char \*what/"  portmap.c  &&
   
@@ -18,4 +16,5 @@
   cp  pmap_dump  /sbin     &&
   cp  pmap_set   /sbin     &&
   cp  $SCRIPT_DIRECTORY/init.d/portmap  /etc/init.d
+  
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/portmap/DEPENDS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DEPENDS	21 Aug 2002 00:55:21 -0000	1.1.1.1
+++ DEPENDS	16 Feb 2004 04:17:46 -0000	1.2
@@ -1,2 +1,2 @@
 depends   chkconfig  &&
-optional_depends  tcp_wrappers "YES" "NO" "If you want host based access cqntrol"
+optional_depends  tcp_wrappers "--with-tcpwrappers" "--without-tcpwrappers" "If you want host based access cqntrol"