openkylin
/
bind9-libs
mirror of https://gitee.com/openkylin/bind9-libs.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
Lu zhiping 2022-06-04 18:02:44 +08:00
parent e2cd5cdbf6
commit eb049eba8f
11 changed files with 1 additions and 619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
debian/patches/0001-non-linux.diff vendored
View File

@ -1,42 +0,0 @@
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:53 +0000
Subject: _non-linux
FTBFS on kfreebsd, hurd
Addresses-Debian-Bug: 741285, 746540
Signed-off-by: LaMont Jones <lamont@debian.org>
---
configure.ac | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4ab10a0..a599776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,7 +452,7 @@ case "$host" in
# as it breaks how the two halves (Basic and Advanced) of the IPv6
# Socket API were designed to be used but we have to live with it.
# Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
- *-linux* | *-kfreebsd*-gnu*)
+ *-linux* | *-kfreebsd*-gnu* | *-gnu*)
STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
;;
@@ -1370,7 +1370,7 @@ then
# LinuxThreads requires some changes to the way we
# deal with signals.
#
- *-linux*)
+ *-linux*|*-kfreebsd*-gnu)
AC_DEFINE(HAVE_LINUXTHREADS)
;;
#
@@ -2755,7 +2755,6 @@ case "$host" in
;;
*)
AC_CHECK_LIB(socket, socket)
- AC_CHECK_LIB(nsl, inet_addr)
;;
esac

29
debian/patches/0002-multiarch.diff vendored
View File

