Update the publicly shown copyright information

Set the publicly shown copyright holder to "The strace developers.".

* COPYING: Update copyright information.
* configure.ac: Add AC_COPYRIGHT.
* strace.c (print_version): New function.
(init): Use it.
* tests/strace-V.test: Update expected output.

diff --git a/COPYING b/COPYING
index e9078d3edaf3cc6d5fd89be60522ecc3126fe8ac..68dc370f337c0f0be582b5d4eb40286610412bd5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -4,6 +4,7 @@ Copyright (c) 1993 Ulrich Pegelow <pegelow@moorea.uni-muenster.de>
 Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net>
 Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
 Copyright (C) 1998-2001 Wichert Akkerman <wakkerma@deephackmode.org>
+Copyright (C) 2001-2016 The strace developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/configure.ac b/configure.ac
index 56b9957e02a8b4c17bad44de528569f4210ea897..2d7664537306530d8d3dc89793e4c79546f00933 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_INIT([strace],
        [strace-devel@lists.sourceforge.net],
        [strace],
        [https://strace.io])
+AC_COPYRIGHT([Copyright (C) 1999-2016 The strace developers.])
 AC_CONFIG_SRCDIR([strace.c])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_HEADERS([config.h])

diff --git a/strace.c b/strace.c
index 23ca108d6e1ba7109c099b2b2a127f37e7fed84d..9df942ecd452700216f359d7c5bf57cc07798bd5 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -192,6 +192,16 @@ strerror(int err_no)
 
 #endif /* HAVE_STERRROR */
 
+static void
+print_version(void)
+{
+       printf("%s -- version %s\n"
+              "Copyright (C) %s The strace developers <%s>.\n"
+              "This is free software; see the source for copying conditions.  There is NO\n"
+              "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
+              PACKAGE_NAME, PACKAGE_VERSION, "1991-2016", PACKAGE_URL);
+}
+
 static void
 usage(void)
 {
@@ -1666,7 +1676,7 @@ init(int argc, char *argv[])
                        qualify("abbrev=none");
                        break;
                case 'V':
-                       printf("%s -- version %s\n", PACKAGE_NAME, VERSION);
+                       print_version();
                        exit(0);
                        break;
                case 'z':

diff --git a/tests/strace-V.test b/tests/strace-V.test
index d441371e5727857e68bf4da2efa41818898c9804..2f0ff3274b9b5c987b46c20dddb379e261c8eeff 100755 (executable)
--- a/tests/strace-V.test
+++ b/tests/strace-V.test
@@ -11,7 +11,12 @@ getval()
        sed -r -n 's/#define[[:space:]]*'"$1"'[[:space:]]*"([^"]*)".*/\1/p' ../config.h
 }
 
-printf "%s -- version %s\n" "$(getval PACKAGE_NAME)" "$(getval VERSION)" > "$EXP"
+cat > "$EXP" << __EOF__
+$(getval PACKAGE_NAME) -- version $(getval PACKAGE_VERSION)
+Copyright (C) 1991-2016 The strace developers <$(getval PACKAGE_URL)>.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+__EOF__
 
 match_diff "$EXP" "$LOG"
 rm -f "$EXP"