From: Tobias Brunner Date: Fri, 3 Jun 2022 16:57:27 +0000 (+0200) Subject: Remove obsolete _copyright utility X-Git-Tag: 5.9.7dr2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c05fdf387bac86c3958d764998c7723c1bd2efe3;p=thirdparty%2Fstrongswan.git Remove obsolete _copyright utility --- diff --git a/configure.ac b/configure.ac index b2345fa654..aead3574ab 100644 --- 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 2125e14a8d..16699f11c2 100644 --- 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 index 23ebcb3813..0000000000 --- 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 index 62baf94da3..0000000000 --- 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 index 3862fba340..0000000000 --- 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 . - * - * 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 -#include -#include -#include -#include -#include - -#include - -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 .", - "", - "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 c1de833fbe..df4d9c0fc8 100644 --- 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 ;; --*)