summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/dovecot/APKBUILD15
-rw-r--r--user/dovecot/apop.patch40
-rw-r--r--user/dovecot/test-file-cache-enomem.patch20
-rw-r--r--user/gtk+3.0/APKBUILD7
-rw-r--r--user/nfs-utils/rpc.statd.initd2
-rw-r--r--user/rpcbind/APKBUILD2
-rw-r--r--user/wayland-protocols/APKBUILD4
-rw-r--r--user/wayland/APKBUILD4
-rw-r--r--user/wlroots/APKBUILD37
-rw-r--r--user/xcb-util-errors/APKBUILD34
10 files changed, 110 insertions, 55 deletions
diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD
index 64ac365e5..b7aaceef8 100644
--- a/user/dovecot/APKBUILD
+++ b/user/dovecot/APKBUILD
@@ -5,10 +5,10 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=dovecot
-pkgver=2.3.11.3
+pkgver=2.3.13
_pkgvermajor=2.3
pkgrel=0
-_pigeonholever=0.5.11
+_pigeonholever=0.5.13
_pigeonholevermajor=${_pigeonholever%.*}
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -35,14 +35,17 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
split-protocols.patch
default-config.patch
ssl-paths.patch
+ test-file-cache-enomem.patch
time64.patch
- apop.patch
dovecot.logrotate
dovecot.initd
"
_builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever"
# secfixes:
+# 2.3.13-r0:
+# - CVE-2020-24386
+# - CVE-2020-25275
# 2.3.11.3-r0:
# - CVE-2020-12100
# - CVE-2020-12673
@@ -255,13 +258,13 @@ _submv() {
done
}
-sha512sums="d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb dovecot-2.3.11.3.tar.gz
-793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d dovecot-2.3-pigeonhole-0.5.11.tar.gz
+sha512sums="758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 dovecot-2.3.13.tar.gz
+fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 dovecot-2.3-pigeonhole-0.5.13.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f ssl-paths.patch
+277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9 test-file-cache-enomem.patch
ee2e1916c712db77409567b4ded9c7fb7dfed295e044c19694bc369af3d4a7086caf14e97809531f76b630bc578271af6e5137985b7d4e8d2afb2a71f800912f time64.patch
-7831276d17386b204ca3aed7fdd9439f00230aa345b367567133d568c07a92bec80ca7512c20b80f692f7f6809cf4a27398c9915aae763e0c9f641650540a73b apop.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
diff --git a/user/dovecot/apop.patch b/user/dovecot/apop.patch
deleted file mode 100644
index a75c770e5..000000000
--- a/user/dovecot/apop.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d1c5d356f36aaf9c32708cc6960fcaebe1cf6e63 Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Sun, 16 Aug 2020 20:32:03 +0100
-Subject: [PATCH] Fix APOP test failure on 32-bit systems
-
-The challenge timestamp is read as a hex number in mech_apop_auth_initial()
-so it should be written as hex, not decimal.
-
-Also fix compiler warnings for 32-bit architectures.
----
- src/auth/test-mech.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
-index cf05370035..db9f85ccfc 100644
---- a/src/auth/test-mech.c
-+++ b/src/auth/test-mech.c
-@@ -192,11 +192,11 @@ static void test_mech_handle_challenge(struct auth_request *request,
- }
-
- static inline const unsigned char *
--test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r)
-+test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r)
- {
- string_t *apop_challenge = t_str_new(128);
-
-- str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(),
-+ str_printfa(apop_challenge,"<%lx.%u.%"PRIxTIME_T"", (unsigned long) getpid(),
- connect_uid, process_start_time+10);
- str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26);
- *len_r = apop_challenge->used;
-@@ -323,7 +323,7 @@ static void test_mechs(void)
- struct test_case *test_case = &tests[running_test];
- const struct mech_module *mech = test_case->mech;
- struct auth_request *request;
-- const char *testname = t_strdup_printf("auth mech %s %d/%lu",
-+ const char *testname = t_strdup_printf("auth mech %s %d/%zu",
- mech->mech_name,
- running_test+1,
- N_ELEMENTS(tests));
diff --git a/user/dovecot/test-file-cache-enomem.patch b/user/dovecot/test-file-cache-enomem.patch
new file mode 100644
index 000000000..536b857de
--- /dev/null
+++ b/user/dovecot/test-file-cache-enomem.patch
@@ -0,0 +1,20 @@
+--- a/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000
++++ b/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000
+@@ -263,7 +263,7 @@
+ };
+ const char *errstr =
+ t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: "
+- "Cannot allocate memory", page_size);
++ "Out of memory", page_size);
+ test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ test_expect_error_string(errstr);
+ test_assert(file_cache_set_size(cache, 1024) == -1);
+@@ -271,7 +271,7 @@
+
+ /* same for mremap */
+ errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: "
+- "Cannot allocate memory", page_size*2);
++ "Out of memory", page_size*2);
+ test_assert(file_cache_set_size(cache, 1) == 0);
+ test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ test_expect_error_string(errstr);
diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD
index bbe467b5d..34e5efe4f 100644
--- a/user/gtk+3.0/APKBUILD
+++ b/user/gtk+3.0/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer:
pkgname=gtk+3.0
-pkgver=3.24.23
+pkgver=3.24.24
pkgrel=0
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
@@ -13,7 +13,7 @@ makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev
gobject-introspection-dev libepoxy-dev libice-dev libx11-dev
libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev
libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev pango-dev
- tiff-dev zlib-dev"
+ tiff-dev wayland-dev wayland-protocols libxkbcommon-dev zlib-dev"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz"
@@ -26,6 +26,7 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --enable-wayland-backend \
--enable-xkb \
--enable-xinerama \
--enable-xrandr \
@@ -48,4 +49,4 @@ package() {
rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1
}
-sha512sums="fe3d677f4922b4568ef406c318ac71e26aac22b808d8d42b516d0e142d38dc12bc97d8a903dfe3e819adf491b9437a49f34213bc67219bee92692e40c6ef564e gtk+-3.24.23.tar.xz"
+sha512sums="f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520 gtk+-3.24.24.tar.xz"
diff --git a/user/nfs-utils/rpc.statd.initd b/user/nfs-utils/rpc.statd.initd
index ea78b9aef..bd0e9cb8f 100644
--- a/user/nfs-utils/rpc.statd.initd
+++ b/user/nfs-utils/rpc.statd.initd
@@ -4,7 +4,7 @@
[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-rpc_bin=/sbin/rpc.statd
+rpc_bin=/usr/sbin/rpc.statd
rpc_pid=/var/run/rpc.statd.pid
depend() {
diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD
index a535b8c7a..383e98045 100644
--- a/user/rpcbind/APKBUILD
+++ b/user/rpcbind/APKBUILD
@@ -22,7 +22,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --bindir=/sbin \
+ --sbindir=/sbin \
--enable-warmstarts \
--with-statedir=/var/lib/rpcbind \
--with-rpcuser=rpc \
diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD
index 4addb5f3f..4b1d41ea4 100644
--- a/user/wayland-protocols/APKBUILD
+++ b/user/wayland-protocols/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=wayland-protocols
-pkgver=1.18
+pkgver=1.20
pkgrel=0
pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol"
url="https://wayland.freedesktop.org"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483 wayland-protocols-1.18.tar.xz"
+sha512sums="d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977 wayland-protocols-1.20.tar.xz"
diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD
index 6dd1f52ff..4036d6b96 100644
--- a/user/wayland/APKBUILD
+++ b/user/wayland/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Maintainer:
pkgname=wayland
-pkgver=1.17.0
+pkgver=1.18.0
pkgrel=0
pkgdesc="A computer display server protocol"
url="https://wayland.freedesktop.org"
@@ -44,4 +44,4 @@ dev() {
default_dev
}
-sha512sums="c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz"
+sha512sums="e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz"
diff --git a/user/wlroots/APKBUILD b/user/wlroots/APKBUILD
new file mode 100644
index 000000000..8af0de066
--- /dev/null
+++ b/user/wlroots/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor:
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+pkgname=wlroots
+pkgver=0.12.0
+pkgrel=0
+pkgdesc="Library for building Wayland compositors"
+url="https://swaywm.org/"
+arch="all"
+license="MIT"
+depends="wayland>=1.18.0"
+makedepends="cmake elogind-dev eudev-dev ffmpeg-dev libinput-dev
+ libxkbcommon-dev mesa-dev meson ninja pixman-dev wayland-dev>=1.18.0
+ wayland-protocols>=1.17.0 xcb-util-errors-dev xcb-util-wm-dev"
+subpackages="$pkgname-dev"
+source="https://github.com/swaywm/wlroots/releases/download/$pkgver/wlroots-$pkgver.tar.gz"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ -Dlogind-provider=elogind \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja -C output test
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415 wlroots-0.12.0.tar.gz"
diff --git a/user/xcb-util-errors/APKBUILD b/user/xcb-util-errors/APKBUILD
new file mode 100644
index 000000000..f9643b5b4
--- /dev/null
+++ b/user/xcb-util-errors/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor:
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+pkgname=xcb-util-errors
+pkgver=1.0
+pkgrel=0
+pkgdesc="XCB utility library for readable X errors"
+url="https://xcb.freedesktop.org/"
+arch="all"
+license="MIT"
+depends=""
+makedepends="automake autoconf xcb-util-dev"
+subpackages="$pkgname-dev"
+source="https://xcb.freedesktop.org/dist/xcb-util-errors-$pkgver.tar.bz2"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="479b731b7056313955db9471d37416c4c9ab8c4574214fe20b3c0bcc1f57812fc343af6b0196814caaa6cc848dd120c70fab2f142902125cba63a8386d32179d xcb-util-errors-1.0.tar.bz2"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-27 10:59:12 +0000