summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonny Davies <woodchip@gentoo.org>2002-05-14 03:27:31 +0000
committerDonny Davies <woodchip@gentoo.org>2002-05-14 03:27:31 +0000
commit43e27c4887c302b83b19807b591725b5c821727b (patch)
tree3b156d0103ca5266d0e8109a5103751b545e416d /net-www/apache
parentNew upstream release. (diff)
downloadgentoo-2-43e27c4887c302b83b19807b591725b5c821727b.tar.gz
gentoo-2-43e27c4887c302b83b19807b591725b5c821727b.tar.bz2
gentoo-2-43e27c4887c302b83b19807b591725b5c821727b.zip
oops, sorry. backing out previous change; i want a better, generic solution for the group detection
Diffstat (limited to 'net-www/apache')
-rw-r--r--net-www/apache/ChangeLog6
-rw-r--r--net-www/apache/apache-1.3.24-r2.ebuild6
2 files changed, 4 insertions, 8 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 8302eac95953..2ee674bcffad 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,10 +1,6 @@
# ChangeLog for net-www/apache
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.9 2002/05/14 02:29:18 woodchip Exp $
-
- 13 May 2002; Donny Davies <woodchip@gentoo.org> :
-
- Test better for existing user/group apache; closes #2313.
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.10 2002/05/14 03:27:31 woodchip Exp $
*apache-1.3.24-r2 (4 May 2002)
diff --git a/net-www/apache/apache-1.3.24-r2.ebuild b/net-www/apache/apache-1.3.24-r2.ebuild
index 445d59253e1f..234549c1e1b2 100644
--- a/net-www/apache/apache-1.3.24-r2.ebuild
+++ b/net-www/apache/apache-1.3.24-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.24-r2.ebuild,v 1.2 2002/05/14 02:29:18 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.24-r2.ebuild,v 1.3 2002/05/14 03:27:31 woodchip Exp $
mod_ssl_ver=2.8.8-${PV}
HARD_SERVER_LIMIT=512
@@ -25,11 +25,11 @@ SLOT="1"
pkg_setup() {
# these are in baselayout now; it will not hurt to leave them here though..
- if ! id -g apache >/dev/null 2>&1 ; then
+ if ! grep -q ^apache: /etc/group ; then
groupadd -g 81 apache || die "problem adding group apache"
fi
- if ! id -u apache >/dev/null 2>&1 ; then
+ if ! grep -q ^apache: /etc/passwd ; then
useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
assert "problem adding user apache"
fi