Version in base suite: 2.6.2-4 Base version: nfs-utils_2.6.2-4 Target version: nfs-utils_2.6.2-4+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/n/nfs-utils/nfs-utils_2.6.2-4.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/n/nfs-utils/nfs-utils_2.6.2-4+deb12u1.dsc changelog | 9 + patches/exports-Fix-referrals-when-enable-junction-no.patch | 65 ++++++++++++ patches/series | 1 salsa-ci.yml | 6 - 4 files changed, 79 insertions(+), 2 deletions(-) diff -Nru nfs-utils-2.6.2/debian/changelog nfs-utils-2.6.2/debian/changelog --- nfs-utils-2.6.2/debian/changelog 2023-01-11 20:41:40.000000000 +0000 +++ nfs-utils-2.6.2/debian/changelog 2024-12-11 14:00:17.000000000 +0000 @@ -1,3 +1,12 @@ +nfs-utils (1:2.6.2-4+deb12u1) bookworm; urgency=medium + + * debian/salsa-ci.yml: Set release to bookworm + * d/salsa-ci.yml: Suppress aliased-location lintian errors + * exports: Fix referrals when --enable-junction=no + (Closes: #1083098, #1035908) + + -- Salvatore Bonaccorso Wed, 11 Dec 2024 15:00:17 +0100 + nfs-utils (1:2.6.2-4) unstable; urgency=medium [ Guillem Jover ] diff -Nru nfs-utils-2.6.2/debian/patches/exports-Fix-referrals-when-enable-junction-no.patch nfs-utils-2.6.2/debian/patches/exports-Fix-referrals-when-enable-junction-no.patch --- nfs-utils-2.6.2/debian/patches/exports-Fix-referrals-when-enable-junction-no.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-2.6.2/debian/patches/exports-Fix-referrals-when-enable-junction-no.patch 2024-12-11 14:00:17.000000000 +0000 @@ -0,0 +1,65 @@ +From: Scott Mayhew +Date: Sun, 8 Dec 2024 06:08:53 -0500 +Subject: exports: Fix referrals when --enable-junction=no +Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=371929c8f0b5eb9aae1a23cc273413b9f4c0165e +Bug-Debian: https://bugs.debian.org/1083098 +Bug-Debian: https://bugs.debian.org/1035908 + +Commit 15dc0bea ("exportd: Moved cache upcalls routines into +libexport.a") caused write_fsloc() to be elided when junction support is +disabled. Remove the not needed #ifdef HAVE_JUNCTION_SUPPORT which +blocks the referrals from working when --enable-junction=no is set. +(only the #ifdef HAVE_JUNCTION_SUPPORT should be around actual +junction code). + +Fixes: 15dc0bea ("exportd: Moved cache upcalls routines into libexport.a") +Link: https://bugs.debian.org/1035908 +Link: https://bugs.debian.org/1083098 + +Reviewed-by: Roland Mainz +Reviewed-by: Chuck Lever +Signed-off-by: Scott Mayhew +Signed-off-by: Steve Dickson +--- + support/export/cache.c | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/support/export/cache.c ++++ b/support/export/cache.c +@@ -33,10 +33,7 @@ + #include "export.h" + #include "pseudoflavors.h" + #include "xcommon.h" +- +-#ifdef HAVE_JUNCTION_SUPPORT + #include "fsloc.h" +-#endif + + #ifdef USE_BLKID + #include "blkid/blkid.h" +@@ -908,7 +905,6 @@ out: + xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL); + } + +-#ifdef HAVE_JUNCTION_SUPPORT + static void write_fsloc(char **bp, int *blen, struct exportent *ep) + { + struct servers *servers; +@@ -931,7 +927,6 @@ static void write_fsloc(char **bp, int * + qword_addint(bp, blen, servers->h_referral); + release_replicas(servers); + } +-#endif + static void write_secinfo(char **bp, int *blen, struct exportent *ep, int flag_mask) + { + struct sec_entry *p; +@@ -975,9 +970,7 @@ static int dump_to_cache(int f, char *bu + qword_addint(&bp, &blen, exp->e_anongid); + qword_addint(&bp, &blen, exp->e_fsid); + +-#ifdef HAVE_JUNCTION_SUPPORT + write_fsloc(&bp, &blen, exp); +-#endif + write_secinfo(&bp, &blen, exp, flag_mask); + if (exp->e_uuid == NULL || different_fs) { + char u[16]; diff -Nru nfs-utils-2.6.2/debian/patches/series nfs-utils-2.6.2/debian/patches/series --- nfs-utils-2.6.2/debian/patches/series 2023-01-11 20:41:40.000000000 +0000 +++ nfs-utils-2.6.2/debian/patches/series 2024-12-11 14:00:17.000000000 +0000 @@ -8,3 +8,4 @@ systemd-Apply-all-sysctl-settings-through-udev-rule-.patch auth-rpcgss-module.service-Don-t-fail-inside-linux-c.patch systemd-Don-t-degrade-system-state-for-nfs-clients-w.patch +exports-Fix-referrals-when-enable-junction-no.patch diff -Nru nfs-utils-2.6.2/debian/salsa-ci.yml nfs-utils-2.6.2/debian/salsa-ci.yml --- nfs-utils-2.6.2/debian/salsa-ci.yml 2023-01-11 20:41:40.000000000 +0000 +++ nfs-utils-2.6.2/debian/salsa-ci.yml 2024-12-11 14:00:17.000000000 +0000 @@ -3,8 +3,10 @@ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml variables: - RELEASE: 'unstable' + RELEASE: 'bookworm' # We only build arch:any packages SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 'true' # Currently triggering falsely (bugs #973313, #1000977) - SALSA_CI_LINTIAN_SUPPRESS_TAGS: 'groff-message,elf-error' + # Suppress 'aliased-location' as usrmerge-migration happened only + # in nfs-utils/1:2.6.3-4~exp1 + SALSA_CI_LINTIAN_SUPPRESS_TAGS: 'groff-message,elf-error,aliased-location'