From 48067f4372ccaa1f82f5427b92f8be569490e4e1 Mon Sep 17 00:00:00 2001 From: thierry Date: Tue, 20 Nov 2012 21:16:46 +0000 Subject: Upgrade to Neubot 0.4.15.6. Changelog at . Feature safe: yes --- net/neubot/Makefile | 4 +--- net/neubot/distinfo | 4 ++-- net/neubot/files/patch-M-Lab_install.sh | 7 ------- net/neubot/files/patch-Makefile | 20 -------------------- net/neubot/files/patch-MasterSrv_install.sh | 10 ---------- net/neubot/files/patch-neubot_system_posix.py | 17 ----------------- net/neubot/pkg-plist | 4 ++++ 7 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 net/neubot/files/patch-M-Lab_install.sh delete mode 100644 net/neubot/files/patch-Makefile delete mode 100644 net/neubot/files/patch-MasterSrv_install.sh delete mode 100644 net/neubot/files/patch-neubot_system_posix.py (limited to 'net') diff --git a/net/neubot/Makefile b/net/neubot/Makefile index 6f0b82b67b7b..ac9d2fc3a92a 100644 --- a/net/neubot/Makefile +++ b/net/neubot/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= neubot -PORTVERSION= 0.4.15.5 -PORTREVISION= 1 +PORTVERSION= 0.4.15.6 CATEGORIES= net MASTER_SITES= http://releases.neubot.org/_packages/ @@ -37,7 +36,6 @@ 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/distinfo b/net/neubot/distinfo index 4f40b073feb2..ae392d4c1bb9 100644 --- a/net/neubot/distinfo +++ b/net/neubot/distinfo @@ -1,2 +1,2 @@ -SHA256 (neubot-0.4.15.5.tar.gz) = eba20c4fc654afc08c4372bb80fc97e22dffb56011cfa088a4db82f32ce5459e -SIZE (neubot-0.4.15.5.tar.gz) = 856586 +SHA256 (neubot-0.4.15.6.tar.gz) = cb564c5942e0fa2f3c4bc0b57131ca3d04063d8a9c109f0d7242b6fc653014d8 +SIZE (neubot-0.4.15.6.tar.gz) = 859132 diff --git a/net/neubot/files/patch-M-Lab_install.sh b/net/neubot/files/patch-M-Lab_install.sh deleted file mode 100644 index 2493bc799245..000000000000 --- a/net/neubot/files/patch-M-Lab_install.sh +++ /dev/null @@ -1,7 +0,0 @@ ---- 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 deleted file mode 100644 index dffe18f521a6..000000000000 --- a/net/neubot/files/patch-Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 8a1aa8de7a01..000000000000 --- a/net/neubot/files/patch-MasterSrv_install.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index aa3e808fd6e3..000000000000 --- a/net/neubot/files/patch-neubot_system_posix.py +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 diff --git a/net/neubot/pkg-plist b/net/neubot/pkg-plist index c35465ddec48..a358694428e6 100644 --- a/net/neubot/pkg-plist +++ b/net/neubot/pkg-plist @@ -176,12 +176,16 @@ share/icons/hicolor/scalable/apps/neubot.svg %%DATADIR%%/notifier_browser.pyc %%DATADIR%%/notify.py %%DATADIR%%/notify.pyc +%%DATADIR%%/percentile.py +%%DATADIR%%/percentile.pyc %%DATADIR%%/pollable.py %%DATADIR%%/pollable.pyc %%DATADIR%%/poller.py %%DATADIR%%/poller.pyc %%DATADIR%%/privacy.py %%DATADIR%%/privacy.pyc +%%DATADIR%%/raw_analyze.py +%%DATADIR%%/raw_analyze.pyc %%DATADIR%%/raw.py %%DATADIR%%/raw.pyc %%DATADIR%%/raw_clnt.py -- cgit