ports/162381: [PATCH] audio/icecast2 upgrade to kh development branch

Scott Lambert lambert at lambertfam.org
Tue Nov 8 19:30:12 UTC 2011 

>Number:         162381
>Category:       ports
>Synopsis:       [PATCH] audio/icecast2 upgrade to kh development branch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 08 19:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Scott Lambert
>Release:        FreeBSD 7.4-PRERELEASE i386
>Organization:
The Computer Works of Arkansas, Inc.
>Environment:
System: FreeBSD hostname 7.4-PRERELEASE FreeBSD 7.4-PRERELEASE #0: Wed Dec 1 11:02:50 CST 2010 root at hostname:/usr/obj/usr/src/sys/GENERIC i386


>Description:

	The current version of icecast2 in port leaks like a sieve
	in my environment.  Karl Heyes development branch has new
	features and claims to fix several leaks.  I don't know if
	we should create a new port for this version or if it would
	be okay to just modify audio/icecast2.

	I used ideas for changes to the Makefile which improve
	portlint happiness in my patch to Makefile from:

	ports/161763: [PATCH] audio/icecast2: add favicon.ico

	http://www.FreeBSD.org/cgi/query-pr.cgi?pr=ports/161763

	portlint seems to be happy with the port.

	I did not remove the official master sites.  I just added
	Karl's site at the end.

	The burst-on-connect and threadpool configuration entries
	are no longer supported, but don't seem to prevent the
	server from running.

[2011-11-08  00:28:44] WARN cfgfile/parse_xml_tags unknown element "threadpool" parsing "limits" at line 5
[2011-11-08  00:28:44] WARN cfgfile/parse_xml_tags unknown element "burst-on-connect" parsing "limits" at line 16

	I haven't taken time to look at the mime.types file issue.
	It is not impacting my setup which has only live streams.
	My icecast.xml does not reference a mime-types entry.

[2011-11-08  00:28:44] WARN fserve/fserve_recheck_mime_types Cannot open mime types file /etc/mime.types

>How-To-Repeat:
	
>Fix:

	12 hours in, memory utilization is up 1MB from when launched.
	Usually, but not always, memory usage would be up 200 to
	800 MB.

--- icecast2.diff begins here ---
diff -ruN /usr/ports/audio/icecast2/Makefile ./Makefile
--- /usr/ports/audio/icecast2/Makefile	2011-09-23 17:21:02.000000000 -0500
+++ ./Makefile	2011-11-01 16:50:19.000000000 -0500
@@ -2,20 +2,24 @@
 # Date created:         28 Jan 1999
 # Whom:                 Chip Marshall <chip at eboai.org>
 #
-# $FreeBSD: ports/audio/icecast2/Makefile,v 1.70 2011/09/23 22:21:02 amdmi3 Exp $
+# $FreeBSD: ports/audio/icecast2/Makefile,v 1.69 2010/09/22 17:10:19 sunpoet Exp $
 #
 
 PORTNAME=	icecast2
-PORTVERSION=	2.3.2
-PORTREVISION=	7
+PORTVERSION=	2.3.2.30k
+PORTREVISION=
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://downloads.xiph.org/releases/icecast/ \
-		http://svn.xiph.org/releases/icecast/
-DISTNAME=	icecast-${PORTVERSION}
+		http://svn.xiph.org/releases/icecast/ \
+		http://www.xiphicecast.webspace.virginmedia.com/
+DISTNAME=	icecast-2.3.2-kh30
 
 MAINTAINER=	sunpoet at FreeBSD.org
-COMMENT=	A streaming mp3/ogg-vorbis audio server
+COMMENT=	A streaming mp3/ogg-vorbis audio server KH tree
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		shout.5:${PORTSDIR}/audio/libshout2 \
@@ -24,17 +28,15 @@
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 
-LICENSE=	GPLv2
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	icecast2.sh
+USE_RC_SUBR=	${PORTNAME}.sh
 SUB_FILES+=	pkg-message
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
 CFLAGS+=	-I${LOCALBASE}/include
 
 DOCSDIR=	${PREFIX}/share/doc/icecast
-WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
+#WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.pre.mk>
 
diff -ruN /usr/ports/audio/icecast2/distinfo ./distinfo
--- /usr/ports/audio/icecast2/distinfo	2011-03-19 07:28:15.000000000 -0500
+++ ./distinfo	2011-11-01 14:41:57.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (icecast-2.3.2.tar.gz) = 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0
-SIZE (icecast-2.3.2.tar.gz) = 1152319
+SHA256 (icecast-2.3.2-kh30.tar.gz) = 341b1aead30b3efed20e71a34702b54886221470c2a8f6331e206f9d47c1eb64
+SIZE (icecast-2.3.2-kh30.tar.gz) = 888721
diff -ruN /usr/ports/audio/icecast2/pkg-plist ./pkg-plist
--- /usr/ports/audio/icecast2/pkg-plist	2008-09-07 06:51:01.000000000 -0500
+++ ./pkg-plist	2011-11-01 16:52:33.000000000 -0500
@@ -2,13 +2,11 @@
 etc/icecast.xml.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_admin.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_basicsetup.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_changes.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_config_file.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_faq.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_glossary.html
@@ -19,35 +17,40 @@
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_win32.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_yp.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/listener_auth1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/listener_auth2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/listener_auth3.jpg
-%%PORTDOCS%%%%DOCSDIR%%/masterslave.png
-%%PORTDOCS%%%%DOCSDIR%%/relay.png
 share/icecast/admin/listclients.xsl
 share/icecast/admin/listmounts.xsl
+share/icecast/admin/logs.xsl
 share/icecast/admin/manageauth.xsl
+share/icecast/admin/managerelays.xsl
 share/icecast/admin/moveclients.xsl
 share/icecast/admin/response.xsl
+share/icecast/admin/showlog.xsl
 share/icecast/admin/stats.xsl
 share/icecast/admin/updatemetadata.xsl
+share/icecast/admin/viewxml.xsl
+share/icecast/admin/xspf.xsl
 share/icecast/doc/icecast.xml.dist
 share/icecast/doc/icecast_minimal.xml.dist
 share/icecast/doc/icecast_shoutcast_compat.xml.dist
-share/icecast/doc/icecast_urlauth.xml.dist
+share/icecast/web/7.xsl
+share/icecast/web/admin.html
+share/icecast/web/adminbar.html
 share/icecast/web/auth.xsl
-share/icecast/web/corner_bottomleft.jpg
-share/icecast/web/corner_bottomright.jpg
-share/icecast/web/corner_topleft.jpg
-share/icecast/web/corner_topright.jpg
-share/icecast/web/icecast.png
-share/icecast/web/key.gif
-share/icecast/web/key.png
+share/icecast/web/favicon.ico
+share/icecast/web/images/corner_bottomleft.jpg
+share/icecast/web/images/corner_bottomright.jpg
+share/icecast/web/images/corner_topleft.jpg
+share/icecast/web/images/corner_topright.jpg
+share/icecast/web/images/icecast.png
+share/icecast/web/images/key.png
+share/icecast/web/images/tunein.png
+share/icecast/web/index.html
 share/icecast/web/server_version.xsl
 share/icecast/web/status.xsl
 share/icecast/web/status2.xsl
+share/icecast/web/statusbar.html
 share/icecast/web/style.css
-share/icecast/web/tunein.png
+ at dirrm share/icecast/web/images
 @dirrm share/icecast/web
 @dirrm share/icecast/doc
 @dirrm share/icecast/admin
--- icecast2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list