diff --git a/ChangeLog b/ChangeLog index e268aed..e4b82ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +commit ad37d5b186c7ea62c874546472a807310acf0e75 +Author: Stephan Wiesand +Date: Fri Apr 12 16:53:40 2019 +0200 + + Make OpenAFS 1.8.3 + + Update version strings for the 1.8.3 release. + + Change-Id: Ie8b29765e4f45bc3ddbe1aba9e31068da0bb54cf + Reviewed-on: https://gerrit.openafs.org/13546 + Tested-by: BuildBot + Reviewed-by: Michael Meffie + Reviewed-by: Stephan Wiesand + +commit 288c218fa96abd8c9ddb66bc6f6bc60a20311645 +Author: Stephan Wiesand +Date: Fri Apr 12 16:47:28 2019 +0200 + + Update NEWS for 1.8.3 + + Finalize the release notes for OpenAFS 1.8.3 + + Change-Id: I5b5eeedde53a1135c003302719cfdeca4f67e8fd + Reviewed-on: https://gerrit.openafs.org/13545 + Tested-by: BuildBot + Reviewed-by: Michael Meffie + Reviewed-by: Stephan Wiesand + commit dc16d6fffa69fe98e8bb338daea7b35ff59651c9 Author: Stephan Wiesand Date: Fri Jan 25 16:08:34 2019 +0100 diff --git a/RELNOTES-1.8.3pre1 b/RELNOTES-1.8.3 similarity index 98% rename from RELNOTES-1.8.3pre1 rename to RELNOTES-1.8.3 index 5feedbb..4cceaaa 100644 --- a/RELNOTES-1.8.3pre1 +++ b/RELNOTES-1.8.3 @@ -1,6 +1,6 @@ User-Visible OpenAFS Changes -OpenAFS 1.8.3 (in progress) +OpenAFS 1.8.3 All platforms diff --git a/dir_layout.patch b/dir_layout.patch index b3ec3c7..2f9e0bc 100644 --- a/dir_layout.patch +++ b/dir_layout.patch @@ -1,11 +1,17 @@ ---- openafs-1.8.2/src/cf/dirpaths.m4.orig 2019-01-16 11:16:56.160768067 +0100 -+++ openafs-1.8.2/src/cf/dirpaths.m4 2019-01-16 11:17:49.300846193 +0100 -@@ -21,7 +21,7 @@ +--- openafs-1.8.3/src/cf/dirpaths.m4.orig 2019-04-30 13:38:33.411870333 +0200 ++++ openafs-1.8.3/src/cf/dirpaths.m4 2019-04-30 13:48:06.182604169 +0200 +@@ -20,10 +20,10 @@ + afssrvbindir=${afssrvbindir='${bindir}'} afssrvsbindir=${afssrvsbindir='${sbindir}'} afssrvlibexecdir=${afssrvlibexecdir='${libexecdir}/openafs'} - afsdbdir=${afsdbdir='${localstatedir}/openafs/db'} +- afsdbdir=${afsdbdir='${localstatedir}/openafs/db'} - afslogsdir=${afslogsdir='${localstatedir}/openafs/logs'} +- afslocaldir=${afslocaldir='${localstatedir}/openafs'} +- afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'} ++ afsdbdir=${afsdbdir='/var/lib/openafs/db'} + afslogsdir=${afslogsdir='/var/log/openafs'} - afslocaldir=${afslocaldir='${localstatedir}/openafs'} - afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'} ++ afslocaldir=${afslocaldir='/var/lib/openafs'} ++ afsbackupdir=${afsbackupdir='/var/lib/openafs/backup'} afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'} + afsdatadir=${afsdatadir='${datadir}/openafs'} + fi diff --git a/openafs-1.8.3-doc.tar.bz2 b/openafs-1.8.3-doc.tar.bz2 new file mode 100644 index 0000000..82771b7 --- /dev/null +++ b/openafs-1.8.3-doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58da20546b5ad6ab8aebf3e701f13e61910a1a95f275bef762c319172c6c5593 +size 3845770 diff --git a/openafs-1.8.3-doc.tar.bz2.md5 b/openafs-1.8.3-doc.tar.bz2.md5 new file mode 100644 index 0000000..2d1207c --- /dev/null +++ b/openafs-1.8.3-doc.tar.bz2.md5 @@ -0,0 +1 @@ +a10f9d79400352cdec886308c1936b52 openafs-1.8.3-doc.tar.bz2 diff --git a/openafs-1.8.3-doc.tar.bz2.sha256 b/openafs-1.8.3-doc.tar.bz2.sha256 new file mode 100644 index 0000000..7096d3d --- /dev/null +++ b/openafs-1.8.3-doc.tar.bz2.sha256 @@ -0,0 +1 @@ +58da20546b5ad6ab8aebf3e701f13e61910a1a95f275bef762c319172c6c5593 openafs-1.8.3-doc.tar.bz2 diff --git a/openafs-1.8.3-src.tar.bz2 b/openafs-1.8.3-src.tar.bz2 new file mode 100644 index 0000000..a35d636 --- /dev/null +++ b/openafs-1.8.3-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ead9c16c50404b98b06e1d22fb6359880bfc6e93a6108a12e5e4e1c73b64cea5 +size 15082203 diff --git a/openafs-1.8.3-src.tar.bz2.md5 b/openafs-1.8.3-src.tar.bz2.md5 new file mode 100644 index 0000000..9d1d41e --- /dev/null +++ b/openafs-1.8.3-src.tar.bz2.md5 @@ -0,0 +1 @@ +1ede289bbfacf71dab09b20978b7e11a openafs-1.8.3-src.tar.bz2 diff --git a/openafs-1.8.3-src.tar.bz2.sha256 b/openafs-1.8.3-src.tar.bz2.sha256 new file mode 100644 index 0000000..ddbad01 --- /dev/null +++ b/openafs-1.8.3-src.tar.bz2.sha256 @@ -0,0 +1 @@ +ead9c16c50404b98b06e1d22fb6359880bfc6e93a6108a12e5e4e1c73b64cea5 openafs-1.8.3-src.tar.bz2 diff --git a/openafs-1.8.3pre1-doc.tar.bz2 b/openafs-1.8.3pre1-doc.tar.bz2 deleted file mode 100644 index 8924e1c..0000000 --- a/openafs-1.8.3pre1-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:495e09a585a63e645437ecf42d43d2cfde3874de6e9c1d90cc7e41deb6309acd -size 3846539 diff --git a/openafs-1.8.3pre1-doc.tar.bz2.md5 b/openafs-1.8.3pre1-doc.tar.bz2.md5 deleted file mode 100644 index e7377b3..0000000 --- a/openafs-1.8.3pre1-doc.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -c0f7a24287d38d48445dac2d59abcd85 openafs-1.8.3pre1-doc.tar.bz2 diff --git a/openafs-1.8.3pre1-doc.tar.bz2.sha256 b/openafs-1.8.3pre1-doc.tar.bz2.sha256 deleted file mode 100644 index 484ad3b..0000000 --- a/openafs-1.8.3pre1-doc.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -495e09a585a63e645437ecf42d43d2cfde3874de6e9c1d90cc7e41deb6309acd openafs-1.8.3pre1-doc.tar.bz2 diff --git a/openafs-1.8.3pre1-src.tar.bz2 b/openafs-1.8.3pre1-src.tar.bz2 deleted file mode 100644 index 5823f92..0000000 --- a/openafs-1.8.3pre1-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95aa3fa70117f34f52a03cdb8abdd99db84850c4fb1067ac7202b049e7f64c2e -size 15080848 diff --git a/openafs-1.8.3pre1-src.tar.bz2.md5 b/openafs-1.8.3pre1-src.tar.bz2.md5 deleted file mode 100644 index 551bed4..0000000 --- a/openafs-1.8.3pre1-src.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -f10b5048d256914d401c5b44f1533263 openafs-1.8.3pre1-src.tar.bz2 diff --git a/openafs-1.8.3pre1-src.tar.bz2.sha256 b/openafs-1.8.3pre1-src.tar.bz2.sha256 deleted file mode 100644 index e4b045a..0000000 --- a/openafs-1.8.3pre1-src.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -95aa3fa70117f34f52a03cdb8abdd99db84850c4fb1067ac7202b049e7f64c2e openafs-1.8.3pre1-src.tar.bz2 diff --git a/openafs-client.service b/openafs-client.service index 84e4485..30afaef 100644 --- a/openafs-client.service +++ b/openafs-client.service @@ -11,6 +11,7 @@ EnvironmentFile=/etc/sysconfig/openafs-client ExecStartPre=/sbin/modprobe libafs ExecStart=/usr/sbin/afsd $AFSD_ARGS ExecStartPost=/usr/bin/fs sysname $SYSNAME +ExecStartPost=/usr/bin/fs setcrypt $CRYPT ExecStop=/usr/bin/umount /afs ExecStop=/usr/sbin/afsd -shutdown ExecStop=/sbin/rmmod libafs diff --git a/openafs-fuse-client.service b/openafs-fuse-client.service index 38dded1..3a339e4 100644 --- a/openafs-fuse-client.service +++ b/openafs-fuse-client.service @@ -8,8 +8,9 @@ Before=remote-fs.target Type=forking RemainAfterExit=true EnvironmentFile=/etc/sysconfig/openafs-fuse-client -ExecStartPre=/bin/chmod 0644 /etc/openafs/CellServDB ExecStart=/usr/sbin/afsd.fuse $AFSD_ARGS +ExecStartPost=/usr/bin/fs sysname $SYSNAME +ExecStartPost=/usr/bin/fs setcrypt $CRYPT ExecStop=/usr/bin/umount /afs ExecStop=/usr/sbin/afsd.fuse -shutdown KillMode=none diff --git a/openafs.changes b/openafs.changes index dad23fc..f12bb52 100644 --- a/openafs.changes +++ b/openafs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 30 10:17:44 UTC 2019 - Christof Hanke + +- update to 1.8.3 +- Require krb5-client for package openafs-client +- fix broken directory layout +- fix broken post-install script +- allow crypt to be set/unset on startup of client +- clean up source-filenames + ------------------------------------------------------------------- Mon Mar 25 11:32:32 UTC 2019 - Jan Engelhardt diff --git a/openafs.spec b/openafs.spec index 9dce5a6..658a611 100644 --- a/openafs.spec +++ b/openafs.spec @@ -56,36 +56,35 @@ # used for %setup only # leave upstream tar-balls untouched for integrity checks. -%define upstream_version 1.8.3pre1 +%define upstream_version 1.8.3 Name: openafs -Version: 1.8.3~pre1 +Version: 1.8.3 Release: 0 Summary: OpenAFS Distributed File System License: IPL-1.0 Group: System/Filesystems Url: http://www.openafs.org/ -Source0: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2 -Source1: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2 -Source2: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.md5 -Source3: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.md5 -Source4: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.sha256 -Source5: http://www.openafs.org/dl/openafs/candidate/%{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 Source10: README.SUSE.openafs Source15: logrotate.openafs-server Source16: ld.conf.openafs Source18: RELNOTES-%{upstream_version} Source19: ChangeLog Source20: kernel-source.build-modules.sh -Source22: sysconfig.openafs-fuse-client Source23: openafs-client.service Source25: openafs-server.service Source26: openafs-fuse-client.service -Source27: sysconfig.openafs-client-systemd -Source28: sysconfig.openafs-server-systemd -Source29: sysconfig.openafs-fuse-client-systemd +Source27: sysconfig.openafs-client +Source28: sysconfig.openafs-server +Source29: sysconfig.openafs-fuse-client Source30: preamble Source55: openafs.SuidCells Source56: openafs.CellAlias @@ -260,6 +259,7 @@ Summary: OpenAFS File System Client Group: System/Filesystems Requires: %{name} = %{version} Requires: %{name}-kmp +Requires: krb5-client %description client AFS is a cross-platform distributed file system product pioneered at @@ -306,12 +306,10 @@ done %setup -q -n openafs-%{upstream_version} -T -b 0 -b 1 %patch3 -p1 +%patch4 -p1 %patch5 -p1 -%if %{run_regen} -%patch4 -p1 - ./regen.sh -%endif +./regen.sh %build # architecture specific settings @@ -641,14 +639,14 @@ fi %{fillup_only -n openafs-server} %service_add_post openafs-server.service -if [ "x$1" = "x" ]; then - my_operation=0 -else - my_operation=$1 -fi -if [ $my_operation -gt 1 ]; then +if [ "$FIRST_ARG" -gt 1 ]; then + # update no new install echo Not stopping the possibly running services. echo You must restart the service to put the upgrade into effect. + if [ -d /var/openafs ]; then + echo To upgrade, stop the server, copy the contents of /var/openafs to /var/lib/openafs, + echo remove the empty directory /var/openafs and then start the server again. + fi else echo For configuring the server, please check /etc/sysconfig/openafs-server echo and/or follow the instructions found on http://www.openafs.org to install an openafs-client. diff --git a/sysconfig.openafs-client-systemd b/sysconfig.openafs-client similarity index 70% rename from sysconfig.openafs-client-systemd rename to sysconfig.openafs-client index 4405486..06ff3d3 100644 --- a/sysconfig.openafs-client-systemd +++ b/sysconfig.openafs-client @@ -2,12 +2,16 @@ # startup options for the openAFS client. # see man afsd for details - AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" - # # sysname to set after startup # leave empty for default setting. SYSNAME="" + +# +# switch for encryption to be set after startup +# must be one of "on" or "off" + +CRYPT="on" diff --git a/sysconfig.openafs-fuse-client b/sysconfig.openafs-fuse-client index 8a51291..06ff3d3 100644 --- a/sysconfig.openafs-fuse-client +++ b/sysconfig.openafs-fuse-client @@ -1,145 +1,17 @@ -## Path: Network/File systems/AFS client -## Description: AFS client configuration, default mode -## This package is for the fuse-client -## Type: yesno -## Default: no # -# Set to "yes" if you want to generate CellServDB and ThisCell files -# from THIS_CELL and THIS_CELL_SERVER variables. -# If you want more complicated setting, set REGENERATE_CELL_INFO to "no" -# and edit the files manually. -# -REGENERATE_CELL_INFO="no" +# startup options for the openAFS client. +# see man afsd for details -## Type: string -## Default: "" -# -# This cell name -# -THIS_CELL="" +AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" -## Type: string -## Default: "" # -# IP address of afs server for this cell -# -THIS_CELL_SERVER="" +# sysname to set after startup +# leave empty for default setting. -## Type: string -## Default: "" -# -# DNS name of afs server for this cell -# -THIS_CELL_SERVER_NAME="" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to use data encription (secure, slower) -# -DATA_ENCRYPTION="yes" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to generate cacheinfo file -# -REGENERATE_CACHE_INFO="yes" - -## Type: string -## Default: "" -# -# AFS client configuration options -# -XXLARGE="-stat 8000 -daemons 6 -volumes 256 -files 50000" -XLARGE="-stat 3600 -daemons 5 -volumes 196 -files 50000" -LARGE="-stat 2800 -daemons 5 -volumes 128" -MEDIUM="-stat 2000 -daemons 3 -volumes 70" -SMALL="-stat 300 -daemons 2 -volumes 50" - -## Type: yesno -## Default: yes -# -# Instead of mounting the home cell's root.afs volume at the AFS mount -# point (typically /afs) a fake root is constructed from information -# available in the client's CellServDB. -# With this option enabled openafs can start up even on network outage. -# -DYNROOT="yes" - -## Type: yesno -## Default: yes -# -# Instead of calling a stat on a mountpoint to a foreign cell, -# return a faked status to the application. -# "ls -l /afs" is the most prominent example for its usefulness. -# -FAKESTAT="yes" - - -## Type: yesno -## Default: yes -# -# Instead of looking up database server in CellServDB try DNS first. -# With this option enabled openafs can access cells which are not in the packaged CellServDB-file, but -# which do provide the required DNS-information. -# -AFSDB="yes" - -## Type: yesno -## Default: yes -# -# use memory-only cache -# -MEMCACHE="yes" - -## Type: string(AUTOMATIC) -## Default: AUTOMATIC -# -# if you set CACHESIZE to "AUTOMATIC", it will automatically be chosen -# deduced by parition sizes (does not work if your cache is on / or -# /usr or /var) or by machine memory size for memory-only cache, -# otherwise the value in (1k-blocks) specified here will be used. -# -CACHESIZE="AUTOMATIC" - -## Type: string(AUTOMATIC,$XXLARGE,$XLARGE,$LARGE,$MEDIUM,$SMALL) -## Default: AUTOMATIC -# -# If you set OPTIONS to "AUTOMATIC", the init script will choose a set -# of options based on the cache size, otherwise the values specified here -# will be used. -# -OPTIONS="AUTOMATIC" - -## Type: string(/var/cache/openafs) -## Default: /var/cache/openafs -# -# Path to cache directory, it is recommended to use separate partition. -# It does not work on reiserfs. A valid directory must be specified -# even if memory only cache is used. -# Recommended cache directory is "/var/cache/openafs" -# -CACHEDIR="/var/cache/openafs" - -## Type: string(/afs) -## Default: /afs -# -# AFS directory. You should never need to change this -# -AFSDIR=/afs - -## Type: yesno -## Default: no -# -# Set to "yes" for a lot of debugging information from afsd. Only -# useful for debugging as it prints _a lot_ of information. -# -VERBOSE="no" - -## Type: string -## Default: "" -# -# SYSNAME of client. Used to expand the magic "@sys" in pathes within /afs. -# If left blank, the hardcoded sysname (e.g. amd64_linux26) will be used. SYSNAME="" + +# +# switch for encryption to be set after startup +# must be one of "on" or "off" + +CRYPT="on" diff --git a/sysconfig.openafs-fuse-client-systemd b/sysconfig.openafs-fuse-client-systemd deleted file mode 100644 index a41b8a6..0000000 --- a/sysconfig.openafs-fuse-client-systemd +++ /dev/null @@ -1,7 +0,0 @@ -# -# startup options for the openAFS client. -# see man afsd for details - - -AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" - diff --git a/sysconfig.openafs-server-systemd b/sysconfig.openafs-server similarity index 100% rename from sysconfig.openafs-server-systemd rename to sysconfig.openafs-server