From 69dfb23ab86f24c20b20627b9f58e8aca48f4010 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Mon, 2 Sep 2019 20:07:42 +0000 Subject: [PATCH] net/fspd: update to 2.8.1.28 PR: 239910 Submitted by: Radim Kolar (maintainer) --- net/fspd/Makefile | 27 +++++++++++++------------- net/fspd/distinfo | 5 +++-- net/fspd/files/patch-bsd_src-print.c | 14 ------------- net/fspd/files/patch-contrib_fspscan.c | 20 ------------------- 4 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 net/fspd/files/patch-bsd_src-print.c delete mode 100644 net/fspd/files/patch-contrib_fspscan.c diff --git a/net/fspd/Makefile b/net/fspd/Makefile index 02f8711014ae..f581b08b9a21 100644 --- a/net/fspd/Makefile +++ b/net/fspd/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= fspd -PORTVERSION= 2.8.1.26 +PORTVERSION= 2.8.1.28 CATEGORIES= net -MASTER_SITES= SF/fsp/fsp/2.8.1b26 -DISTNAME= fsp-2.8.1b26 +MASTER_SITES= SF/fsp/fsp/2.8.1b28 +DISTNAME= fsp-2.8.1b28 MAINTAINER= hsn@sendmail.cz COMMENT= FSP daemon, clients, and scanner @@ -13,22 +13,23 @@ COMMENT= FSP daemon, clients, and scanner LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -CLIENTS= fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \ - flscmd fmkdir fprocmd fput frmcmd frmdircmd fver fspmerge \ - fstatcmd fmvcmd fbye fsetupcmd -FSPDOCS= BETA.README COPYRIGHT ChangeLog FILES INFO INSTALL MACHINES \ - TODO PROTOCOL HISTORY faq.html +USES= scons tar:bzip2 + +CLIENTS= fbye fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \ + flscmd fmkdir fmvcmd fprocmd fput frmcmd frmdircmd fsetupcmd \ + fspmerge fstatcmd fver +FSPDOCS= BETA.README ChangeLog COPYRIGHT faq.html FILES HISTORY INFO \ + INSTALL MACHINES PROTOCOL TODO MAN1CLIENT= fcatcmd.1 fcdcmd.1 fducmd.1 ffindcmd.1 fgetcmd.1 fgrabcmd.1 \ - fhostcmd.1 flscmd.1 fmkdir.1 fprocmd.1 fput.1 frmcmd.1 \ - frmdircmd.1 fver.1 fstatcmd.1 fmvcmd.1 fsetupcmd.1 -MAN1SERVER= fspscan.1 fspd.1 + fhostcmd.1 flscmd.1 fmkdir.1 fmvcmd.1 fprocmd.1 fput.1 frmcmd.1 \ + frmdircmd.1 fsetupcmd.1 fstatcmd.1 fver.1 +MAN1SERVER= fspd.1 fspscan.1 MAN5CLIENT= fsp_prof.5 fspsites.5 MAN7CLIENT= fsp_env.7 -USES= scons tar:bzip2 WRKSRC= ${WRKDIR}/${DISTNAME} -OPTIONS_DEFINE= CLIENTS INFINITE DOCS +OPTIONS_DEFINE= CLIENTS DOCS INFINITE CLIENTS_DESC= Install client commands INFINITE_DESC= Infinite retry in client commands diff --git a/net/fspd/distinfo b/net/fspd/distinfo index 20f4531bbe1c..e5b36985cced 100644 --- a/net/fspd/distinfo +++ b/net/fspd/distinfo @@ -1,2 +1,3 @@ -SHA256 (fsp-2.8.1b26.tar.bz2) = b3196931502e375e5389cf6a0fc2d0610d3f83433c9e390bd4615e284aad2fdd -SIZE (fsp-2.8.1b26.tar.bz2) = 151814 +TIMESTAMP = 1565961262 +SHA256 (fsp-2.8.1b28.tar.bz2) = 55c9dbf87475d56faf5346918778ad1f219d47162448e4615f070a3f46212874 +SIZE (fsp-2.8.1b28.tar.bz2) = 153337 diff --git a/net/fspd/files/patch-bsd_src-print.c b/net/fspd/files/patch-bsd_src-print.c deleted file mode 100644 index 7ef9eb2e710b..000000000000 --- a/net/fspd/files/patch-bsd_src-print.c +++ /dev/null @@ -1,14 +0,0 @@ ---- bsd_src/print.c.orig 2009-10-01 13:46:36.000000000 -0700 -+++ bsd_src/print.c 2011-12-06 13:05:42.177765575 -0800 -@@ -32,7 +32,11 @@ - #include - #include - #include -+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 -+#include -+#else - #include -+#endif - #ifdef TIME_WITH_SYS_TIME - # include - # include diff --git a/net/fspd/files/patch-contrib_fspscan.c b/net/fspd/files/patch-contrib_fspscan.c deleted file mode 100644 index 4cb01861ebc2..000000000000 --- a/net/fspd/files/patch-contrib_fspscan.c +++ /dev/null @@ -1,20 +0,0 @@ ---- contrib/fspscan.c.orig 2009-10-01 20:46:36 UTC -+++ contrib/fspscan.c -@@ -72,7 +72,7 @@ static void printhelp(int argc,char **ar - exit(0); - } - --static void fdclose(void) -+static void myfdclose(void) - { - close(myfd); - } -@@ -150,7 +150,7 @@ int main(int argc,char **argv) - else - fprintf(logfile,"%0d...nada\n",remoteport); - fflush(logfile); -- fdclose(); -+ myfdclose(); - } - return 0; - }