From 432a9351a8dd5a71604fcf18c1c0d400e7acf226 Mon Sep 17 00:00:00 2001 From: Sofia Boldyreva Date: Thu, 31 Oct 2024 18:26:41 +0100 Subject: [PATCH] Import ezstream-0.6.0-12 --- .ezstream.metadata | 2 +- .gitignore | 2 +- ....0-Check-for-undefined-stream-format.patch | 41 ++++ ...tribution-OpenSSL-certificate-bundle.patch | 29 --- SPECS/ezstream.spec | 188 ++++-------------- 5 files changed, 80 insertions(+), 182 deletions(-) create mode 100644 SOURCES/ezstream-0.6.0-Check-for-undefined-stream-format.patch delete mode 100644 SOURCES/ezstream-1.0.1-doc-Link-to-distribution-OpenSSL-certificate-bundle.patch diff --git a/.ezstream.metadata b/.ezstream.metadata index d76aa80..f08e2b5 100644 --- a/.ezstream.metadata +++ b/.ezstream.metadata @@ -1 +1 @@ -8b1cda0f5d7c4df24b847691f98065aab51020d2 SOURCES/ezstream-1.0.2.tar.gz +7817942031411cddf8e4f6d3dd0682a71fc1a592 SOURCES/ezstream-0.6.0.tar.gz diff --git a/.gitignore b/.gitignore index 4d723f9..14f5e9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ezstream-1.0.2.tar.gz +SOURCES/ezstream-0.6.0.tar.gz diff --git a/SOURCES/ezstream-0.6.0-Check-for-undefined-stream-format.patch b/SOURCES/ezstream-0.6.0-Check-for-undefined-stream-format.patch new file mode 100644 index 0000000..021f32e --- /dev/null +++ b/SOURCES/ezstream-0.6.0-Check-for-undefined-stream-format.patch @@ -0,0 +1,41 @@ +From e95150836e332a2522b90382c8a1d4b56ac3ce26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 21 Jul 2015 16:15:07 +0200 +Subject: [PATCH] Check for undefined stream format +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +format element is mandatory but the server will crash if it does not +exist in the configuration file. This patch handle the case +gracefully. + +It does not raise an error on unsupported value because documentation +allows it. + + + +Signed-off-by: Petr Písař +--- + src/util.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/util.c b/src/util.c +index 9ecd430..20c2acc 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -135,6 +135,11 @@ stream_setup(const char *host, unsigned short port, const char *mount) + return (NULL); + } + ++ if (NULL == pezConfig->format) { ++ printf("%s: stream format is missing\n", __progname); ++ shout_free(shout); ++ return (NULL); ++ } + if (!strcmp(pezConfig->format, MP3_FORMAT) && + shout_set_format(shout, SHOUT_FORMAT_MP3) != SHOUTERR_SUCCESS) { + printf("%s: shout_set_format(MP3): %s\n", +-- +2.4.3 + diff --git a/SOURCES/ezstream-1.0.1-doc-Link-to-distribution-OpenSSL-certificate-bundle.patch b/SOURCES/ezstream-1.0.1-doc-Link-to-distribution-OpenSSL-certificate-bundle.patch deleted file mode 100644 index 1646a9f..0000000 --- a/SOURCES/ezstream-1.0.1-doc-Link-to-distribution-OpenSSL-certificate-bundle.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9a195628f12f65cc949bc6b1801895c48a58893a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 24 Feb 2020 11:27:53 +0100 -Subject: [PATCH] doc: Link to distribution OpenSSL certificate bundle -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - examples/ezstream-full.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/ezstream-full.xml b/examples/ezstream-full.xml -index 0987124..6042b91 100644 ---- a/examples/ezstream-full.xml -+++ b/examples/ezstream-full.xml -@@ -67,7 +67,7 @@ - One of the or settings must be enabled for - certificate verification to succeed. - --> -- -+ - -