kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

upgrade to 20030826. corrects keylen miscomputation.

Browse source
This commit is contained in:
itojun 2003-08-26 03:06:08 +00:00
parent 8f27c44a6c
commit 2b364c9adb
6 changed files with 13 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
security/racoon/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.58 2003/07/12 10:01:44 itojun Exp $
# $NetBSD: Makefile,v 1.59 2003/08/26 03:06:08 itojun Exp $
#
DISTNAME= racoon-20030711a
DISTNAME= racoon-20030826a
WRKSRC= ${WRKDIR}/${DISTNAME}/racoon
CATEGORIES= security net
MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
@ -39,9 +39,9 @@ CONFIGURE_ARGS+=--disable-ipv6
.endif
CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
.if defined(PKGREVISION)
CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20021120anb${PKGREVISION}
CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20030826anb${PKGREVISION}
.else
CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20021120a
CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20030826a
.endif
pre-configure:

11
security/racoon/distinfo
View file

@ -1,13 +1,10 @@
$NetBSD: distinfo,v 1.20 2003/07/12 10:24:17 itojun Exp $
$NetBSD: distinfo,v 1.21 2003/08/26 03:06:08 itojun Exp $
SHA1 (racoon-20030711a.tar.gz) = 1223dc8a9b72a6c50da66733f5b791d01b785a43
Size (racoon-20030711a.tar.gz) = 621492 bytes
SHA1 (racoon-20030826a.tar.gz) = f0707c4a8c65adf88212ab185bb9ebd557946c89
Size (racoon-20030826a.tar.gz) = 621394 bytes
SHA1 (patch-aa) = 586f7bd5129f3be88cb104244fba2b7b13a7b044
SHA1 (patch-ab) = 28118a57be0eb2b630fe128d25cdd11261687c62
SHA1 (patch-ab) = 9953d8e61c3c56c15aa78433f07ddd8d9d46c9c2
SHA1 (patch-ac) = 29ff53ca5a23785253321a9629c32065da56ca9f
SHA1 (patch-ad) = d4718088c04c72ccfe34c4b53ec4a2f830600877
SHA1 (patch-ae) = 3b5dcbd2398e95e9bdb0cb69a11d49eecc981a08
SHA1 (patch-af) = 0d0fb78ae6f3a10be95ff6160dc85140ea09455a
SHA1 (patch-ag) = f94c9df2e6e1a2e9efaae70d1662de96197db593
SHA1 (patch-ah) = c2b90a124b9c11f2163fdc03c0bb70714bddd57f
SHA1 (patch-ai) = 42123276187cbd4f7100f4c049977ce5400b088c

10
security/racoon/patches/patch-ab
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ab,v 1.3 2002/11/20 03:26:27 itojun Exp $
$NetBSD: patch-ab,v 1.4 2003/08/26 03:06:09 itojun Exp $
--- Makefile.in.orig Fri Sep 27 15:04:59 2002
+++ Makefile.in Wed Nov 20 12:11:10 2002
--- Makefile.in.orig 2003-08-19 18:09:15.000000000 +0900
+++ Makefile.in 2003-08-26 12:02:07.000000000 +0900
@@ -10,7 +10,7 @@
CFLAGS= @CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -DSYSCONFDIR=\"${sysconfdir}\"
CFLAGS+=-DYY_NO_UNPUT
@ -11,8 +11,8 @@ $NetBSD: patch-ab,v 1.3 2002/11/20 03:26:27 itojun Exp $
YFLAGS+=-d
prefix= @prefix@
@@ -86,15 +86,6 @@
$(INSTALL) -s -o bin -g bin -m 555 racoon $(prefix)/sbin
@@ -87,15 +87,6 @@
$(INSTALL) -s -o bin -g bin -m 555 racoon $(sbindir)
$(INSTALL) -o bin -g bin -m 444 racoon.8 $(mandir)/man8
$(INSTALL) -o bin -g bin -m 444 racoon.conf.5 $(mandir)/man5
- -mkdir -p ${sysconfdir}/racoon

