Version bump, fixed security bug 119548.

(Portage version: 2.0.54)

5 files changed, 185 insertions, 13 deletions

diff --git a/net-dns/mydns/ChangeLog b/net-dns/mydns/ChangeLog
index 78860f0c07cf..e2db921264d0 100644
--- a/net-dns/mydns/ChangeLog
+++ b/net-dns/mydns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/mydns
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.13 2005/11/05 06:34:48 matsuu Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.14 2006/01/22 04:12:37 matsuu Exp $
+
+*mydns-1.1.0 (22 Jan 2006)
+
+  22 Jan 2006; MATSUU Takuto <matsuu@gentoo.org> +mydns-1.1.0.ebuild:
+  Version bump , fixed security bug 119548.
+  Added mysql_config support, bug 119111.
 
   05 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> mydns-1.0.0.ebuild:
   Stable on x86.
diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index a33e8dc40935..de3d9c1597a8 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 197d6b78d2fe4efc575597f9957f8b84 ChangeLog 1908
+MD5 bc57df925963e6edba93bb245d999324 ChangeLog 2105
 MD5 23af670a16b78f2ed91017e898efa177 files/digest-mydns-0.11.0 65
 MD5 9d4a562f99499ac86ee42d360e55b4d8 files/digest-mydns-1.0.0 64
