Sat Sep 6 21:29:45 2014 UTC ()
Update to 0.26:

This release doesn't include anything as significant as the metadata
support added in 0.25, but it has quite a few bug fixes and internal
improvements, in addition to these notable changes:

  - When --meta is specified to the fuse command, instead of generic
    data, the originally saved mode, uid, git, atime, mtime, and ctime
    will be reported for the archive paths.

  - When --browser is specified to the web command, a browser window
    will be opened for the repository.

  - The -x/--xdev/--one-filesystem options now include the mountpoint
    itself in the traversal (matching rsyc, tar, etc.).

  - Empty lines in --exclude-rx-from files will be ignored.
    Previously they would cause all paths to be excluded.

  - The index and restore commands now support --exclude-rx-from.

  - Relative filesystem --excludes like "--exclude bar" should now
    work.  Previously --excludes had to be absolute.

  - The drecurse command now supports --exclude-rx and
    --exclude-rx-from.

  - The --compress option should now work for remote repositories.

  - Streams saved via "bup split" will now show up as a single file
    named "data" at the top level of the VFS, instead of as a subtree
    (i.e. when examined via ftp, ls, and fuse).

  - The ls command now supports -n, -A, -F, --file-type,
    --numeric-ids, and detailed -l options.

  - The save dates are now taken from the corresponding git commit's
    author date, not the committer date.

  - The tornado server, required by the web command, is no longer
    included.  See the README for installation instructions.

Note that the metadata support is still somewhat immature.  For
example, we still need to add better support for cross-filesystem-type
save/restore (which is too noisy), etc.

Please give this release a try and let us know what's broken.  If
you're new to bup, start with the README (and then HACKING if you'd
like to help further):

  https://github.com/bup/bup/blob/master/README.md
  https://github.com/bup/bup/blob/master/HACKING

  http://anonscm.debian.org/gitweb/?p=users/rlb/bup.git;a=blob;f=README.md;hb=refs/heads/master
  http://anonscm.debian.org/gitweb/?p=users/rlb/bup.git;a=blob;f=HACKING;hb=refs/heads/master

And although I probably sound like a broken record -- while we expect
bup to work fairly well, I still don't recommend it as your sole
backup strategy.  I'd still suggest a periodic
tar/rsync/etc. backstop.


