Simon Olofsson wrote on Thu, Jun 23, 2011 at 18:14:20 +0200:
> On 23 Jun 2011, at 17:32, Daniel Shahaf wrote:
> >> when trying to build SVN 1.6 from this branch:
> >> http://svn.apache.org/repos/asf/subversion/branches/1.6.x
> >> get-deps.sh fails, because sqlite-amalgamation has been moved:
> >>
> >> --2011-06-23 14:47:38--
> >> http://www.sqlite.org/sqlite-amalgamation-3.7.5.tar.gz
> >> Resolving www.sqlite.org... 67.18.92.124
> >> Connecting to www.sqlite.org|67.18.92.124|:80... connected.
> >> HTTP request sent, awaiting response... 404 Not Found
> >> 2011-06-23 14:47:39 ERROR 404: Not Found.
> >>
> >> I fixed this by using the get-deps.sh script from trunk (with
> >> corrected versions of course).
> >
> >> Should I create an issue?
> >>
> >
> > No, please re-send the patch as a *.txt attachment.
>
> Attached is the patch.
>
> Regards
> Simon
This is a part of r1134734. Backport proposed. Thanks!
(I've changed 3.7.5 to 3.7.5.0, although now I know that's not necessary
according to POSIX.)
> Index: get-deps.sh
> ===================================================================
> --- get-deps.sh (revision 1138852)
> +++ get-deps.sh (working copy)
> @@ -29,7 +29,7 @@
> SERF=serf-0.7.0
> ZLIB=zlib-1.2.5
> SQLITE_VERSION=3.7.5
> -SQLITE=sqlite-amalgamation-$SQLITE_VERSION
> +SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
>
> HTTPD=httpd-2.2.18
> APR_ICONV=apr-iconv-1.2.1
> @@ -50,18 +50,18 @@
> wget -nc http://webdav.org/neon/$NEON.tar.gz
> wget -nc http://serf.googlecode.com/files/$SERF.tar.bz2
> wget -nc http://www.zlib.net/$ZLIB.tar.bz2
> - wget -nc http://www.sqlite.org/$SQLITE.tar.gz
> + wget -nc http://www.sqlite.org/$SQLITE.zip
>
> cd $BASEDIR
> gzip -dc $TEMPDIR/$NEON.tar.gz | tar -xf -
> bzip2 -dc $TEMPDIR/$ZLIB.tar.bz2 | tar -xf -
> bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
> - gzip -dc $TEMPDIR/$SQLITE.tar.gz | tar -xf -
> + unzip -q $TEMPDIR/$SQLITE.zip
>
> mv $NEON neon
> mv $ZLIB zlib
> mv $SERF serf
> - mv sqlite-$SQLITE_VERSION sqlite-amalgamation
> + mv $SQLITE sqlite-amalgamation
>
> bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
> bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
Received on 2011-06-23 19:00:54 CEST