From 307aa8e51d4a0c55a163819dfb7ba73dd4da3416 Mon Sep 17 00:00:00 2001
From: dsainty <dsainty@pkgsrc.org>
Date: Wed, 28 May 2008 05:13:32 +0000
Subject: Update SaraB to 0.2.4.

Update prompted: by http://secunia.com/advisories/30394/

... but the previous version in Pkgsrc (0.2.2) wasn't vulnerable, the advisory
only relates to new functionality added in SaraB 0.2.3.

Pkgsrc changes:

- Remove patch-aa, which has been applied upstream via bug 1184476:
    http://sourceforge.net/tracker/index.php?func=detail&aid=1184476&group_id=91804&atid=598441

- Minor pkglinting

=====================================================
05/18/2008 - SaraB version 0.2.4
=====================================================

* Security fix: Encryption ciphers are no longer passed on the dar command line

=====================================================
04/21/2008 - SaraB version 0.2.3
=====================================================

* Fixes for bugs long mentioned
---
 archivers/sarab/Makefile         |  9 ++++-----
 archivers/sarab/distinfo         |  9 ++++-----
 archivers/sarab/patches/patch-aa | 17 -----------------
 3 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 archivers/sarab/patches/patch-aa

(limited to 'archivers/sarab')

diff --git a/archivers/sarab/Makefile b/archivers/sarab/Makefile
index d6eb3ae062a..2c905db5017 100644
--- a/archivers/sarab/Makefile
+++ b/archivers/sarab/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2008/03/02 03:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/28 05:13:32 dsainty Exp $
 
-DISTNAME=	sarab-0.2.2
-PKGREVISION=	1
+DISTNAME=	sarab-0.2.4
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sarab/}
 
@@ -11,7 +10,6 @@ COMMENT=	Schedule And Rotate Automatic Backups
 #LICENSE=	GPL
 
 DEPENDS+=	dar-[0-9]*:../../archivers/dar
-WRKSRC=		${WRKDIR}/sarab
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -60,13 +58,14 @@ INSTALLATION_DIRS=	bin ${EGDIR}
 do-build: # do nothing
 
 do-install:
+	set -e; \
 	for example in \
 			${WRKSRC}/etc/rotation.schedule.README \
 			${WRKSRC}/etc/rotation.schedule \
 			${WRKSRC}/etc/sarab.conf \
 			${WRKSRC}/etc/sarab.dcf \
 			${WRKSRC}/etc/examples/*; do \
-		${INSTALL_DATA} $${example} ${DESTDIR}${EGDIR}; \
+		${INSTALL_DATA} "$${example}" ${DESTDIR}${EGDIR}; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/sarab.sh ${DESTDIR}${PREFIX}/bin/sarab
 
diff --git a/archivers/sarab/distinfo b/archivers/sarab/distinfo
index 9d04c67286c..473e479da90 100644
--- a/archivers/sarab/distinfo
+++ b/archivers/sarab/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/11/27 14:24:01 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2008/05/28 05:13:32 dsainty Exp $
 
-SHA1 (sarab-0.2.2.tar.gz) = 6119869e996305fb80d37f58bb2c6bf5e73cde27
-RMD160 (sarab-0.2.2.tar.gz) = b32a4f73ff98b57f3e486f728889d903809389ea
-Size (sarab-0.2.2.tar.gz) = 22428 bytes
-SHA1 (patch-aa) = 142123c307de32ba4a176c7c46b185124e2afb0b
+SHA1 (sarab-0.2.4.tar.gz) = a91d545ec4af9d56c23edf92851eb4f9231f5100
+RMD160 (sarab-0.2.4.tar.gz) = b7c63ba3cac60de2f5ca82dd5e2b35c5b9800939
+Size (sarab-0.2.4.tar.gz) = 23625 bytes
diff --git a/archivers/sarab/patches/patch-aa b/archivers/sarab/patches/patch-aa
deleted file mode 100644
index 8bc067d2f11..00000000000
--- a/archivers/sarab/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/11/27 14:24:01 dsainty Exp $
-
-Under NetBSD, NUM_FIELDS has whitespace padding - courtesy of "wc -w".  Use
-a numeric comparison instead of a string comparison to ignore the differing
-whitespace.
-
---- sarab.sh.orig	2006-11-28 03:04:14.000000000 +1300
-+++ sarab.sh	2006-11-28 03:05:14.000000000 +1300
-@@ -169,7 +169,7 @@
- fi
- 
- ## Two fields means this is a diffential/incremental backup, one field means this is a full backup   
--if [ "$NUM_FIELDS" = "2" ]; then
-+if [ "$NUM_FIELDS" -eq "2" ]; then
-    # First field is the current archive
-    CURRENT_ARCHIVE=$(echo $CURRENT_LINE | cut -f 1 -d" ")
-    # Second field is the reference archive
-- 
cgit v1.2.3