[Devil-linux-commit] build/scripts php,1.5,1.6 thttpd,1.15,1.16

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv16475/scripts

Modified Files:
	php thttpd 
Log Message:
move www to passwd/group
added php.ini


Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- php	19 Oct 2003 11:54:49 -0000	1.5
+++ php	19 Dec 2003 00:20:54 -0000	1.6
@@ -38,7 +38,7 @@
 				--sysconfdir=/etc --with-config-file-path=/etc  --prefix=/usr || exit 1
 			#
 			# not working --enable-xslt --with-kerberos
-			# do not use --with-cyrus 
+			# do not use --with-cyrus
 			make $PMAKE all || exit 1
 			strip_debug
 		fi
@@ -54,6 +54,7 @@
 			rm $WORKDIR/tmp/etc/apache2/httpd.conf.bak
 			rm $WORKDIR/tmp/etc/apache2/httpd.conf.old
 			cp -dp $WORKDIR/tmp/etc/apache2/httpd.conf $ETCDIR/etc/apache2/
+			cp -dp php.ini-dist $ETCDIR/etc/php.ini || exit 1
 			rm -rf $WORKDIR/tmp/usr/include || exit 1
 			cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
 			copy_docs $WORKDIR/tmp/

Index: thttpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/thttpd,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- thttpd	25 Oct 2003 16:44:53 -0000	1.15
+++ thttpd	19 Dec 2003 00:20:54 -0000	1.16
@@ -39,9 +39,6 @@
 
 	install )
 		if [ "$CONFIG_THTTPD" = "y" ]; then
-			groupadd -g 103 www || exit 1
-			useradd -u 30 -g www -s /bin/false www || exit 1
-
 			rm -rf $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp/usr/{sbin,man,www} || exit 1