From d39e6a872df75ca34d6960f0f1294f84e1290ea4 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Mon, 11 Oct 2021 15:42:09 +0800
Subject: [PATCH] 2

---
 base/native-tools/src/revoker/revoker.c | 39 ++++++++++---------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/base/native-tools/src/revoker/revoker.c b/base/native-tools/src/revoker/revoker.c
index b7ff4ea..89ad2ad 100644
--- a/base/native-tools/src/revoker/revoker.c
+++ b/base/native-tools/src/revoker/revoker.c
@@ -94,8 +94,6 @@ int getopt(int ac, char * const av[], const char * opts);
 #endif /* XP_PC */
 /*end secopt.h*/
 
-#define VERSIONSTRING "$Revision$ ($Date$)"
-
 #ifndef PORT_Sprintf
 #define PORT_Sprintf sprintf
 #endif
@@ -137,21 +135,20 @@ static void
 Usage(const char *progName)
 {
     fprintf(stderr, 
-    	"Usage: %s -s serialNum -n rsa_nickname [-p password | -w pwfile ] [-d dbdir] \n"
-	"          [-v] [-V] [-u] [-r reasoncode] [-i numberOfHours] hostname[:port]\n"
-    "      serialNum:    List of serial numbers to revoke, in hex, e.g. '0x31' or '0x44,0x643,0x22'\n"
-    "      reasoncode:  integer from 0 to 6, as follows\n"
-    "                    0 = Unspecified   (default)\n"
-    "                    1 = Key compromised\n"
-    "                    2 = CA key compromised\n"
-    "                    3 = Affiliation changed\n"
-    "                    4 = Certificate superseded\n"
-    "                    5 = Cessation of operation\n"
-    "                    6 = Certificate is on hold\n"
-    "     -u  : unrevoke (take off hold)\n"
-    "     -v  : verbose\n"
-    "     -V  : report version information\n",
-	progName);
+    	     "Usage: %s -s serialNum -n rsa_nickname [-p password | -w pwfile ] [-d dbdir] \n"
+	     "          [-v] [-u] [-r reasoncode] [-i numberOfHours] hostname[:port]\n"
+             "      serialNum:    List of serial numbers to revoke, in hex, e.g. '0x31' or '0x44,0x643,0x22'\n"
+             "      reasoncode:  integer from 0 to 6, as follows\n"
+             "                    0 = Unspecified   (default)\n"
+             "                    1 = Key compromised\n"
+             "                    2 = CA key compromised\n"
+             "                    3 = Affiliation changed\n"
+             "                    4 = Certificate superseded\n"
+             "                    5 = Cessation of operation\n"
+             "                    6 = Certificate is on hold\n"
+             "     -u  : unrevoke (take off hold)\n"
+             "     -v  : verbose\n",
+	     progName);
     exit(1);
 }
 
@@ -745,15 +742,9 @@ main(int argc, char **argv)
     progName = progName ? progName + 1 : tmp;
  
 
-    while ((optchar = getopt(argc, argv, "Vd:n:p:s:r:i:w:uv")) != -1) {
+    while ((optchar = getopt(argc, argv, "d:n:p:s:r:i:w:uv")) != -1) {
 	switch(optchar) {
 
-/* Version */
-	case 'V':
-	  printf("%s\n",VERSIONSTRING);
-	  PR_Cleanup();
-	  return 0;
-
 /* Directory which holds NSS database */
 	case 'd':
 	    dir = optarg;
-- 
2.23.0