Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37759728
en ru br
Репозитории ALT
S:2.4.4-alt2
5.1: 2.3.2-alt3
4.1: 2.3.1-alt3
4.0: 2.3.1-alt3
3.0: 2.2.0-alt1
www.altlinux.org/Changes

Группа :: Система/Серверы
Пакет: icecast

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: icecast-2.3.0-alt.patch
Скачать


diff -urN icecast-2.3.0.orig/conf/icecast.xml.in icecast-2.3.0/conf/icecast.xml.in
--- icecast-2.3.0.orig/conf/icecast.xml.in	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/conf/icecast.xml.in	2005-10-07 16:59:23 +0400
@@ -129,10 +129,10 @@
 
         <!-- Note that if <chroot> is turned on below, these paths must both
              be relative to the new root, not the original root -->
-        <logdir>@localstatedir@/log/@PACKAGE@</logdir>
-        <webroot>@pkgdatadir@/web</webroot>
-        <adminroot>@pkgdatadir@/admin</adminroot>
-        <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> -->
+        <logdir>/logs/</logdir>
+        <webroot>/web</webroot>
+        <adminroot>/admin</adminroot>
+	<pidfile>/icecast.pid</pidfile>
 
         <!-- Aliases: treat requests for 'source' path as being for 'dest' path
              May be made specific to a port or bound address using the "port"
@@ -163,12 +163,10 @@
     </logging>
 
     <security>
-        <chroot>0</chroot>
-        <!--
+        <chroot>1</chroot>
         <changeowner>
-            <user>nobody</user>
-            <group>nogroup</group>
+            <user>icecast</user>
+            <group>icecast</group>
         </changeowner>
-        -->
     </security>
 </icecast>
diff -urN icecast-2.3.0.orig/conf/Makefile.am icecast-2.3.0/conf/Makefile.am
--- icecast-2.3.0.orig/conf/Makefile.am	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/conf/Makefile.am	2005-10-07 17:08:34 +0400
@@ -5,7 +5,7 @@
 EXTRA_DIST = icecast.xml.in icecast_minimal.xml.in icecast_shoutcast_compat.xml.in icecast_urlauth.xml.in
 DISTCLEANFILES = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist icecast_urlauth.xml.dist
 
-docdir = $(datadir)/$(PACKAGE)/doc
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 doc_DATA = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist icecast_urlauth.xml.dist
 
 install-data-hook:
diff -urN icecast-2.3.0.orig/conf/Makefile.in icecast-2.3.0/conf/Makefile.in
--- icecast-2.3.0.orig/conf/Makefile.in.orig	2008-09-14 14:10:14 +0400
+++ icecast-2.3.0/conf/Makefile.in	2008-09-14 14:18:38 +0400
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -176,7 +176,7 @@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = $(datadir)/$(PACKAGE)/doc
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
diff -urN icecast-2.3.0.orig/configure icecast-2.3.0/configure
--- icecast-2.3.0.orig/configure	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/configure	2005-10-07 16:59:23 +0400
@@ -23007,7 +23007,7 @@
 
   fi
 
-  SPEEX_LIBS="-lspeex"
+  SPEEX_LIBS="-lspeex -logg"
 
   xt_save_LIBS="$LIBS"
   xt_save_LDFLAGS="$LDFLAGS"
diff -urN icecast-2.3.0.orig/doc/Makefile.am icecast-2.3.0/doc/Makefile.am
--- icecast-2.3.0.orig/doc/Makefile.am	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/doc/Makefile.am	2005-10-07 16:59:23 +0400
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/icecast
+docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
 doc_DATA = index.html icecast2_admin.html icecast2_basicsetup.html \
 	icecast2_config_file.html icecast2_faq.html icecast2_glossary.html \
 	icecast2_introduction.html icecast2_relay.html icecast2_stats.html \
diff -urN icecast-2.3.0.orig/doc/Makefile.in icecast-2.3.0/doc/Makefile.in
--- icecast-2.3.0.orig/doc/Makefile.in	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/doc/Makefile.in	2005-10-07 16:59:23 +0400
@@ -176,7 +176,7 @@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = $(datadir)/doc/icecast
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
diff -urN icecast-2.3.0.orig/Makefile.am icecast-2.3.0/Makefile.am
--- icecast-2.3.0.orig/Makefile.am	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/Makefile.am	2005-10-07 16:59:23 +0400
@@ -10,7 +10,7 @@
     m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
     m4/xiph_types.m4 m4/xiph_xml2.m4 icecast.spec
 
-docdir = $(datadir)/doc/$(PACKAGE)
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 doc_DATA = README AUTHORS COPYING NEWS TODO ChangeLog
 
 debug:
diff -urN icecast-2.3.0.orig/Makefile.in icecast-2.3.0/Makefile.in
--- icecast-2.3.0.orig/Makefile.in	2005-10-07 16:59:07 +0400
+++ icecast-2.3.0/Makefile.in	2005-10-07 16:59:23 +0400
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -204,7 +204,7 @@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE)
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin