diff --git a/network/uget/curlopt_nosignal.diff b/network/uget/curlopt_nosignal.diff new file mode 100644 index 0000000000..022c763144 --- /dev/null +++ b/network/uget/curlopt_nosignal.diff @@ -0,0 +1,11 @@ +diff -Naur uget-1.6.4/uglib/UgPlugin-curl.c uget-1.6.4.patched//uglib/UgPlugin-curl.c +--- uget-1.6.4/uglib/UgPlugin-curl.c 2011-03-27 22:10:11.000000000 -0400 ++++ uget-1.6.4.patched//uglib/UgPlugin-curl.c 2011-05-21 16:45:24.000000000 -0400 +@@ -280,6 +280,7 @@ + curl_code = CURLE_FAILED_INIT; + + // Common option ---------------------------------------------------------- ++ curl_easy_setopt (curl, CURLOPT_NOSIGNAL , 1); + curl_easy_setopt (curl, CURLOPT_URL, common->url); + // setup scheme and it's related data (user & password) + ug_plugin_curl_set_scheme (plugin, curl); diff --git a/network/uget/uget.SlackBuild b/network/uget/uget.SlackBuild index b4c577eaaa..d3251d21b1 100644 --- a/network/uget/uget.SlackBuild +++ b/network/uget/uget.SlackBuild @@ -4,7 +4,7 @@ # Written by Morten Juhl-Johansen Zölde-Fejér PRGNAM=uget -VERSION=1.6.1 +VERSION=1.6.4_1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,15 +37,24 @@ fi set -e +# AFAIK, pkgtools still get confused by - in version number... +SRCVER=${VERSION/_/-} + +# Grr, and the tarball's filename doesn't match its top-level dir. +DIRVER=$( echo $SRCVER | sed 's/-.*//' ) + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +cd $PRGNAM-$DIRVER chown -R root:root . chmod -R u+w,go+r-w,a-s . +# Prevent segfaults in Curl_resolv_timeout() +patch -p1 < $CWD/curlopt_nosignal.diff + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/uget/uget.info b/network/uget/uget.info index c7a2137cc1..06e186933b 100644 --- a/network/uget/uget.info +++ b/network/uget/uget.info @@ -1,10 +1,10 @@ PRGNAM="uget" -VERSION="1.6.1" +VERSION="1.6.4_1" HOMEPAGE="http://urlget.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/urlget/uget-1.6.1.tar.gz" -MD5SUM="1df3f5de08ab2924ee9c7ed89d3b69a8" +DOWNLOAD="http://downloads.sourceforge.net/urlget/uget-1.6.4-1.tar.gz" +MD5SUM="d5dbd1e98e95c0f7ea47b2233056fb36" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" -APPROVED="rworkman" +APPROVED="dsomero"