Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sslh for openSUSE:Factory checked in
at 2021-05-12 19:31:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sslh (Old)
and /work/SRC/openSUSE:Factory/.sslh.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sslh"
Wed May 12 19:31:46 2021 rev:5 rq:887009 version:1.21c
Changes:
--------
--- /work/SRC/openSUSE:Factory/sslh/sslh.changes 2020-07-31
16:07:46.288833320 +0200
+++ /work/SRC/openSUSE:Factory/.sslh.new.2988/sslh.changes 2021-05-12
19:32:14.551035131 +0200
@@ -1,0 +2,11 @@
+Fri Apr 9 19:08:27 UTC 2021 - Cristian Rodr??guez <crrodrig...@opensuse.org>
+
+- remove unused tcpd-devel dependency
+
+-------------------------------------------------------------------
+Fri Apr 9 19:06:58 UTC 2021 - Cristian Rodr??guez <crrodrig...@opensuse.org>
+
+- sslh-nopcreposix.patch: Using pcreposix is the wrong thing
+ to do on any glibc based system, avoid linking it.
+
+-------------------------------------------------------------------
New:
----
sslh-nopcreposix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sslh.spec ++++++
--- /var/tmp/diff_new_pack.OkW51l/_old 2021-05-12 19:32:15.031033214 +0200
+++ /var/tmp/diff_new_pack.OkW51l/_new 2021-05-12 19:32:15.031033214 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sslh
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2012 by Lars Vogdt
#
# All modifications and additions to the file contributed by third parties
@@ -30,12 +30,11 @@
Source3: %{name}.conf.d
BuildRequires: libcap-devel
BuildRequires: libconfig-devel
-BuildRequires: pcre-devel
-BuildRequires: tcpd-devel
-BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(libsystemd)
Requires: openssh
Requires: openssl
Requires(pre): group(nobody)
+Patch0: sslh-nopcreposix.patch
%{systemd_requires}
%description
@@ -44,13 +43,14 @@
corporate firewall) while still serving HTTPS on that port.
%prep
-%setup -q -n %{name}-v%{version}
+%autosetup -n %{name}-v%{version} -p1
%build
-#
+export CFLAGS="%optflags"
+make PREFIX=%{_prefix} DESTDIR=%{buildroot}
%install
-make USELIBCAP=1 PREFIX=%{_prefix} DESTDIR=%{buildroot} install
+make PREFIX=%{_prefix} DESTDIR=%{buildroot} install
install -Dm644 scripts/systemd.%{name}.service
%{buildroot}%{_unitdir}/%{name}.service
install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/conf.d/%{name}
++++++ sslh-nopcreposix.patch ++++++
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@
# change any of these
ENABLE_REGEX=1 # Enable regex probes
USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files)
-USELIBPCRE=1 # Use libpcre? (needed for regex on musl)
-USELIBWRAP?= # Use libwrap?
-USELIBCAP= # Use libcap?
-USESYSTEMD= # Make use of systemd socket activation
-USELIBBSD?= # Use libbsd (needed to update process name in `ps`)
+USELIBPCRE= # Use libpcre? (needed for regex on musl)
+USELIBWRAP= # Use libwrap?
+USELIBCAP=1 # Use libcap?
+USESYSTEMD=1 # Make use of systemd socket activation
+USELIBBSD= # Use libbsd (needed to update process name in `ps`)
COV_TEST= # Perform test coverage?
PREFIX?=/usr
BINDIR?=$(PREFIX)/sbin
--- a/sslh-conf.c
+++ b/sslh-conf.c
@@ -38,7 +38,7 @@
#include <stdio.h>
#include "sslh-conf.h"
#include "argtable3.h"
-#ifdef LIBPCRE
+#if defined(LIBPCRE) && !defined(__GLIBC__)
#include <pcreposix.h>
#else
#include <regex.h>
