CVS commit: pkgsrc/net/ucspi-tcp6

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct  7 12:55:16 UTC 2018

Modified Files:
        pkgsrc/net/ucspi-tcp6: Makefile distinfo
        pkgsrc/net/ucspi-tcp6/patches: patch-package_man
Added Files:
        pkgsrc/net/ucspi-tcp6/patches: patch-src_rblsmtpd.c
Removed Files:
        pkgsrc/net/ucspi-tcp6/patches: patch-src_Makefile

Log Message:
Update to 1.10. From the changelog:

- complete new build upon fehQlibs.
- tcprules delimiter can be customized via #define DELIMITER in tcprules.c.
- Removed options '-4' and '-6' for shell scripts and fixed bugs.
- Native handling of IPv4 and IPv6 addresses for tcpclient.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ucspi-tcp6/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ucspi-tcp6/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ucspi-tcp6/patches/patch-package_man
cvs rdiff -u -r1.1 -r0 pkgsrc/net/ucspi-tcp6/patches/patch-src_Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-tcp6/patches/patch-src_rblsmtpd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ucspi-tcp6/Makefile
diff -u pkgsrc/net/ucspi-tcp6/Makefile:1.4 pkgsrc/net/ucspi-tcp6/Makefile:1.5
--- pkgsrc/net/ucspi-tcp6/Makefile:1.4  Wed Aug 15 17:49:22 2018
+++ pkgsrc/net/ucspi-tcp6/Makefile      Sun Oct  7 12:55:16 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/08/15 17:49:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2018/10/07 12:55:16 schmonz Exp $
 
-DISTNAME=              ucspi-tcp6-1.06
-PKGREVISION=           1
+DISTNAME=              ucspi-tcp6-1.10
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/ucspi-tcp6/
 EXTRACT_SUFX=          .tgz
@@ -18,6 +17,9 @@ DJB_SLASHPACKAGE=     yes
 DJB_RESTRICTED=                no
 DJB_CONFIG_DIR=                ${WRKSRC}
 
+CFLAGS+=               -I${PREFIX}/include/qlibs
+LDFLAGS+=              -L${PREFIX}/lib/qlibs
+
 INSTALLATION_DIRS=     bin
 
 .include "../../mk/bsd.prefs.mk"
@@ -47,5 +49,6 @@ do-install:
        done;                                                           \
        ./package/man
 
+.include "../../net/fehqlibs/buildlink3.mk"
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ucspi-tcp6/distinfo
diff -u pkgsrc/net/ucspi-tcp6/distinfo:1.3 pkgsrc/net/ucspi-tcp6/distinfo:1.4
--- pkgsrc/net/ucspi-tcp6/distinfo:1.3  Wed Aug 15 17:49:22 2018
+++ pkgsrc/net/ucspi-tcp6/distinfo      Sun Oct  7 12:55:16 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2018/08/15 17:49:22 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2018/10/07 12:55:16 schmonz Exp $
 
-SHA1 (ucspi-tcp6-1.06.tgz) = bc304397b213e4bf793c28b1a79f5d14c61ca833
-RMD160 (ucspi-tcp6-1.06.tgz) = a954234a9ff35c98d6895da09bcfb1d7bb03477b
-SHA512 (ucspi-tcp6-1.06.tgz) = f27c363cce93e9e0ddc06cb84330e7535d883366e211375ba945f870599833d60cefc979f862b594626cb0a3e34ff5c256e26e337588506df599b795dc924e44
-Size (ucspi-tcp6-1.06.tgz) = 81920 bytes
-SHA1 (patch-package_man) = 3fe66e854b7d469aa04cf0ed48625be03eb56647
-SHA1 (patch-src_Makefile) = f8b190130e8c629116e02f551afdcec4a24389ff
+SHA1 (ucspi-tcp6-1.10.tgz) = 21afc2866554a4cdaba2e84200daa7e2bcd81765
+RMD160 (ucspi-tcp6-1.10.tgz) = 454aa3774e20de4ff2477905484749e227f22d14
+SHA512 (ucspi-tcp6-1.10.tgz) = b879ad014ff97de9726a8f07fdd6c5f1da86aff410d91c86db75de283c1f8d748ac3b83b285ea55138e80830eee167c0ad75fba11a3c64457adedac33be071ad
+Size (ucspi-tcp6-1.10.tgz) = 51200 bytes
+SHA1 (patch-package_man) = 2064e165fd736518cfabc0894d81a6d9043f9610
+SHA1 (patch-src_rblsmtpd.c) = 05a7e6e0560458f833e4f8cf3201c0ccc1d598b8

Index: pkgsrc/net/ucspi-tcp6/patches/patch-package_man
diff -u pkgsrc/net/ucspi-tcp6/patches/patch-package_man:1.2 pkgsrc/net/ucspi-tcp6/patches/patch-package_man:1.3
--- pkgsrc/net/ucspi-tcp6/patches/patch-package_man:1.2 Sat Jul 28 07:48:02 2018
+++ pkgsrc/net/ucspi-tcp6/patches/patch-package_man     Sun Oct  7 12:55:16 2018
@@ -1,50 +1,52 @@
-$NetBSD: patch-package_man,v 1.2 2018/07/28 07:48:02 schmonz Exp $
+$NetBSD: patch-package_man,v 1.3 2018/10/07 12:55:16 schmonz Exp $
 
 Support DESTDIR.
 
