SHA256
3
0
forked from pool/tcpd

Accepting request 1173915 from home:pgajdos

- build with gcc14
- added patches
  + tcp_wrappers_7.6-gcc14.patch

OBS-URL: https://build.opensuse.org/request/show/1173915
OBS-URL: https://build.opensuse.org/package/show/network:utilities/tcpd?expand=0&rev=43
This commit is contained in:
Dirk Mueller 2024-06-06 08:36:26 +00:00 committed by Git OBS Bridge
parent 35a34ba07b
commit 9a82ee38fc
3 changed files with 120 additions and 1 deletions

View File

@ -0,0 +1,110 @@
--- a/hosts_access.c 2024-05-14 09:45:54.109391777 +0200
+++ b/hosts_access.c 2024-05-14 09:28:19.989639524 +0200
@@ -38,6 +38,7 @@ static char sccsid[] = "@(#) hosts_acces
#include <errno.h>
#include <setjmp.h>
#include <string.h>
+#include <stdlib.h>
extern char *fgets();
extern int errno;
@@ -88,6 +89,7 @@ static int client_match();
static int host_match();
static int string_match();
static int masked_match();
+static int match_pattern_ylo();
#ifdef INET6
static void ipv6_mask();
#endif
--- a/inetcf.c 2024-05-14 09:45:54.076058239 +0200
+++ b/inetcf.c 2024-05-14 09:39:27.373700870 +0200
@@ -14,12 +14,14 @@ static char sccsid[] = "@(#) inetcf.c 1.
#include <stdio.h>
#include <errno.h>
#include <string.h>
+#include <stdlib.h>
extern int errno;
extern void exit();
#include "tcpd.h"
#include "inetcf.h"
+#include "scaffold.h"
/*
* Network configuration files may live in unusual places. Here are some
--- a/misc.c 2024-05-14 09:45:54.102725070 +0200
+++ b/misc.c 2024-05-14 09:35:49.282373657 +0200
@@ -14,6 +14,8 @@ static char sccsic[] = "@(#) misc.c 1.2
#include <arpa/inet.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
#include "tcpd.h"
--- a/safe_finger.c 2024-05-14 09:45:54.069391531 +0200
+++ b/safe_finger.c 2024-05-14 09:45:21.879195309 +0200
@@ -52,7 +52,9 @@ int sig;
exit(0);
}
-main(argc, argv)
+static int pipe_stdin();
+
+int main(argc, argv)
int argc;
char **argv;
{
--- a/socket.c 2024-05-14 09:45:54.112725131 +0200
+++ b/socket.c 2024-05-14 09:34:34.351917685 +0200
@@ -200,7 +200,7 @@ struct host_info *host;
case AF_INET6:
ap = (char *)&((struct sockaddr_in6 *)sin)->sin6_addr;
if (IN6_IS_ADDR_V4MAPPED(ap)) {
- ap = &((struct in6_addr *) ap)->s6_addr32[3];
+ ap = (char *)&((struct in6_addr *) ap)->s6_addr32[3];
af = AF_INET;
}
break;
--- a/tcpd.c 2024-05-14 09:45:53.962724209 +0200
+++ b/tcpd.c 2024-05-14 09:15:43.001693796 +0200
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#) tcpd.c 1.10
int allow_severity = SEVERITY; /* run-time adjustable */
int deny_severity = LOG_WARNING; /* ditto */
-main(argc, argv)
+int main(argc, argv)
int argc;
char **argv;
{
--- a/tcpd.h 2024-05-14 09:45:54.102725070 +0200
+++ b/tcpd.h 2024-05-14 09:43:00.575000561 +0200
@@ -89,6 +89,7 @@ extern char *xgets(char *, int, FILE *);
extern char *split_at(char *, int);
extern unsigned long dot_quad_addr(char *);
extern char *skip_ipv6_addrs(char *);
+extern unsigned long prefix_to_netmask(char *);
#else
extern int hosts_access(); /* access control */
extern void shell_cmd(); /* execute shell command */
@@ -100,6 +101,7 @@ extern char *xgets(); /* fgets() on st
extern char *split_at(); /* strchr() and split */
extern unsigned long dot_quad_addr(); /* restricted inet_addr() */
extern char *skip_ipv6_addrs();
+extern unsigned long prefix_to_netmask();
#endif
/* Global variables. */
--- a/try-from.c 1994-12-28 17:42:55.000000000 +0100
+++ b/try-from.c 2024-05-14 09:39:43.527132682 +0200
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#) try-from.c
int allow_severity = SEVERITY; /* run-time adjustable */
int deny_severity = LOG_WARNING; /* ditto */
-main(argc, argv)
+int main(argc, argv)
int argc;
char **argv;
{

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 14 08:10:05 UTC 2024 - pgajdos@suse.com
- build with gcc14
- added patches
+ tcp_wrappers_7.6-gcc14.patch
-------------------------------------------------------------------
Thu Feb 29 12:32:07 UTC 2024 - pgajdos@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package tcpd
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -64,6 +64,7 @@ Patch31: tcp_wrappers_%{version}-ipv6-subnet.diff
Patch32: tcp_wrappers_%{version}-ipv6-host-match.patch
Patch33: tcp_wrappers_%{version}-ipv6-mapped-v4.patch
Patch34: tcp_wrappers_%{version}-ipv6.fix.fix3.diff
Patch35: tcp_wrappers_%{version}-gcc14.patch
BuildRequires: linux-kernel-headers
Provides: nkitb:%{_sbindir}/tcpd
# bug437293
@ -137,6 +138,7 @@ to compile and link programs against the TCP wrapper library.
%patch -P 32 -p1
%patch -P 33 -p1
%patch -P 34
%patch -P 35 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects