[rpms/sslh] epel10: Update to upstream 1.20, disable tests until the perl libraries are in Fedora

[rpms/sslh] epel10: Update to upstream 1.20, disable tests until the perl libraries are in Fedora

[James Hogarth]

A new commit has been pushed.

Repo   : rpms/sslh
Branch : epel10
Commit : 2814b37328beb965d414831ac3b216629af6e4c9
Author : James Hogarth <james.hogarth@gmail.com>
Date   : 2019-08-13T08:56:34+01:00
Stats  : +24/-22 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/sslh/c/2814b37328beb965d414831ac3b216629af6e4c9?branch=epel10

Log:
Update to upstream 1.20, disable tests until the perl libraries are in Fedora

---
diff --git a/.gitignore b/.gitignore
index e5f4661..99f962f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sslh-v1.17.tar.gz
 /sslh-1.18-38447c8.tar.gz
 /sslh-1.19c-3a61c8b.tar.gz
+/sslh-1.20-4ae2e62.tar.gz

diff --git a/00-systemd-tuning.patch b/00-systemd-tuning.patch
index d19ff35..33cd512 100644
--- a/00-systemd-tuning.patch
+++ b/00-systemd-tuning.patch
@@ -20,18 +20,18 @@ index 4ef602b..8bde5fb 100644
  
  # Change hostname with your external address name.
 diff --git a/scripts/systemd.sslh.service b/scripts/systemd.sslh.service
-index ecaa4f8..c1ff3b6 100644
+index 3e5cd14..4d2557f 100644
 --- a/scripts/systemd.sslh.service
 +++ b/scripts/systemd.sslh.service
 @@ -1,27 +1,18 @@
  [Unit]
  Description=SSL/SSH multiplexer
-+Documentation=man:sslh(8)
  After=network.target
++Documentation=man:sslh(8)
  
  [Service]
 -EnvironmentFile=/etc/conf.d/sslh
--ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS
+-ExecStart=/usr/sbin/sslh --foreground $DAEMON_OPTS
 +EnvironmentFile=/etc/sysconfig/sslh
 +ExecStart=/usr/sbin/sslh $DAEMON_OPTS
  KillMode=process
@@ -57,10 +57,10 @@ index ecaa4f8..c1ff3b6 100644
  [Install]
  WantedBy=multi-user.target
 diff --git a/sslh.pod b/sslh.pod
-index 2e73234..cbe402a 100644
+index 5735bad..b457b4d 100644
 --- a/sslh.pod
 +++ b/sslh.pod
-@@ -217,12 +217,11 @@ personality disorder).
+@@ -221,12 +221,11 @@ personality disorder).
  
  =over 4
  

diff --git a/01-remove-lcov-testing.patch b/01-remove-lcov-testing.patch
index 0d04ae6..d90e2cf 100644
--- a/01-remove-lcov-testing.patch
+++ b/01-remove-lcov-testing.patch
@@ -1,18 +1,17 @@
 diff --git a/t b/t
-index 59b66c3..7d9172d 100755
+index aad4c61..c1bfbe5 100755
 --- a/t
 +++ b/t
-@@ -35,9 +35,6 @@ my $RB_OPEN_PID_FILE =          1;
- my $RB_BIND_ADDRESS =           1;
+@@ -37,8 +37,6 @@ my $RB_WRONG_USERNAME =         1;
+ my $RB_OPEN_PID_FILE =          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) {
+ sub verbose_exec
+ {
+     my ($cmd) = @_;
+@@ -369,8 +367,5 @@ if ($RB_RESOLVE_ADDRESS) {
      is($code, 4, "Exit status if can't resolve address");
  }
  

diff --git a/sources b/sources
index 1e1046d..68d007c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sslh-1.19c-3a61c8b.tar.gz) = 07bee7fdbb120fa405992b7925d9e4d020d0e5c7bbda1d76fed423dd671c7b1a3139e69570fbfa9b9f00e64930ac2d3223c979d4906e37b4d24422995c486c65
+SHA512 (sslh-1.20-4ae2e62.tar.gz) = daff860b426992ce09031a3babc1a01b56f42f7e5f8acbed466bee17b5a021a174da79eb2e51dc0152622b1dc28e88df70d39f62926296d62800043947cc3cb9

diff --git a/sslh.spec b/sslh.spec
index 39f56c1..0e5ecee 100644
--- a/sslh.spec
+++ b/sslh.spec
@@ -1,13 +1,15 @@
-%global gh_commit    3a61c8b0b1cd846d0cd3a2c590a52fe9bc5974f7
+%global gh_commit    4ae2e62d25b9faf984a303c4bdf2b7675f4988b9
 %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}
+#%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+# disable tests until perl-conf-libconfig is in Fedora
+%global with_tests   0
 
 
 Name:    sslh
-Version: 1.19c
-Release: 6%{?dist}
+Version: 1.20
+Release: 1%{?dist}
 Summary: Applicative protocol(SSL/SSH) multiplexer
 License: GPLv2
 URL:     https://github.com/%{gh_owner}/%{gh_project}
@@ -32,10 +34,9 @@ BuildRequires: perl(Pod::Man)
 # Required for %check
 BuildRequires: perl(IO::Socket::INET6)
 BuildRequires: perl(Test::More)
+BuildRequires: perl(Conf::Libconfig)
 BuildRequires: valgrind
 BuildRequires: psmisc
-%else
-: Skip upstream test suite
 %endif
 
 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7
@@ -117,8 +118,6 @@ EOF
 sed -i 's/ip6-localhost/localhost6/g' t
 # Build the binaries with gcc coverage enabled
 make test
-%else
-: Skip upstream test suite
 %endif
 
 %pre
@@ -152,6 +151,9 @@ exit 0
 
 
 %changelog
+* Mon Aug 12 2019 James Hogarth <james.hogarth@gmail.com> - 1.20-1
+- Update to 1.20 upstream
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19c-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild