Adjust check-local-headers test for libaudit 4.0

Message ID 87zfr6kxhe.fsf@oldenburg.str.redhat.com
State Committed
Commit 91eb62d63887a959e43aafb6fc022a87614dc7c9
Headers
Series Adjust check-local-headers test for libaudit 4.0 |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Test passed

Commit Message

Florian Weimer June 27, 2024, 7:16 p.m. UTC
  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(-)


base-commit: c0f21e073d45670cb54811b07fce8e612a91f107
  

Comments

Stefan Liebler July 16, 2024, 11:41 a.m. UTC | #1
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>
  
Florian Weimer July 16, 2024, 2:20 p.m. UTC | #2
* 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
  
Andreas K. Huettel July 19, 2024, 1:55 p.m. UTC | #3
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
> 
>
  

Patch

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 }
 {