Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Linux build

Browse Source
This commit is contained in:
manu 2008-04-02 19:02:50 +00:00
parent b1374c3956
commit 1c3bd4b930
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/dist/ipsec-tools/ChangeLog vendored
View File

@ -1,3 +1,8 @@
2008-04-02 Emmanuel Dreyfus <manu@netbsd.org>
From Timo Teräs <timo.teras@iki.fi>
* src/racoon/{sockmisc.h|sockmisc.c|Makefile.am}: fix Linux build
after 2008-03-28's change
2008-03-28 Emmanuel Dreyfus <manu@netbsd.org> 2008-03-28 Emmanuel Dreyfus <manu@netbsd.org>
From Cyrus Rahman <crahman@gmail.com> From Cyrus Rahman <crahman@gmail.com>
* src/racoon/{sockmisc.c|isakmp.c|isakmp_inf.c|privsep.c|privsep.h} * src/racoon/{sockmisc.c|isakmp.c|isakmp_inf.c|privsep.c|privsep.h}

2
crypto/dist/ipsec-tools/src/racoon/Makefile.am vendored
View File

@ -44,7 +44,7 @@ racoonctl_LDFLAGS = libracoon.la ../libipsec/libipsec.la
racoonctl_DEPENDENCIES = ../libipsec/libipsec.la libracoon.la racoonctl_DEPENDENCIES = ../libipsec/libipsec.la libracoon.la
libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
libracoon_la_CFLAGS = -DNOUSE_PRIVSEP libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS)
plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \ plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \
crypto_openssl.c logger.c crypto_openssl.c logger.c

11
crypto/dist/ipsec-tools/src/racoon/sockmisc.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sockmisc.c,v 1.10 2008/03/28 04:18:52 manu Exp $ */ /* $NetBSD: sockmisc.c,v 1.11 2008/04/02 19:02:50 manu Exp $ */
/* Id: sockmisc.c,v 1.24 2006/05/07 21:32:59 manubsd Exp */ /* Id: sockmisc.c,v 1.24 2006/05/07 21:32:59 manubsd Exp */
@ -76,15 +76,6 @@
#define SETSOCKOPT privsep_setsockopt #define SETSOCKOPT privsep_setsockopt
#endif #endif
#ifndef IP_IPSEC_POLICY
#define IP_IPSEC_POLICY 16 /* XXX: from linux/in.h */
#endif
#ifndef IPV6_IPSEC_POLICY
#define IPV6_IPSEC_POLICY 34 /* XXX: from linux/???.h per
"Tom Lendacky" <toml@us.ibm.com> */
#endif
const int niflags = 0; const int niflags = 0;
/* /*

11
crypto/dist/ipsec-tools/src/racoon/sockmisc.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sockmisc.h,v 1.7 2006/09/09 16:22:10 manu Exp $ */ /* $NetBSD: sockmisc.h,v 1.8 2008/04/02 19:02:50 manu Exp $ */
/* Id: sockmisc.h,v 1.9 2005/10/05 16:55:41 manubsd Exp */ /* Id: sockmisc.h,v 1.9 2005/10/05 16:55:41 manubsd Exp */
@ -34,6 +34,15 @@
#ifndef _SOCKMISC_H #ifndef _SOCKMISC_H
#define _SOCKMISC_H #define _SOCKMISC_H
#ifndef IP_IPSEC_POLICY
#define IP_IPSEC_POLICY 16 /* XXX: from linux/in.h */
#endif
#ifndef IPV6_IPSEC_POLICY
#define IPV6_IPSEC_POLICY 34 /* XXX: from linux/???.h per
"Tom Lendacky" <toml@us.ibm.com> */
#endif
struct netaddr { struct netaddr {
union { union {
struct sockaddr sa; struct sockaddr sa;