From 172e1633f319a28e5d90edc2d2899fa94535879c Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Thu, 6 Jul 2023 15:12:15 -0700
Subject: [PATCH 1/2] glibc enhancements

Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
---
 glibc.yaml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/glibc.yaml b/glibc.yaml
index 3423558d48c8..04cfe0e633f6 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -1,7 +1,7 @@
 package:
   name: glibc
   version: 2.37
-  epoch: 7
+  epoch: 8
   description: "the GNU C library"
   copyright:
     - license: GPL-3.0-or-later
@@ -69,15 +69,22 @@ pipeline:
   - name: 'Configure glibc'
     runs: |
       cd build
+      echo "user-defined-trusted-dirs=/usr/local/lib:/usr/local/lib64:/usr/lib:/usr/lib64:/lib:/lib64" >> configparms.base
+
+      echo "build-programs=no" > configparms
+      cat configparms.base >> configparms
+
+      # We remove fortify when building the libraries
       export CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
       export CPPFLAGS=${CPPFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
+
       ../configure \
         --prefix=/usr \
         --libdir=/usr/lib \
         --datadir=/usr/share \
         --includedir=/usr/include \
         --host=${{host.triplet.gnu}} \
-        --build=$(../config.guess) \
+        --build=${{host.triplet.gnu}} \
         --disable-werror \
         --enable-kernel=4.9
 
@@ -87,8 +94,13 @@ pipeline:
       make -C build -j$(nproc)
 
   - runs: |
-      export CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
-      export CPPFLAGS=${CPPFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
+      # Build the programs with fortify
+      echo "build-programs=yes" > build/configparms
+      echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=3" >> build/configparms
+      cat build/configparms.base >> build/configparms
+      make -C build -j$(nproc)
+
+  - runs: |
       make -C build -j$(nproc) install DESTDIR="${{targets.destdir}}"
 
   - name: "Set up ldconfig"
@@ -324,6 +336,9 @@ subpackages:
             runs: |
               mkdir -p "${{targets.subpkgdir}}"/lib64
               mv "${{targets.destdir}}"/lib64/ld-linux-x86-64.so.2 "${{targets.subpkgdir}}"/lib64/
+      - runs: |
+          mkdir -p "${{targets.subpkgdir}}"/etc
+          mv "${{targets.destdir}}"/etc/ld.so.* "${{targets.subpkgdir}}"/etc/
     dependencies:
       runtime:
         - wolfi-baselayout

From f855047ea0eeac47f1976f7d96b6c7621397d551 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Thu, 6 Jul 2023 21:12:24 -0700
Subject: [PATCH 2/2] further glibc enhancements

Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
---
 glibc.yaml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/glibc.yaml b/glibc.yaml
index 04cfe0e633f6..c5b989057adf 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -1,7 +1,7 @@
 package:
   name: glibc
   version: 2.37
-  epoch: 8
+  epoch: 9
   description: "the GNU C library"
   copyright:
     - license: GPL-3.0-or-later
@@ -70,6 +70,9 @@ pipeline:
     runs: |
       cd build
       echo "user-defined-trusted-dirs=/usr/local/lib:/usr/local/lib64:/usr/lib:/usr/lib64:/lib:/lib64" >> configparms.base
+      echo "rtlddir=/lib" >> configparms.base
+      echo "slibdir=/lib" >> configparms.base
+      echo "libdir=/usr/lib" >> configparms.base
 
       echo "build-programs=no" > configparms
       cat configparms.base >> configparms
@@ -332,10 +335,11 @@ subpackages:
             runs: |
               mkdir -p "${{targets.subpkgdir}}"/lib
               mv "${{targets.destdir}}"/lib/ld-linux-aarch64.so.1 "${{targets.subpkgdir}}"/lib/
+          # Regrettably, the LSB *requires* the GLIBC ELF loader to be installed in `/lib64`.
           - if: ${{build.arch}} == 'x86_64'
             runs: |
               mkdir -p "${{targets.subpkgdir}}"/lib64
-              mv "${{targets.destdir}}"/lib64/ld-linux-x86-64.so.2 "${{targets.subpkgdir}}"/lib64/
+              mv "${{targets.destdir}}"/lib/ld-linux-x86-64.so.2 "${{targets.subpkgdir}}"/lib64/
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/etc
           mv "${{targets.destdir}}"/etc/ld.so.* "${{targets.subpkgdir}}"/etc/
@@ -430,26 +434,26 @@ subpackages:
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/bin
-          mkdir -p "${{targets.subpkgdir}}"/lib64
+          mkdir -p "${{targets.subpkgdir}}"/lib
           mkdir -p "${{targets.subpkgdir}}"/var
 
           mv "${{targets.destdir}}"/usr/bin/makedb "${{targets.subpkgdir}}"/usr/bin
-          mv "${{targets.destdir}}"/lib64/libnss_db.so.2 "${{targets.subpkgdir}}"/lib64
+          mv "${{targets.destdir}}"/lib/libnss_db.so.2 "${{targets.subpkgdir}}"/lib
           mv "${{targets.destdir}}"/var/db "${{targets.subpkgdir}}"/var
 
   - name: "nss-hesiod"
     description: "NSS module for hesiod lookups"
     pipeline:
       - runs: |
-          mkdir -p "${{targets.subpkgdir}}"/lib64
-          mv "${{targets.destdir}}"/lib64/libnss_hesiod.so.2 "${{targets.subpkgdir}}"/lib64
+          mkdir -p "${{targets.subpkgdir}}"/lib
+          mv "${{targets.destdir}}"/lib/libnss_hesiod.so.2 "${{targets.subpkgdir}}"/lib
 
   - name: "pcprofiledump"
     description: "PC profiling tool"
     pipeline:
       - runs: |
-          mkdir -p "${{targets.subpkgdir}}"/lib64
-          mv "${{targets.destdir}}"/lib64/libpcprofile.so "${{targets.subpkgdir}}"/lib64
+          mkdir -p "${{targets.subpkgdir}}"/lib
+          mv "${{targets.destdir}}"/lib/libpcprofile.so "${{targets.subpkgdir}}"/lib
 
           mkdir -p "${{targets.subpkgdir}}"/usr/bin
           mv "${{targets.destdir}}"/usr/bin/pcprofiledump "${{targets.subpkgdir}}"/usr/bin