Stable amd64, sparc, x86.

5 files changed, 11 insertions, 154 deletions

diff --git a/media-sound/streamripper/ChangeLog b/media-sound/streamripper/ChangeLog
index 59af085c42a3..1a707e76eedc 100644
--- a/media-sound/streamripper/ChangeLog
+++ b/media-sound/streamripper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/streamripper
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/ChangeLog,v 1.12 2004/07/31 02:05:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/ChangeLog,v 1.13 2004/09/03 20:20:43 eradicator Exp $
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/1.32-http-auth.patch, -streamripper-1.32-r2.ebuild:
+  Stable amd64, sparc, x86.
+
+  19 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/1.32-http-auth.patch, -streamripper-1.32-r2.ebuild:
+  Removed old version.
 
 *streamripper-1.60.8 (30 Jul 2004)
 
diff --git a/media-sound/streamripper/files/1.32-http-auth.patch b/media-sound/streamripper/files/1.32-http-auth.patch
deleted file mode 100644
index e7792f5491c0..000000000000
--- a/media-sound/streamripper/files/1.32-http-auth.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- work.orig/streamripper-1.32/lib/types.h
-+++ work/streamripper-1.32/lib/types.h
-@@ -33,6 +33,7 @@
- #define MAX_URI_STRING		1024
- #define MAX_ERROR_STR       (4096)
- #define MAX_USERAGENT_STR	1024
-+#define MAX_AUTH_LEN            255
- 
- #ifdef WIN32
- 	#ifndef _WINSOCKAPI_
---- work.orig/streamripper-1.32/lib/http.c
-+++ work/streamripper-1.32/lib/http.c
-@@ -41,6 +41,8 @@
- /*********************************************************************************
-  * Private functions
-  *********************************************************************************/
-+static char* make_auth_header(const char *header_name, 
-+			      const char *username, const char *password);
- char* b64enc(const char *buf, int size);
- 
- 
-@@ -72,6 +74,11 @@
- 		if (ret < 2) return SR_ERROR_PARSE_FAILURE;
- 		url = strchr(url, '@') + 1;
- 	}
-+	else
-+	{
-+		urlinfo->username[0] = '\0';
-+		urlinfo->password[0] = '\0';
-+	}
- 
- 	//
- 	// search for a port seperator
-@@ -115,33 +122,58 @@
- 					"GET %s HTTP/1.0\r\n"
- 					"Host: %s:%d\r\n"
- 					"User-Agent: %s\r\n"
--					"Icy-MetaData:1\r\n"
--					"Accept: */*\r\n", 
-+					"Icy-MetaData:1\r\n", 
- 					myurl, 
- 					ui.host, 
- 					ui.port, 
- 					useragent[0] ? useragent : "Streamripper/1.x");
- 
- 	//
-+	// http authentication (not proxy, see below for that)
-+	// 
-+	if (ui.username[0] && ui.password[0])
-+	{
-+		char *authbuf = make_auth_header("Authorization", 
-+						 ui.username,
-+						 ui.password);
-+		strcat(buffer, authbuf);
-+		free(authbuf);
-+	}
-+
-+	//
- 	// proxy auth stuff
- 	//
- 	if (proxyurl && proxyui.username[0] && proxyui.password[0])
- 	{
--		char *authbuf = malloc(strlen(proxyui.username)+strlen(proxyui.password)+MAX_URI_STRING);
--		char *auth64;
--
--		sprintf(authbuf, "%s:%s", proxyui.username, proxyui.password);
--		auth64= b64enc(authbuf, strlen(authbuf));
--		sprintf(authbuf, "Proxy-Authorization: Basic %s\r\n", auth64);
--
-+		char *authbuf = make_auth_header("Proxy-Authorization",
-+						 proxyui.username,
-+						 proxyui.password);
- 		strcat(buffer, authbuf);
-+		free(authbuf);
- 	}
--
-+	
- 	strcat(buffer, "\r\n");
- 
--    return SR_SUCCESS;
-+	return SR_SUCCESS;
- }
- 
-+// Make the 'Authorization: Basic xxxxxx\r\n' or 'Proxy-Authorization...' 
-+// headers for the HTTP request.
-+static char* make_auth_header(const char *header_name, 
-+			      const char *username, const char *password) 
-+{
-+	char *authbuf = malloc(strlen(header_name) 
-+			       + strlen(username)
-+			       + strlen(password)
-+			       + MAX_URI_STRING);
-+	char *auth64;
-+	sprintf(authbuf, "%s:%s", username, password);
-+	auth64 = b64enc(authbuf, strlen(authbuf));
-+	sprintf(authbuf, "%s: Basic %s\r\n", header_name, auth64);
-+	free(auth64);
-+	return authbuf;
-+}
-+
- // Here we pretend we're IE 5, hehe
- error_code httplib_construct_page_request(const char *url, BOOL proxyformat, char *buffer)
- {
---- work.orig/streamripper-1.32/CHANGES
-+++ work/streamripper-1.32/CHANGES
-@@ -1,3 +1,15 @@
-+new in cvs
-+----------
-+
-+2003/09/25:
-+* Added support for HTTP "Basic" authorization. Works with DigitallyImported.com.
-+  (lib/types.h, lib/http.c) -Colin D. Bennett <cbennett@radsoft.com>
-+* Fixed a couple of tiny memory leaks in the usage of b64enc(), the
-+  returned buffer allocated as 'string' in b64enc wasn't being freed,
-+  and the 'authbuf' malloc'd in httplib_construct_sc_request for the 
-+  proxy authorization wasn't freed.
-+  (lib/http.c) -Colin D. Bennett <cbennett@radsoft.com>
-+
- new in 1.30b (win32 & nix)
- --------------
- 
diff --git a/media-sound/streamripper/files/digest-streamripper-1.32-r2 b/media-sound/streamripper/files/digest-streamripper-1.32-r2
deleted file mode 100644
index bcedf25623b0..000000000000
--- a/media-sound/streamripper/files/digest-streamripper-1.32-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ca5330602427126d6848a6fdcf4e0079 streamripper-1.32.tar.gz 98092
-MD5 d15851ff8ad67819065127932d1e47bb streamripper-1.32-interface.patch.bz2 3281
diff --git a/media-sound/streamripper/streamripper-1.32-r2.ebuild b/media-sound/streamripper/streamripper-1.32-r2.ebuild
deleted file mode 100644
index 5ed061d0dd46..000000000000
--- a/media-sound/streamripper/streamripper-1.32-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.32-r2.ebuild,v 1.6 2004/07/01 08:00:10 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
-HOMEPAGE="http://streamripper.sourceforge.net/"
-SRC_URI="http://streamripper.sourceforge.net/files/${P}.tar.gz
-	mirror://gentoo/${P}-interface.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${P}-interface.patch
-	epatch ${FILESDIR}/${PV}-http-auth.patch
-}
-
-src_install() {
-	dobin streamripper || die
-	dodoc CHANGES README THANKS TODO
-}
diff --git a/media-sound/streamripper/streamripper-1.60.8.ebuild b/media-sound/streamripper/streamripper-1.60.8.ebuild
index ef5c9cde4075..89110ad82884 100644
--- a/media-sound/streamripper/streamripper-1.60.8.ebuild
+++ b/media-sound/streamripper/streamripper-1.60.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.60.8.ebuild,v 1.1 2004/07/31 02:05:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.60.8.ebuild,v 1.2 2004/09/03 20:20:43 eradicator Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://streamripper.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc sparc amd64"
 IUSE=""
 
 RDEPEND="media-libs/libmad"