From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 7 Aug 2022 14:59:20 +0000 (+0000)
Subject: Maintenance: Improve stability of generated debug-sections.txt (#1101)
X-Git-Tag: SQUID_6_0_1~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efdbb07dc999d554f57f5e868cdce2b3c847fad4;p=thirdparty%2Fsquid.git

Maintenance: Improve stability of generated debug-sections.txt (#1101)

Pure "sort" may not produce stable results across different locales.
This may explain why the official order changed in commit 502bcc7 and
why current runs in some unofficial environments reorder sections.

Also fixed two minor problems:
* "sort -n" (i.e. numeric sort) was applied to non-numeric fields
* "sort -u" (i.e. unique sort) was pointlessly applied multiple times
---

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index 686e90dc85..212cf239e8 100644
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -7,6 +7,9 @@
  */
 
 
+section --    External DISKD process implementation.
+section --    Refcount allocator
+section --    Unlink Daemon
 section 00    Client Database
 section 00    Debug Routines
 section 00    Hash Tables
@@ -56,14 +59,14 @@ section 22    Refresh Calculation
 section 23    URL Parsing
 section 23    URL Scheme parsing
 section 24    SBuf
-section 25    MiME Header Parsing
 section 25    MIME Parsing and Internal Icons
+section 25    MiME Header Parsing
 section 26    Secure Sockets Layer Proxy
 section 27    Cache Announcer
 section 28    Access Control
 section 29    Authenticator
-section 29    Negotiate Authenticator
 section 29    NTLM Authenticator
+section 29    Negotiate Authenticator
 section 30    Ident (RFC 931)
 section 31    Hypertext Caching Protocol
 section 32    Asynchronous Disk I/O
@@ -86,8 +89,8 @@ section 46    Access Log
 section 46    Access Log - Apache combined format
 section 46    Access Log - Apache common format
 section 46    Access Log - Squid Custom format
-section 46    Access Log - Squid format
 section 46    Access Log - Squid ICAP Logging
+section 46    Access Log - Squid format
 section 46    Access Log - Squid referer format
 section 46    Access Log - Squid useragent format
 section 47    Store Directory Routines
@@ -126,8 +129,8 @@ section 79    Squid-side DISKD I/O functions.
 section 79    Squid-side Disk I/O functions.
 section 79    Storage Manager UFS Interface
 section 80    WCCP Support
-section 81    aio_xxx() POSIX emulation on Windows
 section 81    Store HEAP Removal Policies
+section 81    aio_xxx() POSIX emulation on Windows
 section 82    External ACL
 section 83    SSL accelerator support
 section 83    SSL-Bump Server/Peer negotiation
@@ -147,8 +150,5 @@ section 90    HTTP Cache Control Header
 section 90    Storage Manager Client-Side Interface
 section 92    Storage File System
 section 93    Adaptation
-section 93    eCAP Interface
 section 93    ICAP (RFC 3507) Client
-section --    External DISKD process implementation.
-section --    Refcount allocator
-section --    Unlink Daemon
+section 93    eCAP Interface
diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 1369ca5b24..99bb909638 100755
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -299,7 +299,7 @@ processDebugSections ()
 {
     destination="doc/debug-sections.txt"
 
-    sort -u < doc/debug-sections.tmp | sort -n > doc/debug-sections.tmp2
+    LC_ALL=C sort -u < doc/debug-sections.tmp > doc/debug-sections.tmp2
     cat scripts/boilerplate.h > $destination
     echo "" >> $destination
     cat doc/debug-sections.tmp2 >> $destination
@@ -411,7 +411,7 @@ for FILENAME in `git ls-files`; do
 	#
 	# DEBUG Section list maintenance
 	#
-	grep " DEBUG: section" <${FILENAME} | sed -e 's/ \* DEBUG: //' -e 's%/\* DEBUG: %%' -e 's% \*/%%' | sort -u >>doc/debug-sections.tmp
+	grep " DEBUG: section" <${FILENAME} | sed -e 's/ \* DEBUG: //' -e 's%/\* DEBUG: %%' -e 's% \*/%%' >> doc/debug-sections.tmp
 
 	#
 	# File permissions maintenance.