Date: Sunday, February 12, 2023 @ 21:05:54
Author: seblu
Revision: 468681
upgpkg: patch 2.7.6-9
Added:
patch/trunk/test-read-only.patch
Modified:
patch/trunk/PKGBUILD
----------------------+
PKGBUILD | 5 +++--
test-read-only.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-12 20:30:18 UTC (rev 468680)
+++ PKGBUILD 2023-02-12 21:05:54 UTC (rev 468681)
@@ -10,7 +10,6 @@
arch=('x86_64')
url='https://www.gnu.org/software/patch/'
license=('GPL')
-groups=('base-devel')
depends=('glibc' 'attr')
makedepends=('ed')
optdepends=('ed: for patch -e functionality')
@@ -23,6 +22,7 @@
'19599883ffb6a450d2884f081f8ecf68edbed7ee.patch' # Fix memory leaks
introduced in CVE-2018-1000165
'https://github.com/mirror/patch/commit/369dcccdfa6336e5a873d6d63705cfbe04c55727.patch'
'https://github.com/mirror/patch/commit/9c986353e420ead6e706262bf204d6e03322c300.patch'
# CVE-2018-6952
+ 'test-read-only.patch'
)
sha256sums=('ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd'
'SKIP'
@@ -32,7 +32,8 @@
'473f8a7fa8152a3c7803633e2a3072dab545b74377ea618451ceda4283643364'
'6d64a8b8ddfb802ec0aa804388eb5ef51ac808c7a5c111d10490c270eb4fe727'
'e1fc8a8aa2cad71b2a6207241ea71a33a7e3dacb8533ad54af35170c5a6562d1'
- '4b9e81985ca057fa39daed34a4710eb113f08b3d1ce77a7121ddd8e3fae8007a')
+ '4b9e81985ca057fa39daed34a4710eb113f08b3d1ce77a7121ddd8e3fae8007a'
+ 'cce641860eeb7d02f7f3430337e35b76d3c87b615a53dbdf0b0f588f0f9dc57b')
prepare() {
cd $pkgname-$pkgver
Added: test-read-only.patch
===================================================================
--- test-read-only.patch (rev 0)
+++ test-read-only.patch 2023-02-12 21:05:54 UTC (rev 468681)
@@ -0,0 +1,36 @@
+# Remove read-only-files test.
+# Fail to build on btrfs with compression enabled.
+#
+# [44] patch -p0 --read-only=fail < f.diff || echo "Status: $?" -- ok
+# [54] patch -f -p0 --read-only=warn < f.diff || echo "Status: $?" -- FAILED
+# --- expected
+# +++ got
+# @@ -1,4 +1,4 @@
+# File f is read-only; trying to patch anyway
+# patching file f
+# -File f is read-only; trying to patch anyway
+# -patching file f
+# +/home/seblu/arch/packages/core/patch/trunk/src/patch-2.7.6/src/patch:
setting attribute btrfs.compression for btrfs.compression: Permission denied
+# +Status: 2
+# [65] patch -f -p0 --read-only=ignore < f.diff || echo "Status: $?" -- FAILED
+# --- expected
+# +++ got
+# @@ -1,2 +1,3 @@
+# patching file f
+# -patching file f
+# +/home/seblu/arch/packages/core/patch/trunk/src/patch-2.7.6/src/patch:
setting attribute btrfs.compression for btrfs.compression: Permission denied
+# +Status: 2
+# 3 tests (1 passed, 2 failed)
+# FAIL read-only-files (exit status: 1)
+
+
+--- a/tests/Makefile.am 2023-02-12 21:53:41.703257940 +0100
++++ b/tests/Makefile.am 2023-02-12 22:01:28.252357777 +0100
+@@ -55,7 +55,6 @@
+ preserve-c-function-names \
+ preserve-mode-and-timestamp \
+ quoted-filenames \
+- read-only-files \
+ reject-format \
+ remember-backup-files \
+ remember-reject-files \
