diff options
| author | tcely <tcely@users.noreply.github.com> | 2019-07-10 16:04:14 -0400 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-07-21 15:11:14 -0300 |
| commit | d6df58cd59ed037b7ff30089d4f58c1af2e49199 (patch) | |
| tree | 8cdc0792613434d1718fc5096953b55f1be664a8 | |
| parent | 49cf394a021d7169cf79544f92adce3ee558c992 (diff) | |
| download | aports-d6df58cd59ed037b7ff30089d4f58c1af2e49199.tar.bz2 aports-d6df58cd59ed037b7ff30089d4f58c1af2e49199.tar.xz | |
Revert "testing/knot-resolver4: fix sigsegv in stats module init"
This reverts commit 079f9c41cce01ba85ece8c48ba2e6b3a84dd168c.
| -rw-r--r-- | testing/knot-resolver4/APKBUILD | 5 | ||||
| -rw-r--r-- | testing/knot-resolver4/stats-module-memset-upstreams.patch | 10 |
2 files changed, 1 insertions, 14 deletions
diff --git a/testing/knot-resolver4/APKBUILD b/testing/knot-resolver4/APKBUILD index e45d2b9bbe..130cc8bcdc 100644 --- a/testing/knot-resolver4/APKBUILD +++ b/testing/knot-resolver4/APKBUILD @@ -3,7 +3,7 @@ _pkgname="knot-resolver" pkgname="${_pkgname}4" pkgver=4.0.0 -pkgrel=1 +pkgrel=0 pkgdesc="Minimalistic caching DNS resolver implementation" url="https://www.knot-resolver.cz/" arch="all !s390x" # luajit unavailable for s390x @@ -21,7 +21,6 @@ subpackages="$pkgname-mod-http:http:noarch $pkgname-mod-dnstap:dnstap $pkgname-d source=" https://secure.nic.cz/files/${_pkgname}/${_pkgname}-$pkgver.tar.xz meson-dnstap-generated-sources.patch - stats-module-memset-upstreams.patch knot-resolver4.logrotate knot-resolver4.confd knot-resolver4.initd @@ -84,13 +83,11 @@ dnstap() { sha256sums="37161d931e64535ce38c33b9635f06a43cd1541945bf2c79a55e37f230de1631 knot-resolver-4.0.0.tar.xz 630e9e22fc6c343e3f864ab6a83ab57071c1dbf8a55cad24628c30c536c45e4f meson-dnstap-generated-sources.patch -ea377e19ae7bd1c0906c1a15e9d92d275468df5d162b968696b5e985d70667c4 stats-module-memset-upstreams.patch 23a9fff29fae658e669553a385cf5563311a3451bb8f77889a8d8501e8c98c5a knot-resolver4.logrotate bb3e4c1f666c3e1d995aad8fa0af98960298d91b0222fc7f423692493ffbb3a5 knot-resolver4.confd 41acd36d8f84805d851865daf993cb5f6697190662edf7f95d0e92ab1ff58b80 knot-resolver4.initd" sha512sums="e4c7e21ec36b5a733adf9f8e3751bbc347ce9ce7af8d71e8d5f3a7a87da673db753490c5257466e8433cd5fff1651046c8500ee59e91be8e55b1a16614eaf53a knot-resolver-4.0.0.tar.xz d51fb4eacc2b86fe7ee6d39a9f34d9eaf874204ab4c965cb5c053b3a5b5920f90e0cee388c2707d0ff3eb705f5764221e0823813baa9c1ccf247b185436adb6a meson-dnstap-generated-sources.patch -c71a01d6fe74c348fe4a070aa448c234b75a9f4b790685deffaef1dad48668f95fa9fe9ae2e38bdc82ca2cde68d740c28511e83b47191f221f1fa265e8ef9537 stats-module-memset-upstreams.patch 86fcd63264a21b83850d42328c89f051055bbd81c95bb96b298fb74a0826fa453b05fd34ae247e176635466d678ea740912047d05cacaea96c67fd2ded6b5bb5 knot-resolver4.logrotate 0379745f15175aa9a740c7e58b7279b2e1520effb465dd168ea2165118fdb79291082b914dce34d7967068568c35ad381950845e2b03802a1c88fe99b55a7211 knot-resolver4.confd 2f192e5c66455a211f113ae92a8001711d4b174490bd95617eb66cc2072804ba3881508754c2841dd12bcae15a50d85d32f53b026a04a7f4134942ce4a15edb2 knot-resolver4.initd" diff --git a/testing/knot-resolver4/stats-module-memset-upstreams.patch b/testing/knot-resolver4/stats-module-memset-upstreams.patch deleted file mode 100644 index bc084a302a..0000000000 --- a/testing/knot-resolver4/stats-module-memset-upstreams.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/modules/stats/stats.c -+++ b/modules/stats/stats.c -@@ -498,6 +498,7 @@ - } - for (size_t i = 0; i < UPSTREAMS_COUNT; ++i) { - struct sockaddr *sa = (struct sockaddr *)&data->upstreams.q.at[i]; -+ memset(sa, 0, sizeof(struct sockaddr)); - sa->sa_family = AF_UNSPEC; - } - return kr_ok(); |