ports/102479: [maintainer update] ports/net/vserver update to v2.43a
Andreas S. Wetzel
mickey at netassembly.de
Thu Aug 24 15:00:36 UTC 2006
>Number: 102479
>Category: ports
>Synopsis: [maintainer update] ports/net/vserver update to v2.43a
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 24 15:00:30 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Andreas S. Wetzel
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD transrapid.enforcer.cc 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Fri May 12 15:42:59 CEST 2006 root at transrapid.enforcer.cc:/usr/src/sys/i386/compile/TRANSRAPID i386
>Description:
This is an update of ports/net/vserver to the most recent software revision 2.43a.
Included are the diffs to ports/UIDs and ports/GIDs to register uid/gid 128 to be
used by ports/net/vserver as well as the recursive diff of the ports/net/vserver directory.
Files added by this update:
ports/net/vserver/files/pkg-deinstall.in
ports/net/vserver/files/pkg-install.in
ports/net/vserver/files/vserver.in
Files deleted by this update:
ports/net/vserver/files/vserver.sh.in
>How-To-Repeat:
>Fix:
--- UIDs.diff begins here ---
--- UIDs.bak Thu Aug 24 11:40:36 2006
+++ UIDs Thu Aug 24 11:41:39 2006
@@ -57,6 +57,7 @@
hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin
smokeping:*:117:117:SmokePing Daemon:/nonexistent:/sbin/nologin
postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin
+vchat:*:128:128:VChat Conferencing System:/nonexistent:/sbin/nologin
_bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin
_ospfd:*:131:131:OSPF Daemon:/var/empty:/sbin/nologin
rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/sbin/nologin
--- UIDs.diff ends here ---
--- GIDs.diff begins here ---
--- GIDs.bak Thu Aug 24 11:41:45 2006
+++ GIDs Thu Aug 24 11:42:07 2006
@@ -48,6 +48,7 @@
smokeping:*:117:
postfix:*:125:
maildrop:*:126:
+vchat:*:128:
_bgpd:*:130:
_ospfd:*:131:
rbldns:*:153:
--- GIDs.diff ends here ---
--- vserver.diff begins here ---
diff -ruN vserver.bak/Makefile vserver/Makefile
--- vserver.bak/Makefile Wed Jan 11 13:41:24 2006
+++ vserver/Makefile Thu Aug 24 16:03:01 2006
@@ -6,16 +6,34 @@
#
PORTNAME= vserver
-PORTVERSION= 2.42f
+PORTVERSION= 2.43a
CATEGORIES= net
MASTER_SITES= http://www.enforcer.cc/vchat/filez/
MAINTAINER= mickey at netassembly.de
COMMENT= Server software of the VChat conference system
-GNU_CONFIGURE= yes
+HAS_CONFIGURE= yes
+USE_RC_SUBR= vserver
MAN8= vchatctl.8 vserver.8
-PLIST_FILES= sbin/vserver sbin/vchatctl
-.include <bsd.port.mk>
+VCHATUSER= vchat
+VCHATGROUP= vchat
+
+SUB_FILES= pkg-install pkg-deinstall
+SUB_LIST+= VCHATUSER=${VCHATUSER} \
+ VCHATGROUP=${VCHATGROUP}
+
+.include <bsd.port.pre.mk>
+
+pre-install:
+ @${SETENV} PKG_PREFIX=${PREFIX} \
+ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
+post-install:
+ @${SETENV} PKG_PREFIX=${PREFIX} \
+ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+
+.include <bsd.port.post.mk>
diff -ruN vserver.bak/distinfo vserver/distinfo
--- vserver.bak/distinfo Wed Jan 11 13:41:24 2006
+++ vserver/distinfo Thu Aug 24 16:03:01 2006
@@ -1,3 +1,3 @@
-MD5 (vserver-2.42f.tar.gz) = a177993f51877a3e9c21dd4787bded8c
-SHA256 (vserver-2.42f.tar.gz) = 86dddc414ca0372a3f10d1a32db346539ece4befd97bb3ab214cac50412c8526
-SIZE (vserver-2.42f.tar.gz) = 121606
+MD5 (vserver-2.43a.tar.gz) = c2fae94f0cdfe438711aeede741e38f8
+SHA256 (vserver-2.43a.tar.gz) = 74e53c2a5446e3c21c025db776e56938b57a724151949057130f622eee1115fa
+SIZE (vserver-2.43a.tar.gz) = 241481
diff -ruN vserver.bak/files/pkg-deinstall.in vserver/files/pkg-deinstall.in
--- vserver.bak/files/pkg-deinstall.in Thu Jan 1 01:00:00 1970
+++ vserver/files/pkg-deinstall.in Thu Aug 24 16:03:01 2006
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+ exit 0
+fi
+
+PREFIX=${PKG_PREFIX:-%%PREFIX%%}
+VCHATUSER=%%VCHATUSER%%
+VCHATGROUP=%%VCHATGROUP%%
+
+if pw usershow "${VCHATUSER}" 2>/dev/null 1>&2; then
+
+ echo "To delete ${VCHATUSER} user permanently, use 'pw userdel \"${VCHATUSER}\"'"
+
+fi
+
+if [ -d "${PREFIX}/etc/vchat" ]; then
+
+
+ echo "If you do not intend to use this package any longer, please delete"
+ echo "the directory \"${PREFIX}/etc/vchat\" manually."
+
+fi
+
+exit 0
diff -ruN vserver.bak/files/pkg-install.in vserver/files/pkg-install.in
--- vserver.bak/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ vserver/files/pkg-install.in Thu Aug 24 16:03:01 2006
@@ -0,0 +1,93 @@
+#! /bin/sh
+
+PREFIX=${PKG_PREFIX:-%%PREFIX%%}
+
+VCHATUSER=%%VCHATUSER%%
+VCHATGROUP=%%VCHATGROUP%%
+UID=128
+GID=128
+
+if [ -n "%%DESTDIR%%" ]; then
+
+ PW="/usr/sbin/chroot %%DESTDIR%% pw"
+ CHOWN="/usr/sbin/chroot %%DESTDIR%% chown"
+ CHMOD="/usr/sbin/chroot %%DESTDIR%% chmod"
+ MKDIR="/usr/sbin/chroot %%DESTDIR%% mkdir -p"
+
+else
+
+ PW="pw"
+ CHOWN="chown"
+ CHMOD="chmod"
+ MKDIR="mkdir"
+
+
+fi
+
+
+if [ "$2" = "PRE-INSTALL" ]; then
+
+ if ! ${PW} groupshow ${VCHATGROUP} 2>/dev/null 1>&2; then
+
+ if ${PW} groupadd ${VCHATGROUP} -g $GID; then
+ echo "=> Added group \"${VCHATGROUP}\"."
+ else
+ echo "=> Adding group \"${VCHATGROUP}\" failed."
+ exit 1
+ fi
+ fi
+
+ if ! ${PW} usershow ${VCHATUSER} 2>/dev/null 1>&2; then
+
+ if ${PW} useradd ${VCHATUSER} -u $UID -g ${VCHATGROUP} -h - \
+ -s "/sbin/nologin" -d "/nonexistent" \
+ -c "VChat Conferencing System"; \
+ then
+
+ echo "=> Added user \"${VCHATUSER}\"."
+
+ else
+
+ echo "=> Adding user \"${VCHATUSER}\" failed."
+ exit 1
+
+ fi
+ fi
+
+elif [ "$2" = "POST-INSTALL" ]; then
+
+ if [ ! -d "${PREFIX}/etc/vchat" ]; then
+ ${MKDIR} ${PREFIX}/etc/vchat || exit 1
+ fi
+
+ ${CHOWN} ${VCHATUSER}:${VCHATGROUP} ${PREFIX}/etc/vchat
+ ${CHMOD} 755 ${PREFIX}/etc/vchat
+
+ if [ ! -f "${PREFIX}/etc/vchat/user.db" ]; then
+
+
+cat << -EOT-
+
+****************************** IMPORTANT NOTE *******************************
+
+Before starting vserver into normal operations for the first time, you
+need to create an initial user database file "${PREFIX}/etc/vchat/user.db".
+
+This is accomplished by running the following command sequence:
+
+su -f -m ${VCHATUSER} -c "${PREFIX}/sbin/vserver /BASEDIR=${PREFIX}/etc/vchat /CREATEUDB"
+
+*****************************************************************************
+
+-EOT-
+
+ else
+
+ ${CHOWN} ${VCHATUSER}:${VCHATGROUP} ${PREFIX}/etc/vchat/user.db
+ ${CHMOD} 600 ${PREFIX}/etc/vchat/user.db
+
+ fi
+
+fi
+
+exit 0
diff -ruN vserver.bak/files/vserver.in vserver/files/vserver.in
--- vserver.bak/files/vserver.in Thu Jan 1 01:00:00 1970
+++ vserver/files/vserver.in Thu Aug 24 16:03:01 2006
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+#
+# $Id: startup-freebsd.sh,v 1.2 2006/06/03 17:18:59 mickey Exp $
+#
+# FreeBSD boot time start up script for vserver(8).
+#
+# PROVIDE: vserver
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable vserver:
+#
+# vserver_enable="YES"
+#
+# Additional commandline qualifiers to be passed to vserver(8) may
+# be specified in /etc/rc.conf by adding:
+#
+# vserver_flags="<your commandline qualifiers here>"
+#
+# See vserver(8) for a detailed description of vserver commandline qualifiers.
+#
+
+. %%RC_SUBR%%
+
+name=vserver
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/vserver
+required_files=%%PREFIX%%/etc/vchat/user.db
+
+# read settings, set default values
+
+load_rc_config "$name"
+: ${vserver_enable="NO"}
+: ${vserver_flags="/SYSLOG"}
+: ${vserver_user="vchat"}
+: ${vserver_group="vchat"}
+: ${vserver_pidfile="%%PREFIX%%/etc/vchat/vserver.pid"}
+
+command_args="/DETACH"
+
+run_rc_command "$1"
diff -ruN vserver.bak/files/vserver.sh.in vserver/files/vserver.sh.in
--- vserver.bak/files/vserver.sh.in Thu Jan 12 15:24:20 2006
+++ vserver/files/vserver.sh.in Thu Jan 1 01:00:00 1970
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: vserver
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable vserver:
-#
-# vserver_enable="YES"
-#
-# See vserver(8) for a detailed description of vserver commandline options.
-#
-
-. %%RC_SUBR%%
-
-name=vserver
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/vserver
-pidfile=%%RUNDIR%%/vserver.pid
-#authfile=%%PREFIX%%/etc/vserver.auth
-authfile=/tmp/vserver.auth
-lastlogfile=%%DBDIR%%/vserver.lastlog
-#required_files=%%PREFIX%%/etc/vserver.auth
-required_files=/tmp/vserver.auth
-command_args="-Z ${authfile} -W ${lastlogfile} -P ${pidfile} -w 20000 -d"
-
-# read settings, set default values
-
-load_rc_config "$name"
-: ${vserver_enable="NO"}
-: ${vserver_flags=""}
-: ${vserver_socket=""}
-
-
-run_rc_command "$1"
--- vserver.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list