Import of pkgsrc-2013Q2

sysutils/bup/DESCR

@@ -0,0 +1,22 @@
+bup is a program that backs things up.  bup has a few advantages over other
+backup software:
+
+It uses a rolling checksum algorithm (similar to rsync) to split large files
+into chunks. The most useful result of this is you can backup huge virtual
+machine (VM) disk images, databases, and XML files incrementally, even though
+they're typically all in one huge file, and not use tons of disk space for
+multiple versions.
+
+It uses the packfile format from git (the open source version control system),
+so you can access the stored data even if you don't like bup's user interface.
+
+Unlike git, it writes packfiles directly (instead of having a separate garbage
+collection/repacking stage) so it's fast even with gratuitously huge amounts of 
+data. bup's improved index formats also allow you to track far more filenames
+than git (millions) and keep track of far more objects (hundreds or thousands of
+gigabytes).
+
+Data is "automagically" shared between incremental backups without having to
+know which backup is based on which other one - even if the backups are made
+from two different computers that don't even know about each other. You just
+tell bup to back stuff up, and it saves only the minimum amount of data needed.

sysutils/bup/Makefile

@@ -0,0 +1,97 @@
+# $NetBSD: Makefile,v 1.9 2013/05/31 12:41:59 wiz Exp $
+#
+
+DISTNAME=	bup-0.25rc1
+PKGREVISION=	2
+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
+# 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
+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
+
+# needs changing on each update
+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
+REPLACE_PYTHON+=	cmd/daemon-cmd.py
+REPLACE_PYTHON+=	cmd/damage-cmd.py
+REPLACE_PYTHON+=	cmd/drecurse-cmd.py
+REPLACE_PYTHON+=	cmd/fsck-cmd.py
+REPLACE_PYTHON+=	cmd/ftp-cmd.py
+REPLACE_PYTHON+=	cmd/fuse-cmd.py
+REPLACE_PYTHON+=	cmd/help-cmd.py
+REPLACE_PYTHON+=	cmd/index-cmd.py
+REPLACE_PYTHON+=	cmd/init-cmd.py
+REPLACE_PYTHON+=	cmd/join-cmd.py
+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
+REPLACE_PYTHON+=	cmd/on--server-cmd.py
+REPLACE_PYTHON+=	cmd/on-cmd.py
+REPLACE_PYTHON+=	cmd/random-cmd.py
+REPLACE_PYTHON+=	cmd/restore-cmd.py
+REPLACE_PYTHON+=	cmd/save-cmd.py
+REPLACE_PYTHON+=	cmd/server-cmd.py
+REPLACE_PYTHON+=	cmd/split-cmd.py
+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
+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
+
+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
+
+.include "../../filesystems/py-fuse-bindings/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"

sysutils/bup/PLIST

@@ -0,0 +1,106 @@
+@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
+lib/bup/bup/_version.py
+lib/bup/bup/bloom.py
+lib/bup/bup/client.py
+lib/bup/bup/csetup.py
+lib/bup/bup/drecurse.py
+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
+lib/bup/cmd/bup-drecurse
+lib/bup/cmd/bup-fsck
+lib/bup/cmd/bup-ftp
+lib/bup/cmd/bup-fuse
+lib/bup/cmd/bup-help
+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-newliner
+lib/bup/cmd/bup-on
+lib/bup/cmd/bup-on--server
+lib/bup/cmd/bup-random
+lib/bup/cmd/bup-restore
+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/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
+man/man1/bup-daemon.1
+man/man1/bup-damage.1
+man/man1/bup-drecurse.1
+man/man1/bup-fsck.1
+man/man1/bup-ftp.1
+man/man1/bup-fuse.1
+man/man1/bup-help.1
+man/man1/bup-import-rsnapshot.1
+man/man1/bup-index.1
+man/man1/bup-init.1
+man/man1/bup-join.1
+man/man1/bup-ls.1
+man/man1/bup-margin.1
+man/man1/bup-memtest.1
+man/man1/bup-meta.1
+man/man1/bup-midx.1
+man/man1/bup-mux.1
+man/man1/bup-newliner.1
+man/man1/bup-on.1
+man/man1/bup-random.1
+man/man1/bup-restore.1
+man/man1/bup-save.1
+man/man1/bup-server.1
+man/man1/bup-split.1
+man/man1/bup-tag.1
+man/man1/bup-tick.1
+man/man1/bup-web.1
+man/man1/bup.1
+share/doc/bup/DESIGN
+share/doc/bup/README

sysutils/bup/distinfo

@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.3 2012/09/04 13:43:15 wiz Exp $
+
+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

sysutils/bup/patches/patch-Makefile

@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile,v 1.3 2012/09/04 13:43:15 wiz Exp $
+
+Remove CFLAGS override (set from pkgsrc Makefile).
+
+--- Makefile.orig	2011-06-09 03:24:45.000000000 +0000
++++ Makefile
+@@ -1,5 +1,5 @@
+ OS:=$(shell uname | sed 's/[-_].*//')
+-CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
++CFLAGS+=-Wall -O2 -Werror $(PYINCLUDE)
+ SOEXT:=.so
+ 
+ ifeq ($(OS),CYGWIN)

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
+ 

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
+ 
+