diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:45:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:55:09 +0000 |
| commit | 81f3c4ad702f7973a95775880932b1de4e78bb44 (patch) | |
| tree | 758b83c021e4ea533bdd039565ca6280a9410a3b /debian/patches | |
| parent | Releasing progress-linux version 1:2.6.4-4~progress7.99u1. (diff) | |
| download | nfs-utils-81f3c4ad702f7973a95775880932b1de4e78bb44.tar.xz nfs-utils-81f3c4ad702f7973a95775880932b1de4e78bb44.zip | |
Merging debian version 1:2.6.4-5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/reexport.c-Some-Distros-need-the-following-include-t.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/debian/patches/reexport.c-Some-Distros-need-the-following-include-t.patch b/debian/patches/reexport.c-Some-Distros-need-the-following-include-t.patch new file mode 100644 index 0000000..c1429fd --- /dev/null +++ b/debian/patches/reexport.c-Some-Distros-need-the-following-include-t.patch @@ -0,0 +1,38 @@ +From: Steve Dickson <steved@redhat.com> +Date: Mon, 22 Jan 2024 13:23:57 -0500 +Subject: reexport.c: Some Distros need the following include to avoid the + following error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=a2c95e4f557a71b482bb62bad6d93ddde51e5dc6 +Bug-Debian: https://bugs.debian.org/1073818 + +reexport.c: In function ‘connect_fsid_service’: +reexport.c:41:28: error: implicit declaration of function ‘offsetof’ [-Werror=implicit-function-declaration] + 41 | addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path); + | ^~~~~~~~ +reexport.c:19:1: note: ‘offsetof’ is defined in header ‘<stddef.h>’; did you forget to ‘#include <stddef.h>’? + 18 | #include "xlog.h" + +++ |+#include <stddef.h> + 19 | +reexport.c:41:37: error: expected expression before ‘struct’ + 41 | addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path); + | ^~~~~~ +cc1: some warnings being treated as errors + +Signed-off-by: Steve Dickson <steved@redhat.com> +--- + support/reexport/reexport.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/support/reexport/reexport.c ++++ b/support/reexport/reexport.c +@@ -8,6 +8,7 @@ + #include <sys/types.h> + #include <sys/vfs.h> + #include <errno.h> ++#include <stddef.h> + + #include "nfsd_path.h" + #include "conffile.h" diff --git a/debian/patches/series b/debian/patches/series index ad5b435..82f738f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,5 @@ multiarch-kerberos-paths.patch always-run-generator.patch fsidd-call-anonymous-sockets-by-their-name-only-don-.patch junction-export-cache-cast-to-a-type-with-a-known-si.patch +reexport.c-Some-Distros-need-the-following-include-t.patch progress-linux/0001-reexport-include.patch |