From 0f4ccf4e5d5a0f286e353df3631c9f33292167cf Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 22 Nov 2023 11:47:06 +0100 Subject: [PATCH 1/3] configure.ac: Use global instead of main fragment in __attribute__ checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The first argument of AC_COMPILE_IFELSE is intended for top-level constructs, not just #include directives. Stop using } … { to put top-level constructs into the main code fragment in the second argument. This fixes a build failure with future compilers. --- configure.ac | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0dd4127..420cb71 100644 --- a/configure.ac +++ b/configure.ac @@ -212,18 +212,20 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for __attribute__ noreturn) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], - [ exit(0); } static void foo(void) __attribute__((noreturn)); - static void foo(void) {exit(0); ])], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include +static void foo(void) __attribute__((noreturn)); +static void foo(void) {exit(0);}], + [exit(0);])], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE___ATTRIBUTE__NORETURN, 1, [Define if your compiler has __attribute__ noreturn])], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for __attribute__ format) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include - #include ], - [ exit(0); } static int foo(char *fmt, ...) __attribute__((format (printf, 1, 2))); - static int foo(char *fmt, ...) { ])], + #include +static void foo(char *fmt, ...) __attribute__((format (printf, 1, 2))); +static void foo(char *fmt, ...) {}], + [exit(0);])], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE___ATTRIBUTE__FORMAT, 1, [Define if your compiler has __attribute__ format])], [AC_MSG_RESULT(no)]) From 52a8701d547c96c5590566258c328e9f2ad86808 Mon Sep 17 00:00:00 2001 From: Janik Rabe Date: Wed, 22 Nov 2023 20:46:37 +0000 Subject: [PATCH 2/3] Remove duplicate netlink macros These are already defined by . I don't think we need to redefine them here. --- src/netlink.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/netlink.h b/src/netlink.h index 57366fe..8565ce5 100644 --- a/src/netlink.h +++ b/src/netlink.h @@ -18,14 +18,6 @@ #define NETLINK_TCPDIAG 4 #define TCPDIAG_GETSOCK 18 -#define NLMSG_ERROR 0x2 -#define NLMSG_DONE 0x3 - -#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len)) -#define NLMSG_DATA(nlh) ((void*)(((char*)nlh) + NLMSG_LENGTH(0))) -#define NLMSG_NEXT(nlh,len) ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \ - (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))) - /* Socket identity */ struct tcpdiag_sockid { u_int16_t tcpdiag_sport; From a6adaef5df9b007e7ce0d1ea400e441e7ad8fd5f Mon Sep 17 00:00:00 2001 From: Eloy Date: Sun, 21 Jan 2024 20:44:31 +0100 Subject: [PATCH 3/3] Add systemd instructions for Quassel --- doc/book/src/guides/using-oidentd-with-quassel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/book/src/guides/using-oidentd-with-quassel.md b/doc/book/src/guides/using-oidentd-with-quassel.md index d5bdbcf..03d12c8 100644 --- a/doc/book/src/guides/using-oidentd-with-quassel.md +++ b/doc/book/src/guides/using-oidentd-with-quassel.md @@ -79,7 +79,7 @@ file: chmod 0711 ~quasselcore ``` -Finally, make sure Quassel is run with the `--oidentd` flag. +Finally, make sure Quassel is run with the `--oidentd` flag. To modify the systemd unit file of Quassel, run `sudo systemctl edit --full quasselcore` and append the flag to the `ExecStart` line. Your changes will take effect after you reload oidentd and restart Quassel.