[SCM] handbrake/master: Consider CFLAGS, CPPFLAGS and LDFLAGS in libhb build and fix format string security errors.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e4c29ccdaa49e8eabbdb6f491b04c85c6f16233
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Sun Jun 10 23:19:16 2012 +0200

    Consider CFLAGS, CPPFLAGS and LDFLAGS in libhb build and fix format string security errors.

diff --git a/debian/patches/0012-FLAGS.patch b/debian/patches/0012-FLAGS.patch
new file mode 100644
index 0000000..3358399
--- /dev/null
+++ b/debian/patches/0012-FLAGS.patch
@@ -0,0 +1,26 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Subject: Consider CFLAGS, CPPFLAGS and LDFLAGS in libhb build.
+
+--- a/make/include/gcc.defs
++++ b/make/include/gcc.defs
+@@ -67,15 +67,15 @@ GCC.args.L         = -L$(1)
+ GCC.args.l         = -l$(1)
+ GCC.args.end       = -Wl,--end-group
+ 
+-GCC.args.extra         =
++GCC.args.extra         = $(CFLAGS) $(CPPFLAGS)
+ GCC.args.extra.h_o     =
+ GCC.args.extra.c_o     =
+-GCC.args.extra.dylib   =
+-GCC.args.extra.exe     =
++GCC.args.extra.dylib   = $(LDFLAGS) -Wl,-z,defs -Wl,--as-needed
++GCC.args.extra.exe     = $(LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+ GCC.args.extra.hpp_o   =
+ GCC.args.extra.cpp_o   =
+-GCC.args.extra.dylib++ =
+-GCC.args.extra.exe++   =
++GCC.args.extra.dylib++ = $(LDFLAGS) -Wl,-z,defs -Wl,--as-needed
++GCC.args.extra.exe++   = $(LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+ 
+ ###############################################################################
+ 
diff --git a/debian/patches/0013-format-security.patch b/debian/patches/0013-format-security.patch
new file mode 100644
index 0000000..a995b52
--- /dev/null
+++ b/debian/patches/0013-format-security.patch
@@ -0,0 +1,25 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Subject: Fix format string security errors.
+
+--- a/libhb/deccc608sub.c
++++ b/libhb/deccc608sub.c
+@@ -1607,7 +1607,7 @@ int write_cc_buffer_as_srt (struct eia60
+     if (debug_608)
+     {
+         hb_log ("\n- - - SRT caption - - -\n");
+-        hb_log (timeline);
++        hb_log ("%s", timeline);
+     }
+     //fwrite (enc_buffer,enc_buffer_used,1,wb->fh);		
+     XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
+--- a/libhb/decmpeg2.c
++++ b/libhb/decmpeg2.c
+@@ -644,7 +644,7 @@ static int hb_libmpeg2_decode( hb_libmpe
+                 hb_audio_t *audio = hb_list_item( m->title->list_audio, 0 );
+                 if( audio )
+                 {
+-                    snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), 
++                    snprintf( "%s", subtitle->iso639_2, sizeof( subtitle->iso639_2 ),
+                               audio->config.lang.iso639_2);
+                 } else {
+                     snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "und");
diff --git a/debian/patches/series b/debian/patches/series
index 61ed664..ed26d00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@
 #0009-Remove-forcing-PGS-subtitles-to-be-included.patch
 0010-Remove-FAAC-dependency.patch
 0011-First-try-at-removing-some-of-mp4v2.patch
+0012-FLAGS.patch
+0013-format-security.patch

-- 
handbrake packaging