diff options
-rw-r--r-- | system/vim/APKBUILD | 8 | ||||
-rw-r--r-- | user/apache-httpd/APKBUILD | 43 | ||||
-rw-r--r-- | user/gvim/APKBUILD | 9 | ||||
-rw-r--r-- | user/netsurf/APKBUILD | 10 | ||||
-rw-r--r-- | user/netsurf/curl.patch | 161 | ||||
-rw-r--r-- | user/py3-jinja2/APKBUILD | 6 | ||||
-rw-r--r-- | user/vala/APKBUILD | 4 | ||||
-rw-r--r-- | user/xterm/APKBUILD | 6 |
8 files changed, 42 insertions, 205 deletions
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 7e383e016..21183f2d7 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.1662 +pkgver=8.1.1842 pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -28,14 +28,13 @@ builddir="$srcdir/$pkgname-$pkgver" # - CVE-2016-1248 prepare() { - cd "$builddir" + default_prepare # Read vimrc from /etc/vim echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h } build() { local _onlynative - cd "$builddir" [ "$CBUILD" != "$CHOST" ] || _onlynative="--enable-perlinterp=dynamic --enable-python3interp=dynamic" ./configure \ --build=$CBUILD \ @@ -60,7 +59,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir/" install install -Dm644 runtime/doc/uganda.txt \ @@ -81,6 +79,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="512fe345ea0982b49fa4b4d520f7e9e874dff92599a6fbc83ef795f9e39445394c3f0e53326f9a8a56c99ba0aa186d08a7d97af378ea22b2c755c57842f1f2ad vim-8.1.1662.tar.gz +sha512sums="bed9084fce858e0717409cfc4243437601033736f25b02e86fc360706214cf493aaa654053205df2e63b0143df7d2ee7d8f16a4fec776bcd848488f5bed45149 vim-8.1.1842.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index fe6dd6672..fddd11a12 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=apache-httpd _pkgreal=httpd -pkgver=2.4.39 -pkgrel=2 +pkgver=2.4.41 +pkgrel=0 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" arch="all" @@ -11,7 +11,7 @@ license="Apache-2.0" depends="" install="$pkgname.pre-install $pkgname.pre-upgrade" makedepends="apr-dev apr-util-dev autoconf automake libxml2-dev nghttp2-dev - openssl-dev pcre-dev sed zlib-dev" + openssl-dev pcre-dev sed zlib-dev cmd:which" pkgusers="apache" pkggroups="apache" subpackages="$pkgname-dev @@ -21,7 +21,7 @@ subpackages="$pkgname-dev $pkgname-ldap $pkgname-openrc" provides="apache2 apache2-ssl" -source="http://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2 +source="$pkgname-$pkgver.tar.gz::https://github.com/apache/httpd/archive/$pkgver.tar.gz adelie.layout apache-httpd.confd apache-httpd.initd @@ -36,25 +36,33 @@ source="http://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2 builddir="$srcdir/$_pkgreal-$pkgver" options="suid !check" -# 2.4.30: (unreleased) -# - CVE-2017-15710 -# - CVE-2018-1283 -# - CVE-2018-1303 -# - CVE-2018-1301 -# - CVE-2017-15715 -# - CVE-2018-1312 -# - CVE-2018-1302 -# 2.4.34: -# - CVE-2018-8011 -# - CVE-2018-1333 +# secfixes: http_server +# 2.4.34-r0: +# - CVE-2017-15710 +# - CVE-2017-15715 +# - CVE-2018-1283 +# - CVE-2018-1301 +# - CVE-2018-1302 +# - CVE-2018-1303 +# - CVE-2018-1312 +# - CVE-2018-1333 +# - CVE-2018-8011 +# 2.4.41-r0: +# - CVE-2019-9517 +# - CVE-2019-10081 +# - CVE-2019-10082 +# - CVE-2019-10092 +# - CVE-2019-10097 +# - CVE-2019-10098 prepare() { default_prepare cat "$srcdir"/adelie.layout >> "$builddir"/config.layout + ./buildconf \ + --with-apr=apr-1-config } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -77,7 +85,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" -j1 install # apache-provided configuration is awful @@ -135,7 +142,7 @@ ldap() { "$subpkgdir"/usr/libexec/apache2 } -sha512sums="9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7 httpd-2.4.39.tar.bz2 +sha512sums="447310a625c0aaff10777c70d178853536c010a376b7e27a137461e5b83e438bc0548b90f47c21f1d047f685d082db84920bc6b1365f6e1f16698ba059df927a apache-httpd-2.4.41.tar.gz c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index e1cde6aa8..1c7a69419 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1662 +pkgver=8.1.1842 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -25,14 +25,13 @@ builddir="$srcdir/$_pkgreal-$pkgver" # - CVE-2016-1248 prepare() { - cd "$builddir" + default_prepare # Read vimrc from /etc/vim echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h } build() { local _onlynative - cd "$builddir" [ "$CBUILD" != "$CHOST" ] || _onlynative="--enable-perlinterp --enable-python3interp=dynamic" ./configure \ --build=$CBUILD \ @@ -58,8 +57,6 @@ build() { } package() { - cd "$builddir" - install -Dm755 src/vim "$pkgdir"/usr/bin/gvim install -Dm755 src/gvimtutor "$pkgdir"/usr/bin/gvimtutor install -Dm644 runtime/vim16x16.png "$pkgdir"/usr/share/locolor/16x16/apps/gvim.png @@ -74,4 +71,4 @@ package() { ln -s gvim rgvim } -sha512sums="512fe345ea0982b49fa4b4d520f7e9e874dff92599a6fbc83ef795f9e39445394c3f0e53326f9a8a56c99ba0aa186d08a7d97af378ea22b2c755c57842f1f2ad vim-8.1.1662.tar.gz" +sha512sums="bed9084fce858e0717409cfc4243437601033736f25b02e86fc360706214cf493aaa654053205df2e63b0143df7d2ee7d8f16a4fec776bcd848488f5bed45149 vim-8.1.1842.tar.gz" diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 917c71be5..e6f799627 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=netsurf -pkgver=3.8 -pkgrel=1 +pkgver=3.9 +pkgrel=0 pkgdesc="Modern, lightweight GTK-based browser" url="http://www.netsurf-browser.org/" arch="all" @@ -14,7 +14,6 @@ makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev perl-html-parser" source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz Makefile.config - curl.patch " builddir="$srcdir/netsurf-all-$pkgver" @@ -31,6 +30,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="cc040566b2ae4bda1fa15f75f246b2977f17b1f0adc747ddf86a9f8873bc25dce46cacce8e3d80146e72cc0227b1642c9da8b39a73ca2b5bb254334a25b8136a netsurf-all-3.8.tar.gz -cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config -594c82f550ac04ea86807a7b2d634e10b24156439588d2d1917f67a8962ae872ab50289400d7f779ba0711a6758aee4bd442d7318fe6f271945e60242285c2bb curl.patch" +sha512sums="3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987 netsurf-all-3.9.tar.gz +cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" diff --git a/user/netsurf/curl.patch b/user/netsurf/curl.patch deleted file mode 100644 index c76a4dfa1..000000000 --- a/user/netsurf/curl.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 65b16f4c54eba748ee4c8b6580e6f08fc27534f8 Mon Sep 17 00:00:00 2001 -From: Michael Drake <michael.drake@codethink.co.uk> -Date: Mon, 6 May 2019 17:12:14 +0100 -Subject: Curl fetcher: Force HTTP1.1 to fix HTTP2 crash. - -On ubuntu 19.4, curl is built with HTTP2 support, and we -segfault. - -==18174== Invalid read of size 1 -==18174== at 0x4ACCE7D: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4B054B1: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AD398A: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AD7A0B: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AE93EE: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AEA8A8: curl_multi_perform (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x1F2EF7: fetch_curl_poll (curl.c:1209) -==18174== by 0x1EEC5C: fetcher_poll (fetch.c:271) -==18174== by 0x2A1ED4: schedule_run (schedule.c:160) -==18174== by 0x15F941: framebuffer_run (gui.c:596) -==18174== by 0x15F941: main (gui.c:2206) -==18174== Address 0x9de95a8 is 3,224 bytes inside a block of size 6,304 free'd -==18174== at 0x483997B: free (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) -==18174== by 0x4AD497B: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AE158C: curl_easy_cleanup (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x1F30DE: fetch_curl_cache_handle (curl.c:761) -==18174== by 0x1F30DE: fetch_curl_stop (curl.c:840) -==18174== by 0x1F30DE: fetch_curl_done (curl.c:1122) -==18174== by 0x1F30DE: fetch_curl_poll (curl.c:1223) -==18174== by 0x1EEC5C: fetcher_poll (fetch.c:271) -==18174== by 0x2A1ED4: schedule_run (schedule.c:160) -==18174== by 0x15F941: framebuffer_run (gui.c:596) -==18174== by 0x15F941: main (gui.c:2206) -==18174== Block was alloc'd at -==18174== at 0x483AB35: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) -==18174== by 0x4AE165F: curl_easy_duphandle (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x1F15EB: fetch_curl_get_handle (curl.c:738) -==18174== by 0x1F15EB: fetch_curl_start (curl.c:750) -==18174== by 0x1EEB22: fetch_dispatch_job (fetch.c:156) -==18174== by 0x1EEB22: fetch_choose_and_dispatch (fetch.c:187) -==18174== by 0x1EEB22: fetch_dispatch_jobs (fetch.c:247) -==18174== by 0x1EF1BB: fetch_start (fetch.c:573) -==18174== by 0x26C779: llcache_object_refetch (llcache.c:916) -==18174== by 0x26D5E4: llcache_object_fetch (llcache.c:979) -==18174== by 0x26D5E4: llcache_object_retrieve_from_cache (llcache.c:1767) -==18174== by 0x26D5E4: llcache_object_retrieve (llcache.c:1865) -==18174== by 0x26E42C: llcache_fetch_redirect (llcache.c:2110) -==18174== by 0x26E42C: llcache_fetch_callback (llcache.c:2810) -==18174== by 0x1F1295: fetch_curl_process_headers (curl.c:922) -==18174== by 0x1F13A0: fetch_curl_data (curl.c:1324) -==18174== by 0x4ACD4C3: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AE00DA: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) ---- - content/fetchers/curl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c -index 7ce7c5b48..4602f6aea 100644 ---- a/netsurf/content/fetchers/curl.c -+++ b/netsurf/content/fetchers/curl.c -@@ -1519,6 +1519,10 @@ nserror fetch_curl_register(void) - if (nsoption_bool(suppress_curl_debug)) { - SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug); - } -+ -+ /* Currently we explode if curl uses HTTP2, so force 1.1. */ -+ SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); -+ - SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data); - SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header); - SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress); --- -cgit v1.2.1 - - -From 3d80e825e1c77ece19c21ed1cc568049856a44de Mon Sep 17 00:00:00 2001 -From: Daniel Silverstone <dsilvers@digital-scurf.org> -Date: Wed, 5 Jun 2019 19:51:47 +0100 -Subject: content/fetchers/curl.c: Defer fetch start if inside cURL - -In order to cope better with modern cURL which prevents making -cURL calls when inside a callback from within cURL, defer fetch -start when we are processing in `fetch_curl_data()`. - -Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org> ---- - content/fetchers/curl.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -(limited to 'content/fetchers/curl.c') - -diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c -index 63b9ea115..c039429a5 100644 ---- a/netsurf/content/fetchers/curl.c -+++ b/content/fetchers/curl.c -@@ -142,6 +142,9 @@ static char fetch_error_buffer[CURL_ERROR_SIZE]; - /** Proxy authentication details. */ - static char fetch_proxy_userpwd[100]; - -+/** Interlock to prevent initiation during callbacks */ -+static bool inside_curl = false; -+ - - /* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed - * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way -@@ -710,6 +713,9 @@ fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, CURL *handle) - code = fetch_curl_set_options(fetch); - if (code != CURLE_OK) { - fetch->curl_handle = 0; -+ /* The handle maybe went bad, eat it */ -+ NSLOG(netsurf, WARNING, "cURL handle maybe went bad, retry later"); -+ curl_easy_cleanup(handle); - return false; - } - -@@ -747,6 +753,10 @@ static CURL *fetch_curl_get_handle(lwc_string *host) - static bool fetch_curl_start(void *vfetch) - { - struct curl_fetch_info *fetch = (struct curl_fetch_info*)vfetch; -+ if (inside_curl) { -+ NSLOG(netsurf, DEBUG, "Deferring fetch because we're inside cURL"); -+ return false; -+ } - return fetch_curl_initiate_fetch(fetch, - fetch_curl_get_handle(fetch->host)); - } -@@ -1317,6 +1327,9 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) - CURLcode code; - fetch_msg msg; - -+ assert(inside_curl == false); -+ inside_curl = true; -+ - /* ensure we only have to get this information once */ - if (!f->http_code) { - code = curl_easy_getinfo(f->curl_handle, CURLINFO_HTTP_CODE, -@@ -1330,11 +1343,13 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) - */ - if (f->http_code == 401) { - f->http_code = 0; -+ inside_curl = false; - return size * nmemb; - } - - if (f->abort || (!f->had_headers && fetch_curl_process_headers(f))) { - f->stopped = true; -+ inside_curl = false; - return 0; - } - -@@ -1344,6 +1359,7 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) - msg.data.header_or_data.len = size * nmemb; - fetch_send_callback(&msg, f->fetch_handle); - -+ inside_curl = false; - if (f->abort) { - f->stopped = true; - return 0; --- -cgit v1.2.1 - - diff --git a/user/py3-jinja2/APKBUILD b/user/py3-jinja2/APKBUILD index 457262361..fae072169 100644 --- a/user/py3-jinja2/APKBUILD +++ b/user/py3-jinja2/APKBUILD @@ -5,14 +5,14 @@ _pkgname=Jinja2 _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" pkgver=2.10.1 -pkgrel=0 +pkgrel=1 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python." url="https://pypi.python.org/pypi/Jinja2" arch="noarch" license="BSD-3-Clause" -depends="python3" +depends="python3 py3-markupsafe" makedepends="python3-dev" -checkdepends="py3-pytest py3-markupsafe" +checkdepends="py3-pytest" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 3ced69237..ee82e5241 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vala -pkgver=0.44.6 +pkgver=0.44.7 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b0fa6da3b7ecfe5d6731e64a7803e3dde38e843c269e7bd0d9d92dbbba2823bd17689bceec3e2ee6cf8f7884a5e1e11e1699e98808a32fef2167221bdc7b8a2 vala-0.44.6.tar.xz" +sha512sums="5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77 vala-0.44.7.tar.xz" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index e6ac8c3cd..768d4218f 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=347 +pkgver=348 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -17,7 +17,6 @@ source="https://invisible-mirror.net/archives/xterm/xterm-$pkgver.tgz " build() { - cd "$builddir" LIBS="-ltinfow" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -41,9 +40,8 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4b90094c21b7af3042591939308538dc767d42718e9a6112115e6df12a974f8e3b7fba8d791d7c9557863fd07d08f2365fa7f759f7797f859a6fe5fe0852ab4e xterm-347.tgz +sha512sums="852896c0aba885bafc80baad899fc56910dce66bf5df6b3fef3f998efc33af9d30b68cfb0c92c7028365ac4944af3d3c198bc0e408ca09e949b993a79c1e6dd9 xterm-348.tgz e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" |