Attached is an NMU diff for these two grave bugs. I will be uploading
the NMU to delayed/3days.
diff -ruN ../orig/apt-move-4.2.24/Makefile apt-move-4.2.24/Makefile
--- ../orig/apt-move-4.2.24/Makefile 2003-02-22 10:56:27.000000000 +0000
+++ apt-move-4.2.24/Makefile 2005-12-17 00:31:41.000000000 +0000
@@ -23,7 +23,7 @@
install: fetch
install -p apt-move $(BINDIR)
install fetch $(LIBDIR)
- install del1 move3 pkg1 $(SHAREDIR)
+ install del1 move3 pkg1 perlstat $(SHAREDIR)
install -m 644 get[23] move[4-7] *.awk Contents.head $(SHAREDIR)
cp -p apt-move.conf $(CONFDIR)
cp -p apt-move.8 $(MANDIR)
diff -ruN ../orig/apt-move-4.2.24/apt-move apt-move-4.2.24/apt-move
--- ../orig/apt-move-4.2.24/apt-move 2005-12-16 23:25:11.000000000 +0000
+++ apt-move-4.2.24/apt-move 2005-12-17 00:27:32.000000000 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/dash
#
# Copyright (c) 1999 Michael Merten <[EMAIL PROTECTED]>
# Copyright (c) 1999-2000 Gregory T. Norris <[EMAIL PROTECTED]>
@@ -18,14 +18,6 @@
#
set -e
-if ! type exp > /dev/null 2>&1; then
- if type dash > /dev/null 2>&1; then
- exec dash $0 "$@"
- else
- exec ash $0 "$@"
- fi
-fi
-
[ ${CDPATH+1} ] && unset CDPATH
if [ ${LC_ALL+1} ]; then
export LC_MONETARY="$LC_ALL"
@@ -778,14 +770,14 @@
mkdir $pf/deb $pf/dsc
if [ $GET_BINARY ]; then
- < $pf-deb xargs -r stat -L -c %s > $pf-fifo1&
+ < $pf-deb xargs -r $SCRIPTS/perlstat > $pf-fifo1&
< $pf-deb xargs -r md5sum |
$MOVE4 $pf/deb $pf-fifo1 $pf-skip1 $pf-pkg $CONTENTS
waitall
fi > $pf-mvdeb
if [ $GET_SOURCE ]; then
- < $pf-dsc xargs -r stat -L -c %s > $pf-fifo1&
+ < $pf-dsc xargs -r $SCRIPTS/perlstat > $pf-fifo1&
< $pf-dsc xargs -r md5sum |
$MOVE4 $pf/dsc $pf-fifo1 $pf-skip2 > $pf-dsc1
waitall
@@ -847,13 +839,13 @@
-name '*.dsc' -fprint $pf-dsc \
\)
- < $pf-deb xargs -r stat -L -c %s > $pf-fifo1&
+ < $pf-deb xargs -r $SCRIPTS/perlstat > $pf-fifo1&
< $pf-deb xargs -r md5sum |
$MOVE4 $pf/deb $pf-fifo1 $pf-skip1 $pf-pkg $CONTENTS \
> $pf-mvdeb
waitall
- < $pf-dsc xargs -r stat -L -c %s > $pf-fifo1&
+ < $pf-dsc xargs -r $SCRIPTS/perlstat > $pf-fifo1&
< $pf-dsc xargs -r md5sum |
$MOVE4 $pf/dsc $pf-fifo1 $pf-skip2 > $pf-dsc1
waitall
@@ -1240,7 +1232,7 @@
get_checksum() {
for l; do
[ -f $l ] || continue
- size=$(stat -c %s $l)
+ size=$($SCRIPTS/perlstat $l)
printf ' %32s%.s %16d %s\n' \
$(md5sum $l) $size $j/$k/$l
printf ' %40s%.s %16d %s\n' \
diff -ruN ../orig/apt-move-4.2.24/debian/changelog
apt-move-4.2.24/debian/changelog
--- ../orig/apt-move-4.2.24/debian/changelog 2005-12-16 23:25:11.000000000
+0000
+++ apt-move-4.2.24/debian/changelog 2005-12-16 23:52:09.000000000 +0000
@@ -1,3 +1,11 @@
+apt-move (4.2.24-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Patch for new dash (Closes: #341234)
+ * Avoid stat program incompatability by using perl (Closes: #339024)
+
+ -- Blars Blarson <[EMAIL PROTECTED]> Fri, 16 Dec 2005 23:27:13 +0000
+
apt-move (4.2.24-1) unstable; urgency=low
* New upstream version (closes: #310391)
diff -ruN ../orig/apt-move-4.2.24/debian/control apt-move-4.2.24/debian/control
--- ../orig/apt-move-4.2.24/debian/control 2005-12-16 23:25:11.000000000
+0000
+++ apt-move-4.2.24/debian/control 2005-12-16 23:31:09.000000000 +0000
@@ -7,7 +7,7 @@
Package: apt-move
Architecture: any
-Depends: bc, dash | ash, ${shlibs:Depends}
+Depends: bc, dash, ${shlibs:Depends}
Recommends: apt
Description: Maintain Debian packages in a package pool
apt-move is used to move a collection of Debian package files into a proper
diff -ruN ../orig/apt-move-4.2.24/perlstat apt-move-4.2.24/perlstat
--- ../orig/apt-move-4.2.24/perlstat 1970-01-01 00:00:00.000000000 +0000
+++ apt-move-4.2.24/perlstat 2005-12-17 00:38:15.000000000 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/perl
+# replacement for broken stat -L -c %s
+for (@ARGV) {
+ print (((stat)[7]) . "\n");
+}
