2.4.3 bump

This commit is contained in:
Petr Písař 2020-02-11 10:23:12 +01:00
parent 453fe0dab9
commit 97c5d9de48
7 changed files with 197 additions and 106 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
libshout-2.2.2.tar.gz libshout-2.2.2.tar.gz
/libshout-2.4.3.tar.gz

View File

@ -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

View File

@ -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

View File

@ -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

2
libshout.rpmlintrc Normal file
View File

@ -0,0 +1,2 @@
from Config import *
addFilter("spelling-error .* (icecast|Icecast)");

View File

@ -1,19 +1,98 @@
Name: libshout Name: libshout
Version: 2.2.2 Version: 2.4.3
Release: 23%{?dist} Release: 1%{?dist}
Summary: Icecast source streaming library Summary: Icecast source streaming library
License: LGPLv2+ # COPYING: GPLv2 text
URL: http://www.icecast.org/ # include/shout/shout.h.in: LGPLv2+
Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz # README: LGPLv2+
Patch0: libshout-2.2.2-fix_speex.patch # src/codec_opus.c: LGPLv2+
# src/codec_speex.c: LGPLv2+
# src/codec_theora.c: LGPLv2+
# src/codec_vorbis.c: LGPLv2+
# src/common/avl/avl.c: MIT
# src/common/httpp/encoding.c: LGPLv2+
# src/common/httpp/encoding.h: LGPLv2+
# src/common/httpp/httpp.c: LGPLv2+
# src/common/httpp/httpp.h: LGPLv2+
# src/common/net/resolver.c: LGPLv2+
# src/common/net/resolver.h: LGPLv2+
# src/common/net/sock.c: LGPLv2+
# src/common/net/sock.h: LGPLv2+
# src/common/thread/thread.c: LGPLv2+
# src/common/thread/thread.h: LGPLv2+
# src/common/timing/timing.c: LGPLv2+
# src/common/timing/timing.h: LGPLv2+
# src/connection.c: LGPLv2+
# src/format_mp3.c: LGPLv2+
# src/format_ogg.c: LGPLv2+
# src/format_ogg.h: LGPLv2+
# src/format_webm.c: LGPLv2+
# src/proto_http.c: LGPLv2+
# src/proto_icy.c: LGPLv2+
# src/proto_roaraudio.c: LGPLv2+
# src/proto_xaudiocast.c: LGPLv2+
# src/queue.c: LGPLv2+
# src/shout.c: LGPLv2+
# src/shout_private.h: LGPLv2+
# src/tls.c: LGPLv2+
# src/util.c: LGPLv2+
# src/util.h: LGPLv2+
## Not in a binary package
# aclocal.m4: GPLv2+ with Autoconf exception and FSFULLR
# compile: GPLv2+ with Autoconf exception
# config.guess: GPLv3+ with Autoconf exception
# config.sub: GPLv3+ with Autoconf exception
# configure: GPLv2+ with Libtool exception and FSFUL
# depcomp: GPLv2+ with Autoconf exception
# doc/Makefile.in: FSFULLR
# examples/Makefile.in: FSFULLR
# include/Makefile.in: FSFULLR
# include/shout/Makefile.in: FSFULLR
# install-sh: MIT
# ltmain.sh: GPLv2+ with a Libtool exception
# m4/lt~obsolete.m4: FSFULLR
# m4/ltoptions.m4: FSFULLR
# m4/ltsugar.m4: FSFULLR
# m4/ltversion.m4: FSFULLR
# m4/libtool.m4: GPLv2+ with Libtool exception and FSFULLR and FSFUL
# Makefile.in: FSFULLR
# missing: GPLv2+ with Autoconf exception
# src/common/avl/COPYING: LGPLv2 text
# src/common/avl/Makefile.in: FSFULLR
# src/common/httpp/COPYING: LGPLv2 text
# src/common/httpp/Makefile.in: FSFULLR
# src/common/httpp/README: LGPLv2+
# src/common/net/COPYING: LGPLv2 text
# src/common/net/Makefile.in: FSFULLR
# src/common/thread/COPYING: LGPLv2 text
# src/common/thread/Makefile.in: FSFULLR
# src/common/timing/COPYING: LGPLv2 text
# src/common/timing/Makefile.in: FSFULLR
# src/Makefile.in: FSFULLR
# win32/Makefile.in: FSFULLR
License: LGPLv2+ and MIT
URL: https://www.icecast.org/
Source: https://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz
# Fedora does not support ckport. Enable disabling it.
# <https://gitlab.xiph.org/xiph/icecast-libshout/issues/2314>
Patch0: libshout-2.4.3-Allow-disabling-ckport-database-installation.patch
# Enforce a Fedora system-wide crypto policy
# <https://docs.fedoraproject.org/en-US/packaging-guidelines/CryptoPolicies/#_cc_applications>
Patch1: libshout-2.4.3-Default-OpenSSL-cipher-list-is-PROFILE-SYSTEM.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: libtool
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
BuildRequires: libtheora-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: speex-devel BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(theora)
BuildRequires: sed
%description %description
libshout is a library for communicating with and sending data to an libshout is a library for communicating with and sending data to an
@ -21,7 +100,8 @@ icecast server. It handles the socket connection, the timing of the
data, and prevents most bad data from getting to the icecast server. data, and prevents most bad data from getting to the icecast server.
%package devel %package devel
Summary: static libraries and header files for %{name} development. Summary: Header files for %{name} development
License: LGPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
@ -31,12 +111,21 @@ you want to develop applications using libshout.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .fix_speex %patch0 -p1
%patch1 -p1
autoreconf -fi
%build %build
%configure \ %configure \
--disable-ckport \
--enable-examples \
--enable-pkgconfig \
--disable-silent-rules \ --disable-silent-rules \
--disable-static --enable-shared \
--enable-speex \
--disable-static \
--enable-theora \
--enable-thread
# clean unused-direct-shlib-dependencies # clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@ -46,25 +135,27 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%install %install
%make_install %make_install
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.la" -delete
rm -rf $RPM_BUILD_ROOT%{_docdir} rm -rf $RPM_BUILD_ROOT%{_docdir}
%ldconfig_scriptlets
%files %files
%doc NEWS README %doc NEWS README
%license COPYING %license COPYING
%{_libdir}/libshout.so.3* %{_libdir}/libshout.so.3
%{_libdir}/libshout.so.3.*
%files devel %files devel
%doc examples/*.c doc/*.xml doc/*.xsl %doc examples/*.c doc/*.xml
%{_libdir}/libshout.so %{_libdir}/libshout.so
%{_libdir}/pkgconfig/shout.pc %{_libdir}/pkgconfig/shout.pc
%{_includedir}/shout/ %{_includedir}/shout/
%{_datadir}/aclocal/shout.m4 %{_datadir}/aclocal/shout.m4
%changelog %changelog
* Mon Feb 10 2020 Petr Pisar <ppisar@redhat.com> - 2.4.3-1
- 2.4.3 bump
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-23 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
4f75fc9901c724b712c371c9a1e782d3 libshout-2.2.2.tar.gz SHA512 (libshout-2.4.3.tar.gz) = fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34