Hello community, here is the log from the commit of package icecast for openSUSE:Factory checked in at 2014-11-18 22:45:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icecast (Old) and /work/SRC/openSUSE:Factory/.icecast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icecast" Changes: -------- --- /work/SRC/openSUSE:Factory/icecast/icecast.changes 2014-11-10 17:29:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icecast.new/icecast.changes 2014-11-18 22:46:01.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 14 15:36:05 UTC 2014 - [email protected] + +- Add icecast-2.4.0-produce-valid-json.patch: produce valid json status, + fix boo#905468. + +------------------------------------------------------------------- New: ---- icecast-2.4.0-produce-valid-json.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ --- /var/tmp/diff_new_pack.LPhTPK/_old 2014-11-18 22:46:02.000000000 +0100 +++ /var/tmp/diff_new_pack.LPhTPK/_new 2014-11-18 22:46:02.000000000 +0100 @@ -33,6 +33,8 @@ # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: icecast-fix-no-add-needed.patch Patch3: icecast-add_pidfile_directive.patch +# PATCH-FIX-UPSTREAM -- Produce valid json status, already in upstream trunk svn. boo#905468. +Patch4: icecast-2.4.0-produce-valid-json.patch BuildRequires: curl-devel BuildRequires: libtheora-devel BuildRequires: libtool @@ -76,6 +78,7 @@ %patch0 %patch1 %patch3 +%patch4 %build autoreconf -fiv ++++++ icecast-2.4.0-produce-valid-json.patch ++++++ Index: web/status-json.xsl =================================================================== --- web/status-json.xsl.orig +++ web/status-json.xsl @@ -7,24 +7,18 @@ <xsl:variable name="output">true</xsl:variable> <!-- hide certain nodes from all sources --> -<xsl:template match="icestats/source/max_listeners" /> -<xsl:template match="icestats/source/public" /> -<xsl:template match="icestats/source/source_ip" /> -<xsl:template match="icestats/source/slow_listeners" /> -<xsl:template match="icestats/source/*[contains(name(), 'total_bytes')]" /> -<xsl:template match="icestats/source/user_agent" > - <!-- user_agent is most of the time the last node in a mount, - if we just delete it, then we will malform the output, - so special handling applies. --> - <xsl:if test="following-sibling::*"></xsl:if> - <xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if> -</xsl:template> +<xsl:template match="icestats/source/max_listeners"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/source/public"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/source/source_ip"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/source/slow_listeners"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/source/*[contains(name(), 'total_bytes')]"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/source/user_agent"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> <!-- hide certain global nodes --> -<xsl:template match="icestats/sources" /> -<xsl:template match="icestats/clients" /> -<xsl:template match="icestats/stats" /> -<xsl:template match="icestats/listeners" /> -<xsl:template match="node()[contains(name(), 'connections')]" /> +<xsl:template match="icestats/sources"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/clients"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/stats"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="icestats/listeners"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> +<xsl:template match="node()[contains(name(), 'connections')]"><xsl:if test="not(following-sibling::*)">"dummy":null}</xsl:if></xsl:template> </xsl:stylesheet> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
