Upload exception to t-p-u for dansguardian

[Alexander Wirt]

Hi, 

thanks to Thomas Viehmann I now have a patch for #493047. I prepared an upload 
for t-p-u
(interdiff attached), so I'm asking for an upload exception ofthis version
now. 

Thanks in advance

Alex


-- 
Alexander Wirt, [EMAIL PROTECTED] 
CC99 2DDD D39E 75B0 B0AA  B25C D35B BC99 BC7D 020A

diff -u dansguardian-2.9.9.4/debian/changelog 
dansguardian-2.9.9.4/debian/changelog
--- dansguardian-2.9.9.4/debian/changelog
+++ dansguardian-2.9.9.4/debian/changelog
@@ -1,3 +1,13 @@
+dansguardian (2.9.9.4-1+lenny1) testing-proposed-updates; urgency=low
+
+  [ Thomas Viehmann ]
+  * OptionContainer.cpp: If you need to iterate through all lines in the
+    config file to find a field, at least don't abuse the configfile deque
+    by accessing it as if it was an array with signed index.
+    Works way better on arm, too, i.e. closes: #493047.
+
+ -- Alexander Wirt <[EMAIL PROTECTED]>  Mon, 13 Oct 2008 09:29:35 +0200
+
 dansguardian (2.9.9.4-1) unstable; urgency=low
 
   * New upstream version 
diff -u dansguardian-2.9.9.4/debian/patches/00list 
dansguardian-2.9.9.4/debian/patches/00list
--- dansguardian-2.9.9.4/debian/patches/00list
+++ dansguardian-2.9.9.4/debian/patches/00list
@@ -4,0 +5 @@
+11_FixOptionContainer.cpp_on_arm.dpatch
only in patch2:
unchanged:
--- 
dansguardian-2.9.9.4.orig/debian/patches/11_FixOptionContainer.cpp_on_arm.dpatch
+++ dansguardian-2.9.9.4/debian/patches/11_FixOptionContainer.cpp_on_arm.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_FixOptionContainer.cpp_on_arm.dpatch by Alexander Wirt <[EMAIL 
PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If you need to iterate through all lines in the
+##     config file to find a field, at least don't abuse the configfile deque
+##     by accessing it as if it was an array with signed index.
+##     Works way better on arm, too, i.e. closes: #493047.
+
[EMAIL PROTECTED]@
+diff -urNad dansguardian-2.9.9.7~/src/OptionContainer.cpp 
dansguardian-2.9.9.7/src/OptionContainer.cpp
+--- dansguardian-2.9.9.7~/src/OptionContainer.cpp      2008-08-18 
09:57:46.000000000 +0200
++++ dansguardian-2.9.9.7/src/OptionContainer.cpp       2008-10-13 
09:23:20.000000000 +0200
+@@ -662,8 +662,10 @@
+       String temp;
+       String temp2;
+       String o(option);
+-      for (int i = 0; i < (signed) conffile.size(); i++) {
+-              temp = conffile[i].c_str();
++      for (std::deque<std::string>::iterator i = conffile.begin(); i != 
conffile.end(); i++) {
++              if ((*i).empty())
++                      continue;
++              temp = (*i).c_str();
+               temp2 = temp.before("=");
+               while (temp2.endsWith(" ")) {   // get rid of tailing spaces 
before =
+                       temp2.chop();
+@@ -696,8 +698,10 @@
+       String temp2;
+       String o(option);
+       std::deque<String > results;
+-      for (int i = 0; i < (signed) conffile.size(); i++) {
+-              temp = conffile[i].c_str();
++      for (std::deque<std::string>::iterator i = conffile.begin(); i != 
conffile.end(); i++) {
++              if ((*i).empty())
++                      continue;
++              temp = (*i).c_str();
+               temp2 = temp.before("=");
+               while (temp2.endsWith(" ")) {   // get rid of tailing spaces 
before =
+                       temp2.chop();