Debian Bug report logs - #258517
XSI:isms and bash:isms in openssh

Toggle useless messages

Message #5 received at maintonly@bugs.debian.org (full text, mbox, reply):

From: David Weinehall <tao@debian.org>

To: "Debian Bug Tracking System, Maintonly" <maintonly@bugs.debian.org>

Subject: XSI:isms and bash:isms in openssh

Date: Sat, 10 Jul 2004 01:20:05 +0200

Package: openssh
Version: 3.8.1p1-4
Severity: minor
Tags: patch

Several files in openssh contains use of the XSI:isms `-a' and `-o'
in tests.  Additionally, debian/postinst uses the bashism local.
The included patch fixes all of these.  Note that I have not included
fixes for the upstream bugs that does not affect Debian (scripts for
aix, caldera, etc...); if wanted, I can do so separately.

Rationale:
Policy 10.4
http://www.opengroup.org/onlinepubs/009695399/utilities/test.html


Regards: David Weinehall

diff -ur openssh-3.8.1p1-old/Makefile.in openssh-3.8.1p1/Makefile.in
--- openssh-3.8.1p1-old/Makefile.in	2004-02-18 05:35:11.000000000 +0200
+++ openssh-3.8.1p1/Makefile.in	2004-07-10 02:11:49.000000000 +0300
@@ -290,7 +290,7 @@
 	else \
 		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
 	fi
-	@if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+	@if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
 		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
 			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
 		else \
@@ -404,6 +404,6 @@
 		$@
 
 regressclean:
-	if [ -f regress/Makefile -a -r regress/Makefile ]; then \
+	if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
 		(cd regress && $(MAKE) clean) \
 	fi
diff -ur openssh-3.8.1p1-old/contrib/ssh-copy-id openssh-3.8.1p1/contrib/ssh-copy-id
--- openssh-3.8.1p1-old/contrib/ssh-copy-id	2004-01-04 23:16:34.000000000 +0200
+++ openssh-3.8.1p1/contrib/ssh-copy-id	2004-07-10 02:12:05.000000000 +0300
@@ -24,7 +24,7 @@
   fi
 fi
 
-if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
+if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
   GET_ID="cat ${ID_FILE}"
 fi
 
diff -ur openssh-3.8.1p1-old/debian/config openssh-3.8.1p1/debian/config
--- openssh-3.8.1p1-old/debian/config	2004-06-24 12:55:35.000000000 +0300
+++ openssh-3.8.1p1/debian/config	2004-07-10 02:09:45.000000000 +0300
@@ -3,7 +3,7 @@
 action=$1
 version=$2
 
-if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
   version=1.2.27
   cp -a /etc/ssh-nonfree /etc/ssh
 fi
@@ -30,7 +30,7 @@
   db_fset ssh/use_old_init_script seen true
 fi
 
-if [ -z "$version" -a ! -e /etc/ssh/sshd_config ]
+if [ -z "$version" ] && [ ! -e /etc/ssh/sshd_config ]
 then
   db_input medium ssh/protocol2_only || true
 fi
