const keys that need to be constructed is not likely to work with

compliant STL implementation.

3 files changed, 40 insertions, 1 deletions

diff --git a/www/ap2-suphp/distinfo b/www/ap2-suphp/distinfo
index 16e9c7f5db0..e7f701fb6b8 100644
--- a/www/ap2-suphp/distinfo
+++ b/www/ap2-suphp/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2011/09/21 12:54:16 adam Exp $
+$NetBSD: distinfo,v 1.7 2013/05/06 15:01:30 joerg Exp $
 
 SHA1 (suphp-0.7.1.tar.gz) = 9eb82b62b5f71c01d7d8b2510c685141b78e54f5
 RMD160 (suphp-0.7.1.tar.gz) = e5e7e71494af322c3ab33d6a35fbcf96334c098c
 Size (suphp-0.7.1.tar.gz) = 386521 bytes
+SHA1 (patch-src_IniSection.cpp) = 8effa733d567c6a724370e53b008e271aab23ad3
+SHA1 (patch-src_IniSection.hpp) = c97e0e71fc2041d19026bae41838018d5fb991d3
 SHA1 (patch-src_SmartPtr.hpp) = 91c20832b140d6fa49ddb2a6fa9b616ff7fc565d
diff --git a/www/ap2-suphp/patches/patch-src_IniSection.cpp b/www/ap2-suphp/patches/patch-src_IniSection.cpp
new file mode 100644
index 00000000000..bb910e1595e
--- /dev/null
+++ b/www/ap2-suphp/patches/patch-src_IniSection.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_IniSection.cpp,v 1.1 2013/05/06 15:02:13 joerg Exp $
+
+--- src/IniSection.cpp.orig	2013-05-04 14:22:11.000000000 +0000
++++ src/IniSection.cpp
+@@ -36,8 +36,8 @@ void suPHP::IniSection::putValue(const s
+ const std::vector<std::string> suPHP::IniSection::getValues(const std::string& key) const
+     throw (KeyNotFoundException) {
+     std::vector<std::string> values;
+-    std::pair<std::multimap<const std::string, const std::string>::const_iterator, std::multimap<const std::string, const std::string>::const_iterator> range = this->entries.equal_range(key);
+-    for (std::multimap<const std::string, const std::string>::const_iterator pos = 
++    std::pair<std::multimap<std::string, std::string>::const_iterator, std::multimap<std::string, std::string>::const_iterator> range = this->entries.equal_range(key);
++    for (std::multimap<std::string, std::string>::const_iterator pos = 
+         range.first; pos != range.second; pos++) {
+         values.push_back(pos->second);
+     }
+@@ -62,7 +62,7 @@ std::string suPHP::IniSection::getValue(
+ 
+ const std::vector<std::string> suPHP::IniSection::getKeys() const {
+     std::vector<std::string> keys;
+-    for (std::multimap<const std::string, const std::string>::const_iterator pos =
++    for (std::multimap<std::string, std::string>::const_iterator pos =
+              this->entries.begin();
+          pos != this->entries.end(); pos++) {
+         keys.push_back(pos->first);
diff --git a/www/ap2-suphp/patches/patch-src_IniSection.hpp b/www/ap2-suphp/patches/patch-src_IniSection.hpp
new file mode 100644
index 00000000000..701b197616f
--- /dev/null
+++ b/www/ap2-suphp/patches/patch-src_IniSection.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_IniSection.hpp,v 1.1 2013/05/06 15:02:14 joerg Exp $
+
+--- src/IniSection.hpp.orig	2013-05-04 14:21:17.000000000 +0000
++++ src/IniSection.hpp
+@@ -40,7 +40,7 @@ namespace suPHP {
+      */
+     class IniSection {
+     private:
+-        std::multimap<const std::string, const std::string> entries;
++        std::multimap<std::string, std::string> entries;
+         void putValue(const std::string key, const std::string value);
+         void removeValues(const std::string& key);
+