diff --git a/nvchecker.json b/nvchecker.json index 77c1777..34ac5ce 100644 --- a/nvchecker.json +++ b/nvchecker.json @@ -96,10 +96,7 @@ "url": "https://github.com/braice/MuMuDVB/releases/tag/2.1.0" }, "openafs": { - "version": "openafs-stable-1_8_12", - "gitref": "refs/tags/openafs-stable-1_8_12", - "revision": "84c867efb7961bf285f7547d6669d7068344958c", - "url": "https://github.com/openafs/openafs/releases/tag/openafs-stable-1_8_12" + "version": "openafs-stable-1_8_12_1" }, "pidgin-latex": { "version": "1.5.0" diff --git a/nvchecker.toml b/nvchecker.toml index 1f1e5e0..0f3e8b5 100644 --- a/nvchecker.toml +++ b/nvchecker.toml @@ -122,10 +122,13 @@ github = "braice/MuMuDVB" use_max_tag = true [openafs] -source = "github" -github = "openafs/openafs" -use_max_tag = true -exclude_regex = ".*pre[0-9]+" +#source = "github" +#github = "openafs/openafs" +#use_max_tag = true +#exclude_regex = ".*pre[0-9]+" +source = "jq" +url = "https://api.github.com/repos/openafs/openafs/git/refs/tags" +filter = '[.[] | select (.ref | test ("^refs/tags/openafs-stable-[0-9]+(_[0-9]+)*$"))] | .[-1].ref | split ("/") | .[-1]' [pidgin-latex] source = "regex" diff --git a/openafs-modules-dkms/.SRCINFO b/openafs-modules-dkms/.SRCINFO index 42cd30c..43d094e 100644 --- a/openafs-modules-dkms/.SRCINFO +++ b/openafs-modules-dkms/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = openafs-modules-dkms pkgdesc = Kernel module for OpenAFS (dkms) - pkgver = 1.8.12 + pkgver = 1.8.12.1 pkgrel = 1 url = http://www.openafs.org arch = i686 @@ -10,24 +10,14 @@ pkgbase = openafs-modules-dkms depends = dkms depends = libelf depends = openafs - provides = openafs-modules=1.8.12 + provides = openafs-modules=1.8.12.1 conflicts = openafs-features-libafs conflicts = openafs-modules conflicts = openafs<1.6.6-2 options = !emptydirs - source = http://openafs.org/dl/openafs/1.8.12/openafs-1.8.12-src.tar.bz2 - source = 0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch - source = 0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch - source = 0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch - source = 0004-afs-avoid-empty-body-warning.patch - source = 0005-Linux-6.10-Move-inline-before-func-return-type.patch + source = http://openafs.org/dl/openafs/1.8.12.1/openafs-1.8.12.1-src.tar.bz2 source = dkms.conf - sha256sums = 10fea6810c6c0b00ffb2cd3f38ed732c17cfd7955ca0954dc24a2a6172a26e75 - sha256sums = 9e6605fd9f045b85d28d6b275e7f77f93d991cb266f10877d5e4b820322b2e13 - sha256sums = fd4fe8f2a1cd99c239a4bf42f600fcec5399206395c72297631dcfb7b8b7302a - sha256sums = 40cc3b6588c9bfab6d1eb8f0785952791b728f0c2bb17a35ee0d3084afd36aeb - sha256sums = c5287bf9f467af7e7db37dbe193f53983b955a32117018d7984b9a75fee79af5 - sha256sums = 60104dc7d8418829f2e5670783f1a7548e22f717673a1a312ed455c464d6116e + sha256sums = dfe2f39bef9fb3d6791d602e725be7c34b885e4299018266ff9743cb401e594a sha256sums = 5ea5e184f9b44f5ed45817d2b5a10149d15c8c54f49e0b5b4b773652673cb9b0 pkgname = openafs-modules-dkms diff --git a/openafs-modules-dkms/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch b/openafs-modules-dkms/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch deleted file mode 100644 index 12f4803..0000000 --- a/openafs-modules-dkms/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e846b6d15a6f6cd0a5b4c3c4d6cbe7b01ab7c7e6 Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 14:13:59 -0600 -Subject: [PATCH 1/5] Linux-6.10: Use filemap_alloc_folio when avail - -The Linux 6.10 commit: - "mm: remove page_cache_alloc()" (3f2ae4ebd5) -removed the page_cache_alloc(), with a note that callers would be using -filemap_alloc_folio instead. - -The function filemap_alloc_folio() was introduced in Linux 5.15 commit: - "mm/filemap: Add filemap_alloc_folio" (bb3c579e25) - -Add a configure check for filemap_alloc_folio and update the function -afs_linux_read_cache() to use a wrapper that calls filemap_alloc_folio() -if available otherwise calls page_cache_alloc(). - -Minor whitespace/style cleanup - -Note: The function filemap_alloc_folio() was introduced in Linux 5.15, -so this change affects builds using the Linux kernel 5.15 and later. - -Change-Id: Ia17aefc38fe9787e54b315c864da726d610b8bb9 -Reviewed-on: https://gerrit.openafs.org/15764 -Tested-by: BuildBot -Reviewed-by: Andrew Deason -Reviewed-by: Michael Meffie ---- - src/afs/LINUX/osi_vnodeops.c | 27 +++++++++++++++++++++++---- - src/cf/linux-kernel-func.m4 | 10 ++++++++++ - 2 files changed, 33 insertions(+), 4 deletions(-) - -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index b709ad1a5..0e92215cb 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -2331,6 +2331,24 @@ mapping_read_page(struct address_space *mapping, struct page *page) - #endif - } - -+/* -+ * small compat wrapper for filemap_alloc_folio/page_cache_alloc -+ */ -+static struct page * -+afs_page_cache_alloc(struct address_space *cachemapping) -+{ -+#if defined(HAVE_LINUX_FILEMAP_ALLOC_FOLIO) -+ struct folio *folio; -+ folio = filemap_alloc_folio(mapping_gfp_mask(cachemapping), 0); -+ if (folio == NULL) { -+ return NULL; -+ } -+ return &folio->page; -+#else -+ return page_cache_alloc(cachemapping); -+#endif -+} -+ - /* Populate a page by filling it from the cache file pointed at by cachefp - * (which contains indicated chunk) - * If task is NULL, the page copy occurs syncronously, and the routine -@@ -2369,11 +2387,12 @@ afs_linux_read_cache(struct file *cachefp, struct page *page, - pageindex = (offset - AFS_CHUNKTOBASE(chunk)) >> PAGE_SHIFT; - - while (cachepage == NULL) { -- cachepage = find_get_page(cachemapping, pageindex); -+ cachepage = find_get_page(cachemapping, pageindex); - if (!cachepage) { -- if (!newpage) -- newpage = page_cache_alloc(cachemapping); -- if (!newpage) { -+ if (newpage == NULL) { -+ newpage = afs_page_cache_alloc(cachemapping); -+ } -+ if (newpage == NULL) { - code = -ENOMEM; - goto out; - } -diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4 -index 6f9d35022..54fc6786c 100644 ---- a/src/cf/linux-kernel-func.m4 -+++ b/src/cf/linux-kernel-func.m4 -@@ -263,6 +263,16 @@ AC_CHECK_LINUX_FUNC([no_strlcpy], - size_t s; - s = strlcpy(buff);]]) - -+dnl Linux 5.15 introduced filemap_alloc_folio() as a replacement for -+dnl page_cache_alloc(). page_cache_alloc() was updated to become just a -+dnl wrapper for filemap_alloc_folio(). -+dnl Linux 6.10 removed page_cache_alloc(). -+AC_CHECK_LINUX_FUNC([filemap_alloc_folio], -+ [#include -+ #include ], -+ [[static struct folio *folio; -+ folio = filemap_alloc_folio(0, 0);]]) -+ - dnl Consequences - things which get set as a result of the - dnl above tests - AS_IF([test "x$ac_cv_linux_func_d_alloc_anon" = "xno"], --- -2.46.0 - diff --git a/openafs-modules-dkms/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch b/openafs-modules-dkms/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch deleted file mode 100644 index 919f2bd..0000000 --- a/openafs-modules-dkms/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 65c7d76ccb45f83842a6474a7052ce40cee88963 Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 14:16:43 -0600 -Subject: [PATCH 2/5] Linux-6.10: define a wrapper for vmalloc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The Linux 6.10 commit: - "mm: vmalloc: enable memory allocation profiling" (88ae5fb755) -changed vmalloc from a function to a wrapper macro. - -This change results in build errors: - "error: implicit declaration of function ‘vmalloc’; did you mean - ‘kmalloc’? [-Werror=implicit-function-declaration]" - -when vmalloc is passed as a parameter to the afs_atomlist_create() and -afs_lhash_create() functions. - -Add a little wrapper function around vmalloc() to use for the parameter -to afs_atomlist_create() and afs_lhash_create(). - -Note: A configure test was not needed for this change since the name -and functionality of Linux's vmalloc did not change. - -Change-Id: I69c1da9eea5d1de11c1628bbcef427f81f5c01e1 -Reviewed-on: https://gerrit.openafs.org/15765 -Tested-by: BuildBot -Reviewed-by: Andrew Deason -Reviewed-by: Michael Meffie ---- - src/afs/LINUX/osi_alloc.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c -index e33306278..0c7489940 100644 ---- a/src/afs/LINUX/osi_alloc.c -+++ b/src/afs/LINUX/osi_alloc.c -@@ -196,6 +196,15 @@ local_free(void *p, size_t n) - vfree(p); - } - -+/* -+ * wrapper for vmalloc(), since vmalloc() may be a macro -+ */ -+static void * -+local_vmalloc(size_t size) -+{ -+ return vmalloc(size); -+} -+ - /* linux_alloc_init(): Initializes the kernel memory allocator. As part - * of this process, it also initializes a pool of osi_linux_mem - * structures as well as the hash table itself. -@@ -209,14 +218,14 @@ linux_alloc_init(void) - /* initiate our pool of osi_linux_mem structs */ - al_mem_pool = - afs_atomlist_create(sizeof(struct osi_linux_mem), sizeof(long) * 1024, -- (void *)vmalloc, local_free); -+ local_vmalloc, local_free); - if (!al_mem_pool) { - printf("afs_osi_Alloc: Error in initialization(atomlist_create)\n"); - return 0; - } - - /* initialize the hash table to hold references to alloc'ed chunks */ -- lh_mem_htab = afs_lhash_create(hash_equal, (void *)vmalloc, local_free); -+ lh_mem_htab = afs_lhash_create(hash_equal, local_vmalloc, local_free); - if (!lh_mem_htab) { - printf("afs_osi_Alloc: Error in initialization(lhash_create)\n"); - return 0; --- -2.46.0 - diff --git a/openafs-modules-dkms/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch b/openafs-modules-dkms/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch deleted file mode 100644 index aed6e9a..0000000 --- a/openafs-modules-dkms/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 3fb3c5d08e4ee9c9dff0f1f95337688de82f5edd Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 13:56:44 -0600 -Subject: [PATCH 3/5] Linux-6.10: remove includes for asm/ia32_unistd.h - -The Linux 6.10 commit: - "x86/syscall/compat: Remove ia32_unistd.h" (e2d168328e) - -Removed the header ia32_unistd.h since it was just a wrapper for the -unistd_32_ia32.h. - -The commit: - "linux-afs-translator-xen-20060731" (29dd792381) -added an ia32_unistd.h include to several files; all were not needed -(as they didn't reference any of the contents from the header file, e.g -_NR_ia32_*). - -The commit: - "amd64-hook-ia32-table-20030519" (831e172463) -added an include for ia32_unistd.h to osi_module.c. - -A later commit: - "osi-probe-syscall-20050129" (f126dbdbe2) -removed many of the references to defines from ia32_unistd.h, but did -not remove the include for the header. - -Currently the only remaining files (linux-kernel-syscall-probe.m4, -LINUX/osi_probe.c and LINUX/osi_syscall.c) continue to reference the -items from ia32_unistd.h, but only when building older kernels that -either don't have LINUX_KEYRING_SUPPORT or when -ENABLE_LINUX_SYSCALL_PROBING is enabled (in both cases, these are only -applicable for older kernels where the asm/ia32_unistd.h file would be -present). - -For the files that don't have references (i.e. _NR_ia32_*), we can -simply remove the include for asm/ia32_unistd.h. For the remaining set -of files, we can leave the include for asm/ia32_unistd.h since the code -already has preprocessor conditionals so it's only included for older -Linux kernels where the header file will be present. - -We noted above, the include for asm/ia32_unistd.h is already conditional -on the checks for LINUX_KEYRING_SUPPORT and ENABLE_LINUX_SYSCALL_PROBING -so we do not need to add any additional configure checks. - -Change-Id: I901b5c0f0ff86272b02f898f3951325533d22f4f -Reviewed-on: https://gerrit.openafs.org/15763 -Reviewed-by: Michael Meffie -Tested-by: BuildBot -Reviewed-by: Andrew Deason ---- - src/afs/LINUX/osi_ioctl.c | 4 ---- - src/afs/LINUX/osi_module.c | 4 ---- - src/afs/LINUX/osi_pag_module.c | 4 ---- - src/afs/LINUX/osi_proc.c | 4 ---- - 4 files changed, 16 deletions(-) - -diff --git a/src/afs/LINUX/osi_ioctl.c b/src/afs/LINUX/osi_ioctl.c -index 3e797745c..d964d8103 100644 ---- a/src/afs/LINUX/osi_ioctl.c -+++ b/src/afs/LINUX/osi_ioctl.c -@@ -21,10 +21,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --#include --#endif -- - #include - #include - #include -diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c -index 30ac048d3..0fc9beba0 100644 ---- a/src/afs/LINUX/osi_module.c -+++ b/src/afs/LINUX/osi_module.c -@@ -21,10 +21,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --#include --#endif -- - #include - #include - #include -diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c -index 24b938f0e..7e8e4f15b 100644 ---- a/src/afs/LINUX/osi_pag_module.c -+++ b/src/afs/LINUX/osi_pag_module.c -@@ -20,10 +20,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --#include --#endif -- - #include - #include - #include -diff --git a/src/afs/LINUX/osi_proc.c b/src/afs/LINUX/osi_proc.c -index 9c5a080f0..ad7c695b9 100644 ---- a/src/afs/LINUX/osi_proc.c -+++ b/src/afs/LINUX/osi_proc.c -@@ -25,10 +25,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --# include --#endif -- - #include - #include - #include --- -2.46.0 - diff --git a/openafs-modules-dkms/0004-afs-avoid-empty-body-warning.patch b/openafs-modules-dkms/0004-afs-avoid-empty-body-warning.patch deleted file mode 100644 index 4817ca3..0000000 --- a/openafs-modules-dkms/0004-afs-avoid-empty-body-warning.patch +++ /dev/null @@ -1,85 +0,0 @@ -From feba246068976dc09a0885ca7e816364073a07c1 Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 14:24:01 -0600 -Subject: [PATCH 4/5] afs: avoid empty-body warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With Linux 6.10 commit: - "kbuild: turn on -Wextra by default" (f5982cceb3) -there are additional compiler warnings that can turn -into build errors when --enable-checking is used. - - "error: suggest braces around empty body in an ‘if’ - statement [-Werror=empty-body]" - -when there is an empty body, e.g. - if (foo) - ; - -Most cases are due to the macros afs_PutCell and afs_PutServer which are -"empty" macros. - -Update the afs_PutCell and afs_PutServer macros so they expand to - do {} while(0) - -Add a comment at the definitions for afs_PutCell and afs_PutServer to -document the reason for keeping them. - -Add braces to conditionals that have an empty body. - -There are no functional changes with this commit. - -Change-Id: I359723eb6a19d1c78449902b4f477da131b0fa18 -Reviewed-on: https://gerrit.openafs.org/15766 -Reviewed-by: Michael Meffie -Tested-by: BuildBot -Reviewed-by: Andrew Deason ---- - src/afs/afs.h | 6 ++++-- - src/afs/afs_cbqueue.c | 4 +++- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/afs/afs.h b/src/afs/afs.h -index 7872412df..345cecb91 100644 ---- a/src/afs/afs.h -+++ b/src/afs/afs.h -@@ -348,7 +348,8 @@ struct cell_alias { - char *cell; - }; - --#define afs_PutCell(cellp, locktype) -+/* In case someday a counterpart for afs_GetCell is needed */ -+#define afs_PutCell(cellp, locktype) do {} while(0) - - /* the unixuser flag bit definitions */ - #define UHasTokens 1 /* are the st and ct fields valid (ever set)? */ -@@ -536,7 +537,8 @@ struct server { - afs_int32 capabilities; - }; - --#define afs_PutServer(servp, locktype) -+/* In case someday a counterpart for afs_GetServer is needed */ -+#define afs_PutServer(servp, locktype) do {} while(0) - - /* structs for some pioctls - these are (or should be) - * also in venus.h -diff --git a/src/afs/afs_cbqueue.c b/src/afs/afs_cbqueue.c -index 2dd633588..11e3aa3f1 100644 ---- a/src/afs/afs_cbqueue.c -+++ b/src/afs/afs_cbqueue.c -@@ -139,7 +139,9 @@ afs_DequeueCallback(struct vcache *avc) - debugvc = avc; - if (avc->callsort.prev) { - QRemove(&(avc->callsort)); -- } else; /* must have got dequeued in a race */ -+ } else { -+ /* must have got dequeued in a race */ -+ } - - return; - } /* afs_DequeueCallback */ --- -2.46.0 - diff --git a/openafs-modules-dkms/0005-Linux-6.10-Move-inline-before-func-return-type.patch b/openafs-modules-dkms/0005-Linux-6.10-Move-inline-before-func-return-type.patch deleted file mode 100644 index ea8bbd1..0000000 --- a/openafs-modules-dkms/0005-Linux-6.10-Move-inline-before-func-return-type.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0b11f30f3ee63b32f2e8ce182bb54674535893ac Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Thu, 6 Jun 2024 10:42:57 -0600 -Subject: [PATCH 5/5] Linux 6.10: Move 'inline' before func return type -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With Linux 6.10 commit: - "kbuild: turn on -Wextra by default" (f5982cceb3) -there are additional compiler warnings that can turn -into build errors when --enable-checking is used. - - "error: ‘inline’ is not at beginning of declaration - [-Werror=old-style-declaration]" - -The error is due to the return type preceding the "inline" keyword -in function declarations. - -Fix the declarations for file_can_read_pages() and -afs_linux_readpage_fastpath() to have the proper ordering of the -static/inline keywords attributes so they precede the return type. - -Just a note that the `static` and `inline` keywords must precede a -function's return type. - -Change-Id: I3ff9d45c119e70a90faf18fbf6d49fb6b9adcf33 -Reviewed-on: https://gerrit.openafs.org/15768 -Reviewed-by: Andrew Deason -Tested-by: Andrew Deason ---- - src/afs/LINUX/osi_vnodeops.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index 0e92215cb..ba0d9bceb 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -2454,7 +2454,7 @@ afs_linux_read_cache(struct file *cachefp, struct page *page, - /* - * Return true if the file has a mapping that can read pages - */ --static int inline -+static inline int - file_can_read_pages(struct file *fp) - { - #if defined(STRUCT_ADDRESS_SPACE_OPERATIONS_HAS_READ_FOLIO) -@@ -2467,7 +2467,7 @@ file_can_read_pages(struct file *fp) - return 0; - } - --static int inline -+static inline int - afs_linux_readpage_fastpath(struct file *fp, struct page *pp, int *codep) - { - loff_t offset = page_offset(pp); --- -2.46.0 - diff --git a/openafs-modules-dkms/PKGBUILD b/openafs-modules-dkms/PKGBUILD index 3291d66..f10fd7e 100644 --- a/openafs-modules-dkms/PKGBUILD +++ b/openafs-modules-dkms/PKGBUILD @@ -6,7 +6,7 @@ pkgname=openafs-modules-dkms _srcname=openafs -pkgver=1.8.12 +pkgver=1.8.12.1 pkgrel=1 pkgdesc="Kernel module for OpenAFS (dkms)" arch=('i686' 'x86_64' 'armv7h') @@ -17,32 +17,15 @@ provides=("openafs-modules=$pkgver") conflicts=('openafs-features-libafs' 'openafs-modules' 'openafs<1.6.6-2') options=(!emptydirs) source=(http://openafs.org/dl/openafs/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2 - 0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch - 0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch - 0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch - 0004-afs-avoid-empty-body-warning.patch - 0005-Linux-6.10-Move-inline-before-func-return-type.patch dkms.conf) -sha256sums=('10fea6810c6c0b00ffb2cd3f38ed732c17cfd7955ca0954dc24a2a6172a26e75' - '9e6605fd9f045b85d28d6b275e7f77f93d991cb266f10877d5e4b820322b2e13' - 'fd4fe8f2a1cd99c239a4bf42f600fcec5399206395c72297631dcfb7b8b7302a' - '40cc3b6588c9bfab6d1eb8f0785952791b728f0c2bb17a35ee0d3084afd36aeb' - 'c5287bf9f467af7e7db37dbe193f53983b955a32117018d7984b9a75fee79af5' - '60104dc7d8418829f2e5670783f1a7548e22f717673a1a312ed455c464d6116e' +sha256sums=('dfe2f39bef9fb3d6791d602e725be7c34b885e4299018266ff9743cb401e594a' '5ea5e184f9b44f5ed45817d2b5a10149d15c8c54f49e0b5b4b773652673cb9b0') prepare() { cd "${srcdir}/${_srcname}-${pkgver}" - # Compatibility with Linux 6.10 - patch -p1 < "$srcdir"/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch - patch -p1 < "$srcdir"/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch - patch -p1 < "$srcdir"/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch - patch -p1 < "$srcdir"/0004-afs-avoid-empty-body-warning.patch - patch -p1 < "$srcdir"/0005-Linux-6.10-Move-inline-before-func-return-type.patch - # Only needed when changes to configure were made - ./regen.sh -q + # ./regen.sh -q } build() { diff --git a/openafs-modules/.SRCINFO b/openafs-modules/.SRCINFO index d1a8b54..214dd73 100644 --- a/openafs-modules/.SRCINFO +++ b/openafs-modules/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = openafs-modules pkgdesc = Kernel module for OpenAFS - pkgver = 1.8.12 + pkgver = 1.8.12.1 pkgrel = 1 url = http://www.openafs.org install = openafs-modules.install @@ -14,17 +14,7 @@ pkgbase = openafs-modules conflicts = openafs-features-libafs conflicts = openafs<1.6.6-2 options = !emptydirs - source = http://openafs.org/dl/openafs/1.8.12/openafs-1.8.12-src.tar.bz2 - source = 0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch - source = 0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch - source = 0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch - source = 0004-afs-avoid-empty-body-warning.patch - source = 0005-Linux-6.10-Move-inline-before-func-return-type.patch - sha256sums = 10fea6810c6c0b00ffb2cd3f38ed732c17cfd7955ca0954dc24a2a6172a26e75 - sha256sums = 9e6605fd9f045b85d28d6b275e7f77f93d991cb266f10877d5e4b820322b2e13 - sha256sums = fd4fe8f2a1cd99c239a4bf42f600fcec5399206395c72297631dcfb7b8b7302a - sha256sums = 40cc3b6588c9bfab6d1eb8f0785952791b728f0c2bb17a35ee0d3084afd36aeb - sha256sums = c5287bf9f467af7e7db37dbe193f53983b955a32117018d7984b9a75fee79af5 - sha256sums = 60104dc7d8418829f2e5670783f1a7548e22f717673a1a312ed455c464d6116e + source = http://openafs.org/dl/openafs/1.8.12.1/openafs-1.8.12.1-src.tar.bz2 + sha256sums = dfe2f39bef9fb3d6791d602e725be7c34b885e4299018266ff9743cb401e594a pkgname = openafs-modules diff --git a/openafs-modules/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch b/openafs-modules/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch deleted file mode 100644 index 12f4803..0000000 --- a/openafs-modules/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e846b6d15a6f6cd0a5b4c3c4d6cbe7b01ab7c7e6 Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 14:13:59 -0600 -Subject: [PATCH 1/5] Linux-6.10: Use filemap_alloc_folio when avail - -The Linux 6.10 commit: - "mm: remove page_cache_alloc()" (3f2ae4ebd5) -removed the page_cache_alloc(), with a note that callers would be using -filemap_alloc_folio instead. - -The function filemap_alloc_folio() was introduced in Linux 5.15 commit: - "mm/filemap: Add filemap_alloc_folio" (bb3c579e25) - -Add a configure check for filemap_alloc_folio and update the function -afs_linux_read_cache() to use a wrapper that calls filemap_alloc_folio() -if available otherwise calls page_cache_alloc(). - -Minor whitespace/style cleanup - -Note: The function filemap_alloc_folio() was introduced in Linux 5.15, -so this change affects builds using the Linux kernel 5.15 and later. - -Change-Id: Ia17aefc38fe9787e54b315c864da726d610b8bb9 -Reviewed-on: https://gerrit.openafs.org/15764 -Tested-by: BuildBot -Reviewed-by: Andrew Deason -Reviewed-by: Michael Meffie ---- - src/afs/LINUX/osi_vnodeops.c | 27 +++++++++++++++++++++++---- - src/cf/linux-kernel-func.m4 | 10 ++++++++++ - 2 files changed, 33 insertions(+), 4 deletions(-) - -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index b709ad1a5..0e92215cb 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -2331,6 +2331,24 @@ mapping_read_page(struct address_space *mapping, struct page *page) - #endif - } - -+/* -+ * small compat wrapper for filemap_alloc_folio/page_cache_alloc -+ */ -+static struct page * -+afs_page_cache_alloc(struct address_space *cachemapping) -+{ -+#if defined(HAVE_LINUX_FILEMAP_ALLOC_FOLIO) -+ struct folio *folio; -+ folio = filemap_alloc_folio(mapping_gfp_mask(cachemapping), 0); -+ if (folio == NULL) { -+ return NULL; -+ } -+ return &folio->page; -+#else -+ return page_cache_alloc(cachemapping); -+#endif -+} -+ - /* Populate a page by filling it from the cache file pointed at by cachefp - * (which contains indicated chunk) - * If task is NULL, the page copy occurs syncronously, and the routine -@@ -2369,11 +2387,12 @@ afs_linux_read_cache(struct file *cachefp, struct page *page, - pageindex = (offset - AFS_CHUNKTOBASE(chunk)) >> PAGE_SHIFT; - - while (cachepage == NULL) { -- cachepage = find_get_page(cachemapping, pageindex); -+ cachepage = find_get_page(cachemapping, pageindex); - if (!cachepage) { -- if (!newpage) -- newpage = page_cache_alloc(cachemapping); -- if (!newpage) { -+ if (newpage == NULL) { -+ newpage = afs_page_cache_alloc(cachemapping); -+ } -+ if (newpage == NULL) { - code = -ENOMEM; - goto out; - } -diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4 -index 6f9d35022..54fc6786c 100644 ---- a/src/cf/linux-kernel-func.m4 -+++ b/src/cf/linux-kernel-func.m4 -@@ -263,6 +263,16 @@ AC_CHECK_LINUX_FUNC([no_strlcpy], - size_t s; - s = strlcpy(buff);]]) - -+dnl Linux 5.15 introduced filemap_alloc_folio() as a replacement for -+dnl page_cache_alloc(). page_cache_alloc() was updated to become just a -+dnl wrapper for filemap_alloc_folio(). -+dnl Linux 6.10 removed page_cache_alloc(). -+AC_CHECK_LINUX_FUNC([filemap_alloc_folio], -+ [#include -+ #include ], -+ [[static struct folio *folio; -+ folio = filemap_alloc_folio(0, 0);]]) -+ - dnl Consequences - things which get set as a result of the - dnl above tests - AS_IF([test "x$ac_cv_linux_func_d_alloc_anon" = "xno"], --- -2.46.0 - diff --git a/openafs-modules/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch b/openafs-modules/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch deleted file mode 100644 index 919f2bd..0000000 --- a/openafs-modules/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 65c7d76ccb45f83842a6474a7052ce40cee88963 Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 14:16:43 -0600 -Subject: [PATCH 2/5] Linux-6.10: define a wrapper for vmalloc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The Linux 6.10 commit: - "mm: vmalloc: enable memory allocation profiling" (88ae5fb755) -changed vmalloc from a function to a wrapper macro. - -This change results in build errors: - "error: implicit declaration of function ‘vmalloc’; did you mean - ‘kmalloc’? [-Werror=implicit-function-declaration]" - -when vmalloc is passed as a parameter to the afs_atomlist_create() and -afs_lhash_create() functions. - -Add a little wrapper function around vmalloc() to use for the parameter -to afs_atomlist_create() and afs_lhash_create(). - -Note: A configure test was not needed for this change since the name -and functionality of Linux's vmalloc did not change. - -Change-Id: I69c1da9eea5d1de11c1628bbcef427f81f5c01e1 -Reviewed-on: https://gerrit.openafs.org/15765 -Tested-by: BuildBot -Reviewed-by: Andrew Deason -Reviewed-by: Michael Meffie ---- - src/afs/LINUX/osi_alloc.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c -index e33306278..0c7489940 100644 ---- a/src/afs/LINUX/osi_alloc.c -+++ b/src/afs/LINUX/osi_alloc.c -@@ -196,6 +196,15 @@ local_free(void *p, size_t n) - vfree(p); - } - -+/* -+ * wrapper for vmalloc(), since vmalloc() may be a macro -+ */ -+static void * -+local_vmalloc(size_t size) -+{ -+ return vmalloc(size); -+} -+ - /* linux_alloc_init(): Initializes the kernel memory allocator. As part - * of this process, it also initializes a pool of osi_linux_mem - * structures as well as the hash table itself. -@@ -209,14 +218,14 @@ linux_alloc_init(void) - /* initiate our pool of osi_linux_mem structs */ - al_mem_pool = - afs_atomlist_create(sizeof(struct osi_linux_mem), sizeof(long) * 1024, -- (void *)vmalloc, local_free); -+ local_vmalloc, local_free); - if (!al_mem_pool) { - printf("afs_osi_Alloc: Error in initialization(atomlist_create)\n"); - return 0; - } - - /* initialize the hash table to hold references to alloc'ed chunks */ -- lh_mem_htab = afs_lhash_create(hash_equal, (void *)vmalloc, local_free); -+ lh_mem_htab = afs_lhash_create(hash_equal, local_vmalloc, local_free); - if (!lh_mem_htab) { - printf("afs_osi_Alloc: Error in initialization(lhash_create)\n"); - return 0; --- -2.46.0 - diff --git a/openafs-modules/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch b/openafs-modules/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch deleted file mode 100644 index aed6e9a..0000000 --- a/openafs-modules/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 3fb3c5d08e4ee9c9dff0f1f95337688de82f5edd Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 13:56:44 -0600 -Subject: [PATCH 3/5] Linux-6.10: remove includes for asm/ia32_unistd.h - -The Linux 6.10 commit: - "x86/syscall/compat: Remove ia32_unistd.h" (e2d168328e) - -Removed the header ia32_unistd.h since it was just a wrapper for the -unistd_32_ia32.h. - -The commit: - "linux-afs-translator-xen-20060731" (29dd792381) -added an ia32_unistd.h include to several files; all were not needed -(as they didn't reference any of the contents from the header file, e.g -_NR_ia32_*). - -The commit: - "amd64-hook-ia32-table-20030519" (831e172463) -added an include for ia32_unistd.h to osi_module.c. - -A later commit: - "osi-probe-syscall-20050129" (f126dbdbe2) -removed many of the references to defines from ia32_unistd.h, but did -not remove the include for the header. - -Currently the only remaining files (linux-kernel-syscall-probe.m4, -LINUX/osi_probe.c and LINUX/osi_syscall.c) continue to reference the -items from ia32_unistd.h, but only when building older kernels that -either don't have LINUX_KEYRING_SUPPORT or when -ENABLE_LINUX_SYSCALL_PROBING is enabled (in both cases, these are only -applicable for older kernels where the asm/ia32_unistd.h file would be -present). - -For the files that don't have references (i.e. _NR_ia32_*), we can -simply remove the include for asm/ia32_unistd.h. For the remaining set -of files, we can leave the include for asm/ia32_unistd.h since the code -already has preprocessor conditionals so it's only included for older -Linux kernels where the header file will be present. - -We noted above, the include for asm/ia32_unistd.h is already conditional -on the checks for LINUX_KEYRING_SUPPORT and ENABLE_LINUX_SYSCALL_PROBING -so we do not need to add any additional configure checks. - -Change-Id: I901b5c0f0ff86272b02f898f3951325533d22f4f -Reviewed-on: https://gerrit.openafs.org/15763 -Reviewed-by: Michael Meffie -Tested-by: BuildBot -Reviewed-by: Andrew Deason ---- - src/afs/LINUX/osi_ioctl.c | 4 ---- - src/afs/LINUX/osi_module.c | 4 ---- - src/afs/LINUX/osi_pag_module.c | 4 ---- - src/afs/LINUX/osi_proc.c | 4 ---- - 4 files changed, 16 deletions(-) - -diff --git a/src/afs/LINUX/osi_ioctl.c b/src/afs/LINUX/osi_ioctl.c -index 3e797745c..d964d8103 100644 ---- a/src/afs/LINUX/osi_ioctl.c -+++ b/src/afs/LINUX/osi_ioctl.c -@@ -21,10 +21,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --#include --#endif -- - #include - #include - #include -diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c -index 30ac048d3..0fc9beba0 100644 ---- a/src/afs/LINUX/osi_module.c -+++ b/src/afs/LINUX/osi_module.c -@@ -21,10 +21,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --#include --#endif -- - #include - #include - #include -diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c -index 24b938f0e..7e8e4f15b 100644 ---- a/src/afs/LINUX/osi_pag_module.c -+++ b/src/afs/LINUX/osi_pag_module.c -@@ -20,10 +20,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --#include --#endif -- - #include - #include - #include -diff --git a/src/afs/LINUX/osi_proc.c b/src/afs/LINUX/osi_proc.c -index 9c5a080f0..ad7c695b9 100644 ---- a/src/afs/LINUX/osi_proc.c -+++ b/src/afs/LINUX/osi_proc.c -@@ -25,10 +25,6 @@ - #include /* For syscall numbers. */ - #include - --#ifdef AFS_AMD64_LINUX_ENV --# include --#endif -- - #include - #include - #include --- -2.46.0 - diff --git a/openafs-modules/0004-afs-avoid-empty-body-warning.patch b/openafs-modules/0004-afs-avoid-empty-body-warning.patch deleted file mode 100644 index 4817ca3..0000000 --- a/openafs-modules/0004-afs-avoid-empty-body-warning.patch +++ /dev/null @@ -1,85 +0,0 @@ -From feba246068976dc09a0885ca7e816364073a07c1 Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Wed, 12 Jun 2024 14:24:01 -0600 -Subject: [PATCH 4/5] afs: avoid empty-body warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With Linux 6.10 commit: - "kbuild: turn on -Wextra by default" (f5982cceb3) -there are additional compiler warnings that can turn -into build errors when --enable-checking is used. - - "error: suggest braces around empty body in an ‘if’ - statement [-Werror=empty-body]" - -when there is an empty body, e.g. - if (foo) - ; - -Most cases are due to the macros afs_PutCell and afs_PutServer which are -"empty" macros. - -Update the afs_PutCell and afs_PutServer macros so they expand to - do {} while(0) - -Add a comment at the definitions for afs_PutCell and afs_PutServer to -document the reason for keeping them. - -Add braces to conditionals that have an empty body. - -There are no functional changes with this commit. - -Change-Id: I359723eb6a19d1c78449902b4f477da131b0fa18 -Reviewed-on: https://gerrit.openafs.org/15766 -Reviewed-by: Michael Meffie -Tested-by: BuildBot -Reviewed-by: Andrew Deason ---- - src/afs/afs.h | 6 ++++-- - src/afs/afs_cbqueue.c | 4 +++- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/afs/afs.h b/src/afs/afs.h -index 7872412df..345cecb91 100644 ---- a/src/afs/afs.h -+++ b/src/afs/afs.h -@@ -348,7 +348,8 @@ struct cell_alias { - char *cell; - }; - --#define afs_PutCell(cellp, locktype) -+/* In case someday a counterpart for afs_GetCell is needed */ -+#define afs_PutCell(cellp, locktype) do {} while(0) - - /* the unixuser flag bit definitions */ - #define UHasTokens 1 /* are the st and ct fields valid (ever set)? */ -@@ -536,7 +537,8 @@ struct server { - afs_int32 capabilities; - }; - --#define afs_PutServer(servp, locktype) -+/* In case someday a counterpart for afs_GetServer is needed */ -+#define afs_PutServer(servp, locktype) do {} while(0) - - /* structs for some pioctls - these are (or should be) - * also in venus.h -diff --git a/src/afs/afs_cbqueue.c b/src/afs/afs_cbqueue.c -index 2dd633588..11e3aa3f1 100644 ---- a/src/afs/afs_cbqueue.c -+++ b/src/afs/afs_cbqueue.c -@@ -139,7 +139,9 @@ afs_DequeueCallback(struct vcache *avc) - debugvc = avc; - if (avc->callsort.prev) { - QRemove(&(avc->callsort)); -- } else; /* must have got dequeued in a race */ -+ } else { -+ /* must have got dequeued in a race */ -+ } - - return; - } /* afs_DequeueCallback */ --- -2.46.0 - diff --git a/openafs-modules/0005-Linux-6.10-Move-inline-before-func-return-type.patch b/openafs-modules/0005-Linux-6.10-Move-inline-before-func-return-type.patch deleted file mode 100644 index ea8bbd1..0000000 --- a/openafs-modules/0005-Linux-6.10-Move-inline-before-func-return-type.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0b11f30f3ee63b32f2e8ce182bb54674535893ac Mon Sep 17 00:00:00 2001 -From: Cheyenne Wills -Date: Thu, 6 Jun 2024 10:42:57 -0600 -Subject: [PATCH 5/5] Linux 6.10: Move 'inline' before func return type -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With Linux 6.10 commit: - "kbuild: turn on -Wextra by default" (f5982cceb3) -there are additional compiler warnings that can turn -into build errors when --enable-checking is used. - - "error: ‘inline’ is not at beginning of declaration - [-Werror=old-style-declaration]" - -The error is due to the return type preceding the "inline" keyword -in function declarations. - -Fix the declarations for file_can_read_pages() and -afs_linux_readpage_fastpath() to have the proper ordering of the -static/inline keywords attributes so they precede the return type. - -Just a note that the `static` and `inline` keywords must precede a -function's return type. - -Change-Id: I3ff9d45c119e70a90faf18fbf6d49fb6b9adcf33 -Reviewed-on: https://gerrit.openafs.org/15768 -Reviewed-by: Andrew Deason -Tested-by: Andrew Deason ---- - src/afs/LINUX/osi_vnodeops.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index 0e92215cb..ba0d9bceb 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -2454,7 +2454,7 @@ afs_linux_read_cache(struct file *cachefp, struct page *page, - /* - * Return true if the file has a mapping that can read pages - */ --static int inline -+static inline int - file_can_read_pages(struct file *fp) - { - #if defined(STRUCT_ADDRESS_SPACE_OPERATIONS_HAS_READ_FOLIO) -@@ -2467,7 +2467,7 @@ file_can_read_pages(struct file *fp) - return 0; - } - --static int inline -+static inline int - afs_linux_readpage_fastpath(struct file *fp, struct page *pp, int *codep) - { - loff_t offset = page_offset(pp); --- -2.46.0 - diff --git a/openafs-modules/PKGBUILD b/openafs-modules/PKGBUILD index 3f2957c..cf0bd85 100644 --- a/openafs-modules/PKGBUILD +++ b/openafs-modules/PKGBUILD @@ -5,7 +5,7 @@ pkgname=openafs-modules _srcname=openafs -pkgver=1.8.12 +pkgver=1.8.12.1 pkgrel=1 pkgdesc="Kernel module for OpenAFS" arch=('i686' 'x86_64' 'armv7h') @@ -16,18 +16,8 @@ makedepends=('libelf' 'linux-headers') conflicts=('openafs-features-libafs' 'openafs<1.6.6-2') options=(!emptydirs) install=openafs-modules.install -source=(http://openafs.org/dl/openafs/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2 - 0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch - 0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch - 0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch - 0004-afs-avoid-empty-body-warning.patch - 0005-Linux-6.10-Move-inline-before-func-return-type.patch) -sha256sums=('10fea6810c6c0b00ffb2cd3f38ed732c17cfd7955ca0954dc24a2a6172a26e75' - '9e6605fd9f045b85d28d6b275e7f77f93d991cb266f10877d5e4b820322b2e13' - 'fd4fe8f2a1cd99c239a4bf42f600fcec5399206395c72297631dcfb7b8b7302a' - '40cc3b6588c9bfab6d1eb8f0785952791b728f0c2bb17a35ee0d3084afd36aeb' - 'c5287bf9f467af7e7db37dbe193f53983b955a32117018d7984b9a75fee79af5' - '60104dc7d8418829f2e5670783f1a7548e22f717673a1a312ed455c464d6116e') +source=(http://openafs.org/dl/openafs/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2) +sha256sums=('dfe2f39bef9fb3d6791d602e725be7c34b885e4299018266ff9743cb401e594a') # Heuristic to determine version of installed kernel # You can modify this if the heuristic fails @@ -42,15 +32,8 @@ _extramodules="/usr/lib/modules/${_kernelver}/extramodules" prepare() { cd "${srcdir}/${_srcname}-${pkgver}" - # Compatibility with Linux 6.10 - patch -p1 < "$srcdir"/0001-Linux-6.10-Use-filemap_alloc_folio-when-avail.patch - patch -p1 < "$srcdir"/0002-Linux-6.10-define-a-wrapper-for-vmalloc.patch - patch -p1 < "$srcdir"/0003-Linux-6.10-remove-includes-for-asm-ia32_unistd.h.patch - patch -p1 < "$srcdir"/0004-afs-avoid-empty-body-warning.patch - patch -p1 < "$srcdir"/0005-Linux-6.10-Move-inline-before-func-return-type.patch - # Only needed when changes to configure were made - ./regen.sh -q + # ./regen.sh -q } build() { diff --git a/openafs/.SRCINFO b/openafs/.SRCINFO index 90a54a3..288d8e2 100644 --- a/openafs/.SRCINFO +++ b/openafs/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = openafs pkgdesc = Open source implementation of the AFS distributed file system - pkgver = 1.8.12 + pkgver = 1.8.12.1 pkgrel = 1 url = http://www.openafs.org install = openafs.install @@ -18,12 +18,12 @@ pkgbase = openafs backup = etc/openafs/ThisCell backup = etc/openafs/cacheinfo backup = etc/openafs/CellServDB - source = http://openafs.org/dl/openafs/1.8.12/openafs-1.8.12-src.tar.bz2 - source = http://openafs.org/dl/openafs/1.8.12/openafs-1.8.12-doc.tar.bz2 + source = http://openafs.org/dl/openafs/1.8.12.1/openafs-1.8.12.1-src.tar.bz2 + source = http://openafs.org/dl/openafs/1.8.12.1/openafs-1.8.12.1-doc.tar.bz2 source = tmpfiles.d-openafs.conf source = 0001-Adjust-RedHat-config-and-service-files.patch - sha256sums = 10fea6810c6c0b00ffb2cd3f38ed732c17cfd7955ca0954dc24a2a6172a26e75 - sha256sums = 64c6c313c73d4bb7c7725450a3e6dc4a25ee1c1b71b7722848004ebce5962567 + sha256sums = dfe2f39bef9fb3d6791d602e725be7c34b885e4299018266ff9743cb401e594a + sha256sums = 79808f059ab01d5f929bc75d057b129f8b2a375356fe5afd780a075f2b25c562 sha256sums = 18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68 sha256sums = c15539241045e96252d6af4901311f3c494eae42c64edaaa1dcd1c70ef118624 diff --git a/openafs/PKGBUILD b/openafs/PKGBUILD index 2dd9cd8..1d504ef 100644 --- a/openafs/PKGBUILD +++ b/openafs/PKGBUILD @@ -5,7 +5,7 @@ # https://github.com/michaellass/AUR pkgname=openafs -pkgver=1.8.12 +pkgver=1.8.12.1 pkgrel=1 pkgdesc="Open source implementation of the AFS distributed file system" arch=('i686' 'x86_64' 'armv7h') @@ -25,8 +25,8 @@ source=(http://openafs.org/dl/openafs/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2 http://openafs.org/dl/openafs/${pkgver}/${pkgname}-${pkgver}-doc.tar.bz2 tmpfiles.d-openafs.conf 0001-Adjust-RedHat-config-and-service-files.patch) -sha256sums=('10fea6810c6c0b00ffb2cd3f38ed732c17cfd7955ca0954dc24a2a6172a26e75' - '64c6c313c73d4bb7c7725450a3e6dc4a25ee1c1b71b7722848004ebce5962567' +sha256sums=('dfe2f39bef9fb3d6791d602e725be7c34b885e4299018266ff9743cb401e594a' + '79808f059ab01d5f929bc75d057b129f8b2a375356fe5afd780a075f2b25c562' '18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68' 'c15539241045e96252d6af4901311f3c494eae42c64edaaa1dcd1c70ef118624')