From 0db6a92ab8bb83202108a1ade4ed1a54a1b341a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 17:33:03 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/libshout#6e393960d0a68605de9dce59bed1fe96c57404c0 --- .gitignore | 2 + ...sabling-ckport-database-installation.patch | 50 ++++ ...penSSL-cipher-list-is-PROFILE-SYSTEM.patch | 34 +++ libshout.autotools.patch | 72 +++++ libshout.rpmlintrc | 2 + libshout.spec | 258 ++++++++++++++++++ sources | 1 + 7 files changed, 419 insertions(+) create mode 100644 libshout-2.4.3-Allow-disabling-ckport-database-installation.patch create mode 100644 libshout-2.4.3-Default-OpenSSL-cipher-list-is-PROFILE-SYSTEM.patch create mode 100644 libshout.autotools.patch create mode 100644 libshout.rpmlintrc create mode 100644 libshout.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..b1d3a13 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +libshout-2.2.2.tar.gz +/libshout-2.4.3.tar.gz 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 0000000..18d4dd7 --- /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 0000000..f93d02e --- /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.autotools.patch b/libshout.autotools.patch new file mode 100644 index 0000000..c7cecbb --- /dev/null +++ b/libshout.autotools.patch @@ -0,0 +1,72 @@ +diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am +--- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 ++++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 +@@ -2,5 +2,5 @@ + + AUTOMAKE_OPTIONS = foreign + +-includedir = $(prefix)/include/shout +-nodist_include_HEADERS = shout.h ++pkgincludedir = $(includedir)/shout ++nodist_pkginclude_HEADERS = shout.h +diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in +--- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 ++++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 +@@ -61,7 +61,7 @@ + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(includedir)" + nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(nodist_include_HEADERS) ++HEADERS = $(nodist_pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -197,7 +197,7 @@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ +-includedir = $(prefix)/include/shout ++pkgincludedir = $(includedir)//shout + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ +@@ -217,7 +217,7 @@ + target = @target@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = foreign +-nodist_include_HEADERS = shout.h ++nodist_pkginclude_HEADERS = shout.h + all: all-am + + .SUFFIXES: +@@ -262,22 +262,22 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: +-install-nodist_includeHEADERS: $(nodist_include_HEADERS) ++install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" +- @list='$(nodist_include_HEADERS)'; for p in $$list; do \ ++ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" ++ @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ +- $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ ++ echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done + + uninstall-nodist_includeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(nodist_include_HEADERS)'; for p in $$list; do \ ++ @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(includedir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) diff --git a/libshout.rpmlintrc b/libshout.rpmlintrc new file mode 100644 index 0000000..296e556 --- /dev/null +++ b/libshout.rpmlintrc @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* (icecast|Icecast)"); diff --git a/libshout.spec b/libshout.spec new file mode 100644 index 0000000..ac81f32 --- /dev/null +++ b/libshout.spec @@ -0,0 +1,258 @@ +Name: libshout +Version: 2.4.3 +Release: 2%{?dist} +Summary: Icecast source streaming library + +# COPYING: GPLv2 text +# include/shout/shout.h.in: LGPLv2+ +# README: LGPLv2+ +# 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. +# +Patch0: libshout-2.4.3-Allow-disabling-ckport-database-installation.patch +# Enforce a Fedora system-wide crypto policy +# +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: pkgconfig +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(theora) +BuildRequires: sed + +%description +libshout is a library for communicating with and sending data to an +icecast server. It handles the socket connection, the timing of the +data, and prevents most bad data from getting to the icecast server. + +%package devel +Summary: Header files for %{name} development +License: LGPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +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. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +autoreconf -fi + +%build +%configure \ + --disable-ckport \ + --enable-examples \ + --enable-pkgconfig \ + --disable-silent-rules \ + --enable-shared \ + --enable-speex \ + --disable-static \ + --enable-theora \ + --enable-thread + +# clean unused-direct-shlib-dependencies +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} + +%files +%doc NEWS README +%license COPYING +%{_libdir}/libshout.so.3 +%{_libdir}/libshout.so.3.* + +%files devel +%doc examples/*.c doc/*.xml +%{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc +%{_includedir}/shout/ +%{_datadir}/aclocal/shout.m4 + +%changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Feb 10 2020 Petr Pisar - 2.4.3-1 +- 2.4.3 bump + +* Wed Jan 29 2020 Fedora Release Engineering - 2.2.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.2.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.2.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Apr 29 2018 Rex Dieter - 2.2.2-19 +- .spec cleanup + +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 2.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 2.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 2.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 20 2008 Fedora Release Engineering - 2.2.2-3 +- Autorebuild for GCC 4.3 + +* Fri Dec 7 2007 kwizart < kwizart at gmail.com > - 2.2.2-2 +- Fix http://bugzilla.redhat.com/415121 +- Add disable-static +- Don't use makeinstall macro +- Update License field + +* Thu Sep 07 2006 Thomas Vander Stichele +- 2.2.2-1 +- updated to new release + +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + +* Sun May 22 2005 Jeremy Katz - 1.0.9-4 +- rebuild on all arches + +* Fri Apr 1 2005 Michael Schwendt - 1.0.9-3 +- Include headers directory entry in -devel package. + +* Sat Feb 26 2005 Ville Skyttä - 1.0.9-2 +- Remove redundant explicit /sbin/ldconfig dependency. + +* Wed Jun 04 2003 Thomas Vander Stichele +- 1.0.9-0.fdr.1: initial RPM release diff --git a/sources b/sources new file mode 100644 index 0000000..9773e92 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libshout-2.4.3.tar.gz) = fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34