[arch-commits] Commit in apache/repos (3 files)

[Pierre Schmitz]

    Date: Wednesday, July 9, 2008 @ 16:51:15
  Author: pierre
Revision: 4764

Merged revisions 3760-4763 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/apache/trunk

........
  r4678 | pierre | 2008-07-08 19:23:48 +0000 (Di, 08 Jul 2008) | 1 line
  
  http user/group is now provided by the filesystem package
........

Modified:
  apache/repos/testing-x86_64/	(properties)
  apache/repos/testing-x86_64/PKGBUILD
  apache/repos/testing-x86_64/httpd.install

---------------+
 PKGBUILD      |    3 +--
 httpd.install |   16 ----------------
 2 files changed, 1 insertion(+), 18 deletions(-)


Property changes on: apache/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /apache/trunk:1-3759
   + /apache/trunk:1-4763

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-07-09 20:46:40 UTC (rev 4763)
+++ testing-x86_64/PKGBUILD	2008-07-09 20:51:15 UTC (rev 4764)
@@ -3,7 +3,7 @@
 
 pkgname=apache
 pkgver=2.2.9
-pkgrel=3
+pkgrel=4
 pkgdesc="A high performance Unix-based HTTP server"
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -78,4 +78,4 @@
 	rm -rf ${pkgdir}/etc/httpd/conf/original
 	rm -rf ${pkgdir}/srv/http/*
 	rmdir ${pkgdir}/usr/bin
-}
\ No newline at end of file
+}

Modified: testing-x86_64/httpd.install
===================================================================
--- testing-x86_64/httpd.install	2008-07-09 20:46:40 UTC (rev 4763)
+++ testing-x86_64/httpd.install	2008-07-09 20:51:15 UTC (rev 4764)
@@ -1,15 +1,4 @@
-post_install() {
-	if [ -z "`grep '^http::' /etc/group`" ]; then
-		groupadd -g 33 http >& /dev/null
-	fi
-	if [ -z "`grep '^http:' /etc/passwd`" ]; then
-		useradd -u 33 -d /srv/http -g http -s /bin/false http &>/dev/null
-	fi
-}
-
 post_upgrade() {
-	post_install
-
 	if [ $(vercmp '2.2.8' $2) -ge 0 ]; then
 	echo '
 	==> New default DocumentRoot
@@ -24,9 +13,4 @@
 	run httpd as nobody.
 	'
 	fi
-}
-
-pre_remove() {
-	userdel http &> /dev/null
-	groupdel http &> /dev/null
 }
\ No newline at end of file