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.

4 files changed, 21 insertions, 63 deletions

diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile
index 75c032fabe7..ae1467ecf62 100644
--- a/sysutils/bup/Makefile
+++ b/sysutils/bup/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2014/05/29 23:37:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/09/06 21:29:45 wiz Exp $
 
-DISTNAME=	bup-0.25
-PKGREVISION=	4
+DISTNAME=	bup-0.26
 CATEGORIES=	sysutils
-MASTER_SITES=	# manually packaged since master site is git repository
-# and only available via https
-# https://github.com/bup/bup/releases/
+MASTER_SITES=	# https://github.com/bup/bup/releases/
 # doc tarball: switch to "man" branch before downloading
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}.zip
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}${EXTRACT_SUFX}
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://github.com/bup/bup
@@ -16,11 +13,12 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	par2-[0-9]*:../../archivers/par2
 DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
+DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-fuse-bindings
 
-DOCDIR=		${WRKDIR}/bup-man
+DOCDIR=		${WRKDIR}/bup-0.26
 
 TEST_TARGET=	test
 
@@ -62,37 +60,23 @@ REPLACE_PYTHON+=	cmd/tick-cmd.py
 REPLACE_PYTHON+=	cmd/version-cmd.py
 REPLACE_PYTHON+=	cmd/web-cmd.py
 REPLACE_PYTHON+=	cmd/xstat-cmd.py
-REPLACE_PYTHON+=	lib/tornado/__init__.py
-REPLACE_PYTHON+=	lib/tornado/auth.py
-REPLACE_PYTHON+=	lib/tornado/autoreload.py
-REPLACE_PYTHON+=	lib/tornado/database.py
-REPLACE_PYTHON+=	lib/tornado/escape.py
-REPLACE_PYTHON+=	lib/tornado/httpclient.py
-REPLACE_PYTHON+=	lib/tornado/httpserver.py
-REPLACE_PYTHON+=	lib/tornado/httputil.py
-REPLACE_PYTHON+=	lib/tornado/ioloop.py
-REPLACE_PYTHON+=	lib/tornado/iostream.py
-REPLACE_PYTHON+=	lib/tornado/locale.py
-REPLACE_PYTHON+=	lib/tornado/options.py
-REPLACE_PYTHON+=	lib/tornado/s3server.py
-REPLACE_PYTHON+=	lib/tornado/template.py
-REPLACE_PYTHON+=	lib/tornado/test/test_ioloop.py
-REPLACE_PYTHON+=	lib/tornado/web.py
-REPLACE_PYTHON+=	lib/tornado/websocket.py
-REPLACE_PYTHON+=	lib/tornado/wsgi.py
 REPLACE_PYTHON+=	main.py
 REPLACE_PYTHON+=	wvtest.py
 
+REPLACE_PYTHON+=	t/cleanup-mounts-under
 REPLACE_PYTHON+=	t/hardlink-sets
 REPLACE_PYTHON+=	t/id-other-than
 REPLACE_PYTHON+=	t/mksock
+REPLACE_PYTHON+=	t/ns-timestamp-resolutions
 REPLACE_PYTHON+=	t/root-status
+REPLACE_PYTHON+=	t/test-ls.sh
 REPLACE_PYTHON+=	t/unknown-owner
 
 SUBST_CLASSES+=		python-c
 SUBST_SED.python-c+=	-e 's,python -c,${PYTHONBIN} -c,'
 SUBST_STAGE.python-c=	pre-configure
 SUBST_FILES.python-c+=	t/lib.sh
+SUBST_FILES.python-c+=	t/test-ls.sh
 SUBST_FILES.python-c+=	t/test-meta.sh
 SUBST_MESSAGE.python-c=	Fixing python executable in tests.
 
diff --git a/sysutils/bup/PLIST b/sysutils/bup/PLIST
index e1d75621898..0163df5bb47 100644
--- a/sysutils/bup/PLIST
+++ b/sysutils/bup/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/12/31 11:03:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/09/06 21:29:45 wiz Exp $
 bin/bup
 lib/bup/bup/__init__.py
 lib/bup/bup/_helpers.so