(wiz)
diff -r1.18 -r1.19 pkgsrc/sysutils/bup/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/bup/PLIST
diff -r1.6 -r1.7 pkgsrc/sysutils/bup/distinfo
diff -r1.5 -r1.6 pkgsrc/sysutils/bup/patches/patch-Makefile
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/bup/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/bup/Makefile 2014/05/29 23:37:27 1.18
+++ pkgsrc/sysutils/bup/Makefile 2014/09/06 21:29:45 1.19
@@ -1,36 +1,34 @@ @@ -1,36 +1,34 @@
1# $NetBSD: Makefile,v 1.18 2014/05/29 23:37:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2014/09/06 21:29:45 wiz Exp $
2 2
3DISTNAME= bup-0.25 3DISTNAME= bup-0.26
4PKGREVISION= 4 
5CATEGORIES= sysutils 4CATEGORIES= sysutils
6MASTER_SITES= # manually packaged since master site is git repository 5MASTER_SITES= # https://github.com/bup/bup/releases/
7# and only available via https 
8# https://github.com/bup/bup/releases/ 
9# doc tarball: switch to "man" branch before downloading 6# doc tarball: switch to "man" branch before downloading
10DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}.zip 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}${EXTRACT_SUFX}
11 8
12MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
13HOMEPAGE= http://github.com/bup/bup 10HOMEPAGE= http://github.com/bup/bup
14COMMENT= Highly efficient file backup system based on the git packfile format 11COMMENT= Highly efficient file backup system based on the git packfile format
15LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
16 13
17DEPENDS+= par2-[0-9]*:../../archivers/par2 14DEPENDS+= par2-[0-9]*:../../archivers/par2
18DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline 15DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 16DEPENDS+= ${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
19DEPENDS+= git-base-[0-9]*:../../devel/git-base 17DEPENDS+= git-base-[0-9]*:../../devel/git-base
20 18
21PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-fuse-bindings 19PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-fuse-bindings
22 20
23DOCDIR= ${WRKDIR}/bup-man 21DOCDIR= ${WRKDIR}/bup-0.26
24 22
25TEST_TARGET= test 23TEST_TARGET= test
26 24
27MAKE_FLAGS+= PREFIX=${PREFIX} 25MAKE_FLAGS+= PREFIX=${PREFIX}
28MAKE_FLAGS+= PYTHON=${PYTHONBIN} 26MAKE_FLAGS+= PYTHON=${PYTHONBIN}
29MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} 27MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
30 28
31USE_TOOLS+= bash gmake perl 29USE_TOOLS+= bash gmake perl
32REPLACE_PERL= format-subst.pl wvtestrun 30REPLACE_PERL= format-subst.pl wvtestrun
33REPLACE_PYTHON+= cmd/bloom-cmd.py 31REPLACE_PYTHON+= cmd/bloom-cmd.py
34REPLACE_PYTHON+= cmd/cat-file-cmd.py 32REPLACE_PYTHON+= cmd/cat-file-cmd.py
35REPLACE_PYTHON+= cmd/daemon-cmd.py 33REPLACE_PYTHON+= cmd/daemon-cmd.py
36REPLACE_PYTHON+= cmd/damage-cmd.py 34REPLACE_PYTHON+= cmd/damage-cmd.py
@@ -52,57 +50,43 @@ REPLACE_PYTHON+= cmd/mux-cmd.py @@ -52,57 +50,43 @@ REPLACE_PYTHON+= cmd/mux-cmd.py
52REPLACE_PYTHON+= cmd/newliner-cmd.py 50REPLACE_PYTHON+= cmd/newliner-cmd.py
53REPLACE_PYTHON+= cmd/on--server-cmd.py 51REPLACE_PYTHON+= cmd/on--server-cmd.py
54REPLACE_PYTHON+= cmd/on-cmd.py 52REPLACE_PYTHON+= cmd/on-cmd.py
55REPLACE_PYTHON+= cmd/random-cmd.py 53REPLACE_PYTHON+= cmd/random-cmd.py
56REPLACE_PYTHON+= cmd/restore-cmd.py 54REPLACE_PYTHON+= cmd/restore-cmd.py
57REPLACE_PYTHON+= cmd/save-cmd.py 55REPLACE_PYTHON+= cmd/save-cmd.py
58REPLACE_PYTHON+= cmd/server-cmd.py 56REPLACE_PYTHON+= cmd/server-cmd.py
59REPLACE_PYTHON+= cmd/split-cmd.py 57REPLACE_PYTHON+= cmd/split-cmd.py
60REPLACE_PYTHON+= cmd/tag-cmd.py 58REPLACE_PYTHON+= cmd/tag-cmd.py
61REPLACE_PYTHON+= cmd/tick-cmd.py 59REPLACE_PYTHON+= cmd/tick-cmd.py
62REPLACE_PYTHON+= cmd/version-cmd.py 60REPLACE_PYTHON+= cmd/version-cmd.py
63REPLACE_PYTHON+= cmd/web-cmd.py 61REPLACE_PYTHON+= cmd/web-cmd.py
64REPLACE_PYTHON+= cmd/xstat-cmd.py 62REPLACE_PYTHON+= cmd/xstat-cmd.py
65REPLACE_PYTHON+= lib/tornado/__init__.py 
66REPLACE_PYTHON+= lib/tornado/auth.py 
67REPLACE_PYTHON+= lib/tornado/autoreload.py 
68REPLACE_PYTHON+= lib/tornado/database.py 
69REPLACE_PYTHON+= lib/tornado/escape.py 
70REPLACE_PYTHON+= lib/tornado/httpclient.py 
71REPLACE_PYTHON+= lib/tornado/httpserver.py 
72REPLACE_PYTHON+= lib/tornado/httputil.py 
73REPLACE_PYTHON+= lib/tornado/ioloop.py 
74REPLACE_PYTHON+= lib/tornado/iostream.py 
75REPLACE_PYTHON+= lib/tornado/locale.py 
76REPLACE_PYTHON+= lib/tornado/options.py 
77REPLACE_PYTHON+= lib/tornado/s3server.py 
78REPLACE_PYTHON+= lib/tornado/template.py 
79REPLACE_PYTHON+= lib/tornado/test/test_ioloop.py 
80REPLACE_PYTHON+= lib/tornado/web.py 
81REPLACE_PYTHON+= lib/tornado/websocket.py 
82REPLACE_PYTHON+= lib/tornado/wsgi.py 
83REPLACE_PYTHON+= main.py 63REPLACE_PYTHON+= main.py
84REPLACE_PYTHON+= wvtest.py 64REPLACE_PYTHON+= wvtest.py
85 65
 66REPLACE_PYTHON+= t/cleanup-mounts-under
