Date: Thu, 18 Oct 2012 15:07:51 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306074 - in head/net/neubot: . files Message-ID: <201210181507.q9IF7pgh063083@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Thu Oct 18 15:07:51 2012 New Revision: 306074 URL: http://svn.freebsd.org/changeset/ports/306074 Log: Revert custom user: it's optional complexity, and this could cause problems if the port is build as root. Submitted by: Simone Basso (author) Feature safe: yes Added: head/net/neubot/files/patch-M-Lab_install.sh (contents, props changed) head/net/neubot/files/patch-Makefile (contents, props changed) head/net/neubot/files/patch-MasterSrv_install.sh (contents, props changed) head/net/neubot/files/patch-neubot_system_posix.py (contents, props changed) Modified: head/net/neubot/Makefile Modified: head/net/neubot/Makefile ============================================================================== --- head/net/neubot/Makefile Thu Oct 18 14:55:08 2012 (r306073) +++ head/net/neubot/Makefile Thu Oct 18 15:07:51 2012 (r306074) @@ -3,6 +3,7 @@ PORTNAME= neubot PORTVERSION= 0.4.15.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://releases.neubot.org/_packages/ @@ -36,6 +37,7 @@ PLIST_SUB+= STATEDIR=${STATEDIR} PKGMESSAGE= ${WRKDIR}/pkg_message post-install: + ${RM} ${DATADIR}/system_posix.py.orig .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} Added: head/net/neubot/files/patch-M-Lab_install.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/neubot/files/patch-M-Lab_install.sh Thu Oct 18 15:07:51 2012 (r306074) @@ -0,0 +1,7 @@ +--- M-Lab/install.sh 2012-10-18 15:47:46.000000000 +0200 ++++ M-Lab/install.sh.orig 2012-10-10 23:19:06.000000000 +0200 +@@ -34,3 +34,4 @@ + $DEBUG grep -q ^_neubot /etc/group || $DEBUG /usr/sbin/groupadd -r _neubot + $DEBUG grep -q ^_neubot /etc/passwd || \ + $DEBUG /usr/sbin/useradd -r -d/ -g_neubot -s/sbin/nologin _neubot ++$DEBUG sed -i 's/@USER@/_neubot/g' $HOME/neubot/neubot/system_posix.py Added: head/net/neubot/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/neubot/files/patch-Makefile Thu Oct 18 15:07:51 2012 (r306074) @@ -0,0 +1,20 @@ +--- Makefile.orig 2012-10-10 23:19:06.000000000 +0200 ++++ Makefile 2012-10-18 16:04:49.000000000 +0200 +@@ -143,7 +143,6 @@ + LOCALSTATEDIR ?= $(PREFIX)/var + MANDIR ?= $(PREFIX)/share/man + SYSCONFDIR ?= $(PREFIX)/etc +-USER ?= '_neubot' + + _install: + find . -type f -name .DS_Store -exec rm {} \; +@@ -191,8 +190,7 @@ + $(INSTALL) -d $(DESTDIR)$(LOCALSTATEDIR)/neubot + for PATTERN in 's|@BINDIR@|$(BINDIR)|g' 's|@DATADIR@|$(DATADIR)|g' \ + 's|@LOCALSTATEDIR@|$(LOCALSTATEDIR)|g' \ +- 's|@SYSCONFDIR@|$(SYSCONFDIR)|g' \ +- 's|@USER@|$(USER)|g'; do \ ++ 's|@SYSCONFDIR@|$(SYSCONFDIR)|g'; do \ + ./scripts/sed_inplace $$PATTERN \ + $(DESTDIR)$(BINDIR)/neubot \ + $(DESTDIR)$(DATADIR)/applications/neubot.desktop \ Added: head/net/neubot/files/patch-MasterSrv_install.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/neubot/files/patch-MasterSrv_install.sh Thu Oct 18 15:07:51 2012 (r306074) @@ -0,0 +1,10 @@ +--- MasterSrv/install.sh.orig 2012-10-10 23:19:06.000000000 +0200 ++++ MasterSrv/install.sh 2012-10-18 15:53:05.000000000 +0200 +@@ -42,7 +42,6 @@ + $DEBUG /bin/grep -q ^_neubot /etc/group || $DEBUG /usr/sbin/groupadd -r _neubot + $DEBUG /bin/grep -q ^_neubot /etc/passwd || \ + $DEBUG /usr/sbin/useradd -r -d/ -g_neubot -s/sbin/nologin _neubot +-$DEBUG sed -i 's/@USER@/_neubot/g' /home/simone/neubot/neubot/system_posix.py + $DEBUG $INSTALL -d /var/lib/neubot + + $DEBUG $INSTALL -d /usr/local/share/GeoIP Added: head/net/neubot/files/patch-neubot_system_posix.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/neubot/files/patch-neubot_system_posix.py Thu Oct 18 15:07:51 2012 (r306074) @@ -0,0 +1,17 @@ +--- neubot/system_posix.py.orig 2012-10-10 23:19:06.000000000 +0200 ++++ neubot/system_posix.py 2012-10-18 16:53:57.000000000 +0200 +@@ -32,13 +32,7 @@ + # the latter can. + # + +-# +-# By default use `nobody`, so it's possible to develop Neubot on UNIX systems +-# where the `_neubot` user does not exist. +-# +-USER = '@USER@' +-if USER.startswith('@'): +- USER='nobody' ++USER = '_neubot' + + import pwd + import os.path
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210181507.q9IF7pgh063083>