@ -1,29 +0,0 @@
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:53 +0000
Subject: _multiarch
---
isc-config.sh.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/isc-config.sh.in b/isc-config.sh.in
index a8a0a89..1e7903e 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -13,7 +13,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=
includedir=@includedir@
-libdir=@libdir@
usage()
{
@@ -132,7 +131,7 @@ if test x"$echo_libs" = x"true"; then
if test x"${exec_prefix_set}" = x"true"; then
libs="-L${exec_prefix}/lib"
else
- libs="-L${libdir}"
+ libs=
fi
if test x"$libirs" = x"true" ; then
libs="$libs -lirs"

254
debian/patches/0003-min-cache-ttl.diff vendored
View File

@ -1,254 +0,0 @@
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:54 +0000
Subject: _min-cache-ttl
Add min-cache-ttl and min-ncache-ttl keywords
Sometimes it is useful to set a 'floor' on the TTL for records
to be cached. Some sites like to use ridiculously low TTLs for
some reason, and that often is not compatible with slow links.
Signed-off-by: Michael Milligan <milli@acmeps.com>
Signed-off-by: LaMont Jones <lamont@debian.org>
---
bin/named/config.c | 2 ++
bin/named/server.c | 12 ++++++++++++
bin/tests/named.conf | 2 ++
lib/dns/include/dns/ncache.h | 6 ++++--
lib/dns/include/dns/view.h | 2 ++
lib/dns/ncache.c | 18 ++++++++++++------
lib/dns/resolver.c | 22 ++++++++++++++++------
lib/isccfg/namedconf.c | 2 ++
8 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/bin/named/config.c b/bin/named/config.c
index 53a60d7..ff198e6 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -187,6 +187,8 @@ options {\n\
max-recursion-depth 7;\n\
max-recursion-queries 75;\n\
message-compression yes;\n\
+ min-ncache-ttl 0; /* 0 hours */\n\
+ min-cache-ttl 0; /* 0 seconds */\n\
# min-roots <obsolete>;\n\
minimal-any false;\n\
minimal-responses false;\n\
diff --git a/bin/named/server.c b/bin/named/server.c
index 4300330..1bbdaf9 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3731,6 +3731,18 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
if (view->maxncachettl > 7 * 24 * 3600)
view->maxncachettl = 7 * 24 * 3600;
+ obj = NULL;
+ result = ns_config_get(maps, "min-cache-ttl", &obj);
+ INSIST(result == ISC_R_SUCCESS);
+ view->mincachettl = cfg_obj_asuint32(obj);
+
+ obj = NULL;
+ result = ns_config_get(maps, "min-ncache-ttl", &obj);
+ INSIST(result == ISC_R_SUCCESS);
+ view->minncachettl = cfg_obj_asuint32(obj);
+ if (view->minncachettl > 7 * 24 * 3600)
+ view->minncachettl = 7 * 24 * 3600;
+
/*
* Configure the view's cache.
*
diff --git a/bin/tests/named.conf b/bin/tests/named.conf
index 5673e98..34435b6 100644
--- a/bin/tests/named.conf
+++ b/bin/tests/named.conf
@@ -46,6 +46,7 @@ options {
memstatistics-file "named.memstats"; // _PATH_MEMSTATS
max-cache-ttl 999;
+ min-cache-ttl 666;
auth-nxdomain yes; // always set AA on NXDOMAIN.
// don't set this to 'no' unless
// you know what you're doing -- older
@@ -148,6 +149,7 @@ options {
min-refresh-time 777;
max-ncache-ttl 333;
+ min-ncache-ttl 222;
min-roots 15;
serial-queries 34;
diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index 2942c26..c2e1e7b 100644
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -56,12 +56,14 @@ ISC_LANG_BEGINDECLS
isc_result_t
dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
- dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
+ dns_rdatatype_t covers, isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
dns_rdataset_t *addedrdataset);
isc_result_t
dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache,
dns_dbnode_t *node, dns_rdatatype_t covers,
- isc_stdtime_t now, dns_ttl_t maxttl,
+ isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
bool optout, dns_rdataset_t *addedrdataset);
/*%<
* Convert the authority data from 'message' into a negative cache
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index c849dec..2c69acd 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -153,6 +153,8 @@ struct dns_view {
bool sendcookie;
dns_ttl_t maxcachettl;
dns_ttl_t maxncachettl;
+ dns_ttl_t mincachettl;
+ dns_ttl_t minncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
char *nta_file;
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index d71f0d8..7cfb16e 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -45,7 +45,8 @@
static isc_result_t
addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
- dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
+ dns_rdatatype_t covers, isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
bool optout, bool secure,
dns_rdataset_t *addedrdataset);
@@ -95,26 +96,29 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) {
isc_result_t
dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
- dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
+ dns_rdatatype_t covers, isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
dns_rdataset_t *addedrdataset)
{
- return (addoptout(message, cache, node, covers, now, maxttl,
+ return (addoptout(message, cache, node, covers, now, minttl, maxttl,
false, false, addedrdataset));
}
isc_result_t
dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache,
dns_dbnode_t *node, dns_rdatatype_t covers,
- isc_stdtime_t now, dns_ttl_t maxttl,
+ isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
bool optout, dns_rdataset_t *addedrdataset)
{
- return (addoptout(message, cache, node, covers, now, maxttl,
+ return (addoptout(message, cache, node, covers, now, minttl, maxttl,
optout, true, addedrdataset));
}
static isc_result_t
addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
- dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
+ dns_rdatatype_t covers, isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
bool optout, bool secure,
dns_rdataset_t *addedrdataset)
{
@@ -181,6 +185,8 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
type == dns_rdatatype_nsec3) {
if (ttl > rdataset->ttl)
ttl = rdataset->ttl;
+ if (ttl < minttl)
+ ttl = minttl;
if (trust > rdataset->trust)
trust = rdataset->trust;
/*
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e24499e..2cf1645 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -565,7 +565,9 @@ static bool fctx_unlink(fetchctx_t *fctx);
static isc_result_t ncache_adderesult(dns_message_t *message,
dns_db_t *cache, dns_dbnode_t *node,
dns_rdatatype_t covers,
- isc_stdtime_t now, dns_ttl_t maxttl,
+ isc_stdtime_t now,
+ dns_ttl_t minttl,
+ dns_ttl_t maxttl,
bool optout,
bool secure,
dns_rdataset_t *ardataset,
@@ -5072,7 +5074,7 @@ validated(isc_task_t *task, isc_event_t *event) {
ttl = 0;
result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
- covers, now, ttl, vevent->optout,
+ covers, now, fctx->res->view->minncachettl, ttl, vevent->optout,
vevent->secure, ardataset, &eresult);
if (result != ISC_R_SUCCESS)
goto noanswer_response;
@@ -5540,6 +5542,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
rdataset->ttl = res->view->maxcachettl;
}
+ /*
+ * Enforce configured minimum cache TTL.
+ */
+ if (rdataset->ttl < res->view->mincachettl)
+ rdataset->ttl = res->view->mincachettl;
+
/*
* Mark the rdataset as being prefetch eligible.
*/
@@ -5928,7 +5936,8 @@ cache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_stdtime_t now)
*/
static isc_result_t
ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
- dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
+ dns_rdatatype_t covers, isc_stdtime_t now,
+ dns_ttl_t minttl, dns_ttl_t maxttl,
bool optout, bool secure,
dns_rdataset_t *ardataset, isc_result_t *eresultp)
{
@@ -5941,10 +5950,10 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
}
if (secure)
result = dns_ncache_addoptout(message, cache, node, covers,
- now, maxttl, optout, ardataset);
+ now, minttl, maxttl, optout, ardataset);
else
result = dns_ncache_add(message, cache, node, covers, now,
- maxttl, ardataset);
+ minttl, maxttl, ardataset);
if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
/*
* If the cache now contains a negative entry and we
@@ -6119,7 +6128,8 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
ttl = 0;
result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
- covers, now, ttl, false,
+ covers, now, ttl,
+ fctx->res->view->minncachettl, false,
false, ardataset, &eresult);
if (result != ISC_R_SUCCESS)
goto unlock;
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 03890a3..2d99ead 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1780,6 +1780,8 @@ view_clauses[] = {
{ "max-recursion-queries", &cfg_type_uint32, 0 },
{ "max-udp-size", &cfg_type_uint32, 0 },
{ "message-compression", &cfg_type_boolean, 0 },
+ { "min-cache-ttl", &cfg_type_uint32, 0 },
+ { "min-ncache-ttl", &cfg_type_uint32, 0 },
{ "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP },
{ "minimal-any", &cfg_type_boolean, 0 },
{ "minimal-responses", &cfg_type_minimal, 0 },

136
debian/patches/0004-library_paths.diff vendored
View File

@ -1,136 +0,0 @@
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:54 +0000
Subject: _library_paths
Makefile.in: be explicit about library paths
Debian policy requires that all dependent libs be in the .so, not just the
immediately depended ones.
Signed-off-by: LaMont Jones <lamont@debian.org>
---
lib/dns/Makefile.in | 4 +++-
lib/irs/Makefile.in | 4 +++-
lib/isc/Makefile.in | 3 +++
lib/isccc/Makefile.in | 4 +++-
lib/isccfg/Makefile.in | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 732ab3c..769b64c 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -38,7 +38,7 @@ ISCLIBS = ../../lib/isc/libisc.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
-LIBS = ${MAXMINDDB_LIBS} @LIBS@
+LIBS = ${MAXMINDDB_LIBS} @LIBS@ -L../../lib/isc -lcrypto
# Alphabetically
@@ -159,6 +159,7 @@ libdns.la: ${OBJS}
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+ ln -sf .libs/libdns.so .
include: gen
${MAKE} include/dns/enumtype.h
@@ -212,6 +213,7 @@ clean distclean::
newrr::
rm -f code.h include/dns/enumtype.h include/dns/enumclass.h
rm -f include/dns/rdatastruct.h
+ rm -f libdns.so
rdata.@O@: include
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index fc11447..4bb85b1 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -36,7 +36,7 @@ SRCS = context.c \
gai_strerror.c getaddrinfo.c getnameinfo.c \
resconf.c
-LIBS = @LIBS@
+LIBS = @LIBS@ -L../../lib/isc -L../../lib/dns -L../../lib/isccfg -lcrypto -lisc -ldns -lisccfg
SUBDIRS = include
TESTDIRS = @UNITTESTS@
@@ -61,6 +61,7 @@ libirs.la: ${OBJS} version.@O@
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
${OBJS} version.@O@ ${LIBS}
+ ln -sf .libs/libirs.so .
timestamp: libirs.@A@
touch timestamp
@@ -78,3 +79,4 @@ uninstall::
clean distclean::
rm -f libirs.@A@ libirs.la timestamp
+ rm -f libdns.so
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 0fd0837..42fd1cb 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -120,12 +120,14 @@ libisc.la: ${OBJS} ${SYMTBLOBJS}
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
${OBJS} ${SYMTBLOBJS} ${LIBS}
+ ln -sf .libs/libisc.so .
libisc-nosymtbl.la: ${OBJS}
${LIBTOOL_MODE_LINK} \
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
${OBJS} ${LIBS}
+ ln -sf .libs/libisc-nosymtbl.so .
timestamp: libisc.@A@ libisc-nosymtbl.@A@
touch timestamp
@@ -144,3 +146,4 @@ uninstall::
clean distclean::
rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
libisc-nosymtbl.la timestamp
+ rm -f libisc.so libisc-nosymtbl.so
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index e7b6f04..3668490 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -29,7 +29,7 @@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
ISCCCDEPLIBS = libisccc.@A@
-LIBS = @LIBS@
+LIBS = @LIBS@ -L../../lib/isc
SUBDIRS = include
@@ -66,6 +66,7 @@ libisccc.la: ${OBJS}
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccc.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
${OBJS} ${ISCLIBS} ${LIBS}
+ ln -sf .libs/libisccc.so .
timestamp: libisccc.@A@
touch timestamp
@@ -83,3 +84,4 @@ uninstall::
clean distclean::
rm -f libisccc.@A@ timestamp
+ rm -f libisccc.so
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index b97657d..b02a884 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -29,7 +29,7 @@ ISCCFGLIBS = ../../lib/cfg/libisccfg.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
ISCCFGDEPLIBS = libisccfg.@A@
-LIBS = @LIBS@
+LIBS = @LIBS@ -L../dns -L../isc -L../isccc
SUBDIRS = include
TESTDIRS = @UNITTESTS@

22
debian/patches/0006-ctxstart_no_sighandling.diff vendored
View File

@ -1,22 +0,0 @@
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:54 +0000
Subject: _ctxstart_no_sighandling
---
lib/isc/unix/app.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index 567f300..87d981d 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -262,6 +262,9 @@ isc__app_ctxstart(isc_appctx_t *ctx0) {
ctx->want_reload = false;
ctx->blocked = false;
+ if (!isc_bind9)
+ return (ISC_R_SUCCESS);
+
#ifndef HAVE_SIGWAIT
/*
* Install do-nothing handlers for SIGINT and SIGTERM.

24
debian/patches/0007-Add_--install-layout=deb_to_setup.py_call.patch vendored
View File

@ -1,24 +0,0 @@
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:55 +0000
Subject: Add_--install-layout=deb_to_setup.py_call
---
bin/python/Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index aa678d4..a58d72f 100644
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -56,9 +56,9 @@ install:: ${TARGETS} installdirs
${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8
if test -n "${PYTHON}" ; then \
if test -n "${DESTDIR}" ; then \
- ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
+ ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} --install-layout=deb @PYTHON_INSTALL_LIB@ ; \
else \
- ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
+ ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} --install-layout=deb @PYTHON_INSTALL_LIB@ ; \
fi ; \
rm -rf build ; \
fi

24
debian/patches/0008-skip-rtld-deepbind-for-dyndb.diff vendored
View File

@ -1,24 +0,0 @@
From: BIND 9 Package <bind9@package.debian.org>
Date: Fri, 31 Aug 2018 08:42:51 +0000
Subject: skip-rtld-deepbind-for-dyndb
https://bugzilla.redhat.com/show_bug.cgi?id=1410433
https://bugs.launchpad.net/bugs/1769440
---
lib/dns/dyndb.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
index 15561ce..11ba0f5 100644
--- a/lib/dns/dyndb.c
+++ b/lib/dns/dyndb.c
@@ -133,9 +133,6 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname,
instname, filename);
flags = RTLD_NOW|RTLD_LOCAL;
-#if defined(RTLD_DEEPBIND) && !__SANITIZE_ADDRESS__
- flags |= RTLD_DEEPBIND;
-#endif
handle = dlopen(filename, flags);
if (handle == NULL)

29
debian/patches/0009-Use-absolute-srcdir-path-to-protoc-c-invocation.patch vendored
View File

@ -1,29 +0,0 @@
From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@debian.org>
Date: Tue, 21 May 2019 13:54:05 +0200
Subject: Use absolute srcdir path to protoc-c invocation
---
lib/dns/Makefile.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 769b64c..19079e4 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -8,6 +8,7 @@
# information regarding copyright ownership.
srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
@@ -227,7 +228,7 @@ ${OBJS}: include
dnstap.@O@: dnstap.c dnstap.pb-c.c
dnstap.pb-c.c dnstap.pb-c.h: dnstap.proto
- $(PROTOC_C) --c_out=. --proto_path ${srcdir} dnstap.proto
+ $(PROTOC_C) --c_out=. --proto_path ${abs_srcdir} ${abs_srcdir}/dnstap.proto
dnstap.pb-c.@O@: dnstap.pb-c.c

49
debian/patches/0010-python-fix-for-dist-packages.patch vendored
View File

@ -1,49 +0,0 @@
From: Jim Popovitch <jimpop@domainmail.org>
Date: Sat, 13 Jul 2019 17:00:35 +0000
Subject: python fix for dist-packages
---
bin/python/dnssec-checkds.py.in | 2 +-
bin/python/dnssec-coverage.py.in | 2 +-
bin/python/dnssec-keymgr.py.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index ed5ac37..9f06f71 100644
--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -19,7 +19,7 @@ if os.name != 'nt':
sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
else:
sys.path.insert(1, os.path.join('@prefix@', 'lib',
- 'python' + sys.version[:3], 'site-packages'))
+ 'python' + sys.version[:3], 'dist-packages'))
import isc.checkds
diff --git a/bin/python/dnssec-coverage.py.in b/bin/python/dnssec-coverage.py.in
index 8518dc3..c0d7fb2 100644
--- a/bin/python/dnssec-coverage.py.in
+++ b/bin/python/dnssec-coverage.py.in
@@ -19,7 +19,7 @@ if os.name != 'nt':
sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
else:
sys.path.insert(1, os.path.join('@prefix@', 'lib',
- 'python' + sys.version[:3], 'site-packages'))
+ 'python' + sys.version[:3], 'dist-packages'))
import isc.coverage
diff --git a/bin/python/dnssec-keymgr.py.in b/bin/python/dnssec-keymgr.py.in
index c8453a7..8aa7676 100644
--- a/bin/python/dnssec-keymgr.py.in
+++ b/bin/python/dnssec-keymgr.py.in
@@ -19,7 +19,7 @@ if os.name != 'nt':
sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
else:
sys.path.insert(1, os.path.join('@prefix@', 'lib',
- 'python' + sys.version[:3], 'site-packages'))
+ 'python' + sys.version[:3], 'dist-packages'))
import isc.keymgr

9
debian/patches/series vendored
View File

@ -1,9 +0,0 @@
0001-non-linux.diff
0002-multiarch.diff
0003-min-cache-ttl.diff
0004-library_paths.diff
0006-ctxstart_no_sighandling.diff
0007-Add_--install-layout=deb_to_setup.py_call.patch
0008-skip-rtld-deepbind-for-dyndb.diff
0009-Use-absolute-srcdir-path-to-protoc-c-invocation.patch
0010-python-fix-for-dist-packages.patch

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt) 3.0 (native)