---- package/man.orig   2016-08-02 15:14:30.000000000 +0000
+--- package/man.orig   2018-08-27 21:16:33.000000000 +0000
 +++ package/man
-@@ -6,33 +6,35 @@ safe() { "$@" || barf "cannot $@"; }
+@@ -9,20 +9,11 @@ mandir=""
+ usemanpath=0
+ usemandoc=0
+ 
+-if [ `which manpath` 2>/dev/null ]
+-then
+-      usemanpath=1
+-fi
+-
+-if [ `which mandoc`  2>/dev/null ]
+-then 
+-  usemandoc=1
+-  shout "Using mandoc facility for man files."
+-fi
+-
  safe umask 022
  [ -d man ] || barf "no man directory"
  
 +destdir=`head -1 conf-destdir`
 +
- mandir=""
  if [ -f conf-man ]
  then
-   mandir=`head -1 conf-man`
- fi
- 
--if [ ! -d "$mandir" ]
--then
--  mandir=`manpath | awk -F: '{print $1}'`
--fi
--shout "Setting man-dir: $mandir."
-+#if [ ! -d "$mandir" ]
-+#then
-+#  mandir=`manpath | awk -F: '{print $1}'`
-+#fi
-+#shout "Setting man-dir: $mandir."
+    mandir=`head -1 conf-man`
+@@ -57,7 +48,7 @@ fi
  
- for i in `find man -name "*[1-8]"`
- do
-   all="$all $i"
- done
- 
--shout "Installing ucspi-tcp6 compressed man-files in ${mandir}."
-+shout "Installing ucspi-tcp6 man-files in ${destdir}/${mandir}."
- 
- if [ $# -eq 0 ]
+ if [ $usemandoc -eq 0 ]
  then
-   for manfile in $all
-   do
-     dir="man`echo $manfile | awk -F. '{print $NF}'`"
--    safe mkdir -p $mandir/$dir
-+    safe mkdir -p $destdir/$mandir/$dir
+-  shout "Installing ${me} compressed man-files in ${mandir}."
++  shout "Installing ${me} man-files in ${mandir}."
+ else
+   shout "Installing ${me} un-compressed man-files in ${mandir}."
+ fi
+@@ -70,11 +61,11 @@ done
+ for manfile in $all
+ do
+   dir="man`echo $manfile | awk -F. '{print $NF}'`"
+-  [ -d $mandir/$dir ] || safe mkdir $mandir/$dir
++  [ -d $destdir/$mandir/$dir ] || safe mkdir $destdir/$mandir/$dir
+   if [ $usemandoc -eq 0 ]
+   then
      safe gzip $manfile && \
 -         install -m 644 "$manfile.gz" $mandir/$dir/"${manfile#*/}.gz"
 +         install -m 644 "$manfile.gz" $destdir/$mandir/$dir/"${manfile#*/}.gz"
-   done
- fi
- 
+   else
+     safe install -m 644 $manfile $mandir/$dir/${manfile#*./}
+   fi

Added files:

Index: pkgsrc/net/ucspi-tcp6/patches/patch-src_rblsmtpd.c
diff -u /dev/null pkgsrc/net/ucspi-tcp6/patches/patch-src_rblsmtpd.c:1.1
--- /dev/null   Sun Oct  7 12:55:16 2018
+++ pkgsrc/net/ucspi-tcp6/patches/patch-src_rblsmtpd.c  Sun Oct  7 12:55:16 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_rblsmtpd.c,v 1.1 2018/10/07 12:55:16 schmonz Exp $
+
+Avoid conflicting with wait(2).
+
+--- src/rblsmtpd.c.orig        2018-08-16 13:47:56.000000000 +0000
++++ src/rblsmtpd.c
+@@ -152,7 +152,7 @@ static stralloc info;
+ char inspace[64]; buffer in = BUFFER_INIT(read,0,inspace,sizeof(inspace));
+ char outspace[1]; buffer out = BUFFER_INIT(write,1,outspace,sizeof(outspace));
+ 
+-void wait(unsigned long delay)
++void dowait(unsigned long delay)
+ {
+   unsigned long u;
+   char *x;
+@@ -297,8 +297,8 @@ int main(int argc,char **argv,char **env
+       case 't': scan_ulong(optarg,&timeout); break;
+       case 'r': rbl(optarg); break;
+       case 'a': antirbl(optarg); break;
+-      case 'W': if (!decision) { wait(greetdelay); } break;
+-      case 'w': if (!decision) { scan_ulong(optarg,&greetdelay); wait(greetdelay); } break;
++      case 'W': if (!decision) { dowait(greetdelay); } break;
++      case 'w': if (!decision) { scan_ulong(optarg,&greetdelay); dowait(greetdelay); } break;
+       default: usage();
+     }
+