From 035c6bd55dbe75412794f6875063f54d8fe16a3d Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 6 Jan 2012 07:18:15 -0600 Subject: network/uget: Updated for version 1.8.0. Signed-off-by: Erik Hanson --- network/uget/README | 4 ++++ network/uget/curlopt_nosignal.diff | 22 +++++++++++----------- network/uget/uget.SlackBuild | 26 +++++++++++++++----------- network/uget/uget.info | 10 +++++----- 4 files changed, 35 insertions(+), 27 deletions(-) (limited to 'network') diff --git a/network/uget/README b/network/uget/README index a0e6684ecf..7e249ac34d 100644 --- a/network/uget/README +++ b/network/uget/README @@ -2,3 +2,7 @@ Uget (formerly urlgfe) is a Free and Open Source download manager. It allows for queuing downloads, file type-based classification of downloads, and is lightweight. + +Optionally, uget can be compiled with support for aria2. This is +autodetected at build time. You can forcibly disable aria2 support by +setting ARIA2=no in the environment. diff --git a/network/uget/curlopt_nosignal.diff b/network/uget/curlopt_nosignal.diff index 022c763144..5310970fdb 100644 --- a/network/uget/curlopt_nosignal.diff +++ b/network/uget/curlopt_nosignal.diff @@ -1,11 +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 -Naur uget-1.8.0/uglib/UgXmlrpc.c uget-1.8.0.patched//uglib/UgXmlrpc.c +--- uget-1.8.0/uglib/UgXmlrpc.c 2011-04-28 21:34:25.000000000 -0400 ++++ uget-1.8.0.patched//uglib/UgXmlrpc.c 2012-01-02 15:00:39.000000000 -0500 +@@ -111,6 +111,7 @@ + xmlrpc->user_agent = g_strdup (user_agent ? user_agent : "uGet/1.7"); + + curl_easy_setopt (xmlrpc->curl, CURLOPT_URL, xmlrpc->uri); ++ curl_easy_setopt (xmlrpc->curl, CURLOPT_NOSIGNAL , 1); + curl_easy_setopt (xmlrpc->curl, CURLOPT_USERAGENT, xmlrpc->user_agent); + } + diff --git a/network/uget/uget.SlackBuild b/network/uget/uget.SlackBuild index d3251d21b1..a77dad2230 100644 --- a/network/uget/uget.SlackBuild +++ b/network/uget/uget.SlackBuild @@ -1,10 +1,11 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for Uget # Written by Morten Juhl-Johansen Zölde-Fejér +# Updated by B. Watson PRGNAM=uget -VERSION=1.6.4_1 +VERSION=1.8.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,27 +38,30 @@ 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-$SRCVER.tar.gz -cd $PRGNAM-$DIRVER +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION 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 +# At the time of this writing, the SBo aria2 package is 1.9.1. The +# uget docs say: +# "Some features will not work if you use aria2 plug-in with aria2 <= 1.9." +# Caveat construor. +if [ "${ARIA2:-yes}" = "no" ]; then + ARIAFLAG="--disable-plugin-aria2" +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ + $ARIAFLAG \ --disable-gstreamer \ --prefix=/usr \ --build=$ARCH-slackware-linux @@ -65,7 +69,7 @@ make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/uget/uget.info b/network/uget/uget.info index 06e186933b..889ebb0a28 100644 --- a/network/uget/uget.info +++ b/network/uget/uget.info @@ -1,10 +1,10 @@ PRGNAM="uget" -VERSION="1.6.4_1" -HOMEPAGE="http://urlget.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/urlget/uget-1.6.4-1.tar.gz" -MD5SUM="d5dbd1e98e95c0f7ea47b2233056fb36" +VERSION="1.8.0" +HOMEPAGE="http://uget.visuex.com/" +DOWNLOAD="http://downloads.sourceforge.net/urlget/uget-1.8.0.tar.gz" +MD5SUM="2e0ad66ecdd0104b8fb27b29fdb44df1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" -APPROVED="dsomero" +APPROVED="Erik Hanson" -- cgit v1.2.3