52
security/racoon/patches/patch-ag
View file

@ -1,52 +0,0 @@
$NetBSD: patch-ag,v 1.9 2003/07/12 10:24:17 itojun Exp $
--- ../libipsec/key_debug.c- Sat Jul 12 18:49:46 2003
+++ ../libipsec/key_debug.c Sat Jul 12 18:50:25 2003
@@ -80,7 +80,9 @@
static void kdebug_sadb_address __P((struct sadb_ext *));
static void kdebug_sadb_key __P((struct sadb_ext *));
static void kdebug_sadb_x_sa2 __P((struct sadb_ext *));
+#ifdef SADB_X_EXT_TAG
static void kdebug_sadb_x_tag __P((struct sadb_ext *));
+#endif
#ifdef _KERNEL
static void kdebug_secreplay __P((struct secreplay *));
@@ -166,7 +168,9 @@
TYPESTR(X_EXT_KMPRIVATE),
TYPESTR(X_EXT_POLICY),
TYPESTR(X_EXT_SA2),
+#ifdef SADB_X_EXT_TAG
TYPESTR(X_EXT_TAG),
+#endif
{ NULL }
};
@@ -252,9 +256,11 @@
case SADB_X_EXT_SA2:
kdebug_sadb_x_sa2(ext);
break;
+#ifdef SADB_X_EXT_TAG
case SADB_X_EXT_TAG:
kdebug_sadb_x_tag(ext);
break;
+#endif
default:
printf("kdebug_sadb: invalid ext_type %u was passed.\n",
ext->sadb_ext_type);
@@ -494,6 +500,7 @@
return;
}
+#ifdef SADB_X_EXT_TAG
static void
kdebug_sadb_x_tag(ext)
struct sadb_ext *ext;
@@ -508,6 +515,7 @@
return;
}
+#endif
void
kdebug_sadb_x_policy(ext)

14
security/racoon/patches/patch-ah
View file

@ -1,14 +0,0 @@
$NetBSD: patch-ah,v 1.4 2003/07/12 10:24:17 itojun Exp $
--- ../libipsec/pfkey.c- Sat Jul 12 18:56:08 2003
+++ ../libipsec/pfkey.c Sat Jul 12 18:56:18 2003
@@ -1762,7 +1762,9 @@
case SADB_EXT_SPIRANGE:
case SADB_X_EXT_POLICY:
case SADB_X_EXT_SA2:
+#ifdef SADB_X_EXT_TAG
case SADB_X_EXT_TAG:
+#endif
mhp[ext->sadb_ext_type] = (caddr_t)ext;
break;
default:

35
security/racoon/patches/patch-ai
View file

@ -1,35 +0,0 @@
$NetBSD: patch-ai,v 1.2 2003/07/12 10:24:17 itojun Exp $
--- ../libipsec/pfkey_dump.c- Sat Jul 12 18:56:47 2003
+++ ../libipsec/pfkey_dump.c Sat Jul 12 18:57:15 2003
@@ -352,7 +352,9 @@
char pbuf[NI_MAXSERV];
caddr_t mhp[SADB_EXT_MAX + 1];
struct sadb_address *m_saddr, *m_daddr;
+#ifdef SADB_X_EXT_TAG
struct sadb_x_tag *m_tag;
+#endif
struct sadb_x_policy *m_xpl;
struct sadb_lifetime *m_lftc = NULL, *m_lfth = NULL;
struct sockaddr *sa;
@@ -370,7 +372,9 @@
m_saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
m_daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
+#ifdef SADB_X_EXT_TAG
m_tag = (struct sadb_x_tag *)mhp[SADB_X_EXT_TAG];
+#endif
m_xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
m_lftc = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_CURRENT];
m_lfth = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_HARD];
@@ -425,8 +429,10 @@
str_upperspec(m_saddr->sadb_address_proto, sport, dport);
}
+#ifdef SADB_X_EXT_TAG
if (m_tag)
printf("tagged \"%s\" ", m_tag->sadb_x_tag_name);
+#endif
/* policy */
{