Patches to adapt this package to NetBSD supplied by Greg A. Woods in
PR pkg/7141.
This commit is contained in:
tron
parent
8d5704827e
commit
662af81589
4 changed files with 150 additions and 6 deletions
|
|
@ -2,17 +2,19 @@
|
|||
# Version required: 0.21
|
||||
# Date created: 9 October 1995
|
||||
# Whom: torstenb@FreeBSD.ORG
|
||||
# NetBSD port by: woods@planix.com (Greg A. Woods)
|
||||
#
|
||||
# FreeBSD Id: Makefile,v 1.6 1998/01/25 20:42:37 torstenb Exp
|
||||
# $NetBSD: Makefile,v 1.2 1999/03/12 15:51:20 tron Exp $
|
||||
# $FreeBSD: Makefile,v 1.6 1998/01/25 20:42:37 torstenb Exp $
|
||||
#
|
||||
|
||||
DISTNAME= libident-0.21
|
||||
CATEGORIES= devel net security
|
||||
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/libs/
|
||||
|
||||
MAINTAINER= torstenb@FreeBSD.ORG
|
||||
MAINTAINER= packages@NetBSD.org
|
||||
|
||||
ALL_TARGET= freebsd
|
||||
ALL_TARGET= netbsd
|
||||
MAN3= ident.3
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.include <../../mk/bsd.pkg.mk>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
@echo aix
|
||||
@echo bsd
|
||||
@echo bsd2.11
|
||||
+ @echo freebsd
|
||||
+ @echo netbsd
|
||||
@echo dynix
|
||||
@echo hpux
|
||||
@echo irix
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
bsd2.11:
|
||||
@$(MAKE) all CC="$(CC)" CFLAGS="-O -DSIGRETURNTYPE=int -DHAVE_ANSIHEADERS"
|
||||
|
||||
+ freebsd:
|
||||
+ netbsd:
|
||||
+ @$(MAKE) all CC="$(CC)" CFLAGS="${CFLAGS} -Wall -DHAVE_ANSIHEADERS"
|
||||
|
||||
#
|
||||
|
|
|
|||
140
security/libident/patches/patch-ab
Normal file
140
security/libident/patches/patch-ab
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
*** 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));
|
||||
|
||||
|
|
@ -1,2 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.2 1999/03/12 15:51:20 tron Exp $
|
||||
include/ident.h
|
||||
lib/libident.a
|
||||
man/man3/ident.3.gz
|
||||
|
|
|
|||
Loading…
Reference in a new issue