Fix help doc and version

This commit is contained in:
wk333 2022-03-11 10:28:54 +08:00
parent 4ef851f8ad
commit 60369240a7
2 changed files with 131 additions and 1 deletions

View File

@ -0,0 +1,126 @@
From 529ee7929bf0adb2cdd6024323e29f5e4e6f8305 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 9 Mar 2022 17:51:25 +0800
Subject: [PATCH 1/1] fix help doc and version
---
configure | 20 ++++++++++----------
configure.in | 2 +-
src/rootsh.c | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index c8d671e..027ecb2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for rootsh 1.5.2.
+# Generated by GNU Autoconf 2.59 for rootsh 1.5.3.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='rootsh'
PACKAGE_TARNAME='rootsh'
-PACKAGE_VERSION='1.5.2'
-PACKAGE_STRING='rootsh 1.5.2'
+PACKAGE_VERSION='1.5.3'
+PACKAGE_STRING='rootsh 1.5.3'
PACKAGE_BUGREPORT=''
ac_unique_file="src"
@@ -778,7 +778,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rootsh 1.5.2 to adapt to many kinds of systems.
+\`configure' configures rootsh 1.5.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -844,7 +844,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rootsh 1.5.2:";;
+ short | recursive ) echo "Configuration of rootsh 1.5.3:";;
esac
cat <<\_ACEOF
@@ -973,7 +973,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-rootsh configure 1.5.2
+rootsh configure 1.5.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -987,7 +987,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rootsh $as_me 1.5.2, which was
+It was created by rootsh $as_me 1.5.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1635,7 +1635,7 @@ fi
# Define the identity of the package.
PACKAGE='rootsh'
- VERSION='1.5.2'
+ VERSION='1.5.3'
cat >>confdefs.h <<_ACEOF
@@ -6616,7 +6616,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by rootsh $as_me 1.5.2, which was
+This file was extended by rootsh $as_me 1.5.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6682,7 +6682,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-rootsh config.status 1.5.2
+rootsh config.status 1.5.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index a80d4ea..4df0f6d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl ----- Start off like we always need to
-AC_INIT([rootsh],[1.5.2])
+AC_INIT([rootsh],[1.5.3])
AC_CONFIG_SRCDIR(src)
dnl ---- AC_CONFIG_HEADER(src/config.h)
AC_CONFIG_HEADERS([src/config.h])
diff --git a/src/rootsh.c b/src/rootsh.c
index 9d6ffc7..71bf837 100644
--- a/src/rootsh.c
+++ b/src/rootsh.c
@@ -1517,8 +1517,8 @@ void version() {
void usage() {
printf("Usage: %s [OPTION [ARG]] ...\n"
- " -?, --help show this help statement\n"
- " -i, --login start a (initial) login shell\n"
+ " -h, --help show this help statement\n"
+ " -i, --initial start a (initial) login shell\n"
" -u, --user=username run shell as a different user\n"
" -f, --logfile=file name of your logfile (standalone only)\n"
" -d, --logdir=DIR directory for your logfile (standalone only)\n"
--
2.27.0

View File

@ -1,13 +1,14 @@
Name: rootsh
Summary: Shell wrapper for auditing
Version: 1.5.3
Release: 16
Release: 17
License: GPLv3+
Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz
Source1: rootsh.logrotate
Source2: logrotate-rootsh.sh
Patch0: rootsh-1.5.3-open-needs-3-args.patch
Patch1: rootsh-1.5.3_change_permissions.patch
Patch2: rootsh-1.5.3-fix-help-doc-and-version.patch
URL: http://sourceforge.net/projects/rootsh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/rootsh.1.gz
%changelog
* Fri Mar 11 2022 wangkai <wangkai385@huawei.com> - 1.5.3-17
- Fix help doc and version
* Wed Jun 23 2021 yuanxin<yuanxin24@huawei.com> - 1.5.3-16
- Type:bugfix
- CVE:NA