Attachment 148531 Details for Bug 194505 – Fix check-plist and add missing luabackend patches

[patch] Fix check-plist and add missing luabackend patches

powerdns-3.4.0.patch (text/plain), 2.85 KB, created by Ralf van der Enden on 2014-10-21 08:02:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2014-10-21 08:02:13 UTC

Size: 2.85 KB

patch

obsolete

>Default diff mode is GIT
>===> Updating from git
>Already up-to-date.
>===> Generating patch
>===> Viewing diff with more
>diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
>index 7d1f6bdd..bae3d0a 100644
>--- a/dns/powerdns/Makefile
>+++ b/dns/powerdns/Makefile
>@@ -25,6 +25,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--disable-static \
> 		--with-modules="" \
> 		--with-dynmodules="pipe bind ${MODULES}" \
>+		--docdir="${PREFIX}/share/doc/powerdns" \
> 		--sysconfdir="${PREFIX}/etc/pdns" \
> 		--with-boost="${LOCALBASE}"
> SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
>@@ -32,7 +33,6 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
> 		MKDIR="${MKDIR}" \
> 		DISTNAME="${DISTNAME}" \
> 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
>-# DOCSDIR=	${PREFIX}/share/doc/pdns
> 
> SUB_FILES=	pkg-message
> 
>@@ -60,7 +60,7 @@ REMOTE_DESC=		Remote backend
> TINYDNS_DESC=		TinyDNS backend
> TOOLS_DESC=		Build extra tools
> 
>-OPTIONS_DEFAULT=	PGSQLDB DNSSEC BOTAN110 POLARSSL
>+OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
> 
> OPTIONS_SUB=	yes
> 
>diff --git a/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc b/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc
>index e69de29..fcb8790 100644
>--- a/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc
>+++ b/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc
>@@ -0,0 +1,18 @@
>+--- modules/luabackend/lua_functions.cc.orig	2014-09-23 06:27:34 UTC
>++++ modules/luabackend/lua_functions.cc
>+@@ -238,6 +238,7 @@
>+   return ret;
>+ }
>+ 
>++#ifndef __i386__
>+ bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, time_t& value) {
>+   lua_pushstring(lua, key.c_str()); 
>+   lua_gettable(lua, -2);  
>+@@ -253,6 +254,7 @@
>+   
>+   return ret;
>+ }
>++#endif
>+ 
>+ bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value) {
>+   lua_pushstring(lua, key.c_str()); 
>diff --git a/dns/powerdns/files/patch-modules__luabackend__luabackend.hh b/dns/powerdns/files/patch-modules__luabackend__luabackend.hh
>index e69de29..df2fb1d 100644
>--- a/dns/powerdns/files/patch-modules__luabackend__luabackend.hh
>+++ b/dns/powerdns/files/patch-modules__luabackend__luabackend.hh
>@@ -0,0 +1,12 @@
>+--- modules/luabackend/luabackend.hh.orig	2014-09-23 06:27:34 UTC
>++++ modules/luabackend/luabackend.hh
>+@@ -155,7 +155,9 @@
>+ //  FUNCTIONS TO THIS BACKEND
>+     bool getValueFromTable(lua_State *lua, const std::string& key, string& value);
>+     bool getValueFromTable(lua_State *lua, uint32_t key, string& value);
>++#ifndef __i386__
>+     bool getValueFromTable(lua_State *lua, const std::string& key, time_t& value);
>++#endif
>+     bool getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value);
>+     bool getValueFromTable(lua_State *lua, const std::string& key, uint16_t& value);
>+     bool getValueFromTable(lua_State *lua, const std::string& key, int& value);
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 194505: 148531 | 148532