diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-12-20 06:12:42 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-12-20 06:12:42 +0000 |
| commit | 88bdd24fa4f8a10e40812db4b3c61f46f28ec807 (patch) | |
| tree | 9ded412818a72cd043a81e194b961053ba5f19fa | |
| parent | f88ad8795c22fd802dc805e43d995bfc17a13d42 (diff) | |
www/httptunnel: Use USERS/GROUPS instead of custom scripts
This also make sure that the user info actually matches what's in
UIDs.
Notes
Notes:
svn path=/head/; revision=520476
| -rw-r--r-- | www/httptunnel/Makefile | 4 | ||||
| -rw-r--r-- | www/httptunnel/pkg-deinstall | 27 | ||||
| -rw-r--r-- | www/httptunnel/pkg-install | 36 |
3 files changed, 3 insertions, 64 deletions
diff --git a/www/httptunnel/Makefile b/www/httptunnel/Makefile index f29da6bb9804..377bf13a8863 100644 --- a/www/httptunnel/Makefile +++ b/www/httptunnel/Makefile @@ -3,7 +3,7 @@ PORTNAME= httptunnel PORTVERSION= 3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.Awfulhak.org/httptunnel/ \ ftp://ftp.nocrew.org/pub/nocrew/unix/ \ @@ -19,6 +19,8 @@ CONFIGURE_ARGS= --quiet DEBUG_CONFIGURE_ENABLE= debug USE_RC_SUBR= hts htc +USERS= httptunnel +GROUPS= httptunnel PLIST_FILES= bin/hts bin/htc \ man/man1/hts.1.gz man/man1/htc.1.gz diff --git a/www/httptunnel/pkg-deinstall b/www/httptunnel/pkg-deinstall deleted file mode 100644 index b711522d0c7f..000000000000 --- a/www/httptunnel/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -case $2 in -POST-DEINSTALL) - USER=httptunnel - GROUP=${USER} - PW=/usr/sbin/pw - - if ${PW} groupshow "${GROUP}" 2>/dev/null 1>&2; then - if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then - echo "To delete the ${USER} group permanently, use '${PW} groupdel ${GROUP}'." - else - ${PW} groupdel ${USER} - fi - fi - - if ${PW} usershow "${USER}" 2>/dev/null 1>&2; then - if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then - echo "To delete the ${USER} user permanently, use '${PW} userdel ${USER}'." - else - ${PW} userdel ${USER} - fi - fi - - exit 0 - ;; -esac diff --git a/www/httptunnel/pkg-install b/www/httptunnel/pkg-install deleted file mode 100644 index 72e86717a570..000000000000 --- a/www/httptunnel/pkg-install +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - USER=httptunnel - GROUP=${USER} - UID=361 - GID=${UID} - PW=/usr/sbin/pw - - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/var/empty" -s /sbin/nologin -c "OSPF Daemon" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - exit 0 - ;; -esac |