summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Łukasik <mati75@linuxmint.pl>2018-06-08 02:05:17 +0200
committerMateusz Łukasik <mati75@linuxmint.pl>2018-06-08 02:05:17 +0200
commitd1f3aaeda717076c1761f0aebb56681a5c4ce435 (patch)
treed2b817113fe613640bf8ddbb6307e95ef2166d51
parent6dc59d2042f358b943665a82777471acbcebb396 (diff)
Add debian/patches/03-update-mongoose-to-6.11.patch:
- Fix CVE-2017-2891, CVE-2017-2892, CVE-2017-2893, CVE-2017-2894, CVE-2017-2895, CVE-2017-2909, CVE-2017-2921, CVE-2017-2922. (Closes: #898943) * Add debian/patches/07-fix-ftbfs-gcc8.patch: - Fix FTBFS with gcc-8. (Closes: #897863)
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/07-fix-ftbfs-gcc8.patch16
-rw-r--r--debian/patches/series1
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9a3fe0d..c2f19f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ smplayer (18.5.0~ds1-1) UNRELEASED; urgency=medium
* Add debian/patches/03-update-mongoose-to-6.11.patch:
- Fix CVE-2017-2891, CVE-2017-2892, CVE-2017-2893, CVE-2017-2894,
CVE-2017-2895, CVE-2017-2909, CVE-2017-2921, CVE-2017-2922. (Closes: #898943)
+ * Add debian/patches/07-fix-ftbfs-gcc8.patch:
- Fix FTBFS with gcc-8. (Closes: #897863)
-- Reinhard Tartler <siretart@tauware.de> Sun, 03 Jun 2018 16:04:56 -0400
diff --git a/debian/patches/07-fix-ftbfs-gcc8.patch b/debian/patches/07-fix-ftbfs-gcc8.patch
new file mode 100644
index 0000000..a717d6b
--- /dev/null
+++ b/debian/patches/07-fix-ftbfs-gcc8.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with gcc-8 by disable -Werror
+Author: Mateusz Łukasik <mati75@linuxmint.pl>
+Bug-Debian: https://bugs.debian.org/898943
+Last-Update: 2018-06-08
+
+--- a/webserver/Makefile
++++ b/webserver/Makefile
+@@ -2,7 +2,7 @@ PROG = simple_web_server
+ MODULE_CFLAGS=-DMG_DISABLE_DAV_AUTH -DMG_ENABLE_HTTP_CGI=0 -DMG_ENABLE_THREADS=0
+
+ SOURCES = main.c mongoose.c
+-CFLAGS = -O2 -W -Wall -Werror -Wno-unused-function $(CFLAGS_EXTRA) $(MODULE_CFLAGS)
++CFLAGS = -O2 -W -Wall -Wno-unused-function $(CFLAGS_EXTRA) $(MODULE_CFLAGS)
+
+ ifeq ($(OS), Windows_NT)
+ CFLAGS += -lws2_32
diff --git a/debian/patches/series b/debian/patches/series
index e04dcbf..91b34a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
06-tryfixplaylist.patch
01-update-mime-types.patch
03-update-mongoose-to-6.11.patch
+07-fix-ftbfs-gcc8.patch