community/pdns: upgrade to 4.1.11

2 files changed, 36 insertions, 31 deletions

diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD
index b493b23ebb..98e200434b 100644
--- a/community/pdns/APKBUILD
+++ b/community/pdns/APKBUILD
@@ -5,14 +5,12 @@
 # Contributor: Fabian Zoske <fabian@zoske.it>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=pdns
-pkgver=4.1.10
-pkgrel=1
+pkgver=4.1.11
+pkgrel=0
 pkgdesc="PowerDNS Authoritative Server"
 url="https://www.powerdns.com/"
 arch="all !s390x"
 license="GPL-2.0-only"
-depends=""
-depends_dev=""
 makedepends="$depends_dev
 	boost-dev curl geoip-dev krb5-dev openssl-dev
 	libsodium-dev lua-dev mariadb-connector-c-dev openldap-dev
@@ -35,12 +33,15 @@ subpackages="$pkgname-doc $pkgname-openrc $pkgname-tools
 	$pkgname-backend-sqlite3:backend_sqlite3"
 pkgusers="pdns"
 pkggroups="pdns"
-source="https://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2
+source="https://downloads.powerdns.com/releases/pdns-$pkgver.tar.bz2
 	$pkgname.initd
-	$pkgname.conf"
-builddir="$srcdir/$pkgname-$pkgver"
+	$pkgname.conf
+	README.alpine
+	"
 
 # secfixes:
+#   4.1.11-r0:
+#     - CVE-2019-10203
 #   4.1.10-r0:
 #     - CVE-2019-10162
 #     - CVE-2019-10163
@@ -53,8 +54,6 @@ builddir="$srcdir/$pkgname-$pkgver"
 #     - CVE-2017-15091
 
 build() {
-	cd "$builddir"
-
 	./configure --prefix=/usr \
 		--sysconfdir="/etc/$pkgname" \
 		--mandir=/usr/share/man \
@@ -70,13 +69,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	PDNS_TEST_NO_IPV6=1 make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir/$pkgname.initd" \
@@ -85,6 +81,8 @@ package() {
 	install -m600 -D "$srcdir/$pkgname.conf" \
 		"$pkgdir/etc/$pkgname/$pkgname.conf"
 	chown pdns:pdns "$pkgdir/etc/$pkgname/$pkgname.conf"
+
+	install -Dm644 "$srcdir"/README.alpine "$pkgdir"/usr/share/doc/$pkgname/README.alpine
 }
 
 tools() {
@@ -121,23 +119,24 @@ _mv_backend() {
 		"$subpkgdir/usr/lib/pdns/pdns/"
 }
 
-backend_bind()          { _mv_backend bind; }
-backend_geoip()         { _mv_backend geoip geoip; }
-backend_ldap()          { _mv_backend ldap; }
-backend_lua()           { _mv_backend lua lua; }
-backend_mariadb()       { _backend mariadb $pkgname-backend-mysql; }
-backend_mydns()         { _mv_backend mydns; }
-backend_mysql()         { _mv_backend gmysql mariadb-client; }
-backend_odbc()          { _mv_backend godbc unixodbc; }
-#backend_opendbx()       { _mv_backend opendbx; }
-#backend_oracle()        { _mv_backend goracle; }
-backend_pipe()          { _mv_backend pipe; }
-backend_pgsql()         { _mv_backend gpgsql postgresql-client; }
-backend_random()        { _mv_backend random; }
-backend_remote()        { _mv_backend remote; }
-backend_sqlite3()       { _mv_backend gsqlite3 sqlite; }
-#backend_tinydns()       { _mv_backend tinydns; }
-
-sha512sums="59a7a52468f6daae8de01bb2b08d812906ef58047026369895341cfff253a5b9ba29d6a6b43a822f1632641eec34fa1afa6fbb5b0ba5e72ecce8e61787892136  pdns-4.1.10.tar.bz2
+backend_bind() { _mv_backend bind; }
+backend_geoip() { _mv_backend geoip geoip; }
+backend_ldap() { _mv_backend ldap; }
+backend_lua() { _mv_backend lua lua; }
+backend_mariadb() { _backend mariadb $pkgname-backend-mysql; }
+backend_mydns() { _mv_backend mydns; }
+backend_mysql() { _mv_backend gmysql mariadb-client; }
+backend_odbc() { _mv_backend godbc unixodbc; }
+#backend_opendbx() { _mv_backend opendbx; }
+#backend_oracle() { _mv_backend goracle; }
+backend_pipe() { _mv_backend pipe; }
+backend_pgsql() { _mv_backend gpgsql postgresql-client; }
+backend_random() { _mv_backend random; }
+backend_remote() { _mv_backend remote; }
+backend_sqlite3() { _mv_backend gsqlite3 sqlite; }
+#backend_tinydns() { _mv_backend tinydns; }
+
+sha512sums="18215f523a39d48c8756bc13ecae1bd78967c2d66619d93ddaafb13062690002a9bdfe1d337796820706692c449286c7b9e9b8d45933684d32acbc20e490c0c4  pdns-4.1.11.tar.bz2
 3a55547e1b6407e7d2faa6e02982ed903c2364381af1b7eeb626ae3a8b0e32558dd79bf31c982b134414e5636d4868c1f3660ac523f25d2440ed6f7b436843bf  pdns.initd
-3f809f3257680c3e496fa6a4c86c8a636db5d9d5b92aef96fe54c29b8266ee590deb792d13205cc171e27307fa73295dd3b101b09102fd66a2393a7cdbf9dd27  pdns.conf"
+3f809f3257680c3e496fa6a4c86c8a636db5d9d5b92aef96fe54c29b8266ee590deb792d13205cc171e27307fa73295dd3b101b09102fd66a2393a7cdbf9dd27  pdns.conf
+f2781a23e14bea9b4bbb84f3b596663c76359c449ef6fd39c87b5ea1163c47e01c5ba490c804709033598f0542ac558bde477729ad1ab9f17d49606fa61b2049  README.alpine"
diff --git a/community/pdns/README.alpine b/community/pdns/README.alpine
new file mode 100644
index 0000000000..625cb68d2b
--- /dev/null
+++ b/community/pdns/README.alpine
@@ -0,0 +1,6 @@
+When upgrading from 4.1.10 and previous:
+
+This release contains a fix for CVE-2019-10203
+Upgrading is not enough you need to manually apply the schema change
+
+ALTER TABLE domains ALTER notified_serial TYPE bigint USING CASE WHEN notified_serial >= 0 THEN notified_serial::bigint END;