[gentoo-commits] gentoo-x86 commit in net-dns/pdns/files: pdns-3.2-lib_lua.patch pdns-3.2-fix-autoconf.patch pdns-3.2-fix-curl-link.patch pdns-3.2-fix-conditional-polarssl.patch

[Tiziano Mueller (dev-zero)]

dev-zero    13/05/20 19:05:48

  Added:                pdns-3.2-lib_lua.patch pdns-3.2-fix-autoconf.patch
                        pdns-3.2-fix-curl-link.patch
                        pdns-3.2-fix-conditional-polarssl.patch
  Log:
  Version bump (bug #456412), add support for using botan or crypto++ as well as lua-, odbc-, remote-, mydns and tinydns-backends. Fixed a lot of build issues in the build-system and depend on in-tree version of PolarSSL instead of the bundled one.
  
  (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

Revision  Changes    Path
1.1                  net-dns/pdns/files/pdns-3.2-lib_lua.patch

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

Index: pdns-3.2-lib_lua.patch
===================================================================
diff --git a/modules/luabackend/Makefile.am b/modules/luabackend/Makefile.am
index a2374bd..1c7bd9a 100644
--- a/modules/luabackend/Makefile.am
+++ b/modules/luabackend/Makefile.am
@@ -1,7 +1,7 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@
 EXTRA_DIST=OBJECTFILES OBJECTLIBS 
 
-INCLUDES=-I/usr/include/lua5.1
+#INCLUDES=-I/usr/include/lua5.1
 #INCLUDES=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT
 
 lib_LTLIBRARIES = libluabackend.la
@@ -9,5 +9,6 @@ lib_LTLIBRARIES = libluabackend.la
 libluabackend_la_SOURCES=luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \
 	lua_functions.hh 
 
-libluabackend_la_LDFLAGS=-module -avoid-version -llua5.1
+libluabackend_la_LDFLAGS=-module -avoid-version
+libluabackend_la_LIBADD=$(LUA_LIBS)
 #-lluajit-5.1



1.1                  net-dns/pdns/files/pdns-3.2-fix-autoconf.patch

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

Index: pdns-3.2-fix-autoconf.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index 1beab82..243b693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl intro
 AC_INIT(pdns/receiver.cc)
 AM_INIT_AUTOMAKE(pdns, 3.2)
 AC_CANONICAL_HOST
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_C_BIGENDIAN 
 AC_PREREQ(2.52)
 : ${CXXFLAGS="-Wall -O2"}
@@ -180,7 +180,7 @@ AC_ARG_WITH([system-polarssl],
  [system_polarssl=$withval],
  [system_polarssl=yes])
 AC_MSG_RESULT($system_polarssl)
-AM_CONDITIONAL(HAVE_LIBPOLARSSL, false)
+AM_CONDITIONAL(HAVE_LIBPOLARSSL, test x$system_polarssl = xyes)
 if test x$system_polarssl = xyes; then
  AC_MSG_CHECKING([PolarSSL version >= 1.1])
  AC_COMPILE_IFELSE(



1.1                  net-dns/pdns/files/pdns-3.2-fix-curl-link.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/pdns/files/pdns-3.2-fix-curl-link.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/pdns/files/pdns-3.2-fix-curl-link.patch?rev=1.1&content-type=text/plain

Index: pdns-3.2-fix-curl-link.patch
===================================================================
diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index a47f8bb..670ecbf 100644
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -10,4 +10,4 @@ lib_LTLIBRARIES = libremotebackend.la
 libremotebackend_la_SOURCES=remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc 
 
 libremotebackend_la_LDFLAGS=-module -avoid-version
-libremotebackend_la_LIBS=$(LIBCURL_LIBS)
+libremotebackend_la_LIBADD=$(LIBCURL_LIBS)



1.1                  net-dns/pdns/files/pdns-3.2-fix-conditional-polarssl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/pdns/files/pdns-3.2-fix-conditional-polarssl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/pdns/files/pdns-3.2-fix-conditional-polarssl.patch?rev=1.1&content-type=text/plain

Index: pdns-3.2-fix-conditional-polarssl.patch
===================================================================
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 8e7a2eb..57b4a90 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -68,8 +68,12 @@ md5.hh signingpipe.cc signingpipe.hh dnslabeltext.cc lua-pdns.cc lua-auth.cc lua
 ednssubnet.cc ednssubnet.hh cachecleaner.hh json.cc json.hh 
 
 #
-pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
+pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
+if HAVE_LIBPOLARSSL
+pdns_server_LDADD= $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+else
 pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+endif
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
@@ -106,7 +110,11 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh
 
 
 pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+if HAVE_LIBPOLARSSL
+pdnssec_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+else
 pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+endif
 
 if BOTAN110
 pdnssec_SOURCES += botan110signers.cc botansigners.cc