Browse Source
Merge pull request #9983 from James-TR/pdns-4.2.0-bump
pdns: bump version to 4.2.0lilik-openwrt-22.03
Rosen Penev
5 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 105 additions and 218 deletions
Split View
Diff Options
-
+43 -12net/pdns/Makefile
-
+48 -23net/pdns/files/pdns.conf-dist
-
+0 -60net/pdns/patches/100-lua-hpp.patch
-
+14 -5net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch
-
+0 -34net/pdns/patches/300-libatomic-detect.patch
-
+0 -43net/pdns/patches/400-gen-version.patch
-
+0 -41net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch
+ 43
- 12
net/pdns/Makefile
View File
+ 48
- 23
net/pdns/files/pdns.conf-dist
View File
+ 0
- 60
net/pdns/patches/100-lua-hpp.patch
View File
| @ -1,60 +0,0 @@ | |||
| --- a/pdns/Makefile.am | |||
| +++ b/pdns/Makefile.am | |||
| @@ -54,7 +54,8 @@ | |||
| bindparser.h \ | |||
| named.conf.parsertest \ | |||
| delaypipe.hh delaypipe.cc \ | |||
| - pdns.service.in | |||
| + pdns.service.in \ | |||
| + lua_hpp.mk | |||
| BUILT_SOURCES = \ | |||
| bind-dnssec.schema.sqlite3.sql.h \ | |||
| @@ -109,6 +108,12 @@ | |||
| endif | |||
| +if !HAVE_LUA_HPP | |||
| +BUILT_SOURCES += lua.hpp | |||
| +nodist_pdns_server_SOURCES = lua.hpp | |||
| +CLEANFILES += lua.hpp | |||
| +endif | |||
| + | |||
| EXTRA_PROGRAMS = \ | |||
| calidns \ | |||
| comfun \ | |||
| @@ -1303,3 +1305,7 @@ | |||
| pdns.service \ | |||
| pdns@.service | |||
| endif | |||
| + | |||
| +if !HAVE_LUA_HPP | |||
| +include lua_hpp.mk | |||
| +endif | |||
| --- /dev/null | |||
| +++ b/pdns/lua_hpp.mk | |||
| @@ -0,0 +1,6 @@ | |||
| +lua.hpp: | |||
| + $(AM_V_GEN)echo 'extern "C" {' > $@ | |||
| + @echo '#include "lua.h"' >> $@ | |||
| + @echo '#include "lualib.h"' >> $@ | |||
| + @echo '#include "lauxlib.h"' >> $@ | |||
| + @echo '}' >> $@ | |||
| --- a/modules/luabackend/Makefile.am | |||
| +++ b/modules/luabackend/Makefile.am | |||
| @@ -15,5 +15,15 @@ | |||
| slave.cc \ | |||
| supermaster.cc | |||
| +if !HAVE_LUA_HPP | |||
| +BUILT_SOURCES = lua.hpp | |||
| +nodist_libluabackend_la_SOURCES = lua.hpp | |||
| +CLEANFILES = lua.hpp | |||
| +endif | |||
| + | |||
| libluabackend_la_LDFLAGS = -module -avoid-version | |||
| libluabackend_la_LIBADD = $(LUA_LIBS) | |||
| + | |||
| +if !HAVE_LUA_HPP | |||
| +include ../../pdns/lua_hpp.mk | |||
| +endif | |||
net/pdns/patches/200-pdns-disable-pdns.conf-dist.patch → net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch
View File
+ 0
- 34
net/pdns/patches/300-libatomic-detect.patch
View File
| @ -1,34 +0,0 @@ | |||
| --- a/m4/pdns_check_os.m4 | |||
| +++ b/m4/pdns_check_os.m4 | |||
| @@ -35,16 +35,21 @@ | |||
| AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"]) | |||
| AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"]) | |||
| - case "$host" in | |||
| - mips* | powerpc-* ) | |||
| - AC_MSG_CHECKING([whether the linker accepts -latomic]) | |||
| - LDFLAGS="-latomic $LDFLAGS" | |||
| - AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])], | |||
| - [AC_MSG_RESULT([yes])], | |||
| - [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])] | |||
| - ) | |||
| - ;; | |||
| - esac | |||
| + AC_MSG_CHECKING([whether -latomic is needed for __atomic builtins]) | |||
| + AC_LINK_IFELSE( | |||
| + [AC_LANG_PROGRAM([[#include <stdint.h>]], | |||
| + [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]] | |||
| + )], | |||
| + [AC_MSG_RESULT([no])], | |||
| + [LIBS="$LIBS -latomic" | |||
| + AC_LINK_IFELSE( | |||
| + [AC_LANG_PROGRAM([[#include <stdint.h>]], | |||
| + [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]] | |||
| + )], | |||
| + [AC_MSG_RESULT([yes])], | |||
| + [AC_MSG_FAILURE([libatomic needed, but linking with -latomic failed, cannot continue])] | |||
| + )] | |||
| + ) | |||
| AC_SUBST(THREADFLAGS) | |||
| AC_SUBST([DYNLINKFLAGS], [-export-dynamic]) | |||
+ 0
- 43
net/pdns/patches/400-gen-version.patch
View File
| @ -1,43 +0,0 @@ | |||
| --- a/build-aux/gen-version | |||
| +++ b/build-aux/gen-version | |||
| @@ -1,39 +1,4 @@ | |||
| #!/bin/sh | |||
| -VERSION="unknown" | |||
| - | |||
| -DIRTY="" | |||
| -git status | grep -q clean || DIRTY='.dirty' | |||
| - | |||
| -# Special environment variable to signal that we are building a release, as this | |||
| -# has consequences for the version number. | |||
| -if [ "${IS_RELEASE}" = "YES" ]; then | |||
| - TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)" | |||
| - if [ -n "${TAG}" ]; then | |||
| - # We're on a tag | |||
| - echo "${TAG}${DIRTY}" > .version | |||
| - printf "${TAG}${DIRTY}" | |||
| - exit 0 | |||
| - fi | |||
| - echo 'This is not a tag, either tag this commit or do not set $IS_RELEASE' >&2 | |||
| - exit 1 | |||
| -fi | |||
| - | |||
| -# | |||
| -# Generate the version number based on the branch | |||
| -# | |||
| -if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then | |||
| - if $(git rev-parse --abbrev-ref HEAD | grep -q 'rel/'); then | |||
| - REL_TYPE="$(git rev-parse --abbrev-ref HEAD | cut -d/ -f 2 | cut -d- -f 1)" | |||
| - VERSION="$(git describe --match=${REL_TYPE}-* --tags --dirty=.dirty | cut -d- -f 2-)" | |||
| - else | |||
| - GIT_VERSION=$(git show --no-patch --format=format:%h HEAD) | |||
| - BRANCH=".$(git rev-parse --abbrev-ref HEAD | perl -p -e 's/[^[:alnum:]]//g;')" | |||
| - [ "${BRANCH}" = ".master" ] && BRANCH='' | |||
| - VERSION="0.0${BRANCH}.${PDNS_BUILD_NUMBER}g${GIT_VERSION}${DIRTY}" | |||
| - fi | |||
| - echo "$VERSION" > .version | |||
| -elif [ -f .version ]; then | |||
| - VERSION="$(cat .version)" | |||
| -fi | |||
| +VERSION="$(cat .version)" | |||
| printf $VERSION | |||
+ 0
- 41
net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch
View File
| @ -1,41 +0,0 @@ | |||
| From 7ac0df2a59ddd6e92ede2bca590ec0c76eb67559 Mon Sep 17 00:00:00 2001 | |||
| From: James Taylor <james@jtaylor.id.au> | |||
| Date: Tue, 25 Jun 2019 19:33:04 +1000 | |||
| Subject: [PATCH] auth: make sure we really are using glibc | |||
| Make sure we're using glibc and not uclibc pretending to be glibc | |||
| --- | |||
| pdns/receiver.cc | 6 +++--- | |||
| 1 file changed, 3 insertions(+), 3 deletions(-) | |||
| diff --git a/pdns/receiver.cc b/pdns/receiver.cc | |||
| index e6686787b3..209db7af89 100644 | |||
| --- a/pdns/receiver.cc | |||
| +++ b/pdns/receiver.cc | |||
| @@ -354,7 +354,7 @@ static int guardian(int argc, char **argv) | |||
| } | |||
| } | |||
| -#ifdef __GLIBC__ | |||
| +#if defined(__GLIBC__) && !defined(__UCLIBC__) | |||
| #include <execinfo.h> | |||
| static void tbhandler(int num) | |||
| { | |||
| @@ -386,7 +386,7 @@ int main(int argc, char **argv) | |||
| s_programname="pdns"; | |||
| s_starttime=time(0); | |||
| -#ifdef __GLIBC__ | |||
| +#if defined(__GLIBC__) && !defined(__UCLIBC__) | |||
| signal(SIGSEGV,tbhandler); | |||
| signal(SIGFPE,tbhandler); | |||
| signal(SIGABRT,tbhandler); | |||
| @@ -450,7 +450,7 @@ int main(int argc, char **argv) | |||
| // we really need to do work - either standalone or as an instance | |||
| -#ifdef __GLIBC__ | |||
| +#if defined(__GLIBC__) && !defined(__UCLIBC__) | |||
| if(!::arg().mustDo("traceback-handler")) { | |||
| g_log<<Logger::Warning<<"Disabling traceback handler"<<endl; | |||
| signal(SIGSEGV,SIG_DFL); | |||