SHA256
7
0
forked from pool/tcpd

Factory #1

Merged
dgarcia merged 9 commits from factory into main 2025-10-08 12:57:56 +02:00
4 changed files with 1493 additions and 2 deletions

1425
tcp_wrappers_7.6-gcc15.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,31 @@
Index: tcp_wrappers_7.6/safe_finger.c
===================================================================
--- tcp_wrappers_7.6.orig/safe_finger.c
+++ tcp_wrappers_7.6/safe_finger.c
@@ -32,12 +32,10 @@ static char sccsid[] = "@(#) safe_finger
/* Local stuff */
-char path[] = "PATH=/bin:/usr/bin:/usr/sbin";
-
#define TIME_LIMIT 60 /* Do not keep listinging forever */
#define INPUT_LENGTH 100000 /* Do not keep listinging forever */
#define LINE_LENGTH 128 /* Editors can choke on long lines */
-#define FINGER_PROGRAM "finger" /* Most, if not all, UNIX systems */
+#define FINGER_PROGRAM "/usr/bin/finger" /* Most, if not all, UNIX systems */
#define UNPRIV_NAME "nobody" /* Preferred privilege level */
#define UNPRIV_UGID 32767 /* Default uid and gid */
@@ -76,9 +74,9 @@ int main(int argc, char **argv)
/*
* Redirect our standard input through the raw finger command.
*/
- if (putenv(path)) {
- fprintf(stderr, "%s: putenv: out of memory", argv[0]);
- exit(1);
+ if (access(FINGER_PROGRAM, X_OK) != 0) {
+ printf("Can not execute " FINGER_PROGRAM ". Please install 'finger' package.\n");
+ return 1;
}
argv[0] = FINGER_PROGRAM;
finger_pid = pipe_stdin(argv);

View File

@@ -1,3 +1,33 @@
-------------------------------------------------------------------
Mon Jun 30 09:17:56 UTC 2025 - pgajdos@suse.com
- readd safe_finger [bsc#1241401]
- added patches
check whether finger is present
+ tcpd-check-finger-presence.patch
-------------------------------------------------------------------
Tue Apr 22 11:20:12 UTC 2025 - pgajdos@suse.com
- remove safe_finger as it calls dropped figner [bsc#1241401]
-------------------------------------------------------------------
Mon Apr 14 10:55:39 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
- drop -std=gnu11, add tcp_wrappers_7.6-gcc15.patch, adapted from
debian, to support dependant packages such as quota or rpcbind
-------------------------------------------------------------------
Sun Apr 13 15:02:17 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
- compile w/ -std=gnu11 to fix gcc15 compile time error, and to
still allow build on Leap 15.6
-------------------------------------------------------------------
Mon Nov 11 11:04:24 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
- hosts.allow/hosts.deny: remove executable bit
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 14 08:10:05 UTC 2024 - pgajdos@suse.com Tue May 14 08:10:05 UTC 2024 - pgajdos@suse.com

View File

@@ -1,7 +1,7 @@
# #
# spec file for package tcpd # spec file for package tcpd
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -65,6 +65,9 @@ Patch32: tcp_wrappers_%{version}-ipv6-host-match.patch
Patch33: tcp_wrappers_%{version}-ipv6-mapped-v4.patch Patch33: tcp_wrappers_%{version}-ipv6-mapped-v4.patch
Patch34: tcp_wrappers_%{version}-ipv6.fix.fix3.diff Patch34: tcp_wrappers_%{version}-ipv6.fix.fix3.diff
Patch35: tcp_wrappers_%{version}-gcc14.patch Patch35: tcp_wrappers_%{version}-gcc14.patch
Patch36: tcp_wrappers_%{version}-gcc15.patch
# check whether finger is present
Patch37: tcpd-check-finger-presence.patch
BuildRequires: linux-kernel-headers BuildRequires: linux-kernel-headers
Provides: nkitb:%{_sbindir}/tcpd Provides: nkitb:%{_sbindir}/tcpd
# bug437293 # bug437293
@@ -139,6 +142,8 @@ to compile and link programs against the TCP wrapper library.
%patch -P 33 -p1 %patch -P 33 -p1
%patch -P 34 %patch -P 34
%patch -P 35 -p1 %patch -P 35 -p1
%patch -P 36 -p1
%patch -P 37 -p1
%build %build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@@ -161,7 +166,7 @@ ln -sf libwrap.so.0.%{version} %{buildroot}/%{_libdir}/libwrap.so.0
ln -sf libwrap.so.0.%{version} %{buildroot}/%{_libdir}/libwrap.so ln -sf libwrap.so.0.%{version} %{buildroot}/%{_libdir}/libwrap.so
mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}
for i in hosts.allow hosts.deny; do for i in hosts.allow hosts.deny; do
install $RPM_SOURCE_DIR/$i %{buildroot}/%{_sysconfdir} install -m 644 $RPM_SOURCE_DIR/$i %{buildroot}/%{_sysconfdir}
done done
%post -n %{lname} -p /sbin/ldconfig %post -n %{lname} -p /sbin/ldconfig