cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch a problem with nfsen's install.pl that was introduced in the 1.3.7

Browse Source 
update reported by mlnospam at yahoo.com

Garbage-collect pkg/MESSAGE while there. Most of the contents are already
in pkg/README and I've merged the other bit.
This commit is contained in:
sthen 2016-04-11 08:51:28 +00:00
parent 4241732fd6
commit 04f4a4a66e
5 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/nfsen/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2015/10/05 12:59:12 kirby Exp $
# $OpenBSD: Makefile,v 1.35 2016/04/11 08:51:28 sthen Exp $
COMMENT= web-based front end for the nfdump netflow tools
V= 1.3.7
REVISION= 4
REVISION= 5
DISTNAME= nfsen-$V
CATEGORIES= net www
HOMEPAGE= http://nfsen.sourceforge.net/

13
net/nfsen/patches/patch-install_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-install_pl,v 1.7 2015/01/09 18:04:19 sthen Exp $
$OpenBSD: patch-install_pl,v 1.8 2016/04/11 08:51:28 sthen Exp $
--- install.pl.orig Mon Jun 23 20:27:50 2014
+++ install.pl Fri Jan 9 17:16:58 2015
+++ install.pl Mon Apr 11 09:23:26 2016
@@ -165,14 +165,14 @@ sub VerifyUser {
if ( !defined $gid_name ) {
die "Group '$user_gid' not found on this system\n";
@ -22,6 +22,15 @@ $OpenBSD: patch-install_pl,v 1.7 2015/01/09 18:04:19 sthen Exp $
} # End of VerifyUser
@@ -553,7 +553,7 @@ sub UpgradeProfiles {
if( ! -f "$NfConf::PROFILEDATADIR/$profilepath/$channel/.nfstat") {
# no shadow profile, but missing channel stat
print "Rebuilding profile stats for '$profilegroup/$profilename'\n";
- NfProfile::DoRebuild(\%profileinfo, $profilename, $profilegroup, $profilepath, 1, 0);
+ NfProfile::DoRebuild("", \%profileinfo, $profilename, $profilegroup, $profilepath, 1, 0);
NfProfile::WriteProfile(\%profileinfo);
}
# make sure it's own by nfsen_uid after the rebuild
@@ -584,7 +584,6 @@ sub CopyAllFiles {
$CopyRecursive::UID = 0;
$CopyRecursive::GID = $www_gid;

12
net/nfsen/patches/patch-libexec_NfProfile_pm Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libexec_NfProfile_pm,v 1.1 2016/04/11 08:51:28 sthen Exp $
--- libexec/NfProfile.pm.orig Mon Apr 11 09:24:34 2016
+++ libexec/NfProfile.pm Mon Apr 11 09:26:04 2016
@@ -1343,7 +1343,7 @@ sub DoRebuild {
$completed = 100;
}
if ( ($counter % $modulo ) == 0 ) {
- print $socket ".info Rebuilding Profile '$profile': Completed: $completed\%\n";
+ print $socket ".info Rebuilding Profile '$profile': Completed: $completed\%\n" if $socket;
syslog('info', "Rebuilding Profile '$profile': Completed: $completed\%");
}

6
net/nfsen/pkg/MESSAGE
View File

@ -1,6 +0,0 @@
Note: the _nfcapd user has been added to group www.
To proceed with an installation or upgrade, adjust ${SYSCONFDIR}/nfsen.conf
as required and run the configuration tool:
# install-nfsen.pl ${SYSCONFDIR}/nfsen.conf

4
net/nfsen/pkg/README
View File

@ -1,9 +1,11 @@
$OpenBSD: README,v 1.4 2015/10/05 12:59:12 kirby Exp $
$OpenBSD: README,v 1.5 2016/04/11 08:51:28 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
Note: the _nfcapd user has been added to group "www".
Basic installation
==================
To proceed with an installation or upgrade, adjust ${SYSCONFDIR}/nfsen.conf