86REPLACE_PYTHON+= t/hardlink-sets 67REPLACE_PYTHON+= t/hardlink-sets
87REPLACE_PYTHON+= t/id-other-than 68REPLACE_PYTHON+= t/id-other-than
88REPLACE_PYTHON+= t/mksock 69REPLACE_PYTHON+= t/mksock
 70REPLACE_PYTHON+= t/ns-timestamp-resolutions
89REPLACE_PYTHON+= t/root-status 71REPLACE_PYTHON+= t/root-status
 72REPLACE_PYTHON+= t/test-ls.sh
90REPLACE_PYTHON+= t/unknown-owner 73REPLACE_PYTHON+= t/unknown-owner
91 74
92SUBST_CLASSES+= python-c 75SUBST_CLASSES+= python-c
93SUBST_SED.python-c+= -e 's,python -c,${PYTHONBIN} -c,' 76SUBST_SED.python-c+= -e 's,python -c,${PYTHONBIN} -c,'
94SUBST_STAGE.python-c= pre-configure 77SUBST_STAGE.python-c= pre-configure
95SUBST_FILES.python-c+= t/lib.sh 78SUBST_FILES.python-c+= t/lib.sh
 79SUBST_FILES.python-c+= t/test-ls.sh
96SUBST_FILES.python-c+= t/test-meta.sh 80SUBST_FILES.python-c+= t/test-meta.sh
97SUBST_MESSAGE.python-c= Fixing python executable in tests. 81SUBST_MESSAGE.python-c= Fixing python executable in tests.
98 82
99REPLACE_BASH+= cmd/import-rdiff-backup-cmd.sh 83REPLACE_BASH+= cmd/import-rdiff-backup-cmd.sh
100REPLACE_BASH+= t/compare-trees 84REPLACE_BASH+= t/compare-trees
101REPLACE_BASH+= t/configure-sampledata 85REPLACE_BASH+= t/configure-sampledata
102REPLACE_BASH+= t/force-delete 86REPLACE_BASH+= t/force-delete
103REPLACE_BASH+= t/subtree-hash 87REPLACE_BASH+= t/subtree-hash
104REPLACE_BASH+= t/test-cat-file.sh 88REPLACE_BASH+= t/test-cat-file.sh
105REPLACE_BASH+= t/test-command-without-init-fails.sh 89REPLACE_BASH+= t/test-command-without-init-fails.sh
106REPLACE_BASH+= t/test-index-check-device.sh 90REPLACE_BASH+= t/test-index-check-device.sh
107REPLACE_BASH+= t/test-meta.sh 91REPLACE_BASH+= t/test-meta.sh
108REPLACE_BASH+= t/test-redundant-saves.sh 92REPLACE_BASH+= t/test-redundant-saves.sh
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/bup/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/bup/PLIST 2013/12/31 11:03:12 1.4
+++ pkgsrc/sysutils/bup/PLIST 2014/09/06 21:29:45 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2013/12/31 11:03:12 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2014/09/06 21:29:45 wiz Exp $
2bin/bup 2bin/bup
3lib/bup/bup/__init__.py 3lib/bup/bup/__init__.py
4lib/bup/bup/_helpers.so 4lib/bup/bup/_helpers.so
5lib/bup/bup/_version.py 5lib/bup/bup/_version.py
6lib/bup/bup/bloom.py 6lib/bup/bup/bloom.py
7lib/bup/bup/client.py 7lib/bup/bup/client.py
8lib/bup/bup/csetup.py 8lib/bup/bup/csetup.py
9lib/bup/bup/drecurse.py 9lib/bup/bup/drecurse.py
10lib/bup/bup/git.py 10lib/bup/bup/git.py
11lib/bup/bup/hashsplit.py 11lib/bup/bup/hashsplit.py
12lib/bup/bup/helpers.py 12lib/bup/bup/helpers.py
13lib/bup/bup/hlinkdb.py 13lib/bup/bup/hlinkdb.py
14lib/bup/bup/index.py 14lib/bup/bup/index.py
@@ -46,44 +46,26 @@ lib/bup/cmd/bup-mux @@ -46,44 +46,26 @@ lib/bup/cmd/bup-mux
46lib/bup/cmd/bup-newliner 46lib/bup/cmd/bup-newliner
47lib/bup/cmd/bup-on 47lib/bup/cmd/bup-on
48lib/bup/cmd/bup-on--server 48lib/bup/cmd/bup-on--server
49lib/bup/cmd/bup-random 49lib/bup/cmd/bup-random
50lib/bup/cmd/bup-restore 50lib/bup/cmd/bup-restore
51lib/bup/cmd/bup-save 51lib/bup/cmd/bup-save
52lib/bup/cmd/bup-server 52lib/bup/cmd/bup-server
53lib/bup/cmd/bup-split 53lib/bup/cmd/bup-split
54lib/bup/cmd/bup-tag 54lib/bup/cmd/bup-tag
55lib/bup/cmd/bup-tick 55lib/bup/cmd/bup-tick
56lib/bup/cmd/bup-version 56lib/bup/cmd/bup-version
57lib/bup/cmd/bup-web 57lib/bup/cmd/bup-web
58lib/bup/cmd/bup-xstat 58lib/bup/cmd/bup-xstat
59lib/bup/tornado/__init__.py 
60lib/bup/tornado/auth.py 
61lib/bup/tornado/autoreload.py 
62lib/bup/tornado/database.py 
63lib/bup/tornado/escape.py 
64lib/bup/tornado/httpclient.py 
65lib/bup/tornado/httpserver.py 
66lib/bup/tornado/httputil.py 
67lib/bup/tornado/ioloop.py 
68lib/bup/tornado/iostream.py 
69lib/bup/tornado/locale.py 
70lib/bup/tornado/options.py 
71lib/bup/tornado/s3server.py 
72lib/bup/tornado/template.py 
73lib/bup/tornado/web.py 
74lib/bup/tornado/websocket.py 
75lib/bup/tornado/win32_support.py 
76lib/bup/tornado/wsgi.py 
77lib/bup/web/list-directory.html 59lib/bup/web/list-directory.html
78lib/bup/web/static/styles.css 60lib/bup/web/static/styles.css
79man/man1/bup-bloom.1 61man/man1/bup-bloom.1
80man/man1/bup-cat-file.1 62man/man1/bup-cat-file.1
81man/man1/bup-daemon.1 63man/man1/bup-daemon.1
82man/man1/bup-damage.1 64man/man1/bup-damage.1
83man/man1/bup-drecurse.1 65man/man1/bup-drecurse.1
84man/man1/bup-fsck.1 66man/man1/bup-fsck.1
85man/man1/bup-ftp.1 67man/man1/bup-ftp.1
86man/man1/bup-fuse.1 68man/man1/bup-fuse.1
87man/man1/bup-help.1 69man/man1/bup-help.1
88man/man1/bup-import-rdiff-backup.1 70man/man1/bup-import-rdiff-backup.1
89man/man1/bup-import-rsnapshot.1 71man/man1/bup-import-rsnapshot.1
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/bup/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/bup/distinfo 2014/03/19 17:50:00 1.6
+++ pkgsrc/sysutils/bup/distinfo 2014/09/06 21:29:45 1.7
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.6 2014/03/19 17:50:00 gdt Exp $ 1$NetBSD: distinfo,v 1.7 2014/09/06 21:29:45 wiz Exp $
2 2
3SHA1 (bup-0.25.tar.gz) = f32ba39582d0e8875632f282c54f7377ed2a4df9 3SHA1 (bup-0.26.tar.gz) = 86e636818590fe40e1074c67545bb74de6e8306b
4RMD160 (bup-0.25.tar.gz) = d578dc87330c49090c25a212d6c5fe4561c8ad0c 4RMD160 (bup-0.26.tar.gz) = 206d301677a359b3e904e89d5a12e82829d12565
5Size (bup-0.25.tar.gz) = 399332 bytes 5Size (bup-0.26.tar.gz) = 342754 bytes
6SHA1 (bup-man-0.25.zip) = cd76ad005e85aa568d95b9c2938d2716e3b03365 6SHA1 (bup-man-0.26.tar.gz) = 17dc3136b56cd7427c1668681f86565e42ff1a74
7RMD160 (bup-man-0.25.zip) = 8d023cc394ae006ec1a24924176d72a52208558f 7RMD160 (bup-man-0.26.tar.gz) = ff8cfc15609134055c651679ad7b6609a3959c23
8Size (bup-man-0.25.zip) = 40779 bytes 8Size (bup-man-0.26.tar.gz) = 4410896 bytes
9SHA1 (patch-Makefile) = b37a1f2d584c987430e948c5c04d97def8a5334c 9SHA1 (patch-Makefile) = 3208d663af3e5e129499282d14e10abd94f56805
10SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72 10SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72
11SHA1 (patch-lib_bup___helpers.c) = df146a325e4ca912552f09176a605c26267cfe8b 
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/bup/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/bup/patches/Attic/patch-Makefile 2014/03/19 13:15:13 1.5
+++ pkgsrc/sysutils/bup/patches/Attic/patch-Makefile 2014/09/06 21:29:45 1.6
@@ -1,22 +1,15 @@ @@ -1,22 +1,15 @@
1$NetBSD: patch-Makefile,v 1.5 2014/03/19 13:15:13 gdt Exp $ 1$NetBSD: patch-Makefile,v 1.6 2014/09/06 21:29:45 wiz Exp $
2 2
3Pass PYTHON through to configure. 3Pass PYTHON through to configure.
4 4
5--- Makefile.orig 2013-12-10 01:30:45.000000000 +0000 5--- Makefile.orig 2013-12-20 09:43:15.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -1,5 +1,5 @@ 
8 OS:=$(shell uname | sed 's/[-_].*//') 
9-CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS) 
10+CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS) 
11 SOEXT:=.so 
12  
13 ifeq ($(OS),CYGWIN) 
14@@ -67,7 +67,7 @@ install: all 7@@ -67,7 +67,7 @@ install: all
15  8
16 config/config.h: config/Makefile config/configure config/configure.inc \ 9 config/config.h: config/Makefile config/configure config/configure.inc \
17 $(wildcard config/*.in) 10 $(wildcard config/*.in)
18- cd config && $(MAKE) config.h 11- cd config && $(MAKE) config.h
19+ cd config && $(MAKE) PYTHON=$(PYTHON) config.h 12+ cd config && $(MAKE) PYTHON=$(PYTHON) config.h
20  13
21 lib/bup/_helpers$(SOEXT): \ 14 lib/bup/_helpers$(SOEXT): \
22 config/config.h \ 15 config/config.h \