[racoon2] Initial commit (#752223)

Pavel Šimerda pavlix at fedoraproject.org
Mon Feb 13 15:26:00 UTC 2012


commit 9877005c65af84c6c112678253ea8477803a1e06
Author: Pavel Šimerda <pavlix at pavlix.net>
Date:   Mon Feb 13 16:24:57 2012 +0100

    Initial commit (#752223)

 racoon2-autotools.patch         |  225 +++++++++++++++++++++++++++++++++++++++
 racoon2-configfiles.patch       |  219 +++++++++++++++++++++++++++++++++++++
 racoon2-functions-shebang.patch |   10 ++
 racoon2-systemd.patch           |   24 ++++
 racoon2.spec                    |  158 +++++++++++++++++++++++++++
 sources                         |    1 +
 6 files changed, 637 insertions(+), 0 deletions(-)
---
diff --git a/racoon2-autotools.patch b/racoon2-autotools.patch
new file mode 100644
index 0000000..cab9bdc
--- /dev/null
+++ b/racoon2-autotools.patch
@@ -0,0 +1,225 @@
+Index: racoon2-20100526a/iked/Makefile.in
+===================================================================
+--- racoon2-20100526a.orig/iked/Makefile.in
++++ racoon2-20100526a/iked/Makefile.in
+@@ -29,7 +29,7 @@ INSTALL_DATA =	@INSTALL_DATA@
+ LDFLAGS =	@LDFLAGS@
+ CPPFLAGS =	-I. -I./missing
+ CPPFLAGS +=	@CPPFLAGS@
+-CPPFLAGS += -DSYSCONFDIR=\"${sysconfdir}\"
++CPPFLAGS += -DRACOON2_CONFIG_DIR=\"${sysconfdir}/racoon2\"
+ CPPFLAGS += -DDEBUG
+ CPPFLAGS += -DDEBUG_TRACE
+ # CPPFLAGS += -DSELFTEST
+@@ -66,11 +66,12 @@ all:  $(PROG) $(TESTPROG)
+ install: install-prog install-doc
+ 
+ install-prog: $(PROG)
+-	$(INSTALL) -d $(sbindir)
+-	$(INSTALL_PROGRAM) $(PROG) $(sbindir)
++	$(INSTALL) -d $(DESTDIR)$(sbindir)
++	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)
++	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8
+ 
+ install-doc:
+-	$(INSTALL) -d $(mandir)/man8
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+ # not friendly with -n  :-(
+ 	sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \
+ 	for f in $(MAN); do \
+Index: racoon2-20100526a/lib/Makefile.in
+===================================================================
+--- racoon2-20100526a.orig/lib/Makefile.in
++++ racoon2-20100526a/lib/Makefile.in
+@@ -11,7 +11,7 @@ MKDEP = @MKDEP@
+ 
+ LDFLAGS	= @LDFLAGS@
+ CFLAGS	= @CFLAGS@ @CPPFLAGS@ @OPTFLAG@ @DEFS@
+-CFLAGS	+=-DSYSCONFDIR=\"${sysconfdir}\"
++CFLAGS	+=-DRACOON2_CONFIG_DIR=\"${sysconfdir}/racoon2\"
+ CFLAGS	+=-DCF_DEBUG
+ # CFLAGS  +=-DSADB_X_MIGRATE
+ YFLAGS	+=-d
+Index: racoon2-20100526a/lib/racoon.h
+===================================================================
+--- racoon2-20100526a.orig/lib/racoon.h
++++ racoon2-20100526a/lib/racoon.h
+@@ -42,7 +42,7 @@
+ #include "script.h"
+ #include "missing/missing.h"
+ 
+-#define RACOON_CONF	SYSCONFDIR "/racoon2.conf"
++#define RACOON_CONF	RACOON2_CONFIG_DIR "/racoon2.conf"
+ 
+ extern int rct2isakmp_exmode (int);
+ extern int rct2app_action (int);
+Index: racoon2-20100526a/samples/Makefile.in
+===================================================================
+--- racoon2-20100526a.orig/samples/Makefile.in
++++ racoon2-20100526a/samples/Makefile.in
+@@ -12,60 +12,60 @@ INSTALL_SCRIPT=@INSTALL_SCRIPT@
+ all:
+ 
+ install: all install-startup- at startup_scripts@ install-samples install-hook
+-	$(INSTALL) -d -o 0 -g 0 -m 700 /var/run/racoon2
++	$(INSTALL) -d -m 700 $(DESTDIR)/var/run/racoon2
+ 
+ install-samples:
+-	$(INSTALL) -d $(sysconfdir)
+-	$(INSTALL) -m 600 racoon2.conf $(sysconfdir)/racoon2.conf.sample
+-	$(INSTALL) -m 600 vals.conf $(sysconfdir)/vals.conf.sample
+-	$(INSTALL) -m 600 default.conf $(sysconfdir)/default.conf.sample
+-	$(INSTALL) -m 600 transport_ike.conf $(sysconfdir)/transport_ike.conf.sample
+-	$(INSTALL) -m 600 tunnel_ike.conf $(sysconfdir)/tunnel_ike.conf.sample
+-	$(INSTALL) -m 600 tunnel_ike_natt.conf $(sysconfdir)/tunnel_ike_natt.conf.sample
+-	$(INSTALL) -m 600 transport_kink.conf $(sysconfdir)/transport_kink.conf.sample
+-	$(INSTALL) -m 600 tunnel_kink.conf $(sysconfdir)/tunnel_kink.conf.sample
+-	$(INSTALL) -m 600 local-test.conf $(sysconfdir)/local-test.conf.sample
+-	$(INSTALL) -d -m 700 $(sysconfdir)/psk
+-	$(INSTALL) -d -m 700 $(sysconfdir)/cert
++	$(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/racoon2
++	$(INSTALL_DATA) racoon2.conf $(DESTDIR)$(sysconfdir)/racoon2/racoon2.conf
++	$(INSTALL_DATA) vals.conf $(DESTDIR)$(sysconfdir)/racoon2/vals.conf
++	$(INSTALL_DATA) default.conf $(DESTDIR)$(sysconfdir)/racoon2/default.conf
++	$(INSTALL_DATA) transport_ike.conf $(DESTDIR)$(sysconfdir)/racoon2/transport_ike.conf
++	$(INSTALL_DATA) tunnel_ike.conf $(DESTDIR)$(sysconfdir)/racoon2/tunnel_ike.conf
++	$(INSTALL_DATA) tunnel_ike_natt.conf $(DESTDIR)$(sysconfdir)/racoon2/tunnel_ike_natt.conf
++	$(INSTALL_DATA) transport_kink.conf $(DESTDIR)$(sysconfdir)/racoon2/transport_kink.conf
++	$(INSTALL_DATA) tunnel_kink.conf $(DESTDIR)$(sysconfdir)/racoon2/tunnel_kink.conf
++	$(INSTALL_DATA) local-test.conf $(DESTDIR)$(sysconfdir)/racoon2/local-test.conf
++	$(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/racoon2/psk
++	$(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/racoon2/cert
+ 
+ install-startup-rc-d:
+-	$(INSTALL) -d $(sysconfdir)/rc.d
+-	$(INSTALL_SCRIPT) rc.d-iked $(sysconfdir)/rc.d/iked
+-	$(INSTALL_SCRIPT) rc.d-kinkd $(sysconfdir)/rc.d/kinkd
+-	$(INSTALL_SCRIPT) rc.d-spmd $(sysconfdir)/rc.d/spmd
+-	$(INSTALL_SCRIPT) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/rc.d
++	$(INSTALL_SCRIPT) rc.d-iked $(DESTDIR)$(sysconfdir)/rc.d/iked
++	$(INSTALL_SCRIPT) rc.d-kinkd $(DESTDIR)$(sysconfdir)/rc.d/kinkd
++	$(INSTALL_SCRIPT) rc.d-spmd $(DESTDIR)$(sysconfdir)/rc.d/spmd
++	$(INSTALL_SCRIPT) rc.d-racoon2 $(DESTDIR)$(sysconfdir)/rc.d/racoon2
+ 
+ install-startup-init-d:
+-	$(INSTALL) -d $(sysconfdir)/init.d
+-	$(INSTALL_SCRIPT) init.d-iked $(sysconfdir)/init.d/iked
+-	$(INSTALL_SCRIPT) init.d-kinkd $(sysconfdir)/init.d/kinkd
+-	$(INSTALL_SCRIPT) init.d-spmd $(sysconfdir)/init.d/spmd
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/rc.d/init.d
++	$(INSTALL_SCRIPT) init.d-iked $(DESTDIR)$(sysconfdir)/rc.d/init.d/racoon2-iked
++	$(INSTALL_SCRIPT) init.d-kinkd $(DESTDIR)$(sysconfdir)/rc.d/init.d/racoon2-kinkd
++	$(INSTALL_SCRIPT) init.d-spmd $(DESTDIR)$(sysconfdir)/rc.d/init.d/racoon2-spmd
+ 
+ install-startup-none:
+ 
+ install-hook:
+-	$(INSTALL) -d $(sysconfdir)/hook
+-	$(INSTALL_DATA) functions $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/ikesa-up.d
+-	$(INSTALL_SCRIPT) ikesa-up $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/ikesa-down.d
+-	$(INSTALL_SCRIPT) ikesa-down $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/ikesa-rekey.d
+-	$(INSTALL_SCRIPT) ikesa-rekey $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/child-up.d
+-	$(INSTALL_SCRIPT) child-up $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/child-down.d
+-	$(INSTALL_SCRIPT) child-down $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/child-rekey.d
+-	$(INSTALL_SCRIPT) child-rekey $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/migration.d
+-	$(INSTALL_SCRIPT) migration $(sysconfdir)/hook
+-	$(INSTALL_SCRIPT) 00ikesaup_sample $(sysconfdir)/hook/ikesa-up.d
+-	$(INSTALL_SCRIPT) 00childup_sample $(sysconfdir)/hook/child-up.d
+-	$(INSTALL) -d $(sysconfdir)/hook/ph1-up.d
+-	$(INSTALL_SCRIPT) ph1-up $(sysconfdir)/hook
+-	$(INSTALL) -d $(sysconfdir)/hook/ph1-down.d
+-	$(INSTALL_SCRIPT) ph1-down $(sysconfdir)/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL_DATA) functions $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/ikesa-up.d
++	$(INSTALL_SCRIPT) ikesa-up $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/ikesa-down.d
++	$(INSTALL_SCRIPT) ikesa-down $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/ikesa-rekey.d
++	$(INSTALL_SCRIPT) ikesa-rekey $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/child-up.d
++	$(INSTALL_SCRIPT) child-up $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/child-down.d
++	$(INSTALL_SCRIPT) child-down $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/child-rekey.d
++	$(INSTALL_SCRIPT) child-rekey $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/migration.d
++	$(INSTALL_SCRIPT) migration $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL_SCRIPT) 00ikesaup_sample $(DESTDIR)$(sysconfdir)/racoon2/hook/ikesa-up.d
++	$(INSTALL_SCRIPT) 00childup_sample $(DESTDIR)$(sysconfdir)/racoon2/hook/child-up.d
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/ph1-up.d
++	$(INSTALL_SCRIPT) ph1-up $(DESTDIR)$(sysconfdir)/racoon2/hook
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2/hook/ph1-down.d
++	$(INSTALL_SCRIPT) ph1-down $(DESTDIR)$(sysconfdir)/racoon2/hook
+ 
+ # empty
+ depend:
+Index: racoon2-20100526a/spmd/Makefile.in
+===================================================================
+--- racoon2-20100526a.orig/spmd/Makefile.in
++++ racoon2-20100526a/spmd/Makefile.in
+@@ -1,6 +1,6 @@
+ CC = @CC@
+ MKDEP = @MKDEP@
+-CFLAGS = @CFLAGS@ @CPPFLAGS@ @DEFS@ -DSYSCONFDIR=\"${sysconfdir}\" 
++CFLAGS = @CFLAGS@ @CPPFLAGS@ @DEFS@ -DRACOON2_CONFIG_DIR=\"${sysconfdir}/racoon2\"
+ # CFLAGS +=-DSADB_X_MIGRATE
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+@@ -38,11 +38,11 @@ spmdctl: spmdctl.o ../lib/libracoon.a
+ spmdctl.o: spmd_internal.h
+ 
+ install: all
+-	$(INSTALL_DIR) $(sbindir)
+-	$(INSTALL_PROGRAM) $(DAEMON) $(sbindir)
+-	$(INSTALL_PROGRAM) $(COMMAND) $(sbindir)
+-	$(INSTALL_DIR) $(man8dir)
+-	$(INSTALL_DATA) $(MANFILES) $(man8dir)
++	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
++	$(INSTALL_PROGRAM) $(DAEMON) $(DESTDIR)$(sbindir)
++	$(INSTALL_PROGRAM) $(COMMAND) $(DESTDIR)$(sbindir)
++	$(INSTALL_DIR) $(DESTDIR)$(man8dir)
++	$(INSTALL_DATA) $(MANFILES) $(DESTDIR)$(man8dir)
+ 
+ clean:
+ 	-rm -f $(TARGET) *.o $(COMMAND)
+Index: racoon2-20100526a/pskgen/Makefile.in
+===================================================================
+--- racoon2-20100526a.orig/pskgen/Makefile.in
++++ racoon2-20100526a/pskgen/Makefile.in
+@@ -17,10 +17,10 @@ PROG=pskgen
+ all:
+ 
+ install: all
+-	$(INSTALL) -d $(sbindir)
+-	$(INSTALL_SCRIPT) $(PROG) $(sbindir)
+-	$(INSTALL_DATA) $(PROG).8 $(mandir)/man8
+-	$(INSTALL) -d $(prefix)/etc/racoon2
++	$(INSTALL) -d $(DESTDIR)$(sbindir)
++	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(sbindir)
++	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/racoon2
+ 	sh ./autogen.spmd.pwd
+ 
+ depend:
+Index: racoon2-20100526a/spmd/spmd_internal.h
+===================================================================
+--- racoon2-20100526a.orig/spmd/spmd_internal.h
++++ racoon2-20100526a/spmd/spmd_internal.h
+@@ -35,7 +35,7 @@ extern char spmd_version[];
+ 
+ extern int spmd_foreground;
+ 
+-#define RACOON2_CONFIG_FILE SYSCONFDIR"/racoon2.conf"
++#define RACOON2_CONFIG_FILE RACOON2_CONFIG_DIR "/racoon2.conf"
+ 
+ #if defined(HAVE_NSSWITCH_CONF)
+ # define NSSWITCH_CONF_FILE "/etc/nsswitch.conf"
diff --git a/racoon2-configfiles.patch b/racoon2-configfiles.patch
new file mode 100644
index 0000000..1e1d173
--- /dev/null
+++ b/racoon2-configfiles.patch
@@ -0,0 +1,219 @@
+Index: racoon2-20100526a/samples/child-down.in
+===================================================================
+--- racoon2-20100526a.orig/samples/child-down.in
++++ racoon2-20100526a/samples/child-down.in
+@@ -3,7 +3,7 @@
+ # run scripts in the child-down.d directory when CHILD_SA is removed
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/child-rekey.in
+===================================================================
+--- racoon2-20100526a.orig/samples/child-rekey.in
++++ racoon2-20100526a/samples/child-rekey.in
+@@ -3,7 +3,7 @@
+ # run scripts in the child-rekey.d directory when CHILD_SA is rekeyed
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/child-up.in
+===================================================================
+--- racoon2-20100526a.orig/samples/child-up.in
++++ racoon2-20100526a/samples/child-up.in
+@@ -3,7 +3,7 @@
+ # run scripts in the child-up.d directory when CHILD_SA is established
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/ikesa-down.in
+===================================================================
+--- racoon2-20100526a.orig/samples/ikesa-down.in
++++ racoon2-20100526a/samples/ikesa-down.in
+@@ -3,7 +3,7 @@
+ # run scripts in the ikesa-down.d directory when IKE_SA is removed
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/ikesa-rekey.in
+===================================================================
+--- racoon2-20100526a.orig/samples/ikesa-rekey.in
++++ racoon2-20100526a/samples/ikesa-rekey.in
+@@ -3,7 +3,7 @@
+ # run scripts in the ikesa-rekey.d directory when IKE_SA is rekeyed 
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/ikesa-up.in
+===================================================================
+--- racoon2-20100526a.orig/samples/ikesa-up.in
++++ racoon2-20100526a/samples/ikesa-up.in
+@@ -3,7 +3,7 @@
+ # run scripts in the ikesa-up.d directory when IKE_SA is established
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/migration.in
+===================================================================
+--- racoon2-20100526a.orig/samples/migration.in
++++ racoon2-20100526a/samples/migration.in
+@@ -3,7 +3,7 @@
+ # run scripts in the migration.d directory when MIP6 MIGRATE is issued
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/ph1-down.in
+===================================================================
+--- racoon2-20100526a.orig/samples/ph1-down.in
++++ racoon2-20100526a/samples/ph1-down.in
+@@ -3,7 +3,7 @@
+ # run scripts in the ph1-down.d directory when ISAKMP SA is removed
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/ph1-up.in
+===================================================================
+--- racoon2-20100526a.orig/samples/ph1-up.in
++++ racoon2-20100526a/samples/ph1-up.in
+@@ -3,7 +3,7 @@
+ # run scripts in the ph1-up.d directory when ISAKMP SA is established
+ #
+ 
+-cd @prefix@/etc/racoon2/hook
++cd /etc/racoon2/hook
+ 
+ . ./functions
+ 
+Index: racoon2-20100526a/samples/racoon2.conf.in
+===================================================================
+--- racoon2-20100526a.orig/samples/racoon2.conf.in
++++ racoon2-20100526a/samples/racoon2.conf.in
+@@ -1,7 +1,7 @@
+ # $Id: racoon2.conf.in,v 1.34 2007/12/27 01:08:52 mk Exp $
+ 
+ ## Edit vals.conf for your environment
+-include "@prefix@/etc/racoon2/vals.conf";
++include "/etc/racoon2/vals.conf";
+ 
+ # interface info
+ interface
+@@ -17,7 +17,7 @@ interface
+ 	spmd {
+ 		unix "/var/run/racoon2/spmif";
+ 	};
+-	spmd_password "@prefix@/etc/racoon2/spmd.pwd";
++	spmd_password "/etc/racoon2/spmd.pwd";
+ };
+ 
+ # resolver info
+@@ -42,7 +42,7 @@ resolver
+ # Please don't touch this line (especially novice user);
+ #
+ 
+-include "@prefix@/etc/racoon2/default.conf";
++include "/etc/racoon2/default.conf";
+ 
+ #
+ # These are examples of configuration for each peer.
+@@ -50,21 +50,21 @@ include "@prefix@/etc/racoon2/default.co
+ # Uncomment following one 'include' line you want to use.
+ 
+ ## Transport mode IKEv2 or IKEv1
+-# include "@prefix@/etc/racoon2/transport_ike.conf";
++# include "/etc/racoon2/transport_ike.conf";
+ 
+ ## Tunnel mode IKEv2 or IKEv1 (initiator and responder)
+-# include "@prefix@/etc/racoon2/tunnel_ike.conf";
++# include "/etc/racoon2/tunnel_ike.conf";
+ 
+ ## Tunnel mode IKEv2 (responder; NAT-T support)
+ ## Enable this if you're a responder in global net and
+ ## the peer is an initiator behind NAT.
+-# include "@prefix@/etc/racoon2/tunnel_ike_natt.conf";
++# include "/etc/racoon2/tunnel_ike_natt.conf";
+ 
+ ## Transport mode KINK
+-# include "@prefix@/etc/racoon2/transport_kink.conf";
++# include "/etc/racoon2/transport_kink.conf";
+ 
+ ## Tunnel mode KINK
+-# include "@prefix@/etc/racoon2/tunnel_kink.conf";
++# include "/etc/racoon2/tunnel_kink.conf";
+ 
+ ## For local test
+-# include "@prefix@/etc/racoon2/local-test.conf";
++# include "/etc/racoon2/local-test.conf";
+Index: racoon2-20100526a/samples/vals.conf.in
+===================================================================
+--- racoon2-20100526a.orig/samples/vals.conf.in
++++ racoon2-20100526a/samples/vals.conf.in
+@@ -2,10 +2,10 @@
+ setval {
+ ### Directory Settings ###
+ 	# Preshared key file directory : specify if you want to use preshared keys
+-	PSKDIR		"@prefix@/etc/racoon2/psk";
++	PSKDIR		"/etc/racoon2/psk";
+ 
+ 	# Cert file directory : specify if you want to use certs
+-	CERTDIR		"@prefix@/etc/racoon2/cert";
++	CERTDIR		"/etc/racoon2/cert";
+ 
+ ### ID Settings ###
+ 	# your FQDN : specify if you want to use FQDN as your ID
+@@ -75,16 +75,16 @@ setval {
+ 
+ ### Scripts
+         ## IKEv2
+-	IKESAUP_SCR	"@prefix@/etc/racoon2/hook/ikesa-up";
+-	IKESADOWN_SCR	"@prefix@/etc/racoon2/hook/ikesa-down";
+-	CHILDUP_SCR	"@prefix@/etc/racoon2/hook/child-up";
+-	CHILDOWN_SCR	"@prefix@/etc/racoon2/hook/child-down";
+-	IKESAREKEY_SCR	"@prefix@/etc/racoon2/hook/ikesa-rekey";
+-	CHILDREKEY_SCR	"@prefix@/etc/racoon2/hook/child-rekey";
+-	MIGRATION_SCR	"@prefix@/etc/racoon2/hook/migration";
++	IKESAUP_SCR	"/etc/racoon2/hook/ikesa-up";
++	IKESADOWN_SCR	"/etc/racoon2/hook/ikesa-down";
++	CHILDUP_SCR	"/etc/racoon2/hook/child-up";
++	CHILDOWN_SCR	"/etc/racoon2/hook/child-down";
++	IKESAREKEY_SCR	"/etc/racoon2/hook/ikesa-rekey";
++	CHILDREKEY_SCR	"/etc/racoon2/hook/child-rekey";
++	MIGRATION_SCR	"/etc/racoon2/hook/migration";
+ 	## IKEv1
+-	PH1UP_SCR	"@prefix@/etc/racoon2/hook/ph1-up";
+-	PH1DOWN_SCR	"@prefix@/etc/racoon2/hook/ph1-down";
++	PH1UP_SCR	"/etc/racoon2/hook/ph1-up";
++	PH1DOWN_SCR	"/etc/racoon2/hook/ph1-down";
+ 
+ ### KINK ###
+ 	# Kerberos5 principal
diff --git a/racoon2-functions-shebang.patch b/racoon2-functions-shebang.patch
new file mode 100644
index 0000000..97236cb
--- /dev/null
+++ b/racoon2-functions-shebang.patch
@@ -0,0 +1,10 @@
+Index: racoon2-20100526a/samples/functions
+===================================================================
+--- racoon2-20100526a.orig/samples/functions
++++ racoon2-20100526a/samples/functions
+@@ -1,5 +1,3 @@
+-#!/bin/sh 
+-# 
+ # run_hook(), run_hookdir(), are derived from dhcp3-client script 
+ # (debian etch dhcp3-client 3.0.4-13).
+ # The original notice is attached below:
diff --git a/racoon2-systemd.patch b/racoon2-systemd.patch
new file mode 100644
index 0000000..b5cc125
--- /dev/null
+++ b/racoon2-systemd.patch
@@ -0,0 +1,24 @@
+Index: racoon2-20100526a/racoon2-iked.service
+===================================================================
+--- /dev/null
++++ racoon2-20100526a/racoon2-iked.service
+@@ -0,0 +1,8 @@
++[Unit]
++Description=Racoon2
++Requires=racoon2-spmd
++After=racoon2-spmd
++
++[Service]
++Type=forking
++ExecStart=/usr/sbin/iked
+Index: racoon2-20100526a/racoon2-spmd.service
+===================================================================
+--- /dev/null
++++ racoon2-20100526a/racoon2-spmd.service
+@@ -0,0 +1,6 @@
++[Unit]
++Description=Racoon2
++
++[Service]
++Type=forking
++ExecStart=/usr/sbin/spmd
diff --git a/racoon2.spec b/racoon2.spec
new file mode 100644
index 0000000..dd1730c
--- /dev/null
+++ b/racoon2.spec
@@ -0,0 +1,158 @@
+Name:           racoon2
+Version:        20100526a
+Release:        13%{?dist}
+Summary:        An implementation of key management system for IPsec
+Group:          System Environment/Daemons
+License:        BSD
+URL:            http://www.racoon2.wide.ad.jp/
+Source0:        http://ftp.racoon2.wide.ad.jp/pub/%{name}/%{name}-%{version}.tgz
+Patch0:         %{name}-autotools.patch
+Patch1:         %{name}-systemd.patch
+Patch2:         %{name}-functions-shebang.patch
+Patch3:         %{name}-configfiles.patch
+BuildRequires:  byacc
+BuildRequires:  flex
+BuildRequires:  openssl-devel
+BuildRequires:  systemd-units
+Requires(post): systemd-units
+Requires(post): pwgen
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%description
+The Racoon2 project is a joint effort which provides an implementation of key
+management system for IPsec. The implementation is called Racoon2, a successor
+of Racoon, which was developed by the KAME project. It supports IKEv1, IKEv2,
+and KINK protocols. It works on FreeBSD, NetBSD, Linux, and Mac OS X.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+%configure --disable-kinkd --disable-pedant --prefix=%{prefix} --sysconfdir=%{_sysconfdir}
+# --disable-kinkd: KINK must be disabled unless krb5 is compiled --with-crypto-impl=builtin
+# because kinkd uses krb5's internal crypto functions that are not compiled otherwise.
+# --disable-pedant: Racoon2 doesn't compile with pedantic compiler that is enabled
+# in the source tarball.
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+# Delete kinkd initscript
+rm %{buildroot}%{_initddir}/%{name}-kinkd
+# Install/delete systemd units and initscripts
+# This must correspond to units/initscripts in the
+# files section.
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+install -d %{buildroot}/%{_unitdir}
+install -m 644 -t %{buildroot}/%{_unitdir} %{name}-iked.service %{name}-spmd.service
+rm %{buildroot}%{_initddir}/%{name}-*
+%endif
+
+%files
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/default.conf
+%config(noreplace) %{_sysconfdir}/%{name}/local-test.conf
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/transport_ike.conf
+%config(noreplace) %{_sysconfdir}/%{name}/transport_kink.conf
+%config(noreplace) %{_sysconfdir}/%{name}/tunnel_ike.conf
+%config(noreplace) %{_sysconfdir}/%{name}/tunnel_ike_natt.conf
+%config(noreplace) %{_sysconfdir}/%{name}/tunnel_kink.conf
+%config(noreplace) %{_sysconfdir}/%{name}/vals.conf
+%dir %{_sysconfdir}/%{name}/hook
+%{_sysconfdir}/%{name}/hook/child-down
+%{_sysconfdir}/%{name}/hook/child-rekey
+%{_sysconfdir}/%{name}/hook/child-up
+%{_sysconfdir}/%{name}/hook/child-up.d/00childup_sample
+%config(noreplace) %{_sysconfdir}/%{name}/hook/functions
+%{_sysconfdir}/%{name}/hook/ikesa-down
+%{_sysconfdir}/%{name}/hook/ikesa-rekey
+%{_sysconfdir}/%{name}/hook/ikesa-up
+%{_sysconfdir}/%{name}/hook/ikesa-up.d/00ikesaup_sample
+%{_sysconfdir}/%{name}/hook/migration
+%{_sysconfdir}/%{name}/hook/ph1-down
+%{_sysconfdir}/%{name}/hook/ph1-up
+%{_sbindir}/iked
+%{_sbindir}/pskgen
+%{_sbindir}/spmd
+%{_sbindir}/spmdctl
+%dir %{_var}/run/%{name}
+%{_mandir}/man8/iked.8.gz
+%{_mandir}/man8/pskgen.8.gz
+%{_mandir}/man8/spmd.8.gz
+%{_mandir}/man8/spmdctl.8.gz
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%{_unitdir}/%{name}-iked.service
+%{_unitdir}/%{name}-spmd.service
+%else
+%{_initddir}/%{name}-iked
+%{_initddir}/%{name}-spmd
+%endif
+
+%post
+if [ ! -e "%{_sysconfdir}/%{name}/spmd.pwd" ]; then
+    pwgen > %{_sysconfdir}/%{name}/spmd.pwd
+    chmod 600 %{_sysconfdir}/%{name}/spmd.pwd
+fi
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable %{name}-spmd.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable %{name}-iked.service > /dev/null 2>&1 || :
+    /bin/systemctl stop %{name}-spmd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop %{name}-iked.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart %{name}-spmd.service >/dev/null 2>&1 || :
+    /bin/systemctl try-restart %{name}-iked.service >/dev/null 2>&1 || :
+fi
+
+%changelog
+* Sat Jan 21 2012 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-13
+- Added rm at the beginning of install section
+- Changed conditionals to versioned ones
+
+* Sun Jan 15 2012 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-12
+- Removed sysvinit subpackage
+- Added conditionals to handle different init systems
+- Changed initrd macro to initd
+- Marked functions as config file
+
+* Fri Dec 30 2011 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-11
+- Removed -fno-strict-aliasing
+- Removed -D_GNU_SOURCE=1
+- Added rationale for --disable-kinkd and --disable-pedant
+- Removed @prefix@ from configuration files (patch)
+
+* Thu Dec 29 2011 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-10
+- Added pwgen dependency
+- Moved various inline fixes from specfile to patches
+- Fixed racoon2 configuration path (/etc/racoon2)
+
+* Wed Dec 07 2011 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-9
+- Incorporated more rpmlint feedback
+- Directories are now specified by macros
+- Added systemd scriptlets
+- Added needed /var/run/racoon2 directory
+- Added directories to files section
+
+* Wed Nov 09 2011 pavlix - 20100526a-8
+- Incorporated rpmlint feedback
+
+* Wed Nov 09 2011 pavlix - 20100526a-7
+- Experimental build for packaging
diff --git a/sources b/sources
index e69de29..9da6284 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2fa33abff1ccd6fc22876a23db77aaa8  racoon2-20100526a.tgz


More information about the scm-commits mailing list