[asterisk-commits] pabelanger: branch pabelanger/non-root r278574 - in /team/pabelanger/non-root...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jul 21 15:29:21 CDT 2010


Author: pabelanger
Date: Wed Jul 21 15:29:17 2010
New Revision: 278574

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278574
Log:
Revert back to previous method.  pre / post install scripts will have to wait.

Removed:
    team/pabelanger/non-root/build_tools/checkOS
    team/pabelanger/non-root/build_tools/post_install
    team/pabelanger/non-root/build_tools/pre_install
Modified:
    team/pabelanger/non-root/Makefile
    team/pabelanger/non-root/configure
    team/pabelanger/non-root/configure.ac
    team/pabelanger/non-root/contrib/init.d/etc_default_asterisk
    team/pabelanger/non-root/include/asterisk/autoconfig.h.in
    team/pabelanger/non-root/makeopts.in
    team/pabelanger/non-root/sounds/Makefile

Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=278574&r1=278573&r2=278574
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Wed Jul 21 15:29:17 2010
@@ -88,9 +88,6 @@
 export GREP
 export MD5
 export WGET_EXTRA_ARGS
-export AST_USER
-export AST_GROUP
-export AST_ENABLE_ROOT
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -127,13 +124,12 @@
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
 DEBUG=-g3
 
-ifneq ($(AST_ENABLE_ROOT),yes)
-  ifneq ($(AST_USER),)
-    INSTALL+= -o $(AST_USER)
-  endif
-  ifneq ($(AST_GROUP),)
-    INSTALL+= -g $(AST_GROUP)
-  endif
+ifneq ($(AST_USER),)
+  INSTALL+= -o $(AST_USER)
+endif
+
+ifneq ($(AST_GROUP),)
+  INSTALL+= -g $(AST_GROUP)
 endif
 
 # Define standard directories for various platforms
@@ -651,12 +647,6 @@
 		echo " WARNING WARNING WARNING" ;\
 	fi
 
-preinstall:
-	build_tools/pre_install
-
-postinstall:
-	build_tools/post_install
-
 badshell:
 ifneq ($(findstring ~,$(DESTDIR)),)
 	@echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
@@ -664,8 +654,7 @@
 	@exit 1
 endif
 
-install: preinstall badshell bininstall datafiles postinstall
-
+install: badshell bininstall datafiles
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi

Modified: team/pabelanger/non-root/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/configure.ac?view=diff&rev=278574&r1=278573&r2=278574
==============================================================================
--- team/pabelanger/non-root/configure.ac (original)
+++ team/pabelanger/non-root/configure.ac Wed Jul 21 15:29:17 2010
@@ -536,8 +536,6 @@
 		*) AC_MSG_ERROR(bad value ${enableval} for --enable-root) ;;
 	esac], [enable_root=no])
 
-AC_DEFINE_UNQUOTED([AST_ENABLE_ROOT],"$enable_root",[Enable root installation])
-
 dnl Check for asterisk in /etc/passwd
 if test "${enable_root}" = "no" ; then
 	dnl parse /etc/passwd
@@ -550,11 +548,15 @@
 
 	if test "${astuser}" -eq 1 ; then
 		AC_MSG_RESULT(yes)
+		AST_USER="${ast_user}"
+		AC_SUBST([AST_USER])
 	else
 		AC_MSG_RESULT(no)
+		AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_user} user permission; confirm the user exists.)
+		AC_MSG_NOTICE(*** Please run the 'configure' script with the '--enable-root' parameter option or create)
+		AC_MSG_NOTICE(*** the appropiate user.)
+		exit 1
 	fi
-	AST_USER="${ast_user}"
-	AC_SUBST([AST_USER])
 
 	AC_MSG_CHECKING([for ${ast_group} group])
 	if test "x$GETENT" != "x:" ; then
@@ -565,14 +567,16 @@
 
 	if test "${astgroup}" -eq 1 ; then
 		AC_MSG_RESULT(yes)
+		AST_GROUP="${ast_group}"
+		AC_SUBST([AST_GROUP])
 	else
 		AC_MSG_RESULT(no)
+		AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_group} group permission; confirm the group exists.)
+		AC_MSG_NOTICE(*** Please run the 'configure' script with the '--enable-root' parameter option or create)
+		AC_MSG_NOTICE(*** the appropiate group.)
+		exit 1
 	fi
-	AST_GROUP="${ast_group}"
-	AC_SUBST([AST_GROUP])
-fi
-AST_ENABLE_ROOT="${enable_root}"
-AC_SUBST([AST_ENABLE_ROOT])
+fi
 
 # https support (in main/http.c) uses funopen on BSD systems,
 # fopencookie on linux

Modified: team/pabelanger/non-root/contrib/init.d/etc_default_asterisk
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/contrib/init.d/etc_default_asterisk?view=diff&rev=278574&r1=278573&r2=278574
==============================================================================
--- team/pabelanger/non-root/contrib/init.d/etc_default_asterisk (original)
+++ team/pabelanger/non-root/contrib/init.d/etc_default_asterisk Wed Jul 21 15:29:17 2010
@@ -39,3 +39,4 @@
 # Start all recordings into a temporary directory, before moving them to
 # their final location.
 #TEMPRECORDINGLOCATION=yes
+

Modified: team/pabelanger/non-root/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/include/asterisk/autoconfig.h.in?view=diff&rev=278574&r1=278573&r2=278574
==============================================================================
--- team/pabelanger/non-root/include/asterisk/autoconfig.h.in (original)
+++ team/pabelanger/non-root/include/asterisk/autoconfig.h.in Wed Jul 21 15:29:17 2010
@@ -6,9 +6,6 @@
 #include "asterisk/buildopts.h"
 
 
-
-/* Enable root installation */
-#undef AST_ENABLE_ROOT
 
 /* name of the Asterisk group */
 #undef AST_GROUP
@@ -812,7 +809,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1080,11 +1077,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1104,11 +1101,6 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1139,20 +1131,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1169,20 +1171,6 @@
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Modified: team/pabelanger/non-root/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/makeopts.in?view=diff&rev=278574&r1=278573&r2=278574
==============================================================================
--- team/pabelanger/non-root/makeopts.in (original)
+++ team/pabelanger/non-root/makeopts.in Wed Jul 21 15:29:17 2010
@@ -86,7 +86,6 @@
 
 AST_USER=@AST_USER@
 AST_GROUP=@AST_GROUP@
-AST_ENABLE_ROOT=@AST_ENABLE_ROOT@
 
 ALSA_INCLUDE=@ALSA_INCLUDE@
 ALSA_LIB=@ALSA_LIB@

Modified: team/pabelanger/non-root/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/sounds/Makefile?view=diff&rev=278574&r1=278573&r2=278574
==============================================================================
--- team/pabelanger/non-root/sounds/Makefile (original)
+++ team/pabelanger/non-root/sounds/Makefile Wed Jul 21 15:29:17 2010
@@ -177,7 +177,7 @@
 	rm -f *.tar.gz
 
 $(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
-	$(INSTALL) -d -p $@
+	${INSTALL} -d -p $@
 
 permissions:
 	@if [ "$(AST_USER)" != "" ] ; then \




More information about the asterisk-commits mailing list