crypt: Adjust check-local-headers.sh for nspr4 include directory [BZ #17956]

diff --git a/ChangeLog b/ChangeLog
index f782b140451cdc7ed8d8bb53526f52f97841ce3d..31f402a7f6b86dfba84fe9019c7ea1c378c22072 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-04  Florian Weimer  <fweimer@redhat.com>
+
+       * scripts/check-local-headers.sh: Ignore nspr4 header file
+       directory in addition to nspr.
+
 2017-10-04  Guido Trentalancia  <guido@trentalancia.net>
 
        [BZ #17956]

diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index 46923616867df295788cb2a054dfd2d382aa452e..0cde6e8e92a11ab631ce6a6574df7a23e704f3f7 100755 (executable)
--- 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)|cthreads\\.h|gd|nss3/|nspr/|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)|cthreads\\.h|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
 }
 /^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
 {