| Message ID | 87zfr6kxhe.fsf@oldenburg.str.redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Adjust check-local-headers test for libaudit 4.0 | expand |
On 27.06.24 21:16, Florian Weimer wrote: > The new version introduces /usr/include/audit_logging.h and > /usr/include/audit-records.h. > > --- > scripts/check-local-headers.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh > index 5d3e61f889..ad23840333 100755 > --- a/scripts/check-local-headers.sh > +++ b/scripts/check-local-headers.sh > @@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" ' > BEGIN { > status = 0 > exclude = "^" includedir \ > - "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)" > + "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h|audit(_logging|-records)\\.h)" > } > /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } > { > > base-commit: c0f21e073d45670cb54811b07fce8e612a91f107 > I also see those fails on Fedora 40 with libaudit 4: <build>/check-local-headers.out *** $(common-objpfx)nscd/selinux.o: uses /usr/include/audit_logging.h *** $(common-objpfx)nscd/selinux.o: uses /usr/include/audit-records.h *** /usr/include/audit_logging.h: uses /usr/include/audit_logging.h: *** /usr/include/audit-records.h: uses /usr/include/audit-records.h: Both headers audit-records.h and ***audit-logging.h*** were introduced with this commit: "Refactor libaudit.h to split out logging functions and record numbers" https://github.com/linux-audit/audit-userspace/commit/feb4cbd2fcff563a5f9ddb297e260791bf8cdc9b and lateron renamed to ***audit_logging.h***: "Rename audit-logging.h to audit_logging.h to match c file" https://github.com/linux-audit/audit-userspace/commit/5e9c90a622b7513f1036ae90fd203e556535a084 This patch fixes the mentioned issue. Reviewed-by: Stefan Liebler <stli@linux.ibm.com>
* Stefan Liebler: > On 27.06.24 21:16, Florian Weimer wrote: >> The new version introduces /usr/include/audit_logging.h and >> /usr/include/audit-records.h. >> >> --- >> scripts/check-local-headers.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh >> index 5d3e61f889..ad23840333 100755 >> --- a/scripts/check-local-headers.sh >> +++ b/scripts/check-local-headers.sh >> @@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" ' >> BEGIN { >> status = 0 >> exclude = "^" includedir \ >> - "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)" >> + "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h|audit(_logging|-records)\\.h)" >> } >> /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } >> { >> >> base-commit: c0f21e073d45670cb54811b07fce8e612a91f107 >> > > I also see those fails on Fedora 40 with libaudit 4: > <build>/check-local-headers.out > *** $(common-objpfx)nscd/selinux.o: uses /usr/include/audit_logging.h > *** $(common-objpfx)nscd/selinux.o: uses /usr/include/audit-records.h > *** /usr/include/audit_logging.h: uses /usr/include/audit_logging.h: > *** /usr/include/audit-records.h: uses /usr/include/audit-records.h: > > Both headers audit-records.h and ***audit-logging.h*** were introduced > with this commit: > "Refactor libaudit.h to split out logging functions and record numbers" > https://github.com/linux-audit/audit-userspace/commit/feb4cbd2fcff563a5f9ddb297e260791bf8cdc9b > > and lateron renamed to ***audit_logging.h***: > "Rename audit-logging.h to audit_logging.h to match c file" > https://github.com/linux-audit/audit-userspace/commit/5e9c90a622b7513f1036ae90fd203e556535a084 > > This patch fixes the mentioned issue. > > Reviewed-by: Stefan Liebler <stli@linux.ibm.com> Thanks. Andreas, okay for the release? Florian
Am Dienstag, 16. Juli 2024, 16:20:00 CEST schrieb Florian Weimer: > * Stefan Liebler: > > > On 27.06.24 21:16, Florian Weimer wrote: > >> The new version introduces /usr/include/audit_logging.h and > >> /usr/include/audit-records.h. > >> > >> --- > >> scripts/check-local-headers.sh | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh > >> index 5d3e61f889..ad23840333 100755 > >> --- a/scripts/check-local-headers.sh > >> +++ b/scripts/check-local-headers.sh > >> @@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" ' > >> BEGIN { > >> status = 0 > >> exclude = "^" includedir \ > >> - "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)" > >> + "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h|audit(_logging|-records)\\.h)" > >> } > >> /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } > >> { > >> > >> base-commit: c0f21e073d45670cb54811b07fce8e612a91f107 > >> > > > > I also see those fails on Fedora 40 with libaudit 4: > > <build>/check-local-headers.out > > *** $(common-objpfx)nscd/selinux.o: uses /usr/include/audit_logging.h > > *** $(common-objpfx)nscd/selinux.o: uses /usr/include/audit-records.h > > *** /usr/include/audit_logging.h: uses /usr/include/audit_logging.h: > > *** /usr/include/audit-records.h: uses /usr/include/audit-records.h: > > > > Both headers audit-records.h and ***audit-logging.h*** were introduced > > with this commit: > > "Refactor libaudit.h to split out logging functions and record numbers" > > https://github.com/linux-audit/audit-userspace/commit/feb4cbd2fcff563a5f9ddb297e260791bf8cdc9b > > > > and lateron renamed to ***audit_logging.h***: > > "Rename audit-logging.h to audit_logging.h to match c file" > > https://github.com/linux-audit/audit-userspace/commit/5e9c90a622b7513f1036ae90fd203e556535a084 > > > > This patch fixes the mentioned issue. > > > > Reviewed-by: Stefan Liebler <stli@linux.ibm.com> > > Thanks. Andreas, okay for the release? Yes, please push it... Thanks! > > Florian > >
diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh index 5d3e61f889..ad23840333 100755 --- a/scripts/check-local-headers.sh +++ b/scripts/check-local-headers.sh @@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 exclude = "^" includedir \ - "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)" + "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h|version\\.h)|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h|audit(_logging|-records)\\.h)" } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } {