A newer version of borgbackup has been made available: 1.2.0, which is
the first release of the 1.2 branch. This update should play nicely
together with releases in the 1.1 branch, and strictly taken, nothing
special is required for upgrading.
Noticeable change is that freeing repository space only happens when
"borg compact" is invoked. Borg < 1.2 invoked compaction automatically
at the end of each repository writing command. Borg >= 1.2 does not do
that any more. Changelog, including upgrade and compatibility notes, can
be found at
https://github.com/borgbackup/borg/blob/1.2.0/docs/changes.rst#version-120-2022-02-22-220222--.
For now I propose to maintain both branches. 1.1.x Will get fixes for a
while, and advantage of offering releases from both branches is that
people do not have to rush in adopting their scripts.
Diff below moves the current release (1.1.17) to borgbackup/1.1, and
adds 1.2.0 as borgbackup/1.2. @pkgpath-marker has been added to the
PLIST of borgbackup/1.1, so nobody is forced to 1.2.0 when using
`pkg_add -u`.
Testing:
- `make test` runs successfully for both releases.
- `pkg_add -u` from 1.1.17 should pick up releases in the 1.1 branch.
- I have been testing/following the 1.2 branch since the first alpha
release, and have switched completely since the first release
candidate. So far, no regression observed.
There is only one consumer of borgbackup, which needs some attention:
sysutils/borgmatic. I will send a diff for this in a separate mail.
Tests/comments/OK?
diff --git 1.1/Makefile 1.1/Makefile
new file mode 100644
index 00000000000..12e2a699586
--- /dev/null
+++ 1.1/Makefile
@@ -0,0 +1,12 @@
+# $OpenBSD: Makefile,v 1.42 2021/11/02 00:02:21 sthen Exp $
+
+MODPY_EGG_VERSION = 1.1.17
+REVISION = 1
+
+WANTLIB = ${COMPILER_LIBCXX} b2 m
+
+COMPILER = base-clang ports-gcc base-gcc
+
+LIB_DEPENDS = security/libb2
+
+.include <bsd.port.mk>
diff --git 1.1/distinfo 1.1/distinfo
new file mode 100644
index 00000000000..e459bd1dfe8
--- /dev/null
+++ 1.1/distinfo
@@ -0,0 +1,2 @@
+SHA256 (borgbackup-1.1.17.tar.gz) = erkk/AF7JJKb7c66DczhbVb5hov5tQUNKq4usIBnFnQ=
+SIZE (borgbackup-1.1.17.tar.gz) = 3781411
diff --git 1.1/patches/patch-setup_py 1.1/patches/patch-setup_py
new file mode 100644
index 00000000000..7027230efb9
--- /dev/null
+++ 1.1/patches/patch-setup_py
@@ -0,0 +1,16 @@
+$OpenBSD: patch-setup_py,v 1.1 2021/07/15 03:24:34 bket Exp $
+
+do not package source files
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -900,7 +900,7 @@ setup(
+ include_package_data=True,
+ # ...except the source files which have been compiled (C extensions):
+ exclude_package_data={
+- '': ['*.c', '*.h', '*.pyx', ],
++ '': ['*.c', '*.cpp', '*.h', '*.pyx', ],
+ },
+ cmdclass=cmdclass,
+ ext_modules=ext_modules,
diff --git 1.1/patches/patch-src_borg__endian_h 1.1/patches/patch-src_borg__endian_h
new file mode 100644
index 00000000000..2cd5a00cb28
--- /dev/null
+++ 1.1/patches/patch-src_borg__endian_h
@@ -0,0 +1,26 @@
+$OpenBSD: patch-src_borg__endian_h,v 1.2 2017/11/05 06:32:36 jca Exp $
+
+__builtin_bswap32 unavailable at least on sparc64
+
+Index: src/borg/_endian.h
+--- src/borg/_endian.h.orig
++++ src/borg/_endian.h
+@@ -1,6 +1,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdint.h>
++#include <endian.h>
+
+ #if defined (__SVR4) && defined (__sun)
+ #include <sys/isa_defs.h>
+@@ -19,8 +20,8 @@
+
No comments:
Post a Comment