2.38-3 fixups

Frogging-Family · Aug 29, 2023 · e234850 · e234850
1 parent 5abfa28
commit e234850
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/inject_rogue_company_reverts.patch b/inject_rogue_company_reverts.patch
@@ -9,27 +9,27 @@ index a783164..3a8bdc5 100644
 --- a/PKGBUILD
 +++ b/PKGBUILD
 @@ -22,6 +22,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
-         sdt.h sdt-config.h
          reenable_DT_HASH.patch
-         PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
+         fix-malloc-p1.patch
+         fix-malloc-p2.patch
 +        rogue_company_reverts.patch
  )
  validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
                BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
 @@ -31,7 +32,8 @@ b2sums=('SKIP'
-         'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
          '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
          '35e03ed912e1b0cd23783ab83ce919412885c141344905b8b67bbad4a86c48cf3e893806060e48d5737514ff80cea0b58b0e1f15707c32224579c416dcd810c0'
--        '2a83dad4bcca543a5a85e91ebbe2bbccb4f863044d9e6e65806be0ea43ba70dd4e1e76e1548f9d189e996d4fcda0afc75efebdc9431fe10f2b66d3d2e878615b')
-+        '2a83dad4bcca543a5a85e91ebbe2bbccb4f863044d9e6e65806be0ea43ba70dd4e1e76e1548f9d189e996d4fcda0afc75efebdc9431fe10f2b66d3d2e878615b'
+         '28c983bcebc0eeeb37a60756ccee50d587a99d5e2100430d5c0ee51a19d9b2176a4013574a7d72b5857302fbb60d371bbf0b3cdb4fc700a1dbe3aae4a42b04b9'
+-        'c3e94f5b0999878ff472e32f49dc13c20eb9db68c633017cb7824617eb824cf6cff7ea53b92962926e0ee84fd39736616298dcb926356625dd124f3754e79932')
++        'c3e94f5b0999878ff472e32f49dc13c20eb9db68c633017cb7824617eb824cf6cff7ea53b92962926e0ee84fd39736616298dcb926356625dd124f3754e79932'
 +        'SKIP')
 
  prepare() {
    mkdir -p glibc-build lib32-glibc-build
 @@ -43,6 +45,9 @@ prepare() {
-   patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch
-
-   patch -Np1 < ../PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
+
+   patch -Np1 -i "${srcdir}"/fix-malloc-p1.patch
+   patch -Np1 -i "${srcdir}"/fix-malloc-p2.patch
 +
 +  # Reverting 7a5db2e82fbb6c3a6e3fdae02b7166c5d0e8c7a8, 8208be389bce84be0e1c35a3daa0c3467418f921, 6bf789d69e6be48419094ca98f064e00297a27d5, b89d5de2508215ef3131db7bed76ac50b3f4c205, 86f0179bc003ffc34ffaa8d528a7a90153ac06c6 for Rogue Company to work again
 +  patch -Np1 -i "${srcdir}"/rogue_company_reverts.patch