Date: Fri, 02 Jul 2010 17:25:55 +0200 From: Bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: decke@FreeBSD.org Subject: ports/148319: [PATCH] net-mgmt/nefu: convert to USERS/GROUPS Message-ID: <cf2a0@azathoth.lan> Resent-Message-ID: <201007021540.o62Fe73P065173@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148319
>Category: ports
>Synopsis: [PATCH] net-mgmt/nefu: convert to USERS/GROUPS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 02 15:40:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Bapt
>Release: FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD azathoth.lan 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #5 r208894M: Tue Jun 8 11:03:27
>Description:
Convert to new USERS/GROUPS
Removed file(s):
- pkg-deinstall
- pkg-install
Port maintainer (decke@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- nefu-1.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nefu.orig/Makefile /usr/ports/net-mgmt/nefu/Makefile
--- /usr/ports/net-mgmt/nefu.orig/Makefile 2010-04-01 14:45:36.000000000 +0200
+++ /usr/ports/net-mgmt/nefu/Makefile 2010-07-02 17:25:00.204392224 +0200
@@ -27,8 +27,8 @@
--without-zlib \
--without-shelltests
-NEFU_USER= nefu
-NEFU_GROUP= nefu
+USERS= nefu
+GROUPS= nefu
USE_OPENSSL= yes
OPTIONS= LDAP "Enable OpenLDAP support" off \
@@ -71,12 +71,11 @@
${INSTALL_MAN} ${WRKSRC}/nefu.conf.4 ${PREFIX}/man/man4
post-install:
- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if defined(WITH_HTML)
${MKDIR} ${WWWDIR}
- ${CHOWN} -R ${NEFU_USER}:${NEFU_GROUP} ${WWWDIR}
+ ${CHOWN} -R ${USERS}:${GROUPS} ${WWWDIR}
.endif
${MKDIR} ${DBDIR}
- ${CHOWN} -R ${NEFU_USER}:${NEFU_GROUP} ${DBDIR}
+ ${CHOWN} -R ${USERS}:${GROUPS} ${DBDIR}
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nefu.orig/pkg-deinstall /usr/ports/net-mgmt/nefu/pkg-deinstall
--- /usr/ports/net-mgmt/nefu.orig/pkg-deinstall 2009-04-07 13:49:00.000000000 +0200
+++ /usr/ports/net-mgmt/nefu/pkg-deinstall 1970-01-01 01:00:00.000000000 +0100
@@ -1,70 +0,0 @@
-#! /bin/sh
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local dflt question answer
-
- question=$1
- dflt=$2
- while :; do
- answer=$(ask "${question}" "${dflt}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-delete_account() {
- local u g home
-
- u=$1
- g=$2
- if pw group show ${g} > /dev/null 2>&1; then
- if yesno "Do you want me to remove group \"${g}\"" y; then
- pw group del -n ${g}
- echo "Done."
- else
- GID=`pw group show ${g} | awk -F: '{ print $3 }'`
- fi
- fi
- if pw user show ${u} > /dev/null 2>&1; then
- if yesno "Do you want me to remove user \"${u}\"" y; then
- eval home=~${u}
- pw user del -n ${u} -r
- echo "Done."
- if [ -d "${home}" ]; then
- echo "Please remember to remove the home directory \"${home}\""
- fi
-
- # pw user del may have removed the group, too.
- # Put it back if the admin asked us to retain it.
- if [ -n "$GID" ]; then
- pw group show ${g} > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- pw group add ${g}
- fi
- fi
- fi
- fi
-}
-
-case $2 in
- POST-DEINSTALL)
- delete_account nefu nefu
- ;;
-esac
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nefu.orig/pkg-install /usr/ports/net-mgmt/nefu/pkg-install
--- /usr/ports/net-mgmt/nefu.orig/pkg-install 2009-04-07 13:49:00.000000000 +0200
+++ /usr/ports/net-mgmt/nefu/pkg-install 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- USER=nefu
- GROUP=nefu
- UID=918
- GID=918
-
- if pw groupshow "${GROUP}" > /dev/null 2>&1; then
- echo "===> Using existing group ${GROUP}"
- else
- echo "===> Adding group ${GROUP}"
- pw groupadd ${GROUP} -g ${GID} || exit 1
- fi
-
- if pw usershow "${USER}" > /dev/null 2>&1; then
- echo "===> Using existing user ${USER}"
- else
- echo "===> Adding user ${USER}"
- pw adduser ${USER} -u ${UID} -g ${GROUP} -h - -d "/var/db/nefu" \
- -s "/sbin/nologin" -c "Nefu daemon" || exit 1
- fi
- ;;
-esac
--- nefu-1.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cf2a0>