[SCM] korundum packaging branch, kde4.10, updated. debian/4.10.4-1-2-gd7c147e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/korundum.git;a=commitdiff;h=d7c147e

The following commit has been merged in the kde4.10 branch:
commit d7c147eed16abd7292e77e596076a379723e6a75
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 15:26:09 2013 +0200

    New patch: rbkconfig_compiler_mayhem_fix.patch fix for http://www.forallsecure.com/bug-reports/c83a9d5bc92bafac366256af920d7da056febe26/
---
 debian/changelog                                   |    4 +++-
 debian/patches/rbkconfig_compiler_mayhem_fix.patch |   13 +++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c3a06cb..a934f62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 korundum (4:4.10.4-2) experimental; urgency=low
 
-  * 
+  * New patch: rbkconfig_compiler_mayhem_fix.patch
+    fix for http://www.forallsecure.com/bug-
+    reports/c83a9d5bc92bafac366256af920d7da056febe26/
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 15 Jun 2013 09:22:16 +0200
 
diff --git a/debian/patches/rbkconfig_compiler_mayhem_fix.patch b/debian/patches/rbkconfig_compiler_mayhem_fix.patch
new file mode 100644
index 0000000..669a7f9
--- /dev/null
+++ b/debian/patches/rbkconfig_compiler_mayhem_fix.patch
@@ -0,0 +1,13 @@
+Index: korundum-4.10.4/tools/rbkconfig_compiler/rbkconfig_compiler.cpp
+===================================================================
+--- korundum-4.10.4.orig/tools/rbkconfig_compiler/rbkconfig_compiler.cpp	2013-07-01 15:10:45.870585849 +0200
++++ korundum-4.10.4/tools/rbkconfig_compiler/rbkconfig_compiler.cpp	2013-07-01 15:15:43.930792384 +0200
+@@ -51,7 +51,7 @@
+ 
+     for (int i = 1; i < args.count(); ++i) {
+         if (args.at(i) == "-d" ||  args.at(i) == "--directory") {
+-            if (i + 1 > args.count()) {
++            if (i + 1 >= args.count()) {
+                 std::cerr << qPrintable(args.at(i)) << " needs an argument" << std::endl;
+                 exit(1);
+             }
diff --git a/debian/patches/series b/debian/patches/series
index 381db43..ad744de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 do_not_install_examples.diff
 fix_ruby_requires.diff
+rbkconfig_compiler_mayhem_fix.patch

-- 
korundum packaging