diff --git a/libshout-2.4.3-Allow-disabling-ckport-database-installation.patch b/libshout-2.4.3-Allow-disabling-ckport-database-installation.patch new file mode 100644 index 0000000000000000000000000000000000000000..18d4dd7a631670010a3139a0f06bf6b38801248e --- /dev/null +++ b/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?= +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ř +--- + 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 + diff --git a/libshout-2.4.3-Default-OpenSSL-cipher-list-is-PROFILE-SYSTEM.patch b/libshout-2.4.3-Default-OpenSSL-cipher-list-is-PROFILE-SYSTEM.patch new file mode 100644 index 0000000000000000000000000000000000000000..f93d02ef8064ba1178b3b60d50b9badf9d1159f5 --- /dev/null +++ b/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?= +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. + + + +Signed-off-by: Petr Písař +--- + 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 + diff --git a/libshout-2.4.5.tar.gz b/libshout-2.4.5.tar.gz deleted file mode 100644 index 6f53b41ab9cff06d5bbada0f9f94d8822977c387..0000000000000000000000000000000000000000 Binary files a/libshout-2.4.5.tar.gz and /dev/null differ diff --git a/libshout-2.4.6.tar.gz b/libshout-2.4.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d4680a2f5e2141843fc432afbeecb7c0910ef1bd Binary files /dev/null and b/libshout-2.4.6.tar.gz differ diff --git a/libshout.spec b/libshout.spec index 42f66ada763bc9cefec01347fbcd472f769bacce..88e27662263a102895346493b213a9af5c10cc37 100644 --- a/libshout.spec +++ b/libshout.spec @@ -1,12 +1,15 @@ %define anolis_release 1 Name: libshout -Version: 2.4.5 +Version: 2.4.6 Release: %{anolis_release}%{?dist} Summary: Icecast source streaming library License: LGPLv2+ and MIT URL: https://www.icecast.org/ -Source: https://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Source: https://downloads.xiph.org/releases/libshout/libshout-%{version}.tar.gz + +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: autoconf BuildRequires: automake @@ -37,9 +40,16 @@ The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if you want to develop applications using libshout. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %prep -%setup -q -autoreconf -fi +%autosetup -p1 %build %configure \ @@ -65,22 +75,30 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete rm -rf $RPM_BUILD_ROOT%{_docdir} +%generate_compatibility_deps + %files -%doc NEWS README +%dir %{abidir} %license COPYING %{_libdir}/libshout.so.3 %{_libdir}/libshout.so.3.* +%{abidir}/libshout.dump %{_libdir}/ckport/db/* %{_bindir}/shout* %{_mandir}/man1/shout*.1* %files devel -%doc examples/*.c doc/*.xml %{_libdir}/libshout.so %{_libdir}/pkgconfig/shout.pc %{_includedir}/shout/ %{_datadir}/aclocal/shout.m4 +%files doc +%doc NEWS README examples/*.c doc/*.xml + %changelog +* Sat Mar 04 2023 Shawn Wang - 2.4.6-1 +- update to 2.4.6 + * Fri Apr 15 2022 mgb01105731 - 2.4.5-1 - Init from upstream version 2.4.5