Remove obsolete _copyright utility

diff --git a/configure.ac b/configure.ac
index b2345fa65458bcafcc1fe7037d64c201d5e21457..aead3574ab17768c94e9f40c274bd81e3ae38a5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2102,7 +2102,6 @@ AC_CONFIG_FILES([
        src/starter/Makefile
        src/starter/tests/Makefile
        src/_updown/Makefile
-       src/_copyright/Makefile
        src/scepclient/Makefile
        src/aikgen/Makefile
        src/tpm_extendpcr/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 2125e14a8d11b9e163edbb287699dae65487a86c..16699f11c2402e6244623bce68017692b55c1b32 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,7 @@ if USE_FILE_CONFIG
 endif
 
 if USE_IPSEC_SCRIPT
-  SUBDIRS += ipsec _copyright
+  SUBDIRS += ipsec
 endif
 
 if USE_CHARON

diff --git a/src/_copyright/.gitignore b/src/_copyright/.gitignore
deleted file mode 100644 (file)
index 23ebcb3..0000000
--- a/src/_copyright/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_copyright

diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am
deleted file mode 100644 (file)
index 62baf94..0000000
--- a/src/_copyright/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-ipsec_PROGRAMS = _copyright
-_copyright_SOURCES = _copyright.c
-
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/libstrongswan
-
-_copyright_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/_copyright/_copyright.c b/src/_copyright/_copyright.c
deleted file mode 100644 (file)
index 3862fba..0000000
--- a/src/_copyright/_copyright.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * copyright reporter
- * (just avoids having the info in more than one place in the source)
- * Copyright (C) 2001  Henry Spencer.
- *
- * 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
- * for more details.
- */
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-
-#include <library.h>
-
-static const char *copyright[] = {
-       "Copyright (C) 1999-2013",
-       "    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, Christoph Buehler, Reto Buerki,",
-       "    Sansar Choinyambuu, Adrian Doerig, Andreas Eigenmann, Giuliano Grassi,",
-       "    Reto Guadagnini, Fabian Hartmann, Noah Heusser, Jan Hutter,",
-       "    Thomas Kallenberg, Patrick Loetscher, Daniel Roethlisberger,",
-       "    Adrian-Ken Rueegsegger, 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,
-};
-
-static const char usage[] = "Usage: ipsec _copyright";
-static const struct option opts[] = {
-  {"help",     0,      NULL,   'h',},
-  {"version",  0,      NULL,   'v',},
-  {0,          0,      NULL,   0, },
-};
-
-static const char me[] = "ipsec _copyright";   /* for messages */
-
-int
-main(int argc, char *argv[])
-{
-       int opt;
-       extern int optind;
-       int errflg = 0;
-       const char **notice = copyright;
-       const char **co;
-
-       library_init(NULL, "_copyright");
-       atexit(library_deinit);
-
-       while ((opt = getopt_long(argc, argv, "", opts, NULL)) != EOF)
-               switch (opt) {
-               case 'h':       /* help */
-                       printf("%s\n", usage);
-                       exit(0);
-               case 'v':       /* version */
-                       printf("%s strongSwan "VERSION"\n", me);
-                       exit(0);
-               case '?':
-               default:
-                       errflg = 1;
-                       break;
-               }
-       if (errflg || optind != argc) {
-               fprintf(stderr, "%s\n", usage);
-               exit(2);
-       }
-
-       for (co = notice; *co != NULL; co++)
-               printf("%s\n", *co);
-       exit(0);
-}

diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in
index c1de833fbe6343f20f10f31ad256b988104b6ce2..df4d9c0fc8f89714ecad71b7e9a1386f1f824820 100644 (file)
--- a/src/ipsec/_ipsec.in
+++ b/src/ipsec/_ipsec.in
@@ -315,14 +315,9 @@ duplicheck|error-notify|imv_policy_manager|load-tester|lookip|whitelist|\
 _updown|_imv_policy)
        # fall through
        ;;
-copyright|--copyright)
-       set _copyright
-       # fall through
-       ;;
 version|--version)
        printf "$OS_NAME $IPSEC_NAME $IPSEC_VERSION\n"
        printf "$IPSEC_DISTRO\n"
-       printf "See '$IPSEC_SCRIPT --copyright' for copyright information.\n"
        exit 0
        ;;
 --*)