[Openvas-commits] r3014 - trunk/openvas-plugins

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Apr 3 10:17:38 CEST 2009


Author: mwiegand
Date: 2009-04-03 10:17:36 +0200 (Fri, 03 Apr 2009)
New Revision: 3014

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/Makefile
   trunk/openvas-plugins/configure
   trunk/openvas-plugins/configure.in
Log:
Remove the --enable-install configure option and default to allowing
non-root users to install openvas-plugins. This was done for consistency
since openvas-plugins was the last module requiring elevated privileges
for installation.

* configure.in: Removed AC_ARG_ENABLE for install.

* configure: Regenerated.

* Makefile: Removed setting the owner to $installuser.


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-04-03 08:01:34 UTC (rev 3013)
+++ trunk/openvas-plugins/ChangeLog	2009-04-03 08:17:36 UTC (rev 3014)
@@ -1,3 +1,16 @@
+2009-04-03  Michael Wiegand <michael.wiegand at intevation.de>
+
+	Remove the --enable-install configure option and default to allowing
+	non-root users to install openvas-plugins. This was done for consistency
+	since openvas-plugins was the last module requiring elevated privileges
+	for installation.
+
+	* configure.in: Removed AC_ARG_ENABLE for install.
+
+	* configure: Regenerated.
+
+	* Makefile: Removed setting the owner to $installuser.
+
 2009-04-02 Christian Eric Edjenguele <christian.edjenguele at owasp.org>
 	* scripts/remote-detect-WindowsSharePointServices.nasl:
 	Minor Fix, just set the description in the script code

Modified: trunk/openvas-plugins/Makefile
===================================================================
--- trunk/openvas-plugins/Makefile	2009-04-03 08:01:34 UTC (rev 3013)
+++ trunk/openvas-plugins/Makefile	2009-04-03 08:17:36 UTC (rev 3014)
@@ -10,7 +10,7 @@
 
 install-sync-script:
 	test -d $(DESTDIR)${sbindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${sbindir}
-	$(INSTALL) -o $(installuser) -m 0555 openvas-nvt-sync \
+	$(INSTALL) -m 0555 openvas-nvt-sync \
 		$(DESTDIR)${sbindir}
 
 install-dirs:
@@ -21,19 +21,19 @@
 	
 install-nasl:	install-dirs
 	for scripts in scripts/*.nasl; do \
-	$(INSTALL) -o $(installuser) -m 444 $$scripts \
+	$(INSTALL) -m 444 $$scripts \
 		$(DESTDIR)${libdir}/openvas/plugins; \
 	done
 
 install-inc: install-dirs
 	for scripts in scripts/*.inc; do \
-	$(INSTALL) -o $(installuser) -m 444 $$scripts \
+	$(INSTALL) -m 444 $$scripts \
 		$(DESTDIR)${libdir}/openvas/plugins; \
 	done
 
 install-nes: install-dirs
 	for plugins in bin/*.nes; do \
-	$(INSTALL) -o $(installuser) -m 555 $$plugins \
+	$(INSTALL) -m 555 $$plugins \
 		$(DESTDIR)${libdir}/openvas/plugins; \
 	done
 

Modified: trunk/openvas-plugins/configure
===================================================================
--- trunk/openvas-plugins/configure	2009-04-03 08:01:34 UTC (rev 3013)
+++ trunk/openvas-plugins/configure	2009-04-03 08:17:36 UTC (rev 3014)
@@ -1456,7 +1456,6 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-install=user	  for debugging, install as non-root user
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3668,7 +3667,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3671 "configure"' > conftest.$ac_ext
+  echo '#line 3670 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6286,11 +6285,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6289: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6288: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6293: \$? = $ac_status" >&5
+   echo "$as_me:6292: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6554,11 +6553,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6557: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6556: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6561: \$? = $ac_status" >&5
+   echo "$as_me:6560: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6658,11 +6657,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6661: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6660: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6665: \$? = $ac_status" >&5
+   echo "$as_me:6664: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8955,7 +8954,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8958 "configure"
+#line 8957 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9055,7 +9054,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9058 "configure"
+#line 9057 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11391,11 +11390,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11394: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11393: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11398: \$? = $ac_status" >&5
+   echo "$as_me:11397: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11495,11 +11494,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11498: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11497: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11502: \$? = $ac_status" >&5
+   echo "$as_me:11501: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13056,11 +13055,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13059: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13058: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13063: \$? = $ac_status" >&5
+   echo "$as_me:13062: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13160,11 +13159,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13162: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13167: \$? = $ac_status" >&5
+   echo "$as_me:13166: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15347,11 +15346,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15350: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15349: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15354: \$? = $ac_status" >&5
+   echo "$as_me:15353: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15615,11 +15614,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15618: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15617: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15622: \$? = $ac_status" >&5
+   echo "$as_me:15621: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15719,11 +15718,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15722: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15721: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15726: \$? = $ac_status" >&5
+   echo "$as_me:15725: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18688,15 +18687,6 @@
 
 
 
-# Check whether --enable-install was given.
-if test "${enable_install+set}" = set; then
-  enableval=$enable_install; installuser=$enable_install
-fi
-
-: ${installuser:=root}
-
-
-
 { echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6; }
 if test "${ac_cv_lib_util_openpty+set}" = set; then

Modified: trunk/openvas-plugins/configure.in
===================================================================
--- trunk/openvas-plugins/configure.in	2009-04-03 08:01:34 UTC (rev 3013)
+++ trunk/openvas-plugins/configure.in	2009-04-03 08:17:36 UTC (rev 3014)
@@ -59,12 +59,6 @@
 
 
 
-AC_ARG_ENABLE(install,[  --enable-install=user	  for debugging, install as non-root user],
-	installuser=$enable_install)
-: ${installuser:=root}
-
-
-
 dnl containing funny things, like openpty, forkpty
 dnl this library is deprecated because of portability
 AC_CHECK_LIB(util, openpty, LIBUTIL="-lutil")



More information about the Openvas-commits mailing list