update to version 2.4.6

libshout-2.2.2-fix_speex.patch

@@ -1,87 +0,0 @@
-diff -up libshout-2.2.2/src/Makefile.in.fix_speex libshout-2.2.2/src/Makefile.in
---- libshout-2.2.2/src/Makefile.in.fix_speex	2007-12-07 15:03:46.000000000 +0100
-+++ libshout-2.2.2/src/Makefile.in	2007-12-07 15:04:43.000000000 +0100
-@@ -65,7 +65,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_2 =
- libshout_la_DEPENDENCIES = net/libicenet.la timing/libicetiming.la \
- 	avl/libiceavl.la httpp/libicehttpp.la $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
-+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
-+	$(am__DEPENDENCIES_2)
- am__libshout_la_SOURCES_DIST = shout.c util.c ogg.c vorbis.c mp3.c \
- 	theora.c speex.c
- @HAVE_THEORA_TRUE@am__objects_1 = theora.lo
-@@ -128,6 +129,7 @@ EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- FGREP = @FGREP@
-+GREP = @GREP@
- HAVE_PKGCONFIG_FALSE = @HAVE_PKGCONFIG_FALSE@
- HAVE_PKGCONFIG_TRUE = @HAVE_PKGCONFIG_TRUE@
- HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
-@@ -199,13 +201,9 @@ VORBIS_LIBS = @VORBIS_LIBS@
- VORBIS_PREFIX = @VORBIS_PREFIX@
- XIPH_CFLAGS = @XIPH_CFLAGS@
- XIPH_CPPFLAGS = @XIPH_CPPFLAGS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- acx_pthread_config = @acx_pthread_config@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -223,23 +221,30 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- shout_cflags = @shout_cflags@
-@@ -261,7 +266,7 @@ noinst_HEADERS = shout_ogg.h shout_priva
- libshout_la_SOURCES = shout.c util.c ogg.c vorbis.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
- AM_CFLAGS = @XIPH_CFLAGS@
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- all: all-recursive
-diff -up libshout-2.2.2/src/Makefile.am.fix_speex libshout-2.2.2/src/Makefile.am
---- libshout-2.2.2/src/Makefile.am.fix_speex	2007-12-07 15:03:39.000000000 +0100
-+++ libshout-2.2.2/src/Makefile.am	2007-12-07 15:04:35.000000000 +0100
-@@ -26,7 +26,7 @@ libshout_la_SOURCES = shout.c util.c ogg
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- 

libshout-2.4.3-Allow-disabling-ckport-database-installation.patch

