pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2005Q2]: pkgsrc Pullup ticket 594 - requested by grant beattie



details:   https://anonhg.NetBSD.org/pkgsrc/rev/88b9b328fb92
branches:  pkgsrc-2005Q2
changeset: 495898:88b9b328fb92
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Jul 22 16:42:27 2005 +0000

description:
Pullup ticket 594 - requested by grant beattie
kill some hardcoded instances of /sbin/nologin

Revisions pulled up:
- pkgsrc/mail/exim/Makefile             1.58
- pkgsrc/mail/exim3/Makefile            1.20
- pkgsrc/chat/ircd-hybrid/Makefile      1.17
- pkgsrc/net/openntpd/Makefile          1.13
- pkgsrc/security/pflkm/Makefile        1.9
- pkgsrc/sysutils/dbus/Makefile         1.5

    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Tue Jul 12 04:07:41 UTC 2005

    Modified Files:
            pkgsrc/mail/exim: Makefile
            pkgsrc/mail/exim3: Makefile

    Log Message:
    use ${NOLOGIN}, not hardcoded /sbin/nologin. fixes install on Solaris
    and others.
----
    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Tue Jul 12 04:15:50 UTC 2005

    Modified Files:
            pkgsrc/chat/ircd-hybrid: Makefile
            pkgsrc/net/openntpd: Makefile
            pkgsrc/security/pflkm: Makefile
            pkgsrc/sysutils/dbus: Makefile

    Log Message:
    use ${NOLOGIN}, not hardcoded /sbin/nologin.

diffstat:

 chat/ircd-hybrid/Makefile |  4 ++--
 mail/exim/Makefile        |  4 ++--
 mail/exim3/Makefile       |  4 ++--
 net/openntpd/Makefile     |  4 ++--
 security/pflkm/Makefile   |  4 ++--
 sysutils/dbus/Makefile    |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diffs (105 lines):

diff -r 30367fb47afb -r 88b9b328fb92 chat/ircd-hybrid/Makefile
--- a/chat/ircd-hybrid/Makefile Fri Jul 22 16:23:16 2005 +0000
+++ b/chat/ircd-hybrid/Makefile Fri Jul 22 16:42:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2005/07/22 16:42:27 snj 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::/sbin/nologin
+PKG_USERS=             ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\\ User::${NOLOGIN}
 PKG_GROUPS=            ${IRCD_HYBRID_IRC_GROUP}
 
 SUPPORT_FILES=         ${PREFIX}/share/examples/ircd-hybrid/opers.txt \
diff -r 30367fb47afb -r 88b9b328fb92 mail/exim/Makefile
--- a/mail/exim/Makefile        Fri Jul 22 16:23:16 2005 +0000
+++ b/mail/exim/Makefile        Fri Jul 22 16:42:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/05/17 17:06:11 abs Exp $
+# $NetBSD: Makefile,v 1.57.2.1 2005/07/22 16:42:27 snj Exp $
 
 DISTNAME=      exim-4.51
 CATEGORIES=    mail net
@@ -23,7 +23,7 @@
 BUILD_DEFS=    EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON
 
 PKG_GROUPS=    ${EXIM_GROUP}
-PKG_USERS=     ${EXIM_USER}:${EXIM_GROUP}::Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
+PKG_USERS=     ${EXIM_USER}:${EXIM_GROUP}::Exim\\ mail\\ server\\ user:/var/mail:${NOLOGIN}
 
 PKG_SYSCONFSUBDIR?=    exim
 EXAMPLESDIR=           ${PREFIX}/share/examples/exim
diff -r 30367fb47afb -r 88b9b328fb92 mail/exim3/Makefile
--- a/mail/exim3/Makefile       Fri Jul 22 16:23:16 2005 +0000
+++ b/mail/exim3/Makefile       Fri Jul 22 16:42:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/15 04:26:24 jlam Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2005/07/22 16:42:27 snj Exp $
 
 DISTNAME=      exim-3.36
 PKGREVISION=   4
@@ -30,7 +30,7 @@
 OWN_DIRS_PERMS=                /var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 OWN_DIRS_PERMS+=       /var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 
-PKG_USERS=             ${EXIM_USER}:${EXIM_GROUP}:8:Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
+PKG_USERS=             ${EXIM_USER}:${EXIM_GROUP}:8:Exim\\ mail\\ server\\ user:/var/mail:${NOLOGIN}
 PKG_GROUPS=            ${EXIM_GROUP}
 
 .include "../../mk/bsd.prefs.mk"
diff -r 30367fb47afb -r 88b9b328fb92 net/openntpd/Makefile
--- a/net/openntpd/Makefile     Fri Jul 22 16:23:16 2005 +0000
+++ b/net/openntpd/Makefile     Fri Jul 22 16:42:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2005/07/22 16:42:27 snj Exp $
 
 DISTNAME=              openntpd-3.6.1p1
 CATEGORIES=            net
@@ -23,7 +23,7 @@
 CONF_FILES=            ${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf
 
 RCD_SCRIPTS=           openntpd
-PKG_USERS=             _ntp:nogroup::ntpd\\ pseudo-user:${VARBASE}/chroot/ntpd:/sbin/nologin
+PKG_USERS=             _ntp:nogroup::ntpd\\ pseudo-user:${VARBASE}/chroot/ntpd:${NOLOGIN}
 
 OWN_DIRS=              ${VARBASE}/chroot/ntpd
 INSTALLATION_DIRS=     man/man5 man/man8 sbin
diff -r 30367fb47afb -r 88b9b328fb92 security/pflkm/Makefile
--- a/security/pflkm/Makefile   Fri Jul 22 16:23:16 2005 +0000
+++ b/security/pflkm/Makefile   Fri Jul 22 16:42:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:18:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2005/07/22 16:42:27 snj Exp $
 
 DISTNAME=              pflkm-20050511
 CATEGORIES=            security
@@ -13,7 +13,7 @@
 USE_PKGINSTALL=                yes
 NO_CONFIGURE=          yes
 
-PKG_USERS=             _pflogd:nogroup::pflogd\\ pseudo-user:${VARBASE}/chroot/pflogd:/sbin/nologin
+PKG_USERS=             _pflogd:nogroup::pflogd\\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLOGIN}
 
 RCD_SCRIPTS=           pf pflogd
 PKG_SYSCONFSUBDIR=     pf
diff -r 30367fb47afb -r 88b9b328fb92 sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Fri Jul 22 16:23:16 2005 +0000
+++ b/sysutils/dbus/Makefile    Fri Jul 22 16:42:27 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/03/22 10:55:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2005/07/22 16:42:27 snj Exp $
 #
 
 .include "Makefile.common"
 
-PKG_USERS=     messagebus:messagebus::System\\ message\\ bus:${VARBASE}/run/dbus:/sbin/nologin
+PKG_USERS=     messagebus:messagebus::System\\ message\\ bus:${VARBASE}/run/dbus:${NOLOGIN}
 PKG_GROUPS=    messagebus
 
 MAKE_DIRS=     ${PKG_SYSCONFDIR}/event.d



Home | Main Index | Thread Index | Old Index