From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 12 23:49:26 2012 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 031471065674; Tue, 12 Jun 2012 23:49:26 +0000 (UTC) (envelope-from takefu@airport.fm) Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1]) by mx1.freebsd.org (Postfix) with ESMTP id 6D9138FC17; Tue, 12 Jun 2012 23:49:25 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id F18A9D3AC1B; Wed, 13 Jun 2012 08:49:23 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=airport.fm; h= message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type:content-transfer-encoding; s=mail; bh= UvuO9PSpkLiacDUOuPVJ3JA5YfI=; b=N+lc/AcgJ12gcHlG9Rw6+XCsfJCmItpV Y9bTJb+tbaoBIIZUpNTfbxnAHbjXTRhq6aiaXRD6dpEu53QQu7VYEpOMOZ/NFjor WeKMxrqFGk1xf2W16EFmhtg5FRtxyAw70DKiFILMGT7C3vuNTX29PF7QeFKqjCTh s9PxktQ3V9Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=airport.fm; h=message-id :date:from:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; q=dns; s=mail; b=d+whyU pFB6dxar6YroBAv/A0aQu6JvVa49YrE0D6+V+1gAMm0vzpxtbV8ACPeGx0z/qLqp q9clBIOrH2cRgWBsCJq5UbMyblefbQC0ME+vReHZfCXFJ82WX+G8dn2j0BiFRTBY 3D+JyrwKBQ0AbWBLCZOnyq7VnwU2D9jScvevg= Received: from [IPv6:2001:3e0:4ec:a011:25aa:472b:c482:a66a] (unknown [IPv6:2001:3e0:4ec:a011:25aa:472b:c482:a66a]) by ae-osaka.co.jp (Postfix) with ESMTPSA id D5584D3AC1A; Wed, 13 Jun 2012 08:49:23 +0900 (JST) Message-ID: <4FD7D580.1080905@airport.fm> Date: Wed, 13 Jun 2012 08:49:20 +0900 From: Takefu User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:13.0) Gecko/20120604 Thunderbird/13.0 MIME-Version: 1.0 To: freebsd-ports-bugs@FreeBSD.org References: <201206120222.q5C2Mnd1040314@unbound.local.ae-osaka.co.jp> In-Reply-To: <201206120222.q5C2Mnd1040314@unbound.local.ae-osaka.co.jp> X-Enigmail-Version: 1.4.2 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: Sunpoet Po-Chuan Hsieh Subject: Re: ports/161763: [PATCH] audio/icecast2: add favicon.ico X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jun 2012 23:49:26 -0000 - Update to 2.3.3 Security - We fixed 3 security issues. Bugfixes - This is mostly a bug-fix release to flush out the accumulated, mostly small, fixes. - del files/patch-src-stats.c --- icecast2.patch begins here --- diff -ruN /usr/ports/audio/icecast2/Makefile audio/icecast2/Makefile --- /usr/ports/audio/icecast2/Makefile 2012-05-01 07:50:06.000000000 +0900 +++ audio/icecast2/Makefile 2012-06-12 11:12:38.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= icecast2 -PORTVERSION= 2.3.2 -PORTREVISION= 8 +PORTVERSION= 2.3.3 PORTEPOCH= 1 CATEGORIES= audio net ipv6 MASTER_SITES= http://downloads.xiph.org/releases/icecast/ \ @@ -17,18 +16,19 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= A streaming mp3/ogg-vorbis audio server -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - shout.5:${PORTSDIR}/audio/libshout2 \ - speex.1:${PORTSDIR}/audio/speex \ - theora.0:${PORTSDIR}/multimedia/libtheora \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - xslt.2:${PORTSDIR}/textproc/libxslt - LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ + shout:${PORTSDIR}/audio/libshout2 \ + speex:${PORTSDIR}/audio/speex \ + theora:${PORTSDIR}/multimedia/libtheora \ + vorbis:${PORTSDIR}/audio/libvorbis \ + xslt:${PORTSDIR}/textproc/libxslt USE_GMAKE= yes GNU_CONFIGURE= yes -USE_RC_SUBR= icecast2.sh +USE_RC_SUBR= ${PORTNAME} SUB_FILES+= pkg-message CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include @@ -38,8 +38,9 @@ .include -.if defined(NOPORTDOCS) post-patch: + uudecode -p ${FILESDIR}/favicon.uu > ${WRKSRC}/web/favicon.ico +.if defined(NOPORTDOCS) ${REINPLACE_CMD} \ -e 's|SUBDIRS = src conf debian doc web admin win32 examples|SUBDIRS = src conf debian web admin win32 examples # doc|' \ -e 's| install-exec-am install-data-am| install-exec-am|' ${WRKSRC}/Makefile.in diff -ruN /usr/ports/audio/icecast2/distinfo audio/icecast2/distinfo --- /usr/ports/audio/icecast2/distinfo 2011-03-21 14:15:45.000000000 +0900 +++ audio/icecast2/distinfo 2012-06-12 10:49:33.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (icecast-2.3.2.tar.gz) = 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0 -SIZE (icecast-2.3.2.tar.gz) = 1152319 +SHA256 (icecast-2.3.3.tar.gz) = 1b1d06f5f83c9a983cd28cc78aa90e4038f933511b3d20d7fd2cfc116645c36d +SIZE (icecast-2.3.3.tar.gz) = 1161774 diff -ruN /usr/ports/audio/icecast2/files/favicon.uu audio/icecast2/files/favicon.uu --- /usr/ports/audio/icecast2/files/favicon.uu 1970-01-01 09:00:00.000000000 +0900 +++ audio/icecast2/files/favicon.uu 2011-09-01 15:16:00.000000000 +0900 @@ -0,0 +1,35 @@ +begin 644 favicon.ico +M```!``$`$!````````!H!0``%@```"@````0````(`````$`"```````0`$` +M````````````````````````````='I\`#P^/`!D7EP`O+[$`(2*E`!47F0` +MW'I<`'1"-`",:F0`O'IT`(Q2/``D(B0`I%Y$`'123`"L;F0`='J$`.R&9`#$ +M;E0`I**D`!P2#`!T;G0`Q(9T`%1.5`!D,B0`I&)4`)Q61`"4EIP`W()L`(QR +M;`!\6DP`K'9L`+1Z;`!$1DP`A&)<`(2&C``L&A0`;&9D`+QZ;`",2C0`O()T +M`(121`!$)B0`A%9,`/R.9`!T=G0`Q(J$`*1J7`"4EJ0`%`H$`)2"?`"L8DP` +MK')L`(R"C`"LLKP`U(9T`%PZ-`"<8EP`C'9T`(1F7`"$>GP`7#XT`.SJ[`!D +M8F0`I&ID`+Q^=`"T8D0`?%94`(1^A`#TBF0`Q'9<`+RJI``D%A0`;&Y\`+R& +M?`!<5E0`9#HL`)Q:1`"LFI0`I'9D`+QV;`!L1D0`E%Y<`"0>'`#,?FP`?$Y$ +M`)161`!<+AP`#`8$`'QZ?`!L7EP`O,+$`)22E`!<7F0`S'ID`'1&/`"44CP` +M/"(<`*QB1`!\4DP`K')D`'Q^A`#TAF0`M&Y<`"02#`!L4DP`9#8L`*1F5`"4 +MFIP`W(9L`(Q:3`"T=FP`M'IT`$Q&3`",8EP`A(J,`#0>%`!L:FP`Q'IL`'Q* +M/`#$@G0`C%)$`(Q63`#\CFP`?'9T`)2:I``,"@P`M')L`)QF7`!L0CP`K*JL +M`$PN)`"D=FP`I&YD`&QR?`#$?G0`Q(9\`*1:1``````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``#___\`+HB(B(B(B$-3#HB(>"A!B'B'AX>'"F-?=%A1)@HF4`J(AX>'ARMW +M#4PD?E4F)E!!B(UX&?06&;#568FZ%<(B'"FUF%D<0$TX+8GI` +M?R"(AX<*;2P2A!YB8FZ%;W\@B(>'AR9G1D5Y>2F`)F]_<(B'AR9`0&U%,V-2 +M.7]O;W!XAX=DA8>''!D/"D`O;V\F+HAX08B(B(AXB'@H<$%!2@``__\``/__ +M``#__P``__\``/__``#__P``__\``/__``#__P``__\``/__``#__P``__\` ++`/__``#__P``__\` +` +end diff -ruN /usr/ports/audio/icecast2/files/icecast2.in audio/icecast2/files/icecast2.in --- /usr/ports/audio/icecast2/files/icecast2.in 1970-01-01 09:00:00.000000000 +0900 +++ audio/icecast2/files/icecast2.in 2012-01-17 09:44:32.000000000 +0900 @@ -0,0 +1,41 @@ +#!/bin/sh +# +# $FreeBSD: ports/audio/icecast2/files/icecast2.sh.in,v 1.9 2012/01/14 08:55:23 dougb Exp $ +# + +# PROVIDE: icecast2 +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Add the following line to /etc/rc.conf to enable `icecast2'. +# +#icecast_enable="YES" +# +# To specify a non-default configuration file, set icecast_config +# in /etc/rc.conf: +# +#icecast_config="%%PREFIX%%/etc/icecast.xml" +# +# Make sure the section in your configuration file is +# not commented out - icecast refuses to run as root. +# + +. /etc/rc.subr + +name="icecast" +rcvar=icecast_enable + +command="%%PREFIX%%/bin/icecast" +command_args="-b 1>/dev/null" +extra_commands="reload" + +# read configuration and set defaults +load_rc_config "$name" +: ${icecast_enable="NO"} +: ${icecast_config="%%PREFIX%%/etc/${name}.xml"} +: ${icecast_flags="-c ${icecast_config}"} + +required_files="${icecast_config}" + +run_rc_command "$1" diff -ruN /usr/ports/audio/icecast2/files/icecast2.sh.in audio/icecast2/files/icecast2.sh.in --- /usr/ports/audio/icecast2/files/icecast2.sh.in 2012-01-17 09:44:32.000000000 +0900 +++ audio/icecast2/files/icecast2.sh.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,41 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/audio/icecast2/files/icecast2.sh.in,v 1.9 2012/01/14 08:55:23 dougb Exp $ -# - -# PROVIDE: icecast2 -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# Add the following line to /etc/rc.conf to enable `icecast2'. -# -#icecast_enable="YES" -# -# To specify a non-default configuration file, set icecast_config -# in /etc/rc.conf: -# -#icecast_config="%%PREFIX%%/etc/icecast.xml" -# -# Make sure the section in your configuration file is -# not commented out - icecast refuses to run as root. -# - -. /etc/rc.subr - -name="icecast" -rcvar=icecast_enable - -command="%%PREFIX%%/bin/icecast" -command_args="-b 1>/dev/null" -extra_commands="reload" - -# read configuration and set defaults -load_rc_config "$name" -: ${icecast_enable="NO"} -: ${icecast_config="%%PREFIX%%/etc/${name}.xml"} -: ${icecast_flags="-c ${icecast_config}"} - -required_files="${icecast_config}" - -run_rc_command "$1" diff -ruN /usr/ports/audio/icecast2/files/patch-src-stats.c audio/icecast2/files/patch-src-stats.c --- /usr/ports/audio/icecast2/files/patch-src-stats.c 2012-04-27 20:09:33.000000000 +0900 +++ audio/icecast2/files/patch-src-stats.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,14 +0,0 @@ ---- src/stats.c.orig 2008-05-01 10:22:40.000000000 +0800 -+++ src/stats.c 2012-04-24 02:22:44.574821557 +0800 -@@ -973,7 +973,11 @@ - if (event->source) - { - if (show_mount && strcmp (event->source, show_mount) != 0) -+ { -+ xmlFree (name); -+ xmlFree (value); - break; -+ } - srcnode = _find_xml_node(event->source, &src_nodes, node); - } - else diff -ruN /usr/ports/audio/icecast2/files/patch-web_Makefile.in audio/icecast2/files/patch-web_Makefile.in --- /usr/ports/audio/icecast2/files/patch-web_Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ audio/icecast2/files/patch-web_Makefile.in 2011-10-18 15:36:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- web/Makefile.in.orig 2008-05-30 08:58:59.000000000 +0900 ++++ web/Makefile.in 2011-10-18 15:35:42.000000000 +0900 +@@ -215,6 +215,7 @@ + corner_bottomright.jpg \ + corner_topleft.jpg \ + corner_topright.jpg \ ++ favicon.ico \ + icecast.png \ + key.gif \ + style.css \ diff -ruN /usr/ports/audio/icecast2/pkg-plist audio/icecast2/pkg-plist --- /usr/ports/audio/icecast2/pkg-plist 2010-07-21 16:52:39.000000000 +0900 +++ audio/icecast2/pkg-plist 2012-06-12 11:01:19.000000000 +0900 @@ -31,6 +31,8 @@ share/icecast/admin/response.xsl share/icecast/admin/stats.xsl share/icecast/admin/updatemetadata.xsl +share/icecast/admin/vclt.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 @@ -40,6 +42,7 @@ share/icecast/web/corner_bottomright.jpg share/icecast/web/corner_topleft.jpg share/icecast/web/corner_topright.jpg +share/icecast/web/favicon.ico share/icecast/web/icecast.png share/icecast/web/key.gif share/icecast/web/key.png --- icecast2.patch ends here ---