[rpms/sslh] epel10: Update to 1.18 upstream release

[rpms/sslh] epel10: Update to 1.18 upstream release

[James Hogarth]

            A new commit has been pushed.

            Repo   : rpms/sslh
            Branch : epel10
            Commit : 7d2fa5d2a34f1aed2100bb0f5b9b3a9f3426d933
            Author : James Hogarth <james.hogarth@gmail.com>
            Date   : 2016-03-30T11:40:00+01:00
            Stats  : +90/-25 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/sslh/c/7d2fa5d2a34f1aed2100bb0f5b9b3a9f3426d933?branch=epel10

            Log:
            Update to 1.18 upstream release
Add a template systemd socket that can be extended
Enable %check tests in the rpm spec

---
diff --git a/.gitignore b/.gitignore
index a29d5d7..e8a5a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sslh-v1.17.tar.gz
+/sslh-1.18-38447c8.tar.gz

diff --git a/00-systemd-tuning.patch b/00-systemd-tuning.patch
index e63410e..bd19344 100644
--- a/00-systemd-tuning.patch
+++ b/00-systemd-tuning.patch
@@ -1,5 +1,5 @@
 diff --git a/basic.cfg b/basic.cfg
-index 526ffbf..fb274e2 100644
+index 54a799c..cd33cd0 100644
 --- a/basic.cfg
 +++ b/basic.cfg
 @@ -2,13 +2,12 @@
@@ -11,7 +11,7 @@ index 526ffbf..fb274e2 100644
  inetd: false;
  numeric: false;
  transparent: false;
- timeout: "2";
+ timeout: 2;
 -user: "nobody";
 -pidfile: "/var/run/sslh.pid";
 +user: "sslh";
@@ -19,7 +19,7 @@ index 526ffbf..fb274e2 100644
  
  # Change hostname with your external address name.
 diff --git a/scripts/systemd.sslh.service b/scripts/systemd.sslh.service
-index c2a69fd..b4d0c49 100644
+index c2a69fd..c3be100 100644
 --- a/scripts/systemd.sslh.service
 +++ b/scripts/systemd.sslh.service
 @@ -1,11 +1,17 @@
@@ -43,10 +43,10 @@ index c2a69fd..b4d0c49 100644
  [Install]
  WantedBy=multi-user.target
 diff --git a/sslh.pod b/sslh.pod
-index c0ce606..b4446b2 100644
+index a90d4bd..018ca75 100644
 --- a/sslh.pod
 +++ b/sslh.pod
-@@ -214,12 +214,11 @@ personality disorder).
+@@ -210,12 +210,11 @@ personality disorder).
  
  =over 4
  

