[rpms/sslh] epel10: Update to 1.19c

[rpms/sslh] epel10: Update to 1.19c

[James Hogarth]

A new commit has been pushed.

Repo   : rpms/sslh
Branch : epel10
Commit : 6844cd2a778633235cdbcd6f676d88ec7c316eeb
Author : James Hogarth <james.hogarth@gmail.com>
Date   : 2018-04-18T12:25:26+01:00
Stats  : +35/-14 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/sslh/c/6844cd2a778633235cdbcd6f676d88ec7c316eeb?branch=epel10

Log:
Update to 1.19c

---
diff --git a/00-systemd-tuning.patch b/00-systemd-tuning.patch
index bd19344..9caeeba 100644
--- a/00-systemd-tuning.patch
+++ b/00-systemd-tuning.patch
@@ -1,8 +1,8 @@
 diff --git a/basic.cfg b/basic.cfg
-index 54a799c..cd33cd0 100644
+index 4ef602b..8bde5fb 100644
 --- a/basic.cfg
 +++ b/basic.cfg
-@@ -2,13 +2,12 @@
+@@ -2,14 +2,12 @@
  # sensible values for "standard" setup.
  
  verbose: false;
@@ -14,15 +14,16 @@ index 54a799c..cd33cd0 100644
  timeout: 2;
 -user: "nobody";
 -pidfile: "/var/run/sslh.pid";
+-chroot: "/var/empty";
 +user: "sslh";
  
  
  # Change hostname with your external address name.
 diff --git a/scripts/systemd.sslh.service b/scripts/systemd.sslh.service
-index c2a69fd..c3be100 100644
+index ecaa4f8..c1ff3b6 100644
 --- a/scripts/systemd.sslh.service
 +++ b/scripts/systemd.sslh.service
-@@ -1,11 +1,17 @@
+@@ -1,27 +1,18 @@
  [Unit]
  Description=SSL/SSH multiplexer
 +Documentation=man:sslh(8)
@@ -32,21 +33,34 @@ index c2a69fd..c3be100 100644
 -EnvironmentFile=/etc/conf.d/sslh
 -ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS
 +EnvironmentFile=/etc/sysconfig/sslh
-+ExecStart=/usr/sbin/sslh $DAEMON_OPTS
++ExecStart=/usr/bin/sslh $DAEMON_OPTS
  KillMode=process
-+CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID
-+PrivateTmp=true
-+PrivateDevices=true
+ #Hardening
+ PrivateTmp=true
+-CapabilityBoundingSet=CAP_SETGID CAP_SETUID CAP_NET_BIND_SERVICE
+-AmbientCapabilities=CAP_NET_BIND_SERVICE
+-SecureBits=noroot-locked
+-ProtectSystem=strict
++CapabilityBoundingSet=CAP_SETGID CAP_SETUID CAP_NET_BIND_SERVICE CAP_NET_ADMIN
 +ProtectSystem=full
-+ProtectHome=true
+ ProtectHome=true
+-ProtectKernelModules=true
+-ProtectKernelTunables=true
+-ProtectControlGroups=true
+-MountFlags=private
+-NoNewPrivileges=true
+ PrivateDevices=true
+-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+-MemoryDenyWriteExecute=true
+-DynamicUser=true
  
  [Install]
  WantedBy=multi-user.target
 diff --git a/sslh.pod b/sslh.pod
-index a90d4bd..018ca75 100644
+index 2e73234..cbe402a 100644
 --- a/sslh.pod
 +++ b/sslh.pod
-@@ -210,12 +210,11 @@ personality disorder).
+@@ -217,12 +217,11 @@ personality disorder).
  
  =over 4
  

diff --git a/sslh.spec b/sslh.spec
index b7076c8..59718f4 100644
--- a/sslh.spec
+++ b/sslh.spec
@@ -1,4 +1,4 @@
-%global gh_commit    38447c815821ae8b6379d8005628ea3c9f94f1ee
+%global gh_commit    3a61c8b0b1cd846d0cd3a2c590a52fe9bc5974f7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     yrutschle
 %global gh_project   sslh
@@ -6,8 +6,8 @@
 
 
 Name:    sslh
-Version: 1.18
-Release: 6%{?dist}
+Version: 1.19c
+Release: 1%{?dist}
 Summary: Applicative protocol(SSL/SSH) multiplexer
 License: GPLv2
 URL:     https://github.com/%{gh_owner}/%{gh_project}
@@ -22,6 +22,7 @@ Patch1:  01-remove-lcov-testing.patch
 BuildRequires: pkgconfig(libconfig)
 BuildRequires: pkgconfig(libcap)
 BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(libpcre)
 BuildRequires: systemd
 BuildRequires: perl(Pod::Man)
 
@@ -66,6 +67,9 @@ comes from its original function to serve SSH and HTTPS on the same port.
 
 %build
 ./genver.sh >version.h
+%if 0%{?rhel}
+export CFLAGS="${CFLAGS} -std=gnu99"
+%endif
 %if %{use_libwrap}
   make %{?_smp_mflags} USELIBWRAP=1 USELIBCAP=1 USESYSTEMD=1 sslh echosrv
 %else
@@ -147,6 +151,9 @@ exit 0
 
 
 %changelog
+* Wed Apr 18 2018 James Hogarth <james.hogarth@gmail.com> - 1.19c-1
+- Update to 1.19c upstream
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.18-6
 - Escape macros in %%changelog