summaryrefslogtreecommitdiff
path: root/archivers/py-bup/files
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2022-03-02 18:49:36 +0100
committerThierry Thomas <thierry@FreeBSD.org>2022-03-26 10:20:18 +0100
commit8a56a24e868fd924c4f5fb511b31dcdcfbe7aec2 (patch)
tree7840885fb2dc24132145a660dd1f59a02267dec1 /archivers/py-bup/files
parentmail/dovecot-fts-xapian: Update to 1.5.4 (diff)
archivers/py-bup: upgrade to 0.32
This release should work with Python-3.9. Release notes at <https://github.com/bup/bup/blob/master/note/0.32-from-0.31.md>. PR: 262303 Approved by: maintainer’s time-out
Diffstat (limited to 'archivers/py-bup/files')
-rw-r--r--archivers/py-bup/files/patch-Makefile12
-rw-r--r--archivers/py-bup/files/patch-config_configure15
-rw-r--r--archivers/py-bup/files/patch-test_ext_test-sparse-files (renamed from archivers/py-bup/files/patch-t_test-sparse-files.sh)6
3 files changed, 15 insertions, 18 deletions
diff --git a/archivers/py-bup/files/patch-Makefile b/archivers/py-bup/files/patch-Makefile
index 83685eaab391..a06868c66112 100644
--- a/archivers/py-bup/files/patch-Makefile
+++ b/archivers/py-bup/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig 2020-12-15 12:37:40.871053000 -0800
-+++ Makefile 2020-12-15 12:38:46.984653000 -0800
-@@ -28,7 +28,7 @@
+--- Makefile.orig 2021-01-09 22:11:10 UTC
++++ Makefile
+@@ -28,7 +28,7 @@ current_sampledata := test/sampledata/var/rev/v$(sampl
os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
os := $(call shout,$(os),Unable to determine OS)
--CFLAGS := -Wall -Wformat=2 -O2 -Werror -Wno-unknown-pragmas $(CFLAGS)
-+CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+-CFLAGS := -O2 -Wall -Werror -Wformat=2 $(CFLAGS)
++CFLAGS := -Wall $(CFLAGS)
+ CFLAGS := -Wno-unknown-pragmas -Wsign-compare $(CFLAGS)
CFLAGS := -D_FILE_OFFSET_BITS=64 $(PYINCLUDE) $(CFLAGS)
SOEXT:=.so
-
diff --git a/archivers/py-bup/files/patch-config_configure b/archivers/py-bup/files/patch-config_configure
index e0db82ed7f27..71df44071322 100644
--- a/archivers/py-bup/files/patch-config_configure
+++ b/archivers/py-bup/files/patch-config_configure
@@ -1,13 +1,10 @@
---- config/configure.orig 2020-12-15 16:52:00.017999000 -0800
-+++ config/configure 2020-12-15 16:53:04.758080000 -0800
-@@ -66,6 +66,10 @@
+--- config/configure.orig 2021-01-09 22:11:10 UTC
++++ config/configure
+@@ -66,6 +66,7 @@ expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $M
AC_SUB bup_make "$MAKE"
bup_python="$(type -p "$PYTHON")"
+test -z "$bup_python" && bup_python="$(bup_find_prog python3.9 '')"
-+test -z "$bup_python" && bup_python="$(bup_find_prog python3.8 '')"
-+test -z "$bup_python" && bup_python="$(bup_find_prog python3.7 '')"
-+test -z "$bup_python" && bup_python="$(bup_find_prog python3.6 '')"
- test -z "$bup_python" && bup_python="$(bup_find_prog python2.7 '')"
- test -z "$bup_python" && bup_python="$(bup_find_prog python2.6 '')"
- test -z "$bup_python" && bup_python="$(bup_find_prog python2 '')"
+ test -z "$bup_python" && bup_python="$(bup_find_prog python3.8 '')"
+ test -z "$bup_python" && bup_python="$(bup_find_prog python3.7 '')"
+ test -z "$bup_python" && bup_python="$(bup_find_prog python3.6 '')"
diff --git a/archivers/py-bup/files/patch-t_test-sparse-files.sh b/archivers/py-bup/files/patch-test_ext_test-sparse-files
index 3df7cb548932..08f6217a45df 100644
--- a/archivers/py-bup/files/patch-t_test-sparse-files.sh
+++ b/archivers/py-bup/files/patch-test_ext_test-sparse-files
@@ -1,6 +1,6 @@
---- t/test-sparse-files.sh.orig 2020-12-15 12:42:46.593767000 -0800
-+++ t/test-sparse-files.sh 2020-12-15 12:43:10.570419000 -0800
-@@ -31,6 +31,12 @@
+--- test/ext/test-sparse-files.orig 2021-01-09 22:11:10 UTC
++++ test/ext/test-sparse-files
+@@ -31,6 +31,12 @@ if [ "$probe_size" -ge "$((data_size / 1024))" ]; then
exit 0
fi