diff --git a/01-remove-lcov-testing.patch b/01-remove-lcov-testing.patch
new file mode 100644
index 0000000..0d04ae6
--- /dev/null
+++ b/01-remove-lcov-testing.patch
@@ -0,0 +1,23 @@
+diff --git a/t b/t
+index 59b66c3..7d9172d 100755
+--- a/t
++++ b/t
+@@ -35,9 +35,6 @@ my $RB_OPEN_PID_FILE =          1;
+ my $RB_BIND_ADDRESS =           1;
+ my $RB_RESOLVE_ADDRESS =        1;
+ 
+-`lcov --directory . --zerocounters`;
+-
+-
+ my ($ssh_pid, $ssl_pid);
+ 
+ if (!($ssh_pid = fork)) {
+@@ -310,8 +307,5 @@ if ($RB_RESOLVE_ADDRESS) {
+     is($code, 4, "Exit status if can't resolve address");
+ }
+ 
+-`lcov --directory . --capture --output-file sslh_cov.info`;
+-`genhtml sslh_cov.info`;
+-
+ `killall echosrv`;
+ 

diff --git a/sources b/sources
index b8a1f96..f1cb779 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fc3ada4bafaca5a9786cc1431f48ed4  sslh-v1.17.tar.gz
+474c9016b2001279a51558f2bf98192d  sslh-1.18-38447c8.tar.gz

diff --git a/sslh.spec b/sslh.spec
index 341efcc..6fde0da 100644
--- a/sslh.spec
+++ b/sslh.spec
@@ -1,26 +1,44 @@
-%global _hardened_build 1
-# Define pkgdocdir for releases that don't define it already
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
+%global gh_commit    38447c815821ae8b6379d8005628ea3c9f94f1ee
+%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner     yrutschle
+%global gh_project   sslh
+%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+
 
 Name:    sslh
-Version: 1.17
-Release: 5%{?dist}
+Version: 1.18
+Release: 1%{?dist}
 Summary: Applicative protocol(SSL/SSH) multiplexer
 License: GPLv2
-URL:     http://www.rutschle.net/tech/sslh.shtml
-Source0: http://www.rutschle.net/tech/%{name}-v%{version}.tar.gz
+URL:     https://github.com/%{gh_owner}/%{gh_project}
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+
+# Make the systemd unit a little nicer for Fedora
 Patch0:  00-systemd-tuning.patch
 
-BuildRequires: libconfig-devel
-BuildRequires: libcap-devel
+# Don't do lcov coverage testing
+Patch1:  01-remove-lcov-testing.patch
+
+BuildRequires: pkgconfig(libconfig)
+BuildRequires: pkgconfig(libcap)
 BuildRequires: tcp_wrappers-devel
+BuildRequires: pkgconfig(libsystemd)
 BuildRequires: systemd
-BuildRequires: perl-podlators
+BuildRequires: perl(Pod::Man)
+
+
+%if %{with_tests}
+# Required for %check
+BuildRequires: perl(IO::Socket::INET6)
+BuildRequires: perl(Test::More)
+BuildRequires: valgrind
+BuildRequires: psmisc
+%else
+: Skip upstream test suite
+%endif
 
 Requires(pre):    shadow-utils
-Requires(post):   systemd
-Requires(preun):  systemd
-Requires(postun): systemd
+%{?systemd_requires}
 
 %description
 sslh accepts connections on specified ports, and forwards them further
@@ -38,12 +56,11 @@ comes from its original function to serve SSH and HTTPS on the same port.
 
 
 %prep
-%setup -q -n %{name}-v%{version}
-%patch0 -p1
+%autosetup -n %{name}-%{gh_commit} -p1
 
 %build
 ./genver.sh >version.h
-make %{?_smp_mflags} USELIBWRAP=1 USELIBCAP=1 CFLAGS="%{optflags}" %{name}
+make %{?_smp_mflags} USELIBWRAP=1 USELIBCAP=1 USESYSTEMD=1 sslh echosrv
 pod2man --section=8 --release=%{version} --center=" " %{name}.pod > %{name}.8
 iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.conv && \
 touch -r ChangeLog ChangeLog.conv && \
@@ -65,9 +82,29 @@ cat > %{buildroot}%{_sysconfdir}/sysconfig/%{name} << EOF
 # The options passed to the sslh binary can be provided here
 # Defaults to passing the configuration file to the daemon
 #
-DAEMON_OPTS="-F /etc/sslh.cfg"
+DAEMON_OPTS="-F/etc/sslh.cfg"
 EOF
+cat > %{buildroot}%{_unitdir}/%{name}.socket << EOF
+[Unit]
+Description=Socket support for sslh
+Before=sslh.service
 
+[Socket]
+FreeBind=true
+
+[Install]
+WantedBy=sockets.target
+EOF
+
+%check
+%if %{with_tests}
+# Use right ip6 localhost for Fedora
+sed -i 's/ip6-localhost/localhost6/g' t
+# Build the binaries with gcc coverage enabled
+make test
+%else
+: Skip upstream test suite
+%endif
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
@@ -92,6 +129,7 @@ exit 0
 %attr(0755,root,root) %{_sbindir}/%{name}
 %attr(0755,root,root) %{_sbindir}/%{name}-select
 %{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.socket
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}.cfg
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/%{name}
 
@@ -99,11 +137,14 @@ exit 0
 
 
 %changelog
+* Wed Mar 30 2016 James Hogarth <james.hogarth@gmail.com> - 1.18-1
+- Update to 1.18 upstream
+- Add systemd socket template
+- Add %check to rpm spec
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
 * Thu Sep 17 2015 James Hogarth <james.hogarth@gmail.com> - 1.17-4
-- Bug un systemd unit with incorrect variable usage BZ#1264140
+- Bug in systemd unit with incorrect variable usage BZ#1264140
 * Mon Jul 20 2015 James Hogarth <james.hogarth@gmail.com> - 1.17-3
 - Make sslh.cfg argument overrideable from sysconfig BZ#1221320
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-2