From 6361de07a35f2e9dc1d7201d6b26ca31da93ee69 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 9 Dec 2021 01:07:32 +0100
Subject: [PATCH] Revert "Remove priority from attribute
 constructor/destructor"

This reverts commit 0340df46ec5897636dd071bc8b5c4272cfa7d7be.  It works
around an irrelevant operating system and breaks compilation on Guix:

mem.c:873: fatal error: RUNTIME_CHECK(((pthread_mutex_lock(((&contextslock))) == 0) ? 0 : 34) == 0) failed
/gnu/store/…-bash-minimal-5.0.16/bin/bash: line 1: 13768 Aborted                 ./${fuzzer}

Let's simply revert it for now---there are securities at stake!
---
 lib/isc/include/isc/util.h | 8 ++++----
 lib/isc/lib.c              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index f0f7f85fa4..64c26587ac 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -49,11 +49,11 @@
 #endif /* __GNUC__ */
 
 #if HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR && HAVE_FUNC_ATTRIBUTE_DESTRUCTOR
-#define ISC_CONSTRUCTOR __attribute__((constructor))
-#define ISC_DESTRUCTOR	__attribute__((destructor))
+#define ISC_CONSTRUCTOR(priority) __attribute__((constructor(priority)))
+#define ISC_DESTRUCTOR(priority)  __attribute__((destructor(priority)))
 #elif WIN32
-#define ISC_CONSTRUCTOR
-#define ISC_DESTRUCTOR
+#define ISC_CONSTRUCTOR(priority)
+#define ISC_DESTRUCTOR(priority)
 #endif
 
 /*%
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index f3576b2659..2a167fec21 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -35,9 +35,9 @@ isc_lib_register(void) {
 }
 
 void
-isc__initialize(void) ISC_CONSTRUCTOR;
+isc__initialize(void) ISC_CONSTRUCTOR(101);
 void
-isc__shutdown(void) ISC_DESTRUCTOR;
+isc__shutdown(void) ISC_DESTRUCTOR(101);
 
 void
 isc__initialize(void) {
-- 
2.34.0

</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=761810d32a0550912b5bb36a0c9f60141bcb7d20'>root</a>/<a href='/guix/log/gnu?id=761810d32a0550912b5bb36a0c9f60141bcb7d20'>gnu</a>/<a href='/guix/log/gnu/system?id=761810d32a0550912b5bb36a0c9f60141bcb7d20'>system</a>/<a href='/guix/log/gnu/system/accounts.scm?id=761810d32a0550912b5bb36a0c9f60141bcb7d20'>accounts.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/accounts.scm?id=761810d32a0550912b5bb36a0c9f60141bcb7d20&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-10-05 23:14:54 +0200'>2023-10-05</span></td><td><a href='/guix/commit/gnu/system/accounts.scm?id=97927608cb4f9c5d721115f1cb638de17ac38e62'>Revert "system: accounts: Export &lt;user-account&gt;."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 03795e2ba27424fc98957da00f6c71325e7ae425.
Fixes &lt;https://issues.guix.gnu.org/66279&gt;.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-08-20 02:00:00 +0200'>2023-08-20</span></td><td><a href='/guix/commit/gnu/system/accounts.scm?id=5a2c3352d8f8a08a5ba01542a3f282799e503d33'>Revert "gnu: system: Add home-directory-permissions field to &lt;user-account&gt;."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit e9a5eebc785cb843034b38c5c5a6dd10904bdf2a, which
as far as I can tell breaks system roll-backs thusly:

[...]
In gnu/build/accounts.scm:
   239:27  3 (_ #&lt;&lt;password-entry&gt; name: "root" password: "x" uid: 0 gid: 0 real-name: "System &gt;)
In unknown file:
           2 (string-join ("root" "x" "0" "0" "System administrator" "/root" #t) ":" #&lt;undefined&gt;)
In ice-9/boot-9.scm:
  1685:16  1 (raise-exception _ #:continuable? _)
  1685:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure string-append: Wrong type (expecting string): #t
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-08-25 15:12:54 +0200'>2023-08-25</span></td><td><a href='/guix/commit/gnu/system/accounts.scm?id=e9a5eebc785cb843034b38c5c5a6dd10904bdf2a'>gnu: system: Add home-directory-permissions field to &lt;user-account&gt;.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/accounts.scm (&lt;user-account&gt;)[home-directory-permissions]: New
field.
(user-account-home-directory-permissions): New accessor.
* gnu/build/activation.scm (activate-users+groups): Use home directory
permission bits from the user account object.
* doc/guix.texi (User Accounts): Document new field.

Signed-off-by: Josselin Poiret &lt;dev@jpoiret.xyz&gt;
</span></span></td><td>David Thompson</td></tr>
<tr><td><span title='2023-07-26 10:40:16 -0400'>2023-07-26</span></td><td><a href='/guix/commit/gnu/system/accounts.scm?id=03795e2ba27424fc98957da00f6c71325e7ae425'>system: accounts: Export &lt;user-account&gt;.</a></td><td>Maxim Cournoyer</td></tr>