From 088aa691c907d8e40462b13f8f8c1a8be6e9d979 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 31 May 2011 23:04:27 -0400
Subject: network/uget: Updated for version 1.6.4_1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 network/uget/curlopt_nosignal.diff | 11 +++++++++++
 network/uget/uget.SlackBuild       | 15 ++++++++++++---
 network/uget/uget.info             |  8 ++++----
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 network/uget/curlopt_nosignal.diff

(limited to 'network/uget')

diff --git a/network/uget/curlopt_nosignal.diff b/network/uget/curlopt_nosignal.diff
new file mode 100644
index 000000000000..022c76314450
--- /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 b4c577eaaa87..d3251d21b135 100644
--- a/network/uget/uget.SlackBuild
+++ b/network/uget/uget.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>
 
 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 c7a2137cc12a..06e186933bc0 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"
-- 
cgit v1.2.3