Add RCS Ids and convert to "diff -u" format.

2 files changed, 135 insertions, 197 deletions

diff --git a/security/libident/patches/patch-aa b/security/libident/patches/patch-aa
index af5f6ebcadb..c5e8063ca8b 100644
--- a/security/libident/patches/patch-aa
+++ b/security/libident/patches/patch-aa
@@ -1,57 +1,39 @@
-*** Makefile.o	Sat Jan 24 17:11:37 1998
---- Makefile	Sat Jan 24 17:12:49 1998
-***************
-*** 8,14 ****
-  RANLIB=ranlib
-  AR=ar cq
-  
-! INSTROOT=/usr/local
-  LIBDIR=$(INSTROOT)/lib
-  INCDIR=$(INSTROOT)/include
-  MANDIR=$(INSTROOT)/man/man3
---- 8,14 ----
-  RANLIB=ranlib
-  AR=ar cq
-  
-! INSTROOT=${PREFIX}
-  LIBDIR=$(INSTROOT)/lib
-  INCDIR=$(INSTROOT)/include
-  MANDIR=$(INSTROOT)/man/man3
-***************
-*** 19,25 ****
-  # Add -DHAVE_ANSIHEADERS if your system have the ANSI C header files
-  # needed for our purposes (stdlib, string, unistd).
-  #
-! CFLAGS = -O
-  
-  LDLIBS =
-  LIBIDENT = libident.a
---- 19,25 ----
-  # Add -DHAVE_ANSIHEADERS if your system have the ANSI C header files
-  # needed for our purposes (stdlib, string, unistd).
-  #
-! #CFLAGS = -O
-  
-  LDLIBS =
-  LIBIDENT = libident.a
-***************
-*** 33,38 ****
---- 33,39 ----
-  	@echo aix
-  	@echo bsd
-  	@echo bsd2.11
-+ 	@echo netbsd
-  	@echo dynix
-  	@echo hpux
-  	@echo irix
-***************
-*** 126,131 ****
---- 127,134 ----
-  bsd2.11:
-  	@$(MAKE) all CC="$(CC)" CFLAGS="-O -DSIGRETURNTYPE=int -DHAVE_ANSIHEADERS"
-  
-+ netbsd:
-+ 	@$(MAKE) all CC="$(CC)" CFLAGS="${CFLAGS} -Wall -DHAVE_ANSIHEADERS"
-  
-  #
-  #
+$NetBSD: patch-aa,v 1.3 1999/03/12 15:58:09 tron Exp $
+
+--- Makefile.orig	Fri Jan 17 20:10:55 1997
++++ Makefile	Fri Mar 12 16:56:54 1999
+@@ -8,7 +8,7 @@
+ RANLIB=ranlib
+ AR=ar cq
+ 
+-INSTROOT=/usr/local
++INSTROOT=${PREFIX}
+ LIBDIR=$(INSTROOT)/lib
+ INCDIR=$(INSTROOT)/include
+ MANDIR=$(INSTROOT)/man/man3
+@@ -19,7 +19,7 @@
+ # Add -DHAVE_ANSIHEADERS if your system have the ANSI C header files
+ # needed for our purposes (stdlib, string, unistd).
+ #
+-CFLAGS = -O
++#CFLAGS = -O
+ 
+ LDLIBS =
+ LIBIDENT = libident.a
+@@ -33,6 +33,7 @@
+ 	@echo aix
+ 	@echo bsd
+ 	@echo bsd2.11
++	@echo netbsd
+ 	@echo dynix
+ 	@echo hpux
+ 	@echo irix
+@@ -126,6 +127,8 @@
+ bsd2.11:
+ 	@$(MAKE) all CC="$(CC)" CFLAGS="-O -DSIGRETURNTYPE=int -DHAVE_ANSIHEADERS"
+ 
++netbsd:
++	@$(MAKE) all CC="$(CC)" CFLAGS="${CFLAGS} -Wall -DHAVE_ANSIHEADERS"
+ 
+ #
+ #
diff --git a/security/libident/patches/patch-ab b/security/libident/patches/patch-ab
index 0df77e4e604..12815258bbf 100644
--- a/security/libident/patches/patch-ab
+++ b/security/libident/patches/patch-ab
@@ -1,140 +1,96 @@
-*** ident.h.orig	Thu Nov 23 14:44:36 1995
---- ident.h	Tue Jan 19 10:55:43 1999
-***************
-*** 13,22 ****
-  #endif
-  
-  /* Sigh */
-! #ifdef __STDC__
-! #  if __STDC__ == 1
-! #    define IS_STDC 1
-! #  endif
-  #endif
-  
-  #ifdef __P
---- 13,20 ----
-  #endif
-  
-  /* Sigh */
-! #if (0 - __STDC__) <= -1
-! #  define IS_STDC 1
-  #endif
-  
-  #ifdef __P
-***************
-*** 96,129 ****
-  #  include <bstring.h>
-  #endif
-  #include <sys/types.h>
-  #include <netinet/in.h>
-- #include <sys/time.h>
-  
-  #if defined(VMS) && !defined(FD_SETSIZE)
-  #  define FD_SETSIZE 64
-  #endif
-  
-- /*
--  * Sigh, GCC v2 complains when using undefined struct tags
--  * in function prototypes...
--  */
-- #if defined(__GNUC__) && !defined(INADDR_ANY)
-- #  define __STRUCT_IN_ADDR_P	void *
-- #else
-- #  define __STRUCT_IN_ADDR_P	struct in_addr *
-- #endif
-- 
-- #if defined(__GNUC__) && !defined(DST_NONE)
-- #  define __STRUCT_TIMEVAL_P	void *
-- #else
-- #  define __STRUCT_TIMEVAL_P	struct timeval *
-- #endif
-- 
-- #if defined(__sgi) && defined(_POSIX_SOURCE)
-- #  undef  __STRUCT_TIMEVAL_P
-- #  define __STRUCT_TIMEVAL_P	void *
-- #endif
-- 	
-  #ifndef IDBUFSIZE
-  #  define IDBUFSIZE 2048
-  #endif
---- 94,115 ----
-  #  include <bstring.h>
-  #endif
-  #include <sys/types.h>
-+ #if TIME_WITH_SYS_TIME
-+ # include <sys/time.h>
-+ # include <time.h>
-+ #else
-+ # if HAVE_SYS_TIME_H
-+ #  include <sys/time.h>
-+ # else
-+ #  include <time.h>
-+ # endif
-+ #endif
-  #include <netinet/in.h>
-  
-  #if defined(VMS) && !defined(FD_SETSIZE)
-  #  define FD_SETSIZE 64
-  #endif
-  
-  #ifndef IDBUFSIZE
-  #  define IDBUFSIZE 2048
-  #endif
-***************
-*** 149,167 ****
-  /* Low-level calls and macros */
-  #define id_fileno(ID)	((ID)->fd)
-  
-! extern ident_t * id_open __P((__STRUCT_IN_ADDR_P laddr,
-! 			   __STRUCT_IN_ADDR_P faddr,
-! 			   __STRUCT_TIMEVAL_P timeout));
-    
-  extern int    id_close __P((ident_t *id));
-    
-  extern int    id_query __P((ident_t *id,
-  			    int lport,
-  			    int fport,
-! 			    __STRUCT_TIMEVAL_P timeout));
-    
-  extern int    id_parse __P((ident_t *id,
-! 			    __STRUCT_TIMEVAL_P timeout,
-  			    int *lport,
-  			    int *fport,
-  			    char **identifier,
---- 135,153 ----
-  /* Low-level calls and macros */
-  #define id_fileno(ID)	((ID)->fd)
-  
-! extern ident_t * id_open __P((struct in_addr * laddr,
-! 			   struct in_addr * faddr,
-! 			   struct timeval * timeout));
-    
-  extern int    id_close __P((ident_t *id));
-    
-  extern int    id_query __P((ident_t *id,
-  			    int lport,
-  			    int fport,
-! 			    struct timeval * timeout));
-    
-  extern int    id_parse __P((ident_t *id,
-! 			    struct timeval * timeout,
-  			    int *lport,
-  			    int *fport,
-  			    char **identifier,
-***************
-*** 174,180 ****
-  
-  extern char  *ident_id __P((int fd, int timeout));
-  
-! extern IDENT *ident_query __P(( __STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P raddr, int lport, int rport, int timeout));
-  
-  extern void   ident_free __P((IDENT *id));
-  
---- 160,166 ----
-  
-  extern char  *ident_id __P((int fd, int timeout));
-  
-! extern IDENT *ident_query __P(( struct in_addr * laddr, struct in_addr * raddr, int lport, int rport, int timeout));
-  
-  extern void   ident_free __P((IDENT *id));
-  
+$NetBSD: patch-ab,v 1.2 1999/03/12 15:58:09 tron Exp $
+
+--- ident.h.orig	Thu Nov 23 23:44:36 1995
++++ ident.h	Fri Mar 12 16:56:54 1999
+@@ -13,10 +13,8 @@
+ #endif
+ 
+ /* Sigh */
+-#ifdef __STDC__
+-#  if __STDC__ == 1
+-#    define IS_STDC 1
+-#  endif
++#if (0 - __STDC__) <= -1
++#  define IS_STDC 1
+ #endif
+ 
+ #ifdef __P
+@@ -96,34 +94,22 @@
+ #  include <bstring.h>
+ #endif
+ #include <sys/types.h>
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
+ #include <netinet/in.h>
+-#include <sys/time.h>
+ 
+ #if defined(VMS) && !defined(FD_SETSIZE)
+ #  define FD_SETSIZE 64
+ #endif
+ 
+-/*
+- * Sigh, GCC v2 complains when using undefined struct tags
+- * in function prototypes...
+- */
+-#if defined(__GNUC__) && !defined(INADDR_ANY)
+-#  define __STRUCT_IN_ADDR_P	void *
+-#else
+-#  define __STRUCT_IN_ADDR_P	struct in_addr *
+-#endif
+-
+-#if defined(__GNUC__) && !defined(DST_NONE)
+-#  define __STRUCT_TIMEVAL_P	void *
+-#else
+-#  define __STRUCT_TIMEVAL_P	struct timeval *
+-#endif
+-
+-#if defined(__sgi) && defined(_POSIX_SOURCE)
+-#  undef  __STRUCT_TIMEVAL_P
+-#  define __STRUCT_TIMEVAL_P	void *
+-#endif
+-	
+ #ifndef IDBUFSIZE
+ #  define IDBUFSIZE 2048
+ #endif
+@@ -149,19 +135,19 @@
+ /* Low-level calls and macros */
+ #define id_fileno(ID)	((ID)->fd)
+ 
+-extern ident_t * id_open __P((__STRUCT_IN_ADDR_P laddr,
+-			   __STRUCT_IN_ADDR_P faddr,
+-			   __STRUCT_TIMEVAL_P timeout));
++extern ident_t * id_open __P((struct in_addr * laddr,
++			   struct in_addr * faddr,
++			   struct timeval * timeout));
+   
+ extern int    id_close __P((ident_t *id));
+   
+ extern int    id_query __P((ident_t *id,
+ 			    int lport,
+ 			    int fport,
+-			    __STRUCT_TIMEVAL_P timeout));
++			    struct timeval * timeout));
+   
+ extern int    id_parse __P((ident_t *id,
+-			    __STRUCT_TIMEVAL_P timeout,
++			    struct timeval * timeout,
+ 			    int *lport,
+ 			    int *fport,
+ 			    char **identifier,
+@@ -174,7 +160,7 @@
+ 
+ extern char  *ident_id __P((int fd, int timeout));
+ 
+-extern IDENT *ident_query __P(( __STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P raddr, int lport, int rport, int timeout));
++extern IDENT *ident_query __P(( struct in_addr * laddr, struct in_addr * raddr, int lport, int rport, int timeout));
+ 
+ extern void   ident_free __P((IDENT *id));
+