Update to 0.25rc1. Add py-readline dependency for better 'bup ftp' support.

This is the latest stable release, despite its name. Lots of bug fixes
compared to previous one, but no NEWS provided.

7 files changed, 94 insertions, 68 deletions

diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile
index 5e8214d1c5f..9b37ed8b1b7 100644
--- a/sysutils/bup/Makefile
+++ b/sysutils/bup/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2012/03/15 11:53:38 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/04 13:43:14 wiz Exp $
 #
 
-DISTNAME=	bup-0.24b
-PKGREVISION=	3
+DISTNAME=	bup-0.25rc1
 CATEGORIES=	sysutils
 MASTER_SITES=	# manually packaged since master site is git repository
 # and only available via https
 # https://github.com/apenwarr/bup/tarball/
 # doc tarball: switch to "man" branch before downloading
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}${EXTRACT_SUFX}
+# latest apenwarr doc tarball is for 0.24b
+# bup-man-0.24b.tar.gz
+# use lelutin one instead
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} lelutin-bup-7e0bc2e.zip
+# ${DISTNAME:S/bup/bup-man/}${EXTRACT_SUFX}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://github.com/apenwarr/bup
@@ -16,18 +19,21 @@ COMMENT=	Highly efficient file backup system based on the git packfile format
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	par2-[0-9]*:../../archivers/par2
+DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	scmgit-base-[0-9]*:../../devel/scmgit-base
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # needs changing on each update
-DOCDIR=		${WRKDIR}/apenwarr-bup-1783a57
-WRKSRC=		${WRKDIR}/apenwarr-bup-d8d6406
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/bup
+DOCDIR=		${WRKDIR}/lelutin-bup-7e0bc2e
+WRKSRC=		${WRKDIR}/apenwarr-bup-4525252
 
 TEST_TARGET=	test
 
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
+MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 USE_TOOLS+=		gmake perl
 REPLACE_PERL=		format-subst.pl wvtestrun
 REPLACE_PYTHON+=	cmd/bloom-cmd.py
@@ -45,6 +51,7 @@ REPLACE_PYTHON+=	cmd/list-idx-cmd.py
 REPLACE_PYTHON+=	cmd/ls-cmd.py
 REPLACE_PYTHON+=	cmd/margin-cmd.py
 REPLACE_PYTHON+=	cmd/memtest-cmd.py
+REPLACE_PYTHON+=	cmd/meta-cmd.py
 REPLACE_PYTHON+=	cmd/midx-cmd.py
 REPLACE_PYTHON+=	cmd/mux-cmd.py
 REPLACE_PYTHON+=	cmd/newliner-cmd.py
@@ -59,6 +66,7 @@ REPLACE_PYTHON+=	cmd/tag-cmd.py
 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
diff --git a/sysutils/bup/PLIST b/sysutils/bup/PLIST
index 7f5f480f19f..0364fe07e1e 100644
--- a/sysutils/bup/PLIST
+++ b/sysutils/bup/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/05/31 12:01:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/09/04 13:43:15 wiz Exp $
 bin/bup
 lib/bup/bup/__init__.py
 lib/bup/bup/_helpers.so
@@ -11,12 +11,16 @@ lib/bup/bup/git.py
 lib/bup/bup/hashsplit.py
 lib/bup/bup/helpers.py
 lib/bup/bup/index.py
+lib/bup/bup/ls.py
+lib/bup/bup/metadata.py
 lib/bup/bup/midx.py
 lib/bup/bup/options.py
 lib/bup/bup/path.py
 lib/bup/bup/shquote.py
 lib/bup/bup/ssh.py
 lib/bup/bup/vfs.py
+lib/bup/bup/vint.py
+lib/bup/bup/xstat.py
 lib/bup/cmd/bup-bloom
 lib/bup/cmd/bup-daemon
 lib/bup/cmd/bup-damage
@@ -33,6 +37,7 @@ 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-newliner
@@ -47,6 +52,7 @@ 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/tornado/__init__.py
 lib/bup/tornado/auth.py
 lib/bup/tornado/autoreload.py
diff --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo
index 217d9d5f019..4d0640f3100 100644
--- a/sysutils/bup/distinfo
+++ b/sysutils/bup/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2011/05/31 12:01:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/09/04 13:43:15 wiz Exp $
 
