diff --git a/389-ds-base.spec b/389-ds-base.spec index 6db1f6fd7c3470741f960caf23ae2a24dc2a7506..69b96d0ea7fa87dcf10dc6e8ee5b0542a3c26aac 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -6,7 +6,7 @@ ExcludeArch: i686 Name: 389-ds-base Summary: Base 389 Directory Server Version: 1.4.3.36 -Release: 1 +Release: 2 License: GPLv3+ URL: https://www.port389.org Source0: https://github.com/389ds/389-ds-base/archive/refs/tags/389-ds-base-%{version}.tar.gz @@ -15,6 +15,7 @@ Source2: 389-ds-base-devel.README Source3: https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 # Refer: https://github.com/389ds/389-ds-base/pull/5374 Patch0: fix-dsidm-posixgroup-get_dn-fails-with-search_ext.patch +Patch1: fix-dn2rdn-get-args-error.patch BuildRequires: nspr-devel nss-devel >= 3.34 perl-generators openldap-devel libdb-devel cyrus-sasl-devel icu BuildRequires: libicu-devel pcre-devel cracklib-devel gcc-c++ net-snmp-devel lm_sensors-devel bzip2-devel @@ -354,6 +355,9 @@ exit 0 %{_mandir}/*/* %changelog +* Fri Oct 27 2023 wangkai <13474090681@163.com> - 1.4.3.36-2 +- Fix dn2rdn -v error + * Tue Oct 24 2023 wangkai <13474090681@163.com> - 1.4.3.36-1 - Update to 1.4.3.36 - Fix dsidm user/posixgroup get_dn fails with search_ext() diff --git a/fix-dn2rdn-get-args-error.patch b/fix-dn2rdn-get-args-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..3aceab9e5b2fd98662fa0740dd6156271b3e3a0f --- /dev/null +++ b/fix-dn2rdn-get-args-error.patch @@ -0,0 +1,22 @@ +diff --git a/ldap/admin/src/scripts/dn2rdn.in b/ldap/admin/src/scripts/dn2rdn.in +index 3974b00..b707efc 100755 +--- a/ldap/admin/src/scripts/dn2rdn.in ++++ b/ldap/admin/src/scripts/dn2rdn.in +@@ -27,12 +27,12 @@ do + h) usage + exit 0;; + Z) servid=$OPTARG;; +- d) arg=$arg" -d \"$OPTARG\"";; +- a) arg=$arg" -a \"$OPTARG\"" ++ d) args=$args" -d \"$OPTARG\"";; ++ a) args=$args" -a \"$OPTARG\"" + archive="provided";; +- v) arg=$arg" -v";; +- f) arg=$arg" -f";; +- D) arg=$arg" -D \"$OPTARG\"";; ++ v) args=$args" -v";; ++ f) args=$args" -f";; ++ D) args=$args" -D \"$OPTARG\"";; + ?) usage + exit 1;; + esac