rpms
/
tcp_wrappers
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rediff all patches to get rid of patch fuzz

This commit is contained in:
Jan Šafránek 2008-08-29 07:49:41 +00:00
parent 52de858384
commit e615632138
23 changed files with 436 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tcp_wrappers-7.6-162412.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/inetcf.c.162412 2006-01-24 15:33:20.000000000 +0100
+++ tcp_wrappers_7.6/inetcf.c 2006-01-24 15:35:44.000000000 +0100
@@ -61,7 +61,7 @@
diff -up tcp_wrappers_7.6/inetcf.c.patch16 tcp_wrappers_7.6/inetcf.c
--- tcp_wrappers_7.6/inetcf.c.patch16 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/inetcf.c 2008-08-29 09:45:12.000000000 +0200
@@ -61,7 +61,7 @@ char *inet_cfg(conf)
char *conf;
{
char buf[BUFSIZ];

7
tcp_wrappers-7.6-196326.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/hosts_access.c.196326 2007-06-28 13:44:10.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2007-06-28 15:33:45.000000000 +0200
@@ -346,6 +346,9 @@
diff -up tcp_wrappers_7.6/hosts_access.c.patch21 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch21 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -346,6 +346,9 @@ char *string;
return (STR_NE(string, unknown));
} else if (tok[(n = strlen(tok)) - 1] == '.') { /* prefix */
return (STRN_EQ(tok, string, n));

35
tcp_wrappers-7.6-220015.patch
View File

@ -1,16 +1,7 @@
--- tcp_wrappers_7.6/tcpd.h.220015 2007-06-28 15:42:49.000000000 +0200
+++ tcp_wrappers_7.6/tcpd.h 2007-06-28 15:43:59.000000000 +0200
@@ -167,6 +167,7 @@
/* look up endpoint addresses */
extern void sock_host __P((struct request_info *));
+extern void sock_hostnofd __P((struct request_info *));
/* translate address to hostname */
extern void sock_hostname __P((struct host_info *));
/* address to printable address */
--- tcp_wrappers_7.6/hosts_ctl.c.220015 1994-12-28 17:42:28.000000000 +0100
+++ tcp_wrappers_7.6/hosts_ctl.c 2007-06-28 15:42:49.000000000 +0200
@@ -29,10 +29,12 @@
diff -up tcp_wrappers_7.6/hosts_ctl.c.patch17 tcp_wrappers_7.6/hosts_ctl.c
--- tcp_wrappers_7.6/hosts_ctl.c.patch17 1994-12-28 17:42:28.000000000 +0100
+++ tcp_wrappers_7.6/hosts_ctl.c 2008-08-29 09:45:12.000000000 +0200
@@ -29,10 +29,12 @@ char *user;
{
struct request_info request;
@ -29,9 +20,10 @@
+
+ return (hosts_access(&request));
}
--- tcp_wrappers_7.6/socket.c.220015 2007-06-28 15:42:49.000000000 +0200
+++ tcp_wrappers_7.6/socket.c 2007-06-28 15:42:49.000000000 +0200
@@ -147,6 +147,51 @@
diff -up tcp_wrappers_7.6/socket.c.patch17 tcp_wrappers_7.6/socket.c
--- tcp_wrappers_7.6/socket.c.patch17 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/socket.c 2008-08-29 09:45:12.000000000 +0200
@@ -147,6 +147,51 @@ struct request_info *request;
#endif
}
@ -83,3 +75,14 @@
/* sock_hostaddr - map endpoint address to printable form */
void sock_hostaddr(host)
diff -up tcp_wrappers_7.6/tcpd.h.patch17 tcp_wrappers_7.6/tcpd.h
--- tcp_wrappers_7.6/tcpd.h.patch17 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/tcpd.h 2008-08-29 09:45:12.000000000 +0200
@@ -167,6 +167,7 @@ extern char *eval_server __P((struct req
/* look up endpoint addresses */
extern void sock_host __P((struct request_info *));
+extern void sock_hostnofd __P((struct request_info *));
/* translate address to hostname */
extern void sock_hostname __P((struct host_info *));
/* address to printable address */

48
tcp_wrappers-7.6-bug11881.patch
View File

@ -1,6 +1,28 @@
--- tcp_wrappers_7.6/tcpd.c.bug11881 Thu Jul 27 15:39:27 2000
+++ tcp_wrappers_7.6/tcpd.c Thu Jul 27 15:41:54 2000
@@ -60,10 +60,10 @@
diff -up tcp_wrappers_7.6/eval.c.patch4 tcp_wrappers_7.6/eval.c
--- tcp_wrappers_7.6/eval.c.patch4 1995-01-30 19:51:46.000000000 +0100
+++ tcp_wrappers_7.6/eval.c 2008-08-29 09:45:12.000000000 +0200
@@ -111,7 +111,7 @@ struct request_info *request;
return (hostinfo);
#endif
if (STR_NE(eval_user(request), unknown)) {
- sprintf(both, "%s@%s", request->user, hostinfo);
+ snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo);
return (both);
} else {
return (hostinfo);
@@ -128,7 +128,7 @@ struct request_info *request;
char *daemon = eval_daemon(request);
if (STR_NE(host, unknown)) {
- sprintf(both, "%s@%s", daemon, host);
+ snprintf(both, sizeof(both), "%s@%s", daemon, host);
return (both);
} else {
return (daemon);
diff -up tcp_wrappers_7.6/tcpd.c.patch4 tcp_wrappers_7.6/tcpd.c
--- tcp_wrappers_7.6/tcpd.c.patch4 1996-02-11 17:01:33.000000000 +0100
+++ tcp_wrappers_7.6/tcpd.c 2008-08-29 09:45:12.000000000 +0200
@@ -60,10 +60,10 @@ char **argv;
*/
if (argv[0][0] == '/') {
@ -13,23 +35,3 @@
}
/*
--- tcp_wrappers_7.6/eval.c.bug11881 Thu Jul 27 15:39:53 2000
+++ tcp_wrappers_7.6/eval.c Thu Jul 27 15:40:51 2000
@@ -111,7 +111,7 @@
return (hostinfo);
#endif
if (STR_NE(eval_user(request), unknown)) {
- sprintf(both, "%s@%s", request->user, hostinfo);
+ snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo);
return (both);
} else {
return (hostinfo);
@@ -128,7 +128,7 @@
char *daemon = eval_daemon(request);
if (STR_NE(host, unknown)) {
- sprintf(both, "%s@%s", daemon, host);
+ snprintf(both, sizeof(both), "%s@%s", daemon, host);
return (both);
} else {
return (daemon);

42
tcp_wrappers-7.6-bug17795.patch
View File

@ -1,6 +1,24 @@
--- tcp_wrappers_7.6/hosts_access.c Wed Feb 12 03:13:23 1997
+++ tcp_wrappers/hosts_access.c Wed Jul 19 08:37:02 2000
@@ -240,6 +255,26 @@
diff -up tcp_wrappers_7.6/hosts_access.5.patch5 tcp_wrappers_7.6/hosts_access.5
--- tcp_wrappers_7.6/hosts_access.5.patch5 1995-01-30 19:51:47.000000000 +0100
+++ tcp_wrappers_7.6/hosts_access.5 2008-08-29 09:45:12.000000000 +0200
@@ -89,6 +89,13 @@ An expression of the form `n.n.n.n/m.m.m
bitwise AND of the address and the `mask\'. For example, the net/mask
pattern `131.155.72.0/255.255.254.0\' matches every address in the
range `131.155.72.0\' through `131.155.73.255\'.
+.IP \(bu
+A string that begins with a `/\' character is treated as a file
+name. A host name or address is matched if it matches any host name
+or address pattern listed in the named file. The file format is
+zero or more lines with zero or more host name or address patterns
+separated by whitespace. A file name pattern can be used anywhere
+a host name or address pattern can be used.
.SH WILDCARDS
The access control language supports explicit wildcards:
.IP ALL
diff -up tcp_wrappers_7.6/hosts_access.c.patch5 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch5 1997-02-12 02:13:23.000000000 +0100
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -240,6 +240,26 @@ struct request_info *request;
}
}
@ -27,7 +45,7 @@
/* host_match - match host name and/or address against pattern */
static int host_match(tok, host)
@@ -267,6 +302,8 @@
@@ -267,6 +287,8 @@ struct host_info *host;
tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */
return (NO);
#endif
@ -36,19 +54,3 @@
} else if (STR_EQ(tok, "KNOWN")) { /* check address and name */
char *name = eval_hostname(host);
return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name));
--- tcp_wrappers_7.6/hosts_access.5 Mon Jan 30 20:51:47 1995
+++ tcp_wrappers.new/hosts_access.5 Wed Sep 20 22:24:29 2000
@@ -89,6 +89,13 @@
bitwise AND of the address and the `mask\'. For example, the net/mask
pattern `131.155.72.0/255.255.254.0\' matches every address in the
range `131.155.72.0\' through `131.155.73.255\'.
+.IP \(bu
+A string that begins with a `/\' character is treated as a file
+name. A host name or address is matched if it matches any host name
+or address pattern listed in the named file. The file format is
+zero or more lines with zero or more host name or address patterns
+separated by whitespace. A file name pattern can be used anywhere
+a host name or address pattern can be used.
.SH WILDCARDS
The access control language supports explicit wildcards:
.IP ALL

18
tcp_wrappers-7.6-bug17847.patch
View File

@ -1,7 +1,7 @@
diff -uNr tcp_wrappers_7.6/hosts_access.5 tcp_wrappers_7.6.new/hosts_access.5
--- tcp_wrappers_7.6/hosts_access.5 Fri Sep 22 21:29:24 2000
+++ tcp_wrappers_7.6.new/hosts_access.5 Fri Sep 22 21:28:44 2000
@@ -96,6 +96,10 @@
diff -up tcp_wrappers_7.6/hosts_access.5.patch6 tcp_wrappers_7.6/hosts_access.5
--- tcp_wrappers_7.6/hosts_access.5.patch6 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.5 2008-08-29 09:45:12.000000000 +0200
@@ -96,6 +96,10 @@ or address pattern listed in the named f
zero or more lines with zero or more host name or address patterns
separated by whitespace. A file name pattern can be used anywhere
a host name or address pattern can be used.
@ -12,10 +12,10 @@ diff -uNr tcp_wrappers_7.6/hosts_access.5 tcp_wrappers_7.6.new/hosts_access.5
.SH WILDCARDS
The access control language supports explicit wildcards:
.IP ALL
diff -uNr tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c Fri Sep 22 21:29:24 2000
+++ tcp_wrappers_7.6.new/hosts_access.c Fri Sep 22 21:18:09 2000
@@ -311,6 +311,11 @@
diff -up tcp_wrappers_7.6/hosts_access.c.patch6 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch6 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -311,6 +311,11 @@ char *string;
{
int n;
@ -27,7 +27,7 @@ diff -uNr tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
if (tok[0] == '.') { /* suffix */
n = strlen(string) - strlen(tok);
return (n > 0 && STR_EQ(tok, string + n));
@@ -351,3 +356,71 @@
@@ -351,3 +356,71 @@ char *string;
}
return ((addr & mask) == net);
}

7
tcp_wrappers-7.6-docu.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/hosts_access.5.docu Tue Jun 11 21:05:44 2002
+++ tcp_wrappers_7.6/hosts_access.5 Tue Jun 11 21:06:25 2002
@@ -340,7 +340,7 @@
diff -up tcp_wrappers_7.6/hosts_access.5.patch8 tcp_wrappers_7.6/hosts_access.5
--- tcp_wrappers_7.6/hosts_access.5.patch8 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.5 2008-08-29 09:45:12.000000000 +0200
@@ -333,7 +333,7 @@ in.tftpd: LOCAL, .my.domain
/etc/hosts.deny:
.in +3
.nf

9
tcp_wrappers-7.6-fix_sig-bug141110.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/hosts_access.c.bug141110 2004-11-29 15:19:09.872243504 +0300
+++ tcp_wrappers_7.6/hosts_access.c 2004-11-29 19:59:09.282344976 +0300
@@ -127,7 +127,7 @@
diff -up tcp_wrappers_7.6/hosts_access.c.patch15 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch15 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -127,7 +127,7 @@ struct request_info *request;
verdict = setjmp(tcpd_buf);
if (verdict != 0)
return (verdict == AC_PERMIT);
@ -9,7 +10,7 @@
return (YES);
if (table_match(hosts_deny_table, request) == NO)
return (YES);
@@ -177,7 +177,7 @@
@@ -177,7 +177,7 @@ struct request_info *request;
tcpd_warn("cannot open %s: %m", table);
match = ERR;
}

9
tcp_wrappers-7.6-fixgethostbyname.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/socket.c.fixgethostbyname Fri Mar 21 13:27:25 1997
+++ tcp_wrappers_7.6/socket.c Mon Feb 5 14:09:40 2001
@@ -52,7 +52,8 @@
diff -up tcp_wrappers_7.6/socket.c.patch7 tcp_wrappers_7.6/socket.c
--- tcp_wrappers_7.6/socket.c.patch7 1997-03-21 19:27:25.000000000 +0100
+++ tcp_wrappers_7.6/socket.c 2008-08-29 09:45:12.000000000 +0200
@@ -52,7 +52,8 @@ static struct hostent *gethostbyname_dot
char *name;
{
char dot_name[MAXHOSTNAMELEN + 1];
@ -10,7 +11,7 @@
/*
* Don't append dots to unqualified names. Such names are likely to come
* from local hosts files or from NIS.
@@ -61,8 +62,12 @@
@@ -61,8 +62,12 @@ char *name;
if (strchr(name, '.') == 0 || strlen(name) >= MAXHOSTNAMELEN - 1) {
return (gethostbyname(name));
} else {

7
tcp_wrappers-7.6-ldflags.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/Makefile.ldflags 2004-03-05 14:47:36.438315648 +0100
+++ tcp_wrappers_7.6/Makefile 2004-03-05 14:50:01.438272304 +0100
@@ -732,26 +732,26 @@
diff -up tcp_wrappers_7.6/Makefile.patch14 tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6/Makefile.patch14 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/Makefile 2008-08-29 09:45:12.000000000 +0200
@@ -732,26 +732,26 @@ $(SHLIB): $(LIB_OBJ)
ln -s $(SHLIB).$(MAJOR).$(MINOR).$(REL) $(SHLIB)
tcpd: tcpd.o $(LIB)

12
tcp_wrappers-7.6-restore_sigalarm.patch
View File

@ -1,7 +1,7 @@
diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c 2004-08-29 18:40:02.000000000 +0200
@@ -92,6 +92,8 @@
diff -up tcp_wrappers_7.6/rfc931.c.patch18 tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6/rfc931.c.patch18 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c 2008-08-29 09:45:12.000000000 +0200
@@ -92,6 +92,8 @@ char *dest;
char *cp;
char *result = unknown;
FILE *fp;
@ -10,7 +10,7 @@ diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
#ifdef INET6
/* address family must be the same */
@@ -134,7 +136,12 @@
@@ -134,7 +136,12 @@ char *dest;
*/
if (setjmp(timebuf) == 0) {
@ -24,7 +24,7 @@ diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
alarm(rfc931_timeout);
/*
@@ -223,6 +230,10 @@
@@ -223,6 +230,10 @@ char *dest;
}
alarm(0);
}

84
tcp_wrappers-7.6-shared.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/Makefile.shared 2003-02-10 20:12:26.000000000 +0100
+++ tcp_wrappers_7.6/Makefile 2003-02-10 20:14:05.000000000 +0100
@@ -150,8 +150,8 @@
diff -up tcp_wrappers_7.6/Makefile.patch11 tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6/Makefile.patch11 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/Makefile 2008-08-29 09:45:12.000000000 +0200
@@ -150,8 +150,8 @@ netbsd:
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
@ -11,7 +12,7 @@
linux-old:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
@@ -249,7 +249,7 @@
@@ -249,7 +249,7 @@ tandem:
# Amdahl UTS 2.1.5 (Richard.Richmond@bridge.bst.bls.com)
uts215:
@ -20,7 +21,7 @@
LIBS="-lsocket" RANLIB=echo \
ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP=-DNO_NETGROUP TLI= all
@@ -706,8 +706,9 @@
@@ -706,8 +706,9 @@ KIT = README miscd.c tcpd.c fromhost.c h
scaffold.h tcpdmatch.8 README.NIS
LIB = libwrap.a
@ -31,7 +32,7 @@
# Invalidate all object files when the compiler options (CFLAGS) have changed.
@@ -724,6 +725,12 @@
@@ -724,6 +725,12 @@ $(LIB): $(LIB_OBJ)
$(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
-$(RANLIB) $(LIB)
@ -44,15 +45,40 @@
tcpd: tcpd.o $(LIB)
$(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
@@ -906,5 +913,6 @@
@@ -906,5 +913,6 @@ update.o: cflags
update.o: mystdarg.h
update.o: tcpd.h
vfprintf.o: cflags
+weak_symbols.o: tcpd.h
workarounds.o: cflags
workarounds.o: tcpd.h
--- tcp_wrappers_7.6/tcpd.h.shared 2003-02-10 20:12:26.000000000 +0100
+++ tcp_wrappers_7.6/tcpd.h 2003-02-10 20:12:26.000000000 +0100
diff -up tcp_wrappers_7.6/scaffold.c.patch11 tcp_wrappers_7.6/scaffold.c
--- tcp_wrappers_7.6/scaffold.c.patch11 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/scaffold.c 2008-08-29 09:45:12.000000000 +0200
@@ -237,10 +237,17 @@ struct request_info *request;
/* ARGSUSED */
-void rfc931(request)
-struct request_info *request;
+void rfc931(rmt_sin, our_sin, dest)
+#ifndef INET6
+struct sockaddr_in *rmt_sin;
+struct sockaddr_in *our_sin;
+#else
+struct sockaddr *rmt_sin;
+struct sockaddr *our_sin;
+#endif
+char *dest;
{
- strcpy(request->user, unknown);
+ strcpy(dest, unknown);
}
/* check_path - examine accessibility */
diff -up tcp_wrappers_7.6/tcpd.h.patch11 tcp_wrappers_7.6/tcpd.h
--- tcp_wrappers_7.6/tcpd.h.patch11 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/tcpd.h 2008-08-29 09:45:12.000000000 +0200
@@ -4,6 +4,25 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
@ -79,7 +105,7 @@
/* Structure to describe one communications endpoint. */
#define STRING_LENGTH 128 /* hosts, users, processes */
@@ -29,10 +48,10 @@
@@ -29,10 +48,10 @@ 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 */
@ -94,7 +120,7 @@
struct netconfig *config; /* netdir handle */
};
@@ -65,25 +84,34 @@
@@ -65,25 +84,34 @@ extern char paranoid[];
/* Global functions. */
#if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
@ -139,7 +165,7 @@
extern char *hosts_allow_table; /* for verification mode redirection */
extern char *hosts_deny_table; /* for verification mode redirection */
extern int hosts_access_verbose; /* for verbose matching mode */
@@ -96,9 +124,14 @@
@@ -96,9 +124,14 @@ extern int resident; /* > 0 if residen
*/
#ifdef __STDC__
@ -154,7 +180,7 @@
extern struct request_info *request_init(); /* initialize request */
extern struct request_info *request_set(); /* update request structure */
#endif
@@ -121,27 +154,31 @@
@@ -121,27 +154,31 @@ extern struct request_info *request_set(
* host_info structures serve as caches for the lookup results.
*/
@ -196,7 +222,7 @@
#endif
/*
@@ -182,7 +219,7 @@
@@ -182,7 +219,7 @@ extern struct tcpd_context tcpd_context;
* behavior.
*/
@ -205,7 +231,7 @@
extern int dry_run; /* verification flag */
/* Bug workarounds. */
@@ -221,3 +258,7 @@
@@ -221,3 +258,7 @@ extern char *fix_strtok();
#define strtok my_strtok
extern char *my_strtok();
#endif
@ -213,31 +239,9 @@
+__END_DECLS
+
+#endif /* tcpd.h */
--- tcp_wrappers_7.6/scaffold.c.shared 2003-02-10 20:12:26.000000000 +0100
+++ tcp_wrappers_7.6/scaffold.c 2003-02-10 20:12:26.000000000 +0100
@@ -237,10 +237,17 @@
/* ARGSUSED */
-void rfc931(request)
-struct request_info *request;
+void rfc931(rmt_sin, our_sin, dest)
+#ifndef INET6
+struct sockaddr_in *rmt_sin;
+struct sockaddr_in *our_sin;
+#else
+struct sockaddr *rmt_sin;
+struct sockaddr *our_sin;
+#endif
+char *dest;
{
- strcpy(request->user, unknown);
+ strcpy(dest, unknown);
}
/* check_path - examine accessibility */
--- /dev/null 2003-01-30 11:24:37.000000000 +0100
+++ tcp_wrappers_7.6/weak_symbols.c 2003-02-10 20:12:26.000000000 +0100
diff -up /dev/null tcp_wrappers_7.6/weak_symbols.c
--- /dev/null 2008-08-29 10:35:15.589003986 +0200
+++ tcp_wrappers_7.6/weak_symbols.c 2008-08-29 09:45:12.000000000 +0200
@@ -0,0 +1,11 @@
+ /*
+ * @(#) weak_symbols.h 1.5 99/12/29 23:50

13
tcp_wrappers-7.6-sig.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/hosts_access.c.sig 2003-02-10 16:18:31.000000000 +0100
+++ tcp_wrappers_7.6/hosts_access.c 2003-02-10 16:50:38.000000000 +0100
@@ -66,6 +66,7 @@
diff -up tcp_wrappers_7.6/hosts_access.c.patch12 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch12 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -66,6 +66,7 @@ static char sep[] = ", \t\r\n";
#define YES 1
#define NO 0
@ -8,7 +9,7 @@
/*
* These variables are globally visible so that they can be redirected in
@@ -106,7 +107,6 @@
@@ -106,7 +107,6 @@ int hosts_access(request)
struct request_info *request;
{
int verdict;
@ -16,7 +17,7 @@
/*
* If the (daemon, client) pair is matched by an entry in the file
* /etc/hosts.allow, access is granted. Otherwise, if the (daemon,
@@ -129,9 +129,9 @@
@@ -129,9 +129,9 @@ struct request_info *request;
return (verdict == AC_PERMIT);
if (table_match(hosts_allow_table, request))
return (YES);
@ -29,7 +30,7 @@
}
/* table_match - match table entries with (daemon, client) pair */
@@ -175,6 +175,7 @@
@@ -175,6 +175,7 @@ struct request_info *request;
(void) fclose(fp);
} else if (errno != ENOENT) {
tcpd_warn("cannot open %s: %m", table);

11
tcp_wrappers-7.6-sigchld.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/shell_cmd.c.sigchld 1994-12-28 17:42:44.000000000 +0100
+++ tcp_wrappers_7.6/shell_cmd.c 2007-06-28 15:42:17.000000000 +0200
@@ -20,6 +20,11 @@
diff -up tcp_wrappers_7.6/shell_cmd.c.patch20 tcp_wrappers_7.6/shell_cmd.c
--- tcp_wrappers_7.6/shell_cmd.c.patch20 1994-12-28 17:42:44.000000000 +0100
+++ tcp_wrappers_7.6/shell_cmd.c 2008-08-29 09:45:12.000000000 +0200
@@ -20,6 +20,11 @@ static char sccsid[] = "@(#) shell_cmd.c
#include <stdio.h>
#include <syslog.h>
#include <string.h>
@ -12,7 +13,7 @@
extern void exit();
@@ -31,13 +36,42 @@
@@ -31,13 +36,42 @@ extern void exit();
static void do_child();
@ -56,7 +57,7 @@
/*
* Most of the work is done within the child process, to minimize the
@@ -49,12 +83,26 @@
@@ -49,12 +83,26 @@ char *command;
tcpd_warn("cannot fork: %m");
break;
case 00: /* child */

6
tcp_wrappers-7.6-siglongjmp.patch
View File

@ -1,6 +1,6 @@
diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c 2004-08-29 18:41:04.000000000 +0200
diff -up tcp_wrappers_7.6/rfc931.c.patch19 tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6/rfc931.c.patch19 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c 2008-08-29 09:45:12.000000000 +0200
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */

9
tcp_wrappers-7.6-strerror.patch
View File

@ -1,6 +1,7 @@
--- tcp-wrappers-7.6/percent_m.c
+++ tcp-wrappers-7.6/percent_m.c
@@ -13,7 +13,7 @@
diff -up tcp_wrappers_7.6/percent_m.c.patch13 tcp_wrappers_7.6/percent_m.c
--- tcp_wrappers_7.6/percent_m.c.patch13 1994-12-28 17:42:37.000000000 +0100
+++ tcp_wrappers_7.6/percent_m.c 2008-08-29 09:45:12.000000000 +0200
@@ -13,7 +13,7 @@ static char sccsid[] = "@(#) percent_m.c
#include <string.h>
extern int errno;
@ -9,7 +10,7 @@
extern char *sys_errlist[];
extern int sys_nerr;
#endif
@@ -29,11 +29,15 @@
@@ -29,11 +29,15 @@ char *ibuf;
while (*bp = *cp)
if (*cp == '%' && cp[1] == 'm') {

7
tcp_wrappers.spec
View File

@ -1,7 +1,7 @@
Summary: A security tool which acts as a wrapper for TCP daemons
Name: tcp_wrappers
Version: 7.6
Release: 52%{?dist}
Release: 53%{?dist}
%define LIB_MAJOR 0
%define LIB_MINOR 7
@ -77,7 +77,7 @@ develop applications with tcp_wrappers support.
%patch5 -p1 -b .bug17847
%patch6 -p1 -b .fixgethostbyname
%patch7 -p1 -b .docu
%patch9 -p0 -b .usagi-ipv6
%patch9 -p1 -b .usagi-ipv6
%patch10 -p1 -b .ume-ipv6
%patch11 -p1 -b .shared
%patch12 -p1 -b .sig
@ -148,6 +148,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man3/*
%changelog
* Fri Aug 29 2008 Jan Safranek <jsafranek@redhat.com> - 7.6-53
- rediff all patches to get rid of patch fuzz
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 7.6-52
- Autorebuild for GCC 4.3

18
tcp_wrappers.ume-ipv6.patch
View File

@ -1,7 +1,7 @@
diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002
+++ tcp_wrappers_7.6.new/hosts_access.c Mon May 20 14:25:05 2002
@@ -448,6 +448,15 @@
diff -up tcp_wrappers_7.6/hosts_access.c.patch10 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch10 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -443,6 +443,15 @@ char *string;
int len, mask_len, i = 0;
char ch;
@ -17,7 +17,7 @@ diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET6;
hints.ai_socktype = SOCK_STREAM;
@@ -457,13 +466,6 @@
@@ -452,13 +461,6 @@ char *string;
memcpy(&addr, res->ai_addr, sizeof(addr));
freeaddrinfo(res);
@ -31,10 +31,10 @@ diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
/* match IPv6 address against netnumber/prefixlen */
len = strlen(net_tok);
if (*net_tok != '[' || net_tok[len - 1] != ']')
diff -uN tcp_wrappers_7.6/socket.c tcp_wrappers_7.6.new/socket.c
--- tcp_wrappers_7.6/socket.c Mon May 20 13:48:35 2002
+++ tcp_wrappers_7.6.new/socket.c Mon May 20 14:22:27 2002
@@ -228,7 +228,7 @@
diff -up tcp_wrappers_7.6/socket.c.patch10 tcp_wrappers_7.6/socket.c
--- tcp_wrappers_7.6/socket.c.patch10 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/socket.c 2008-08-29 09:45:12.000000000 +0200
@@ -228,7 +228,7 @@ struct host_info *host;
hints.ai_family = sin->sa_family;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST;

530
tcp_wrappers.usagi-ipv6.patch
View File

@ -1,107 +1,7 @@
Index: Makefile
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 2001/03/02 09:26:27 1.1.1.1
+++ Makefile 2001/03/02 09:30:19 1.2
@@ -21,7 +21,7 @@
@echo " dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix"
@echo " linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
@echo " ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4"
- @echo " sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
+ @echo " sunos40 sunos5 solaris8 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
@echo " uts215 uxp"
@echo
@echo "If none of these match your environment, edit the system"
@@ -131,20 +131,33 @@
NETGROUP=-DNETGROUP TLI= SYSTYPE="-systype bsd43" all
# Freebsd and linux by default have no NIS.
-386bsd netbsd bsdos:
+386bsd bsdos:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
freebsd:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS="-L/usr/local/v6/lib -linet6" \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
- EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" \
+ VSYSLOG= all
+
+netbsd:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" VSYSLOG= all
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS="-lnsl" RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
- NETGROUP="-DNETGROUP" TLI= EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER" all
+ NETGROUP="-DNETGROUP" TLI= EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
+
+linux-old:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS="/usr/inet6/lib/libinet6.a -lresolv" \
+ RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP= TLI= \
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=sin6_family -Dsockaddr_storage=sockaddr_in6 -I/usr/inet6/include" all
# This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
hpux hpux8 hpux9 hpux10:
@@ -196,6 +209,13 @@
NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \
BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" all
+# SunOS 5.8 is another SYSV4 variant, but has IPv6 support
+solaris8:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv VSYSLOG= \
+ NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \
+ EXTRA_CFLAGS="-DINET6 -DNO_CLONE_DEVICE -DINT32_T" all
+
# Generic SYSV40
esix sysv4:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
@@ -391,7 +411,7 @@
# the ones provided with this source distribution. The environ.c module
# implements setenv(), getenv(), and putenv().
-AUX_OBJ= setenv.o
+#AUX_OBJ= setenv.o
#AUX_OBJ= environ.o
#AUX_OBJ= environ.o strcasecmp.o
@@ -454,7 +474,7 @@
# host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
# around this. The workaround does no harm on other Solaris versions.
-BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
+#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
@@ -472,7 +492,7 @@
# If your system supports vsyslog(), comment out the following definition.
# If in doubt leave it in, it won't harm.
-VSYSLOG = -Dvsyslog=myvsyslog
+#VSYSLOG = -Dvsyslog=myvsyslog
# End of the system dependencies.
#################################
Index: fix_options.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/fix_options.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fix_options.c 2001/03/02 09:26:27 1.1.1.1
+++ fix_options.c 2001/03/02 09:30:19 1.2
@@ -11,6 +11,9 @@
diff -up tcp_wrappers_7.6/fix_options.c.patch9 tcp_wrappers_7.6/fix_options.c
--- tcp_wrappers_7.6/fix_options.c.patch9 1997-04-08 02:29:19.000000000 +0200
+++ tcp_wrappers_7.6/fix_options.c 2008-08-29 09:45:12.000000000 +0200
@@ -11,6 +11,9 @@ static char sccsid[] = "@(#) fix_options
#include <sys/types.h>
#include <sys/param.h>
@ -111,7 +11,7 @@ diff -u -r1.1.1.1 -r1.2
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
@@ -41,6 +44,22 @@
@@ -41,6 +44,22 @@ struct request_info *request;
unsigned int opt;
int optlen;
struct in_addr dummy;
@ -134,15 +34,10 @@ diff -u -r1.1.1.1 -r1.2
if ((ip = getprotobyname("ip")) != 0)
ipproto = ip->p_proto;
Index: hosts_access.5
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/hosts_access.5,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hosts_access.5 2001/03/02 09:26:27 1.1.1.1
+++ hosts_access.5 2001/03/02 09:30:19 1.2
@@ -85,10 +85,17 @@
diff -up tcp_wrappers_7.6/hosts_access.5.patch9 tcp_wrappers_7.6/hosts_access.5
--- tcp_wrappers_7.6/hosts_access.5.patch9 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.5 2008-08-29 09:45:12.000000000 +0200
@@ -85,11 +85,18 @@ member of the specified netgroup. Netgro
for daemon process names or for client user names.
.IP \(bu
An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a
@ -151,26 +46,21 @@ diff -u -r1.1.1.1 -r1.2
bitwise AND of the address and the `mask\'. For example, the net/mask
pattern `131.155.72.0/255.255.254.0\' matches every address in the
range `131.155.72.0\' through `131.155.73.255\'.
+.IP \(bu
.IP \(bu
+An expression of the form `[n:n:n:n:n:n:n:n]/m\' is interpreted as a
+`[net]/prefixlen\' pair. An IPv6 host address is matched if
+`prefixlen\' bits of `net\' is equal to the `prefixlen\' bits of the
+address. For example, the [net]/prefixlen pattern
+`[3ffe:505:2:1::]/64\' matches every address in the range
+`3ffe:505:2:1::\' through `3ffe:505:2:1:ffff:ffff:ffff:ffff\'.
.IP \(bu
+.IP \(bu
A string that begins with a `/\' character is treated as a file
name. A host name or address is matched if it matches any host name
Index: hosts_access.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/hosts_access.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hosts_access.c 2001/03/02 09:26:27 1.1.1.1
+++ hosts_access.c 2001/03/02 09:30:19 1.2
@@ -24,7 +24,13 @@
or address pattern listed in the named file. The file format is
diff -up tcp_wrappers_7.6/hosts_access.c.patch9 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch9 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -24,7 +24,13 @@ static char sccsid[] = "@(#) hosts_acces
/* System libraries. */
#include <sys/types.h>
@ -184,7 +74,7 @@ diff -u -r1.1.1.1 -r1.2
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdio.h>
@@ -33,6 +39,9 @@
@@ -33,6 +39,9 @@ static char sccsid[] = "@(#) hosts_acces
#include <errno.h>
#include <setjmp.h>
#include <string.h>
@ -194,7 +84,7 @@ diff -u -r1.1.1.1 -r1.2
extern char *fgets();
extern int errno;
@@ -82,6 +91,10 @@
@@ -82,6 +91,10 @@ static int client_match();
static int host_match();
static int string_match();
static int masked_match();
@ -205,7 +95,7 @@ diff -u -r1.1.1.1 -r1.2
/* Size of logical line buffer. */
@@ -289,6 +302,13 @@
@@ -311,6 +324,13 @@ char *string;
{
int n;
@ -219,7 +109,7 @@ diff -u -r1.1.1.1 -r1.2
#ifndef DISABLE_WILDCARD_MATCHING
if (strchr(tok, '*') || strchr(tok,'?')) { /* contains '*' or '?' */
return (match_pattern_ylo(string,tok));
@@ -299,20 +319,72 @@
@@ -326,20 +346,72 @@ char *string;
} else if (tok[(n = strlen(tok)) - 1] == '.') { /* prefix */
return (STRN_EQ(tok, string, n));
} else { /* exact match */
@ -292,7 +182,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Disallow forms other than dotted quad: the treatment that inet_addr()
@@ -416,11 +423,77 @@
@@ -351,12 +423,78 @@ char *string;
return (NO);
if ((net = dot_quad_addr(net_tok)) == INADDR_NONE
|| (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) {
@ -303,7 +193,7 @@ diff -u -r1.1.1.1 -r1.2
}
return ((addr & mask) == net);
}
+
+#ifdef INET6
+static int masked_match6(net_tok, mask_tok, string)
+char *net_tok;
@ -367,19 +257,14 @@ diff -u -r1.1.1.1 -r1.2
+ return YES;
+}
+#endif /* INET6 */
+
#ifndef DISABLE_WILDCARD_MATCHING
/* Note: this feature has been adapted in a pretty straightforward way
Index: inetcf.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/inetcf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- inetcf.c 2001/03/02 09:26:27 1.1.1.1
+++ inetcf.c 2001/03/02 09:30:19 1.2
@@ -26,6 +26,9 @@
from Tatu Ylonen's last SSH version under free license by
diff -up tcp_wrappers_7.6/inetcf.c.patch9 tcp_wrappers_7.6/inetcf.c
--- tcp_wrappers_7.6/inetcf.c.patch9 1997-02-12 02:13:24.000000000 +0100
+++ tcp_wrappers_7.6/inetcf.c 2008-08-29 09:45:12.000000000 +0200
@@ -26,6 +26,9 @@ extern void exit();
* guesses. Shorter names follow longer ones.
*/
char *inet_files[] = {
@ -389,15 +274,100 @@ diff -u -r1.1.1.1 -r1.2
"/private/etc/inetd.conf", /* NEXT */
"/etc/inet/inetd.conf", /* SYSV4 */
"/usr/etc/inetd.conf", /* IRIX?? */
Index: misc.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/misc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- misc.c 2001/03/02 09:26:27 1.1.1.1
+++ misc.c 2001/03/02 09:30:19 1.2
@@ -58,9 +58,31 @@
diff -up tcp_wrappers_7.6/Makefile.patch9 tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6/Makefile.patch9 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/Makefile 2008-08-29 09:45:12.000000000 +0200
@@ -21,7 +21,7 @@ what:
@echo " dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix"
@echo " linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
@echo " ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4"
- @echo " sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
+ @echo " sunos40 sunos5 solaris8 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
@echo " uts215 uxp"
@echo
@echo "If none of these match your environment, edit the system"
@@ -131,20 +131,33 @@ epix:
NETGROUP=-DNETGROUP TLI= SYSTYPE="-systype bsd43" all
# Freebsd and linux by default have no NIS.
-386bsd netbsd bsdos:
+386bsd bsdos:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
freebsd:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS="-L/usr/local/v6/lib -linet6" \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
- EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" \
+ VSYSLOG= all
+
+netbsd:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" VSYSLOG= all
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS="-lnsl" RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
- NETGROUP="-DNETGROUP" TLI= EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER" all
+ NETGROUP="-DNETGROUP" TLI= EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
+
+linux-old:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS="/usr/inet6/lib/libinet6.a -lresolv" \
+ RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP= TLI= \
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=sin6_family -Dsockaddr_storage=sockaddr_in6 -I/usr/inet6/include" all
# This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
hpux hpux8 hpux9 hpux10:
@@ -196,6 +209,13 @@ sunos5:
NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \
BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" all
+# SunOS 5.8 is another SYSV4 variant, but has IPv6 support
+solaris8:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv VSYSLOG= \
+ NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \
+ EXTRA_CFLAGS="-DINET6 -DNO_CLONE_DEVICE -DINT32_T" all
+
# Generic SYSV40
esix sysv4:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
@@ -391,7 +411,7 @@ AR = ar
# the ones provided with this source distribution. The environ.c module
# implements setenv(), getenv(), and putenv().
-AUX_OBJ= setenv.o
+#AUX_OBJ= setenv.o
#AUX_OBJ= environ.o
#AUX_OBJ= environ.o strcasecmp.o
@@ -454,7 +474,7 @@ AUX_OBJ= setenv.o
# host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
# around this. The workaround does no harm on other Solaris versions.
-BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
+#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
@@ -472,7 +492,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS
# If your system supports vsyslog(), comment out the following definition.
# If in doubt leave it in, it won't harm.
-VSYSLOG = -Dvsyslog=myvsyslog
+#VSYSLOG = -Dvsyslog=myvsyslog
# End of the system dependencies.
#################################
diff -up tcp_wrappers_7.6/misc.c.patch9 tcp_wrappers_7.6/misc.c
--- tcp_wrappers_7.6/misc.c.patch9 1996-02-11 17:01:30.000000000 +0100
+++ tcp_wrappers_7.6/misc.c 2008-08-29 09:45:12.000000000 +0200
@@ -58,9 +58,31 @@ int delimiter;
{
char *cp;
@ -429,15 +399,10 @@ diff -u -r1.1.1.1 -r1.2
}
/* dot_quad_addr - convert dotted quad to internal form */
Index: refuse.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/refuse.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- refuse.c 2001/03/02 09:26:27 1.1.1.1
+++ refuse.c 2001/03/02 09:30:19 1.2
@@ -25,7 +25,12 @@
diff -up tcp_wrappers_7.6/refuse.c.patch9 tcp_wrappers_7.6/refuse.c
--- tcp_wrappers_7.6/refuse.c.patch9 1994-12-28 17:42:40.000000000 +0100
+++ tcp_wrappers_7.6/refuse.c 2008-08-29 09:45:12.000000000 +0200
@@ -25,7 +25,12 @@ static char sccsid[] = "@(#) refuse.c 1.
void refuse(request)
struct request_info *request;
{
@ -450,15 +415,10 @@ diff -u -r1.1.1.1 -r1.2
clean_exit(request);
/* NOTREACHED */
}
Index: rfc931.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/rfc931.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rfc931.c 2001/03/02 09:26:26 1.1.1.1
+++ rfc931.c 2001/03/02 09:30:19 1.2
@@ -68,20 +68,50 @@
diff -up tcp_wrappers_7.6/rfc931.c.patch9 tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6/rfc931.c.patch9 1995-01-02 16:11:34.000000000 +0100
+++ tcp_wrappers_7.6/rfc931.c 2008-08-29 09:45:12.000000000 +0200
@@ -68,20 +68,50 @@ int sig;
/* rfc931 - return remote user name, given socket structures */
void rfc931(rmt_sin, our_sin, dest)
@ -509,7 +469,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Use one unbuffered stdio stream for writing to and for reading from
* the RFC931 etc. server. This is done because of a bug in the SunOS
@@ -92,7 +122,11 @@
@@ -92,7 +122,11 @@ char *dest;
* sockets.
*/
@ -521,7 +481,7 @@ diff -u -r1.1.1.1 -r1.2
setbuf(fp, (char *) 0);
/*
@@ -112,6 +146,25 @@
@@ -112,6 +146,25 @@ char *dest;
* addresses from the query socket.
*/
@ -547,7 +507,7 @@ diff -u -r1.1.1.1 -r1.2
our_query_sin = *our_sin;
our_query_sin.sin_port = htons(ANY_PORT);
rmt_query_sin = *rmt_sin;
@@ -121,6 +174,7 @@
@@ -121,6 +174,7 @@ char *dest;
sizeof(our_query_sin)) >= 0 &&
connect(fileno(fp), (struct sockaddr *) & rmt_query_sin,
sizeof(rmt_query_sin)) >= 0) {
@ -555,7 +515,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Send query to server. Neglect the risk that a 13-byte
@@ -129,8 +183,13 @@
@@ -129,8 +183,13 @@ char *dest;
*/
fprintf(fp, "%u,%u\r\n",
@ -569,7 +529,7 @@ diff -u -r1.1.1.1 -r1.2
fflush(fp);
/*
@@ -144,8 +203,13 @@
@@ -144,8 +203,13 @@ char *dest;
&& ferror(fp) == 0 && feof(fp) == 0
&& sscanf(buffer, "%u , %u : USERID :%*[^:]:%255s",
&rmt_port, &our_port, user) == 3
@ -583,15 +543,10 @@ diff -u -r1.1.1.1 -r1.2
/*
* Strip trailing carriage return. It is part of the
Index: scaffold.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/scaffold.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- scaffold.c 2001/03/02 09:26:27 1.1.1.1
+++ scaffold.c 2001/03/02 09:30:19 1.2
@@ -25,7 +25,9 @@
diff -up tcp_wrappers_7.6/scaffold.c.patch9 tcp_wrappers_7.6/scaffold.c
--- tcp_wrappers_7.6/scaffold.c.patch9 1997-03-21 19:27:24.000000000 +0100
+++ tcp_wrappers_7.6/scaffold.c 2008-08-29 09:45:12.000000000 +0200
@@ -25,7 +25,9 @@ static char sccs_id[] = "@(#) scaffold.c
#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
#endif
@ -601,7 +556,7 @@ diff -u -r1.1.1.1 -r1.2
/* Application-specific. */
@@ -39,6 +41,7 @@
@@ -39,6 +41,7 @@ int allow_severity = SEVERITY;
int deny_severity = LOG_WARNING;
int rfc931_timeout = RFC931_TIMEOUT;
@ -609,7 +564,7 @@ diff -u -r1.1.1.1 -r1.2
/* dup_hostent - create hostent in one memory block */
static struct hostent *dup_hostent(hp)
@@ -73,9 +76,46 @@
@@ -73,9 +76,46 @@ struct hostent *hp;
}
return (&hb->host);
}
@ -656,7 +611,7 @@ diff -u -r1.1.1.1 -r1.2
struct hostent *find_inet_addr(host)
char *host;
{
@@ -118,6 +158,7 @@
@@ -118,6 +158,7 @@ char *host;
}
return (dup_hostent(hp));
}
@ -664,7 +619,7 @@ diff -u -r1.1.1.1 -r1.2
/* check_dns - give each address thorough workout, return address count */
@@ -125,8 +166,13 @@
@@ -125,8 +166,13 @@ int check_dns(host)
char *host;
{
struct request_info request;
@ -678,7 +633,7 @@ diff -u -r1.1.1.1 -r1.2
int count;
char *addr;
@@ -134,11 +180,18 @@
@@ -134,11 +180,18 @@ char *host;
return (0);
request_init(&request, RQ_CLIENT_SIN, &sin, 0);
sock_methods(&request);
@ -697,7 +652,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Force host name and address conversions. Use the request structure
@@ -151,7 +204,11 @@
@@ -151,7 +204,11 @@ char *host;
tcpd_warn("host address %s->name lookup failed",
eval_hostaddr(request.client));
}
@ -709,14 +664,9 @@ diff -u -r1.1.1.1 -r1.2
return (count);
}
Index: scaffold.h
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/scaffold.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- scaffold.h 2001/03/02 09:26:27 1.1.1.1
+++ scaffold.h 2001/03/02 09:30:19 1.2
diff -up tcp_wrappers_7.6/scaffold.h.patch9 tcp_wrappers_7.6/scaffold.h
--- tcp_wrappers_7.6/scaffold.h.patch9 1994-12-31 18:19:20.000000000 +0100
+++ tcp_wrappers_7.6/scaffold.h 2008-08-29 09:45:12.000000000 +0200
@@ -4,6 +4,10 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
@ -728,15 +678,10 @@ diff -u -r1.1.1.1 -r1.2
+#endif
extern int check_dns();
extern int check_path();
Index: socket.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/socket.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- socket.c 2001/03/02 09:26:27 1.1.1.1
+++ socket.c 2001/03/02 09:30:19 1.2
@@ -24,13 +24,22 @@
diff -up tcp_wrappers_7.6/socket.c.patch9 tcp_wrappers_7.6/socket.c
--- tcp_wrappers_7.6/socket.c.patch9 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/socket.c 2008-08-29 09:45:12.000000000 +0200
@@ -24,13 +24,22 @@ static char sccsid[] = "@(#) socket.c 1.
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@ -759,7 +704,7 @@ diff -u -r1.1.1.1 -r1.2
/* Local stuff. */
@@ -74,8 +83,13 @@
@@ -79,8 +88,13 @@ char *name;
void sock_host(request)
struct request_info *request;
{
@ -773,7 +718,7 @@ diff -u -r1.1.1.1 -r1.2
int len;
char buf[BUFSIZ];
int fd = request->fd;
@@ -104,7 +118,11 @@
@@ -109,7 +123,11 @@ struct request_info *request;
memset(buf, 0 sizeof(buf));
#endif
}
@ -785,7 +730,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Determine the server binding. This is used for client username
@@ -117,7 +135,11 @@
@@ -122,7 +140,11 @@ struct request_info *request;
tcpd_warn("getsockname: %m");
return;
}
@ -797,7 +742,7 @@ diff -u -r1.1.1.1 -r1.2
}
/* sock_hostaddr - map endpoint address to printable form */
@@ -125,10 +147,26 @@
@@ -130,10 +152,26 @@ struct request_info *request;
void sock_hostaddr(host)
struct host_info *host;
{
@ -824,7 +769,7 @@ diff -u -r1.1.1.1 -r1.2
}
/* sock_hostname - map endpoint address to host name */
@@ -136,6 +174,160 @@
@@ -141,6 +179,160 @@ struct host_info *host;
void sock_hostname(host)
struct host_info *host;
{
@ -985,7 +930,7 @@ diff -u -r1.1.1.1 -r1.2
struct sockaddr_in *sin = host->sin;
struct hostent *hp;
int i;
@@ -215,6 +407,7 @@
@@ -220,6 +412,7 @@ struct host_info *host;
}
strcpy(host->name, paranoid); /* name is bad, clobber it */
}
@ -993,7 +938,7 @@ diff -u -r1.1.1.1 -r1.2
}
/* sock_sink - absorb unreceived IP datagram */
@@ -223,7 +416,11 @@
@@ -228,7 +421,11 @@ static void sock_sink(fd)
int fd;
{
char buf[BUFSIZ];
@ -1005,56 +950,10 @@ diff -u -r1.1.1.1 -r1.2
int size = sizeof(sin);
/*
Index: tcpd.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/tcpd.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tcpd.c 2001/03/02 09:26:27 1.1.1.1
+++ tcpd.c 2001/03/02 09:30:19 1.2
@@ -120,7 +120,12 @@
/* Report request and invoke the real daemon program. */
+#ifdef INET6
+ syslog(allow_severity, "connect from %s (%s)",
+ eval_client(&request), eval_hostaddr(request.client));
+#else
syslog(allow_severity, "connect from %s", eval_client(&request));
+#endif
closelog();
(void) execv(path, argv);
syslog(LOG_ERR, "error: cannot execute %s: %m", path);
Index: tcpd.h
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/tcpd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tcpd.h 2001/03/02 09:26:27 1.1.1.1
+++ tcpd.h 2001/03/02 09:30:19 1.2
@@ -11,7 +11,11 @@
struct host_info {
char name[STRING_LENGTH]; /* access via eval_hostname(host) */
char addr[STRING_LENGTH]; /* access via eval_hostaddr(host) */
+#ifdef INET6
+ struct sockaddr *sin; /* socket address or 0 */
+#else
struct sockaddr_in *sin; /* socket address or 0 */
+#endif
struct t_unitdata *unit; /* TLI transport address or 0 */
struct request_info *request; /* for shared information */
};
Index: tcpdchk.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/tcpdchk.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tcpdchk.c 2001/03/02 09:26:27 1.1.1.1
+++ tcpdchk.c 2001/03/02 09:30:19 1.2
@@ -22,6 +22,9 @@
diff -up tcp_wrappers_7.6/tcpdchk.c.patch9 tcp_wrappers_7.6/tcpdchk.c
--- tcp_wrappers_7.6/tcpdchk.c.patch9 1997-02-12 02:13:25.000000000 +0100
+++ tcp_wrappers_7.6/tcpdchk.c 2008-08-29 09:45:12.000000000 +0200
@@ -22,6 +22,9 @@ static char sccsid[] = "@(#) tcpdchk.c 1
#include <sys/types.h>
#include <sys/stat.h>
@ -1064,7 +963,7 @@ diff -u -r1.1.1.1 -r1.2
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdio.h>
@@ -397,6 +400,31 @@
@@ -397,6 +400,31 @@ char *pat;
}
}
@ -1096,7 +995,7 @@ diff -u -r1.1.1.1 -r1.2
/* check_host - criticize host pattern */
static int check_host(pat)
@@ -423,14 +451,27 @@
@@ -423,14 +451,27 @@ char *pat;
#endif
#endif
} else if (mask = split_at(pat, '/')) { /* network/netmask */
@ -1124,15 +1023,41 @@ diff -u -r1.1.1.1 -r1.2
} else if (NOT_INADDR(pat)) { /* internet name */
if (pat[strlen(pat) - 1] == '.') {
tcpd_warn("%s: domain or host name ends in dot", pat);
Index: tcpdmatch.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/tcpdmatch.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tcpdmatch.c 2001/03/02 09:26:27 1.1.1.1
+++ tcpdmatch.c 2001/03/02 09:30:19 1.2
@@ -57,7 +57,11 @@
diff -up tcp_wrappers_7.6/tcpd.c.patch9 tcp_wrappers_7.6/tcpd.c
--- tcp_wrappers_7.6/tcpd.c.patch9 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/tcpd.c 2008-08-29 09:45:12.000000000 +0200
@@ -120,7 +120,12 @@ char **argv;
/* Report request and invoke the real daemon program. */
+#ifdef INET6
+ syslog(allow_severity, "connect from %s (%s)",
+ eval_client(&request), eval_hostaddr(request.client));
+#else
syslog(allow_severity, "connect from %s", eval_client(&request));
+#endif
closelog();
(void) execv(path, argv);
syslog(LOG_ERR, "error: cannot execute %s: %m", path);
diff -up tcp_wrappers_7.6/tcpd.h.patch9 tcp_wrappers_7.6/tcpd.h
--- tcp_wrappers_7.6/tcpd.h.patch9 1996-03-19 16:22:25.000000000 +0100
+++ tcp_wrappers_7.6/tcpd.h 2008-08-29 09:45:12.000000000 +0200
@@ -11,7 +11,11 @@
struct host_info {
char name[STRING_LENGTH]; /* access via eval_hostname(host) */
char addr[STRING_LENGTH]; /* access via eval_hostaddr(host) */
+#ifdef INET6
+ struct sockaddr *sin; /* socket address or 0 */
+#else
struct sockaddr_in *sin; /* socket address or 0 */
+#endif
struct t_unitdata *unit; /* TLI transport address or 0 */
struct request_info *request; /* for shared information */
};
diff -up tcp_wrappers_7.6/tcpdmatch.c.patch9 tcp_wrappers_7.6/tcpdmatch.c
--- tcp_wrappers_7.6/tcpdmatch.c.patch9 1996-02-11 17:01:36.000000000 +0100
+++ tcp_wrappers_7.6/tcpdmatch.c 2008-08-29 09:45:12.000000000 +0200
@@ -57,7 +57,11 @@ int main(argc, argv)
int argc;
char **argv;
{
@ -1144,7 +1069,7 @@ diff -u -r1.1.1.1 -r1.2
char *myname = argv[0];
char *client;
char *server;
@@ -68,8 +72,13 @@
@@ -68,8 +72,13 @@ char **argv;
int ch;
char *inetcf = 0;
int count;
@ -1158,7 +1083,7 @@ diff -u -r1.1.1.1 -r1.2
struct stat st;
/*
@@ -172,13 +181,20 @@
@@ -172,13 +181,20 @@ char **argv;
if (NOT_INADDR(server) == 0 || HOSTNAME_KNOWN(server)) {
if ((hp = find_inet_addr(server)) == 0)
exit(1);
@ -1179,7 +1104,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Force evaluation of server host name and address. Host name
@@ -194,7 +210,11 @@
@@ -194,7 +210,11 @@ char **argv;
fprintf(stderr, "Please specify an address instead\n");
exit(1);
}
@ -1191,7 +1116,7 @@ diff -u -r1.1.1.1 -r1.2
} else {
request_set(&request, RQ_SERVER_NAME, server, 0);
}
@@ -208,6 +228,18 @@
@@ -208,6 +228,18 @@ char **argv;
tcpdmatch(&request);
exit(0);
}
@ -1210,7 +1135,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* Perhaps they are testing special client hostname patterns that aren't
@@ -229,6 +261,34 @@
@@ -229,6 +261,34 @@ char **argv;
*/
if ((hp = find_inet_addr(client)) == 0)
exit(1);
@ -1245,7 +1170,7 @@ diff -u -r1.1.1.1 -r1.2
memset((char *) &client_sin, 0, sizeof(client_sin));
client_sin.sin_family = AF_INET;
request_set(&request, RQ_CLIENT_SIN, &client_sin, 0);
@@ -250,6 +310,7 @@
@@ -250,6 +310,7 @@ char **argv;
printf("\n");
}
free((char *) hp);
@ -1253,15 +1178,10 @@ diff -u -r1.1.1.1 -r1.2
exit(0);
}
Index: tli.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/tli.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tli.c 2001/03/02 09:26:27 1.1.1.1
+++ tli.c 2001/03/02 09:30:19 1.2
@@ -65,8 +65,13 @@
diff -up tcp_wrappers_7.6/tli.c.patch9 tcp_wrappers_7.6/tli.c
--- tcp_wrappers_7.6/tli.c.patch9 1997-03-21 19:27:26.000000000 +0100
+++ tcp_wrappers_7.6/tli.c 2008-08-29 09:45:12.000000000 +0200
@@ -65,8 +65,13 @@ static void tli_sink();
void tli_host(request)
struct request_info *request;
{
@ -1275,7 +1195,7 @@ diff -u -r1.1.1.1 -r1.2
/*
* If we discover that we are using an IP transport, pretend we never
@@ -76,14 +81,29 @@
@@ -76,14 +81,29 @@ struct request_info *request;
tli_endpoints(request);
if ((request->config = tli_transport(request->fd)) != 0
@ -1305,7 +1225,7 @@ diff -u -r1.1.1.1 -r1.2
}
tli_cleanup(request);
sock_methods(request);
@@ -187,7 +207,15 @@
@@ -187,7 +207,15 @@ int fd;
}
while (config = getnetconfig(handlep)) {
if (stat(config->nc_device, &from_config) == 0) {
@ -1321,15 +1241,10 @@ diff -u -r1.1.1.1 -r1.2
break;
}
}
Index: update.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/update.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- update.c 2001/03/02 09:26:27 1.1.1.1
+++ update.c 2001/03/02 09:30:19 1.2
@@ -46,10 +46,18 @@
diff -up tcp_wrappers_7.6/update.c.patch9 tcp_wrappers_7.6/update.c
--- tcp_wrappers_7.6/update.c.patch9 1994-12-28 17:42:56.000000000 +0100
+++ tcp_wrappers_7.6/update.c 2008-08-29 09:45:12.000000000 +0200
@@ -46,10 +46,18 @@ va_list ap;
request->fd = va_arg(ap, int);
continue;
case RQ_CLIENT_SIN:
@ -1348,15 +1263,10 @@ diff -u -r1.1.1.1 -r1.2
continue;
/*
Index: workarounds.c
===================================================================
RCS file: /cvsroot/usagi/usagi/src/tcp_wrappers/workarounds.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- workarounds.c 2001/03/02 09:26:27 1.1.1.1
+++ workarounds.c 2001/03/02 09:30:19 1.2
@@ -166,11 +166,22 @@
diff -up tcp_wrappers_7.6/workarounds.c.patch9 tcp_wrappers_7.6/workarounds.c
--- tcp_wrappers_7.6/workarounds.c.patch9 1996-03-19 16:22:26.000000000 +0100
+++ tcp_wrappers_7.6/workarounds.c 2008-08-29 09:45:12.000000000 +0200
@@ -166,11 +166,22 @@ struct sockaddr *sa;
int *len;
{
int ret;

7
tcp_wrappers_7.6-249430.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/hosts_access.c.249430 2007-07-25 15:20:51.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2007-07-25 15:22:05.000000000 +0200
@@ -426,7 +426,9 @@
diff -up tcp_wrappers_7.6/hosts_access.c.patch22 tcp_wrappers_7.6/hosts_access.c
--- tcp_wrappers_7.6/hosts_access.c.patch22 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c 2008-08-29 09:45:12.000000000 +0200
@@ -426,7 +426,9 @@ char *string;
if ((addr = dot_quad_addr(string)) == INADDR_NONE)
return (NO);
if ((net = dot_quad_addr(net_tok)) == INADDR_NONE

35
tcpw7.2-config.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.4/Makefile.orig Mon Mar 25 13:22:25 1996
+++ tcp_wrappers_7.4/Makefile Fri Aug 9 17:31:01 1996
@@ -43,7 +43,7 @@
diff -up tcp_wrappers_7.6/Makefile.patch1 tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6/Makefile.patch1 1997-03-21 19:27:21.000000000 +0100
+++ tcp_wrappers_7.6/Makefile 2008-08-29 09:45:12.000000000 +0200
@@ -44,7 +44,7 @@ what:
#REAL_DAEMON_DIR=/usr/etc
#
# SysV.4 Solaris 2.x OSF AIX
@ -9,7 +10,7 @@
#
# BSD 4.4
#REAL_DAEMON_DIR=/usr/libexec
@@ -143,7 +143,7 @@
@@ -144,7 +144,7 @@ freebsd:
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
@ -17,8 +18,8 @@
+ NETGROUP= TLI= EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER" all
# This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
hpux hpux8 hpux9:
@@ -461,7 +461,7 @@
hpux hpux8 hpux9 hpux10:
@@ -491,7 +491,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
# Uncomment the next definition to turn on the language extensions
# (examples: allow, deny, banners, twist and spawn).
#
@ -27,7 +28,7 @@
################################################################
# Optional: Changing the default disposition of logfile records
@@ -484,7 +484,8 @@
@@ -514,7 +514,8 @@ VSYSLOG = -Dvsyslog=myvsyslog
#
# The LOG_XXX names below are taken from the /usr/include/syslog.h file.
@ -37,16 +38,16 @@
# The syslog priority at which successful connections are logged.
@@ -500,7 +501,7 @@
# off by default because it causes problems on sites that don't use DNS
# and with Solaris < 2.4.
@@ -531,7 +532,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall
# and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
# from /etc/hosts or from NIS maps. It does work with DNS through NIS.
#
-# DOT= -DAPPEND_DOT
+DOT= -DAPPEND_DOT
##################################################
# Optional: Always attempt remote username lookups
@@ -520,7 +521,7 @@
@@ -551,7 +552,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall
# still do selective username lookups as documented in the hosts_access.5
# and hosts_options.5 manual pages (`nroff -man' format).
#
@ -55,7 +56,7 @@
#
# The default username lookup timeout is 10 seconds. This may not be long
# enough for slow hosts or networks, but is enough to irritate PC users.
@@ -579,7 +580,7 @@
@@ -610,7 +611,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
# Paranoid mode implies hostname lookup. In order to disable hostname
# lookups altogether, see the next section.
@ -64,7 +65,7 @@
########################################
# Optional: turning off hostname lookups
@@ -592,7 +593,7 @@
@@ -623,7 +624,7 @@ PARANOID= -DPARANOID
# In order to perform selective hostname lookups, disable paranoid
# mode (see previous section) and comment out the following definition.
@ -73,16 +74,16 @@
#############################################
# Optional: Turning on host ADDRESS checking
@@ -617,7 +618,7 @@
#
# Uncomment the following macro definition if your getsockopt() is OK.
@@ -649,7 +650,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
# source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
# Solaris 2.x, and Linux. See your system documentation for details.
#
-# KILL_OPT= -DKILL_IP_OPTIONS
+KILL_OPT= -DKILL_IP_OPTIONS
## End configuration options
############################
@@ -627,7 +628,7 @@
@@ -659,7 +660,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
SHELL = /bin/sh
.c.o:; $(CC) $(CFLAGS) -c $*.c

7
tcpw7.2-setenv.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/Makefile.old Thu Jun 25 22:54:24 1998
+++ tcp_wrappers_7.6/Makefile Thu Jun 25 22:54:50 1998
@@ -143,7 +143,7 @@
diff -up tcp_wrappers_7.6/Makefile.patch2 tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6/Makefile.patch2 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/Makefile 2008-08-29 09:45:12.000000000 +0200
@@ -143,7 +143,7 @@ freebsd:
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \

7
tcpw7.6-netgroup.patch
View File

@ -1,6 +1,7 @@
--- tcp_wrappers_7.6/Makefile.netgroup Mon Aug 23 17:24:17 1999
+++ tcp_wrappers_7.6/Makefile Mon Aug 23 17:25:22 1999
@@ -143,8 +143,8 @@
diff -up tcp_wrappers_7.6/Makefile.patch3 tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6/Makefile.patch3 2008-08-29 09:45:12.000000000 +0200
+++ tcp_wrappers_7.6/Makefile 2008-08-29 09:45:12.000000000 +0200
@@ -143,8 +143,8 @@ freebsd:
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \