Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3]: src Apply patch (requested by manu in ticket #981):
details: https://anonhg.NetBSD.org/src/rev/aa9454373a32
branches: netbsd-3
changeset: 577530:aa9454373a32
user: tron <tron%NetBSD.org@localhost>
date: Mon Nov 21 21:12:29 2005 +0000
description:
Apply patch (requested by manu in ticket #981):
Update ipsec-tools to version 0.6.3.
diffstat:
crypto/dist/ipsec-tools/ChangeLog | 43 +
crypto/dist/ipsec-tools/NEWS | 3 +
crypto/dist/ipsec-tools/configure.ac | 14 +-
crypto/dist/ipsec-tools/netbsd-import.sh | 2 +-
crypto/dist/ipsec-tools/rpm/suse/ipsec-tools.spec | 110 +
crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3 | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h | 2 +-
crypto/dist/ipsec-tools/src/libipsec/key_debug.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/libpfkey.h | 2 +-
crypto/dist/ipsec-tools/src/libipsec/pfkey.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/policy_parse.c | 1545 +++
crypto/dist/ipsec-tools/src/libipsec/policy_parse.h | 29 +
crypto/dist/ipsec-tools/src/libipsec/policy_parse.y | 2 +-
crypto/dist/ipsec-tools/src/libipsec/policy_token.c | 1888 ++++
crypto/dist/ipsec-tools/src/libipsec/policy_token.l | 2 +-
crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/test-policy.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/admin.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/admin.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/admin_var.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/algorithm.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/algorithm.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/backupsa.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/backupsa.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/cfparse.c | 3525 ++++++++
crypto/dist/ipsec-tools/src/racoon/cfparse.y | 12 +-
crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/cftoken.c | 4158 ++++++++++
crypto/dist/ipsec-tools/src/racoon/cftoken.l | 7 +-
crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/debug.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/debugrm.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/debugrm.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/dhgroup.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/dnssec.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/dnssec.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/dump.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/dump.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/eaytest.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/evt.c | 4 +-
crypto/dist/ipsec-tools/src/racoon/evt.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/gcmalloc.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/genlist.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/genlist.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/gnuc.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/gssapi.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/gssapi.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/handler.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/handler.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c | 10 +-
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h | 5 +-
crypto/dist/ipsec-tools/src/racoon/isakmp.c | 6 +-
crypto/dist/ipsec-tools/src/racoon/isakmp.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c | 21 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_base.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_base.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c | 4 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c | 9 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_var.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/kmpstat.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/localconf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/localconf.h | 7 +-
crypto/dist/ipsec-tools/src/racoon/logger.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/logger.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/main.c | 23 +-
crypto/dist/ipsec-tools/src/racoon/misc.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/misc.h | 8 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/strdup.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/nattraversal.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/nattraversal.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/oakley.c | 6 +-
crypto/dist/ipsec-tools/src/racoon/oakley.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/pfkey.c | 4 +-
crypto/dist/ipsec-tools/src/racoon/pfkey.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8 | 2 +-
crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/plog.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/plog.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/policy.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/policy.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/privsep.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/privsep.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/proposal.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/proposal.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/prsa_par.c | 1290 +++
crypto/dist/ipsec-tools/src/racoon/prsa_par.y | 2 +-
crypto/dist/ipsec-tools/src/racoon/prsa_tok.c | 1910 ++++
crypto/dist/ipsec-tools/src/racoon/prsa_tok.l | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoon.8 | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 | 26 +-
crypto/dist/ipsec-tools/src/racoon/racoonctl.8 | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoonctl.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoonctl.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/remoteconf.c | 10 +-
crypto/dist/ipsec-tools/src/racoon/remoteconf.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/rsalist.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/rsalist.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/safefile.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/safefile.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/sainfo.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/sainfo.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/schedule.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/schedule.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/session.c | 33 +-
crypto/dist/ipsec-tools/src/racoon/session.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/sockmisc.c | 4 +-
crypto/dist/ipsec-tools/src/racoon/sockmisc.h | 4 +-
crypto/dist/ipsec-tools/src/racoon/str2val.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/str2val.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/strnames.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/strnames.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/throttle.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/throttle.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/var.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/vendorid.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/vendorid.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/vmbuf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/vmbuf.h | 2 +-
crypto/dist/ipsec-tools/src/setkey/extern.h | 2 +-
crypto/dist/ipsec-tools/src/setkey/parse.c | 2550 ++++++
crypto/dist/ipsec-tools/src/setkey/parse.h | 64 +
crypto/dist/ipsec-tools/src/setkey/parse.y | 2 +-
crypto/dist/ipsec-tools/src/setkey/setkey.8 | 2 +-
crypto/dist/ipsec-tools/src/setkey/setkey.c | 2 +-
crypto/dist/ipsec-tools/src/setkey/test-pfkey.c | 2 +-
crypto/dist/ipsec-tools/src/setkey/token.c | 2677 ++++++
crypto/dist/ipsec-tools/src/setkey/token.l | 2 +-
crypto/dist/ipsec-tools/src/setkey/vchar.h | 2 +-
lib/libipsec/Makefile | 2 +-
lib/libipsec/config.h | 3 +
lib/libipsec/package_version.h | 4 +-
169 files changed, 20067 insertions(+), 217 deletions(-)
diffs (truncated from 21656 to 300 lines):
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/ChangeLog
--- a/crypto/dist/ipsec-tools/ChangeLog Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/ChangeLog Mon Nov 21 21:12:29 2005 +0000
@@ -1,3 +1,46 @@
+---------------------------------------------
+
+ 0.6.3 released
+
+2005-11-21 Yvan Vanhullebus <vanhu%netasq.com@localhost>
+
+ * src/racoon/isakmp_[ident|agg].c: Check if natt is available when
+ receiving a NAT_D payload from initiator. It saves a crash,
+ reported by Dave Huang to NetBSD.
+
+2005-11-20 Yvan Vanhullebus <vanhu%netasq.com@localhost>
+
+ * src/racoon/isakmp_agg.c: Check that we got some needed payloads
+ from peer (could cause a DoS). Crash reported by Adrian Portelli
+ using IKE test suite from
+ http://www.ee.oulu.fi/research/ouspg/protos/testing/c09/isakmp/
+
+2005-11-06 Aidas Kasparas <a.kasparas%gmc.lt@localhost>
+
+ * src/racoon/main.c, src/racoon/session.c: moved .pid file writing
+ just before main loop. Thanks Stephen Thorne
+ * src/racoon/localconf.h, src/racoon/cftoken.l: introduced
+ path pidfile directive
+ * src/racoon/racoon.conf.5: documented above
+ * configure.ac: OpenSSL 0.9.8 compilation fix. Thank Ganesan
+ Rajagopal
+ * configure.ac: added check for strlcat function
+ * src/racoon/misc.h: define strlcat function for systems without one
+ * src/racoon/remoteconf.c: strncat -> strlcat
+
+2005-10-17 Aidas Kasparas <a.kasparas%gmc.lt@localhost>
+
+ Introduced subnet sainfo type.
+ * src/racoon/cftoken.l: new token "subnet"
+ * src/racoon/cfparse.y: added address/subnet diferentiation logic
+ * src/racoon/ipsec-doi.h: new constant
+ * src/racoon/ipsec-doi.c: adopted to above
+ * src/racoon/racoon.conf.5: documented above
+
+2005-10-14 Emmanuel Dreyfus <manu%netbsd.org@localhost>
+
+ * src/libipsec/pfkey.c: One forgotten cast caddr_t -> void *
+
---------------------------------------------
0.6.2 released
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/NEWS
--- a/crypto/dist/ipsec-tools/NEWS Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/NEWS Mon Nov 21 21:12:29 2005 +0000
@@ -1,5 +1,8 @@
Version history:
----------------
+0.6.3 - 21 November 2005
+ o Various bug fixes
+
0.6.2 - 14 October 2005
o ISAKMP mode config works without Xauth
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/configure.ac
--- a/crypto/dist/ipsec-tools/configure.ac Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/configure.ac Mon Nov 21 21:12:29 2005 +0000
@@ -1,8 +1,8 @@
dnl -*- mode: m4 -*-
-dnl Id: configure.ac,v 1.47.2.29 2005/10/14 09:24:43 manubsd Exp
+dnl Id: configure.ac,v 1.47.2.31 2005/11/21 11:11:41 manubsd Exp
AC_PREREQ(2.52)
-AC_INIT(ipsec-tools, 0.6.2)
+AC_INIT(ipsec-tools, 0.6.3)
AC_CONFIG_SRCDIR([configure.ac])
AM_CONFIG_HEADER(config.h)
@@ -108,7 +108,7 @@
AC_FUNC_MEMCMP
AC_TYPE_SIGNAL
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gettimeofday select socket strerror strtol strtoul strlcpy)
+AC_CHECK_FUNCS(gettimeofday select socket strerror strtol strtoul strlcpy strlcat)
AC_REPLACE_FUNCS(strdup)
RACOON_CHECK_VA_COPY
@@ -210,13 +210,13 @@
AC_TRY_COMPILE([
#include <openssl/sha.h>
], [
- typedef int SHA256_CTX;
+ SHA256_CTX ctx;
+ ], [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_SHA2_IN_SHA_H], [], [sha2 is defined in sha.h])
], [AC_MSG_RESULT(no)
AC_LIBOBJ([sha2])
CRYPTOBJS="$CRYPTOBJS sha2.o"
- ], [
- AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_SHA2_IN_SHA_H], [], [sha2 is defined in sha.h])
])
CPPFLAGS_ADD="$CPPFLAGS_ADD -I./\${top_srcdir}/src/racoon/missing"
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/netbsd-import.sh
--- a/crypto/dist/ipsec-tools/netbsd-import.sh Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/netbsd-import.sh Mon Nov 21 21:12:29 2005 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: netbsd-import.sh,v 1.1.1.2.2.1 2005/09/03 07:03:49 snj Exp $
+# $NetBSD: netbsd-import.sh,v 1.1.1.2.2.2 2005/11/21 21:12:29 tron Exp $
#
# Copyright (c) 2000-2005 The NetBSD Foundation, Inc.
# All rights reserved.
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/rpm/suse/ipsec-tools.spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/dist/ipsec-tools/rpm/suse/ipsec-tools.spec Mon Nov 21 21:12:29 2005 +0000
@@ -0,0 +1,110 @@
+#
+# spec file for package ipsec-tools
+#
+# Copyright (c) 2005 SUSE LINUX AG, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://www.suse.de/feedback/
+#
+
+# norootforbuild
+# neededforbuild kernel-source openssl openssl-devel readline-devel
+
+BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc
glibc-devel glibc-locale gpm grep groff gzip info insserv less libacl libattr libgcc libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg
openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel
autoconf automake binutils gcc gdbm gettext kernel-source libtool openssl-devel perl readline-devel rpm
+
+Name: ipsec-tools
+Version: 0.6.3
+Release: 0
+License: Other License(s), see package, BSD
+Group: Productivity/Networking/Security
+Provides: racoon
+PreReq: %insserv_prereq %fillup_prereq
+Autoreqprov: on
+Summary: IPsec Utilities
+Source: http://prdownloads.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2
+Source1: racoon.init
+Source2: sysconfig.racoon
+URL: http://ipsec-tools.sourceforge.net/
+Prefix: /usr
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+This is the IPsec-Tools package. This package is needed to really make
+use of the IPsec functionality in the version 2.5 and 2.6 Linux
+kernels. This package builds:
+
+- libipsec, a PFKeyV2 library
+
+- setkey, a program to directly manipulate policies and SAs
+
+- racoon, an IKEv1 keying daemon
+
+These sources can be found at the IPsec-Tools home page at:
+http://ipsec-tools.sourceforge.net/
+
+
+
+Authors:
+--------
+ Derek Atkins <derek%ihtfp.com@localhost>
+ Michal Ludvig <mludvig%suse.cz@localhost>
+
+%prep
+%setup
+
+%build
+%{suse_update_config -f . src/racoon}
+CFLAGS="$RPM_OPT_FLAGS" \
+./configure --prefix=/usr --disable-shared \
+ --mandir=%{_mandir} --infodir=%{_infodir} --libdir=%{_libdir} \
+ --libexecdir=%{_libdir} --sysconfdir=/etc/racoon \
+ --sharedstatedir=/var/run --localstatedir=/var \
+ --enable-dpd --enable-hybrid --enable-frag
+make
+make check
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+install -m 0755 $RPM_SOURCE_DIR/racoon.init $RPM_BUILD_ROOT/etc/init.d/racoon
+ln -sf /etc/init.d/racoon $RPM_BUILD_ROOT/usr/sbin/rcracoon
+mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+install -m 644 $RPM_SOURCE_DIR/sysconfig.racoon $RPM_BUILD_ROOT/var/adm/fillup-templates/
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/
+cp -rv src/racoon/samples $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/
+cp -v src/setkey/sample* $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/
+
+%post
+%{fillup_and_insserv racoon}
+
+%postun
+%{insserv_cleanup}
+
+%clean
+if test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/"; then
+ rm -rf $RPM_BUILD_ROOT
+fi
+
+%files
+%defattr(-,root,root)
+%dir /etc/racoon
+%config(noreplace) /etc/racoon/psk.txt
+%config(noreplace) /etc/racoon/racoon.conf
+%config(noreplace) /etc/racoon/setkey.conf
+%config /etc/init.d/racoon
+/usr/sbin/rcracoon
+%dir /usr/include/libipsec/
+%doc /usr/share/doc/packages/%{name}/
+/var/adm/fillup-templates/sysconfig.racoon
+/usr/include/libipsec/libpfkey.h
+/usr/%{_lib}/libipsec.a
+/usr/%{_lib}/libipsec.la
+/usr/sbin/racoon
+/usr/sbin/racoonctl
+/usr/sbin/setkey
+/usr/sbin/plainrsa-gen
+%{_mandir}/man*/*
+
+%changelog -n ipsec-tools
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h
--- a/crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: glibc-bugs.h,v 1.1.1.2.2.1 2005/09/03 07:03:49 snj Exp $ */
+/* $NetBSD: glibc-bugs.h,v 1.1.1.2.2.2 2005/11/21 21:12:29 tron Exp $ */
#ifndef __GLIBC_BUGS_H__
#define __GLIBC_BUGS_H__ 1
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
--- a/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pfkeyv2.h,v 1.1.1.2.2.1 2005/09/03 07:03:49 snj Exp $ */
+/* $NetBSD: pfkeyv2.h,v 1.1.1.2.2.2 2005/11/21 21:12:29 tron Exp $ */
#ifndef __NET_PFKEYV2_H_
#define __NET_PFKEYV2_H_ 1
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h
--- a/crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.1.1.2.2.1 2005/09/03 07:03:49 snj Exp $ */
+/* $NetBSD: ipsec.h,v 1.1.1.2.2.2 2005/11/21 21:12:29 tron Exp $ */
#include <net/pfkeyv2.h>
#include <linux/ipsec.h>
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h
--- a/crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.1.1.2.2.1 2005/09/03 07:03:49 snj Exp $ */
+/* $NetBSD: queue.h,v 1.1.1.2.2.2 2005/11/21 21:12:29 tron Exp $ */
/*
* Copyright (c) 1991, 1993
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_dump_policy.c,v 1.1.1.2.2.2 2005/09/03 07:03:49 snj Exp $ */
+/* $NetBSD: ipsec_dump_policy.c,v 1.1.1.2.2.3 2005/11/21 21:12:29 tron Exp $ */
/* Id: ipsec_dump_policy.c,v 1.7.4.2 2005/06/29 13:01:27 manubsd Exp */
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_get_policylen.c,v 1.1.1.2.2.1 2005/09/03 07:03:49 snj Exp $ */
+/* $NetBSD: ipsec_get_policylen.c,v 1.1.1.2.2.2 2005/11/21 21:12:30 tron Exp $ */
/* $KAME: ipsec_get_policylen.c,v 1.5 2000/05/07 05:25:03 itojun Exp $ */
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipsec_set_policy.3,v 1.1.1.2.2.2 2005/09/03 07:03:49 snj Exp $
+.\" $NetBSD: ipsec_set_policy.3,v 1.1.1.2.2.3 2005/11/21 21:12:30 tron Exp $
.\"
.\" $KAME: ipsec_set_policy.3,v 1.16 2003/01/06 21:59:03 sumikawa Exp $
.\"
diff -r 48b89f1791e5 -r aa9454373a32 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3 Mon Nov 21 20:56:38 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3 Mon Nov 21 21:12:29 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipsec_strerror.3,v 1.1.1.2.2.2 2005/09/03 07:03:49 snj Exp $
+.\" $NetBSD: ipsec_strerror.3,v 1.1.1.2.2.3 2005/11/21 21:12:30 tron Exp $
.\"
.\" $KAME: ipsec_strerror.3,v 1.9 2001/08/17 07:21:36 itojun Exp $
.\"
Home |
Main Index |
Thread Index |
Old Index