[Apt-zip-devel] r79 - in trunk: . debian methods
eddyp-guest at alioth.debian.org
eddyp-guest at alioth.debian.org
Tue Mar 18 09:02:09 UTC 2008
Author: eddyp-guest
Date: 2008-03-18 09:02:08 +0000 (Tue, 18 Mar 2008)
New Revision: 79
Modified:
trunk/README.wget-dos
trunk/apt-zip-inst
trunk/apt-zip-list
trunk/apt-zip.sgml
trunk/common.sh.in
trunk/debian/NEWS
trunk/debian/changelog
trunk/debian/control
trunk/methods/wget
trunk/methods/wget-dos
Log:
added files that make release 0.18
Modified: trunk/README.wget-dos
===================================================================
--- trunk/README.wget-dos 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/README.wget-dos 2008-03-18 09:02:08 UTC (rev 79)
@@ -4,7 +4,7 @@
binaries need to be installed on the target according to your settings. These
can be in PATH or simply in the same directory as the scripts. The easiest
possibility is to disable md5-checks, then you just need wget.exe. Still,
-adding md5sum.exe is also not that hard :) Locations for working binaries are:
+adding sha236sum.exe is also not that hard :) Locations for working binaries are:
wget (DOS) : http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.0/pkgs/wgetx.zip
md5sum (DOS) : http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.0/pkgs/md5sumx.zip
Modified: trunk/apt-zip-inst
===================================================================
--- trunk/apt-zip-inst 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/apt-zip-inst 2008-03-18 09:02:08 UTC (rev 79)
@@ -42,7 +42,7 @@
rm -f foo-stamp
)
else
- EXTRACTDIR=/var/cache/apt/archive
+ EXTRACTDIR=/var/cache/apt/archives
echo >&2 "Unpacking tarball..."
( cd $EXTRACTDIR ; tar xvf ${MEDIUM}/${APTZIPTARFILE} )
fi
Modified: trunk/apt-zip-list
===================================================================
--- trunk/apt-zip-list 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/apt-zip-list 2008-03-18 09:02:08 UTC (rev 79)
@@ -35,7 +35,7 @@
[ -n "$PACKAGES" ] && apt-get ${APTGETEXTRAOPTS} -qq --print-uris install $PACKAGES > "$TMP"
[ -n "$APTGETACTION" ] && apt-get ${APTGETEXTRAOPTS} -qq --print-uris ${APTGETACTION} >> "$TMP"
-grep $GREP < "$TMP" | tr -d "'" | sort -u > "$TEMP"
+grep $GREP < "$TMP" | tr -d "'" | sed 's/SHA256://' | sort -u > "$TEMP"
if [ $? != 0 ]
then
error "apt-get failed"
@@ -94,7 +94,7 @@
$TEMP
fi
-# --print-uris shows: URI filename size-in-bytes md5
+# --print-uris shows: URI filename size-in-bytes checksum
$FILTER < "$TEMP" >"$SCRIPT"
if [ $? != 0 ]
then
Modified: trunk/apt-zip.sgml
===================================================================
--- trunk/apt-zip.sgml 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/apt-zip.sgml 2008-03-18 09:02:08 UTC (rev 79)
@@ -65,7 +65,7 @@
<citerefentry><refentrytitle/dselect/<manvolnum/8/</citerefentry> or
indicated in the command line, the other <filename>apt-zip.options</filename>
saves the options used by
- <command>apt-zip-list</command> to indicates to
+ <command>apt-zip-list</command> to indicate to
<command>apt-zip-inst</command> what action to perform and/or which
packages to install.
Various types of scripts can be generated, by specifying a fetch
@@ -186,13 +186,14 @@
</varlistentry>
<varlistentry>
- <term>--no-md5, -5</term>
+ <term>--no-checksum, --no-md5, -5</term>
<listitem>
<simpara>This option will command to apt-zip-list to create a
- script which does not make any md5sum checks.
+ script which does not make any sha256sum checks.
Note that if this option is not given at script generation
- time, the md5sum command will be called only after it has
- been found in the system.
+ time, the sha256sum command will be called only after it has
+ been found in the system. (--no-md5 is maintained for
+ script compatibility, but there is only sha256)
</simpara>
</listitem>
</varlistentry>
Modified: trunk/common.sh.in
===================================================================
--- trunk/common.sh.in 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/common.sh.in 2008-03-18 09:02:08 UTC (rev 79)
@@ -54,8 +54,8 @@
-f, --fix-broken Call apt-get with this flag
-s, --skip-mount Do not mount a device on the dir specified by --medium
-S, --use-sleep=SEC Wait SEC seconds after each download
- -5, --no-md5 Do not make md5 sum checks; Note that if this option is
- not given at script generation time, the md5sum command
+ -5, --no-checksum Do not make checksum checks; Note that if this option is
+ not given at script generation time, the sha256sum command
will be called only after it has been found in the
system.
EOF
@@ -117,7 +117,7 @@
SLEEPTIME=0
SLEEPEVALCMD='true'
CHECKEVALCMD='echo "check"'
- USEMD5SUMS='yes'
+ USECHECKSUMS='yes'
[ -r $CONFFILE ] && . $CONFFILE
METHOD=${METHOD-wget}
MEDIUM=${MEDIUM-/ZIP}
@@ -169,9 +169,9 @@
shift
shift
;;
- --no-md5|-5)
+ --no-checksum|--no-md5|-5)
CHECKEVALCMD='echo "echo"'
- USEMD5SUMS='no'
+ USECHECKSUMS='no'
shift
;;
--use-sleep=*)
Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/debian/NEWS 2008-03-18 09:02:08 UTC (rev 79)
@@ -1,9 +1,11 @@
-2006-06-05
+apt-zip (0.15) unstable; urgency=low
-Please note that apt-zip does no longer use by default /ZIP as a mount point.
-Instead, /media/zip is used in order to achieve FHS compliancy (#344243).
+ Please note that apt-zip does no longer use by default /ZIP as a mount point.
+ Instead, /media/zip is used in order to achieve FHS compliancy (#344243).
-This is true since version 0.14.
+ This is true since version 0.14.
-Files affected: /etc/apt/apt-zip.conf
+ Files affected: /etc/apt/apt-zip.conf
+ -- Eddy Petri<C8><99>or <eddy.petrisor at gmail.com> Mon, 5 Jun 2006 22:41:28 +0300
+
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/debian/changelog 2008-03-18 09:02:08 UTC (rev 79)
@@ -1,3 +1,12 @@
+apt-zip (0.18) unstable; urgency=medium
+
+ * Use sha256 instead of md5 for checksum, as in apt 0.7.7.
+ Patch from Sandro Tosi (Closes: #455577), thanks!
+ * correct dir in apt-zip-inst (Closes: #385087), thanks Reinhardt A.W. Maier
+ * fix typo in manpage (Closes: #441207), thanks Ferdinand Rissner
+
+ -- Giacomo Catenazzi <cate at debian.org> Fri, 01 Feb 2008 08:18:47 +0100
+
apt-zip (0.17) unstable; urgency=low
* Add 'wget-dos' method. Now you can use a DOS/Windows
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/debian/control 2008-03-18 09:02:08 UTC (rev 79)
@@ -5,11 +5,12 @@
Build-Depends: debhelper (>= 5), cdbs
Maintainer: Giacomo Catenazzi <cate at debian.org>
Uploaders: Eddy Petrișor <eddy.petrisor at gmail.com>, François Févotte <francois.fevotte at ensta.org>
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
+Homepage: http://alioth.debian.org/projects/apt-zip
Package: apt-zip
Architecture: all
-Depends: apt (>= 0.3.10)
+Depends: apt (>= 0.7.7)
Description: Update a non-networked computer using apt and removable media
These scripts simplify the process of using dselect and apt on a
non-networked Debian box, using removable media like ZIP floppies and
Modified: trunk/methods/wget
===================================================================
--- trunk/methods/wget 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/methods/wget 2008-03-18 09:02:08 UTC (rev 79)
@@ -28,15 +28,15 @@
###############
# add check code, if is wanted
#
-[ ! "${USEMD5SUMS}" = 'no' ] && cat <<-EOF
+[ ! "${USECHECKSUMS}" = 'no' ] && cat <<-EOF
check(){
[ ! -r "\$1" ] && return 1
[ "\$2" = "0" ] && return \$3
[ "\$2" = "" ] && return \$3
- [ "\`type md5sum\`" ] &&
- if [ "\`md5sum \$1 | cut -d' ' -f1\`" = \$2 ]
+ [ "\`type sha256sum\`" ] &&
+ if [ "\`sha256sum \$1 | cut -d' ' -f1\`" = \$2 ]
then return 0
- else err \$1 "wrong MD5"; return 1
+ else err \$1 "wrong checksum"; return 1
fi
[ "\`type gzip\`" ] &&
if ar p \$1 data.tar.gz | gzip -t
@@ -188,8 +188,8 @@
cat <<-EOF
echo Download will be of size: "$DWLSIZE" in "$PACKCOUNT" files
- while read URL FILE SIZE MD5
- do getfile \$URL \$FILE \$SIZE \$MD5 || true
+ while read URL FILE SIZE CHECKSUM
+ do getfile \$URL \$FILE \$SIZE \$CHECKSUM || true
done <<EOP
EOF
Modified: trunk/methods/wget-dos
===================================================================
--- trunk/methods/wget-dos 2008-03-18 08:59:15 UTC (rev 78)
+++ trunk/methods/wget-dos 2008-03-18 09:02:08 UTC (rev 79)
@@ -63,12 +63,12 @@
if not exist %file_to_check% goto failed
EOF
-[ ! "${USEMD5SUMS}" = 'no' ] && cat >>${SCRIPT}.utils <<-EOF
- if "%3"=="" goto md5_ok
- if "%3"=="0" goto md5_ok
- if %HAS_md5sum.exe%==1 echo %3 *%file_to_check% | md5sum -c
+[ ! "${USECHECKSUMS}" = 'no' ] && cat >>${SCRIPT}.utils <<-EOF
+ if "%3"=="" goto checksum_ok
+ if "%3"=="0" goto checksum_ok
+ if %HAS_sha256sum.exe%==1 echo %3 *%file_to_check% | sha256sum -c
if errorlevel 1 goto failed
-:md5_ok
+:checksum_ok
EOF
cat >>${SCRIPT}.utils <<-EOF
@@ -91,7 +91,7 @@
echo "@echo off" >>${SCRIPT}.bat
add_check wget.exe
-[ ! "${USEMD5SUMS}" = 'no' ] && add_check md5sum.exe
+[ ! "${USECHECKSUMS}" = 'no' ] && add_check sha256sum.exe
[ "$SLEEPTIME" -ne "0" ] && add_check sleep.exe
#FIXME: could not make dir?
@@ -117,7 +117,7 @@
echo Critical error!
:end
set HAS_wget.exe=
- set HAS_md5sum.exe=
+ set HAS_sha256sum.exe=
set HAS_sleep.exe=
EOF
@@ -128,7 +128,7 @@
echo "echo Download will be of size: $DWLSIZE in $PACKCOUNT files"
# '%' needs to be escaped twice here, so it will stay as a character inside a filename
-if [ ! "${USEMD5SUMS}" = 'no' ]; then
+if [ ! "${USECHECKSUMS}" = 'no' ]; then
awk '{gsub(/%/,"%%%%",$2); printf "call u.bat \"%s\" %s %s\n",$1,$2,$4}'
else
awk '{gsub(/%/,"%%%%",$2); printf "call u.bat \"%s\" %s\n",$1,$2}'
More information about the apt-zip-devel
mailing list