freeswitch-stable: unite libvpx patches, address CVE

Currently there are two simple patches for libvpx. This commit puts the
second patch into the first.

Also added:

  - CPPFLAGS
  - a flag to address CVE-2017-0641
  - comments

A tiff patch got refreshed due to the above.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

3 files changed, 10 insertions, 15 deletions

diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch-stable/patches/140-libvpx-cross.patch
index 98694d2..0bd0e60 100644
--- a/net/freeswitch-stable/patches/140-libvpx-cross.patch
+++ b/net/freeswitch-stable/patches/140-libvpx-cross.patch
@@ -1,11 +1,17 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -550,7 +550,7 @@ libs/libzrtp/libzrtp.a:
+@@ -549,8 +549,13 @@ libs/libedit/src/.libs/libedit.a:
+ libs/libzrtp/libzrtp.a:
  	cd libs/libzrtp && $(MAKE)
  
++# !!! OpenWrt was here !!!
++# - added CROSS and set target to generic-gnu for cross-compile
++# - added CPPFLAGS to CFLAGS, otherwise they would be ignored
++# - disabled optimizations that would override OpenWrt's CFLAGS
++# - added a size limit like Debian does to address CVE-2017-0641
  libs/libvpx/Makefile:
 -	cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
-+	cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
++	cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" --disable-optimizations --size-limit=16384x16384
  
  libs/libvpx/libvpx.a: libs/libvpx/Makefile
  	@cd libs/libvpx && $(MAKE)
diff --git a/net/freeswitch-stable/patches/250-libvpx-use-openwrt-flags.patch b/net/freeswitch-stable/patches/250-libvpx-use-openwrt-flags.patch
deleted file mode 100644
index 636180280..0000000
--- a/net/freeswitch-stable/patches/250-libvpx-use-openwrt-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -550,7 +550,7 @@ libs/libzrtp/libzrtp.a:
- 	cd libs/libzrtp && $(MAKE)
- 
- libs/libvpx/Makefile:
--	cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
-+	cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" --disable-optimizations
- 
- libs/libvpx/libvpx.a: libs/libvpx/Makefile
- 	@cd libs/libvpx && $(MAKE)
diff --git a/net/freeswitch-stable/patches/310-use-system-tiff.patch b/net/freeswitch-stable/patches/310-use-system-tiff.patch
index 1fcb029..5466ed2 100644
--- a/net/freeswitch-stable/patches/310-use-system-tiff.patch
+++ b/net/freeswitch-stable/patches/310-use-system-tiff.patch
@@ -14,7 +14,7 @@ Date:   Tue Mar 14 17:39:05 2017 -0500
  if ENABLE_LIBVPX
  CORE_CFLAGS += -DSWITCH_HAVE_VPX
  endif
-@@ -731,11 +730,6 @@ sndfile-reconf:
+@@ -736,11 +735,6 @@ sndfile-reconf:
  	cd libs/libsndfile && ./config.status --recheck
  	cd libs/libsndfile && ./config.status
  
@@ -26,7 +26,7 @@ Date:   Tue Mar 14 17:39:05 2017 -0500
  python-reconf:
  	rm -f src/mod/languages/mod_python/Makefile
  	./config.status
-@@ -757,7 +751,7 @@ iks-reconf:
+@@ -762,7 +756,7 @@ iks-reconf:
  	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
  	$(MAKE) mod_dingaling-clean