[vdr] Build with hardening flags on.

Mon Apr 23 20:27:16 UTC 2012

commit 63d0788fdb97a91b377e3e6e3e6e409f4d54979c
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Apr 23 23:27:03 2012 +0300

    Build with hardening flags on.
    
    - Update hlcutter patch to 0.2.3.
    - Patch to build libhdffcmd with our CFLAGS.
    - Sync CXXFLAGS in Make.config with upstream.

 .gitignore                              |    2 +-
 sources                                 |    2 +-
 vdr-1.7.21-hlcutter-0.2.2-finnish.patch |   23 -----------------------
 vdr-1.7.27-hlcutter.patch               |   12 ------------
 vdr-1.7.27-libhdffcmd-cflags.patch      |   13 +++++++++++++
 vdr.spec                                |   22 +++++++++++++---------
 6 files changed, 28 insertions(+), 46 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 10fa5c4..98dfeb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 /vdr-1.7.21-ttxtsubs.patch
 /vdr-timer-info-0.5-1.7.13.diff
 /vdr.epgsearch-exttimeredit-0.0.2.diff
-/vdr-1.7.22-hlcutter-0.2.2.diff
+/vdr-1.7.27-hlcutter-0.2.3.diff
diff --git a/sources b/sources
index 37d7cc0..be48417 100644
--- a/sources
+++ b/sources
@@ -3,7 +3,7 @@
 fae3698214bd45de1f675c2b037d5f3b  vdr-1.7.21-ttxtsubs.patch
 04511ae02243eb1bab94f3f45b59e574  vdr-timer-info-0.5-1.7.13.diff
 71f7281d55eba1957f4267f596b11e29  vdr.epgsearch-exttimeredit-0.0.2.diff
-925d44ca8a2d10a4b84f1d47e617fc46  vdr-1.7.22-hlcutter-0.2.2.diff
 d40db7bea1b9af94d7625e611ef3dae2  vdr_1.7.23-1.debian.tar.bz2
 bfeaa79a9e55144bca2b69139c45f1bb  vdr-1.7.27.tar.bz2
 b2fac5d9ee86abb8abf294839bdf2fbf  vdr-1.7.27-liemikuutio-1.34.patch.gz
+ef7a35dc23c5ed700e1ce873274f7793  vdr-1.7.27-hlcutter-0.2.3.diff
diff --git a/vdr-1.7.27-libhdffcmd-cflags.patch b/vdr-1.7.27-libhdffcmd-cflags.patch
new file mode 100644
index 0000000..b2bca1d
--- /dev/null
+++ b/vdr-1.7.27-libhdffcmd-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
+index ad50296..7e74343 100644
+--- a/PLUGINS/src/dvbhddevice/Makefile
++++ b/PLUGINS/src/dvbhddevice/Makefile
+@@ -99,7 +99,7 @@ i18n: $(I18Nmsgs) $(I18Npot)
+ ### Targets:
+ 
+ libvdr-$(PLUGIN).so: $(OBJS) libhdffcmd
+-	$(MAKE) -C libhdffcmd all
++	$(MAKE) -C libhdffcmd all CFLAGS="$(CFLAGS)"
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
+ 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
diff --git a/vdr.spec b/vdr.spec
index 351cb27..7a89da5 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -6,6 +6,7 @@
 #   http://www.tolleri.net/vdr/vdr/vdr-1.6.0-2-pause-0.0.1.patch
 #   http://thread.gmane.org/gmane.linux.vdr/40188
 
+%global _hardened_build 1
 %bcond_without    docs
 
 %global varbase   %{_var}/lib/vdr
@@ -25,7 +26,7 @@
 
 Name:           vdr
 Version:        1.7.27
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video Disk Recorder
 
 License:        GPLv2+
@@ -65,17 +66,14 @@ Patch7:         http://projects.vdr-developer.org/projects/plg-ttxtsubs/reposito
 # Original at http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.7.6.diff
 Patch8:         %{name}-1.7.27-jumpplay.patch
 # http://www.udo-richter.de/vdr/patches.en.html#hlcutter
-Patch9:         http://www.udo-richter.de/vdr/files/vdr-1.7.22-hlcutter-0.2.2.diff
-# Sent to hlcutter upstream 2009-06-15 and 2011-10-16
-Patch10:        %{name}-1.7.21-hlcutter-0.2.2-finnish.patch
+Patch9:         http://www.udo-richter.de/vdr/files/vdr-1.7.27-hlcutter-0.2.3.diff
+Patch10:        %{name}-1.7.27-libhdffcmd-cflags.patch
 # http://article.gmane.org/gmane.linux.vdr/43590
 Patch11:        %{name}-1.7.25-mainmenuhooks101.patch
 # http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/timercmd-0.1_1.7.17.diff
 # Modified so that it applies over the timer-info patch
 Patch12:        %{name}-1.7.21-timercmd.patch
 Patch13:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr-1.5.17-progressbar-support-0.0.1.diff
-# Sent to hlcutter upstream 2012-03-26
-Patch14:        %{name}-1.7.27-hlcutter.patch
 Patch15:        %{name}-1.7.21-fedora-pkgconfig.patch
 Patch16:        %{name}-1.7.21-jumpplay-finnish.patch
 Patch17:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
@@ -207,7 +205,6 @@ sed \
 %patch12 -p1
 # TODO: does not apply
 #patch13 -p1
-%patch14 -p1
 %patch15 -p0
 %patch16 -p1
 # TODO: build failure
@@ -249,6 +246,7 @@ done
 %build
 
 export RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-O2/-O3}" # see HISTORY for 1.7.17
+vdrcxxflags="-Wall -Werror=overloaded-virtual -Wno-parentheses"
 
 cat << EOF > Make.config
 CC           = %{__cc}
@@ -256,11 +254,11 @@ CXX          = %{__cxx}
 
 ifeq (\$(RPM_OPT_FLAGS),)
   CFLAGS     = $RPM_OPT_FLAGS
-  CXXFLAGS   = $RPM_OPT_FLAGS -Wall -Woverloaded-virtual -Wno-parentheses
+  CXXFLAGS   = $RPM_OPT_FLAGS $vdrcxxflags
   LDFLAGS    = $RPM_LD_FLAGS
 else
   CFLAGS     = \$(RPM_OPT_FLAGS)
-  CXXFLAGS   = \$(RPM_OPT_FLAGS) -Wall -Woverloaded-virtual -Wno-parentheses
+  CXXFLAGS   = \$(RPM_OPT_FLAGS) $vdrcxxflags
   LDFLAGS    = \$(RPM_LD_FLAGS)
 endif
 
@@ -549,6 +547,12 @@ rm -f %{migrfile} &>/dev/null || :
 
 
 %changelog
+* Mon Apr 23 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.27-2
+- Build with hardening flags on.
+- Update hlcutter patch to 0.2.3.
+- Patch to build libhdffcmd with our CFLAGS.
+- Sync CXXFLAGS in Make.config with upstream.
+
 * Mon Mar 26 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.27-1
 - Update to 1.7.27, re-enable legacy receiver code for now.
 
