5 files changed, 76 insertions, 2 deletions
diff --git a/dev-ml/ocaml-mysql/ChangeLog b/dev-ml/ocaml-mysql/ChangeLog
index 0fd779ace74f..7a45cf411d72 100644
--- a/dev-ml/ocaml-mysql/ChangeLog
+++ b/dev-ml/ocaml-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocaml-mysql
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.1 2005/02/06 16:20:11 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.2 2005/06/02 15:11:54 mattam Exp $
+
+*ocaml-mysql-1.0.3-r1 (02 Jun 2005)
+
+  02 Jun 2005; Matthieu Sozeau <mattam@gentoo.org>
+  +files/ocaml-mysql-1.0.3-shtool.patch, +ocaml-mysql-1.0.3-r1.ebuild:
+  Fixes security bug in shtool (see bug #93784).
 
 *ocaml-mysql-1.0.3 (06 Feb 2005)
 
diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest
index ad8995676e58..edb02ff48d4b 100644
--- a/dev-ml/ocaml-mysql/Manifest
+++ b/dev-ml/ocaml-mysql/Manifest
@@ -1,5 +1,8 @@
+MD5 46dd087f07d4429af853bc66862b44ce ocaml-mysql-1.0.3-r1.ebuild 897
 MD5 53f858c3c552a4aaaab3c9a82ab1031b ocaml-mysql-1.0.3.ebuild 849
-MD5 b0ec731acc9640762319f5d7316f548f ChangeLog 467
+MD5 8fa29bb308d9da2c80f8ec7d70397ab8 ChangeLog 676
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
+MD5 d136e53521c22eb8b9f2987dfd19163d files/ocaml-mysql-1.0.3-shtool.patch 744
 MD5 000615b1a5a0999a580efdd6dadad829 files/ocaml-mysql-1.0.3-head.patch 1635
 MD5 d6862e23b576fefef089e739a132cd16 files/digest-ocaml-mysql-1.0.3 69
+MD5 d6862e23b576fefef089e739a132cd16 files/digest-ocaml-mysql-1.0.3-r1 69
diff --git a/dev-ml/ocaml-mysql/files/digest-ocaml-mysql-1.0.3-r1 b/dev-ml/ocaml-mysql/files/digest-ocaml-mysql-1.0.3-r1
new file mode 100644
index 000000000000..b6a1e1190087
--- /dev/null
+++ b/dev-ml/ocaml-mysql/files/digest-ocaml-mysql-1.0.3-r1
@@ -0,0 +1 @@
+MD5 3254be1cb6ef8801701a5628e60cfee4 ocaml-mysql-1.0.3.tar.gz 111574
diff --git a/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool.patch b/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool.patch
new file mode 100644
index 000000000000..115629468bc2
--- /dev/null
+++ b/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool.patch
@@ -0,0 +1,26 @@
+--- sh.common.orig	2004-04-07 08:50:21.000000000 +0100
++++ sh.common	2005-05-29 20:39:20.854878600 +0100
+@@ -168,7 +168,13 @@
+     else
+         tmpdir="/tmp"
+     fi
+-    tmpfile="$tmpdir/.shtool.$$"
++    if mkdir "$tmpdir/.shtool.$$"; then
++        tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
++	else
++        echo "$msgprefix:Error: failed to create temporary file" 1>&2
++        exit 1
++    fi
++    tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
+     rm -f $tmpfile >/dev/null 2>&1
+     touch $tmpfile
+     chmod 600 $tmpfile
+@@ -188,7 +194,7 @@
+ shtool_exit () {
+     rc="$1"
+     if [ ".$gen_tmpfile" = .yes ]; then
+-        rm -f $tmpfile >/dev/null 2>&1 || true
++        rm -fr "$tmpdir/.shtool.$$" >/dev/null 2>&1 || true
+     fi
+     exit $rc
+ }
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..d665deaff73a
--- /dev/null
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild,v 1.1 2005/06/02 15:11:54 mattam Exp $
+
+inherit findlib eutils
+
+IUSE="doc"
+
+DESCRIPTION="A package for ocaml that provides access to mysql databases."
+SRC_URI="http://raevnos.pennmush.org/code/${PN}/${P}.tar.gz"
+HOMEPAGE="http://raevnos.pennmush.org/code/ocaml-mysql/index.html"
+
+DEPEND=">=dev-lang/ocaml-3.06
+	>=dev-db/mysql-4.0.12"
+
+RDEPEND="$DEPEND"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="x86 ppc"
+
+src_compile()
+{
+	epatch ${FILESDIR}/${P}-head.patch
+	epatch ${FILESDIR}/${P}-shtool.patch
+	econf || die "configure failed"
+	make all || die "make failed"
+	make opt
+}
+
+src_install()
+{
+	findlib_src_preinst
+	make install || die
+
+	( use doc ) && dohtml -r doc/html/*
+	dodoc META COPYING CHANGES README VERSION
+}