@@ -56,24 +56,6 @@ lib/bup/cmd/bup-tick
 lib/bup/cmd/bup-version
 lib/bup/cmd/bup-web
 lib/bup/cmd/bup-xstat
-lib/bup/tornado/__init__.py
-lib/bup/tornado/auth.py
-lib/bup/tornado/autoreload.py
-lib/bup/tornado/database.py
-lib/bup/tornado/escape.py
-lib/bup/tornado/httpclient.py
-lib/bup/tornado/httpserver.py
-lib/bup/tornado/httputil.py
-lib/bup/tornado/ioloop.py
-lib/bup/tornado/iostream.py
-lib/bup/tornado/locale.py
-lib/bup/tornado/options.py
-lib/bup/tornado/s3server.py
-lib/bup/tornado/template.py
-lib/bup/tornado/web.py
-lib/bup/tornado/websocket.py
-lib/bup/tornado/win32_support.py
-lib/bup/tornado/wsgi.py
 lib/bup/web/list-directory.html
 lib/bup/web/static/styles.css
 man/man1/bup-bloom.1
diff --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo
index fc0368b71a6..20d6ff331fa 100644
--- a/sysutils/bup/distinfo
+++ b/sysutils/bup/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.6 2014/03/19 17:50:00 gdt Exp $
+$NetBSD: distinfo,v 1.7 2014/09/06 21:29:45 wiz Exp $
 
-SHA1 (bup-0.25.tar.gz) = f32ba39582d0e8875632f282c54f7377ed2a4df9
-RMD160 (bup-0.25.tar.gz) = d578dc87330c49090c25a212d6c5fe4561c8ad0c
-Size (bup-0.25.tar.gz) = 399332 bytes
-SHA1 (bup-man-0.25.zip) = cd76ad005e85aa568d95b9c2938d2716e3b03365
-RMD160 (bup-man-0.25.zip) = 8d023cc394ae006ec1a24924176d72a52208558f
-Size (bup-man-0.25.zip) = 40779 bytes
-SHA1 (patch-Makefile) = b37a1f2d584c987430e948c5c04d97def8a5334c
+SHA1 (bup-0.26.tar.gz) = 86e636818590fe40e1074c67545bb74de6e8306b
+RMD160 (bup-0.26.tar.gz) = 206d301677a359b3e904e89d5a12e82829d12565
+Size (bup-0.26.tar.gz) = 342754 bytes
+SHA1 (bup-man-0.26.tar.gz) = 17dc3136b56cd7427c1668681f86565e42ff1a74
+RMD160 (bup-man-0.26.tar.gz) = ff8cfc15609134055c651679ad7b6609a3959c23
+Size (bup-man-0.26.tar.gz) = 4410896 bytes
+SHA1 (patch-Makefile) = 3208d663af3e5e129499282d14e10abd94f56805
 SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72
-SHA1 (patch-lib_bup___helpers.c) = df146a325e4ca912552f09176a605c26267cfe8b
diff --git a/sysutils/bup/patches/patch-Makefile b/sysutils/bup/patches/patch-Makefile
index 0d61c622d8c..da5442f312c 100644
--- a/sysutils/bup/patches/patch-Makefile
+++ b/sysutils/bup/patches/patch-Makefile
@@ -1,16 +1,9 @@
-$NetBSD: patch-Makefile,v 1.5 2014/03/19 13:15:13 gdt Exp $
+$NetBSD: patch-Makefile,v 1.6 2014/09/06 21:29:45 wiz Exp $
 
 Pass PYTHON through to configure.
 
---- Makefile.orig	2013-12-10 01:30:45.000000000 +0000
+--- Makefile.orig	2013-12-20 09:43:15.000000000 +0000
 +++ Makefile
-@@ -1,5 +1,5 @@
- OS:=$(shell uname | sed 's/[-_].*//')
--CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
-+CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
- SOEXT:=.so
- 
- ifeq ($(OS),CYGWIN)
 @@ -67,7 +67,7 @@ install: all
  
  config/config.h: config/Makefile config/configure config/configure.inc \