Revert "Revert "Update Jammy to 1.8.9""
This reverts commit 3134cbe95917482388ba2cd11e7544e9ae7abca8. We inadverdently merged jammy into master and we don't want to pollute master with any specific branch content. Revert it out. Change-Id: I9c8453b294bad96daed4d2ba590a6f36bc142773
This commit is contained in:
Clark Boylan
parent
ae3e3092e6
commit
3c978d8bca
41
debian/changelog
vendored
41
debian/changelog
vendored
@ -1,9 +1,46 @@
|
||||
openafs (1.8.8.1-2~ppa1~jammy) jammy; urgency=medium
|
||||
openafs (1.8.9-1~ppa1~jammy) jammy; urgency=medium
|
||||
|
||||
* Build for OpenDev PPA.
|
||||
* Backport for Jammy PPA
|
||||
* Remove DKMS module changes from 1.8.9-1
|
||||
|
||||
-- Ian Wienand <iwienand@redhat.com> Wed, 04 May 2022 20:29:00 +0000
|
||||
|
||||
openafs (1.8.9-1ubuntu1) lunar; urgency=medium
|
||||
|
||||
* Linux 6.0+ FTBFS (LP: #2007263)
|
||||
|
||||
-- Paolo Pisati <paolo.pisati@canonical.com> Fri, 17 Feb 2023 10:42:20 +0000
|
||||
|
||||
openafs (1.8.9-1) unstable; urgency=medium
|
||||
|
||||
[ Benjamin Kaduk ]
|
||||
* New upstream release:
|
||||
- Support kernels up to 6.0.
|
||||
- Avoid delays in certain scenarios.
|
||||
- Detect invalid RPC inputs for FetchData RPCs to prevent volumes from
|
||||
unnecessarily being taken offline.
|
||||
|
||||
[ Alejandro R. Sedeño ]
|
||||
* Do not build DKMS module on PREEMPT_RT kernels.
|
||||
|
||||
-- Benjamin Kaduk <kaduk@mit.edu> Thu, 22 Dec 2022 10:37:54 -0800
|
||||
|
||||
openafs (1.8.8.1-3) unstable; urgency=low
|
||||
|
||||
[ Andreas Beckmann ]
|
||||
* Switch to B-D: dh-dkms.
|
||||
* Declare Testsuite: autopkgtest-pkg-dkms.
|
||||
|
||||
[ Benjamin Kaduk ]
|
||||
* Import upstream patches to support linux through 5.18 (Closes: #1010764)
|
||||
- This will change kernels from 5.8 through 5.17 to use the "readahead"
|
||||
interface rather than "readpages".
|
||||
- This imports some code from autoconf-archive and updates
|
||||
debian/copyright to list the new license/files.
|
||||
* Bump Standards-Version to 4.6.1 (no changes needed)
|
||||
|
||||
-- Benjamin Kaduk <kaduk@mit.edu> Mon, 20 Jun 2022 15:54:55 -0700
|
||||
|
||||
openafs (1.8.8.1-2) unstable; urgency=medium
|
||||
|
||||
* Skip unit test that fails on the buildds by virtue of using a
|
||||
|
||||
5
debian/control
vendored
5
debian/control
vendored
@ -1,7 +1,8 @@
|
||||
Source: openafs
|
||||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Benjamin Kaduk <kaduk@mit.edu>
|
||||
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
XSBC-Original-Maintainer: Benjamin Kaduk <kaduk@mit.edu>
|
||||
Uploaders: Sam Hartman <hartmans@debian.org>, Anders Kaseorg <andersk@mit.edu>
|
||||
Build-Depends: debhelper, debhelper-compat (= 12), autoconf, automake, bison,
|
||||
comerr-dev, cpio, flex, libfuse-dev, libkrb5-dev, libncurses5-dev,
|
||||
@ -9,7 +10,7 @@ Build-Depends: debhelper, debhelper-compat (= 12), autoconf, automake, bison,
|
||||
libtool, heimdal-multidev (>= 1.7~git20150920)
|
||||
Build-Depends-Indep: dblatex, dkms (>= 2.1.1.1), docbook-xsl, doxygen (>= 1.8.4-1~),
|
||||
xsltproc
|
||||
Standards-Version: 4.6.0
|
||||
Standards-Version: 4.6.1
|
||||
Homepage: http://www.openafs.org/
|
||||
Vcs-Git: https://salsa.debian.org/debian/openafs.git
|
||||
Vcs-Browser: https://salsa.debian.org/debian/openafs
|
||||
|
||||
15
debian/copyright
vendored
15
debian/copyright
vendored
@ -514,3 +514,18 @@ tests/common/misc.c is subject to the following license:
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
====================================================
|
||||
|
||||
The files under src/external/autoconf-archive/m4/ are covered by the following
|
||||
license:
|
||||
|
||||
Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
|
||||
Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
|
||||
Copyright (c) 2013 Gabriele Svelto <gabriele.svelto@gmail.com>
|
||||
Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
Copying and distribution of this file, with or without modification, are
|
||||
permitted in any medium without royalty provided the copyright notice
|
||||
and this notice are preserved. This file is offered as-is, without any
|
||||
warranty.
|
||||
|
||||
97
debian/patches/0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch
vendored
Normal file
97
debian/patches/0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch
vendored
Normal file
@ -0,0 +1,97 @@
|
||||
From: Michael Meffie <mmeffie@sinenomine.net>
|
||||
Date: Fri, 10 Jan 2020 10:54:20 -0500
|
||||
Subject: tests: skip vos tests when a vlserver is already running
|
||||
|
||||
The vos tests start a temporary vlserver process, which is problematic
|
||||
when the local system already has an installed vlserver. Attempt to
|
||||
temporarily bind a socket to the vlserver port, and if unable to bind
|
||||
with an EADDRINUSE error, assume the vlserver is already running and
|
||||
skip these tests.
|
||||
|
||||
Change-Id: I1dd3bc4c7ebcd2c7bffc8aca422222a50058090e
|
||||
Reviewed-on: https://gerrit.openafs.org/14021
|
||||
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
|
||||
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
|
||||
Tested-by: BuildBot <buildbot@rampaginggeek.com>
|
||||
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
|
||||
(cherry picked from commit bf1b3e2fc12a7502cfd74eb109eeb7131f7230d3)
|
||||
---
|
||||
tests/common/common.h | 1 +
|
||||
tests/common/network.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
||||
tests/volser/vos-t.c | 2 ++
|
||||
3 files changed, 44 insertions(+)
|
||||
|
||||
diff --git a/tests/common/common.h b/tests/common/common.h
|
||||
index b976683..e1a407c 100644
|
||||
--- a/tests/common/common.h
|
||||
+++ b/tests/common/common.h
|
||||
@@ -55,6 +55,7 @@ extern int afstest_GetUbikClient(struct afsconf_dir *dir, char *service,
|
||||
extern int afstest_IsLoopbackNetworkDefault(void);
|
||||
extern int afstest_SkipTestsIfLoopbackNetIsDefault(void);
|
||||
extern void afstest_SkipTestsIfBadHostname(void);
|
||||
+extern void afstest_SkipTestsIfServerRunning(char *name);
|
||||
|
||||
/* misc.c */
|
||||
extern char *afstest_GetProgname(char **argv);
|
||||
diff --git a/tests/common/network.c b/tests/common/network.c
|
||||
index 474fc61..c664505 100644
|
||||
--- a/tests/common/network.c
|
||||
+++ b/tests/common/network.c
|
||||
@@ -61,3 +61,44 @@ afstest_SkipTestsIfBadHostname(void)
|
||||
if (!host)
|
||||
skip_all("Can't resolve hostname %s\n", hostname);
|
||||
}
|
||||
+
|
||||
+/*!
|
||||
+ * Skips all TAP tests if a server is already running on this system.
|
||||
+ *
|
||||
+ * \param name[in] IANA service name, e.g. "afs3-vlserver"
|
||||
+ */
|
||||
+void
|
||||
+afstest_SkipTestsIfServerRunning(char *name)
|
||||
+{
|
||||
+ afs_int32 code;
|
||||
+ osi_socket sock;
|
||||
+ struct sockaddr_in addr;
|
||||
+ afs_int32 service;
|
||||
+
|
||||
+ service = afsconf_FindService(name);
|
||||
+ if (service == -1) {
|
||||
+ fprintf(stderr, "Unknown service name: %s\n", name);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
||||
+ if (sock == OSI_NULLSOCKET) {
|
||||
+ fprintf(stderr, "Failed to get socket file descriptor.\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ addr.sin_family = AF_INET;
|
||||
+ addr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
+ addr.sin_port = service; /* Already in network byte order. */
|
||||
+#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
|
||||
+ addr.sin_len = sizeof(addr);
|
||||
+#endif
|
||||
+ code = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
|
||||
+ if (code < 0) {
|
||||
+ if (errno == EADDRINUSE) {
|
||||
+ skip_all("Service %s is already running.\n", name);
|
||||
+ } else {
|
||||
+ perror("bind");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ }
|
||||
+ close(sock);
|
||||
+}
|
||||
diff --git a/tests/volser/vos-t.c b/tests/volser/vos-t.c
|
||||
index 41e74bd..382fbed 100644
|
||||
--- a/tests/volser/vos-t.c
|
||||
+++ b/tests/volser/vos-t.c
|
||||
@@ -106,6 +106,8 @@ main(int argc, char **argv)
|
||||
afstest_SkipTestsIfBadHostname();
|
||||
/* Skip all tests if the current hostname is on the loopback network */
|
||||
afstest_SkipTestsIfLoopbackNetIsDefault();
|
||||
+ /* Skip all tests if a vlserver is already running on this system. */
|
||||
+ afstest_SkipTestsIfServerRunning("afs3-vlserver");
|
||||
|
||||
plan(6);
|
||||
|
||||
82
debian/patches/0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch
vendored
Normal file
82
debian/patches/0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch
vendored
Normal file
@ -0,0 +1,82 @@
|
||||
From cfac0df9cd7152be2672c665442aac84215494d6 Mon Sep 17 00:00:00 2001
|
||||
From: Cheyenne Wills <cwills@sinenomine.net>
|
||||
Date: Wed, 14 Dec 2022 13:40:48 -0700
|
||||
Subject: [PATCH] Linux: Replace lru_cache_add with folio_add_lru
|
||||
|
||||
The Linux 6.2 commit:
|
||||
"folio-compat: remove lru_cache_add()" (6e1ca48d0)
|
||||
removed the lru_cache_add() function (which was introduced in Linux 5.8)
|
||||
|
||||
The replacement function is folio_add_lru(), which was introduced with
|
||||
the Linux 5.16 commit:
|
||||
"mm/lru: Add folio_add_lru()" (0d31125d2d)
|
||||
|
||||
Change-Id: I4615e6bde0253618c13ec1eb067e23b2c3e3ff42
|
||||
Reviewed-on: https://gerrit.openafs.org/15227
|
||||
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
|
||||
Tested-by: Benjamin Kaduk <kaduk@mit.edu>
|
||||
---
|
||||
src/afs/LINUX/osi_vnodeops.c | 10 +++++++---
|
||||
src/cf/linux-kernel-func.m4 | 7 +++++++
|
||||
2 files changed, 14 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
|
||||
index e9ac9e3a2..89e85e9c2 100644
|
||||
--- a/src/afs/LINUX/osi_vnodeops.c
|
||||
+++ b/src/afs/LINUX/osi_vnodeops.c
|
||||
@@ -32,7 +32,7 @@
|
||||
#endif
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/writeback.h>
|
||||
-#if defined(HAVE_LINUX_LRU_CACHE_ADD_FILE)
|
||||
+#if defined(HAVE_LINUX_FOLIO_ADD_LRU) || defined(HAVE_LINUX_LRU_CACHE_ADD_FILE)
|
||||
# include <linux/swap.h>
|
||||
#else
|
||||
# include <linux/pagevec.h>
|
||||
@@ -78,7 +78,8 @@ extern struct vcache *afs_globalVp;
|
||||
|
||||
/* Handle interfacing with Linux's pagevec/lru facilities */
|
||||
|
||||
-#if defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) || defined(HAVE_LINUX_LRU_CACHE_ADD)
|
||||
+#if defined(HAVE_LINUX_FOLIO_ADD_LRU) || \
|
||||
+ defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) || defined(HAVE_LINUX_LRU_CACHE_ADD)
|
||||
|
||||
/*
|
||||
* Linux's lru_cache_add_file provides a simplified LRU interface without
|
||||
@@ -97,7 +98,10 @@ afs_lru_cache_init(struct afs_lru_pages *alrupages)
|
||||
static inline void
|
||||
afs_lru_cache_add(struct afs_lru_pages *alrupages, struct page *page)
|
||||
{
|
||||
-# if defined(HAVE_LINUX_LRU_CACHE_ADD)
|
||||
+# if defined(HAVE_LINUX_FOLIO_ADD_LRU)
|
||||
+ struct folio *folio = page_folio(page);
|
||||
+ folio_add_lru(folio);
|
||||
+# elif defined(HAVE_LINUX_LRU_CACHE_ADD)
|
||||
lru_cache_add(page);
|
||||
# elif defined(HAVE_LINUX_LRU_CACHE_ADD_FILE)
|
||||
lru_cache_add_file(page);
|
||||
diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4
|
||||
index 504c73122..a53c186a8 100644
|
||||
--- a/src/cf/linux-kernel-func.m4
|
||||
+++ b/src/cf/linux-kernel-func.m4
|
||||
@@ -173,10 +173,17 @@ AC_CHECK_LINUX_FUNC([in_compat_syscall],
|
||||
|
||||
dnl lru_cache_add exported in Linux 5.8
|
||||
dnl replaces lru_cache_add_file
|
||||
+dnl removed in linux 6.1. folio_add_lru is a replacement
|
||||
AC_CHECK_LINUX_FUNC([lru_cache_add],
|
||||
[#include <linux/swap.h>],
|
||||
[lru_cache_add(NULL);])
|
||||
|
||||
+dnl Linux 5.16 added folio_add_lru as a replacement for
|
||||
+dnl lru_cache_add
|
||||
+AC_CHECK_LINUX_FUNC([folio_add_lru],
|
||||
+ [#include <linux/swap.h>],
|
||||
+ [folio_add_lru(NULL);])
|
||||
+
|
||||
dnl Linux 5.8 replaced kernel_setsockopt with helper functions
|
||||
dnl e.g. ip_sock_set_mtu_discover, ip_sock_set_recverr
|
||||
AC_CHECK_LINUX_FUNC([ip_sock_set],
|
||||
--
|
||||
2.38.1
|
||||
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -1,3 +1,5 @@
|
||||
0003-Catch-up-to-roken-s-rename-of-base64-symbols.patch
|
||||
0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch
|
||||
0007-Temporarily-disable-flaky-test.patch
|
||||
0004-Disable-rx-perf-test.patch
|
||||
0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
# sources. If bumping the vesion here, look in the script below
|
||||
# to switch between downloading or creating.
|
||||
|
||||
VERSION=1.8.8.1
|
||||
VERSION=1.8.9
|
||||
|
||||
echo "${VERSION}" > version
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user