Date: Fri, 02 Jul 2010 17:36:56 +0200 From: Bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: yaizawa@2004.jukuin.keio.ac.jp Subject: ports/148321: [PATCH] mail/quickml: user USERS/GROUPS Message-ID: <cf2a0@azathoth.lan> Resent-Message-ID: <201007021540.o62Fe7vU065210@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148321
>Category: ports
>Synopsis: [PATCH] mail/quickml: user 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:07 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:
User USERS/GROUPS
Removed file(s):
- files/pkg-install.in
Port maintainer (yaizawa@2004.jukuin.keio.ac.jp) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- quickml-0.7_9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/quickml.orig/Makefile /usr/ports/mail/quickml/Makefile
--- /usr/ports/mail/quickml.orig/Makefile 2010-03-28 08:39:13.000000000 +0200
+++ /usr/ports/mail/quickml/Makefile 2010-07-02 17:36:07.160431369 +0200
@@ -17,18 +17,14 @@
OPTIONS+= ANALOG "Enable quickml-analog" on \
LIMIT "Enable Creators and Members Limitation Patch" off
-PKGINSTALL= ${WRKDIR}/pkg-install
-SUB_FILES+= pkg-install
-
-QUICKML_USER= quickml
-QUICKML_GROUP= quickml
+USERS= quickml
+GROUPS= quickml
USE_AUTOTOOLS= autoconf:262
GNU_CONFIGURE= yes
USE_RUBY= yes
USE_RC_SUBR= ${PORTNAME}
-SUB_LIST+= USER=${QUICKML_USER} GROUP=${QUICKML_GROUP} RUBY=${RUBY}
CONFIGURE_ARGS+= --datadir="${PREFIX}/share/quickml"
CONFIGURE_ARGS+= --with-ruby="${RUBY}"
@@ -61,9 +57,6 @@
${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/without_quickml-analog
.endif
-pre-install:
- @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
post-install:
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/messages.ja ${DATADIR}
diff -ruN --exclude=CVS /usr/ports/mail/quickml.orig/files/pkg-install.in /usr/ports/mail/quickml/files/pkg-install.in
--- /usr/ports/mail/quickml.orig/files/pkg-install.in 2009-12-28 19:48:41.000000000 +0100
+++ /usr/ports/mail/quickml/files/pkg-install.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/quickml/files/pkg-install.in,v 1.1 2009/12/28 18:48:41 pgollucci Exp $
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-
-PRE-INSTALL)
- echo "---> Starting pre-install script:"
-
- if pw showgroup "%%GROUP%%" 2>/dev/null; then
- echo "---> Using existing group \"%%GROUP%%\""
- else
- echo "---> Adding group \"%%GROUP%%\""
- pw addgroup %%GROUP%% -g 109 -h - || exit 1
- fi
-
- # Create user if required
- if pw showuser "%%USER%%" 2>/dev/null; then
- echo "---> Using existing user \"%%USER%%\""
- else
- echo "---> Adding user \"%%USER%%\""
- pw adduser %%USER%% -u 109 -g %%GROUP%% -h - \
- -d "/nonexistent" -s "/sbin/nologin" -c "quickml Server" || exit 1
- fi
-
- ;;
-
-esac
--- quickml-0.7_9.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>