diff options
author | ache <ache@FreeBSD.org> | 2001-12-08 07:12:32 +0800 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2001-12-08 07:12:32 +0800 |
commit | bffc285f9fe9c0a6ed5751f903c612bd86f6297b (patch) | |
tree | e2dcb917d65823e7e71f369a6cba9388a05987fa /www | |
parent | 3dd5864fbd7614a5d99ece9d4ab896e91e96a7e1 (diff) | |
download | freebsd-ports-gnome-bffc285f9fe9c0a6ed5751f903c612bd86f6297b.tar.gz freebsd-ports-gnome-bffc285f9fe9c0a6ed5751f903c612bd86f6297b.tar.zst freebsd-ports-gnome-bffc285f9fe9c0a6ed5751f903c612bd86f6297b.zip |
Suggest a command to delete user instead of actually deleting it
PR: 32536
Diffstat (limited to 'www')
-rw-r--r-- | www/apache13-modssl/Makefile | 2 | ||||
-rw-r--r-- | www/apache13-modssl/pkg-deinstall | 9 | ||||
-rw-r--r-- | www/apache13/Makefile | 2 | ||||
-rw-r--r-- | www/apache13/pkg-deinstall | 7 | ||||
-rw-r--r-- | www/apache2/Makefile | 2 | ||||
-rw-r--r-- | www/apache2/pkg-deinstall | 11 | ||||
-rw-r--r-- | www/apache20/Makefile | 2 | ||||
-rw-r--r-- | www/apache20/pkg-deinstall | 11 | ||||
-rw-r--r-- | www/apache21/Makefile | 2 | ||||
-rw-r--r-- | www/apache21/pkg-deinstall | 11 | ||||
-rw-r--r-- | www/apache22/Makefile | 2 | ||||
-rw-r--r-- | www/apache22/pkg-deinstall | 11 |
12 files changed, 21 insertions, 51 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index c69510d8524d..7754e0cfa87b 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www security MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://www.modssl.org/source/ \ diff --git a/www/apache13-modssl/pkg-deinstall b/www/apache13-modssl/pkg-deinstall index b9f633379f21..b652ce40aa8d 100644 --- a/www/apache13-modssl/pkg-deinstall +++ b/www/apache13-modssl/pkg-deinstall @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache13-modssl/Attic/pkg-deinstall,v 1.1 2001-10-22 18:05:33 ache Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache13-modssl/Attic/pkg-deinstall,v 1.2 2001-12-07 23:12:32 ache Exp $ # if [ "$2" != "POST-DEINSTALL" ]; then @@ -9,12 +9,7 @@ fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 69d583006005..d176e9cbe8e4 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 1.3.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ diff --git a/www/apache13/pkg-deinstall b/www/apache13/pkg-deinstall index dc23907bb768..297073050c8c 100644 --- a/www/apache13/pkg-deinstall +++ b/www/apache13/pkg-deinstall @@ -9,12 +9,7 @@ fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 907bf66bdf01..f9eab5fbd9cc 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache2/pkg-deinstall b/www/apache2/pkg-deinstall index 61ed1a6c6a38..ebd5f5bc8f82 100644 --- a/www/apache2/pkg-deinstall +++ b/www/apache2/pkg-deinstall @@ -1,20 +1,15 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-deinstall,v 1.4 2001-12-07 23:12:32 ache Exp $ # if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 + exit 0 fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 907bf66bdf01..f9eab5fbd9cc 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache20/pkg-deinstall b/www/apache20/pkg-deinstall index 799fbf3fa6d2..5628096268f5 100644 --- a/www/apache20/pkg-deinstall +++ b/www/apache20/pkg-deinstall @@ -1,20 +1,15 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache20/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache20/Attic/pkg-deinstall,v 1.4 2001-12-07 23:12:32 ache Exp $ # if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 + exit 0 fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 907bf66bdf01..f9eab5fbd9cc 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache21/pkg-deinstall b/www/apache21/pkg-deinstall index c45782a9c38c..d1162ea1a922 100644 --- a/www/apache21/pkg-deinstall +++ b/www/apache21/pkg-deinstall @@ -1,20 +1,15 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/pkg-deinstall,v 1.4 2001-12-07 23:12:32 ache Exp $ # if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 + exit 0 fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 907bf66bdf01..f9eab5fbd9cc 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache22/pkg-deinstall b/www/apache22/pkg-deinstall index b50a243a2f57..424c820da458 100644 --- a/www/apache22/pkg-deinstall +++ b/www/apache22/pkg-deinstall @@ -1,20 +1,15 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache22/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache22/Attic/pkg-deinstall,v 1.4 2001-12-07 23:12:32 ache Exp $ # if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 + exit 0 fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 |