import libmemcached-1.0.18-17.el8

SOURCES/libmemcached-memaslap-help.patch

@@ -1,9 +1,61 @@
-commit 0a20d6ba4610941c4834b33d1598b546745ad8e8
+commit 567105e2f3007783cd155846118ad47068110565
 Author: Tomas Korbar <tkorbar@redhat.com>
 Date:   Mon Oct 11 12:26:45 2021 +0200
 
-    Fix typo in memaslap manpage
+    Fix typo in memaslap manpage and help
 
+diff --git a/clients/memaslap.c b/clients/memaslap.c
+index 0290794..d599cc4 100644
+--- a/clients/memaslap.c
++++ b/clients/memaslap.c
+@@ -32,7 +32,7 @@
+ #include "ms_setting.h"
+ #include "ms_thread.h"
+ 
+-#define PROGRAM_NAME    "memslap"
++#define PROGRAM_NAME    "memaslap"
+ #define PROGRAM_DESCRIPTION \
+                         "Generates workload against memcached servers."
+ 
+@@ -130,7 +130,7 @@ static __attribute__((noreturn)) void ms_help_command(const char *command_name,
+   printf("    %s\n\n", description);
+   printf(
+     "Usage:\n"
+-    "    memslap -hV | -s servers [-F config_file] [-t time | -x exe_num] [...]\n\n"
++    "    memaslap -hV | -s servers [-F config_file] [-t time | -x exe_num] [...]\n\n"
+     "Options:\n");
+ 
+   for (int x= 0; long_options[x].name; x++)
+@@ -146,13 +146,13 @@ static __attribute__((noreturn)) void ms_help_command(const char *command_name,
+ 
+   printf(
+     "\nExamples:\n"
+-    "    memslap -s 127.0.0.1:11211 -S 5s\n"
+-    "    memslap -s 127.0.0.1:11211 -t 2m -v 0.2 -e 0.05 -b\n"
+-    "    memslap -s 127.0.0.1:11211 -F config -t 2m -w 40k -S 20s -o 0.2\n"
+-    "    memslap -s 127.0.0.1:11211 -F config -t 2m -T 4 -c 128 -d 20 -P 40k\n"
+-    "    memslap -s 127.0.0.1:11211 -F config -t 2m -d 50 -a -n 40\n"
+-    "    memslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m\n"
+-    "    memslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m -p 2\n\n");
++    "    memaslap -s 127.0.0.1:11211 -S 5s\n"
++    "    memaslap -s 127.0.0.1:11211 -t 2m -v 0.2 -e 0.05 -b\n"
++    "    memaslap -s 127.0.0.1:11211 -F config -t 2m -w 40k -S 20s -o 0.2\n"
++    "    memaslap -s 127.0.0.1:11211 -F config -t 2m -T 4 -c 128 -d 20 -P 40k\n"
++    "    memaslap -s 127.0.0.1:11211 -F config -t 2m -d 50 -a -n 40\n"
++    "    memaslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m\n"
++    "    memaslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m -p 2\n\n");
+ 
+   exit(0);
+ } /* ms_help_command */
+@@ -286,7 +286,7 @@ static const char *ms_lookup_help(ms_options_t option)
+ 
+   case OPT_UDP:
+     return
+-      "UDP support, default memslap uses TCP, TCP port and UDP port of\n"
++      "UDP support, default memaslap uses TCP, TCP port and UDP port of\n"
+       "        server must be same.";
+ 
+   case OPT_EXPIRE:
 diff --git a/man/memaslap.1 b/man/memaslap.1
 index 1f41484..e884381 100644
 --- a/man/memaslap.1

SPECS/libmemcached.spec

@@ -14,7 +14,7 @@
 Name:      libmemcached
 Summary:   Client library and command line tools for memcached server
 Version:   1.0.18
-Release:   16%{?dist}
+Release:   17%{?dist}
 License:   BSD
 URL:       http://libmemcached.org/
 # Original sources:
@@ -49,7 +49,7 @@ Patch1: %{libname}-build.patch
 # Fix typo in memparse man page
 # https://bugs.launchpad.net/libmemcached/+bug/1675762
 Patch2: %{libname}-memparse-man.patch
-Patch3: %{libname}-memaslap-man.patch
+Patch3: %{libname}-memaslap-help.patch
 
 %description
 libmemcached is a C/C++ client library and tools for the memcached server
@@ -100,7 +100,7 @@ This package contains the %{libname} libraries version %{version}.
 %patch0 -p1 -b .link
 %patch1 -p1 -b .build
 %patch2 -p1 -b .memparse-man
-%patch3 -p1 -b .memaslap-man
+%patch3 -p1 -b .memaslap-help
 
 mkdir examples
 cp -p tests/*.{cc,h} examples/
@@ -188,6 +188,10 @@ make test
 
 
 %changelog
+* Mon Oct 25 2021 Tomas Korbar <tkorbar@redhat.com> - 1.0.18-17
+- fix also memaslap help text
+- Related: rhbz#2008399
+
 * Mon Oct 11 2021 Tomas Korbar <tkorbar@redhat.com> - 1.0.18-16
 - fix typo in memaslap man page
 - Resolves: rhbz#2008399