diff options
| -rw-r--r-- | system/diffutils/APKBUILD | 10 | ||||
| -rw-r--r-- | system/diffutils/gnulib-tests-dont-require-gpg-passphrase.patch | 2 | ||||
| -rw-r--r-- | system/diffutils/musl-ppc32.patch | 12 |
3 files changed, 5 insertions, 19 deletions
diff --git a/system/diffutils/APKBUILD b/system/diffutils/APKBUILD index 0264d56ed..f7fd123c4 100644 --- a/system/diffutils/APKBUILD +++ b/system/diffutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=diffutils -pkgver=3.8 -pkgrel=1 +pkgver=3.9 +pkgrel=0 pkgdesc="Utility programs used for creating patch files" url="https://www.gnu.org/software/diffutils/" arch="all" @@ -12,7 +12,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz disable-mbrtowc-test.patch gnulib-tests-dont-require-gpg-passphrase.patch - musl-ppc32.patch " build() { @@ -36,7 +35,6 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c diffutils-3.8.tar.xz +sha512sums="d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f diffutils-3.9.tar.xz 079d04f48fa5f5fd57eca8ba9ddefcdbb9e42a26dba7ca9b0a6f3f391112aa5ce34f0a32a931432f0ef0cc3345cc97de8310660cd05df9b30c38609440a729ee disable-mbrtowc-test.patch -d45ab939e70b8b6e80d8950a8436be81e34e1067741196229edc7fbe33db92aa14532cf7490379741e779ae2cfc6010bec22dda2b2a046a3bc9eb68b94a0ff11 gnulib-tests-dont-require-gpg-passphrase.patch -249b62b0d3b166507103860122460d8c042c12bbf4c7fe883e2d0e2b90bd9f2ba387f444908aa874c9a06db72aea3e7dccefa0033c663088a0be015aaa077a9c musl-ppc32.patch" +bf78ccb22f9bcc7bb69414e19075233369c4373210a3f686b459ba37a0167ed130bd03b2d18440e04b773e5131a19006482a0ed8a1e2344ed4e869778c843f95 gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/system/diffutils/gnulib-tests-dont-require-gpg-passphrase.patch b/system/diffutils/gnulib-tests-dont-require-gpg-passphrase.patch index 1eb15c5e0..6cde11072 100644 --- a/system/diffutils/gnulib-tests-dont-require-gpg-passphrase.patch +++ b/system/diffutils/gnulib-tests-dont-require-gpg-passphrase.patch @@ -1,6 +1,6 @@ --- diffutils-3.6/gnulib-tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 +++ diffutils-3.6/gnulib-tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 -@@ -32,6 +32,7 @@ +@@ -39,6 +39,7 @@ touch d/a b c && git config user.email "you@example.com" && git config user.name "Your Name" && diff --git a/system/diffutils/musl-ppc32.patch b/system/diffutils/musl-ppc32.patch deleted file mode 100644 index c1cd3dace..000000000 --- a/system/diffutils/musl-ppc32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/lib/sigsegv.c b/lib/sigsegv.c ---- a/lib/sigsegv.c 2022-01-08 21:35:58.620000000 +0000 -+++ b/lib/sigsegv.c 2022-01-08 21:36:11.380000000 +0000 -@@ -222,7 +222,7 @@ - # if 0 - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] - # else --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] - # endif - # endif - |