-SHA1 (bup-0.24b.tar.gz) = 478aa11b9f1ecc72d6d1ca07fb543042d152b81e
-RMD160 (bup-0.24b.tar.gz) = f2c3474c9f5467ad95153725947cc6c3a016f0f0
-Size (bup-0.24b.tar.gz) = 330630 bytes
-SHA1 (bup-man-0.24b.tar.gz) = 03e84f5e61405a00750a7f1bd3ea9e9213a9ffd7
-RMD160 (bup-man-0.24b.tar.gz) = dff92315d4b54c5373fd21130c52987899e793f2
-Size (bup-man-0.24b.tar.gz) = 21950 bytes
-SHA1 (patch-Makefile) = e9d549e00e7ebb4f84724e62acffb3fdf9b7dda3
-SHA1 (patch-lib_bup_t_tgit.py) = aaf8fb8738aef2dae5379848895de1532118ea51
+SHA1 (bup-0.25rc1.tar.gz) = 96760b4cca5b4655cb79caaafd2ce2e70a242a7a
+RMD160 (bup-0.25rc1.tar.gz) = 7663ee1f4288fa171ec292ff3e35bc6a9c3d4ec9
+Size (bup-0.25rc1.tar.gz) = 360001 bytes
+SHA1 (lelutin-bup-7e0bc2e.zip) = c4908ca4e1f3680089ef8d9bf3b7d1b6a01e0081
+RMD160 (lelutin-bup-7e0bc2e.zip) = 9c2da9481dfc4129ba23f5022d08d62e484bf3e3
+Size (lelutin-bup-7e0bc2e.zip) = 35533 bytes
+SHA1 (patch-Makefile) = ad0dbee5a38e769c7941b5f19d91777ac769b13b
+SHA1 (patch-config_configure) = 367c611762242e4f56e5ee2f4cea6aed95c62559
+SHA1 (patch-lib_bup_helpers.py) = 894d9ee4b2882876a42f4afd63d82c284231a211
diff --git a/sysutils/bup/patches/patch-Makefile b/sysutils/bup/patches/patch-Makefile
index a1f86453e56..17374e36ef8 100644
--- a/sysutils/bup/patches/patch-Makefile
+++ b/sysutils/bup/patches/patch-Makefile
@@ -1,25 +1,13 @@
-$NetBSD: patch-Makefile,v 1.2 2011/05/31 12:01:18 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2012/09/04 13:43:15 wiz Exp $
 
-Install into PREFIX, and remove PYTHON override (set from pkgsrc Makefile).
+Remove CFLAGS override (set from pkgsrc Makefile).
 
---- Makefile.orig	2011-03-20 07:40:42.000000000 +0000
+--- Makefile.orig	2011-06-09 03:24:45.000000000 +0000
 +++ Makefile
-@@ -15,13 +15,12 @@ bup: lib/bup/_version.py lib/bup/_helper
- Documentation/all: bup
+@@ -1,5 +1,5 @@
+ OS:=$(shell uname | sed 's/[-_].*//')
+-CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
++CFLAGS+=-Wall -O2 -Werror $(PYINCLUDE)
+ SOEXT:=.so
  
