pkg/49257: update net/sslh to version 1.16

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/49257: update net/sslh to version 1.16
From: nils.netbsd%anotherhomepage.org@localhost
Date: Sun, 5 Oct 2014 18:10:11 +0000 (UTC)
>Number:         49257
>Category:       pkg
>Synopsis:       update net/sslh to version 1.16
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 05 18:10:01 +0000 2014
>Originator:     Nils Ratusznik
>Release:        pkgsrc-2014Q3
>Organization:
>Environment:
NetBSD dev.anotherhomepage.org 6.1.4 NetBSD 6.1.4 (XEN3_DOMU) amd64
>Description:
Pkgsrc version of sslh is 1.15 in 2014Q3 and in current, but upstream is 1.16.
>How-To-Repeat:
Look in package source. Look at web page. Note version discrepancy.
>Fix:
Patches are made against pkgsrc-2013Q3 :
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/sslh/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile    14 Nov 2013 08:01:01 -0000      1.4
+++ Makefile    5 Oct 2014 17:59:28 -0000
@@ -1,16 +1,20 @@
 # $NetBSD: Makefile,v 1.4 2013/11/14 08:01:01 apb Exp $
 #
 
-DISTNAME=      sslh-1.15
-PKGREVISION=   1
+DISTNAME=      v1.16
+PKGNAME=       sslh-1.16
+#PKGREVISION=  1
 CATEGORIES=    net
-MASTER_SITES=  http://www.rutschle.net/tech/
+MASTER_SITES=  https://github.com/yrutschle/sslh/archive/
+EXTRACT_SUFX=  .zip
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.rutschle.net/tech/sslh.shtml
 COMMENT=       Multiplex ssl, ssh, and other connections on the same port
 LICENSE=       gnu-gpl-v2
 
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.rutschle.net/tech/sslh.shtml
+
 USE_TOOLS+=    gmake gzip pod2man
 USE_LANGUAGES= c
 
