pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/bup
Module Name: pkgsrc
Committed By: gdt
Date: Sat Dec 9 01:46:30 UTC 2023
Modified Files:
pkgsrc/sysutils/bup: Makefile PLIST distinfo
Log Message:
sysutils/bup: Update to 0.33.2
Upstream NEWS less some bugfixes and minor improvements:
Notable changes in 0.33 since 0.32
Python 3 is now required, in particular 3.7 or newer.
The version of Python is no longer determined by the value of PYTHON
during ./configure. It is now determined by the version of
python-config selected during configuration. The BUP_PYTHON_CONFIG
environment variable can be set during configuration to select a
particular executable (e.g. BUP_PYTHON_CONFIG=python3.9-config
./configure). See the README for further details.
The bup executable is now a binary rather than a Python
script. Practically speaking, this means that the Python version is
determined by the libpython that the executable is linked against
(selected via python-config), and it means that bup will show up as
"bup" in process listings rather than a python invocation.
The output of bup ls for multiple paths includes each path before
its contents, more closely matching the system ls.
The bup ftp ls command should now respect the working directory (set
by cd), and that directory has been added to the prompt.
The index-cache is no longer included in the bup midx --dir default.
Performance may have improved after the relocation of a number of
operations from Python to C, and a number of improvements to the
VFS.
Bugs
Bup should now respect the current umask, directory sgid bit,
etc. when creating new files (e.g. new packfiles). Previously, it
would create them via mkstemp, which would cause them to be readable
only by the current user.
Bup should now be able to handle repositories containing signed
commits.
bup tag has been changed to rely on git update-ref instead of
writing the (loose) refs directly so that it can handle packed refs
correctly.
bup save should be more careful about noting an error and skipping
paths whose type (link, regular file, ...) has changed since
indexing.
There should no longer be a narrow window where save could store
conflicting symlink targets or conflicting sizes (in the metadata
record and the packfile symlink blob) for a path if the filesystem
changed at just the wrong time during a save.
bup fuse should no longer become unusable after an unfinished read
of commits associated with tags. The underlying VFS issue may have
affected other commands too.
Bup's packfile names should now match git's. Previously bup computed
the SHA1 from just the sorted object list (cf. git-index-pack(1)),
but git appears to include the entire pack file in the hash.
Passing idx files to bup midx along with --dir should now work
correctly.
Resource usage (e.g. memory) may have improved, given a number of
changes intended to make bup release resources more carefully and
sooner.
Build and install
The build process should now work on systems where make isn't GNU
Make (the Makefile automatically redirects to GNUmakefile).
Thanks to (at least)
Abdel Said, Arthur Ward, Bas Stottelaar, Brian Minton, Greg Troxel,
Johannes Berg, Mark Hewitt, Muh Muhten, and Rob Browning
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/sysutils/bup/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/bup/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/bup/distinfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/bup/Makefile
diff -u pkgsrc/sysutils/bup/Makefile:1.62 pkgsrc/sysutils/bup/Makefile:1.63
--- pkgsrc/sysutils/bup/Makefile:1.62 Mon Aug 14 05:25:13 2023
+++ pkgsrc/sysutils/bup/Makefile Sat Dec 9 01:46:30 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2023/08/14 05:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2023/12/09 01:46:30 gdt Exp $
-DISTNAME= bup-0.32.1
-PKGREVISION= 1
+DISTNAME= bup-0.33.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=bup/}
# bup has two problems that make packaging difficult. One is that
@@ -18,7 +17,7 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=bup/
# Upstream should have a tag, but doesn't.
# EXTRACT_SUFX default value is set too late, so using it in SITES.* fails.
EXTRACT_SUFX= .tar.gz
-MAN_TAG= 2fe35faff1fb9c5e7b0ea357de371ac219f2cc38
+MAN_TAG= a9757d6fe3509130622a636d35e92049f9e20fce
MAN_UNPACK= bup-${MAN_TAG}
MAN_DISTFILE= bup-man-${MAN_TAG}${EXTRACT_SUFX}
SITES.${MAN_DISTFILE}= -${MASTER_SITE_GITHUB:=bup/bup/archive/}${MAN_TAG}${EXTRACT_SUFX}
@@ -32,6 +31,7 @@ COMMENT= Highly efficient file backup sy
LICENSE= gnu-gpl-v2
USE_LANGUAGES= c
+USE_TOOLS+= bash gmake perl:run
HAS_CONFIGURE= yes
# On macOS 10.13, building bup fails with defaults but builds with
@@ -46,11 +46,22 @@ TEST_DEPENDS+= rsync-[0-9]*:../../net/rs
PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-tornado
-DOCDIR= ${WRKDIR}/${MAN_UNPACK}
+DIST_MANPAGES= ${WRKDIR}/${MAN_UNPACK}
# Note that tests 1) will fail on a fs mounted noatime and 2) need a
# lot of space, perhaps 1 GB.
TEST_TARGET= test
+TEST_ENV+= TZ=UTC
+
+# bup's configure is buggy and ends up with a make->make symlink.
+# Whack it to something sensible. Reported upstream 20221204.
+#
+# bup's Makefile is buggy in that there is no install target. Whack
+# Makefile from GNUmakefile so that the install target will be run.
+# Reported upstream 20221204.
+post-configure:
+ cd ${WRKSRC}/config/bin && rm -f make && ln -s ${TOOLS_PATH.gmake} make
+ cd ${WRKSRC} && cp -pf GNUmakefile Makefile
MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= PYTHON=${PYTHONBIN}
@@ -59,32 +70,75 @@ MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/
# Even if converters/pandoc is installed, pretend as if it weren't.
MAKE_FLAGS+= PANDOC=
-USE_TOOLS+= bash gmake perl:run
-
-CONFIGURE_ENV+= MAKE=${TOOLS_PATH.gmake}
+REPLACE_BASH+= lib/cmd/bup-import-rdiff-backup
+REPLACE_BASH+= dev/checksum
+REPLACE_BASH+= dev/compare-trees
+REPLACE_BASH+= dev/configure-sampledata
+REPLACE_BASH+= dev/force-delete
+REPLACE_BASH+= dev/git-cat-tree
+REPLACE_BASH+= dev/perf-glance
+REPLACE_BASH+= dev/prep-for-debianish-build
+REPLACE_BASH+= dev/prep-for-macos-build
+REPLACE_BASH+= dev/refresh
+REPLACE_BASH+= dev/sync-tree
+REPLACE_BASH+= dev/system-info
+REPLACE_BASH+= dev/update-checkout-info
+REPLACE_BASH+= dev/update-doc-branches
+REPLACE_BASH+= dev/validate-python
+REPLACE_BASH+= pylint
+REPLACE_BASH+= test/ext/test-cat-file
+REPLACE_BASH+= test/ext/test-command-without-init-fails
+REPLACE_BASH+= test/ext/test-comparative-split-join
+REPLACE_BASH+= test/ext/test-compression
+REPLACE_BASH+= test/ext/test-drecurse
+REPLACE_BASH+= test/ext/test-fsck
+REPLACE_BASH+= test/ext/test-fuse
+REPLACE_BASH+= test/ext/test-gc
+REPLACE_BASH+= test/ext/test-help
+REPLACE_BASH+= test/ext/test-import-duplicity
+REPLACE_BASH+= test/ext/test-import-rdiff-backup
+REPLACE_BASH+= test/ext/test-index
+REPLACE_BASH+= test/ext/test-index-check-device
+REPLACE_BASH+= test/ext/test-index-clear
+REPLACE_BASH+= test/ext/test-index-save-type-change
+REPLACE_BASH+= test/ext/test-list-idx
+REPLACE_BASH+= test/ext/test-ls
+REPLACE_BASH+= test/ext/test-ls-remote
+REPLACE_BASH+= test/ext/test-main
+REPLACE_BASH+= test/ext/test-meta
+REPLACE_BASH+= test/ext/test-misc
+REPLACE_BASH+= test/ext/test-on
+REPLACE_BASH+= test/ext/test-packsizelimit
+REPLACE_BASH+= test/ext/test-redundant-saves
+REPLACE_BASH+= test/ext/test-release-archive
+REPLACE_BASH+= test/ext/test-restore-map-owner
+REPLACE_BASH+= test/ext/test-restore-single-file
+REPLACE_BASH+= test/ext/test-rm
+REPLACE_BASH+= test/ext/test-rm-between-index-and-save
+REPLACE_BASH+= test/ext/test-save-creates-no-unrefs
+REPLACE_BASH+= test/ext/test-save-data-race
+REPLACE_BASH+= test/ext/test-save-errors
+REPLACE_BASH+= test/ext/test-save-restore
+REPLACE_BASH+= test/ext/test-save-restore-excludes
+REPLACE_BASH+= test/ext/test-save-smaller
+REPLACE_BASH+= test/ext/test-save-strip-graft
+REPLACE_BASH+= test/ext/test-save-symlink-race
+REPLACE_BASH+= test/ext/test-save-with-valid-parent
+REPLACE_BASH+= test/ext/test-sparse-files
+REPLACE_BASH+= test/ext/test-split-join
+REPLACE_BASH+= test/ext/test-tz
+REPLACE_BASH+= test/ext/test-web
+REPLACE_BASH+= test/ext/test-xdev
+REPLACE_BASH+= .sh
-REPLACE_BASH+= cmd/import-rdiff-backup-cmd.sh
-REPLACE_BASH+= t/compare-trees
-REPLACE_BASH+= t/configure-sampledata
-REPLACE_BASH+= t/force-delete
-REPLACE_BASH+= t/subtree-hash
-REPLACE_BASH+= t/test-cat-file.sh
-REPLACE_BASH+= t/test-command-without-init-fails.sh
-REPLACE_BASH+= t/test-index-check-device.sh
-REPLACE_BASH+= t/test-meta.sh
-REPLACE_BASH+= t/test-redundant-saves.sh
-REPLACE_BASH+= t/test-restore-single-file.sh
-REPLACE_BASH+= t/test-rm-between-index-and-save.sh
-REPLACE_BASH+= t/test-save-creates-no-unrefs.sh
-REPLACE_BASH+= t/test.sh
-REPLACE_BASH+= wvtest-bup.sh
+DOCDIR= share/doc/${PKGBASE}
-INSTALLATION_DIRS+= ${PKGMANDIR}/man1 share/doc/${PKGBASE}
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${DOCDIR}
post-install:
- ${INSTALL_DATA} ${DOCDIR}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA} ${WRKSRC}/DESIGN ${DESTDIR}${PREFIX}/share/doc/bup
- ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/bup
+ ${INSTALL_DATA} ${DIST_MANPAGES}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_DATA} ${WRKSRC}/DESIGN ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
.include "options.mk"
Index: pkgsrc/sysutils/bup/PLIST
diff -u pkgsrc/sysutils/bup/PLIST:1.11 pkgsrc/sysutils/bup/PLIST:1.12
--- pkgsrc/sysutils/bup/PLIST:1.11 Sun Sep 20 22:28:00 2020
+++ pkgsrc/sysutils/bup/PLIST Sat Dec 9 01:46:30 2023
@@ -1,11 +1,48 @@
-@comment $NetBSD: PLIST,v 1.11 2020/09/20 22:28:00 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2023/12/09 01:46:30 gdt Exp $
bin/bup
lib/bup/bup/__init__.py
lib/bup/bup/_helpers.so
lib/bup/bup/bloom.py
lib/bup/bup/client.py
+lib/bup/bup/cmd/__init__.py
+lib/bup/bup/cmd/bloom.py
+lib/bup/bup/cmd/cat_file.py
+lib/bup/bup/cmd/daemon.py
+lib/bup/bup/cmd/damage.py
+lib/bup/bup/cmd/drecurse.py
+lib/bup/bup/cmd/features.py
+lib/bup/bup/cmd/fsck.py
+lib/bup/bup/cmd/ftp.py
+lib/bup/bup/cmd/fuse.py
+lib/bup/bup/cmd/gc.py
+lib/bup/bup/cmd/get.py
+lib/bup/bup/cmd/help.py
+lib/bup/bup/cmd/import_duplicity.py
+lib/bup/bup/cmd/index.py
+lib/bup/bup/cmd/init.py
+lib/bup/bup/cmd/join.py
+lib/bup/bup/cmd/list_idx.py
+lib/bup/bup/cmd/ls.py
+lib/bup/bup/cmd/margin.py
+lib/bup/bup/cmd/memtest.py
+lib/bup/bup/cmd/meta.py
+lib/bup/bup/cmd/midx.py
+lib/bup/bup/cmd/mux.py
+lib/bup/bup/cmd/on.py
+lib/bup/bup/cmd/on__server.py
+lib/bup/bup/cmd/prune_older.py
+lib/bup/bup/cmd/random.py
+lib/bup/bup/cmd/restore.py
+lib/bup/bup/cmd/rm.py
+lib/bup/bup/cmd/save.py
+lib/bup/bup/cmd/server.py
+lib/bup/bup/cmd/split.py
+lib/bup/bup/cmd/tag.py
+lib/bup/bup/cmd/tick.py
+lib/bup/bup/cmd/version.py
+lib/bup/bup/cmd/web.py
+lib/bup/bup/cmd/xstat.py
lib/bup/bup/compat.py
-lib/bup/bup/csetup.py
lib/bup/bup/drecurse.py
lib/bup/bup/gc.py
lib/bup/bup/git.py
@@ -15,61 +52,25 @@ lib/bup/bup/hlinkdb.py
lib/bup/bup/index.py
lib/bup/bup/io.py
lib/bup/bup/ls.py
+lib/bup/bup/main.py
lib/bup/bup/metadata.py
lib/bup/bup/midx.py
lib/bup/bup/options.py
lib/bup/bup/path.py
lib/bup/bup/pwdgrp.py
-lib/bup/bup/py2raise.py
lib/bup/bup/repo.py
lib/bup/bup/rm.py
lib/bup/bup/shquote.py
lib/bup/bup/source_info.py
lib/bup/bup/ssh.py
+lib/bup/bup/tree.py
lib/bup/bup/version.py
lib/bup/bup/vfs.py
lib/bup/bup/vint.py
lib/bup/bup/xstat.py
lib/bup/cmd/bup
-lib/bup/cmd/bup-bloom
-lib/bup/cmd/bup-cat-file
-lib/bup/cmd/bup-daemon
-lib/bup/cmd/bup-damage
-lib/bup/cmd/bup-drecurse
-lib/bup/cmd/bup-features
-lib/bup/cmd/bup-fsck
-lib/bup/cmd/bup-ftp
-lib/bup/cmd/bup-fuse
-lib/bup/cmd/bup-gc
-lib/bup/cmd/bup-get
-lib/bup/cmd/bup-help
-lib/bup/cmd/bup-import-duplicity
lib/bup/cmd/bup-import-rdiff-backup
lib/bup/cmd/bup-import-rsnapshot
-lib/bup/cmd/bup-index
-lib/bup/cmd/bup-init
-lib/bup/cmd/bup-join
-lib/bup/cmd/bup-list-idx
-lib/bup/cmd/bup-ls
-lib/bup/cmd/bup-margin
-lib/bup/cmd/bup-memtest
-lib/bup/cmd/bup-meta
-lib/bup/cmd/bup-midx
-lib/bup/cmd/bup-mux
-lib/bup/cmd/bup-on
-lib/bup/cmd/bup-on--server
-lib/bup/cmd/bup-prune-older
-lib/bup/cmd/bup-random
-lib/bup/cmd/bup-restore
-lib/bup/cmd/bup-rm
-lib/bup/cmd/bup-save
-lib/bup/cmd/bup-server
-lib/bup/cmd/bup-split
-lib/bup/cmd/bup-tag
-lib/bup/cmd/bup-tick
-lib/bup/cmd/bup-version
-lib/bup/cmd/bup-web
-lib/bup/cmd/bup-xstat
lib/bup/web/list-directory.html
lib/bup/web/static/styles.css
man/man1/bup-bloom.1
Index: pkgsrc/sysutils/bup/distinfo
diff -u pkgsrc/sysutils/bup/distinfo:1.22 pkgsrc/sysutils/bup/distinfo:1.23
--- pkgsrc/sysutils/bup/distinfo:1.22 Sun Jun 18 22:35:59 2023
+++ pkgsrc/sysutils/bup/distinfo Sat Dec 9 01:46:30 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2023/06/18 22:35:59 gdt Exp $
+$NetBSD: distinfo,v 1.23 2023/12/09 01:46:30 gdt Exp $
-BLAKE2s (bup-0.32.1.tar.gz) = 2071edf85fde68d04019723a548d1b66c18f517e6b0f2e137e1e193ff628c161
-SHA512 (bup-0.32.1.tar.gz) = 3c50eabefbd93ab74b31ddd80c2347fb08086c7ba2f1c4b853c962a748562050f41c8c702354525cf84d9d44f3a01d397b6ef8fd2f47b9a94bc26e20e3e40a04
-Size (bup-0.32.1.tar.gz) = 450107 bytes
-BLAKE2s (bup-man-2fe35faff1fb9c5e7b0ea357de371ac219f2cc38.tar.gz) = 815ba68a11e45eb649a6b08b8f756eba7ebdf4f089b364d15efeb75d68f012bd
-SHA512 (bup-man-2fe35faff1fb9c5e7b0ea357de371ac219f2cc38.tar.gz) = 18f3c627f901af3b405f611035eb6f080ba0361c47aca271d85352437d155b17cf810ae2e1d254513bc6d3f4e2c2ad52278431c28cd886a4815b6585ff1777e3
-Size (bup-man-2fe35faff1fb9c5e7b0ea357de371ac219f2cc38.tar.gz) = 32804 bytes
+BLAKE2s (bup-0.33.2.tar.gz) = 73b8d736c437c65eef34b7419e19d687ac28d364606fe142214ac15a1aa1cf87
+SHA512 (bup-0.33.2.tar.gz) = a7427961b70a8a2e831c8f1cfaf8acfe7a5c7975e7435d73e8867c20c47cc626bd3f03a0aa3b9ec83ca182fd786b21c1702a01ef040cfe6f3f2030bb4000488c
+Size (bup-0.33.2.tar.gz) = 473096 bytes
+BLAKE2s (bup-man-a9757d6fe3509130622a636d35e92049f9e20fce.tar.gz) = 0ceb47259da90d1945ad2b56ba7eb01bcacde989fa6904564f9565f9af800ef5
+SHA512 (bup-man-a9757d6fe3509130622a636d35e92049f9e20fce.tar.gz) = 21e14f6927bd71712d7fe3dc21eb7bb3100215fab89e3c4fcd3c74eefb0d06042643f49f974c8430fcec2f7d7e96d6fdfcdef1972b550ff07d9d61f825780a77
+Size (bup-man-a9757d6fe3509130622a636d35e92049f9e20fce.tar.gz) = 32575 bytes
Home |
Main Index |
Thread Index |
Old Index