diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2006-11-28 20:50:38 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2006-11-28 20:50:38 +0000 |
| commit | c82a814f99772c0a0b67b6a7c366e81890462770 (patch) | |
| tree | 7ebd45861959adbaf55d23f003d16acf6b6a537e /dev-db/mysql++/files | |
| parent | stable x86, security bug #154650 (diff) | |
| download | gentoo-2-c82a814f99772c0a0b67b6a7c366e81890462770.tar.gz gentoo-2-c82a814f99772c0a0b67b6a7c366e81890462770.tar.bz2 gentoo-2-c82a814f99772c0a0b67b6a7c366e81890462770.zip | |
My first patch broke the ABI, which is bad. Fix it.
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'dev-db/mysql++/files')
| -rw-r--r-- | dev-db/mysql++/files/digest-mysql++-2.1.1-r2 | 3 | ||||
| -rw-r--r-- | dev-db/mysql++/files/mysql++-signed-char-fix-try2.diff | 51 |
2 files changed, 54 insertions, 0 deletions
diff --git a/dev-db/mysql++/files/digest-mysql++-2.1.1-r2 b/dev-db/mysql++/files/digest-mysql++-2.1.1-r2 new file mode 100644 index 000000000000..5fc16a885b3d --- /dev/null +++ b/dev-db/mysql++/files/digest-mysql++-2.1.1-r2 @@ -0,0 +1,3 @@ +MD5 3a42b3422b37c65f88be9162a969d164 mysql++-2.1.1.tar.gz 1855521 +RMD160 bfeeade2be22e761c494e26f46059df2fbc858ac mysql++-2.1.1.tar.gz 1855521 +SHA256 fcd05ac5b4ef0b7b196636907f0ab14860a4b889bd3b3e4f2acc919e2bb05a53 mysql++-2.1.1.tar.gz 1855521 diff --git a/dev-db/mysql++/files/mysql++-signed-char-fix-try2.diff b/dev-db/mysql++/files/mysql++-signed-char-fix-try2.diff new file mode 100644 index 000000000000..2b14a39f66ab --- /dev/null +++ b/dev-db/mysql++/files/mysql++-signed-char-fix-try2.diff @@ -0,0 +1,51 @@ +diff -ru mysql++-2.1.1.orig/lib/qparms.h mysql++-2.1.1/lib/qparms.h +--- mysql++-2.1.1.orig/lib/qparms.h 2006-04-05 06:44:49.000000000 +0200 ++++ mysql++-2.1.1/lib/qparms.h 2006-11-28 21:40:36.000000000 +0100 +@@ -232,7 +232,7 @@ + /// \param b the 'before' value + /// \param o the 'option' value + /// \param n the 'num' value +- SQLParseElement(std::string b, char o, char n) : ++ SQLParseElement(std::string b, char o, signed char n) : + before(b), + option(o), + num(n) +@@ -241,7 +241,7 @@ + + std::string before; ///< string inserted before the parameter + char option; ///< the parameter option, or blank if none +- char num; ///< the parameter position to use ++ signed char num; ///< the parameter position to use + }; + + } // end namespace mysqlpp +diff -ru mysql++-2.1.1.orig/lib/query.cpp mysql++-2.1.1/lib/query.cpp +--- mysql++-2.1.1.orig/lib/query.cpp 2006-04-05 06:44:49.000000000 +0200 ++++ mysql++-2.1.1/lib/query.cpp 2006-11-28 21:40:52.000000000 +0100 +@@ -185,7 +185,7 @@ + else { + num[1] = 0; + } +- short int n = atoi(num); ++ signed char n = atoi(num); + + // Look for option character following position value. + char option = ' '; +@@ -220,7 +220,7 @@ + } + + // Finished parsing parameter; save it. +- parse_elems_.push_back(SQLParseElement(str, option, char(n))); ++ parse_elems_.push_back(SQLParseElement(str, option, n)); + str = ""; + name = ""; + } +@@ -304,7 +304,7 @@ + { + sbuffer_.str(""); + +- char num; ++ signed char num; + SQLString* ss; + SQLQueryParms* c; + |