Update for 2.39+r52+gf8e4623421-1 (#13)

* Update inject_reenable_DT_HASH * Update inject_rogue_company_reverts * Update for 2.39-3 * Update for 2.39-4 * Sync with f8e462342189525e4605cf233b8f798d1c7f398d * Sync with f8e462342189525e4605cf233b8f798d1c7f398d part-2 * Sync with f8e462342189525e4605cf233b8f798d1c7f398d part final * Update inject_reenable_DT_HASH for 2.39+r52 * Update inject_rogue_company_reverts for 2.39+r52 * Update disable_tests for 2.39+r52
Frogging-Family · May 17, 2024 · 6a2ddca · 6a2ddca
1 parent 54da2b8
commit 6a2ddca
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 95 deletions.
diff --git a/disable_tests.patch b/disable_tests.patch
@@ -5,10 +5,10 @@ Subject: Remove tests, unhappy after the reverts
 
 
 diff --git a/PKGBUILD b/PKGBUILD
-index 3a8bdc5..876ea32 100644
+index c403c10730da7ad32ddd3853f06ac4ab4b3b4f92..fafba76e132451f9c8bda57f7cdc91cac39cf833 100644
 --- a/PKGBUILD
 +++ b/PKGBUILD
-@@ -116,38 +116,6 @@ build() {
+@@ -125,37 +125,6 @@ build() {
      DESTDIR="${srcdir}"/locales install-locale-files
  }
 
@@ -17,16 +17,15 @@ index 3a8bdc5..876ea32 100644
 -_skip_test() {
 -  test=${1}
 -  file=${2}
--  sed -i "/\b${test} /d" "${srcdir}"/glibc/${file}
+-  sed -i "/\b${test} /d" "${srcdir}/glibc/${file}"
 -}
 -
 -check() (
 -  cd glibc-build
 -
 -  # adjust/remove buildflags that cause false-positive testsuite failures
--  sed -i '/FORTIFY/d' configparms                                     # failure to build testsuite
 -  sed -i 's/-Werror=format-security/-Wformat-security/' config.make   # failure to build testsuite
--  sed -i '/CFLAGS/s/-fno-plt//' config.make                           # 16 failures
+-  sed -i '/CFLAGS/s/-fno-plt//' config.make                           # 27 failures
 -  sed -i '/CFLAGS/s/-fexceptions//' config.make                       # 1 failure
 -
 -  # The following tests fail due to restrictions in the Arch build system

diff --git a/inject_reenable_DT_HASH.patch b/inject_reenable_DT_HASH.patch
@@ -1,26 +1,26 @@
 diff --git a/PKGBUILD b/PKGBUILD
-index 5d9bac1edd3dc08920ec005b91ccd7a0ec528464..d4c210c34edef6e53ed2217d69ac7ee598795649 100644
+index 387a4125a2a54c298f72e6498b0343bb4cb7b117..e500282d05f2d7c0b8e29e6c17b389938b9174da 100644
 --- a/PKGBUILD
 +++ b/PKGBUILD
-@@ -21,6 +21,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
+@@ -21,6 +21,7 @@ source=("git+https://sourceware.org/git/glibc.git#commit=${_commit}"
          locale-gen
          lib32-glibc.conf
          sdt.h sdt-config.h
 +        reenable_DT_HASH.patch
  )
  validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
-               BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh
-@@ -31,7 +32,8 @@ b2sums=('SKIP'
+               BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
+@@ -29,7 +30,8 @@ b2sums=('a37822e85d99b01b289950bbc3a6ba3c9f88cf2aafe6510a4e3aa9666c35ab4279377b8
          '04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
          '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
          'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
 -        '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678')
 +        '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
 +        'SKIP')
-
- prepare() {
-   mkdir -p glibc-build lib32-glibc-build
-@@ -38,6 +39,10 @@ prepare() {
+ 
+ pkgver() {
+   cd glibc
+@@ -42,6 +44,10 @@ prepare() {
    [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
    cd glibc
 

diff --git a/inject_rogue_company_reverts.patch b/inject_rogue_company_reverts.patch
@@ -5,33 +5,32 @@ Subject: Add rogue company reverts patch
 
 
 diff --git a/PKGBUILD b/PKGBUILD
-index a783164..3a8bdc5 100644
+index e500282d05f2d7c0b8e29e6c17b389938b9174da..c403c10730da7ad32ddd3853f06ac4ab4b3b4f92 100644
 --- a/PKGBUILD
 +++ b/PKGBUILD
-@@ -22,6 +22,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
+@@ -22,6 +22,7 @@ source=("git+https://sourceware.org/git/glibc.git#commit=${_commit}"
          lib32-glibc.conf
          sdt.h sdt-config.h
          reenable_DT_HASH.patch
 +        rogue_company_reverts.patch
  )
  validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
                BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
-@@ -31,7 +32,8 @@ b2sums=('SKIP'
+@@ -31,6 +32,7 @@ b2sums=('a37822e85d99b01b289950bbc3a6ba3c9f88cf2aafe6510a4e3aa9666c35ab4279377b8
          '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
          'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
          '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
--        'SKIP')
 +        'SKIP'
-+        'SKIP')
+         'SKIP')
 
- prepare() {
-   mkdir -p glibc-build lib32-glibc-build
-@@ -43,6 +45,9 @@ prepare() {
+ pkgver() {
+@@ -48,6 +50,10 @@ prepare() {
    # which relies on DT_HASH to be present in these libs.
    # reconsider 2023-01
    patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch
 +
-+  # Reverting 7a5db2e82fbb6c3a6e3fdae02b7166c5d0e8c7a8, 8208be389bce84be0e1c35a3daa0c3467418f921, 6bf789d69e6be48419094ca98f064e00297a27d5, b89d5de2508215ef3131db7bed76ac50b3f4c205, 86f0179bc003ffc34ffaa8d528a7a90153ac06c6 for Rogue Company to work again
++  # Reverting 7a5db2e82fbb6c3a6e3fdae02b7166c5d0e8c7a8, 8208be389bce84be0e1c35a3daa0c3467418f921,
++  # 6bf789d69e6be48419094ca98f064e00297a27d5, b89d5de2508215ef3131db7bed76ac50b3f4c205, 86f0179bc003ffc34ffaa8d528a7a90153ac06c6 for Rogue Company to work again
 +  patch -Np1 -i "${srcdir}"/rogue_company_reverts.patch
  }