d1681e
From 0b7fa3bdd3334c70d99d1a1b99c3e37d49fc66e3 Mon Sep 17 00:00:00 2001
d1681e
From: Atin Mukherjee <amukherj@redhat.com>
d1681e
Date: Mon, 12 Mar 2018 19:47:11 +0530
d1681e
Subject: [PATCH 184/201] cli/glusterfsd: remove copyright information
d1681e
d1681e
There's no point of dumping upstream copyright information in --version.
d1681e
d1681e
Label: DOWNSTREAM ONLY
d1681e
d1681e
Change-Id: I3a10e30878698e1d53082936bbf22bca560a3896
d1681e
BUG: 1550474
d1681e
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
d1681e
Reviewed-on: https://code.engineering.redhat.com/gerrit/132445
d1681e
Tested-by: RHGS Build Bot <nigelb@redhat.com>
d1681e
Reviewed-by: Milind Changire <mchangir@redhat.com>
d1681e
---
d1681e
 cli/src/cli.c               | 10 +---------
d1681e
 glusterfsd/src/glusterfsd.c | 10 +---------
d1681e
 2 files changed, 2 insertions(+), 18 deletions(-)
d1681e
d1681e
diff --git a/cli/src/cli.c b/cli/src/cli.c
d1681e
index ce06366..52c1b67 100644
d1681e
--- a/cli/src/cli.c
d1681e
+++ b/cli/src/cli.c
d1681e
@@ -66,15 +66,7 @@ extern int connected;
d1681e
 /* using argp for command line parsing */
d1681e
 
d1681e
 const char *argp_program_version = ""                                         \
d1681e
-        PACKAGE_NAME" "PACKAGE_VERSION                                        \
d1681e
-        "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"          \
d1681e
-        "Copyright (c) 2006-2016 Red Hat, Inc. "                              \
d1681e
-        "<https://www.gluster.org/>\n"                                        \
d1681e
-        "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"                      \
d1681e
-        "It is licensed to you under your choice of the GNU Lesser\n"         \
d1681e
-        "General Public License, version 3 or any later version (LGPLv3\n"    \
d1681e
-        "or later), or the GNU General Public License, version 2 (GPLv2),\n"  \
d1681e
-        "in all cases as published by the Free Software Foundation.";
d1681e
+        PACKAGE_NAME" "PACKAGE_VERSION;
d1681e
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
d1681e
 
d1681e
 struct rpc_clnt *global_quotad_rpc;
d1681e
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
d1681e
index eeffdc5..38b863c 100644
d1681e
--- a/glusterfsd/src/glusterfsd.c
d1681e
+++ b/glusterfsd/src/glusterfsd.c
d1681e
@@ -87,15 +87,7 @@ static char gf_doc[] = "";
d1681e
 static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n"       \
d1681e
         "--volfile=VOLFILE [MOUNT-POINT]";
d1681e
 const char *argp_program_version = ""                                         \
d1681e
-        PACKAGE_NAME" "PACKAGE_VERSION                                        \
d1681e
-        "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"          \
d1681e
-        "Copyright (c) 2006-2016 Red Hat, Inc. "                              \
d1681e
-        "<https://www.gluster.org/>\n"                                        \
d1681e
-        "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"                      \
d1681e
-        "It is licensed to you under your choice of the GNU Lesser\n"         \
d1681e
-        "General Public License, version 3 or any later version (LGPLv3\n"    \
d1681e
-        "or later), or the GNU General Public License, version 2 (GPLv2),\n"  \
d1681e
-        "in all cases as published by the Free Software Foundation.";
d1681e
+        PACKAGE_NAME" "PACKAGE_VERSION;
d1681e
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
d1681e
 
d1681e
 static error_t parse_opts (int32_t key, char *arg, struct argp_state *_state);
d1681e
-- 
d1681e
1.8.3.1
d1681e