ports/164548: [PATCH] sysutils/bacula2-server should use USERS
Chris Rees
crees at FreeBSD.org
Fri Jan 27 19:00:22 UTC 2012
>Number: 164548
>Category: ports
>Synopsis: [PATCH] sysutils/bacula2-server should use USERS
>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 Jan 27 19:00:16 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
USERS code in bsd.port.mk removes need for special user-creation code in pkg-install.
While here, remove unneccessary and incorrect setting of DEFAULT_PGSQL_VER
>How-To-Repeat:
>Fix:
--- patch.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula2-server/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 23 Sep 2011 22:25:22 -0000 1.6
+++ Makefile 27 Jan 2012 18:49:42 -0000
@@ -26,6 +26,9 @@
WRKSRC= ${WRKDIR}/bacula-${DISTVERSION}
+USERS= bacula
+GROUPS= ${USERS}
+
.if !defined(WITH_BAT)
.if !defined(WITH_CLIENT_ONLY)
USE_RC_SUBR?= bacula-dir bacula-sd
@@ -155,7 +158,6 @@
DBTYPE= mysql
SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""
.elif defined(WITH_POSTGRESQL)
-DEFAULT_PGSQL_VER?= 82
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-postgresql=yes
DBTYPE= postgresql
Index: pkg-install.client
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula2-server/pkg-install.client,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.client
--- pkg-install.client 15 Jun 2009 18:17:17 -0000 1.1
+++ pkg-install.client 27 Jan 2012 18:49:42 -0000
@@ -14,30 +14,3 @@
bacula-sd 9103/tcp #Bacula storage daemon
# Bacule port end" >> /etc/services
fi
-
-case $2 in
-PRE-INSTALL)
- # Install UID/GID
- USER=bacula
- GROUP=${USER}
- UID=910
- GID=${UID}
-
- if [ ! -d ${BACULA_DIR} ]; then
- mkdir -p ${BACULA_DIR}
- fi
-
- 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
-
- chgrp -R ${GROUP} ${BACULA_DIR}
- ;;
-esac
Index: pkg-install.server
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula2-server/pkg-install.server,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.server
--- pkg-install.server 15 Jun 2009 18:17:17 -0000 1.1
+++ pkg-install.server 27 Jan 2012 18:49:42 -0000
@@ -14,49 +14,3 @@
bacula-sd 9103/tcp #Bacula storage daemon
# Bacule port end" >> /etc/services
fi
-
-case $2 in
-PRE-INSTALL)
- # Install UID/GID
- USER=bacula
- GROUP=${USER}
- UID=910
- GID=${UID}
-
- if [ ! -d ${BACULA_DIR} ]; then
- mkdir -p ${BACULA_DIR}
- fi
-
- 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."
- if pw usermod ${USER} -d ${BACULA_DIR} -G operator
- then
- echo "Changed home directory of \"${USER}\" to \"${BACULA_DIR}\""
- else
- echo "Changing home directory of \"${USER}\" to \"${BACULA_DIR}\" failed..."
- exit 1
- fi
- else
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -G operator -h - \
- -d ${BACULA_DIR} -s /sbin/nologin -c "Bacula Daemon"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
- fi
- chown -R ${USER}:${GROUP} ${BACULA_DIR}
- ;;
-esac
--- patch.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list