pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc The real user name in PKG_USERS does not need to be es...
details: https://anonhg.NetBSD.org/pkgsrc/rev/083cfb75d6c8
branches: trunk
changeset: 498468:083cfb75d6c8
user: rillig <rillig%pkgsrc.org@localhost>
date: Tue Aug 23 11:48:47 2005 +0000
description:
The real user name in PKG_USERS does not need to be escaped with double
backslashes anymore. A single backslash is enough. Changed the
definition in all affected packages. For those that are not caught, an
additional check is placed into bsd.pkginstall.mk.
diffstat:
audio/icecast/Makefile | 4 +-
chat/bitlbee/Makefile | 4 +-
chat/ircd-hybrid/Makefile | 4 +-
chat/ircu/Makefile | 4 +-
chat/jabberd/Makefile | 4 +-
chat/silc-server/Makefile | 4 +-
comms/fidogate/Makefile | 4 +-
databases/gnats/Makefile | 4 +-
databases/mysql-server/Makefile | 4 +-
databases/mysql4-server/Makefile | 4 +-
databases/postgresql73-server/Makefile | 4 +-
databases/postgresql74-server/Makefile | 4 +-
databases/postgresql80-server/Makefile | 4 +-
devel/distcc/Makefile | 4 +-
devel/monotone-server/Makefile | 4 +-
devel/p4d/Makefile | 4 +-
inputmethod/canna-server/Makefile | 4 +-
inputmethod/ja-freewnn-server-bin/Makefile | 4 +-
mail/clamav/Makefile | 4 +-
mail/dovecot/Makefile | 4 +-
mail/exim/Makefile | 4 +-
mail/exim3/Makefile | 4 +-
mail/gld/Makefile | 4 +-
mail/mailman/Makefile | 4 +-
mail/milter-greylist/Makefile | 4 +-
mail/postfix-current/Makefile | 4 +-
mail/postfix/Makefile | 4 +-
mail/postgrey/Makefile | 4 +-
mail/sendmail/Makefile | 4 +-
mail/sendmail812/Makefile | 4 +-
mail/spamd/Makefile | 4 +-
mail/sympa/Makefile | 4 +-
mail/tmda/Makefile | 4 +-
mk/install/bsd.pkginstall.mk | 42 ++++++++++++++++-------------
net/bind9/Makefile | 4 +-
net/hobbitmon/Makefile | 4 +-
net/howl/Makefile | 4 +-
net/ja-samba/Makefile | 4 +-
net/mldonkey/Makefile | 4 +-
net/netdisco/Makefile | 4 +-
net/netsaint-base/Makefile.common | 6 ++--
net/openntpd/Makefile | 4 +-
net/snort/Makefile.common | 4 +-
net/vsftpd/Makefile | 4 +-
news/inn/Makefile | 4 +-
news/leafnode/Makefile | 4 +-
parallel/sge/Makefile | 4 +-
print/cups/Makefile | 4 +-
security/amavisd-new/Makefile | 4 +-
security/courier-authlib/Makefile.common | 4 +-
security/dirmngr/Makefile | 4 +-
security/openssh+gssapi/Makefile | 4 +-
security/openssh/Makefile | 4 +-
security/pflkm/Makefile | 4 +-
security/sfs/Makefile | 4 +-
sysutils/amanda-common/Makefile | 4 +-
sysutils/dbus/Makefile | 4 +-
sysutils/ups-nut/Makefile | 4 +-
www/apache/Makefile | 4 +-
www/apache2/Makefile | 4 +-
www/privoxy/Makefile | 4 +-
www/squid/Makefile | 4 +-
www/tinyproxy/Makefile | 4 +-
63 files changed, 148 insertions(+), 144 deletions(-)
diffs (truncated from 1275 to 300 lines):
diff -r 36c30c7dfe20 -r 083cfb75d6c8 audio/icecast/Makefile
--- a/audio/icecast/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/audio/icecast/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= icecast-2.2.0
@@ -27,7 +27,7 @@
ICECAST_GROUP?= icecast
PKG_GROUPS= ${ICECAST_GROUP}
-PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}::Icecast2\\ user
+PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}::Icecast2\ user
EGDIR= ${PREFIX}/share/examples/icecast
CONF_FILES= ${EGDIR}/icecast.xml ${PKG_SYSCONFDIR}/icecast.xml
diff -r 36c30c7dfe20 -r 083cfb75d6c8 chat/bitlbee/Makefile
--- a/chat/bitlbee/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/chat/bitlbee/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= bitlbee-0.92
@@ -32,7 +32,7 @@
OWN_DIRS_PERMS= ${STATEDIR} bitlbee nobody 700
-PKG_USERS= bitlbee:nobody::Bitlbee\\ user:${VARBASE}/db/bitlbee
+PKG_USERS= bitlbee:nobody::Bitlbee\ user:${VARBASE}/db/bitlbee
INSTALLATION_DIRS= man/man8 sbin
diff -r 36c30c7dfe20 -r 083cfb75d6c8 chat/ircd-hybrid/Makefile
--- a/chat/ircd-hybrid/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/chat/ircd-hybrid/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:36 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= ircd-hybrid-6.2
@@ -107,7 +107,7 @@
RCD_SCRIPTS= ircd-hybrid
-PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\\ User::${NOLOGIN}
+PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\ User::${NOLOGIN}
PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP}
CONF_FILES= ${PREFIX}/share/examples/ircd-hybrid/opers.txt \
diff -r 36c30c7dfe20 -r 083cfb75d6c8 chat/ircu/Makefile
--- a/chat/ircu/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/chat/ircu/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= ircu2.10.11.07
@@ -43,7 +43,7 @@
MESSAGE_SUBST+= IRCD_USER=${IRCD_USER}
MESSAGE_SUBST+= IRCD_GROUP=${IRCD_GROUP}
PKG_GROUPS= ${IRCD_GROUP}
-PKG_USERS= ${IRCD_USER}:${IRCD_GROUP}::IRC\\ server\\ user:/nonexistant:${SH}
+PKG_USERS= ${IRCD_USER}:${IRCD_GROUP}::IRC\ server\ user:/nonexistant:${SH}
SUBST_CLASSES= paths
SUBST_STAGE.paths= post-patch
diff -r 36c30c7dfe20 -r 083cfb75d6c8 chat/jabberd/Makefile
--- a/chat/jabberd/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/chat/jabberd/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= jabber-1.4.2
@@ -39,7 +39,7 @@
JABBERD_PIDDIR
PKG_GROUPS= ${JABBERD_GROUP}
-PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\\ user
+PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\ user
FILES_SUBST+= JABBERD_USER="${JABBERD_USER}"
FILES_SUBST+= JABBERD_GROUP="${JABBERD_GROUP}"
diff -r 36c30c7dfe20 -r 083cfb75d6c8 chat/silc-server/Makefile
--- a/chat/silc-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/chat/silc-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/19 01:22:17 salo Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= silc-server-1.0
@@ -26,7 +26,7 @@
SILCD_USER?= silcd
SILCD_GROUP?= silcd
PKG_GROUPS= ${SILCD_GROUP}
-PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\\ Server\\ user
+PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\ Server\ user
PKG_SYSCONFSUBDIR?= ${PKGBASE}
diff -r 36c30c7dfe20 -r 083cfb75d6c8 comms/fidogate/Makefile
--- a/comms/fidogate/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/comms/fidogate/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/08/17 11:43:27 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= fidogate-4.4.10
@@ -21,7 +21,7 @@
CONF_FILES= ${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
RCD_SCRIPTS= fidogate
-PKG_USERS= news:news::Network\\ News:/var/spool/news:${NOLOGIN}
+PKG_USERS= news:news::Network\ News:/var/spool/news:${NOLOGIN}
PKG_GROUPS= news
post-extract:
diff -r 36c30c7dfe20 -r 083cfb75d6c8 databases/gnats/Makefile
--- a/databases/gnats/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/databases/gnats/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= gnats-4.0.1
@@ -23,7 +23,7 @@
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
GNATS_HOME= ${PREFIX}/share/gnats/gnats-db
-PKG_USERS= gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:${SH}
+PKG_USERS= gnats:daemon::GNATS\ database\ owner:${GNATS_HOME}:${SH}
REQD_DIRS= ${PREFIX}/share/gnats
REQD_DIRS+= ${PREFIX}/libexec/gnats
diff -r 36c30c7dfe20 -r 083cfb75d6c8 databases/mysql-server/Makefile
--- a/databases/mysql-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/databases/mysql-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.65 2005/08/23 11:48:47 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs
@@ -21,7 +21,7 @@
USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
diff -r 36c30c7dfe20 -r 083cfb75d6c8 databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/databases/mysql4-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/29 21:02:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/23 11:48:47 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
#PKGREVISION= 1
@@ -22,7 +22,7 @@
USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
diff -r 36c30c7dfe20 -r 083cfb75d6c8 databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/databases/postgresql73-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $
PKGNAME= postgresql73-server-${BASE_VERS}
PKGREVISION= # empty
@@ -47,7 +47,7 @@
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS= PGUSER PGGROUP PGHOME
-PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
diff -r 36c30c7dfe20 -r 083cfb75d6c8 databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/databases/postgresql74-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/23 11:48:47 rillig Exp $
PKGNAME= postgresql74-server-${BASE_VERS}
PKGREVISION= # empty
@@ -47,7 +47,7 @@
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS= PGUSER PGGROUP PGHOME
-PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
diff -r 36c30c7dfe20 -r 083cfb75d6c8 databases/postgresql80-server/Makefile
--- a/databases/postgresql80-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/databases/postgresql80-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/08 23:09:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:47 rillig Exp $
PKGNAME= postgresql80-server-${BASE_VERS}
PKGREVISION= 2
@@ -62,7 +62,7 @@
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS+= PGUSER PGGROUP PGHOME
-PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
diff -r 36c30c7dfe20 -r 083cfb75d6c8 devel/distcc/Makefile
--- a/devel/distcc/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/devel/distcc/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/13 15:30:23 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/23 11:48:47 rillig Exp $
DISTNAME= distcc-2.18.3
CATEGORIES= devel
@@ -21,7 +21,7 @@
DISTCC_USER?= distcc
DISTCC_GROUP?= distcc
PKG_GROUPS= ${DISTCC_GROUP}
-PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\\ user
+PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\ user
DISTCC_PIDDIR?= ${VARBASE}/run/distccd
OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750
diff -r 36c30c7dfe20 -r 083cfb75d6c8 devel/monotone-server/Makefile
--- a/devel/monotone-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/devel/monotone-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/13 11:19:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= monotone-server-0.22
@@ -33,7 +33,7 @@
${PKG_SYSCONFDIR}/hooks.conf \
${MONOTONE_USER} ${MONOTONE_GROUP} 600
-PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}::Monotone\\ dedicated\\ server:${VARBASE}/monotone:${SH}
+PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}::Monotone\ dedicated\ server:${VARBASE}/monotone:${SH}
PKG_GROUPS= ${MONOTONE_GROUP}
SUBST_CLASSES+= vars
diff -r 36c30c7dfe20 -r 083cfb75d6c8 devel/p4d/Makefile
--- a/devel/p4d/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/devel/p4d/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= p4d
@@ -19,7 +19,7 @@
FILES_SUBST+= P4JOURNAL=${P4JOURNAL:Q}
PKG_GROUPS?= ${P4GROUP}
-PKG_USERS?= ${P4USER}:${P4GROUP}::Perforce\\ Server:${P4ROOT}
+PKG_USERS?= ${P4USER}:${P4GROUP}::Perforce\ Server:${P4ROOT}
OWN_DIRS_PERMS= ${P4ROOT} ${P4USER} ${P4GROUP} 750
diff -r 36c30c7dfe20 -r 083cfb75d6c8 inputmethod/canna-server/Makefile
--- a/inputmethod/canna-server/Makefile Tue Aug 23 10:29:38 2005 +0000
+++ b/inputmethod/canna-server/Makefile Tue Aug 23 11:48:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:47 rillig Exp $
#
.include "../canna/Makefile.common"
@@ -18,7 +18,7 @@
MESSAGE_SUBST+= CANNA_GROUP="${CANNA_GROUP}"
Home |
Main Index |
Thread Index |
Old Index