[gentoo-commits] gentoo-x86 commit in net-dns/mydns/files: mydns-1.2.8.27-m4.patch mydns-1.2.8.27-gentoo.patch

[gentoo-commits] gentoo-x86 commit in net-dns/mydns/files: mydns-1.2.8.27-m4.patch mydns-1.2.8.27-gentoo.patch

[Markos Chandras (hwoarang)]

hwoarang    11/05/17 16:09:22

  Added:                mydns-1.2.8.27-m4.patch mydns-1.2.8.27-gentoo.patch
  Log:
  Use proper patches. Bug #347485. Thanks to Dries Harnie <botje.linux@gmail.com>
  
  (Portage version: 2.1.9.47/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-dns/mydns/files/mydns-1.2.8.27-m4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/mydns/files/mydns-1.2.8.27-m4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/mydns/files/mydns-1.2.8.27-m4.patch?rev=1.1&content-type=text/plain

Index: mydns-1.2.8.27-m4.patch
===================================================================
--- mydns-1.1.0/m4/mydns.m4.orig	2010-12-01 21:57:52.000000000 +0100
+++ mydns-1.1.0/m4/mydns.m4	2010-12-01 22:07:24.000000000 +0100
@@ -542,46 +542,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_r.so, libmysqlclient_found=yes, libmysqlclient_found=no)
-				if test "$libmysqlclient_found" != yes; then
-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.so, libmysqlclient_found=yes, libmysqlclient_found=no)
-				fi
-				if test "$libmysqlclient_found" != yes; then
-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.a, 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_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)
 	]
 )



1.1                  net-dns/mydns/files/mydns-1.2.8.27-gentoo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/mydns/files/mydns-1.2.8.27-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/mydns/files/mydns-1.2.8.27-gentoo.patch?rev=1.1&content-type=text/plain

Index: mydns-1.2.8.27-gentoo.patch
===================================================================
diff -Naur mydns-1.1.0.orig/doc/Makefile.am mydns-1.1.0/doc/Makefile.am
--- mydns-1.1.0.orig/doc/Makefile.am	2004-02-28 03:28:06.000000000 +0900
+++ mydns-1.1.0/doc/Makefile.am	2008-12-28 09:48:57.000000000 +0900
@@ -33,25 +33,25 @@
 	fi
 
 mydns.8: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 mydnscheck.8: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 mydns.conf.5: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 mydns-conf.8: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 mydnsexport.8: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 mydnsimport.8: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 mydnsptrconvert.8: sedfile ${@:=.in}
-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
 
 html:
 	if [ -x /usr/local/bin/mydns-texi2html ]; then /usr/local/bin/mydns-texi2html mydns.texi; fi
--- mydns-1.2.8/m4/mydns.m4.orig	2009-02-02 14:52:34.000000000 +0100
+++ mydns-1.2.8/m4/mydns.m4	2010-12-01 22:31:20.000000000 +0100
@@ -357,16 +357,12 @@
 					AC_MSG_RESULT([no])
 					if test -z "$PROFILE_ENABLED"; then
 						AC_C_CFLAGS(-finline-functions)
-					else
-						LDFLAGS="$LDFLAGS -static"
 					fi
 				fi
 			], [
 				AC_MSG_RESULT([no])
 				if test -z "$PROFILE_ENABLED"; then
 					AC_C_CFLAGS(-finline-functions)
-				else
-					LDFLAGS="$LDFLAGS -static"
 				fi
 			]
 		)