Skip to content

Instantly share code, notes, and snippets.

View Habbie's full-sized avatar

Peter van Dijk Habbie

View GitHub Profile

Hello visitor of ##sqlite on Freenode!

Many regulars of ##sqlite have moved to ##sqlite on https://libera.chat/ .

If you join the channel on both networks, please ask your question only in one place, to not waste community time doubly.

diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc
index de4de76ff..4b3275e3e 100644
--- a/modules/gpgsqlbackend/gpgsqlbackend.cc
+++ b/modules/gpgsqlbackend/gpgsqlbackend.cc
@@ -141,7 +141,7 @@ public:
declare(suffix, "delete-rrset-query", "", "delete from records where domain_id=$1 and name=$2 and type=$3");
declare(suffix, "delete-names-query", "", "delete from records where domain_id=$1 and name=$2");
- declare(suffix, "add-domain-key-query", "", "insert into cryptokeys (domain_id, flags, active, published, content) select id, $1, $2, $3, $4 from domains where name=$5");
+ declare(suffix, "add-domain-key-query", "", "insert into cryptokeys (domain_id, flags, active, published, content) select id, $1, $2, $3, $4 from domains where name=$5 returning id");
diff --git a/pdns/dnspcap.cc b/pdns/dnspcap.cc
index c7d634504..409dff0c5 100644
--- a/pdns/dnspcap.cc
+++ b/pdns/dnspcap.cc
@@ -59,6 +59,10 @@ PcapPacketReader::PcapPacketReader(const string& fname) : d_fname(fname)
else throw runtime_error((boost::format("Unsupported link type %d") % d_pfh.linktype).str());
d_runts = d_oversized = d_correctpackets = d_nonetheripudp = 0;
+
+ if (d_skipMediaHeader > mediaHeaderRoom) throw runtime_error("media header is too big");
diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 5ebc6ff65..6b05a6779 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -126,6 +126,7 @@ public:
// by stored procedures. you can return more than one
// if you return SETOF refcursor.
if (PQftype(d_res_set, 0) == 1790) { // REFCURSOR
+ cerr<<"got REFCURSOR"<<endl;
#if PG_VERSION_NUM > 90000
diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index c6954e495..d728172c1 100644
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -513,7 +513,9 @@ public:
uint32_t tmp;
memcpy(&tmp, (void*) p, sizeof(tmp));
tmp = ntohl(tmp);
+ cerr<<"decreaseAndSkip32BitInt tmp="<<tmp<<" decrease="<<decrease;
tmp-=decrease;
--- /root/pkgs.centos-8 2021-03-05 10:10:35.724591341 +0000
+++ /root/pkgs.centos-8-stream 2021-03-05 10:13:13.490141716 +0000
@@ -2,17 +2,17 @@
adobe-mappings-cmap-20171205-3.el8.noarch
adobe-mappings-cmap-deprecated-20171205-3.el8.noarch
adobe-mappings-pdf-20180407-1.el8.noarch
-annobin-9.23-1.el8.x86_64
+annobin-9.50-1.el8.x86_64
asciidoc-8.6.10-0.5.20180627gitf7c2274.el8.noarch
atk-2.28.1-1.el8.x86_64
diff --git a/builder-support/debian/authoritative/debian-buster/compat b/builder-support/debian/authoritative/debian-buster/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/builder-support/debian/authoritative/debian-buster/compat
@@ -0,0 +1 @@
+10
diff --git a/builder-support/debian/authoritative/debian-buster/control b/builder-support/debian/authoritative/debian-buster/control
index 56d80695a..699501a3f 100644
--- a/builder-support/debian/authoritative/debian-buster/control
diff --git a/downloads.md b/downloads.md
index 0ef3bfe..1cbcec3 100644
--- a/downloads.md
+++ b/downloads.md
@@ -20,14 +20,14 @@ available, often in the package called **pdns**, **powerdns-server**,
#### Current releases
Release notes can be browsed as part of the documentation: [Authoritative Server](https://doc.powerdns.com/authoritative/changelog/), [Recursor](https://doc.powerdns.com/recursor/changelog/).
-The most recent release of the PowerDNS Authoritative Server is **4.4.0** and is available as:
+The most recent supported release of the PowerDNS Authoritative Server is **4.4.0** and is available as:
diff --git a/Dockerfile-auth b/Dockerfile-auth
index 3716a185e..ab5329918 100644
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -44,12 +44,12 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
# simplify repeated -C calls with SUBDIRS?
RUN mkdir /build && \
./configure \
- --with-lua=luajit \
--sysconfdir=/etc/powerdns \
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-buster b/builder-support/dockerfiles/Dockerfile.target.debian-buster
index 66cc4ea6e..6b28cb081 100644
--- a/builder-support/dockerfiles/Dockerfile.target.debian-buster
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-buster
@@ -1,9 +1,22 @@
# First do the source builds
@INCLUDE Dockerfile.target.sdist
+@EVAL RUN echo BUILDER_TARGET: ${BUILDER_TARGET}
+