@@ -0,0 +1,50 @@
+From 010bd3df9de5837728e61a672e90e25b12f07440 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 11 Feb 2020 08:44:22 +0100
+Subject: [PATCH] Allow disabling ckport database installation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Passing --disable-ckport to ./configure prevents from installing
+libshout.ckport.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.am  | 2 ++
+ configure.ac | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8312d2d..e4c12ad 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,8 +18,10 @@ doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = m4/shout.m4
+ 
++if HAVE_CKPORT
+ ckportdir = $(libdir)/ckport/db
+ ckport_DATA = libshout.ckport
++endif
+ 
+ if HAVE_PKGCONFIG
+   pkgconfigdir = $(libdir)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index d6db90f..2e58c0f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,10 @@ XIPH_PATH_OPENSSL([
+ AC_SUBST([SHOUT_TLS])
+ AM_CONDITIONAL([HAVE_TLS], [test -n "$OPENSSL_LIBS"])
+ 
++AC_ARG_ENABLE([ckport],
++  AC_HELP_STRING([--disable-ckport],[do not install a ckport database]))
++AM_CONDITIONAL([HAVE_CKPORT], [test "$enable_ckport" != "no"])
++
+ SHOUT_VERSION="$VERSION"
+ SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS"
+ SHOUT_CFLAGS="$PTHREAD_CFLAGS"
+-- 
+2.21.1
+

libshout-2.4.3-Default-OpenSSL-cipher-list-is-PROFILE-SYSTEM.patch

@@ -0,0 +1,34 @@
+From 2fc42c6939bbc1ea5ddba88414e902014d651532 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 11 Feb 2020 10:03:21 +0100
+Subject: [PATCH] Default OpenSSL cipher list is PROFILE=SYSTEM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+"PROFILE=SYSTEM" is a Fedora extension to OpenSSL that enables to
+enforce a system-wide configured list of algorithms.
+
+<https://docs.fedoraproject.org/en-US/packaging-guidelines/CryptoPolicies/#_cc_applications>
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/shout_private.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shout_private.h b/src/shout_private.h
+index aa18f21..6845cc6 100644
+--- a/src/shout_private.h
++++ b/src/shout_private.h
+@@ -52,7 +52,7 @@
+ #define LIBSHOUT_DEFAULT_PROTOCOL   SHOUT_PROTOCOL_HTTP
+ #define LIBSHOUT_DEFAULT_USER       "source"
+ #define LIBSHOUT_DEFAULT_USERAGENT  "libshout/" VERSION
+-#define LIBSHOUT_DEFAULT_ALLOWED_CIPHERS "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA" /* Mozilla's 'Intermediate' list as of 2015-04-19 */
++#define LIBSHOUT_DEFAULT_ALLOWED_CIPHERS "PROFILE=SYSTEM"
+ 
+ /* server capabilities.
+    0x000000XXUL -> Methods.
+-- 
+2.21.1
+

libshout.spec

@@ -1,14 +1,16 @@
 Name:           libshout
-Version:        2.2.2
+Version:        2.4.6
-Release:        22
+Release:        1
 Summary:        Library which can be used to write a source client like ices
 License:        LGPLv2+
 URL:            http://www.icecast.org/
 Source:         http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz
 
-Patch0:         libshout-2.2.2-fix_speex.patch
+Patch0:         libshout-2.4.3-Allow-disabling-ckport-database-installation.patch
+Patch1:         libshout-2.4.3-Default-OpenSSL-cipher-list-is-PROFILE-SYSTEM.patch
 
-BuildRequires:  libogg-devel libvorbis-devel libtheora-devel speex-devel pkgconfig gcc
+BuildRequires:  openssl-devel libvorbis-devel libtheora-devel speex-devel pkgconfig gcc
+BuildRequires:  autoconf automake coreutils findutils libtool 
 
 %description
 libshout is a library which can be used to write a source client like ices. It handles the socket
@@ -23,15 +25,20 @@ The libshout-devel package contains the libraries and header files needed for li
 
 %prep
 %autosetup -p1
+autoreconf -fi
 
 %build
-%configure --disable-silent-rules --disable-static
+%configure --disable-silent-rules --disable-static --disable-ckport \
+  --enable-examples --enable-pkgconfig --enable-shared --enable-speex \
+  --enable-theora --enable-thread
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 %make_build
 
 %install
 %make_install
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+rm -rf $RPM_BUILD_ROOT%{_docdir}
 
 %pre
 
@@ -44,9 +51,11 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 %files
 %doc NEWS README COPYING
 %{_libdir}/libshout.so.3*
+%{_bindir}/shout
+%{_mandir}/*/shout.*
 
 %files devel
-%doc examples/*.c doc/*.xml doc/*.xsl
+%doc examples/*.c doc/*.xml
 %{_includedir}/shout/
 %{_libdir}/libshout.so
 %{_libdir}/pkgconfig/shout.pc
@@ -55,6 +64,9 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 %exclude %{_docdir}/libshout/*.c
 
 %changelog
+* Thu Oct 12 2023 Ge Wang <wang__ge@126.com> - 2.4.6-1
+- Update to version 2.4.6
+
 * Tue Jun 08 2021 wulei <wulei80@huawei.com> - 2.2.2-22
 - fixes failed: error: no acceptable C compiler found in $PATH