summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Chvátal <scarabeus@gentoo.org>2011-01-24 14:29:22 +0100
committerTomáš Chvátal <scarabeus@gentoo.org>2011-01-24 14:29:22 +0100
commit303fab3c275e48c07f0f81cadb2e7c8f880304a1 (patch)
treed127e823ea1d4b6b536e2b01124b3926e997b0aa
parent[dev-db/pgpool2] pgpool2 initial commit for ccss.cz (diff)
downloadscarabeus-303fab3c275e48c07f0f81cadb2e7c8f880304a1.tar.gz
scarabeus-303fab3c275e48c07f0f81cadb2e7c8f880304a1.tar.bz2
scarabeus-303fab3c275e48c07f0f81cadb2e7c8f880304a1.zip
[dev-db/pgpool2] Fix md5 malloc segfault
-rw-r--r--dev-db/pgpool2/Manifest3
-rw-r--r--dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch12
-rw-r--r--dev-db/pgpool2/pgpool2-3.0.1.ebuild1
3 files changed, 15 insertions, 1 deletions
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 46532f5..42fd76f 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,5 +1,6 @@
+AUX 3.0.1-fix_md5_malloc.patch 481 RMD160 6b1ad6d1202d14ea08b2e5088838e2c59ba06359 SHA1 2afb8feb36ae6dbe7ebcbfe00a4e245e6a376f61 SHA256 7de41b015436367e25a4cf4b2da792e0b0543ce766e85ca2c008eab78920da79
AUX pgpool2-tmpdir.patch 1806 RMD160 cfe4b124726f612953152c7cc40d028d8fef7800 SHA1 2dafdc37a24318b99bcdf8f983f12d048d8fd7f0 SHA256 431996a2d2e9acf99511c0315b51e478809b3b16818aefaf17bd9cb228975f2d
AUX pgpool2.initd 563 RMD160 ac3d50f4a90b6b69bf98ae73a55f4a34d5a30081 SHA1 5d7eced2cbd1a1f1149466ee398e28c774f26d15 SHA256 f8702c560b31110ea1a6581cfe37fe7b5b2fbe8af0188ace0b75e39a0e694aee
DIST pgpool-II-3.0.1.tar.gz 1226151 RMD160 3fa36d1d1d7c66dc6d291ba14905feb01342eb17 SHA1 1c72a271d65bd7b44b473b5020746808a056bf3d SHA256 3adfa1f92dee238abec2dd6880985da99b1e2d862e567994e9e2f2736a872ae0
-EBUILD pgpool2-3.0.1.ebuild 1213 RMD160 69c7c3fb32cbc925826bdb334183b8eb28eec9ea SHA1 02069533be95e0411bedf0246f35b3fe9374e8be SHA256 2219de2e46e5876d9f4e5e114291b36501b868bda41e1642e2991270d35ada5d
+EBUILD pgpool2-3.0.1.ebuild 1255 RMD160 4971a332823e614eed77aa225ab3d245df0bbcea SHA1 a9e41ba340683b35b1489a321be573f50f4e299d SHA256 157b245833bd4d80366bf9e14c8110d3ce991bd2c1414fb9a16d17ae51fba33d
MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch b/dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch
new file mode 100644
index 0000000..818b232
--- /dev/null
+++ b/dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch
@@ -0,0 +1,12 @@
+diff -burN pgpool-II-3.0.1/pool_auth.c pgpool-II-3.0.1.new/pool_auth.c
+--- pgpool-II-3.0.1/pool_auth.c 2010-09-28 10:00:48.000000000 +0200
++++ pgpool-II-3.0.1.new/pool_auth.c 2011-01-24 14:12:00.646197002 +0100
+@@ -987,7 +987,7 @@
+
+ backend->auth_kind = 5;
+ backend->pwd_size = ntohl(size) - 4;
+- memcpy(backend->password, password, backend->pwd_size);
++ memcpy(backend->password, password, sizeof(password));
+ memcpy(backend->salt, salt, sizeof(salt));
+ }
+ return kind; \ No newline at end of file
diff --git a/dev-db/pgpool2/pgpool2-3.0.1.ebuild b/dev-db/pgpool2/pgpool2-3.0.1.ebuild
index 43faa9e..cf4937f 100644
--- a/dev-db/pgpool2/pgpool2-3.0.1.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.0.1.ebuild
@@ -29,6 +29,7 @@ AUTOTOOLS_IN_SOURCE_BUILD="1"
PATCHES=(
"${FILESDIR}/${PN}-tmpdir.patch"
+ "${FILESDIR}/${PV}-fix_md5_malloc.patch"
)
DOCS=(