From 365f7014530440468254fe7fc4bcc560d3d1ead1f32855c41642a94b693f9470 Mon Sep 17 00:00:00 2001 From: Christof Hanke Date: Fri, 10 Apr 2020 08:25:55 +0000 Subject: [PATCH] Accepting request 792909 from home:hauky:branches:filesystems_GA - update to HEAD of git branch openafs-stable-1_8_x. * 1.8.6pre2 is not out yet. * do not use source URLs, none are present * remove patch forward-to-1.8.6.pre1.patch - fix build of i586 with fix_timeval_i586.patch - update to pre-release 1.8.6pre1: forward-to-1.8.6.pre1.patch OBS-URL: https://build.opensuse.org/request/show/792909 OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=55 --- RELNOTES-1.8.5 | 29 -------------------------- RELNOTES-1.8.6~pre1a | 2 ++ fix_timeval_i586.patch | 13 ++++++++++++ openafs-1.8.5-doc.tar.bz2 | 3 --- openafs-1.8.5-doc.tar.bz2.md5 | 1 - openafs-1.8.5-doc.tar.bz2.sha256 | 1 - openafs-1.8.5-src.tar.bz2 | 3 --- openafs-1.8.5-src.tar.bz2.md5 | 1 - openafs-1.8.5-src.tar.bz2.sha256 | 1 - openafs-1.8.6~pre1a-doc.tar.bz2 | 3 +++ openafs-1.8.6~pre1a-doc.tar.bz2.md5 | 1 + openafs-1.8.6~pre1a-doc.tar.bz2.sha256 | 1 + openafs-1.8.6~pre1a-src.tar.bz2 | 3 +++ openafs-1.8.6~pre1a-src.tar.bz2.md5 | 1 + openafs-1.8.6~pre1a-src.tar.bz2.sha256 | 1 + openafs.changes | 14 +++++++++++++ openafs.spec | 29 +++++++++++++++++--------- 17 files changed, 58 insertions(+), 49 deletions(-) delete mode 100644 RELNOTES-1.8.5 create mode 100644 RELNOTES-1.8.6~pre1a create mode 100644 fix_timeval_i586.patch delete mode 100644 openafs-1.8.5-doc.tar.bz2 delete mode 100644 openafs-1.8.5-doc.tar.bz2.md5 delete mode 100644 openafs-1.8.5-doc.tar.bz2.sha256 delete mode 100644 openafs-1.8.5-src.tar.bz2 delete mode 100644 openafs-1.8.5-src.tar.bz2.md5 delete mode 100644 openafs-1.8.5-src.tar.bz2.sha256 create mode 100644 openafs-1.8.6~pre1a-doc.tar.bz2 create mode 100644 openafs-1.8.6~pre1a-doc.tar.bz2.md5 create mode 100644 openafs-1.8.6~pre1a-doc.tar.bz2.sha256 create mode 100644 openafs-1.8.6~pre1a-src.tar.bz2 create mode 100644 openafs-1.8.6~pre1a-src.tar.bz2.md5 create mode 100644 openafs-1.8.6~pre1a-src.tar.bz2.sha256 diff --git a/RELNOTES-1.8.5 b/RELNOTES-1.8.5 deleted file mode 100644 index 2d715b9..0000000 --- a/RELNOTES-1.8.5 +++ /dev/null @@ -1,29 +0,0 @@ - User-Visible OpenAFS Changes - -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. - diff --git a/RELNOTES-1.8.6~pre1a b/RELNOTES-1.8.6~pre1a new file mode 100644 index 0000000..510e00c --- /dev/null +++ b/RELNOTES-1.8.6~pre1a @@ -0,0 +1,2 @@ +This is a current checkout of the branch origin/openafs-stable-1_8_x. +This file will be updated once a proper release is made. diff --git a/fix_timeval_i586.patch b/fix_timeval_i586.patch new file mode 100644 index 0000000..3ba5256 --- /dev/null +++ b/fix_timeval_i586.patch @@ -0,0 +1,13 @@ +diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h +index 5e21cfdd2..807062066 100644 +--- a/src/afs/afs_osi.h ++++ b/src/afs/afs_osi.h +@@ -177,7 +177,7 @@ extern void osi_AttachVnode(struct vcache *, int seq); + * In 64 bit HP-UX the timeval structure has a 64 bit member. + */ + +-#if defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL) || (defined(AFS_SGI61_ENV) && defined(KERNEL) && defined(_K64U64)) ++#if defined(AFS_HPUX_ENV) || defined(AFS_LINUX26_ENV) || (defined(AFS_SGI61_ENV) && defined(KERNEL) && defined(_K64U64)) + typedef struct { + afs_int32 tv_sec; + afs_int32 tv_usec; diff --git a/openafs-1.8.5-doc.tar.bz2 b/openafs-1.8.5-doc.tar.bz2 deleted file mode 100644 index 5dddb41..0000000 --- a/openafs-1.8.5-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3abab824485429674b8f60b228c35d77667f55ca2848388356ee4581811daf22 -size 3801635 diff --git a/openafs-1.8.5-doc.tar.bz2.md5 b/openafs-1.8.5-doc.tar.bz2.md5 deleted file mode 100644 index 83cbbe5..0000000 --- a/openafs-1.8.5-doc.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -313dc4d38e5fffbbb6322d90c10c7292 /home/kaduk/openafs/1.8.5/openafs-1.8.5-doc.tar.bz2 diff --git a/openafs-1.8.5-doc.tar.bz2.sha256 b/openafs-1.8.5-doc.tar.bz2.sha256 deleted file mode 100644 index 663ad9c..0000000 --- a/openafs-1.8.5-doc.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -3abab824485429674b8f60b228c35d77667f55ca2848388356ee4581811daf22 openafs-1.8.5-doc.tar.bz2 diff --git a/openafs-1.8.5-src.tar.bz2 b/openafs-1.8.5-src.tar.bz2 deleted file mode 100644 index 5fd5f1c..0000000 --- a/openafs-1.8.5-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eeded68f238be2d6fc37522b7feae5e0b1ea9815b90ea5da91e5d43e00b28523 -size 15089716 diff --git a/openafs-1.8.5-src.tar.bz2.md5 b/openafs-1.8.5-src.tar.bz2.md5 deleted file mode 100644 index fa0f243..0000000 --- a/openafs-1.8.5-src.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -3c41e2a512a41eb9ee3377339fb9d6d0 /home/kaduk/openafs/1.8.5/openafs-1.8.5-src.tar.bz2 diff --git a/openafs-1.8.5-src.tar.bz2.sha256 b/openafs-1.8.5-src.tar.bz2.sha256 deleted file mode 100644 index aa0f81a..0000000 --- a/openafs-1.8.5-src.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -eeded68f238be2d6fc37522b7feae5e0b1ea9815b90ea5da91e5d43e00b28523 openafs-1.8.5-src.tar.bz2 diff --git a/openafs-1.8.6~pre1a-doc.tar.bz2 b/openafs-1.8.6~pre1a-doc.tar.bz2 new file mode 100644 index 0000000..099a632 --- /dev/null +++ b/openafs-1.8.6~pre1a-doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df18842c67585387a1f73892b6c652ece452b9040d9210c5ba62f5be117bd5ee +size 3511018 diff --git a/openafs-1.8.6~pre1a-doc.tar.bz2.md5 b/openafs-1.8.6~pre1a-doc.tar.bz2.md5 new file mode 100644 index 0000000..0e1917c --- /dev/null +++ b/openafs-1.8.6~pre1a-doc.tar.bz2.md5 @@ -0,0 +1 @@ +dc7934136e10333da8bc25f99413ebd5 openafs-1.8.6~pre1a-doc.tar.bz2 diff --git a/openafs-1.8.6~pre1a-doc.tar.bz2.sha256 b/openafs-1.8.6~pre1a-doc.tar.bz2.sha256 new file mode 100644 index 0000000..f8fba14 --- /dev/null +++ b/openafs-1.8.6~pre1a-doc.tar.bz2.sha256 @@ -0,0 +1 @@ +df18842c67585387a1f73892b6c652ece452b9040d9210c5ba62f5be117bd5ee openafs-1.8.6~pre1a-doc.tar.bz2 diff --git a/openafs-1.8.6~pre1a-src.tar.bz2 b/openafs-1.8.6~pre1a-src.tar.bz2 new file mode 100644 index 0000000..7c888b3 --- /dev/null +++ b/openafs-1.8.6~pre1a-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19da9f96b01a78c4c268b24991754d50ebc61a2977d189316ace2f7d7a56c541 +size 14982628 diff --git a/openafs-1.8.6~pre1a-src.tar.bz2.md5 b/openafs-1.8.6~pre1a-src.tar.bz2.md5 new file mode 100644 index 0000000..069e980 --- /dev/null +++ b/openafs-1.8.6~pre1a-src.tar.bz2.md5 @@ -0,0 +1 @@ +85bedac1234b2e7aaf398b62ce153e63 openafs-1.8.6~pre1a-src.tar.bz2 diff --git a/openafs-1.8.6~pre1a-src.tar.bz2.sha256 b/openafs-1.8.6~pre1a-src.tar.bz2.sha256 new file mode 100644 index 0000000..a5ac579 --- /dev/null +++ b/openafs-1.8.6~pre1a-src.tar.bz2.sha256 @@ -0,0 +1 @@ +19da9f96b01a78c4c268b24991754d50ebc61a2977d189316ace2f7d7a56c541 openafs-1.8.6~pre1a-src.tar.bz2 diff --git a/openafs.changes b/openafs.changes index 8f1501c..e7a3716 100644 --- a/openafs.changes +++ b/openafs.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Apr 10 06:36:58 UTC 2020 - Christof Hanke + +- update to HEAD of git branch openafs-stable-1_8_x. + * 1.8.6pre2 is not out yet. + * disable source URLs, none are present + * remove patch forward-to-1.8.6.pre1.patch +- fix build of i586 with fix_timeval_i586.patch + +------------------------------------------------------------------- +Thu Apr 2 06:08:09 UTC 2020 - Christof Hanke + +- update to pre-release 1.8.6pre1: forward-to-1.8.6.pre1.patch + ------------------------------------------------------------------- Wed Oct 23 13:48:04 UTC 2019 - Christof Hanke diff --git a/openafs.spec b/openafs.spec index 0c9999b..40b64b8 100644 --- a/openafs.spec +++ b/openafs.spec @@ -1,7 +1,7 @@ # # spec file for package openafs # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -57,23 +57,29 @@ # used for %setup only # leave upstream tar-balls untouched for integrity checks. -%define upstream_version 1.8.5 +%define upstream_version 1.8.6~pre1a Name: openafs -Version: 1.8.5 +Version: 1.8.6~pre1a Release: 0 Summary: OpenAFS Distributed File System License: IPL-1.0 Group: System/Filesystems -Url: http://www.openafs.org/ +URL: http://www.openafs.org/ -Source0: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2 -Source1: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2 -Source2: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.md5 -Source3: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.md5 -Source4: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.sha256 -Source5: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.sha256 +#Source0: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2 +#Source1: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2 +#Source2: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.md5 +#Source3: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.md5 +#Source4: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.sha256 +#Source5: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.sha256 +Source0: openafs-%{version}-src.tar.bz2 +Source1: openafs-%{version}-doc.tar.bz2 +Source2: openafs-%{version}-src.tar.bz2.md5 +Source3: openafs-%{version}-doc.tar.bz2.md5 +Source4: openafs-%{version}-src.tar.bz2.sha256 +Source5: openafs-%{version}-doc.tar.bz2.sha256 Source10: README.SUSE.openafs Source15: logrotate.openafs-server Source16: ld.conf.openafs @@ -98,6 +104,8 @@ Patch3: dir_layout.patch Patch4: openafs-1.8.x.ncurses6.patch # PATCH-SUSE-SPECIFIC make KMP work again Patch5: add_arch_to_linux_kernel_make.patch +# PATCH-FIX-i586-BUILD +Patch99: fix_timeval_i586.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -309,6 +317,7 @@ done %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch99 -p1 ./regen.sh