commit 80d9799469f3b28af5b515666fbb21a7de1147c2
Author: Elan Ruusamäe <[email protected]>
Date: Sun Nov 17 14:19:15 2019 +0200
up to 1.20; compilation fails
sslh-DESTDIR.patch | 13 -------------
sslh-LDFLAGS.patch | 21 ---------------------
sslh-pidfile.patch | 20 --------------------
sslh.spec | 22 ++++++++--------------
4 files changed, 8 insertions(+), 68 deletions(-)
---
diff --git a/sslh.spec b/sslh.spec
index 2740843..76c3d30 100644
--- a/sslh.spec
+++ b/sslh.spec
@@ -1,20 +1,17 @@
Summary: sslh - ssl/ssh multiplexer
Summary(pl.UTF-8): multiplekser ssl/ssh
Name: sslh
-Version: 1.10
+Version: 1.20
Release: 0.1
License: GPL v2+
Group: Applications
-Source0: http://www.rutschle.net/tech/%{name}-%{version}.tar.gz
-# Source0-md5: bc34e9a4770d634633e70589c72708cc
+Source0: http://www.rutschle.net/tech/sslh/%{name}-v%{version}.tar.gz
+# Source0-md5: 6a69c6128d0349e5fb22167675d18aee
Source1: %{name}.sysconfig
Source2: %{name}.init
Source3: %{name}.service
-Patch0: %{name}-DESTDIR.patch
-Patch1: %{name}-LDFLAGS.patch
-Patch2: %{name}-pidfile.patch
Patch3: %{name}-man.patch
-URL: http://www.rutschle.net/sslh.shtml
+URL: http://www.rutschle.net/tech/sslh/README.html
BuildRequires: libwrap-devel
BuildRequires: perl-tools-pod
BuildRequires: rpmbuild(macros) >= 1.644
@@ -43,10 +40,7 @@ tych usług na porcie 443 (n.p. zza firmowego firewalla,
który rzadko
kiedy blokuje połączenia na ten port) równolegle z usługami HTTPS.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{name}-v%{version}
%patch3 -p1
%build
@@ -64,9 +58,9 @@ install -d
$RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{systemdunitdir}}
PREFIX="%{_prefix}" \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/sslh
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sslh
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/sslh
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sslh
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/sslh-DESTDIR.patch b/sslh-DESTDIR.patch
deleted file mode 100644
index b455346..0000000
--- a/sslh-DESTDIR.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sslh-1.10/Makefile~ 2011-11-26 19:06:58.000000000 +0100
-+++ sslh-1.10/Makefile 2012-02-17 08:44:17.021050673 +0100
-@@ -50,8 +50,8 @@
-
- # generic install: install binary and man page
- install: sslh $(MAN)
-- install -D sslh-fork $(PREFIX)/sbin/sslh
-- install -D -m 0644 $(MAN) $(PREFIX)/share/man/man8/$(MAN)
-+ install -D sslh-fork $(DESTDIR)$(PREFIX)/sbin/sslh
-+ install -D -m 0644 $(MAN) $(DESTDIR)$(PREFIX)/share/man/man8/$(MAN)
-
- # "extended" install for Debian: install startup script
- install-debian: install sslh $(MAN)
diff --git a/sslh-LDFLAGS.patch b/sslh-LDFLAGS.patch
deleted file mode 100644
index 81f33e4..0000000
--- a/sslh-LDFLAGS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- sslh-1.10/Makefile~ 2012-02-17 19:57:57.402310819 +0100
-+++ sslh-1.10/Makefile 2012-02-17 19:58:32.139227298 +0100
-@@ -36,15 +36,15 @@
- sslh: $(OBJS) sslh-fork sslh-select
-
- sslh-fork: $(OBJS) sslh-fork.o Makefile common.h
-- $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-fork sslh-fork.o $(OBJS)
$(LIBS)
-+ $(CC) $(LDFLAGS) -D'VERSION=$(VERSION)' -o sslh-fork sslh-fork.o
$(OBJS) $(LIBS)
- #strip sslh-fork
-
- sslh-select: $(OBJS) sslh-select.o Makefile common.h
-- $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-select sslh-select.o
$(OBJS) $(LIBS)
-+ $(CC) $(LDFLAGS) -D'VERSION=$(VERSION)' -o sslh-select sslh-select.o
$(OBJS) $(LIBS)
- #strip sslh-select
-
- echosrv: $(OBJS) echosrv.o
-- $(CC) $(CFLAGS) -o echosrv echosrv.o common.o $(LIBS)
-+ $(CC) $(LDFLAGS) -o echosrv echosrv.o common.o $(LIBS)
-
- $(MAN): sslh.pod Makefile
- pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip
-9 - > $(MAN)
diff --git a/sslh-pidfile.patch b/sslh-pidfile.patch
deleted file mode 100644
index f1e62ad..0000000
--- a/sslh-pidfile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sslh-1.10/sslh-main.c~ 2011-11-26 22:16:43.000000000 +0100
-+++ sslh-1.10/sslh-main.c 2012-02-17 22:56:31.899567806 +0100
-@@ -177,6 +177,8 @@
-
- setup_signals();
-
-+ write_pid_file(pid_file);
-+
- drop_privileges(user_name);
-
- /* New session -- become group leader */
-@@ -185,8 +187,6 @@
- CHECK_RES_DIE(res, "setsid: already process leader");
- }
-
-- write_pid_file(pid_file);
--
- /* Open syslog connection */
- setup_syslog(argv[0]);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sslh.git/commitdiff/80d9799469f3b28af5b515666fbb21a7de1147c2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
