diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index bd86899fa..dc2c9cd2e 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -5,6 +5,7 @@ - improved the exim package to honor prefix, made it jail-able - improvements and some tiny clenups in misc/jailing - the stone isntall module now lists the guessed partition content + - Mathieu: (real) support for .Z files, fix for dcc *) 2003-09-14 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/sirkull/dcc/dcc.conf b/package/sirkull/dcc/dcc.conf index 3b0697b1c..b00ad43f9 100644 --- a/package/sirkull/dcc/dcc.conf +++ b/package/sirkull/dcc/dcc.conf @@ -24,15 +24,3 @@ if [ $prefix_auto = 1 ] ; then prefix="opt/dcc" set_confopt fi - -dcc_custmain() { - tar zxf $archdir/dcc-dccd-$ver.tar.Z - cd dcc-dccd-$ver - ./configure $confopt - $MAKE - $MAKE install -} - -autoextract=0 -custmain="dcc_custmain" - diff --git a/package/sirkull/dcc/dcc.desc b/package/sirkull/dcc/dcc.desc index 03cdb4f81..f1e256946 100644 --- a/package/sirkull/dcc/dcc.desc +++ b/package/sirkull/dcc/dcc.desc @@ -38,8 +38,8 @@ [L] BSD [S] Stable -[V] 1.2.1 +[V] 1.2.6 [P] X -----5---9 238.000 -[D] 1814987215 dcc-dccd-1.2.1.tar.Z http://www.rhyolite.com/anti-spam/dcc/source/ +[D] 3398545870 dcc-dccd-1.2.6.tar.Z http://www.rhyolite.com/anti-spam/dcc/source/ diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 797dc947b..b857e8978 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -642,7 +642,7 @@ abort() { ( set -e for xsrctar in $( echo "$desc_D" | tr ' ' '\t' | \ - tr -s '\t' | cut -f2 | sed 's,.\(t\?\)gz$,.\1bz2,' ) + tr -s '\t' | cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' ) do if [ ! -f $archdir/$xsrctar ]; then echo "File not found: ${archdir#$base/}/$xsrctar" diff --git a/scripts/Create-CkSumPatch b/scripts/Create-CkSumPatch index f4f3ed20c..6844263fd 100755 --- a/scripts/Create-CkSumPatch +++ b/scripts/Create-CkSumPatch @@ -48,7 +48,7 @@ echo -n > cksum.patch ./scripts/Download -list-cksums | grep '^00* ' | \ while read cksum gzfile ; do - bzfile="`echo "$gzfile" | sed 's,\.\(t\?\)gz$,.\1bz2,'`" + bzfile="`echo "$gzfile" | sed 's,\.\(t\?\)\(gz\|Z\)$,.\1bz2,'`" if [ -f "$bzfile" ] then diff --git a/scripts/Download b/scripts/Download index d9caaeb4d..c17cdfbfe 100755 --- a/scripts/Download +++ b/scripts/Download @@ -265,7 +265,7 @@ download_file() { # Make src directory for creating tar balls mkdir -p src/ # Tar ball file name: - bzfile="`echo "$gzfile" | sed 's,\.\(t\?\)gz$,.\1bz2,'`" + bzfile="`echo "$gzfile" | sed 's,\.\(t\?\)\(gz\|Z\)$,.\1bz2,'`" # Lock file name: lkfile="src/down.lockfile.`echo $bzfile | tr / -`" @@ -534,7 +534,7 @@ download_file() { # Convert a .gz to .bz2 and test checksum # if [ "$gzfile" != "$bzfile" ] ; then - echo "gzip->bzip2 + cksum-test: $gzfile" + echo "bzip'ing + cksum-test: $gzfile" gunzip < "$gzfile" > src/down.$$.dat if cksum_chk src/down.$$.dat $cksum "$gzfile" ; then bzip2 < src/down.$$.dat > "$bzfile" ; rm -f "$gzfile" diff --git a/scripts/functions b/scripts/functions index f7dd3fddf..beadbf49b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -448,7 +448,7 @@ build_this_package() { # if [ $srctar = auto ] ; then xsourceballs=$( echo "$desc_D" | head -1 | tr ' ' '\t' | tr -s '\t' | \ - cut -f2 | sed 's,.\(t\?\)gz$,.\1bz2,' ) + cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' ) if [ -z "$xsourceballs" ] ; then echo "Can't auto-detect srctar for package '$pkg'!" false @@ -458,7 +458,7 @@ build_this_package() { fi else sourceballs=$( echo "$desc_D" | tr ' ' '\t' | tr -s '\t' | \ - cut -f2 | sed 's,.\(t\?\)gz$,.\1bz2,' ) + cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' ) xsrcpattern=$( echo "$desc_SRC" | tr ' ' '\t' | tr -s '\t' | tr '\t' '\n' ) xsourceballs=$( echo "$sourceballs" | grep -F "$xsrcpattern" ) fi