Imported Upstream version 5.0.1

3 files changed, 46 insertions, 11 deletions

diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am
index 405e08b3d..915b57421 100644
--- a/src/_copyright/Makefile.am
+++ b/src/_copyright/Makefile.am
@@ -2,7 +2,6 @@ ipsec_PROGRAMS = _copyright
 _copyright_SOURCES = _copyright.c
 
 INCLUDES = \
--I$(top_srcdir)/src/libfreeswan \
 -I$(top_srcdir)/src/libstrongswan
 
-_copyright_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
+_copyright_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
diff --git a/src/_copyright/Makefile.in b/src/_copyright/Makefile.in
index ae15d3cde..c4477f303 100644
--- a/src/_copyright/Makefile.in
+++ b/src/_copyright/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(ipsecdir)"
@@ -57,9 +58,8 @@ PROGRAMS = $(ipsec_PROGRAMS)
 am__copyright_OBJECTS = _copyright.$(OBJEXT)
 _copyright_OBJECTS = $(am__copyright_OBJECTS)
 _copyright_DEPENDENCIES =  \
-	$(top_builddir)/src/libfreeswan/libfreeswan.a \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
-DEFAULT_INCLUDES = -I.@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -85,6 +85,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BFDLIB = @BFDLIB@
 BTLIB = @BTLIB@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -179,11 +180,14 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 c_plugins = @c_plugins@
+charon_natt_port = @charon_natt_port@
+charon_plugins = @charon_plugins@
+charon_udp_port = @charon_udp_port@
 clearsilver_LIBS = @clearsilver_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dbusservicedir = @dbusservicedir@
-default_pkcs11 = @default_pkcs11@
+dev_headers = @dev_headers@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -200,11 +204,12 @@ imcvdir = @imcvdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipsec_script = @ipsec_script@
+ipsec_script_upper = @ipsec_script_upper@
 ipsecdir = @ipsecdir@
 ipsecgroup = @ipsecgroup@
 ipseclibdir = @ipseclibdir@
 ipsecuser = @ipsecuser@
-libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
 libexecdir = @libexecdir@
 linux_headers = @linux_headers@
@@ -220,6 +225,7 @@ mkdir_p = @mkdir_p@
 nm_CFLAGS = @nm_CFLAGS@
 nm_LIBS = @nm_LIBS@
 nm_ca_dir = @nm_ca_dir@
+nm_plugins = @nm_plugins@
 oldincludedir = @oldincludedir@
 openac_plugins = @openac_plugins@
 p_plugins = @p_plugins@
@@ -229,7 +235,6 @@ pdfdir = @pdfdir@
 piddir = @piddir@
 pki_plugins = @pki_plugins@
 plugindir = @plugindir@
-pluto_plugins = @pluto_plugins@
 pool_plugins = @pool_plugins@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -259,10 +264,9 @@ xml_CFLAGS = @xml_CFLAGS@
 xml_LIBS = @xml_LIBS@
 _copyright_SOURCES = _copyright.c
 INCLUDES = \
--I$(top_srcdir)/src/libfreeswan \
 -I$(top_srcdir)/src/libstrongswan
 
-_copyright_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
+_copyright_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 all: all-am
 
 .SUFFIXES:
diff --git a/src/_copyright/_copyright.c b/src/_copyright/_copyright.c
index 072998345..b20b17256 100644
--- a/src/_copyright/_copyright.c
+++ b/src/_copyright/_copyright.c
@@ -21,9 +21,41 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include <freeswan.h>
 #include <library.h>
 
+static const char *copyright[] = {
+	"Copyright (C) 1999-2012",
+	"    Henry Spencer, D. Hugh Redelmeier, Michael Richardson, Ken Bantoft,",
+	"    Stephen J. Bevan, JuanJo Ciarlante, Thomas Egerer, Heiko Hund,",
+	"    Mathieu Lafon, Stephane Laroche, Kai Martius, Stephan Scholz,",
+	"    Tuomo Soini, Herbert Xu.",
+	"",
+	"    Martin Berner, Marco Bertossa, David Buechi, Ueli Galizzi,",
+	"    Christoph Gysin, Andreas Hess, Patric Lichtsteiner, Michael Meier,",
+	"    Andreas Schleiss, Ariane Seiler, Mario Strasser, Lukas Suter,",
+	"    Roger Wegmann, Simon Zwahlen,",
+	"    ZHW Zuercher Hochschule Winterthur (Switzerland).",
+	"",
+	"    Philip Boetschi, Tobias Brunner, Sansar Choinyambuu, Adrian Doerig,",
+	"    Andreas Eigenmann, Giuliano Grassi, Reto Guadagnini, Fabian Hartmann,",
+	"    Noah Heusser, Jan Hutter, Thomas Kallenberg, Daniel Roethlisberger,",
+	"    Ralf Sager, Joel Stillhart, Daniel Wydler, Andreas Steffen,",
+	"    HSR Hochschule fuer Technik Rapperswil (Switzerland).",
+	"",
+	"    Martin Willi (revosec AG), Clavister (Sweden).",
+	"",
+	"This program is free software; you can redistribute it and/or modify it",
+	"under the terms of the GNU General Public License as published by the",
+	"Free Software Foundation; either version 2 of the License, or (at your",
+	"option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.",
+	"",
+	"This program is distributed in the hope that it will be useful, but",
+	"WITHOUT ANY WARRANTY; without even the implied warranty of",
+	"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General",
+	"Public License (file COPYING in the distribution) for more details.",
+	NULL,
+};
+
 char usage[] = "Usage: ipsec _copyright";
 struct option opts[] = {
   {"help",	0,	NULL,	'h',},
@@ -39,7 +71,7 @@ main(int argc, char *argv[])
 	int opt;
 	extern int optind;
 	int errflg = 0;
-	const char **notice = ipsec_copyright_notice();
+	const char **notice = copyright;
 	const char **co;
 
 	library_init(NULL);