Update "libident" to version 0.22 and include shared library support.

4 files changed, 54 insertions, 109 deletions

diff --git a/security/libident/Makefile b/security/libident/Makefile
index 95966795205..ca5255fd37e 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.3 1999/03/12 15:59:17 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/03/12 16:29:03 tron Exp $
 # FreeBSD ID: Makefile,v 1.6 1998/01/25 20:42:37 torstenb Exp
 
-DISTNAME=	libident-0.21
+DISTNAME=	libident-0.22
 CATEGORIES=	security devel net
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/ident/libs/
 
 MAINTAINER=	packages@netbsd.org
 
+USE_LIBTOOL=	yes
+
 ALL_TARGET=	netbsd
+MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/security/libident/patches/patch-aa b/security/libident/patches/patch-aa
index c5e8063ca8b..110a0c2ecb2 100644
--- a/security/libident/patches/patch-aa
+++ b/security/libident/patches/patch-aa
@@ -1,17 +1,22 @@
-$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 @@
++++ Makefile	Fri Mar 12 17:20:39 1999
+@@ -4,11 +4,12 @@
+ 
+ MAKE=make
+ SHELL=/bin/sh
+-RM=rm -f
  RANLIB=ranlib
- AR=ar cq
+-AR=ar cq
++RM=rm -f
++AR=${LIBTOOL} --mode=link cc -rpath ${PREFIX}/lib -version-info 0:22 -o
++CC=${LIBTOOL} --mode=compile cc
  
 -INSTROOT=/usr/local
 +INSTROOT=${PREFIX}
  LIBDIR=$(INSTROOT)/lib
  INCDIR=$(INSTROOT)/include
  MANDIR=$(INSTROOT)/man/man3
-@@ -19,7 +19,7 @@
+@@ -19,10 +20,10 @@
  # Add -DHAVE_ANSIHEADERS if your system have the ANSI C header files
  # needed for our purposes (stdlib, string, unistd).
  #
@@ -19,8 +24,12 @@ $NetBSD: patch-aa,v 1.3 1999/03/12 15:58:09 tron Exp $
 +#CFLAGS = -O
  
  LDLIBS =
- LIBIDENT = libident.a
-@@ -33,6 +33,7 @@
+-LIBIDENT = libident.a
++LIBIDENT = libident.la
+ 
+ OBJS = ident.o id_open.o id_close.o id_query.o id_parse.o support.o version.o
+ 
+@@ -33,6 +34,7 @@
  	@echo aix
  	@echo bsd
  	@echo bsd2.11
@@ -28,7 +37,35 @@ $NetBSD: patch-aa,v 1.3 1999/03/12 15:58:09 tron Exp $
  	@echo dynix
  	@echo hpux
  	@echo irix
-@@ -126,6 +127,8 @@
+@@ -52,8 +54,8 @@
+ 
+ $(LIBIDENT):	$(OBJS)
+ 	-$(RM) $(LIBIDENT)
+-	$(AR) $(LIBIDENT) $(OBJS)
+-	-$(RANLIB) $(LIBIDENT)
++	$(AR) $(LIBIDENT) $(OBJS:.o=.lo)
++#	-$(RANLIB) $(LIBIDENT)
+ 
+ testers: lookup-tester ident-tester
+ 
+@@ -82,13 +84,9 @@
+ #
+ 
+ install:
+-	-$(RM) $(LIBDIR)/$(LIBIDENT)
+-	cp $(LIBIDENT) $(LIBDIR)/$(LIBIDENT)
+-	-$(RANLIB) $(LIBDIR)/$(LIBIDENT)
+-	-$(RM) $(INCDIR)/ident.h
+-	cp ident.h $(INCDIR)/ident.h
+-	-$(RM) $(MANDIR)/ident.3
+-	cp ident.3 $(MANDIR)/ident.3
++	${LIBTOOL} --mode=install ${INSTALL_DATA} ${LIBIDENT} ${PREFIX}/lib
++	${INSTALL_DATA} ident.h ${INCDIR}/ident.h
++	${INSTALL_DATA} ident.3 ${MANDIR}/ident.3
+ 
+ clean:
+ 	-$(RM) $(LIBIDENT) ident-tester lookup-tester *~ core *.o \#*
+@@ -126,6 +124,8 @@
  bsd2.11:
  	@$(MAKE) all CC="$(CC)" CFLAGS="-O -DSIGRETURNTYPE=int -DHAVE_ANSIHEADERS"
  
diff --git a/security/libident/patches/patch-ab b/security/libident/patches/patch-ab
deleted file mode 100644
index 12815258bbf..00000000000
--- a/security/libident/patches/patch-ab
+++ /dev/null
@@ -1,96 +0,0 @@
-$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));
- 
diff --git a/security/libident/pkg/PLIST b/security/libident/pkg/PLIST
index 4a1f2921d68..331a0188c23 100644
--- a/security/libident/pkg/PLIST
+++ b/security/libident/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1999/03/12 15:51:20 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/03/12 16:29:04 tron Exp $
 include/ident.h
 lib/libident.a
-man/man3/ident.3.gz
+lib/libident.so.0.22
+man/man3/ident.3