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

5 files changed, 56 insertions, 0 deletions

diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index 70baca1b8fa3..6f0b82b67b7b 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -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}
diff --git a/net/neubot/files/patch-M-Lab_install.sh b/net/neubot/files/patch-M-Lab_install.sh
new file mode 100644
index 000000000000..2493bc799245
--- /dev/null
+++ b/net/neubot/files/patch-M-Lab_install.sh
@@ -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
diff --git a/net/neubot/files/patch-Makefile b/net/neubot/files/patch-Makefile
new file mode 100644
index 000000000000..dffe18f521a6
--- /dev/null
+++ b/net/neubot/files/patch-Makefile
@@ -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 \
diff --git a/net/neubot/files/patch-MasterSrv_install.sh b/net/neubot/files/patch-MasterSrv_install.sh
new file mode 100644
index 000000000000..8a1aa8de7a01
--- /dev/null
+++ b/net/neubot/files/patch-MasterSrv_install.sh
@@ -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
diff --git a/net/neubot/files/patch-neubot_system_posix.py b/net/neubot/files/patch-neubot_system_posix.py
new file mode 100644
index 000000000000..aa3e808fd6e3
--- /dev/null
+++ b/net/neubot/files/patch-neubot_system_posix.py
@@ -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