From f91eba6ee0965558f2c33c82e029763f59886272 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 18:21:34 +0100
Subject: [PATCH] update to 7.6.31 rebuilt with debug package, debian patches,
 and specfile fixes [release 7.6.31-1mamba;Fri Nov 27 2020]

---
 tcp_wrappers.spec | 101 ++++++++++++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 35 deletions(-)

diff --git a/tcp_wrappers.spec b/tcp_wrappers.spec
index f0d6faf..224bff9 100644
--- a/tcp_wrappers.spec
+++ b/tcp_wrappers.spec
@@ -1,13 +1,16 @@
+%define majver %(echo %version | cut -d. -f1-2)
+%define patchver %(echo %version | cut -d. -f3)
 Name:          tcp_wrappers
-Version:       7.6
-Release:       4mamba
+Version:       7.6.31
+Release:       1mamba
 Summary:       A security tool which acts as a wrapper for TCP daemons
 Group:         System/Servers
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://ftp.porcupine.org/pub/security/
-Source:        http://ftp.porcupine.org/pub/security/%{name}_%{version}.tar.gz
+Source:        http://ftp.porcupine.org/pub/security/%{name}_%{majver}.tar.gz
+Source1:       http://http.us.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_%{majver}.q-%{patchver}.debian.tar.xz
 Patch0:        %{name}-7.6-conf.patch
 Patch1:        %{name}-7.6-setenv.patch
 Patch2:        %{name}-7.6-security.patch
@@ -18,6 +21,11 @@ Patch6:        %{name}-7.6-sig.patch
 Patch7:        %{name}-7.6-malloc.patch
 Patch8:        %{name}-7.6-shared_lib_plus_plus-1.patch
 License:       Distributable
+## AUTOBUILDREQ-BEGIN
+BuildRequires: glibc-devel
+BuildRequires: ldconfig
+BuildRequires: libnsl-devel
+## AUTOBUILDREQ-END
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,19 +52,19 @@ Provides:      tcp_wrappers-devel
 The tcp_wrappers package provides small daemon programs which can monitor and filter incoming requests for systat, finger, ftp, telnet, rlogin, rsh, exec, tftp, talk and other network services.
 This package contains the static libraries and header files for the tcp_wrappers program.
 
-%prep
-%setup -q -n %{name}_%{version}
-%patch8 -p1
-#%patch0 -p1
-#%patch1 -p1
-%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%debug_package
 
-sed -i "s|/usr/lib/|/usr/%_lib/|g" Makefile
+%prep
+%setup -q -n %{name}_%{majver} -a1
+for p in `sed -e 's:^:debian/patches/:' debian/patches/series`; do patch -p1 < $p; done
+
+#%patch8 -p1
+%patch2 -p1
+#%patch4 -p1
+#%patch6 -p1
+#%patch7 -p1
+
+sed -i "s|/usr/lib/|%{_libdir}|g" Makefile
 
 %build
 %if "%{_host}" != "%{_build}"
@@ -66,44 +74,67 @@ sed -i "s|-lwrap|-lnsl -lwrap|" Makefile
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-sed -i "s|-o root -g root ||" Makefile
-install -d %{buildroot}%{_sbindir} %{buildroot}%{_libdir} \
-           %{buildroot}%{_mandir}/man{3,5,8} \
-           %{buildroot}%{_includedir} \
 
-%makeinstall
+for f in libwrap.so libwrap.so.0 libwrap.so.0.7.6; do
+   install -D -m0755 shared/$f %{buildroot}%{_libdir}/$f
+done
+install -D -m0755 libwrap.a %{buildroot}%{_libdir}/libwrap.a
+
+install -D -m0644 tcpd.h %{buildroot}%{_includedir}/tcpd.h
+
+for f in safe_finger tcpd tcpdchk tcpdmatch try-from; do
+   install -D -m0755 $f %{buildroot}%{_sbindir}/$f
+   install -D -m0644 $f.8 %{buildroot}%{_mandir}/man8/$f.8
+done
+
+for f in hosts_access hosts_options; do
+   install -D -m0644 $f.5 %{buildroot}%{_mandir}/man5/$f.5
+done
+
+for f in hosts_access; do
+   install -D -m0644 $f.3 %{buildroot}%{_mandir}/man3/$f.3
+done
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %files
 %defattr(-,root,root)
-%{_sbindir}/*
-%{_mandir}/man8/tcpd.8.gz
-%{_mandir}/man8/tcpdchk.8.gz
-%{_mandir}/man8/tcpdmatch.8.gz
-%{_mandir}/man8/try-from.8.gz
-%{_mandir}/man8/safe_finger.8.gz
-%{_mandir}/man8/safe_finger.8.gz
+%{_sbindir}/safe_finger
+%{_sbindir}/tcpd
+%{_sbindir}/tcpdchk
+%{_sbindir}/tcpdmatch
+%{_sbindir}/try-from
+%{_mandir}/man5/hosts_access.5*
+%{_mandir}/man5/hosts_options.5*
+%{_mandir}/man8/tcpd.8*
+%{_mandir}/man8/tcpdchk.8*
+%{_mandir}/man8/tcpdmatch.8*
+%{_mandir}/man8/try-from.8*
+%{_mandir}/man8/safe_finger.8*
+%{_mandir}/man8/safe_finger.8*
 
 %files -n libwrap
 %defattr(-,root,root)
 %{_libdir}/libwrap.so.*
-%{_mandir}/man5/hosts_access.5.gz
-%{_mandir}/man5/hosts_options.5.gz
-%doc BLURB CHANGES README* DISCLAIMER Banners.Makefile
+%doc DISCLAIMER
 
 %files -n libwrap-devel
 %defattr(-,root,root)
 %{_includedir}/tcpd.h
 %{_libdir}/libwrap.a
 %{_libdir}/libwrap.so
-%{_mandir}/man3/hosts_access.3.gz
-%{_mandir}/man3/hosts_ctl.3.gz
-%{_mandir}/man3/request_init.3.gz
-%{_mandir}/man3/request_set.3.gz
+%{_mandir}/man3/hosts_access.3*
+#%{_mandir}/man3/hosts_ctl.3*
+#%{_mandir}/man3/request_init.3*
+#%{_mandir}/man3/request_set.3*
+%doc BLURB CHANGES README*
 
 %changelog
+* Fri Nov 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 7.6.31-1mamba
+- update to 7.6.31
+- rebuilt with debug package, debian patches, and specfile fixes
+
 * Fri Sep 21 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 7.6-4mamba
 - added shared_lib_plus_plus patch for dynamic library and build fixes for other packages
 - use Makefile for install, remove specfile code
@@ -117,5 +148,5 @@ install -d %{buildroot}%{_sbindir} %{buildroot}%{_libdir} \
 - misc security fixes
 - fixed gcc compilation errors
 
-* Tue Apr 17 2003 Luca Tinelli <luca.tinelli@qinet.it> 7.6-1qilnx
+* Thu Apr 17 2003 Luca Tinelli <luca.tinelli@qinet.it> 7.6-1qilnx
 - first build