- INSTALL=install
--PYTHON=python
--MANDIR=$(DESTDIR)/usr/share/man
--DOCDIR=$(DESTDIR)/usr/share/doc/bup
--BINDIR=$(DESTDIR)/usr/bin
--LIBDIR=$(DESTDIR)/usr/lib/bup
-+MANDIR=$(DESTDIR)$(PREFIX)/man
-+DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
-+BINDIR=$(DESTDIR)$(PREFIX)/bin
-+LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
- install: all
--	$(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-+	$(INSTALL) -d $(BINDIR) \
- 		$(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
- 		$(LIBDIR)/web $(LIBDIR)/web/static
- 	[ ! -e Documentation/.docs-available ] || \
+ ifeq ($(OS),CYGWIN)
diff --git a/sysutils/bup/patches/patch-config_configure b/sysutils/bup/patches/patch-config_configure
new file mode 100644
index 00000000000..c6b3c2cdbc8
--- /dev/null
+++ b/sysutils/bup/patches/patch-config_configure
@@ -0,0 +1,25 @@
+$NetBSD: patch-config_configure,v 1.1 2012/09/04 13:43:15 wiz Exp $
+
+Use PYTHON from environment.
+Do not check for utimensat. It is found on NetBSD even though unusable
+for now (20120827).
+
+--- config/configure.orig	2011-06-09 03:24:45.000000000 +0000
++++ config/configure
+@@ -30,7 +30,7 @@ expr "$MAKE_VERSION" '>=' '3.81' || AC_F
+ TLOG " ok"
+ 
+ TLOGN "checking the python"
+-PYTHON=`acLookFor python`
++[ -n "$PYTHON" ] || PYTHON=`acLookFor python`
+ if [ -z "$PYTHON" ]; then
+     AC_FAIL " Cannot find python";
+ fi
+@@ -59,7 +59,6 @@ AC_CHECK_HEADERS unistd.h
+ AC_CHECK_HEADERS linux/fs.h
+ AC_CHECK_HEADERS sys/ioctl.h
+ 
+-AC_CHECK_FUNCS utimensat 
+ AC_CHECK_FUNCS utimes
+ AC_CHECK_FUNCS lutimes
+ 
diff --git a/sysutils/bup/patches/patch-lib_bup_helpers.py b/sysutils/bup/patches/patch-lib_bup_helpers.py
new file mode 100644
index 00000000000..99a460c62f3
--- /dev/null
+++ b/sysutils/bup/patches/patch-lib_bup_helpers.py
@@ -0,0 +1,27 @@
+$NetBSD: patch-lib_bup_helpers.py,v 1.1 2012/09/04 13:43:15 wiz Exp $
+
+Survive empty GECOS name fields.
+Reported-by: Alper Kanat
+Tested-by: Michael Witten
+Signed-off-by: Michael Witten
+---
+ lib/bup/helpers.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- lib/bup/helpers.py.orig	2011-06-09 03:24:45.000000000 +0000
++++ lib/bup/helpers.py
+@@ -231,9 +231,11 @@ def userfullname():
+     if not _userfullname:
+         uid = os.getuid()
+         try:
+-            _userfullname = pwd.getpwuid(uid)[4].split(',')[0]
+-        except KeyError:
+-            _userfullname = 'user%d' % uid
++            entry = pwd.getpwuid(uid)
++            _userfullname = entry[4].split(',')[0] or entry[0]
++        finally:
++            if not _userfullname:
++              _userfullname = 'user %d' % uid
+     return _userfullname
+ 
+ 
diff --git a/sysutils/bup/patches/patch-lib_bup_t_tgit.py b/sysutils/bup/patches/patch-lib_bup_t_tgit.py
deleted file mode 100644
index cb17eca1837..00000000000
--- a/sysutils/bup/patches/patch-lib_bup_t_tgit.py
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-lib_bup_t_tgit.py,v 1.1.1.1 2011/05/16 13:52:56 wiz Exp $
-
-Fix test case, from upstream git.
-
---- lib/bup/t/tgit.py.orig	2011-05-12 16:51:44.000000000 +0000
-+++ lib/bup/t/tgit.py
-@@ -145,17 +145,18 @@ def test_long_index():
- @wvtest
- def test_check_repo_or_die():
-     git.check_repo_or_die()
--    WVPASS('check_repo_or_die')  # if we reach this point the call above passed
-+    WVPASS('check_repo_or_die') # if we reach this point the call above passed
- 
--    mode = os.stat('pybuptest.tmp').st_mode
--    os.chmod('pybuptest.tmp', 0000)
-+    os.rename('pybuptest.tmp/objects/pack', 'pybuptest.tmp/objects/pack.tmp')
-+    open('pybuptest.tmp/objects/pack', 'w').close()
-     try:
-         git.check_repo_or_die()
-     except SystemExit, e:
-         WVPASSEQ(e.code, 14)
-     else:
-         WVFAIL()
--    os.chmod('pybuptest.tmp', mode)
-+    os.unlink('pybuptest.tmp/objects/pack')
-+    os.rename('pybuptest.tmp/objects/pack.tmp', 'pybuptest.tmp/objects/pack')
- 
-     try:
-         git.check_repo_or_die('nonexistantbup.tmp')