diff -ur openssh-3.8.1p1-old/debian/postinst openssh-3.8.1p1/debian/postinst
--- openssh-3.8.1p1-old/debian/postinst	2004-06-24 12:55:35.000000000 +0300
+++ openssh-3.8.1p1/debian/postinst	2004-07-10 02:10:14.000000000 +0300
@@ -28,9 +28,9 @@
 
 
 create_key() {
-	local msg="$1"
+	msg="$1"
 	shift
-	local file="$1"
+	file="$1"
 	shift
 
 	if [ ! -f "$file" ] ; then
diff -ur openssh-3.8.1p1-old/debian/preinst openssh-3.8.1p1/debian/preinst
--- openssh-3.8.1p1-old/debian/preinst	2004-06-24 12:55:35.000000000 +0300
+++ openssh-3.8.1p1/debian/preinst	2004-07-10 02:10:40.000000000 +0300
@@ -3,11 +3,11 @@
 action=$1
 version=$2
 
-if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
   version=1.2.27
 fi
 
-if [ "$action" = upgrade -o "$action" = install ]
+if [ "$action" = upgrade ] || [ "$action" = install ]
 then
   # check if debconf is missing
   if ! test -f /usr/share/debconf/confmodule
@@ -39,7 +39,7 @@
     # work around for missing debconf
     db_get() { : ; }
     RET=true
-    if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+    if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
       cp -a /etc/ssh-nonfree /etc/ssh
     fi
   else

Message #10 received at 258517@bugs.debian.org (full text, mbox, reply):

From: Colin Watson <cjwatson@debian.org>

To: David Weinehall <tao@debian.org>, 258517@bugs.debian.org

Subject: Re: Bug#258517: XSI:isms and bash:isms in openssh

Date: Sat, 10 Jul 2004 02:03:37 +0100

On Sat, Jul 10, 2004 at 01:20:05AM +0200, David Weinehall wrote:
> Several files in openssh contains use of the XSI:isms `-a' and `-o'
> in tests.  Additionally, debian/postinst uses the bashism local.

I've applied the fixes to the maintainer scripts; thanks. I'll forward
the rest upstream when I'm more awake.

Cheers,

-- 
Colin Watson                                  [cjwatson@flatline.org.uk]

Message #15 received at 258517-close@bugs.debian.org (full text, mbox, reply):

From: Colin Watson <cjwatson@debian.org>

To: 258517-close@bugs.debian.org

Subject: Bug#258517: fixed in openssh 1:3.8.1p1-5

Date: Sat, 10 Jul 2004 09:32:03 -0400

Source: openssh
Source-Version: 1:3.8.1p1-5

We believe that the bug you reported is fixed in the latest version of
openssh, which is due to be installed in the Debian FTP archive:

openssh-client-udeb_3.8.1p1-5_powerpc.udeb
  to pool/main/o/openssh/openssh-client-udeb_3.8.1p1-5_powerpc.udeb
openssh-server-udeb_3.8.1p1-5_powerpc.udeb
  to pool/main/o/openssh/openssh-server-udeb_3.8.1p1-5_powerpc.udeb
openssh_3.8.1p1-5.diff.gz
  to pool/main/o/openssh/openssh_3.8.1p1-5.diff.gz
openssh_3.8.1p1-5.dsc
  to pool/main/o/openssh/openssh_3.8.1p1-5.dsc
ssh-askpass-gnome_3.8.1p1-5_powerpc.deb
  to pool/main/o/openssh/ssh-askpass-gnome_3.8.1p1-5_powerpc.deb
ssh_3.8.1p1-5_powerpc.deb
  to pool/main/o/openssh/ssh_3.8.1p1-5_powerpc.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 258517@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Colin Watson <cjwatson@debian.org> (supplier of updated openssh package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sat, 10 Jul 2004 13:57:27 +0100
Source: openssh
Binary: ssh-askpass-gnome openssh-client-udeb ssh openssh-server-udeb
Architecture: source powerpc
Version: 1:3.8.1p1-5
Distribution: unstable
Urgency: medium
Maintainer: Matthew Vernon <matthew@debian.org>
Changed-By: Colin Watson <cjwatson@debian.org>
Description: 
 openssh-client-udeb - Secure shell client for the Debian installer (udeb)
 openssh-server-udeb - Secure shell server for the Debian installer (udeb)
 ssh        - Secure rlogin/rsh/rcp replacement (OpenSSH)
 ssh-askpass-gnome - under X, asks user for a passphrase for ssh-add
Closes: 252226 252676 258517
Changes: 
 openssh (1:3.8.1p1-5) unstable; urgency=medium
 .
   * Update German debconf template translation (thanks, Helge Kreutzmann;
     closes: #252226).
   * Remove Suggests: dnsutils, as it was only needed for
     make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
   * Disable shadow password support in openssh-server-udeb.
   * Fix non-portable shell constructs in maintainer scripts, Makefile, and
     ssh-copy-id (thanks, David Weinehall; closes: #258517).
   * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
     handler kill the PAM thread if its waitpid() call returns 0, as well as
     the previous check for -1 (closes: #252676).
   * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any
     more; oh well.
Files: 
 3202977c5bb0f8ad90f054490c897ee8 890 net standard openssh_3.8.1p1-5.dsc
 c1607db15c5c218a105ebeb283987c16 148208 net standard openssh_3.8.1p1-5.diff.gz
 7fd850f6eaa00a94bc20bd08bd47365f 732184 net standard ssh_3.8.1p1-5_powerpc.deb
 bcccadd0ae2ccdf5e392fdc0857c6440 51878 gnome optional ssh-askpass-gnome_3.8.1p1-5_powerpc.deb
 e7f35854be7a14906d2c003a881a979e 150892 debian-installer optional openssh-client-udeb_3.8.1p1-5_powerpc.udeb
 afbc62f360b4ea7fea4586cc4b46e369 159546 debian-installer optional openssh-server-udeb_3.8.1p1-5_powerpc.udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Colin Watson <cjwatson@debian.org> -- Debian developer

iD8DBQFA7+vC9t0zAhD6TNERAhpDAJ9MSjipj7CkcZ9KklG7dONVYCSvIwCfRijl
MuXejNOZ9aZhR/N5QWQL4Fg=
=V8cq
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.