sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert custom user: it's optional complexity, and this could cause

Browse source 
problems if the port is build as root.

Submitted by:	Simone Basso (author)
Feature safe:	yes
This commit is contained in:
Thierry Thomas 2012-10-18 15:07:51 +00:00
parent 62fdcb8e05
commit 1552157f71
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=306074
5 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/neubot/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= neubot PORTNAME= neubot
PORTVERSION= 0.4.15.5 PORTVERSION= 0.4.15.5
PORTREVISION= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= http://releases.neubot.org/_packages/ MASTER_SITES= http://releases.neubot.org/_packages/
@ -36,6 +37,7 @@ PLIST_SUB+= STATEDIR=${STATEDIR}
PKGMESSAGE= ${WRKDIR}/pkg_message PKGMESSAGE= ${WRKDIR}/pkg_message
post-install: post-install:
${RM} ${DATADIR}/system_posix.py.orig
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}

7
net/neubot/files/patch-M-Lab_install.sh Normal file
View file

@ -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

20
net/neubot/files/patch-Makefile Normal file
View file

@ -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 \

10
net/neubot/files/patch-MasterSrv_install.sh Normal file
View file

@ -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

17
net/neubot/files/patch-neubot_system_posix.py Normal file
View file

@ -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