@@ -23,6 +27,7 @@ CONF_FILES=   ${EGDIR}/basic.cfg ${PKG_SYS
 RCD_SCRIPTS=   sslh
 
 AUTO_MKDIRS=   yes
+REPLACE_SH+=   genver.sh
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${DESTDIR}${PREFIX}/sbin/sslh
@@ -31,7 +36,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/scripts/* ${DESTDIR}${EGDIR}/scripts
        ${INSTALL_DATA} ${WRKSRC}/example.cfg ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/basic.cfg ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/README.MacOSX ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/sslh/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- PLIST       11 Mar 2014 14:05:11 -0000      1.3
+++ PLIST       5 Oct 2014 17:59:28 -0000
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:11 jperkin Exp $
+@comment $NetBSD$
 man/man8/sslh.8
 sbin/sslh
 sbin/sslh-select
 share/doc/sslh/ChangeLog
-share/doc/sslh/README
 share/doc/sslh/README.MacOSX
+share/doc/sslh/README.md
 share/examples/sslh/basic.cfg
 share/examples/sslh/example.cfg
 share/examples/sslh/scripts/etc.default.sslh
 share/examples/sslh/scripts/etc.init.d.sslh
 share/examples/sslh/scripts/etc.rc.d.init.d.sslh.centos
+share/examples/sslh/scripts/etc.sysconfig.sslh
 share/examples/sslh/scripts/systemd.sslh.service
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/sslh/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo    8 Nov 2013 13:33:55 -0000       1.2
+++ distinfo    5 Oct 2014 17:59:28 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.2 2013/11/08 13:33:55 obache Exp $
 
-SHA1 (sslh-1.15.tar.gz) = eaf255fcbc0aa35f1274240e619636ad3af2e3b2
-RMD160 (sslh-1.15.tar.gz) = 03fb637fe06c5b1e4010547017ef39d7265ae503
-Size (sslh-1.15.tar.gz) = 33241 bytes
-SHA1 (patch-echosrv.c) = d235b5053aa597746f4cc8d1b13b8fc20ffa9c4f
-SHA1 (patch-sslh-main.c) = 39e9de71028c28de3e6bc5510b395409c99b73d1
+SHA1 (v1.16.zip) = 19f3931ce8d98895e85b2da2d6995b489f123bd2
+RMD160 (v1.16.zip) = 29da00f88db489c88f8ec76e14ce1131f0766ee7
+Size (v1.16.zip) = 46395 bytes
+SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
+SHA1 (patch-sslh-main.c) = 996bbec53dbb3c92c3485b1f210853c7ed368519
Index: patches/patch-echosrv.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/sslh/patches/patch-echosrv.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-echosrv.c
--- patches/patch-echosrv.c     8 Nov 2013 13:33:55 -0000       1.1
+++ patches/patch-echosrv.c     5 Oct 2014 17:59:28 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-echosrv.c,v 1.1 2013/11/0
 
 * getopt_long_only does not exist on NetBSD getopt.
 
---- echosrv.c.orig     2013-07-27 14:25:04.000000000 +0000
+--- echosrv.c.orig     2014-02-11 21:06:01.000000000 +0000
 +++ echosrv.c
 @@ -64,7 +64,7 @@ void parse_cmdline(int argc, char* argv[
      };
Index: patches/patch-sslh-main.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/sslh/patches/patch-sslh-main.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sslh-main.c
--- patches/patch-sslh-main.c   8 Nov 2013 13:33:55 -0000       1.1
+++ patches/patch-sslh-main.c   5 Oct 2014 17:59:28 -0000
@@ -2,9 +2,9 @@ $NetBSD: patch-sslh-main.c,v 1.1 2013/11
 
 * getopt_long_only does not exist on NetBSD getopt.
 
---- sslh-main.c.orig   2013-07-27 14:25:04.000000000 +0000
+--- sslh-main.c.orig   2014-02-11 21:06:01.000000000 +0000
 +++ sslh-main.c
-@@ -337,7 +337,7 @@ static void cmdline_config(int argc, cha
+@@ -358,7 +358,7 @@ static void cmdline_config(int argc, cha
  #ifdef LIBCONFIG
      optind = 1;
      opterr = 0; /* we're missing protocol options at this stage so don't output errors */
@@ -13,7 +13,7 @@ $NetBSD: patch-sslh-main.c,v 1.1 2013/11
          if (c == 'F') {
              config_filename = optarg;
              /* find the end of the listen list */
-@@ -362,7 +362,7 @@ static void parse_cmdline(int argc, char
+@@ -383,7 +383,7 @@ static void parse_cmdline(int argc, char
      optind = 1;
      opterr = 1;
  next_arg:


Changelog for sslh is the following : 
v1.16: 11FEB2014
Probes made more resilient, to incoming data
containing NULLs. Also made them behave properly
when receiving too short packets to probe on the
first incoming packet.
(Ondrej Kuzník)
Libcap support: Keep only CAP_NET_ADMIN if started
as root with transparent proxying and dropping
priviledges (enable USELIBCAP in Makefile). This
avoids having to mess with filesystem capabilities.
(Sebastian Schmidt/yath)
Fixed bugs related to getpeername that would cause
sslh to quit erroneously (getpeername can return
actual errors if connections are dropped before
getting to getpeername).
Set IP_FREEDBIND if available to bind to addresses
that don't yet exist.

Changelog for pkgsrc :
- now uses Github for fetching source, ${HOMEPAGE} says : "sslh is managed in Git and pushed to Github" ;
- replaced #!/bin/bash with #!/bin/sh in genver.sh, choice of sh instead of bash is because of a commit in sslh github : https://github.com/yrutschle/sslh/commit/62cbb55b8e9c9b0bc878b094c5be815d58276b39
Prev by Date: PR/49251 CVS commit: pkgsrc/security/libsodium
Next by Date: Re: pkg/49199: boost errors - net/libcmis fails to build on NetBSD-6.1.4_PATCH/amd64
Previous by Thread: PR/49251 CVS commit: pkgsrc/security/libsodium
Next by Thread: Firefox compile error
Indexes:
Home | Main Index | Thread Index | Old Index