diff -Nru openafs-1.8.4~pre1/configure.ac openafs-1.8.5/configure.ac --- openafs-1.8.4~pre1/configure.ac 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/configure.ac 2019-10-22 21:30:17.000000000 +0000 @@ -5,8 +5,8 @@ AC_CONFIG_SRCDIR([src/config/stds.h]) AC_CONFIG_HEADER([src/config/afsconfig.h]) -MACOS_VERSION=1.8.4fc1 -LINUX_PKGREL=1.8.4pre1 +MACOS_VERSION=1.8.5 +LINUX_PKGREL=1.8.5 AC_SUBST([MACOS_VERSION]) diff -Nru openafs-1.8.4~pre1/configure-libafs.ac openafs-1.8.5/configure-libafs.ac --- openafs-1.8.4~pre1/configure-libafs.ac 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/configure-libafs.ac 2019-10-22 21:30:17.000000000 +0000 @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/libafs/Makefile.common.in]) AC_CONFIG_HEADER([src/config/afsconfig.h]) -MACOS_VERSION=1.8.4fc1 +MACOS_VERSION=1.8.5 AC_SUBST([MACOS_VERSION]) diff -Nru openafs-1.8.4~pre1/debian/changelog openafs-1.8.5/debian/changelog --- openafs-1.8.4~pre1/debian/changelog 2019-08-18 23:39:57.000000000 +0000 +++ openafs-1.8.5/debian/changelog 2019-10-29 04:25:07.000000000 +0000 @@ -1,8 +1,20 @@ -openafs (1.8.4~pre1-1~ppa0~ubuntu14.04.1) trusty; urgency=medium +openafs (1.8.5-1~ppa0~ubuntu14.04.1) trusty; urgency=medium * Build for PPA. - -- Anders Kaseorg Sun, 18 Aug 2019 16:39:57 -0700 + -- Anders Kaseorg Mon, 28 Oct 2019 21:25:07 -0700 + +openafs (1.8.5-1) unstable; urgency=high + + * New upstream security release (Closes: #943587): + - Fix OPENAFS-SA-2019-001, OPENAFS-SA-2019-002: information leakage from + uninitialized RPC output variables + - Fix OPENAFS-SA-2019-003: database server DoS (NULL dereference) + * Configure --without-ctf-tools to allow kernel module builds when ctfutils + are installed. (Closes: #935771) + * Enable support for ppc64le. (Closes: #941658) + + -- Benjamin Kaduk Sun, 27 Oct 2019 15:13:27 -0700 openafs (1.8.4~pre1-1) unstable; urgency=medium @@ -3360,7 +3372,7 @@ works under fakeroot. Important for modules package. * Fix purge to delete configuration files - -- Sat, 25 Nov 2000 01:09:55 -0500 + -- Sam Hartman Sat, 25 Nov 2000 01:09:55 -0500 openafs (1.0.snap20001106-5) unstable; urgency=low diff -Nru openafs-1.8.4~pre1/debian/control openafs-1.8.5/debian/control --- openafs-1.8.4~pre1/debian/control 2019-08-18 23:39:56.000000000 +0000 +++ openafs-1.8.5/debian/control 2019-10-29 04:25:06.000000000 +0000 @@ -15,7 +15,7 @@ Vcs-Browser: https://salsa.debian.org/debian/openafs Package: openafs-client -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6) Recommends: lsof, openafs-modules-dkms (>= ${source:Version}) | openafs-modules-source (>= ${source:Version}) @@ -33,7 +33,7 @@ want to install openafs-krb5. Package: openafs-fuse -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client (= ${binary:Version}) Description: AFS distributed file system experimental FUSE client @@ -48,7 +48,7 @@ access is sufficient and the kernel module cannot be built. Package: openafs-fileserver -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), openafs-client, openafs-krb5 (>= 1.8.0~pre1-1) Recommends: ntp | time-daemon @@ -62,7 +62,7 @@ installed on any machine that will export files into AFS. Package: openafs-dbserver -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, openafs-fileserver Recommends: openafs-client @@ -90,7 +90,7 @@ protocol documentation, and other OpenAFS documentation. Package: openafs-krb5 -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: openafs-client (<< 1.4.7.dfsg1-1) Description: AFS distributed filesystem Kerberos 5 integration @@ -105,7 +105,7 @@ Package: libkopenafs2 Section: libs -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} Description: AFS distributed file system runtime library (PAGs) AFS is a distributed filesystem allowing cross-platform sharing of @@ -118,7 +118,7 @@ Package: libafsauthent2 Section: libs -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} Description: AFS distributed file system runtime library (authentication) AFS is a distributed filesystem allowing cross-platform sharing of @@ -130,7 +130,7 @@ Package: libafsrpc2 Section: libs -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} Description: AFS distributed file system runtime library (RPC layer) AFS is a distributed filesystem allowing cross-platform sharing of @@ -142,7 +142,7 @@ Package: libopenafs-dev Section: libdevel -Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, libafsauthent2 (= ${binary:Version}), libafsrpc2 (= ${binary:Version}), libkopenafs2 (= ${binary:Version}), diff -Nru openafs-1.8.4~pre1/debian/module/sysname openafs-1.8.5/debian/module/sysname --- openafs-1.8.4~pre1/debian/module/sysname 2018-09-12 10:47:56.000000000 +0000 +++ openafs-1.8.5/debian/module/sysname 2019-10-29 04:15:49.000000000 +0000 @@ -22,6 +22,9 @@ ppc64) echo ppc64_linux26 ;; +ppc64le) + echo ppc64le_linux26 + ;; s390) echo s390_linux26 ;; diff -Nru openafs-1.8.4~pre1/debian/patches/0003-Remove-automake-autoconf-vars.patch openafs-1.8.5/debian/patches/0003-Remove-automake-autoconf-vars.patch --- openafs-1.8.4~pre1/debian/patches/0003-Remove-automake-autoconf-vars.patch 2019-08-18 23:35:55.000000000 +0000 +++ openafs-1.8.5/debian/patches/0003-Remove-automake-autoconf-vars.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,209 +0,0 @@ -From: Andrew Deason -Date: Thu, 11 Oct 2018 00:18:17 -0500 -Subject: Remove automake autoconf vars - -Commit 4706854f (autoconf: updates and cleanup) removed our invocation -of AM_INIT_AUTOMAKE, which defines the output variables PACKAGE and -VERSION. Several files in our build system are still referencing -@PACKAGE@ and @VERSION@, though, leaving them un-substituted. This -most easily is seen as the AFSVersion version string remaining as -"@VERSION@" when the tree is built without git, but it also affects -some packaging in the tree. - -Remove references to @VERSION@ and @PACKAGE@, replacing them with -their autoconf equivalents @PACKAGE_VERSION@ and @PACKAGE_TARNAME@. - -Change-Id: I6c6a09a46c4af4259009a4a60cfdaee63d6258c2 -Reviewed-on: https://gerrit.openafs.org/13357 -Tested-by: BuildBot -Reviewed-by: Benjamin Kaduk -(cherry picked from commit 2f2c2ce62aa17ecac3651d64c1168af926f7458b) ---- - src/config/Makefile.version-CML.in | 4 ++-- - src/config/Makefile.version-NOCML.in | 6 +++--- - src/packaging/MacOS/OpenAFS-debug.Description.plist.in | 2 +- - src/packaging/MacOS/OpenAFS.Description.plist.in | 2 +- - src/packaging/MacOS/OpenAFS.info.in | 2 +- - src/packaging/MacOS/buildpkg.sh.in | 4 ++-- - src/packaging/MacOS/pkgbuild.sh.in | 12 ++++++------ - src/packaging/RedHat/openafs.spec.in | 2 +- - src/tests/run-tests.in | 4 ++-- - 9 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/src/config/Makefile.version-CML.in b/src/config/Makefile.version-CML.in -index 45c4b84..0a08a92 100644 ---- a/src/config/Makefile.version-CML.in -+++ b/src/config/Makefile.version-CML.in -@@ -5,8 +5,8 @@ - # License. For details, see the LICENSE file in the top-level source - # directory or online at http://www.openafs.org/dl/license10.html - --PACKAGE=@PACKAGE@ --VERSION=@VERSION@ -+PACKAGE=@PACKAGE_TARNAME@ -+VERSION=@PACKAGE_VERSION@ - - AFS_component_version_number.o: AFS_component_version_number.c $(TOP_SRCDIR)/config/mkvers - version.xml version.txt: $(TOP_SRCDIR)/config/mkvers -diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in -index c65cfe9..8a11ee8 100644 ---- a/src/config/Makefile.version-NOCML.in -+++ b/src/config/Makefile.version-NOCML.in -@@ -5,12 +5,12 @@ - # License. For details, see the LICENSE file in the top-level source - # directory or online at http://www.openafs.org/dl/license10.html - --PACKAGE=@PACKAGE@ -+PACKAGE=@PACKAGE_TARNAME@ - - AFS_component_version_number.o: AFS_component_version_number.c - - AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version -- ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \ -+ ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@PACKAGE_VERSION@"` && \ - if [ "$$SOURCE_DATE_EPOCH" ]; then \ - echo 'char cml_version_number[]="@(#)OpenAFS '$$VERSION `date -u -d "@$$SOURCE_DATE_EPOCH" +"%Y-%m-%d" 2>/dev/null || date -u -r "$$SOURCE_DATE_EPOCH" +"%Y-%m-%d"`'";'; \ - else \ -@@ -22,7 +22,7 @@ AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version - rm -f AFS_component_version_number.c.NEW - - version.xml: -- VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \ -+ VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@PACKAGE_VERSION@"` && \ - echo '' >version.xml && \ - echo '' >>version.xml && \ - echo ''$$VERSION'' >>version.xml && \ -diff --git a/src/packaging/MacOS/OpenAFS-debug.Description.plist.in b/src/packaging/MacOS/OpenAFS-debug.Description.plist.in -index 2667452..dfbb4dc 100644 ---- a/src/packaging/MacOS/OpenAFS-debug.Description.plist.in -+++ b/src/packaging/MacOS/OpenAFS-debug.Description.plist.in -@@ -9,6 +9,6 @@ - IFPkgDescriptionTitle - OpenAFS debug extension - IFPkgDescriptionVersion -- @VERSION@ -+ @PACKAGE_VERSION@ - - -diff --git a/src/packaging/MacOS/OpenAFS.Description.plist.in b/src/packaging/MacOS/OpenAFS.Description.plist.in -index 8dece17..3cab1f7 100644 ---- a/src/packaging/MacOS/OpenAFS.Description.plist.in -+++ b/src/packaging/MacOS/OpenAFS.Description.plist.in -@@ -9,6 +9,6 @@ - IFPkgDescriptionTitle - OpenAFS - IFPkgDescriptionVersion -- @VERSION@ -+ @PACKAGE_VERSION@ - - -diff --git a/src/packaging/MacOS/OpenAFS.info.in b/src/packaging/MacOS/OpenAFS.info.in -index a3d04a5..ac40126 100644 ---- a/src/packaging/MacOS/OpenAFS.info.in -+++ b/src/packaging/MacOS/OpenAFS.info.in -@@ -1,5 +1,5 @@ - Title OpenAFS --Version @VERSION@ -+Version @PACKAGE_VERSION@ - Description The OpenAFS distributed filesystem. This package installs a ready-to-run client for OpenAFS. See http://www.openafs.org for more information. - DefaultLocation / - Diskname (null) -diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in -index 143bda7..ec3711c 100644 ---- a/src/packaging/MacOS/buildpkg.sh.in -+++ b/src/packaging/MacOS/buildpkg.sh.in -@@ -306,14 +306,14 @@ if [ $secondpass = yes ]; then - if [ $majorvers -ge 8 ]; then - mv $CURDIR/OpenAFS-debug-extension.pkg $CURDIR/dmg - fi -- rm -rf $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg -+ rm -rf $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg - cp $RESSRC/Uninstall $CURDIR/dmg/Uninstall.command - cp $RESSRC/DS_Store $CURDIR/dmg/.DS_Store - mkdir $CURDIR/dmg/.background - cp $RESSRC/afslogo.jpg $CURDIR/dmg/.background - # hdiutil create -srcfolder $CURDIR/dmg -volname OpenAFS -anyowners $CURDIR/OpenAFS.dmg - hdiutil makehybrid -hfs -hfs-volume-name OpenAFS -hfs-openfolder $CURDIR/dmg $CURDIR/dmg -o $CURDIR/TMP.dmg -- hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg -+ hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg - rm $CURDIR/TMP.dmg - rm -rf $CURDIR/dmg - # Unfortunately, sudo sets $USER to root, so I can't chown the -diff --git a/src/packaging/MacOS/pkgbuild.sh.in b/src/packaging/MacOS/pkgbuild.sh.in -index 3570d7a..d65f585 100644 ---- a/src/packaging/MacOS/pkgbuild.sh.in -+++ b/src/packaging/MacOS/pkgbuild.sh.in -@@ -426,7 +426,7 @@ if [ x"$PASS2" = x1 ]; then - - rm -rf "$CURDIR"/OpenAFS-debug-extension.pkg - /usr/bin/pkgbuild --root "$DPKGROOT" --id org.openafs.OpenAFS-debug.pkg \ -- --version '@VERSION@' \ -+ --version '@PACKAGE_VERSION@' \ - "$CURDIR"/OpenAFS-debug-extension.pkg - - cd "$RESSRC" -@@ -445,7 +445,7 @@ if [ x"$PASS2" = x1 ]; then - - rm -rf "$CURDIR"/OpenAFS-dist.pkg - /usr/bin/pkgbuild --root "$PKGROOT" --id org.openafs.OpenAFS.pkg \ -- --version '@VERSION@' \ -+ --version '@PACKAGE_VERSION@' \ - --scripts "$PKGRES" "$CURDIR"/OpenAFS-dist.pkg - - rm -rf "$PKGRES" -@@ -466,7 +466,7 @@ if [ x"$PASS2" = x1 ]; then - sed -e "s/%%OSX_MAJOR_CUR%%/$THISREL/g" \ - -e "s/%%OSX_MAJOR_NEXT%%/$(( $THISREL + 1 ))/g" \ - -e "s,%%PRES_EXTRA%%,$PRES_EXTRA,g" \ -- -e "s/%%OPENAFS_VERSION%%/@VERSION@/g" \ -+ -e "s/%%OPENAFS_VERSION%%/@PACKAGE_VERSION@/g" \ - < Distribution.xml.in > Distribution.xml - - rm -rf "$CURDIR/prod" -@@ -484,7 +484,7 @@ if [ x"$PASS2" = x1 ]; then - - rm -rf "$CURDIR/dmg" - rm -f "$CURDIR/TMP.dmg" -- rm -rf "$CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg" -+ rm -rf "$CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg" - - mkdir "$CURDIR"/dmg - mv "$CURDIR"/OpenAFS.pkg "$CURDIR"/dmg -@@ -500,8 +500,8 @@ if [ x"$PASS2" = x1 ]; then - hdiutil create -srcfolder "$CURDIR"/dmg -volname OpenAFS \ - -o "$CURDIR"/TMP.dmg - hdiutil convert -format UDZO "$CURDIR"/TMP.dmg \ -- -o "$CURDIR/OpenAFS-@VERSION@-$RELNAME".dmg -+ -o "$CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME".dmg - - echo -- echo "Created $CURDIR/OpenAFS-@VERSION@-$RELNAME".dmg -+ echo "Created $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME".dmg - fi -diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in -index 5282c4a..d0298d0 100644 ---- a/src/packaging/RedHat/openafs.spec.in -+++ b/src/packaging/RedHat/openafs.spec.in -@@ -1,6 +1,6 @@ - # Openafs Spec $Revision$ - --%define afsvers @VERSION@ -+%define afsvers @PACKAGE_VERSION@ - %define pkgvers @LINUX_PKGVER@ - # for beta/rc releases make pkgrel 0. - # for real releases make pkgrel 1 (or more for extra releases) -diff --git a/src/tests/run-tests.in b/src/tests/run-tests.in -index d0fc73d..1ab12ad 100755 ---- a/src/tests/run-tests.in -+++ b/src/tests/run-tests.in -@@ -28,8 +28,8 @@ srcdir=@srcdir@ - objdir=`pwd` - SHELL=/bin/sh - SHELLVERBOSE= --VERSION=@VERSION@ --PACKAGE=@PACKAGE@ -+VERSION=@PACKAGE_VERSION@ -+PACKAGE=@PACKAGE_TARNAME@ - host=@host@ - RUNAS= - FS=${AFSSRVBINDIR}/fs diff -Nru openafs-1.8.4~pre1/debian/patches/0004-Remove-one-more-automake-VERSION-reference.patch openafs-1.8.5/debian/patches/0004-Remove-one-more-automake-VERSION-reference.patch --- openafs-1.8.4~pre1/debian/patches/0004-Remove-one-more-automake-VERSION-reference.patch 2019-08-18 23:35:55.000000000 +0000 +++ openafs-1.8.5/debian/patches/0004-Remove-one-more-automake-VERSION-reference.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Andrew Deason -Date: Wed, 17 Oct 2018 16:35:36 -0500 -Subject: Remove one more automake VERSION reference - -The configure summary was still referencing the old automake-specific -VERSION var. Use the autoconf PACKAGE_VERSION var instead, so this -actually shows our version. - -Change-Id: I18007935d0235931f1d2e023abddee7356e8ac2d -Reviewed-on: https://gerrit.openafs.org/13360 -Reviewed-by: Benjamin Kaduk -Tested-by: BuildBot -(cherry picked from commit 0f65b40b24599d58cf30bfd47fae83ab54e1416a) ---- - src/cf/summary.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cf/summary.m4 b/src/cf/summary.m4 -index 8e45413..2967b02 100644 ---- a/src/cf/summary.m4 -+++ b/src/cf/summary.m4 -@@ -59,7 +59,7 @@ AC_DEFUN([OPENAFS_SUMMARY],[ - *************************************************************** - OpenAFS configure summary - -- version : ${VERSION} -+ version : ${PACKAGE_VERSION} - sysname : ${AFS_SYSNAME} - - debug: diff -Nru openafs-1.8.4~pre1/debian/patches/series openafs-1.8.5/debian/patches/series --- openafs-1.8.4~pre1/debian/patches/series 2019-08-18 23:39:56.000000000 +0000 +++ openafs-1.8.5/debian/patches/series 2019-10-29 04:25:06.000000000 +0000 @@ -1,3 +1 @@ 0002-aklog-require-opt-in-to-enable-single-DES-in-libkrb5.patch -0003-Remove-automake-autoconf-vars.patch -0004-Remove-one-more-automake-VERSION-reference.patch diff -Nru openafs-1.8.4~pre1/debian/rules openafs-1.8.5/debian/rules --- openafs-1.8.4~pre1/debian/rules 2019-08-18 23:39:56.000000000 +0000 +++ openafs-1.8.5/debian/rules 2019-10-29 04:25:06.000000000 +0000 @@ -111,6 +111,7 @@ --with-roken-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal \ --with-hcrypto-include=/usr/include/heimdal \ --with-hcrypto-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal \ + --without-ctf-tools \ $(DEBIAN_OPT_FLAGS) # Also build a libafs_tree and build the XML documentation if building diff -Nru openafs-1.8.4~pre1/debian/sysname openafs-1.8.5/debian/sysname --- openafs-1.8.4~pre1/debian/sysname 2018-09-12 10:47:57.000000000 +0000 +++ openafs-1.8.5/debian/sysname 2019-10-29 04:15:49.000000000 +0000 @@ -30,6 +30,9 @@ ppc64) echo ppc64_linux26 ;; +ppc64le) + echo ppc64le_linux26 + ;; s390) echo s390_linux26 ;; diff -Nru openafs-1.8.4~pre1/NEWS openafs-1.8.5/NEWS --- openafs-1.8.4~pre1/NEWS 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/NEWS 2019-10-22 21:30:17.000000000 +0000 @@ -1,11 +1,39 @@ User-Visible OpenAFS Changes -OpenAFS 1.8.4 (in progress) +OpenAFS 1.8.5 + +All platforms + + * Fix OPENAFS-SA-2019-001: information leakage in failed RPC output + Generated RPC handler routines ran output variables through XDR encoding + even when the call had failed and would shortly be aborted (and for + which uninitialized output variables is common); any complete packets + assembled in the process would be sent to the peer, leaking the contents + of the uninitialized memory in question. + + * Fix OPENAFS-SA-2019-002: information leakage from uninitialized scalars + Generated RPC handler routines did not initialize output variables of + scalar (fixed-length) type, since they did not require dedicated logic to + free. Such variables allocated on the stack could remain uninitialized + in some cases (including those affected by OPENAFS-SA-2019-001), and the + contents of uninitialized memory would be returned to the peer. + +All server platforms + + * Fix OPENAFS-SA-2019-003: fix crash in database servers + The ubik debugging RPCs prioritize being fast and non-disruptive to + database operations over strict correctness, and do not adhere to the + usual locking protocol for data access. A data race could cause a NULL + dereference if the second memory load was not optimized out by the + compiler. + +OpenAFS 1.8.4 All platforms Build system updates to remove obsolete autoconf macros and remove missing - script warning during builds (13480, 13481, 13482, 13483, 13484, 13486). + script warning during builds (13480, 13481, 13482, 13483, 13484, 13486, + 13789, 13790). Build system update to fix a conditional check in the pthread.m4 autoconf file (13595) @@ -52,9 +80,11 @@ Linux - More improper use of ENOENT fixes to avoid incorrect use of linux negative - dentry cache, which can lead to false ENOENT errors (13542, 13543, 13590 - 13692) (RT #134904). + Support for mainline kernels up to 5.3 (13787, 13789). + + More fixes for improper use of ENOENT fixes to avoid incorrect use of linux + negative dentry cache, which can lead to false ENOENT errors (13542, 13543, + 13590, 13692) (RT #134904). Return errors instead of returning incomplete directory listings when the directory objects are incomplete in the cache (13591). diff -Nru openafs-1.8.4~pre1/src/afs/afs_osi.c openafs-1.8.5/src/afs/afs_osi.c --- openafs-1.8.4~pre1/src/afs/afs_osi.c 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/afs/afs_osi.c 2019-10-22 21:30:17.000000000 +0000 @@ -138,6 +138,9 @@ void afs_osi_UnmaskRxkSignals(void) { +#ifdef AFS_LINUX22_ENV + osi_linux_unmaskrxk(); +#endif } /* Two hacks to try and fix afsdb */ diff -Nru openafs-1.8.4~pre1/src/afs/afs_prototypes.h openafs-1.8.5/src/afs/afs_prototypes.h --- openafs-1.8.4~pre1/src/afs/afs_prototypes.h 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/afs/afs_prototypes.h 2019-10-22 21:30:17.000000000 +0000 @@ -643,7 +643,7 @@ extern void osi_linux_free_inode_pages(void); #endif extern void osi_linux_mask(void); -extern void osi_linux_unmask(void); +extern void osi_linux_unmaskrxk(void); extern int setpag(cred_t ** cr, afs_uint32 pagvalue, afs_uint32 * newpag, int change_parent); #endif diff -Nru openafs-1.8.4~pre1/src/afs/LINUX/osi_compat.h openafs-1.8.5/src/afs/LINUX/osi_compat.h --- openafs-1.8.4~pre1/src/afs/LINUX/osi_compat.h 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/afs/LINUX/osi_compat.h 2019-10-22 21:30:17.000000000 +0000 @@ -222,9 +222,15 @@ key_ref_t key_ref; if (afs_session_keyring(cred)) { +# if defined(KEYRING_SEARCH_TAKES_RECURSE) + key_ref = keyring_search( + make_key_ref(afs_session_keyring(cred), 1), + type, "_pag", 1); +# else key_ref = keyring_search( make_key_ref(afs_session_keyring(cred), 1), type, "_pag"); +# endif if (IS_ERR(key_ref)) return ERR_CAST(key_ref); diff -Nru openafs-1.8.4~pre1/src/afs/LINUX/osi_misc.c openafs-1.8.5/src/afs/LINUX/osi_misc.c --- openafs-1.8.4~pre1/src/afs/LINUX/osi_misc.c 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/afs/LINUX/osi_misc.c 2019-10-22 21:30:17.000000000 +0000 @@ -37,6 +37,17 @@ SIG_UNLOCK(current); } +void +osi_linux_unmaskrxk(void) +{ + extern struct task_struct *rxk_ListenerTask; + /* Note this unblocks signals on the rxk_Listener + * thread from a thread that is stopping rxk */ + SIG_LOCK(rxk_ListenerTask); + sigdelset(&rxk_ListenerTask->blocked, SIGKILL); + SIG_UNLOCK(rxk_ListenerTask); +} + /* LOOKUP_POSITIVE is becoming the default */ #ifndef LOOKUP_POSITIVE #define LOOKUP_POSITIVE 0 diff -Nru openafs-1.8.4~pre1/src/cf/linux-kernel-assorted.m4 openafs-1.8.5/src/cf/linux-kernel-assorted.m4 --- openafs-1.8.4~pre1/src/cf/linux-kernel-assorted.m4 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/cf/linux-kernel-assorted.m4 2019-10-22 21:30:17.000000000 +0000 @@ -55,6 +55,7 @@ LINUX_IOP_LOOKUP_TAKES_UNSIGNED LINUX_D_INVALIDATE_IS_VOID LINUX_KERNEL_READ_OFFSET_IS_LAST +LINUX_KEYRING_SEARCH_TAKES_RECURSE ]) diff -Nru openafs-1.8.4~pre1/src/cf/linux-test4.m4 openafs-1.8.5/src/cf/linux-test4.m4 --- openafs-1.8.4~pre1/src/cf/linux-test4.m4 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/cf/linux-test4.m4 2019-10-22 21:30:17.000000000 +0000 @@ -836,3 +836,16 @@ [define if your kernel_read has offset as the last argument], []) ]) + +AC_DEFUN([LINUX_KEYRING_SEARCH_TAKES_RECURSE], [ + AC_CHECK_LINUX_BUILD([whether keyring_search has the recurse parameter], + [ac_cv_linux_func_keyring_search_takes_recurse], + [#include + key_ref_t tkey;], + [ + keyring_search(tkey, NULL, NULL, 0); + ], + [KEYRING_SEARCH_TAKES_RECURSE], + [define if your keyring_search has the recurse parameter], + []) +]) diff -Nru openafs-1.8.4~pre1/src/cf/summary.m4 openafs-1.8.5/src/cf/summary.m4 --- openafs-1.8.4~pre1/src/cf/summary.m4 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/cf/summary.m4 2019-10-22 21:30:17.000000000 +0000 @@ -59,7 +59,7 @@ *************************************************************** OpenAFS configure summary - version : ${VERSION} + version : ${PACKAGE_VERSION} sysname : ${AFS_SYSNAME} debug: diff -Nru openafs-1.8.4~pre1/src/config/Makefile.version-CML.in openafs-1.8.5/src/config/Makefile.version-CML.in --- openafs-1.8.4~pre1/src/config/Makefile.version-CML.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/config/Makefile.version-CML.in 2019-10-22 21:30:17.000000000 +0000 @@ -5,8 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -PACKAGE=@PACKAGE@ -VERSION=@VERSION@ +PACKAGE=@PACKAGE_TARNAME@ +VERSION=@PACKAGE_VERSION@ AFS_component_version_number.o: AFS_component_version_number.c $(TOP_SRCDIR)/config/mkvers version.xml version.txt: $(TOP_SRCDIR)/config/mkvers diff -Nru openafs-1.8.4~pre1/src/config/Makefile.version-NOCML.in openafs-1.8.5/src/config/Makefile.version-NOCML.in --- openafs-1.8.4~pre1/src/config/Makefile.version-NOCML.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/config/Makefile.version-NOCML.in 2019-10-22 21:30:17.000000000 +0000 @@ -5,12 +5,12 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -PACKAGE=@PACKAGE@ +PACKAGE=@PACKAGE_TARNAME@ AFS_component_version_number.o: AFS_component_version_number.c AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version - ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \ + ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@PACKAGE_VERSION@"` && \ if [ "$$SOURCE_DATE_EPOCH" ]; then \ echo 'char cml_version_number[]="@(#)OpenAFS '$$VERSION `date -u -d "@$$SOURCE_DATE_EPOCH" +"%Y-%m-%d" 2>/dev/null || date -u -r "$$SOURCE_DATE_EPOCH" +"%Y-%m-%d"`'";'; \ else \ @@ -22,7 +22,7 @@ rm -f AFS_component_version_number.c.NEW version.xml: - VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \ + VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@PACKAGE_VERSION@"` && \ echo '' >version.xml && \ echo '' >>version.xml && \ echo ''$$VERSION'' >>version.xml && \ diff -Nru openafs-1.8.4~pre1/src/config/NTMakefile.amd64_w2k openafs-1.8.5/src/config/NTMakefile.amd64_w2k --- openafs-1.8.4~pre1/src/config/NTMakefile.amd64_w2k 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/config/NTMakefile.amd64_w2k 2019-10-22 21:30:17.000000000 +0000 @@ -88,7 +88,7 @@ AFSPRODUCT_VER_MINOR=8 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=0400 +AFSPRODUCT_VER_PATCH=0500 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff -Nru openafs-1.8.4~pre1/src/config/NTMakefile.i386_nt40 openafs-1.8.5/src/config/NTMakefile.i386_nt40 --- openafs-1.8.4~pre1/src/config/NTMakefile.i386_nt40 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/config/NTMakefile.i386_nt40 2019-10-22 21:30:17.000000000 +0000 @@ -88,7 +88,7 @@ AFSPRODUCT_VER_MINOR=8 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=0400 +AFSPRODUCT_VER_PATCH=0500 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff -Nru openafs-1.8.4~pre1/src/config/NTMakefile.i386_w2k openafs-1.8.5/src/config/NTMakefile.i386_w2k --- openafs-1.8.4~pre1/src/config/NTMakefile.i386_w2k 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/config/NTMakefile.i386_w2k 2019-10-22 21:30:17.000000000 +0000 @@ -92,7 +92,7 @@ AFSPRODUCT_VER_MINOR=8 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=0400 +AFSPRODUCT_VER_PATCH=0500 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff -Nru openafs-1.8.4~pre1/src/packaging/MacOS/buildpkg.sh.in openafs-1.8.5/src/packaging/MacOS/buildpkg.sh.in --- openafs-1.8.4~pre1/src/packaging/MacOS/buildpkg.sh.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/packaging/MacOS/buildpkg.sh.in 2019-10-22 21:30:17.000000000 +0000 @@ -306,14 +306,14 @@ if [ $majorvers -ge 8 ]; then mv $CURDIR/OpenAFS-debug-extension.pkg $CURDIR/dmg fi - rm -rf $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg + rm -rf $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg cp $RESSRC/Uninstall $CURDIR/dmg/Uninstall.command cp $RESSRC/DS_Store $CURDIR/dmg/.DS_Store mkdir $CURDIR/dmg/.background cp $RESSRC/afslogo.jpg $CURDIR/dmg/.background # hdiutil create -srcfolder $CURDIR/dmg -volname OpenAFS -anyowners $CURDIR/OpenAFS.dmg hdiutil makehybrid -hfs -hfs-volume-name OpenAFS -hfs-openfolder $CURDIR/dmg $CURDIR/dmg -o $CURDIR/TMP.dmg - hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg + hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg rm $CURDIR/TMP.dmg rm -rf $CURDIR/dmg # Unfortunately, sudo sets $USER to root, so I can't chown the diff -Nru openafs-1.8.4~pre1/src/packaging/MacOS/OpenAFS-debug.Description.plist.in openafs-1.8.5/src/packaging/MacOS/OpenAFS-debug.Description.plist.in --- openafs-1.8.4~pre1/src/packaging/MacOS/OpenAFS-debug.Description.plist.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/packaging/MacOS/OpenAFS-debug.Description.plist.in 2019-10-22 21:30:17.000000000 +0000 @@ -9,6 +9,6 @@ IFPkgDescriptionTitle OpenAFS debug extension IFPkgDescriptionVersion - @VERSION@ + @PACKAGE_VERSION@ diff -Nru openafs-1.8.4~pre1/src/packaging/MacOS/OpenAFS.Description.plist.in openafs-1.8.5/src/packaging/MacOS/OpenAFS.Description.plist.in --- openafs-1.8.4~pre1/src/packaging/MacOS/OpenAFS.Description.plist.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/packaging/MacOS/OpenAFS.Description.plist.in 2019-10-22 21:30:17.000000000 +0000 @@ -9,6 +9,6 @@ IFPkgDescriptionTitle OpenAFS IFPkgDescriptionVersion - @VERSION@ + @PACKAGE_VERSION@ diff -Nru openafs-1.8.4~pre1/src/packaging/MacOS/OpenAFS.info.in openafs-1.8.5/src/packaging/MacOS/OpenAFS.info.in --- openafs-1.8.4~pre1/src/packaging/MacOS/OpenAFS.info.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/packaging/MacOS/OpenAFS.info.in 2019-10-22 21:30:17.000000000 +0000 @@ -1,5 +1,5 @@ Title OpenAFS -Version @VERSION@ +Version @PACKAGE_VERSION@ Description The OpenAFS distributed filesystem. This package installs a ready-to-run client for OpenAFS. See http://www.openafs.org for more information. DefaultLocation / Diskname (null) diff -Nru openafs-1.8.4~pre1/src/packaging/MacOS/pkgbuild.sh.in openafs-1.8.5/src/packaging/MacOS/pkgbuild.sh.in --- openafs-1.8.4~pre1/src/packaging/MacOS/pkgbuild.sh.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/packaging/MacOS/pkgbuild.sh.in 2019-10-22 21:30:17.000000000 +0000 @@ -426,7 +426,7 @@ rm -rf "$CURDIR"/OpenAFS-debug-extension.pkg /usr/bin/pkgbuild --root "$DPKGROOT" --id org.openafs.OpenAFS-debug.pkg \ - --version '@VERSION@' \ + --version '@PACKAGE_VERSION@' \ "$CURDIR"/OpenAFS-debug-extension.pkg cd "$RESSRC" @@ -445,7 +445,7 @@ rm -rf "$CURDIR"/OpenAFS-dist.pkg /usr/bin/pkgbuild --root "$PKGROOT" --id org.openafs.OpenAFS.pkg \ - --version '@VERSION@' \ + --version '@PACKAGE_VERSION@' \ --scripts "$PKGRES" "$CURDIR"/OpenAFS-dist.pkg rm -rf "$PKGRES" @@ -466,7 +466,7 @@ sed -e "s/%%OSX_MAJOR_CUR%%/$THISREL/g" \ -e "s/%%OSX_MAJOR_NEXT%%/$(( $THISREL + 1 ))/g" \ -e "s,%%PRES_EXTRA%%,$PRES_EXTRA,g" \ - -e "s/%%OPENAFS_VERSION%%/@VERSION@/g" \ + -e "s/%%OPENAFS_VERSION%%/@PACKAGE_VERSION@/g" \ < Distribution.xml.in > Distribution.xml rm -rf "$CURDIR/prod" @@ -484,7 +484,7 @@ rm -rf "$CURDIR/dmg" rm -f "$CURDIR/TMP.dmg" - rm -rf "$CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg" + rm -rf "$CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg" mkdir "$CURDIR"/dmg mv "$CURDIR"/OpenAFS.pkg "$CURDIR"/dmg @@ -500,8 +500,8 @@ hdiutil create -srcfolder "$CURDIR"/dmg -volname OpenAFS \ -o "$CURDIR"/TMP.dmg hdiutil convert -format UDZO "$CURDIR"/TMP.dmg \ - -o "$CURDIR/OpenAFS-@VERSION@-$RELNAME".dmg + -o "$CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME".dmg echo - echo "Created $CURDIR/OpenAFS-@VERSION@-$RELNAME".dmg + echo "Created $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME".dmg fi diff -Nru openafs-1.8.4~pre1/src/packaging/RedHat/openafs.spec.in openafs-1.8.5/src/packaging/RedHat/openafs.spec.in --- openafs-1.8.4~pre1/src/packaging/RedHat/openafs.spec.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/packaging/RedHat/openafs.spec.in 2019-10-22 21:30:17.000000000 +0000 @@ -1,6 +1,6 @@ # Openafs Spec $Revision$ -%define afsvers @VERSION@ +%define afsvers @PACKAGE_VERSION@ %define pkgvers @LINUX_PKGVER@ # for beta/rc releases make pkgrel 0. # for real releases make pkgrel 1 (or more for extra releases) diff -Nru openafs-1.8.4~pre1/src/rx/LINUX/rx_knet.c openafs-1.8.5/src/rx/LINUX/rx_knet.c --- openafs-1.8.4~pre1/src/rx/LINUX/rx_knet.c 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/rx/LINUX/rx_knet.c 2019-10-22 21:30:17.000000000 +0000 @@ -272,7 +272,7 @@ while (rxk_ListenerTask) { if (rxk_ListenerTask) { flush_signals(rxk_ListenerTask); - force_sig(SIGKILL, rxk_ListenerTask); + send_sig(SIGKILL, rxk_ListenerTask, 1); } if (!rxk_ListenerTask) break; diff -Nru openafs-1.8.4~pre1/src/rx/rx_kcommon.c openafs-1.8.5/src/rx/rx_kcommon.c --- openafs-1.8.4~pre1/src/rx/rx_kcommon.c 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/rx/rx_kcommon.c 2019-10-22 21:30:17.000000000 +0000 @@ -1201,6 +1201,7 @@ #ifdef AFS_LINUX20_ENV rxk_ListenerPid = current->pid; rxk_ListenerTask = current; + allow_signal(SIGKILL); /* Allowed, but blocked until shutdown */ #endif #ifdef AFS_SUN5_ENV rxk_ListenerPid = 1; /* No PID, just a flag that we're alive */ diff -Nru openafs-1.8.4~pre1/src/rxgen/rpc_parse.c openafs-1.8.5/src/rxgen/rpc_parse.c --- openafs-1.8.4~pre1/src/rxgen/rpc_parse.c 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/rxgen/rpc_parse.c 2019-10-22 21:30:17.000000000 +0000 @@ -1301,7 +1301,12 @@ static void ss_Proc_CodeGeneration(definition * defp) { - defp->can_fail = 0; + extern char zflag; + + if (zflag) + defp->can_fail = 0; + else + defp->can_fail = 1; ss_ProcName_setup(defp); if (!cflag) { ss_ProcParams_setup(defp); @@ -1430,8 +1435,6 @@ if (streq(string, structname(plist->pl.param_type))) { plist->pl.string_name = spec->sdef.string_name; plist->pl.param_flag |= FREETHIS_PARAM; - fprintf(fout, "\n\t%s.%s = 0;", plist->pl.param_name, - spec->sdef.string_name); } } } @@ -1446,22 +1449,13 @@ case REL_ARRAY: plist->pl.string_name = alloc(40); if (brief_flag) { - f_print(fout, "\n\t%s.val = 0;", - plist->pl.param_name); - f_print(fout, "\n\t%s.len = 0;", - plist->pl.param_name); s_print(plist->pl.string_name, "val"); } else { - f_print(fout, "\n\t%s.%s_val = 0;", - plist->pl.param_name, defp1->def_name); - f_print(fout, "\n\t%s.%s_len = 0;", - plist->pl.param_name, defp1->def_name); s_print(plist->pl.string_name, "%s_val", defp1->def_name); } break; case REL_POINTER: - f_print(fout, "\n\t%s = 0;", plist->pl.param_name); plist->pl.string_name = NULL; break; default: @@ -1477,13 +1471,19 @@ if (plist->component_kind == DEF_PARAM) { if (streq(defp1->def_name, structname(plist->pl.param_type))) { plist->pl.param_flag |= FREETHIS_PARAM; - fprintf(fout, "\n\tmemset(&%s, 0, sizeof(%s));", - plist->pl.param_name, defp1->def_name); } } } } + for (plist = defp->pc.plists; plist; plist = plist->next) { + if (plist->component_kind == DEF_PARAM) { + fprintf(fout, "\n\tmemset(&%s, 0, sizeof(%s));", + plist->pl.param_name, + plist->pl.param_name); + } + } + f_print(fout, "\n"); } @@ -1546,6 +1546,8 @@ f_print(fout, ");\n"); if (zflag) { f_print(fout, "\tif (z_result)\n\t\treturn z_result;\n"); + } else { + f_print(fout, "\tif (z_result)\n\t\tgoto fail;\n"); } } diff -Nru openafs-1.8.4~pre1/src/tests/run-tests.in openafs-1.8.5/src/tests/run-tests.in --- openafs-1.8.4~pre1/src/tests/run-tests.in 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/tests/run-tests.in 2019-10-22 21:30:17.000000000 +0000 @@ -28,8 +28,8 @@ objdir=`pwd` SHELL=/bin/sh SHELLVERBOSE= -VERSION=@VERSION@ -PACKAGE=@PACKAGE@ +VERSION=@PACKAGE_VERSION@ +PACKAGE=@PACKAGE_TARNAME@ host=@host@ RUNAS= FS=${AFSSRVBINDIR}/fs diff -Nru openafs-1.8.4~pre1/src/ubik/vote.c openafs-1.8.5/src/ubik/vote.c --- openafs-1.8.4~pre1/src/ubik/vote.c 2019-08-09 15:59:29.000000000 +0000 +++ openafs-1.8.5/src/ubik/vote.c 2019-10-22 21:30:17.000000000 +0000 @@ -441,10 +441,7 @@ if (ubik_currentTrans) { aparm->currentTrans = 1; - if (ubik_currentTrans->type == UBIK_WRITETRANS) - aparm->writeTrans = 1; - else - aparm->writeTrans = 0; + aparm->writeTrans = 1; } else { aparm->currentTrans = 0; } @@ -524,10 +521,7 @@ if (ubik_currentTrans) { aparm->currentTrans = 1; - if (ubik_currentTrans->type == UBIK_WRITETRANS) - aparm->writeTrans = 1; - else - aparm->writeTrans = 0; + aparm->writeTrans = 1; } else { aparm->currentTrans = 0; }