diff -Nru globus-gsi-cert-utils-10.3/configure globus-gsi-cert-utils-10.7/configure --- globus-gsi-cert-utils-10.3/configure 2019-08-29 15:27:11.711745679 +0000 +++ globus-gsi-cert-utils-10.7/configure 2020-12-12 20:55:28.352897731 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for globus_gsi_cert_utils 10.3. +# Generated by GNU Autoconf 2.69 for globus_gsi_cert_utils 10.7. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='globus_gsi_cert_utils' PACKAGE_TARNAME='globus_gsi_cert_utils' -PACKAGE_VERSION='10.3' -PACKAGE_STRING='globus_gsi_cert_utils 10.3' +PACKAGE_VERSION='10.7' +PACKAGE_STRING='globus_gsi_cert_utils 10.7' PACKAGE_BUGREPORT='https://github.com/gridcf/gct/issues' PACKAGE_URL='' @@ -1339,7 +1339,7 @@ # 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 globus_gsi_cert_utils 10.3 to adapt to many kinds of systems. +\`configure' configures globus_gsi_cert_utils 10.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1410,7 +1410,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of globus_gsi_cert_utils 10.3:";; + short | recursive ) echo "Configuration of globus_gsi_cert_utils 10.7:";; esac cat <<\_ACEOF @@ -1528,7 +1528,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -globus_gsi_cert_utils configure 10.3 +globus_gsi_cert_utils configure 10.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1806,7 +1806,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by globus_gsi_cert_utils $as_me 10.3, which was +It was created by globus_gsi_cert_utils $as_me 10.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2679,7 +2679,7 @@ # Define the identity of the package. PACKAGE='globus_gsi_cert_utils' - VERSION='10.3' + VERSION='10.7' cat >>confdefs.h <<_ACEOF @@ -11673,7 +11673,7 @@ -DIRT_TIMESTAMP=1566483868 +DIRT_TIMESTAMP=1607703417 DIRT_BRANCH_ID=0 @@ -12782,7 +12782,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by globus_gsi_cert_utils $as_me 10.3, which was +This file was extended by globus_gsi_cert_utils $as_me 10.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12848,7 +12848,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -globus_gsi_cert_utils config.status 10.3 +globus_gsi_cert_utils config.status 10.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru globus-gsi-cert-utils-10.3/configure.ac globus-gsi-cert-utils-10.7/configure.ac --- globus-gsi-cert-utils-10.3/configure.ac 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/configure.ac 2020-12-12 20:52:21.432897731 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_gsi_cert_utils], [10.3], [https://github.com/gridcf/gct/issues]) +AC_INIT([globus_gsi_cert_utils], [10.7], [https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff -Nru globus-gsi-cert-utils-10.3/debian/changelog globus-gsi-cert-utils-10.7/debian/changelog --- globus-gsi-cert-utils-10.3/debian/changelog 2019-09-02 17:18:58.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/changelog 2020-12-15 09:11:05.000000000 +0000 @@ -1,3 +1,16 @@ +globus-gsi-cert-utils (10.7-1) unstable; urgency=medium + + * Minor fixes to makefiles (10.4) + * Remove old replace-version.xsl file (10.5) + * Fix format for grid-cert-info -issuer (10.6) + * Use -nameopt sep_multiline to derive certificate subject string (10.7) + * Change to debhelper compat level 13 + * Remove override_dh_missing rule (--fail-missing is default) + * Drop old symlink-to-dir conversion from 2014 + * Drop ancient Replaces/Conflicts/Breaks + + -- Mattias Ellert Tue, 15 Dec 2020 10:11:05 +0100 + globus-gsi-cert-utils (10.3-1) unstable; urgency=medium * Update additional old document references diff -Nru globus-gsi-cert-utils-10.3/debian/compat globus-gsi-cert-utils-10.7/debian/compat --- globus-gsi-cert-utils-10.3/debian/compat 2019-07-11 13:07:02.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/compat 2020-12-12 15:25:07.000000000 +0000 @@ -1 +1 @@ -10 +13 diff -Nru globus-gsi-cert-utils-10.3/debian/control globus-gsi-cert-utils-10.7/debian/control --- globus-gsi-cert-utils-10.3/debian/control 2019-07-11 14:29:27.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/control 2020-12-12 22:11:41.000000000 +0000 @@ -2,7 +2,7 @@ Priority: optional Maintainer: Mattias Ellert Build-Depends: - debhelper (>= 10), + debhelper (>= 13), pkg-config, libglobus-common-dev (>= 15), libglobus-openssl-module-dev (>= 3), @@ -10,7 +10,7 @@ libssl-dev, openssl, doxygen -Standards-Version: 4.4.0 +Standards-Version: 4.5.1 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-gsi-cert-utils Vcs-Git: https://salsa.debian.org/ellert/globus-gsi-cert-utils.git @@ -39,12 +39,6 @@ Section: net Architecture: all Multi-Arch: foreign -Replaces: - globus-openssl-progs (<< 6), - globus-openssl-module-progs (<< 4) -Conflicts: - globus-openssl-progs (<< 6), - globus-openssl-module-progs (<< 4) Depends: openssl, ${misc:Depends}, @@ -86,8 +80,6 @@ Section: doc Architecture: all Multi-Arch: foreign -Pre-Depends: - dpkg (>= 1.17.5) Depends: ${misc:Depends} Description: Grid Community Toolkit - Globus GSI Cert Utils Library Documentation Files diff -Nru globus-gsi-cert-utils-10.3/debian/copyright globus-gsi-cert-utils-10.7/debian/copyright --- globus-gsi-cert-utils-10.3/debian/copyright 2019-09-02 17:18:29.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/copyright 2020-12-12 21:52:21.000000000 +0000 @@ -1,17 +1,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: globus_gsi_cert_utils Upstream-Contact: https://github.com/gridcf/gct/ -Source: https://repo.gridcf.org/gct6/sources/globus_gsi_cert_utils-10.3.tar.gz +Source: https://repo.gridcf.org/gct6/sources/globus_gsi_cert_utils-10.7.tar.gz Files: * Copyright: 1999-2017 University of Chicago - 2018-2019 Grid Community Forum + 2018-2020 Grid Community Forum License: Apache-2.0 Files: debian/* Copyright: - 2008-2019 Mattias Ellert + 2008-2020 Mattias Ellert 2010-2013 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ License: Apache-2.0 diff -Nru globus-gsi-cert-utils-10.3/debian/globus-gsi-cert-utils-progs.install globus-gsi-cert-utils-10.7/debian/globus-gsi-cert-utils-progs.install --- globus-gsi-cert-utils-10.3/debian/globus-gsi-cert-utils-progs.install 2018-03-02 17:15:18.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/globus-gsi-cert-utils-progs.install 2020-12-12 15:26:26.000000000 +0000 @@ -1,10 +1,10 @@ -debian/tmp/usr/share/man/man1/grid-cert-info.1 -debian/tmp/usr/share/man/man1/grid-cert-request.1 -debian/tmp/usr/share/man/man1/grid-change-pass-phrase.1 -debian/tmp/usr/share/man/man8/globus-update-certificate-dir.8 -debian/tmp/usr/share/man/man8/grid-default-ca.8 -debian/tmp/usr/bin/grid-cert-info -debian/tmp/usr/bin/grid-cert-request -debian/tmp/usr/bin/grid-change-pass-phrase -debian/tmp/usr/sbin/globus-update-certificate-dir -debian/tmp/usr/sbin/grid-default-ca +/usr/share/man/man1/grid-cert-info.1 +/usr/share/man/man1/grid-cert-request.1 +/usr/share/man/man1/grid-change-pass-phrase.1 +/usr/share/man/man8/globus-update-certificate-dir.8 +/usr/share/man/man8/grid-default-ca.8 +/usr/bin/grid-cert-info +/usr/bin/grid-cert-request +/usr/bin/grid-change-pass-phrase +/usr/sbin/globus-update-certificate-dir +/usr/sbin/grid-default-ca diff -Nru globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils0.install globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils0.install --- globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils0.install 2018-03-02 17:15:18.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils0.install 2020-12-12 15:26:26.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/*/libglobus_gsi_cert_utils.so.* +/usr/lib/*/libglobus_gsi_cert_utils.so.* diff -Nru globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils-dev.install globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils-dev.install --- globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils-dev.install 2018-03-02 17:15:18.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils-dev.install 2020-12-12 15:26:26.000000000 +0000 @@ -1,3 +1,3 @@ -debian/tmp/usr/include/globus/* -debian/tmp/usr/lib/*/libglobus_gsi_cert_utils.so -debian/tmp/usr/lib/*/pkgconfig/globus-gsi-cert-utils.pc +/usr/include/globus/* +/usr/lib/*/libglobus_gsi_cert_utils.so +/usr/lib/*/pkgconfig/globus-gsi-cert-utils.pc diff -Nru globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils-doc.install globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils-doc.install --- globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils-doc.install 2018-03-02 17:15:18.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils-doc.install 2020-12-12 15:26:26.000000000 +0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/libglobus-gsi-cert-utils-dev/html -debian/tmp/usr/share/man/man3/* +/usr/share/doc/libglobus-gsi-cert-utils-dev/html +/usr/share/man/man3/* diff -Nru globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils-doc.maintscript globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils-doc.maintscript --- globus-gsi-cert-utils-10.3/debian/libglobus-gsi-cert-utils-doc.maintscript 2019-02-27 16:39:10.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/libglobus-gsi-cert-utils-doc.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libglobus-gsi-cert-utils-doc libglobus-gsi-cert-utils-dev 9.10-2~ libglobus-gsi-cert-utils-doc diff -Nru globus-gsi-cert-utils-10.3/debian/rules globus-gsi-cert-utils-10.7/debian/rules --- globus-gsi-cert-utils-10.3/debian/rules 2019-07-11 18:51:40.000000000 +0000 +++ globus-gsi-cert-utils-10.7/debian/rules 2020-12-14 04:34:46.000000000 +0000 @@ -3,6 +3,8 @@ name = globus-gsi-cert-utils +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs + INSTALLDIR = debian/tmp _docdir = /usr/share/doc/lib$(name)-dev @@ -14,7 +16,6 @@ dh_autoreconf --as-needed override_dh_auto_configure: - LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \ GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ @@ -22,9 +23,6 @@ --libexecdir=/usr/share/globus \ --docdir=$(_docdir) -override_dh_auto_test: - dh_auto_test -- VERBOSE=1 - override_dh_auto_install: dh_auto_install @@ -34,8 +32,5 @@ # Remove installed license file rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE -override_dh_missing: - dh_missing --fail-missing - override_dh_strip: dh_strip --dbgsym-migration='lib$(name)-dbg (<< 9.16-2~), $(name)-dbg (<< 8.6)' diff -Nru globus-gsi-cert-utils-10.3/dirt.sh globus-gsi-cert-utils-10.7/dirt.sh --- globus-gsi-cert-utils-10.3/dirt.sh 2019-08-29 15:25:52.275745679 +0000 +++ globus-gsi-cert-utils-10.7/dirt.sh 2020-12-12 20:54:26.280897731 +0000 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1566483868 +DIRT_TIMESTAMP=1607703417 DIRT_BRANCH_ID=0 diff -Nru globus-gsi-cert-utils-10.3/library/Makefile.am globus-gsi-cert-utils-10.7/library/Makefile.am --- globus-gsi-cert-utils-10.3/library/Makefile.am 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/library/Makefile.am 2020-12-12 20:52:21.432897731 +0000 @@ -36,14 +36,14 @@ install-data-local: $(DOC_STAMPS) if test -d doc/man/man3; then \ - install -d -m 755 $(DESTDIR)$(mandir)/man3; \ + install -d -m 755 $(DESTDIR)$(mandir)/man3 && \ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ fi if test -d doc/html; then \ - for dir in `(cd doc; find html -type d)`; do \ - install -d -m 755 $(DESTDIR)$(docdir)/$$dir; \ + for dir in `cd doc; find html -type d`; do \ + install -d -m 755 $(DESTDIR)$(docdir)/$$dir || exit 1; \ done ; \ - for f in `(cd doc; find html -type f)`; do \ - $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f ; \ + for f in `cd doc; find html -type f`; do \ + $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f || exit 1; \ done ; \ fi diff -Nru globus-gsi-cert-utils-10.3/library/Makefile.in globus-gsi-cert-utils-10.7/library/Makefile.in --- globus-gsi-cert-utils-10.3/library/Makefile.in 2019-08-29 15:27:12.531745679 +0000 +++ globus-gsi-cert-utils-10.7/library/Makefile.in 2020-12-12 20:55:28.992897731 +0000 @@ -707,15 +707,15 @@ install-data-local: $(DOC_STAMPS) if test -d doc/man/man3; then \ - install -d -m 755 $(DESTDIR)$(mandir)/man3; \ + install -d -m 755 $(DESTDIR)$(mandir)/man3 && \ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ fi if test -d doc/html; then \ - for dir in `(cd doc; find html -type d)`; do \ - install -d -m 755 $(DESTDIR)$(docdir)/$$dir; \ + for dir in `cd doc; find html -type d`; do \ + install -d -m 755 $(DESTDIR)$(docdir)/$$dir || exit 1; \ done ; \ - for f in `(cd doc; find html -type f)`; do \ - $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f ; \ + for f in `cd doc; find html -type f`; do \ + $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f || exit 1; \ done ; \ fi diff -Nru globus-gsi-cert-utils-10.3/programs/grid-cert-info.in globus-gsi-cert-utils-10.7/programs/grid-cert-info.in --- globus-gsi-cert-utils-10.3/programs/grid-cert-info.in 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/programs/grid-cert-info.in 2020-12-12 20:52:21.432897731 +0000 @@ -102,12 +102,12 @@ if test "$testfile" = ""; then : - elif echo "$certfile" | grep '\.p12$' > /dev/null 2>&1 ; then + elif echo "$testfile" | grep '\.p12$' > /dev/null 2>&1 ; then _format=pkcs12 - elif echo "$certfile" | grep '\.pem$' > /dev/null 2>&1 ; then + elif echo "$testfile" | grep '\.pem$' > /dev/null 2>&1 ; then _format=x509 elif grep -- '-----BEGIN' "$testfile" > /dev/null 2>&1 ; then - _format="x509" + _format=x509 else : fi @@ -186,7 +186,7 @@ else echo "No DiRT information available." fi - exit 0; + exit 0 ;; -file| -f | --file) if [ -n "$2" -a -f "$2" -a -r "$2" ]; then @@ -200,7 +200,7 @@ fi shift ;; - -all | -all) + -all | --all) toprint="$toprint -text" ;; -subject|-s | --subject) @@ -210,7 +210,7 @@ toprint="$toprint -issuer_hash" ;; -issuer|-i | --issuer) - toprint="$toprint -issuer" + toprint="$toprint ISSUER" ;; -startdate|-sd|--startdate) toprint="$toprint -startdate" @@ -229,59 +229,62 @@ shift done -if [ "${rfc2253:-0}" != 1 ]; then - openssl_options="$openssl_options -nameopt rfc2253,-dn_rev" -fi cert_format=`certificate_format "$certfile"` if test "$cert_format" = ""; then echo "Error: Cannot locate certificate" 1>&2 - exit 1; + exit 1 fi if [ "X$toprint" = "X" ]; then + # If no specific information requested - print all toprint="-text" fi -if [ ! \( -f "${certfile}" -a -r "${certfile}" \) ]; then +if [ ! -r "${certfile}" ]; then echo "ERROR: Cannot read certificate file ${certfile}" >&2 exit 1 fi if [ "$cert_format" = pkcs12 ]; then echo "Credentials are in pkcs12 format, OpenSSL will prompt for p12 password" - cert_data="`"$openssl" pkcs12 -nokeys -clcerts -nomacver -in ${certfile}`" + cert_data=`"$openssl" pkcs12 -nokeys -clcerts -nomacver -in "$certfile"` command_stub="\"$openssl\" x509 -noout $openssl_options" else - command_stub="\"$openssl\" x509 -noout -in ${certfile} $openssl_options" -fi - - -# Will probably need this... -if [ "$cert_format" = pkcs12 ]; then - subject=`echo "$cert_data" | eval ${command_stub} -subject` -else - subject=`eval ${command_stub} -subject` -fi - -if test $? -ne 0 ; then - exit 1 + cert_data="" + command_stub="\"$openssl\" x509 -noout -in \"$certfile\" $openssl_options" fi -subject=`echo ${subject} | sed 's%^subject=\ *%%'` -if [ "${rfc2253:-0}" != 1 ]; then - subject=$(echo "${subject}" | sed -e 's|^|/|' -e 's|,|/|g') -fi +echo "$cert_data" | eval ${command_stub} || exit $? eval set -- "$toprint" for i in "$@"; do case "$i" in -*) - echo "$cert_data" | eval "{ ${command_stub} $i || exit $?; } | sed 's/^[a-zA-Z]*=[ ]*//'" + echo "$cert_data" | eval ${command_stub} $i | sed 's/^[a-zA-Z]*= *//' ;; SUBJECT) + if [ "${rfc2253:-0}" != 1 ]; then + subject=`echo "$cert_data" | \ + eval ${command_stub} -subject -nameopt sep_multiline | \ + sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` + else + subject=`echo "$cert_data" | eval ${command_stub} -subject | \ + sed 's/^subject= *//'` + fi # Do not show the proxy levels echo "${subject}" | sed -e 's%/CN=proxy%%g' -e 's%/CN=limited proxy%%g' ;; + ISSUER) + if [ "${rfc2253:-0}" != 1 ]; then + issuer=`echo "$cert_data" | \ + eval ${command_stub} -issuer -nameopt sep_multiline | \ + sed -e '/^issuer=/d' -e 's!^\s*!/!' | tr -d '\n'` + else + issuer=`echo "$cert_data" | eval ${command_stub} -issuer | \ + sed 's/^issuer= *//'` + fi + # Do not show the proxy levels + echo "${issuer}" | sed -e 's%/CN=proxy%%g' -e 's%/CN=limited proxy%%g' + ;; esac done - diff -Nru globus-gsi-cert-utils-10.3/programs/grid-cert-request.in globus-gsi-cert-utils-10.7/programs/grid-cert-request.in --- globus-gsi-cert-utils-10.3/programs/grid-cert-request.in 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/programs/grid-cert-request.in 2020-12-12 20:52:21.432897731 +0000 @@ -196,7 +196,7 @@ for cert in ${trusted_certs_dir}/*.0; do if test -r "${cert}" ; then eval "CA${index}=${cert}" - TEMP_SUBJECT="$("$openssl" x509 -in ${cert} -noout -subject -nameopt rfc2253,-dn_rev | sed -e 's|^subject= *|/|' -e 's|,|/|g')" + TEMP_SUBJECT=`"$openssl" x509 -in ${cert} -noout -subject -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` eval "CA_SUBJECT${index}=\"${TEMP_SUBJECT}\"" eval "CA_HASH${index}=`"$openssl" x509 -in ${cert} -noout -hash`" eval "echo \"$index) \${CA_HASH${index}} - \${CA_SUBJECT${index}}\"" @@ -225,7 +225,7 @@ echo exit 1 fi - TEMP_SUBJECT=`"$openssl" x509 -in ${trusted_certs_dir}/${CA_HASH}.0 -noout -subject -nameopt rfc2253,-dn_rev | sed -e 's|^subject= *|/|' -e 's|,|/|g'` + TEMP_SUBJECT=`"$openssl" x509 -in ${trusted_certs_dir}/${CA_HASH}.0 -noout -subject -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` eval "CA_SUBJECT=\"${TEMP_SUBJECT}\"" fi @@ -789,13 +789,7 @@ #------------------------ # Insert instructions into the request file - - SUBJECT="$("$openssl" req -text -noout < ${REQ_OUTPUT} 2>&1 |\ - grep 'Subject:' | awk -F: '{print $2}' |\ - cut -c2- )" - - #Convert the subject to the correct form. - SUBJECT=`echo "/"${SUBJECT} | sed -e 's|, |/|g'` + SUBJECT=`"$openssl" req -in ${REQ_OUTPUT} -noout -subject -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` create_request_header >${REQ_HEAD} diff -Nru globus-gsi-cert-utils-10.3/programs/grid-default-ca.in globus-gsi-cert-utils-10.7/programs/grid-default-ca.in --- globus-gsi-cert-utils-10.3/programs/grid-default-ca.in 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/programs/grid-default-ca.in 2020-12-12 20:52:21.432897731 +0000 @@ -22,7 +22,7 @@ shift for x in "$@"; do - if test -f "$x/$cahash.0"; then + if test -r "$x/$cahash.0"; then echo "${x}" return 0 fi @@ -50,11 +50,11 @@ DEFAULTCAHASH="NONE" gsconf="" - if test -f "${GRID_SECURITY_DIR}/grid-security.conf"; then + if test -r "${GRID_SECURITY_DIR}/grid-security.conf"; then gsconf=${GRID_SECURITY_DIR}/grid-security.conf - elif test -f "/etc/grid-security/grid-security.conf"; then + elif test -r "/etc/grid-security/grid-security.conf"; then gsconf="/etc/grid-security/grid-security.conf" - elif test -f "${sysconfdir}/grid-security.conf"; then + elif test -r "${sysconfdir}/grid-security.conf"; then gsconf="${sysconfdir}/grid-security.conf" fi @@ -62,8 +62,8 @@ DEFAULTCAHASH=`echo "$DEFAULTCACONFFILE" | sed -e "s|.*\.\(.*\)$|\1|"` for x in "$@"; do - if test -f "${x}/$DEFAULTCAHASH.0"; then - DEFAULT_SUBJECT="$("$openssl" x509 -in ${x}/$DEFAULTCAHASH.0 -noout -subject -nameopt rfc2253,-dn_rev| sed -e "s|subject= *|/|" -e "s|,|/|g")" + if test -r "${x}/$DEFAULTCAHASH.0"; then + DEFAULT_SUBJECT=`"$openssl" x509 -in ${x}/$DEFAULTCAHASH.0 -noout -subject -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` echo echo "The default CA is: $DEFAULT_SUBJECT" echo " Location: ${x}/$DEFAULTCAHASH.0" @@ -91,7 +91,7 @@ for cert in ${cert_hashes}; do if test -r "${cert}" ; then eval "CA${index}=${cert}" - TEMP_SUBJECT="$("$openssl" x509 -in "${cert}" -noout -subject -nameopt rfc2253,-dn_rev| sed -e "s|subject= *|/|" -e "s|,|/|g")" + TEMP_SUBJECT=`"$openssl" x509 -in "${cert}" -noout -subject -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` eval "CA_SUBJECT${index}=\"${TEMP_SUBJECT}\"" TEMP_HASH=`echo ${cert} | sed -e "s|.*/\([^/]*\)\.0|\1|"` eval "CA_HASH${index}=$TEMP_HASH" @@ -283,7 +283,7 @@ short_usage="$PROGRAM_NAME [-help] [ options ...]" -if ! openssl version > /dev/null 2> /dev/null; then +if ! "$openssl" version > /dev/null 2> /dev/null; then echo "Unable to locate openssl binary in $bindir or PATH" 1>&2 exit 1 fi @@ -351,7 +351,7 @@ echo exit 1 fi - CA_SUBJECT="$(openssl x509 -in "${CA_CERT}" -noout -subject -nameopt rfc2253,-dn_rev| sed -e "s|subject= *|/|" -e "s|,|/|g")" + CA_SUBJECT=`"$openssl" x509 -in "${CA_CERT}" -noout -subject -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'` fi secconfdir=`get_security_dir ${CA_CERT_DIR}` @@ -369,7 +369,7 @@ echo "setting the default CA to: ${CA_SUBJECT}" echo -NEW_DEFAULT_CA_HASH=`openssl x509 -in ${CA_CERT} -noout -hash` +NEW_DEFAULT_CA_HASH=`"$openssl" x509 -in "${CA_CERT}" -noout -hash` GRID_SECURITY_FILE=${CA_CERT_DIR}/grid-security.conf.${NEW_DEFAULT_CA_HASH} CA_SSL_HOST_CONFIG_FILE=${CA_CERT_DIR}/globus-host-ssl.conf.${NEW_DEFAULT_CA_HASH} diff -Nru globus-gsi-cert-utils-10.3/programs/Makefile.am globus-gsi-cert-utils-10.7/programs/Makefile.am --- globus-gsi-cert-utils-10.3/programs/Makefile.am 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/programs/Makefile.am 2020-12-12 20:52:21.432897731 +0000 @@ -22,8 +22,7 @@ grid-default-ca \ globus-update-certificate-dir -EXTRA_DIST = $(MANUALS_SOURCE) $(man_MANS) \ - replace-version.xsl +EXTRA_DIST = $(MANUALS_SOURCE) $(man_MANS) if BUILD_MANPAGES SUFFIXES = .txt .1 .8 diff -Nru globus-gsi-cert-utils-10.3/programs/Makefile.in globus-gsi-cert-utils-10.7/programs/Makefile.in --- globus-gsi-cert-utils-10.3/programs/Makefile.in 2019-08-29 15:27:12.571745679 +0000 +++ globus-gsi-cert-utils-10.7/programs/Makefile.in 2020-12-12 20:55:29.020897731 +0000 @@ -309,9 +309,7 @@ grid-default-ca \ globus-update-certificate-dir -EXTRA_DIST = $(MANUALS_SOURCE) $(man_MANS) \ - replace-version.xsl - +EXTRA_DIST = $(MANUALS_SOURCE) $(man_MANS) @BUILD_MANPAGES_TRUE@SUFFIXES = .txt .1 .8 all: all-am diff -Nru globus-gsi-cert-utils-10.3/programs/replace-version.xsl globus-gsi-cert-utils-10.7/programs/replace-version.xsl --- globus-gsi-cert-utils-10.3/programs/replace-version.xsl 2019-08-29 15:23:22.163745679 +0000 +++ globus-gsi-cert-utils-10.7/programs/replace-version.xsl 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - -