Package: dupload
Version: 2.6.3.2
Severity: wishlist
Hi.
I would love to see some of the various dupload bugs fixed before
etch goes to freeze. I would propose to do a NMU upload to achieve
this. As none of them is RC I will certainly not rush this upload.
Here my current patch:
diff -aur dupload-2.6.3.2/debian/changelog dupload-2.6.3.3/debian/changelog
--- dupload-2.6.3.2/debian/changelog 2005-08-06 20:18:54.000000000 +0200
+++ dupload-2.6.3.3/debian/changelog 2006-11-11 23:19:36.000000000 +0100
@@ -1,3 +1,22 @@
+dupload (2.6.3.3) unstable; urgency=low
+
+ * NMU
+ * Recommend openssh-client instead of ssh, keep ssh as alternative
+ for now. Reported by Aaron Schrab (Closes: #387678)
+ * Setting $default_host from a local dupload.conf is now possible
+ again. Reported by martin f krafft (Closes: #249341)
+ * Add empty binary-arch target in debian/rules. Reported by
+ Aurelien Jarno (Closes: #395593)
+ * Treat DEBDELAY=0 correctly. Patch by Matej Vela (Closes: #356780)
+ * Fix headers of man pages. Reported by Denis Barbier (Closes: #222934)
+ * Update location of security upload queues. Reported by adrian
+ (Closes: #345078)
+ * Fix move of files to the queuedir. Patch by Bob Proulx
+ (Closes: #279308)
+ * Remove build-stamp in debian/rules' clean target
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 11 Nov 2006 21:17:38 +0100
+
dupload (2.6.3.2) unstable; urgency=low
* NMU during BSP.
diff -aur dupload-2.6.3.2/debian/control dupload-2.6.3.3/debian/control
--- dupload-2.6.3.2/debian/control 2003-09-21 13:32:29.000000000 +0200
+++ dupload-2.6.3.3/debian/control 2006-11-11 21:36:59.000000000 +0100
@@ -9,7 +9,7 @@
Package: dupload
Architecture: all
Depends: perl (>= 5.003), libnet-perl
-Recommends: ssh
+Recommends: openssh-client | ssh
Suggests: lintian, mail-transport-agent
Description: utility to upload Debian packages
dupload will automagically upload Debian packages to a remote host
diff -aur dupload-2.6.3.2/debian/rules dupload-2.6.3.3/debian/rules
--- dupload-2.6.3.2/debian/rules 2005-07-27 00:35:05.000000000 +0200
+++ dupload-2.6.3.3/debian/rules 2006-11-11 23:16:24.000000000 +0100
@@ -13,10 +13,14 @@
clean:
dh_testdir
$(MAKE) clean
+ rm -f build-stamp
dh_clean build
binary: binary-indep binary-arch
+binary-arch:
+# do nothing here
+
binary-indep: DH_OPTIONS=-i
binary-indep: build
dh_testdir
diff -aur dupload-2.6.3.2/dupload dupload-2.6.3.3/dupload
--- dupload-2.6.3.2/dupload 2005-07-27 00:48:57.000000000 +0200
+++ dupload-2.6.3.3/dupload 2006-11-11 23:14:14.000000000 +0100
@@ -51,8 +51,7 @@
@all_the_debs, # ... we installed (for postupload processing)
%all_packages, # All Debian binary packages we installed
# (for postupload processing)
- $scpfiles,
- $rsyncfiles,
+ $copiedfiles,
$dry, # if do-nothing
$mailonly,
$fqdn, # per host
@@ -109,6 +108,9 @@
quiet Version version
) or fatal("Bad Options\n");
+$configfile = $::opt_configfile || $configfile;
+configure("./dupload.conf") if $configfile;
+
$dry = defined($::opt_no);
$mailonly = defined($::opt_mailonly);
if ($mailonly) {
@@ -116,13 +118,10 @@
}
$debug = $::opt_debug || $debug;
$keep = $::opt_keep || $keep;
-$configfile = $::opt_configfile || $configfile;
$host = $::opt_to || $config::default_host;
$force = $::opt_force || $force;
$nomail = $::opt_nomail || 0;
$quiet = $::opt_quiet;
-
-configure("./dupload.conf") if $configfile;
# only info or version?
info($host), exit 0 if $::opt_print;
@@ -474,8 +473,7 @@
my $mode;
my $batchmode;
my $allfiles;
- $scpfiles = "";
- $rsyncfiles = "";
+ $copiedfiles = "";
my ($package, $version, $arch) = (split("_", $job, 3));
my ($upstream, $debian) = (split("-", $version, 2));
@@ -531,7 +529,7 @@
$t = 1;
}
} elsif ($method eq "scpb") {
- $scpfiles .= "$file ";
+ $copiedfiles .= "$file ";
$mode = (stat($file))[2];
# Small optimization
if ($mode != 33188) { # rw-r--r-- aka 0644
@@ -540,7 +538,7 @@
$t = 1;
$batchmode = 1;
} elsif ($method eq "rsync") {
- $rsyncfiles .= "$file ";
+ $copiedfiles .= "$file ";
$mode = (stat($file))[2];
# Small optimization
if ($mode != 33188) { # rw-r--r-- aka 0644
@@ -587,48 +585,53 @@
}
}
# and now the batch mode uploads
+ my $needcmd = 0;
+ my $cmd = "ssh -x -l $login $fqdn 'cd $incoming;";
+ if ($wrong_mode) {
+ $cmd .= "chmod 0644 $copiedfiles;";
+ $needcmd = 1;
+ }
+ if (length($queuedir) > 0) {
+ $cmd .= "mv $copiedfiles $queuedir;";
+ $needcmd = 1;
+ }
+ $cmd .= "'";
if ($method eq "scpb") {
- my $cmd = "ssh -x -l $login $fqdn 'cd $incoming;chmod 0644
$scpfiles;".
- ($queuedir ? "mv $scpfiles $queuedir" : "").
- "'";
unless ($dry) {
p "\n";
- system("scp $options $scpfiles [EMAIL
PROTECTED]:$incoming");
+ system("scp $options $copiedfiles [EMAIL
PROTECTED]:$incoming");
if ($?) {
unlink $log{$job};
- fatal("scp $scpfiles failed\n");
+ fatal("scp $copiedfiles failed\n");
}
- if ($wrong_mode) {
+ if ($needcmd) {
system($cmd);
}
fatal("$cmd failed\n") if $?;
} else {
- p "\n+ scp $options $scpfiles [EMAIL
PROTECTED]:$incoming";
+ p "\n+ scp $options $copiedfiles [EMAIL
PROTECTED]:$incoming";
p "\n+ $cmd";
}
- $allfiles = $scpfiles;
+ $allfiles = $copiedfiles;
}
if ($method eq "rsync") {
- my $cmd = "ssh -x -l $login $fqdn 'cd $incoming;chmod 0644
$rsyncfiles".
- ($queuedir ? ";mv $rsyncfiles $queuedir" : "").
- "'";
unless ($dry) {
p "\n";
- system("rsync --partial -zave ssh $options -x
$rsyncfiles $login" . "@" . "$fqdn:$incoming");
+ system("rsync --partial -zave ssh $options -x
$copiedfiles $login" . "@" . "$fqdn:$incoming");
if ($?) {
unlink $log{$job};
- fatal("rsync $rsyncfiles failed\n");
+ fatal("rsync $copiedfiles failed\n");
}
- if ($wrong_mode) {
+ if ($needcmd) {
system($cmd);
}
fatal("$cmd failed\n") if $?;
} else {
- p "\n+ rsync --partial -zave ssh $options -x
$rsyncfiles $login" . "@" . "$fqdn:$incoming";
+ p "\n+ rsync --partial -zave ssh $options -x
$copiedfiles $login" . "@" . "$fqdn:$incoming";
p "\n+ $cmd";
}
- $allfiles = $rsyncfiles;
+ $allfiles = $copiedfiles;
}
if ($batchmode) {
unless ($dry) {
diff -aur dupload-2.6.3.2/dupload.conf dupload-2.6.3.3/dupload.conf
--- dupload-2.6.3.2/dupload.conf 2005-07-27 01:13:46.000000000 +0200
+++ dupload-2.6.3.3/dupload.conf 2006-11-11 22:54:13.000000000 +0100
@@ -55,7 +55,8 @@
# $postupload{'deb'}
# $postupload{'package'}
-# Note: hooks can also be defined in a per-host basis
+# Note: hooks can also be defined in a per-host basis, this
+# overrides globaly defined hooks.
# -----------------
# Pre-defined hosts
@@ -79,7 +80,7 @@
# For Delayed uploads use this. You can use 0-day, which is uploaded
# one hour before dinstall runs.
-$delay = ($ENV{DEBDELAY} || 7);
+$delay = (defined($ENV{DEBDELAY}) ? $ENV{DEBDELAY} : 7);
$cfg{'delayed'} = {
fqdn => "gluck.debian.org",
method => "scpb",
@@ -115,7 +116,7 @@
# Notice: There are login restriction on this host, scp will not
# work unless you are authorised.
#$cfg{'security'} = {
-# fqdn => "security.debian.org",
+# fqdn => "security-master.debian.org",
# method => "scpb",
# incoming => "/org/security.debian.org/queue/unchecked",
# # The dinstall on security sends emails itself
@@ -123,7 +124,7 @@
# nonus => 1,
#};
#$cfg{'anonymous-security'} = {
-# fqdn => "security.debian.org",
+# fqdn => "security-master.debian.org",
# incoming => "/pub/SecurityUploadQueue",
# # files pass on to dinstall on security which sends emails itself
# dinstall_runs => 1,
diff -aur dupload-2.6.3.2/Makefile dupload-2.6.3.3/Makefile
--- dupload-2.6.3.2/Makefile 2005-07-27 01:04:08.000000000 +0200
+++ dupload-2.6.3.3/Makefile 2006-11-11 22:12:02.000000000 +0100
@@ -45,7 +45,8 @@
%: %pod
$(POD2MAN) \
- --section=$(notdir $@) \
+ --section=$(subst .,,$(suffix $@)) \
+ --name=$$(echo $(basename $@) | perl -pe '$$_=uc') \
--center="Debian Project" \
--date="`LC_ALL=C date '+%B %Y'`" \
--release="dupload $(version)" \
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-2-k7
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Versions of packages dupload depends on:
ii perl 5.8.8-6.1 Larry Wall's Practical Extraction
ii perl-modules [libnet-perl] 5.8.8-6.1 Core Perl modules
Versions of packages dupload recommends:
ii ssh 1:4.3p2-5.1 Secure shell client and server (tr
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
