X-Original-To: alpine-aports@lists.alpinelinux.org Received: from smtp.mauras.ch (smtp.mauras.ch [163.172.199.81]) by lists.alpinelinux.org (Postfix) with ESMTP id AF56D5C4201 for ; Tue, 16 Aug 2016 17:27:32 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mauras.ch; s=20160502; h=Content-Type:Mime-Version:Message-Id:Subject:To:From:Date: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=rpir+dY9cgemaprHV8bny2t0P43j+bD8J18OShFAANM=; b=Mowac5egz8TC4FgJahSHIWPQRd 83lEVt9sWMoHMvgA2+6N2dgVcUcY6B+DyV+/LoIDjCnGWn2bCnDEnl++EWLQ0G2NYIwkKMclSmjIF kUFJygzcckJxf5nNCjBE+y/UXE8XWGdbvl7FFWd039DDplt7pegIbVfK5D2pUIJ/wSfk=; Received: from 109-203-40-206.static.jp-net.net ([109.203.40.206] helo=tiptop.internal) by smtp.mauras.ch with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1bZi9D-0005rY-GZ for alpine-aports@lists.alpinelinux.org; Tue, 16 Aug 2016 19:27:31 +0200 Date: Tue, 16 Aug 2016 19:27:21 +0200 From: Olivier Mauras To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 1/2] testing/pdns: Upgrade and cleanup Message-Id: <20160816192721.4aae02f0e8c634346e5e624b@mauras.ch> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__16_Aug_2016_19_27_21_+0200_CQbFWhBjs_=S26/X" X-Authenticated-Sender: olivier@mauras.ch --Signature=_Tue__16_Aug_2016_19_27_21_+0200_CQbFWhBjs_=S26/X Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable - Upgrade to latest version - 4.0.1=20 - Removed unused patches - Set config file in /etc/pdns instead of /etc to have a cleaner setup with= pdns-recursor=20 - Remove geo backend that doesn't exist anymore - geoip backend can be rein= troduced later but has other dependancies --- testing/pdns/0010-disable-execinfo.patch | 25 ------------ testing/pdns/APKBUILD | 24 +++++------ testing/pdns/allocate-tcp-buffer-dynamically.patch | 46 ------------------= ---- 3 files changed, 12 insertions(+), 83 deletions(-) delete mode 100644 testing/pdns/0010-disable-execinfo.patch delete mode 100644 testing/pdns/allocate-tcp-buffer-dynamically.patch diff --git a/testing/pdns/0010-disable-execinfo.patch b/testing/pdns/0010-d= isable-execinfo.patch deleted file mode 100644 index 23747b3..0000000 --- a/testing/pdns/0010-disable-execinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ./pdns/receiver.cc.orig -+++ ./pdns/receiver.cc -@@ -375,10 +375,11 @@ -=20 -=20 - #ifdef __linux__ --#include -+//#include - static void tbhandler(int num) - { -- L< # Contributor: Matt Smith +# Contributor: Olivier Mauras # Maintainer: Matt Smith pkgname=3Dpdns -pkgver=3D3.4.8 -pkgrel=3D3 +pkgver=3D4.0.1 +pkgrel=3D0 pkgdesc=3D"PowerDNS Authoritative Server" url=3D"http://www.powerdns.com/" arch=3D"all" @@ -15,7 +16,6 @@ makedepends=3D"$depends_dev boost-dev lua-dev openldap-de= v mariadb-dev install=3D"$pkgname.pre-install $pkgname.post-deinstall" subpackages=3D"$pkgname-doc $pkgname-backend-bind:backend_bind - $pkgname-backend-geo:backend_geo $pkgname-backend-ldap:backend_ldap $pkgname-backend-mysql:backend_mysql $pkgname-backend-pgsql:backend_pgsql @@ -44,13 +44,13 @@ prepare() { build() { cd "$_builddir" ./configure --prefix=3D/usr \ - --sysconfdir=3D/etc \ + --sysconfdir=3D/etc/$pkgname \ --mandir=3D/usr/share/man \ --infodir=3D/usr/share/info \ --localstatedir=3D/var \ --libdir=3D/usr/lib/pdns \ --with-modules=3D"" \ - --with-dynmodules=3D"bind geo ldap gmysql gpgsql pipe gsqlite3" \ + --with-dynmodules=3D"bind ldap gmysql gpgsql pipe gsqlite3" \ --disable-static \ || return 1 make || return 1 @@ -62,14 +62,13 @@ package() { =20 install -m755 -D "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname || return 1 - rm "$pkgdir"/etc/pdns.conf-dist + rm "$pkgdir"/etc/$pkgname/$pkgname.conf-dist install -m600 -D "$srcdir"/$pkgname.conf \ - "$pkgdir"/etc/$pkgname.conf || return 1 - chown pdns:pdns "$pkgdir"/etc/$pkgname.conf || return 1 + "$pkgdir"/etc/$pkgname/$pkgname.conf || return 1 + chown pdns:pdns "$pkgdir"/etc/$pkgname/$pkgname.conf || return 1 } =20 backend_bind() { _mv_backend bind; } -backend_geo() { _mv_backend geo; } backend_ldap() { _mv_backend ldap openldap; } backend_mysql() { _mv_backend gmysql mysql; } backend_pgsql() { _mv_backend gpgsql postgresql; } @@ -79,6 +78,7 @@ backend_sqlite3() { _mv_backend gsqlite3 sqlite; } _mv_backend() { local backend=3D$1 pkgdesc=3D"${backend} backend module for PowerDNS" + depends=3D"$pkgname" =20 # backend dependencies if [ -n "${2-}" ]; then @@ -91,12 +91,12 @@ _mv_backend() { "$subpkgdir"/usr/lib/pdns/pdns/ || return 1 } =20 -md5sums=3D"7d7c7de2b8b0343c64f85edab8e8074e pdns-3.4.8.tar.bz2 +md5sums=3D"d34a390672aa043f8a287e5bb2284f4a pdns-4.0.1.tar.bz2 db11dfe72474858f706155c817f2ded5 pdns.initd 351bac7f784a1a40e768466d9e6f1a79 pdns.conf" -sha256sums=3D"4f818fd09bff89625b4317cc7c05445f6e7bd9ea8d21e7eefeaaca07b8b0= cd9f pdns-3.4.8.tar.bz2 +sha256sums=3D"d191eed4a6664430e85969f49835c59e810ecbb7b3eb506e64c6b2734091= edd7 pdns-4.0.1.tar.bz2 081835f812e419b153a9cc716ad55b9cb22c6c185b748e0aafc40430fa5e8b5e pdns.ini= td 5fdf423f829dca0b50bc81bab773d7ec4ee6627e35f861124d8c2ccd79a2f50c pdns.con= f" -sha512sums=3D"8d0f7bbbe21559ecf0d9f323a2f4226b2c2d5542261e0ad44e6ac17f13bb= e087b52efe1b74ca756cf9b92f6cb333829c42b55c245543fa3dea4a4f62be8cdf6e pdns-= 3.4.8.tar.bz2 +sha512sums=3D"77fce9963a05198afeb569f92fbb0f6a1cb3426c28dd77b0921128189c80= d9a72ebdbfc249dfc0b5b89cc7a65a83887a0388d6cc3461453b1e3096e563afdd1e pdns-= 4.0.1.tar.bz2 71257be925fe57b15ebf29a7810cd70581cb867416ab9562300a1bbc3eb94fcb92ea2eb95f= 15e3ee3bd409468911077c50f90a2501801b0c8c49ed979f41f3a4 pdns.initd 9913551bb4d685aaced806134b1037d85ce759e7d9e780e256e67651d9d346aad5e608b4a4= 5a4933f0ba879605b69d06e579c38b7f917f7a9be37c7797c5953b pdns.conf" diff --git a/testing/pdns/allocate-tcp-buffer-dynamically.patch b/testing/p= dns/allocate-tcp-buffer-dynamically.patch deleted file mode 100644 index b346a2e..0000000 --- a/testing/pdns/allocate-tcp-buffer-dynamically.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c2b4ccc0d125a30a1970f555f572bf74de27a3d5 Mon Sep 17 00:00:00 2001 -From: bert hubert -Date: Sat, 10 Jan 2015 23:06:38 +0100 -Subject: [PATCH] allocate TCP buffer dynamically, decreasing our stack usa= ge - ---- - pdns/tcpreceiver.cc | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc -index f90bf90..6356d34 100644 ---- a/pdns/tcpreceiver.cc -+++ b/pdns/tcpreceiver.cc -@@ -253,7 +253,8 @@ void *TCPNameserver::doConnection(void *data) - pthread_detach(pthread_self()); - Utility::setNonBlocking(fd); - try { -- char mesg[65535]; -+ int mesgsize=3D65535; -+ scoped_array mesg(new char[mesgsize]); - =20 - DLOG(L<<"TCP Connection accepted on fd "<sizeof(mesg)) { -+ if(pktlen > mesgsize) { - L<(new DNSPacket); - packet->setRemote(&remote); - packet->d_tcp=3Dtrue; - packet->setSocket(fd); -- if(packet->parse(mesg, pktlen)<0) -+ if(packet->parse(mesg.get(), pktlen)<0) - break; - =20 - if(packet->qtype.getCode()=3D=3DQType::AXFR) { --=20 2.8.3 --Signature=_Tue__16_Aug_2016_19_27_21_+0200_CQbFWhBjs_=S26/X Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXs0z5AAoJEJXQwVHPrdN80WoQAMcSU51KQt3vXnsT8ifKfUph A5JrX0M9G2nLA8eNZtuG7TYof8liTRpJaw6DbRNLopPf6/7f03MZad0Sku399tav 9ajDnqPwnMrMikkRDg5Xvnv10JuviUdvQ+yUZWt6Hy7vVrpxQ5YN9bWDqQt0sXIA JYoaftyxgj9MRf27XJsud0QEGEjAb06B+B/dhLoUK1pW7U1aR7EnfPXiNrshHxRq ZIR3GPdYrkojgCsQRBmyhr0SfrxBRWhTyYcpCQEk2QY52w75HrXmS4L3I+FVqKGR KNaub0SMLfdY/DSX4OzwU7xSxusuoOUBrrdc/R77OIIwqPMecoeFkK9pQvtx2/mb reI9dq+MYoXXbmqgkqV4vY29pbAlYPe7YhYXhMNNIwz2S3Si+JYAkjVUNxlYBH0V UWEiZSHo/am9V+iTLxV/Ebq4YlAAaRM3JK9ehZey3aNuJGH3JdbW+3PNKkko6GTg onIm5E7uaplX+ZgX0TlRUrGzWvuD071H0hs2F4VV+8Odl/ZsHtw9iyFLWmrQiZgW JE0ep4SAjpwJsTy1LfXpzf/Dxc56aITyctJozRkVs1Y2HI2b8/s4wEA7z+OjpGg/ 8Tt8XiMOb4hdQL2zJhEovTC+eJRc9okaK/BEsuPaTVSvKkFdJlo1KVZM1ZKg1OUa H1XPdUhcaN/f7PdtJDnM =E7Tg -----END PGP SIGNATURE----- --Signature=_Tue__16_Aug_2016_19_27_21_+0200_CQbFWhBjs_=S26/X-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---