pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/tcp_wrappers
Module Name: pkgsrc
Committed By: tnn
Date: Tue Apr 29 14:18:00 UTC 2025
Modified Files:
pkgsrc/security/tcp_wrappers: distinfo
pkgsrc/security/tcp_wrappers/patches: patch-ab patch-af patch-ag
patch-ai patch-aj patch-clean__exit.c patch-options.c
patch-percent__x.c patch-safe__finger.c patch-shell__cmd.c
patch-socket.c patch-tcpdmatch.c
Added Files:
pkgsrc/security/tcp_wrappers/patches: patch-inetcf.h patch-misc.c
patch-mystdarg.h patch-scaffold.h
Log Message:
tcp_wrappers: replace K&R prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/tcp_wrappers/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/tcp_wrappers/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/tcp_wrappers/patches/patch-af \
pkgsrc/security/tcp_wrappers/patches/patch-clean__exit.c \
pkgsrc/security/tcp_wrappers/patches/patch-options.c \
pkgsrc/security/tcp_wrappers/patches/patch-percent__x.c \
pkgsrc/security/tcp_wrappers/patches/patch-safe__finger.c \
pkgsrc/security/tcp_wrappers/patches/patch-shell__cmd.c \
pkgsrc/security/tcp_wrappers/patches/patch-socket.c \
pkgsrc/security/tcp_wrappers/patches/patch-tcpdmatch.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/tcp_wrappers/patches/patch-ag
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/tcp_wrappers/patches/patch-ai \
pkgsrc/security/tcp_wrappers/patches/patch-aj
cvs rdiff -u -r0 -r1.1 pkgsrc/security/tcp_wrappers/patches/patch-inetcf.h \
pkgsrc/security/tcp_wrappers/patches/patch-misc.c \
pkgsrc/security/tcp_wrappers/patches/patch-mystdarg.h \
pkgsrc/security/tcp_wrappers/patches/patch-scaffold.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/tcp_wrappers/distinfo
diff -u pkgsrc/security/tcp_wrappers/distinfo:1.24 pkgsrc/security/tcp_wrappers/distinfo:1.25
--- pkgsrc/security/tcp_wrappers/distinfo:1.24 Thu Sep 19 16:46:44 2024
+++ pkgsrc/security/tcp_wrappers/distinfo Tue Apr 29 14:18:00 2025
@@ -1,29 +1,33 @@
-$NetBSD: distinfo,v 1.24 2024/09/19 16:46:44 tnn Exp $
+$NetBSD: distinfo,v 1.25 2025/04/29 14:18:00 tnn Exp $
BLAKE2s (tcp_wrappers_7.6-ipv6.4.tar.gz) = d05aa438c87a74553812522d91d4dc3c078ed3d176512fde8fe1094f11915ee7
SHA512 (tcp_wrappers_7.6-ipv6.4.tar.gz) = b753b2e54fe243fbcb403470b19fa1b08a912a6a65981dc1bf20288379b903701d4b5a477350cb3470cb6d908cf51ef653f44dc17daff17f34e59b6aa1b41c95
Size (tcp_wrappers_7.6-ipv6.4.tar.gz) = 138700 bytes
SHA1 (patch-aa) = 6bc6f0523b4e8c31a4b02af948f285e800d5c59b
-SHA1 (patch-ab) = 1d1f4cc9ba21e4599a622b69587732527a1a5166
+SHA1 (patch-ab) = 9efde2313af9719872badc73a89f3191a1f28ab3
SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0
-SHA1 (patch-af) = 1bf946174b027880014e64aa9b84dcfa5ca951a0
-SHA1 (patch-ag) = 425af6288053a89215e94f2dbe720d36496c16de
+SHA1 (patch-af) = a0222173c06bd5cfc16d7b0bb702d379f5204b1b
+SHA1 (patch-ag) = 873ca7a9b1ce3fb46b6d533a20577d3a43b3e7bc
SHA1 (patch-ah) = fa829052d466a4597c1cec528ab02c9d2ea98a60
-SHA1 (patch-ai) = 8e27da22c3e52d755749968d07c1e9227c48f417
-SHA1 (patch-aj) = 07f1d068d8e0173fe16ebef5430c0b5d257eac3f
-SHA1 (patch-clean__exit.c) = 6a61c97251c37c2f67d47cc31cd01b31de1a0d32
+SHA1 (patch-ai) = 67ce4f7aa01ea70baf3c6971c06016006b3800af
+SHA1 (patch-aj) = 254934c262358107ba808707c41c16998ccdff17
+SHA1 (patch-clean__exit.c) = eb8b4d005b3c3aec55dcde4f2cde2fe08733decb
SHA1 (patch-diag.c) = 370d7473e3d3bb29308903c1ee530cdd15978708
SHA1 (patch-fakelog.c) = 29c34feb951df20a105b24bf6025ae4d68a5f587
SHA1 (patch-fix_options.c) = ce49ff5b4b1e26eb7634e61fa33ad4697917fbcb
+SHA1 (patch-inetcf.h) = 08d8ff18fcd97e9362e4e6de3facd7497a3bf458
+SHA1 (patch-misc.c) = ec1788518aac239fbc46ea60986fcd986e56b442
+SHA1 (patch-mystdarg.h) = 698aa99a5fe228a4cedc96a1981a63346e5418b4
SHA1 (patch-myvsyslog.c) = bda66de72825eadbf175ebe4ba47107317d7f820
-SHA1 (patch-options.c) = 3e33dc27a5b3e17889536124e4d5c5262758f2a0
-SHA1 (patch-percent__x.c) = 5bab0ee0afdab1b3e3dbbc4195015be7281875e7
+SHA1 (patch-options.c) = 99153e2f6fa7e3c5190498782c8112d0797d9dc4
+SHA1 (patch-percent__x.c) = 6563352ad90f656acbff2daca7970aa0e00f7b40
SHA1 (patch-rfc931.c) = 27bbe7fdbff981dbb6ad50816bd5a23c9d86a2c0
-SHA1 (patch-safe__finger.c) = bb8af8c4919cc016b58a18510c941aea99eb56e1
+SHA1 (patch-safe__finger.c) = e7086ea8a84b62b34f0a8ced7b4af10feb98dfa3
+SHA1 (patch-scaffold.h) = da788e252d7129f4eabeb389c1fee8148b7c5ee6
SHA1 (patch-setenv.c) = d6b126f99fc2c01eb120b8835c2a2c17469c20a2
-SHA1 (patch-shell__cmd.c) = a003824c8865dd170f7279e561d437fdcc2d4416
-SHA1 (patch-socket.c) = 72b66611e705fd29260557d8a3845b426d4076f0
+SHA1 (patch-shell__cmd.c) = c5808df925c474bd6165b13c4ccf9936f186fab8
+SHA1 (patch-socket.c) = 8ecdb3022d3cfae139a3fa12b08441938c2df29b
SHA1 (patch-tcpd.c) = 6cca01afc932c71d01af8fd4869053395217ee67
-SHA1 (patch-tcpdmatch.c) = 97517e55d41e1004f7c4622aebd010a9d9558f32
+SHA1 (patch-tcpdmatch.c) = abac672e3cd7f35209b5a7d849273502cc06d0a5
SHA1 (patch-try-from.c) = 7c573da758f2709c9f1be332adffd284b1d64c98
SHA1 (patch-update.c) = 2d77db15431878666cc37aa06e32bd3eb296f807
Index: pkgsrc/security/tcp_wrappers/patches/patch-ab
diff -u pkgsrc/security/tcp_wrappers/patches/patch-ab:1.5 pkgsrc/security/tcp_wrappers/patches/patch-ab:1.6
--- pkgsrc/security/tcp_wrappers/patches/patch-ab:1.5 Mon Aug 5 14:15:10 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-ab Tue Apr 29 14:18:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2024/08/05 14:15:10 tnn Exp $
+$NetBSD: patch-ab,v 1.6 2025/04/29 14:18:00 tnn Exp $
--- tcpd.h.orig 2003-04-16 14:27:11.000000000 +0000
+++ tcpd.h
@@ -10,7 +10,29 @@ $NetBSD: patch-ab,v 1.5 2024/08/05 14:15
typedef struct sockaddr_gen {
union {
-@@ -137,7 +138,13 @@ extern void fromhost(); /* get/validat
+@@ -29,7 +30,7 @@ typedef union gen_addr {
+ #endif
+ } gen_addr;
+
+-extern void sockgen_simplify();
++extern void sockgen_simplify(sockaddr_gen *);
+
+ #define sg_sa sg_addr._sg_sa
+ #define sg_sin sg_addr._sg_sin
+@@ -92,9 +93,9 @@ struct request_info {
+ char pid[10]; /* access via eval_pid(request) */
+ struct host_info client[1]; /* client endpoint info */
+ struct host_info server[1]; /* server endpoint info */
+- void (*sink) (); /* datagram sink function or 0 */
+- void (*hostname) (); /* address to printable hostname */
+- void (*hostaddr) (); /* address to printable address */
++ void (*sink) (int); /* datagram sink function or 0 */
++ void (*hostname) (struct host_info *); /* address to printable hostname */
++ void (*hostaddr) (struct host_info *); /* address to printable address */
+ void (*cleanup) (); /* cleanup function or 0 */
+ struct netconfig *config; /* netdir handle */
+ };
+@@ -137,17 +138,23 @@ extern void fromhost(); /* get/validat
#define fromhost sock_host /* no TLI support needed */
#endif
@@ -19,11 +41,31 @@ $NetBSD: patch-ab,v 1.5 2024/08/05 14:15
+extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
+#else
extern int hosts_access(); /* access control */
+-extern void shell_cmd(); /* execute shell command */
+-extern char *percent_x(); /* do %<char> expansion */
+-extern void rfc931(); /* client name from RFC 931 daemon */
+-extern void clean_exit(); /* clean up and exit */
+-extern void refuse(); /* clean up and exit */
+-extern char *xgets(); /* fgets() on steroids */
+-extern char *split_at(); /* strchr() and split */
+-extern unsigned long dot_quad_addr(); /* restricted inet_addr() */
+-extern int numeric_addr(); /* IP4/IP6 inet_addr (restricted) */
+-extern struct hostent *tcpd_gethostbyname();
+extern int hosts_ctl();
+#endif
- extern void shell_cmd(); /* execute shell command */
- extern char *percent_x(); /* do %<char> expansion */
- extern void rfc931(); /* client name from RFC 931 daemon */
++extern void shell_cmd(char *); /* execute shell command */
++extern char *percent_x(char *, int, char *, struct request_info *); /* do %<char> expansion */
++extern void rfc931(struct sockaddr_gen *, struct sockaddr_gen *, char *); /* client name from RFC 931 daemon */
++extern void clean_exit(struct request_info *); /* clean up and exit */
++extern void refuse(struct request_info *); /* clean up and exit */
++extern char *xgets(char *, int, FILE *); /* fgets() on steroids */
++extern char *split_at(char *, int); /* strchr() and split */
++extern unsigned long dot_quad_addr(char *); /* restricted inet_addr() */
++extern int numeric_addr(char *, union gen_addr *, int *, int *); /* IP4/IP6 inet_addr (restricted) */
++extern struct hostent *tcpd_gethostbyname(char *, int);
+ /* IP4/IP6 gethostbyname */
+ #ifdef HAVE_IPV6
+ extern char *skip_ipv6_addrs(); /* skip over colons in IPv6 addrs */
@@ -196,20 +203,35 @@ extern struct request_info *request_set(
* host_info structures serve as caches for the lookup results.
*/
@@ -60,3 +102,37 @@ $NetBSD: patch-ab,v 1.5 2024/08/05 14:15
#define sock_methods(r) \
{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
+@@ -257,7 +279,7 @@ extern struct tcpd_context tcpd_context;
+ * behavior.
+ */
+
+-extern void process_options(); /* execute options */
++extern void process_options(char *, struct request_info *); /* execute options */
+ extern int dry_run; /* verification flag */
+
+ /* Bug workarounds. */
+@@ -269,7 +291,7 @@ extern long fix_inet_addr();
+
+ #ifdef BROKEN_FGETS /* partial reads from sockets */
+ #define fgets fix_fgets
+-extern char *fix_fgets();
++extern char *fix_fgets(char *, int, FILE *);
+ #endif
+
+ #ifdef RECVFROM_BUG /* no address family info */
+@@ -279,7 +301,7 @@ extern int fix_recvfrom();
+
+ #ifdef GETPEERNAME_BUG /* claims success with UDP */
+ #define getpeername fix_getpeername
+-extern int fix_getpeername();
++extern int fix_getpeername(int, struct sockaddr *sa, int *);
+ #endif
+
+ #ifdef SOLARIS_24_GETHOSTBYNAME_BUG /* lists addresses as aliases */
+@@ -294,5 +316,5 @@ extern char *fix_strtok();
+
+ #ifdef LIBC_CALLS_STRTOK /* libc calls strtok() */
+ #define strtok my_strtok
+-extern char *my_strtok();
++extern char *my_strtok(char *, char *);
+ #endif
Index: pkgsrc/security/tcp_wrappers/patches/patch-af
diff -u pkgsrc/security/tcp_wrappers/patches/patch-af:1.1 pkgsrc/security/tcp_wrappers/patches/patch-af:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-af:1.1 Thu Feb 17 23:10:45 2005
+++ pkgsrc/security/tcp_wrappers/patches/patch-af Tue Apr 29 14:18:00 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/02/17 23:10:45 peter Exp $
+$NetBSD: patch-af,v 1.2 2025/04/29 14:18:00 tnn Exp $
---- scaffold.c.orig 1999-10-27 15:27:22.000000000 +0200
-+++ scaffold.c 2005-02-17 23:56:49.000000000 +0100
-@@ -20,13 +20,12 @@
+--- scaffold.c.orig 1999-10-27 13:27:22.000000000 +0000
++++ scaffold.c
+@@ -20,13 +20,12 @@ static char sccs_id[] = "@(#) scaffold.c
#include <syslog.h>
#include <setjmp.h>
#include <string.h>
@@ -17,3 +17,17 @@ $NetBSD: patch-af,v 1.1 2005/02/17 23:10
/* Application-specific. */
#include "tcpd.h"
+@@ -180,11 +179,13 @@ struct request_info *request;
+
+ /* ARGSUSED */
+
++#if 0
+ void rfc931(request)
+ struct request_info *request;
+ {
+ strcpy(request->user, unknown);
+ }
++#endif
+
+ /* check_path - examine accessibility */
+
Index: pkgsrc/security/tcp_wrappers/patches/patch-clean__exit.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-clean__exit.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-clean__exit.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-clean__exit.c:1.1 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-clean__exit.c Tue Apr 29 14:18:00 2025
@@ -1,12 +1,15 @@
-$NetBSD: patch-clean__exit.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-clean__exit.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
---- clean_exit.c.orig 2024-08-05 13:51:37.866956280 +0000
+--- clean_exit.c.orig 1994-12-28 16:42:20.000000000 +0000
+++ clean_exit.c
-@@ -13,6 +13,7 @@ static char sccsid[] = "@(#) clean_exit.
+@@ -13,8 +13,9 @@ static char sccsid[] = "@(#) clean_exit.
#endif
#include <stdio.h>
+#include <unistd.h>
- extern void exit();
+-extern void exit();
++#include <stdlib.h>
+
+ #include "tcpd.h"
Index: pkgsrc/security/tcp_wrappers/patches/patch-options.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-options.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-options.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-options.c:1.1 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-options.c Tue Apr 29 14:18:00 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-options.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-options.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
---- options.c.orig 2024-08-05 14:07:29.242137802 +0000
+--- options.c.orig 1996-02-11 16:01:32.000000000 +0000
+++ options.c
@@ -47,6 +47,8 @@ static char sccsid[] = "@(#) options.c 1
#include <ctype.h>
@@ -11,3 +11,70 @@ $NetBSD: patch-options.c,v 1.1 2024/08/0
#ifndef MAXPATHNAMELEN
#define MAXPATHNAMELEN BUFSIZ
+@@ -66,31 +68,31 @@ extern jmp_buf tcpd_buf; /* tcpd_jump()
+ static char whitespace_eq[] = "= \t\r\n";
+ #define whitespace (whitespace_eq + 1)
+
+-static char *get_field(); /* chew :-delimited field off string */
+-static char *chop_string(); /* strip leading and trailing blanks */
++static char *get_field(char *); /* chew :-delimited field off string */
++static char *chop_string(char *); /* strip leading and trailing blanks */
+
+ /* List of functions that implement the options. Add yours here. */
+
+-static void user_option(); /* execute "user name.group" option */
+-static void group_option(); /* execute "group name" option */
+-static void umask_option(); /* execute "umask mask" option */
+-static void linger_option(); /* execute "linger time" option */
+-static void keepalive_option(); /* execute "keepalive" option */
+-static void spawn_option(); /* execute "spawn command" option */
+-static void twist_option(); /* execute "twist command" option */
+-static void rfc931_option(); /* execute "rfc931" option */
+-static void setenv_option(); /* execute "setenv name value" */
+-static void nice_option(); /* execute "nice" option */
+-static void severity_option(); /* execute "severity value" */
+-static void allow_option(); /* execute "allow" option */
+-static void deny_option(); /* execute "deny" option */
+-static void banners_option(); /* execute "banners path" option */
++static void user_option(char *, struct request_info *); /* execute "user name.group" option */
++static void group_option(char *, struct request_info *); /* execute "group name" option */
++static void umask_option(char *, struct request_info *); /* execute "umask mask" option */
++static void linger_option(char *, struct request_info *); /* execute "linger time" option */
++static void keepalive_option(char *, struct request_info *); /* execute "keepalive" option */
++static void spawn_option(char *, struct request_info *); /* execute "spawn command" option */
++static void twist_option(char *, struct request_info *); /* execute "twist command" option */
++static void rfc931_option(char *, struct request_info *); /* execute "rfc931" option */
++static void setenv_option(char *, struct request_info *); /* execute "setenv name value" */
++static void nice_option(char *, struct request_info *); /* execute "nice" option */
++static void severity_option(char *, struct request_info *); /* execute "severity value" */
++static void allow_option(char *, struct request_info *); /* execute "allow" option */
++static void deny_option(char *, struct request_info *); /* execute "deny" option */
++static void banners_option(char *, struct request_info *); /* execute "banners path" option */
+
+ /* Structure of the options table. */
+
+ struct option {
+ char *name; /* keyword name, case is ignored */
+- void (*func) (); /* function that does the real work */
++ void (*func) (char *, struct request_info *); /* function that does the real work */
+ int flags; /* see below... */
+ };
+
+@@ -250,7 +252,7 @@ char *value;
+ struct request_info *request;
+ {
+ struct group *grp;
+- struct group *getgrnam();
++ struct group *getgrnam(const char *);
+
+ if ((grp = getgrnam(value)) == 0)
+ tcpd_jump("unknown group: \"%s\"", value);
+@@ -269,7 +271,7 @@ char *value;
+ struct request_info *request;
+ {
+ struct passwd *pwd;
+- struct passwd *getpwnam();
++ struct passwd *getpwnam(const char *);
+ char *group;
+
+ if ((group = split_at(value, '.')) != 0)
Index: pkgsrc/security/tcp_wrappers/patches/patch-percent__x.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-percent__x.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-percent__x.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-percent__x.c:1.1 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-percent__x.c Tue Apr 29 14:18:00 2025
@@ -1,12 +1,15 @@
-$NetBSD: patch-percent__x.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-percent__x.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
---- percent_x.c.orig 2024-08-05 13:52:09.983774379 +0000
+--- percent_x.c.orig 1994-12-28 16:42:38.000000000 +0000
+++ percent_x.c
-@@ -19,6 +19,7 @@ static char sccsid[] = "@(#) percent_x.c
+@@ -19,8 +19,9 @@ static char sccsid[] = "@(#) percent_x.c
#include <stdio.h>
#include <syslog.h>
#include <string.h>
+#include <unistd.h>
- extern void exit();
+-extern void exit();
++#include <stdlib.h>
+
+ /* Local stuff. */
Index: pkgsrc/security/tcp_wrappers/patches/patch-safe__finger.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-safe__finger.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-safe__finger.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-safe__finger.c:1.1 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-safe__finger.c Tue Apr 29 14:18:00 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-safe__finger.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-safe__finger.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
--- safe_finger.c.orig 1994-12-28 16:42:42.000000000 +0000
+++ safe_finger.c
-@@ -22,11 +22,16 @@ static char sccsid[] = "@(#) safe_finger
+@@ -22,12 +22,16 @@ static char sccsid[] = "@(#) safe_finger
#include <sys/types.h>
#include <sys/stat.h>
@@ -15,11 +15,12 @@ $NetBSD: patch-safe__finger.c,v 1.1 2024
+#include <fcntl.h>
+#include <stdlib.h>
+-extern void exit();
+int pipe_stdin(char**);
- extern void exit();
/* Local stuff */
-@@ -49,6 +54,7 @@ int sig;
+
+@@ -49,6 +53,7 @@ int sig;
exit(0);
}
Index: pkgsrc/security/tcp_wrappers/patches/patch-shell__cmd.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-shell__cmd.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-shell__cmd.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-shell__cmd.c:1.1 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-shell__cmd.c Tue Apr 29 14:18:00 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-shell__cmd.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-shell__cmd.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
---- shell_cmd.c.orig 2024-08-05 14:07:12.929804367 +0000
+--- shell_cmd.c.orig 1994-12-28 16:42:44.000000000 +0000
+++ shell_cmd.c
-@@ -16,10 +16,13 @@ static char sccsid[] = "@(#) shell_cmd.c
+@@ -16,12 +16,15 @@ static char sccsid[] = "@(#) shell_cmd.c
#include <sys/types.h>
#include <sys/param.h>
@@ -14,5 +14,17 @@ $NetBSD: patch-shell__cmd.c,v 1.1 2024/0
+#include <unistd.h>
+#include <fcntl.h>
- extern void exit();
+-extern void exit();
++#include <stdlib.h>
+
+ /* Local stuff. */
+
+@@ -29,7 +32,7 @@ extern void exit();
+
+ /* Forward declarations. */
+
+-static void do_child();
++static void do_child(char *);
+
+ /* shell_cmd - execute shell command */
Index: pkgsrc/security/tcp_wrappers/patches/patch-socket.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-socket.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-socket.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-socket.c:1.1 Thu Sep 19 16:46:44 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-socket.c Tue Apr 29 14:18:00 2025
@@ -1,14 +1,25 @@
-$NetBSD: patch-socket.c,v 1.1 2024/09/19 16:46:44 tnn Exp $
+$NetBSD: patch-socket.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
Include arpa/inet.h for inet_pton(3)
---- socket.c.orig 2024-09-19 16:43:43.630481893 +0000
+--- socket.c.orig 1999-10-27 13:23:14.000000000 +0000
+++ socket.c
-@@ -29,6 +29,7 @@ static char sccsid[] = "@(#) socket.c 1.
+@@ -29,8 +29,7 @@ static char sccsid[] = "@(#) socket.c 1.
#include <stdio.h>
#include <syslog.h>
#include <string.h>
+-
+-extern char *inet_ntoa();
+#include <arpa/inet.h>
- extern char *inet_ntoa();
+ /* Local stuff. */
+
+@@ -38,7 +37,7 @@ extern char *inet_ntoa();
+
+ /* Forward declarations. */
+
+-static void sock_sink();
++static void sock_sink(int);
+
+ #ifdef APPEND_DOT
Index: pkgsrc/security/tcp_wrappers/patches/patch-tcpdmatch.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-tcpdmatch.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-tcpdmatch.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-tcpdmatch.c:1.1 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-tcpdmatch.c Tue Apr 29 14:18:00 2025
@@ -1,13 +1,26 @@
-$NetBSD: patch-tcpdmatch.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-tcpdmatch.c,v 1.2 2025/04/29 14:18:00 tnn Exp $
---- tcpdmatch.c.orig 2024-08-05 14:09:19.243824349 +0000
+--- tcpdmatch.c.orig 1999-10-27 14:16:35.000000000 +0000
+++ tcpdmatch.c
-@@ -29,6 +29,8 @@ static char sccsid[] = "@(#) tcpdmatch.c
+@@ -29,8 +29,9 @@ static char sccsid[] = "@(#) tcpdmatch.c
#include <syslog.h>
#include <setjmp.h>
#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
- extern void exit();
+-extern void exit();
extern int optind;
+ extern char *optarg;
+
+@@ -48,8 +49,8 @@ extern char *optarg;
+ #include "inetcf.h"
+ #include "scaffold.h"
+
+-static void usage();
+-static void tcpdmatch();
++static void usage(char *);
++static void tcpdmatch(struct request_info *);
+
+ /* The main program */
+
Index: pkgsrc/security/tcp_wrappers/patches/patch-ag
diff -u pkgsrc/security/tcp_wrappers/patches/patch-ag:1.3 pkgsrc/security/tcp_wrappers/patches/patch-ag:1.4
--- pkgsrc/security/tcp_wrappers/patches/patch-ag:1.3 Thu Sep 19 16:46:44 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-ag Tue Apr 29 14:18:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2024/09/19 16:46:44 tnn Exp $
+$NetBSD: patch-ag,v 1.4 2025/04/29 14:18:00 tnn Exp $
--- hosts_access.c.orig 2003-12-25 00:49:56.000000000 +0000
+++ hosts_access.c
@@ -13,6 +13,36 @@ $NetBSD: patch-ag,v 1.3 2024/09/19 16:46
#ifndef INADDR_NONE
#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+@@ -75,13 +73,13 @@ int resident = (-1); /* -1, 0: unkn
+
+ /* Forward declarations. */
+
+-static int table_match();
+-static int list_match();
+-static int server_match();
+-static int client_match();
+-static int host_match();
+-static int string_match();
+-static int masked_match();
++static int table_match(char*, struct request_info *);
++static int list_match(char *, struct request_info *, int (*)(char *, struct request_info *));
++static int server_match(char *, struct request_info *);
++static int client_match(char *, struct request_info *);
++static int host_match(char *, struct host_info *);
++static int string_match(char *, char *);
++static int masked_match(char *, char *, char *);
+ #ifdef HAVE_IPV6
+ static void ipv6_mask();
+ #endif
+@@ -188,7 +186,7 @@ struct request_info *request;
+ static int list_match(list, request, match_fn)
+ char *list;
+ struct request_info *request;
+-int (*match_fn) ();
++int (*match_fn)(char *, struct request_info *);
+ {
+ char *tok;
+
@@ -405,7 +403,7 @@ static void ipv6_mask(in6p, maskbits)
struct in6_addr *in6p;
int maskbits;
Index: pkgsrc/security/tcp_wrappers/patches/patch-ai
diff -u pkgsrc/security/tcp_wrappers/patches/patch-ai:1.2 pkgsrc/security/tcp_wrappers/patches/patch-ai:1.3
--- pkgsrc/security/tcp_wrappers/patches/patch-ai:1.2 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-ai Tue Apr 29 14:18:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-ai,v 1.3 2025/04/29 14:18:00 tnn Exp $
--- inetcf.c.orig 1997-02-12 01:13:24.000000000 +0000
+++ inetcf.c
@@ -19,3 +19,23 @@ $NetBSD: patch-ai,v 1.2 2024/08/05 12:48
/*
* Network configuration files may live in unusual places. Here are some
+@@ -36,8 +35,8 @@ char *inet_files[] = {
+ 0,
+ };
+
+-static void inet_chk();
+-static char *base_name();
++static void inet_chk(char *, char *, char *, char *);
++static char *base_name(char *);
+
+ /*
+ * Structure with everything we know about a service.
+@@ -66,7 +65,7 @@ char *conf;
+ char *arg0;
+ char *arg1;
+ struct tcpd_context saved_context;
+- char *percent_m();
++ char *percent_m(char *, char *);
+ int i;
+ struct stat st;
+
Index: pkgsrc/security/tcp_wrappers/patches/patch-aj
diff -u pkgsrc/security/tcp_wrappers/patches/patch-aj:1.2 pkgsrc/security/tcp_wrappers/patches/patch-aj:1.3
--- pkgsrc/security/tcp_wrappers/patches/patch-aj:1.2 Mon Aug 5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-aj Tue Apr 29 14:18:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-aj,v 1.3 2025/04/29 14:18:00 tnn Exp $
--- tcpdchk.c.orig 1999-10-28 06:38:06.000000000 +0000
+++ tcpdchk.c
@@ -19,3 +19,26 @@ $NetBSD: patch-aj,v 1.2 2024/08/05 12:48
extern int optind;
extern char *optarg;
+@@ -67,14 +67,14 @@ extern jmp_buf tcpd_buf;
+ * Local stuff.
+ */
+ static void usage();
+-static void parse_table();
+-static void print_list();
+-static void check_daemon_list();
+-static void check_client_list();
+-static void check_daemon();
+-static void check_user();
+-static int check_host();
+-static int reserved_name();
++static void parse_table(char *, struct request_info *);
++static void print_list(char *, char *);
++static void check_daemon_list(char *);
++static void check_client_list(char *);
++static void check_daemon(char *);
++static void check_user(char *);
++static int check_host(char *);
++static int reserved_name(char *);
+
+ #define PERMIT 1
+ #define DENY 0
Added files:
Index: pkgsrc/security/tcp_wrappers/patches/patch-inetcf.h
diff -u /dev/null pkgsrc/security/tcp_wrappers/patches/patch-inetcf.h:1.1
--- /dev/null Tue Apr 29 14:18:00 2025
+++ pkgsrc/security/tcp_wrappers/patches/patch-inetcf.h Tue Apr 29 14:18:00 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-inetcf.h,v 1.1 2025/04/29 14:18:00 tnn Exp $
+
+--- inetcf.h.orig 2025-04-29 13:28:22.132359019 +0000
++++ inetcf.h
+@@ -4,9 +4,9 @@
+ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
+ */
+
+-extern char *inet_cfg(); /* read inetd.conf file */
+-extern void inet_set(); /* remember internet service */
+-extern int inet_get(); /* look up internet service */
++extern char *inet_cfg(char *); /* read inetd.conf file */
++extern void inet_set(char *, int); /* remember internet service */
++extern int inet_get(char *); /* look up internet service */
+
+ #define WR_UNKNOWN (-1) /* service unknown */
+ #define WR_NOT 1 /* may not be wrapped */
Index: pkgsrc/security/tcp_wrappers/patches/patch-misc.c
diff -u /dev/null pkgsrc/security/tcp_wrappers/patches/patch-misc.c:1.1
--- /dev/null Tue Apr 29 14:18:00 2025
+++ pkgsrc/security/tcp_wrappers/patches/patch-misc.c Tue Apr 29 14:18:00 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-misc.c,v 1.1 2025/04/29 14:18:00 tnn Exp $
+
+--- misc.c.orig 2025-04-29 13:24:23.152144242 +0000
++++ misc.c
+@@ -19,8 +19,6 @@ static char sccsic[] = "@(#) misc.c 1.2
+
+ #include "tcpd.h"
+
+-extern char *fgets();
+-
+ #ifndef INADDR_NONE
+ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+ #endif
Index: pkgsrc/security/tcp_wrappers/patches/patch-mystdarg.h
diff -u /dev/null pkgsrc/security/tcp_wrappers/patches/patch-mystdarg.h:1.1
--- /dev/null Tue Apr 29 14:18:00 2025
+++ pkgsrc/security/tcp_wrappers/patches/patch-mystdarg.h Tue Apr 29 14:18:00 2025
@@ -0,0 +1,10 @@
+$NetBSD: patch-mystdarg.h,v 1.1 2025/04/29 14:18:00 tnn Exp $
+
+--- mystdarg.h.orig 2025-04-29 12:53:14.212107539 +0000
++++ mystdarg.h
+@@ -16,4 +16,4 @@
+ #define VAEND(ap) va_end(ap);}
+ #endif
+
+-extern char *percent_m();
++extern char *percent_m(char *, char *);
Index: pkgsrc/security/tcp_wrappers/patches/patch-scaffold.h
diff -u /dev/null pkgsrc/security/tcp_wrappers/patches/patch-scaffold.h:1.1
--- /dev/null Tue Apr 29 14:18:00 2025
+++ pkgsrc/security/tcp_wrappers/patches/patch-scaffold.h Tue Apr 29 14:18:00 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-scaffold.h,v 1.1 2025/04/29 14:18:00 tnn Exp $
+
+--- scaffold.h.orig 2025-04-29 13:27:24.805794093 +0000
++++ scaffold.h
+@@ -4,6 +4,6 @@
+ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
+ */
+
+-extern struct hostent *find_inet_addr();
+-extern int check_dns();
+-extern int check_path();
++extern struct hostent *find_inet_addr(char *);
++extern int check_dns(char *);
++extern int check_path(char *, struct stat *);
Home |
Main Index |
Thread Index |
Old Index