ports/60289: [Update] Port: dns/mydns

[Alex Dupre]

>Number:         60289
>Category:       ports
>Synopsis:       [Update] Port: dns/mydns
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 15 23:30:19 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Dec 16 03:14:53 CET 2003 alex at armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
Update to 0.10.1 release (contains a security fix).
Tune dependencies.
	
>How-To-Repeat:
	
>Fix:

	

--- mydns.diff begins here ---
diff -ruN mydns.orig/Makefile mydns/Makefile
--- mydns.orig/Makefile	Tue Dec 16 08:09:24 2003
+++ mydns/Makefile	Tue Dec 16 08:22:53 2003
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.10.0
-PORTREVISION=	3
+PORTVERSION=	0.10.1
+PORTREVISION=	0
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
@@ -28,8 +28,6 @@
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
-.include <bsd.port.pre.mk>
-
 .if defined (WITH_ALIAS)
 CONFIGURE_ARGS+=--enable-alias
 .endif
@@ -39,19 +37,13 @@
 .endif
 
 .if defined (WITH_PGSQL)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=--without-mysql
 PKGNAMESUFFIX=	-pg
 .else
 CONFIGURE_ARGS+=--without-pgsql
 PKGNAMESUFFIX=	-mysql
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)
-LIB_DEPENDS+=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
-.else
-LIB_DEPENDS+=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.endif
+USE_MYSQL=	yes
 .endif
 
 pre-fetch:
@@ -60,7 +52,7 @@
 	@${ECHO} ""
 	@${ECHO} "      WITH_PGSQL=yes          Build with PostgreSQL support"
 	@${ECHO} "      WITH_ALIAS=yes          Enable server side aliases"
-	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL"
+	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL)"
 	@${ECHO} ""
 
 post-install:
@@ -78,4 +70,4 @@
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
 	@${SED} -e 's,%%%PREFIX%%%,${PREFIX},g' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN mydns.orig/distinfo mydns/distinfo
--- mydns.orig/distinfo	Tue Dec 16 08:09:24 2003
+++ mydns/distinfo	Tue Dec 16 08:10:27 2003
@@ -1 +1 @@
-MD5 (mydns-0.10.0.tar.bz2) = 4791990d1017fa85461dcc9fa31089f7
+MD5 (mydns-0.10.1.tar.bz2) = a931f7fdd3398dbd441ef8cce12793c6
diff -ruN mydns.orig/files/patch-src::mydns::conf.c mydns/files/patch-src::mydns::conf.c
--- mydns.orig/files/patch-src::mydns::conf.c	Tue Dec 16 08:09:24 2003
+++ mydns/files/patch-src::mydns::conf.c	Tue Dec 16 08:16:27 2003
@@ -1,11 +1,11 @@
---- src/mydns/conf.c.orig	Fri Nov 28 12:04:45 2003
-+++ src/mydns/conf.c	Fri Nov 28 12:04:58 2003
-@@ -351,7 +351,7 @@
+--- src/mydns/conf.c.orig	Fri Dec 12 06:02:22 2003
++++ src/mydns/conf.c	Tue Dec 16 08:16:03 2003
+@@ -429,7 +429,7 @@
  
  	/* Set additional where clauses if provided */
  	mydns_set_soa_where_clause(conf_get(&Conf, "soa-where", NULL));
 -	mydns_set_rr_where_clause(conf_get(&Conf, "soa-where", NULL));
 +	mydns_set_rr_where_clause(conf_get(&Conf, "rr-where", NULL));
- }
- /*--- load_config() -----------------------------------------------------------------------------*/
  
+ 	/* Set recursive server if specified */
+ 	conf_set_recursive();
--- mydns.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: