pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/dirvish
Module Name: pkgsrc
Committed By: abs
Date: Thu Jun 27 17:40:34 UTC 2024
Modified Files:
pkgsrc/sysutils/dirvish: Makefile distinfo
Added Files:
pkgsrc/sysutils/dirvish/patches: patch-dirvish-expire.pl
patch-dirvish.conf.5 patch-dirvish.pl
Log Message:
Pull across some useful patches from debian, bump PKGREVISION
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/dirvish/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/dirvish/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/dirvish/patches/patch-dirvish-expire.pl \
pkgsrc/sysutils/dirvish/patches/patch-dirvish.conf.5 \
pkgsrc/sysutils/dirvish/patches/patch-dirvish.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/dirvish/Makefile
diff -u pkgsrc/sysutils/dirvish/Makefile:1.16 pkgsrc/sysutils/dirvish/Makefile:1.17
--- pkgsrc/sysutils/dirvish/Makefile:1.16 Mon Aug 22 18:34:23 2022
+++ pkgsrc/sysutils/dirvish/Makefile Thu Jun 27 17:40:34 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/08/22 18:34:23 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2024/06/27 17:40:34 abs Exp $
#
DISTNAME= dirvish-1.2.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= https://dirvish.org/
EXTRACT_SUFX= .tgz
@@ -30,7 +30,8 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${P
share/doc/dirvish
do-build:
- cd ${WRKSRC}; \
+ set -e; \
+ cd ${WRKSRC}; \
for f in ${EXECUTABLES}; do \
${ECHO} "#!${PERL5}" > $$f; \
${ECHO} "\$$CONFDIR = \"${PKG_SYSCONFDIR}\";" >> $$f; \
Index: pkgsrc/sysutils/dirvish/distinfo
diff -u pkgsrc/sysutils/dirvish/distinfo:1.5 pkgsrc/sysutils/dirvish/distinfo:1.6
--- pkgsrc/sysutils/dirvish/distinfo:1.5 Mon Aug 22 18:34:23 2022
+++ pkgsrc/sysutils/dirvish/distinfo Thu Jun 27 17:40:34 2024
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2022/08/22 18:34:23 tnn Exp $
+$NetBSD: distinfo,v 1.6 2024/06/27 17:40:34 abs Exp $
BLAKE2s (dirvish-20120107/dirvish-1.2.1.tgz) = 305e41b592c72105a500208f6fabbf3a68f42aba71c91daec0fdcba2d8f6be74
SHA512 (dirvish-20120107/dirvish-1.2.1.tgz) = 27cfbd3dd83c452a9c3a84d357fba4d5fd4a3a9e55bddf9a609d6f45d4c3ca3458e5d13247a748ec0886de05453c869a585a7bec7e70382211fbc53d2b5ff4b7
Size (dirvish-20120107/dirvish-1.2.1.tgz) = 48604 bytes
+SHA1 (patch-dirvish-expire.pl) = 4f7ce7d73e6a8fcf02d2ef311ec1a7a500ecec84
+SHA1 (patch-dirvish.conf.5) = 18130e07423ca8f53abc44a23767d2ea8d649669
+SHA1 (patch-dirvish.pl) = c0c9937f48a6f81cbf6a2265df1797459bc31e90
Added files:
Index: pkgsrc/sysutils/dirvish/patches/patch-dirvish-expire.pl
diff -u /dev/null pkgsrc/sysutils/dirvish/patches/patch-dirvish-expire.pl:1.1
--- /dev/null Thu Jun 27 17:40:34 2024
+++ pkgsrc/sysutils/dirvish/patches/patch-dirvish-expire.pl Thu Jun 27 17:40:34 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-dirvish-expire.pl,v 1.1 2024/06/27 17:40:34 abs Exp $
+
+Taken from debian - Paul Slootman <paul%debian.org@localhost>
+Subject: Fix for future reserved word warning
+
+--- dirvish-expire.pl.orig 2024-06-20 09:09:32.049428903 +0000
++++ dirvish-expire.pl
+@@ -140,7 +140,7 @@ if (!$$Options{quiet})
+ qw(VAULT:BRANCH IMAGE CREATED EXPIRED);
+ }
+
+-for $expire (sort(imsort @expires))
++for $expire (sort {imsort()} @expires)
+ {
+ my ($created, $expired);
+ ($created = $$expire{created}) =~ s/:\d\d$//;
Index: pkgsrc/sysutils/dirvish/patches/patch-dirvish.conf.5
diff -u /dev/null pkgsrc/sysutils/dirvish/patches/patch-dirvish.conf.5:1.1
--- /dev/null Thu Jun 27 17:40:34 2024
+++ pkgsrc/sysutils/dirvish/patches/patch-dirvish.conf.5 Thu Jun 27 17:40:34 2024
@@ -0,0 +1,28 @@
+$NetBSD: patch-dirvish.conf.5,v 1.1 2024/06/27 17:40:34 abs Exp $
+
+Taken from debian - From: Ondřej Surý <ondrej%debian.org@localhost>
+Subject: Fix typo in docs about rsync-options which was deprecated
+
+Taken from debian - From: Paul Slootman <paul%debian.org@localhost>
+Subject: fix manpage nroff typo
+
+--- dirvish.conf.5.orig 2024-06-20 09:31:51.449735823 +0000
++++ dirvish.conf.5
+@@ -101,7 +101,7 @@ the system-wide configuration files in s
+ than /etc/dirvish.
+
+ Multiple configuration files will be loaded by the
+-.DR config ,
++.Dr config ,
+ .D vault
+ and
+ .D branch
+@@ -537,7 +537,7 @@ use the the
+ .B dirvish
+ supplied mechanism for setting it.
+
+-.multiple rsync\-options
++.multiple rsync\-option
+ .TP
+ .Br sparse: (B)
+ Try to handle sparse files efficiently so they take up
Index: pkgsrc/sysutils/dirvish/patches/patch-dirvish.pl
diff -u /dev/null pkgsrc/sysutils/dirvish/patches/patch-dirvish.pl:1.1
--- /dev/null Thu Jun 27 17:40:34 2024
+++ pkgsrc/sysutils/dirvish/patches/patch-dirvish.pl Thu Jun 27 17:40:34 2024
@@ -0,0 +1,89 @@
+$NetBSD: patch-dirvish.pl,v 1.1 2024/06/27 17:40:34 abs Exp $
+
+Taken from debian - add per vault lockfile to stop overlapping runs
+
+Taken from debian - From: Paul Slootman <paul%debian.org@localhost>
+# If you do "dirvish --init" and forget the --vault bit, the error message
+# is "vault undefined", which could make you think that a config file is
+# incorrect. Change the message to "vault not specified", which is a bit
+# clearer.
+
+Taken from debian - From: Paul Slootman <paul%debian.org@localhost>
+# If client is listed as the same as `hostname`, dirvish will not use
+# ssh to connect but do a local transfer. Do the same if client is
+# specified as 'localhost'.
+
+--- dirvish.pl.orig 2024-06-20 09:31:29.558321590 +0000
++++ dirvish.pl
+@@ -273,6 +273,13 @@ $$Options{vault} =~ /:/
+ and ($$Options{vault}, $$Options{branch})
+ = split(/:/, $Options{vault});
+
++# PS 20080819 the message "vault undefined" doesn't clearly say it's a command line problem
++for $key (qw(vault))
++{
++ length($$Options{$key}) or usage("$key not specified");
++ ref($$Options{$key}) eq 'CODE' and usage("$key undefined"); # where can 'CODE' come from?!
++}
++
+ for $key (qw(vault Image client tree))
+ {
+ length($$Options{$key}) or usage("$key undefined");
+@@ -451,6 +458,18 @@ scalar @{$$Options{exclude}}
+
+ if (!$$Options{'no-run'})
+ {
++ $lock_file = "$vault/dirvish/lock_file";
++ if (! -f $lock_file)
++ {
++ open(LOCK, "+>", $lock_file) or seppuku 150, "cannot create $lock_file";
++ printf LOCK $$;
++ close(LOCK);
++ }
++ else
++ {
++ seppuku 151, "$lock_file already exists";
++ }
++
+ mkdir "$vault/$image", 0700
+ or seppuku 230, "mkdir $vault/$image failed";
+ mkdir $destree, 0755;
+@@ -512,8 +531,9 @@ for $key (@summary_fields, 'RESET', sort
+ $$Options{init} or push @rsyncargs, "--link-dest=$reftree";
+
+ $rclient = undef;
+-$$Options{client} ne $$Options{Server}
+- and $rclient = $$Options{client} . ':';
++if ($$Options{client} ne $$Options{Server} and $$Options{client} ne 'localhost') {
++ $rclient = $$Options{client} . ':';
++}
+
+ $ENV{RSYNC_RSH} = $$Options{rsh};
+
+@@ -586,7 +606,7 @@ if ($$Options{'pre-client'})
+ log => $log_file,
+ dir => $srctree,
+ env => $WRAPPER_ENV,
+- shell => (($$Options{client} eq $$Options{Server})
++ shell => (($$Options{client} eq $$Options{Server} or $$Options{client} eq 'localhost')
+ ? undef
+ : "$$Options{rsh} $$Options{client}"),
+ );
+@@ -721,7 +741,7 @@ if ($$Options{'post-client'})
+ log => $log_file,
+ dir => $srctree,
+ env => $WRAPPER_ENV,
+- shell => (($$Options{client} eq $$Options{Server})
++ shell => (($$Options{client} eq $$Options{Server} or $$Options{client} eq 'localhost')
+ ? undef
+ : "$$Options{rsh} $$Options{client}"),
+ );
+@@ -755,6 +775,8 @@ if ($$Options{'post-server'})
+ }
+ }
+
++unlink($lock_file);
++
+ if($status{fatal})
+ {
+ system ("rm -rf $destree");
Home |
Main Index |
Thread Index |
Old Index