Big patch courtesy of siefkenj@onid.oregonstate.edu in bug #48188

7 files changed, 170 insertions, 7 deletions

diff --git a/net-misc/mmsclient/ChangeLog b/net-misc/mmsclient/ChangeLog
index 0af515480b40..a2944e72fd44 100644
--- a/net-misc/mmsclient/ChangeLog
+++ b/net-misc/mmsclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/mmsclient
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/ChangeLog,v 1.5 2003/02/12 08:27:54 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/ChangeLog,v 1.6 2004/04/26 06:51:28 dragonheart Exp $
+
+*mmsclient-0.0.3-r1 (26 Apr 2004)
+
+  26 Apr 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  mmsclient-0.0.3-r1.ebuild, mmsclient-0.0.3.ebuild,
+  files/mmsclient-0.0.3-r1.patch:
+  Big patch courtesy of siefkenj@onid.oregonstate.edu in bug #48188
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/net-misc/mmsclient/Manifest b/net-misc/mmsclient/Manifest
index d537060d347e..2ff92373b5b5 100644
--- a/net-misc/mmsclient/Manifest
+++ b/net-misc/mmsclient/Manifest
@@ -1,3 +1,3 @@
-MD5 121479edc7e559bd477962e7bebe97bd ChangeLog 563
-MD5 50ab0cea56757f96df048e57a0738e07 mmsclient-0.0.3.ebuild 709
-MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3 68
+MD5 a5be16d83e0f5cbb775f8d1e1bb8d40f mmsclient-0.0.3-r1.ebuild 718
+MD5 1c904575316d5ddd46b55d8d400468b0 files/mssclient-0.0.3.patch 3784
+MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3-r1 68
diff --git a/net-misc/mmsclient/files/digest-mmsclient-0.0.3-r1 b/net-misc/mmsclient/files/digest-mmsclient-0.0.3-r1
new file mode 100644
index 000000000000..d621ad9d5638
--- /dev/null
+++ b/net-misc/mmsclient/files/digest-mmsclient-0.0.3-r1
@@ -0,0 +1 @@
+MD5 c91171a0bbbfb94290d362e907432787 mms_client-0.0.3.tar.gz 117424
diff --git a/net-misc/mmsclient/files/mmsclient-0.0.3-r1.patch b/net-misc/mmsclient/files/mmsclient-0.0.3-r1.patch
new file mode 100644
index 000000000000..ed4c7efac050
--- /dev/null
+++ b/net-misc/mmsclient/files/mmsclient-0.0.3-r1.patch
@@ -0,0 +1,109 @@
+Only in mms_client-0.0.4: .Makefile
+diff -u mms_client-0.0.3/AUTHORS mms_client-0.0.4/AUTHORS
+--- mms_client-0.0.3/AUTHORS	2001-10-09 16:09:40.000000000 -0700
++++ mms_client-0.0.4/AUTHORS	2004-04-17 17:18:17.891514128 -0700
+@@ -0,0 +1,5 @@
++Original Author:
++Major MMS <http://www.geocities.com/majormms/>
++
++Patch Contributers:
++Jason Siefken <http://oregonstate.edu/~siefkenj/>
+diff -u mms_client-0.0.3/ChangeLog mms_client-0.0.4/ChangeLog
+--- mms_client-0.0.3/ChangeLog	2001-10-09 16:09:47.000000000 -0700
++++ mms_client-0.0.4/ChangeLog	2004-04-17 17:05:27.014705216 -0700
+@@ -0,0 +1,3 @@
++0.0.4
++	Fixed segmentation faults when invalid URL's are entered
++	Added --version and --help options
+diff -u mms_client-0.0.3/Makefile.in mms_client-0.0.4/Makefile.in
+--- mms_client-0.0.3/Makefile.in	2002-01-21 18:51:31.000000000 -0800
++++ mms_client-0.0.4/Makefile.in	2004-04-17 15:57:10.241509408 -0700
+@@ -85,7 +85,7 @@
+ mmsclient_DEPENDENCIES = 
+ mmsclient_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) "-DVERSION=\"$(VERSION)\""
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ HEADERS =  $(noinst_HEADERS)
+diff -u mms_client-0.0.3/README mms_client-0.0.4/README
+--- mms_client-0.0.3/README	2001-10-09 16:09:36.000000000 -0700
++++ mms_client-0.0.4/README	2004-04-17 17:16:29.204037136 -0700
+@@ -0,0 +1,2 @@
++mmsclient downloads MMS (Microsoft Media Server) streams, and 
++saves them to disk.
+diff -u mms_client-0.0.3/client.c mms_client-0.0.4/client.c
+--- mms_client-0.0.3/client.c	2001-12-28 19:40:48.000000000 -0800
++++ mms_client-0.0.4/client.c	2004-04-17 17:02:06.409201888 -0700
+@@ -5,6 +5,9 @@
+  * mms://193.159.244.12/n24_wmt_mid
+  */
+ 
++#define HELPINFO "Usage: mmsclient mms://<url>\n -v --version\n\tPrint version information\n -h --help\n\tPrint this page\nhttp://www.geocities.com/majormms/\n"
++
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <assert.h>
+@@ -475,23 +478,44 @@
+   char                *path, *url, *file, *cp;
+ 
+   if (argc != 2) {
+-    printf ("usage: %s url\n", argv[0]);
++    printf ("Usage: %s URL\n", argv[0]);
+     exit(1);
+   }
+-
++  
++  /* check for non-url arguments (version or help ...) */
++  if (strncmp(argv[1], "mms://", 6) == 0 && argv[1][6] == 0){		/* Just typed "mms://" with no URL */
++	printf("Error: No URL\n");
++	exit(1);
++  }
++  if (strncmp(argv[1], "mms://", 6) != 0){	/* haven't typed a url */
++	
++	if (strncmp(argv[1], "--version", 9) == 0 || strncmp(argv[1], "-v", 9) == 0){
++		printf("%s\n", VERSION);
++	}else if (strncmp(argv[1], "--help", 9) == 0 || strncmp(argv[1], "-h", 9) == 0){
++		printf("%s\n", HELPINFO);
++	}else{
++		printf("Error: unrecognized command %s\n", argv[1]); 
++	}
++	exit(1);
++  }
++  
+   /* parse url */
+   
+   url = argv[1];
+   strncpy (host, &url[6], 255);
+   cp = strchr(host,'/');
+-  *cp= 0;
++  if(cp == 0){			/* If they just typed a top level domain name */
++  	printf("Error: Incomplete URL '%s'\n", &url[6]);
++  	exit(1);
++  }
++  *cp= 0;			/* Make the '/' a null */
+ 
+   printf ("host : >%s<\n", host);
+ 
+   path = strchr(&url[6], '/') +1;
+ 
+   printf ("path : >%s<\n", path);
+-
++  
+   file = strrchr (url, '/');
+ 
+   printf ("file : >%s<\n", file);
+diff -u mms_client-0.0.3/configure mms_client-0.0.4/configure
+--- mms_client-0.0.3/configure	2002-01-21 18:50:51.000000000 -0800
++++ mms_client-0.0.4/configure	2004-04-17 16:47:01.126825728 -0700
+@@ -694,7 +694,7 @@
+ 
+ PACKAGE="mms_client"
+ 
+-VERSION=0.0.3
++VERSION=0.0.4
+ 
+ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/net-misc/mmsclient/metadata.xml b/net-misc/mmsclient/metadata.xml
new file mode 100644
index 000000000000..d8b96be3c5cd
--- /dev/null
+++ b/net-misc/mmsclient/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>bug-wranglers@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild b/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..4ed5ca6e2764
--- /dev/null
+++ b/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild,v 1.1 2004/04/26 06:51:28 dragonheart Exp $
+
+include eutils
+
+S=${WORKDIR}/mms_client-${PV}
+DESCRIPTION="mms protocol download utility"
+SRC_URI="http://www.geocities.com/majormms/mms_client-${PV}.tar.gz"
+HOMEPAGE="http://www.geocities.com/majormms/"
+
+DEPEND="virtual/glibc
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
+
+DEPEND="virtual/glibc"
+
+KEYWORDS="~x86 ~sparc "
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}.patch
+}
+
+src_compile() {
+	econf || die
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR=${D} install || die "make install failed"
+	dodoc COPYING
+}
diff --git a/net-misc/mmsclient/mmsclient-0.0.3.ebuild b/net-misc/mmsclient/mmsclient-0.0.3.ebuild
index 8a5a5985e8dd..66a69066c3c1 100644
--- a/net-misc/mmsclient/mmsclient-0.0.3.ebuild
+++ b/net-misc/mmsclient/mmsclient-0.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3.ebuild,v 1.6 2003/02/13 14:59:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3.ebuild,v 1.7 2004/04/26 06:51:28 dragonheart Exp $
 
 S=${WORKDIR}/mms_client-${PV}
 DESCRIPTION="mms protocol download utility"