Hello community, here is the log from the commit of package icecast for openSUSE:Factory checked in at 2014-11-26 20:55:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-24 11:10:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icecast.new/icecast.changes 2014-11-26 22:57:23.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 25 22:38:43 CET 2014 - [email protected] + +- updated to version 2.4.1: + * Fixes in logging, <auth> in default mounts, JSON status API + * SSL Security improvements: + * Handle empty strings in config file better + * Require Content-Type header for PUT requests + * Fix possible leak of on-connect scripts (CVE-2014-9018,bnc#906538) + More details, see http://icecast.org/news/icecast-release-2_4_1/ +- Remove obsoleted patch: + icecast-2.4.0-produce-valid-json.patch +- Change doc subpackage to noarch +- Spec file cleanup + +------------------------------------------------------------------- Old: ---- icecast-2.4.0-produce-valid-json.patch icecast-2.4.0.tar.gz New: ---- icecast-2.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ --- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:24.000000000 +0100 +++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: icecast -Version: 2.4.0 +Version: 2.4.1 Release: 0 Summary: Audio Streaming Server License: GPL-2.0+ @@ -33,8 +33,6 @@ # 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 # PATCH-FEATURE-OPENSUSE -- mp3 frame validation Patch100: icecast-mp3-frame-validation.patch BuildRequires: curl-devel @@ -67,6 +65,7 @@ %package doc Summary: Documentation for Icecast Group: Documentation/Other +BuildArch: noarch %description doc Icecast is a MP3 and OGG streaming server able to serve many clients @@ -77,20 +76,18 @@ %prep %setup -q -%patch0 -%patch1 -%patch3 -%patch4 -%patch100 +%patch0 -p1 +%patch1 -p1 +%patch3 -p1 +%patch100 -p1 %build autoreconf -fiv %configure -make +make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -rm -rf %{buildroot}%{_datadir}/doc/%{name} +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name} # init script install -d -m 0755 %{buildroot}%{_sbindir} install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} @@ -106,14 +103,7 @@ # logrotate install -D -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/%{name} -D=%{buildroot}%{_docdir}/%{name} -install -d "$D" -cp -a README AUTHORS COPYING NEWS TODO ChangeLog "$D/" -cp -a doc/*.{html,jpg,png} "$D/" -cp -a conf/*.dist "$D/" - -%clean -%{?buildroot:%__rm -rf %{buildroot}} +cp -a conf/*.dist %{buildroot}%{_docdir}/%{name} %pre /usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : @@ -165,10 +155,12 @@ %files doc %defattr(-,root,root) -%dir %doc %{_docdir}/%{name} -%doc %{_docdir}/%{name}/*.html -%doc %{_docdir}/%{name}/*.jpg -%doc %{_docdir}/%{name}/*.png -%doc %{_docdir}/%{name}/*.dist +%doc %{_docdir}/%{name} +%exclude %{_docdir}/%{name}/README +%exclude %{_docdir}/%{name}/AUTHORS +%exclude %{_docdir}/%{name}/COPYING +%exclude %{_docdir}/%{name}/NEWS +%exclude %{_docdir}/%{name}/TODO +%exclude %{_docdir}/%{name}/ChangeLog %changelog ++++++ icecast-2.3.1_runas_icecast_user.patch ++++++ --- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:24.000000000 +0100 +++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:24.000000000 +0100 @@ -1,27 +1,12 @@ ---- conf/icecast_minimal.xml.in.orig -+++ conf/icecast_minimal.xml.in -@@ -32,4 +32,19 @@ - <errorlog>error.log</errorlog> - <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error --> - </logging> -+ <security> -+ <chroot>0</chroot> -+ <!-- -+ Note from the packager: -+ For security reasons you should not run the icecast server as root. -+ SUSE adds a icecast user and group for this purpose. -+ -+ If you change the user/group here you need to change the ownership -+ of the @localstatedir@/log/@PACKAGE@ aswell -+ --> -+ <changeowner> -+ <user>icecast</user> -+ <group>icecast</group> -+ </changeowner> -+ </security> - </icecast> ---- conf/icecast_shoutcast_compat.xml.in.orig -+++ conf/icecast_shoutcast_compat.xml.in +--- + conf/icecast.xml.in | 12 +++++++++--- + conf/icecast_minimal.xml.in | 15 +++++++++++++++ + conf/icecast_shoutcast_compat.xml.in | 12 ++++++++++++ + conf/icecast_urlauth.xml.in | 12 ++++++++++++ + 4 files changed, 48 insertions(+), 3 deletions(-) + +--- a/conf/icecast_shoutcast_compat.xml.in ++++ b/conf/icecast_shoutcast_compat.xml.in @@ -44,5 +44,17 @@ </logging> <security> @@ -40,8 +25,8 @@ + </changeowner> </security> </icecast> ---- conf/icecast_urlauth.xml.in.orig -+++ conf/icecast_urlauth.xml.in +--- a/conf/icecast_urlauth.xml.in ++++ b/conf/icecast_urlauth.xml.in @@ -43,5 +43,17 @@ </logging> <security> @@ -60,9 +45,9 @@ + </changeowner> </security> </icecast> ---- conf/icecast.xml.in.orig -+++ conf/icecast.xml.in -@@ -165,10 +165,16 @@ +--- a/conf/icecast.xml.in ++++ b/conf/icecast.xml.in +@@ -235,10 +235,16 @@ <security> <chroot>0</chroot> <!-- @@ -82,3 +67,27 @@ - --> </security> </icecast> +--- a/conf/icecast_minimal.xml.in ++++ b/conf/icecast_minimal.xml.in +@@ -33,6 +33,21 @@ + <errorlog>error.log</errorlog> + <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error --> + </logging> ++ <security> ++ <chroot>0</chroot> ++ <!-- ++ Note from the packager: ++ For security reasons you should not run the icecast server as root. ++ SUSE adds a icecast user and group for this purpose. ++ ++ If you change the user/group here you need to change the ownership ++ of the @localstatedir@/log/@PACKAGE@ aswell ++ --> ++ <changeowner> ++ <user>icecast</user> ++ <group>icecast</group> ++ </changeowner> ++ </security> + <http-headers> + <header name="Access-Control-Allow-Origin" value="*" /> + </http-headers> ++++++ icecast-2.4.0.tar.gz -> icecast-2.4.1.tar.gz ++++++ ++++ 15449 lines of diff (skipped) ++++++ icecast-add_pidfile_directive.patch ++++++ --- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:25.000000000 +0100 +++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:25.000000000 +0100 @@ -1,6 +1,10 @@ ---- conf/icecast.xml.in.orig 2013-06-05 01:46:14.664301324 +0200 -+++ conf/icecast.xml.in 2013-06-05 01:47:00.851343292 +0200 -@@ -138,7 +138,7 @@ +--- + conf/icecast.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/conf/icecast.xml.in ++++ b/conf/icecast.xml.in +@@ -198,7 +198,7 @@ <logdir>@localstatedir@/log/@PACKAGE@</logdir> <webroot>@pkgdatadir@/web</webroot> <adminroot>@pkgdatadir@/admin</adminroot> ++++++ icecast-fix-no-add-needed.patch ++++++ --- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:25.000000000 +0100 +++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:25.000000000 +0100 @@ -1,33 +1,37 @@ ---- configure.in.orig 2014-05-04 20:46:52.000000000 +0200 -+++ configure.in 2014-05-20 16:41:18.210785900 +0200 -@@ -1,6 +1,7 @@ - AC_INIT([Icecast], [2.4.0], [[email protected]]) - - AC_PREREQ(2.54) -+AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR(src/main.c) - dnl Process this file with autoconf to produce a configure script. - -@@ -8,7 +9,8 @@ - AM_CONFIG_HEADER(config.h) - AM_MAINTAINER_MODE - --AC_PROG_CC -+AC_PROG_CC_STDC -+AC_USE_SYSTEM_EXTENSIONS - AC_CANONICAL_HOST - AC_PROG_LIBTOOL - AC_SYS_LARGEFILE -@@ -53,9 +55,12 @@ - - dnl -- configure options -- - -+XIPH_PATH_XML - XIPH_PATH_XSLT - XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS]) - XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS]) -+XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XML_CFLAGS]) -+XIPH_VAR_PREPEND([XIPH_LIBS],[$XML_LIBS]) - - XIPH_PATH_VORBIS([ - XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS]) +--- + configure.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/configure.in ++++ b/configure.in +@@ -1,6 +1,7 @@ + AC_INIT([Icecast], [2.4.1], [[email protected]]) + + AC_PREREQ(2.54) ++AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR(src/main.c) + dnl Process this file with autoconf to produce a configure script. + +@@ -8,7 +9,8 @@ AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS + AC_CANONICAL_HOST + AC_PROG_LIBTOOL + AC_SYS_LARGEFILE +@@ -53,9 +55,12 @@ XIPH_NET + + dnl -- configure options -- + ++XIPH_PATH_XML + XIPH_PATH_XSLT + XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS]) + XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS]) ++XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XML_CFLAGS]) ++XIPH_VAR_PREPEND([XIPH_LIBS],[$XML_LIBS]) + + XIPH_PATH_VORBIS([ + XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS]) ++++++ icecast-mp3-frame-validation.patch ++++++ --- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:25.000000000 +0100 +++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:25.000000000 +0100 @@ -15,10 +15,13 @@ http://lists.xiph.org/pipermail//icecast-dev/2011-October/001998.html -Index: src/format_mp3.c -=================================================================== ---- src/format_mp3.c.orig -+++ src/format_mp3.c +--- + src/format_mp3.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/format_mp3.h | 10 +++ + 2 files changed, 170 insertions(+) + +--- a/src/format_mp3.c ++++ b/src/format_mp3.c @@ -509,6 +509,161 @@ static int complete_read (source_t *sour return 1; } @@ -201,10 +204,8 @@ refbuf->sync_point = 1; return refbuf; -Index: src/format_mp3.h -=================================================================== ---- src/format_mp3.h.orig -+++ src/format_mp3.h +--- a/src/format_mp3.h ++++ b/src/format_mp3.h @@ -39,6 +39,16 @@ typedef struct { char build_metadata[4081]; } mp3_state; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