+MD5 2e5710abe63e66ba058b8cab7a3c7fa7 files/digest-mydns-1.1.0 64
+MD5 c6cef0bb5a9e48f0afcc4496a4c799bf files/mydns-1.1.0-m4.patch 3055
 MD5 38219cb6d2a256e9fbe8fbac5a0a01d6 files/mydns.rc6 903
 MD5 4c0162b2fafe950563e223e5a939c5c7 files/mydns.rc6-0.11.0 763
 MD5 c50346bf0fb8b39c521dca42b145f6ee metadata.xml 230
 MD5 80e9ef6371c327c8784736f7cfdbba9f mydns-0.11.0.ebuild 2148
 MD5 22250bac26f3f000198d9016dfd9c935 mydns-1.0.0.ebuild 2140
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDkftNgIKl8Uu19MoRAjXxAJ0WHbpp1VldIcLP4CYDWkUipssLcACeK97n
-2hYNcMVGhQmv2Dpd/eLeT94=
-=CzS+
------END PGP SIGNATURE-----
+MD5 f8aa042af796e16f6260c7a96be1cd37 mydns-1.1.0.ebuild 2251
diff --git a/net-dns/mydns/files/digest-mydns-1.1.0 b/net-dns/mydns/files/digest-mydns-1.1.0
new file mode 100644
index 000000000000..2d907495ee6d
--- /dev/null
+++ b/net-dns/mydns/files/digest-mydns-1.1.0
@@ -0,0 +1 @@
+MD5 c613a14686f08486d444cee2d68f9c87 mydns-1.1.0.tar.bz2 573261
diff --git a/net-dns/mydns/files/mydns-1.1.0-m4.patch b/net-dns/mydns/files/mydns-1.1.0-m4.patch
new file mode 100644
index 000000000000..c8f86dff1bb2
--- /dev/null
+++ b/net-dns/mydns/files/mydns-1.1.0-m4.patch
@@ -0,0 +1,81 @@
+diff -Naur mydns-1.1.0.orig/m4/mydns.m4 mydns-1.1.0/m4/mydns.m4
+--- mydns-1.1.0.orig/m4/mydns.m4	2006-01-19 07:08:14.000000000 +0900
++++ mydns-1.1.0/m4/mydns.m4	2006-01-22 13:09:39.000000000 +0900
+@@ -517,47 +517,10 @@
+ ##
+ AC_DEFUN([AC_LIB_MYSQLCLIENT],
+ 	[
+-		libmysqlclient_dirs="/usr/local/mysql/lib /usr/local/lib/mysql /usr/local/lib /usr/lib/mysql /usr/lib /lib"
+-		AC_ARG_WITH(mysql-lib,
+-			AC_HELP_STRING([--with-mysql-lib=DIR], [look for the MySQL client library in DIR]),
+-			libmysqlclient_dirs="$withval $libmysqlclient_dirs")
+-		libmysqlclient_found=no, libmysqlclient_ok=no
+-		for libmysqlclient_dir in $libmysqlclient_dirs; do
+-			if test "$libmysqlclient_found" != yes; then
+-				AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.a, libmysqlclient_found=yes, libmysqlclient_found=no)
+-				if test "$libmysqlclient_found" != yes; then
+-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.so.10, libmysqlclient_found=yes, libmysqlclient_found=no)
+-				fi
+-				if test "$libmysqlclient_found" != yes; then
+-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.so.12, libmysqlclient_found=yes, libmysqlclient_found=no)
+-				fi
+-				if test "$libmysqlclient_found" = yes; then
+-					## libmysqlclient depends on libz
+-					if ! test -n "$LIBZ"; then
+-						AC_LIB_Z
+-					fi
+-					if ! test -n "$LIBZ"; then
+-						## No zlib
+-						AC_MSG_ERROR([
+-
+-][  ###
+-][  ###  zlib compression library (libz.a) not found.
+-][  ###
+-][  ###  Please download and install the zlib compression
+-][  ###  library from the following URL:
+-][  ###
+-][  ###       http://www.gzip.org/zlib/
+-][  ###
+-][  ###  (Error detail might be available in `config.log')
+-][  ###
+-])
+-     				fi
+-					LIBMYSQLCLIENT="-L$libmysqlclient_dir -lmysqlclient"
+-					#LIBMYSQLCLIENT="$libmysqlclient_dir/libmysqlclient.a"
+-					libmysqlclient_found=yes
+-				fi
+-			fi
+-		done
++		AC_CHECK_PROG(LIBMYSQLCLIENT,mysql_config,`mysql_config --libs`)
++		if test -z "$LIBMYSQLCLIENT"; then
++			AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
++		fi
+ 		AC_SUBST(LIBMYSQLCLIENT)
+ 	]
+ )
+@@ -567,21 +530,10 @@
+ ##
+ AC_DEFUN([AC_HEADER_MYSQL],
+ 	[
+-		ac_mydns_header_dirs="/usr/include /usr/include/mysql /usr/local/include \
+-									 /usr/local/include/mysql /usr/local/mysql/include"
+-		ac_mydns_header_found=no, ac_mydns_header_ok=no
+-		AC_ARG_WITH(mysql-include,
+-			AC_HELP_STRING([--with-mysql-include=DIR],
+-								[look for MySQL include files in DIR]),
+-			ac_mydns_header_dirs="$withval $ac_mydns_header_dirs")
+-		for dir in $ac_mydns_header_dirs
+-		do
+-			if test "$ac_mydns_header_found" != yes
+-			then
+-				AC_CHECK_FILE($dir/mysql.h, ac_mydns_header_found=yes, ac_mydns_header_found=no)
+-				test "$ac_mydns_header_found" = yes && MYSQL_INCLUDE="-I$dir"
+-			fi
+-		done
++		AC_CHECK_PROG(MYSQL_INCLUDE,mysql_config,`mysql_config --include`)
++		if test -z "$MYSQL_INCLUDE"; then
++			AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql headers are installed])
++		fi
+ 		AC_SUBST(MYSQL_INCLUDE)
+ 	]
+ )
diff --git a/net-dns/mydns/mydns-1.1.0.ebuild b/net-dns/mydns/mydns-1.1.0.ebuild
new file mode 100644
index 000000000000..47b56b8ac5cc
--- /dev/null
+++ b/net-dns/mydns/mydns-1.1.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-1.1.0.ebuild,v 1.1 2006/01/22 04:12:37 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="A DNS-Server which gets its data from mysql-databases"
+HOMEPAGE="http://mydns.bboy.net/"
+SRC_URI="http://mydns.bboy.net/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="debug mysql nls postgres ssl static zlib"
+
+RDEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )
+	|| (
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql )
+		!postgres? ( dev-db/mysql )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	autoconf || die
+}
+
+src_compile() {
+	local myconf
+
+	if use mysql || ! use postgres; then
+		myconf="${myconf} --with-mysql"
+	else
+		myconf="${myconf} --without-mysql --with-pgsql"
+	fi
+
+	econf --enable-alias \
+		`use_enable nls` \
+		`use_enable debug` \
+		`use_enable static static-build` \
+		`use_with ssl openssl` \
+		`use_with zlib` \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+
+	exeinto /etc/init.d; newexe ${FILESDIR}/mydns.rc6 mydns || die
+
+	if use mysql || ! use postgres; then
+		sed -i -e 's/__db__/mysql/g' ${D}/etc/init.d/mydns || die
+		dodoc QUICKSTART.mysql README.mysql
+	else
+		sed -i -e 's/__db__/postgresql/g' ${D}/etc/init.d/mydns || die
+		dodoc QUICKSTART.postgres
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You should now run these commands:"
+	einfo
+	einfo "# /usr/sbin/mydns --dump-config > /etc/mydns.conf"
+	einfo "# chmod 0600 /etc/mydns.conf"
+	if use mysql || ! use postgres; then
+		einfo "# mysqladmin -u <useruname> -p create mydns"
+		einfo "# /usr/sbin/mydns --create-tables | mysql -u <username> -p mydns"
+		einfo
+		einfo "to create the tables in the MySQL-Database."
+		einfo "For more info see QUICKSTART.mysql."
+	else
+		einfo "# createdb mydns"
+		einfo "# /usr/sbin/mydns --create-tables | psql mydns"
+		einfo
+		einfo "to create the tables in the PostgreSQL-Database."
+		einfo "For more info see QUICKSTART.postgres."
+	fi
+	einfo
+}