aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Adamski <michal@ert.pl>2022-05-14 14:06:00 +0200
committerMichał Adamski <michal@ert.pl>2022-05-14 14:06:00 +0200
commit1b66d9ca2492d4bcb0f40841ec6f4f70a1e707e2 (patch)
treefedc2d54efefa2e7ce997ba49090f4a5af25a766
parent03be10d0df44a64297bee71793ed5e79d0419b03 (diff)
parent2e98a97e399561761c0e6642c8fb4bf0816de857 (diff)
downloadaports-1b66d9ca2492d4bcb0f40841ec6f4f70a1e707e2.tar.gz
aports-1b66d9ca2492d4bcb0f40841ec6f4f70a1e707e2.tar.bz2
aports-1b66d9ca2492d4bcb0f40841ec6f4f70a1e707e2.tar.xz
Merge remote-tracking branch 'origin/master' into feature/bitcoin-wallet
-rw-r--r--community/abiword/APKBUILD2
-rw-r--r--community/aerc/APKBUILD2
-rw-r--r--community/age/APKBUILD2
-rw-r--r--community/aircrack-ng/APKBUILD10
-rw-r--r--community/akonadi/APKBUILD2
-rw-r--r--community/alembic/APKBUILD2
-rw-r--r--community/alertmanager/APKBUILD2
-rw-r--r--community/ali/APKBUILD2
-rw-r--r--community/alkimia/APKBUILD6
-rw-r--r--community/alpine-repo-tools/APKBUILD2
-rw-r--r--community/amfora/APKBUILD2
-rw-r--r--community/android-tools/APKBUILD2
-rw-r--r--community/ansible-lint/APKBUILD6
-rw-r--r--community/anytun/APKBUILD2
-rw-r--r--community/apache-arrow/APKBUILD16
-rw-r--r--community/apk-file/APKBUILD2
-rw-r--r--community/asio/APKBUILD2
-rw-r--r--community/aspcud/APKBUILD8
-rw-r--r--community/atools/APKBUILD2
-rw-r--r--community/autofs/0001-auto.master-change-paths-in-etc.patch42
-rw-r--r--community/autofs/0002-musl-backport-fixes.patch393
-rw-r--r--community/autofs/10-glibc.patch120
-rw-r--r--community/autofs/APKBUILD27
-rw-r--r--community/autofs/pid_t.patch14
-rw-r--r--community/bat/APKBUILD10
-rw-r--r--community/bird_exporter/APKBUILD2
-rw-r--r--community/bitcoin/APKBUILD6
-rw-r--r--community/blender/APKBUILD2
-rw-r--r--community/browserpass/APKBUILD2
-rw-r--r--community/buildah/APKBUILD2
-rw-r--r--community/bzrtp/APKBUILD17
-rw-r--r--community/cachefilesd/APKBUILD10
-rw-r--r--community/caddy/APKBUILD2
-rw-r--r--community/cage/APKBUILD9
-rw-r--r--community/cage/wlroots-0.15.patch351
-rw-r--r--community/calamares/APKBUILD2
-rw-r--r--community/calligra/APKBUILD6
-rw-r--r--community/calligra/poppler-22.03.patch110
-rw-r--r--community/calligra/poppler-22.04.patch95
-rw-r--r--community/ceph/APKBUILD2
-rw-r--r--community/cereal/APKBUILD2
-rw-r--r--community/chezmoi/APKBUILD6
-rw-r--r--community/chromium/APKBUILD53
-rw-r--r--community/chromium/fix-no-member-named-tie-in-namespace-std.patch29
-rw-r--r--community/chromium/gcc-arm.patch11
-rw-r--r--community/chromium/iwyu-add-utility-for-std-exchange.patch28
-rw-r--r--community/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch12
-rw-r--r--community/chromium/use-deprecated-ffmpeg-api.patch36
-rw-r--r--community/clamav/APKBUILD6
-rw-r--r--community/clickclack/APKBUILD4
-rw-r--r--community/cloudi/APKBUILD2
-rw-r--r--community/cni-plugin-dnsname/APKBUILD2
-rw-r--r--community/cni-plugin-flannel/APKBUILD2
-rw-r--r--community/cni-plugins/APKBUILD2
-rw-r--r--community/consul-template/APKBUILD2
-rw-r--r--community/consul/APKBUILD2
-rw-r--r--community/containerd/APKBUILD2
-rw-r--r--community/coredns/APKBUILD6
-rw-r--r--community/cosign/APKBUILD3
-rw-r--r--community/croc/APKBUILD2
-rw-r--r--community/curlie/APKBUILD2
-rw-r--r--community/dasel/APKBUILD2
-rw-r--r--community/dbus-cpp/APKBUILD2
-rw-r--r--community/delta/APKBUILD10
-rw-r--r--community/dendrite/APKBUILD2
-rw-r--r--community/dep/APKBUILD2
-rw-r--r--community/direnv/APKBUILD2
-rw-r--r--community/dnscrypt-proxy/APKBUILD2
-rw-r--r--community/dnsdist/APKBUILD2
-rw-r--r--community/docker-cli-buildx/APKBUILD2
-rw-r--r--community/docker-cli-compose/APKBUILD2
-rw-r--r--community/docker-credential-ecr-login/APKBUILD2
-rw-r--r--community/docker-registry/APKBUILD2
-rw-r--r--community/docker/APKBUILD2
-rw-r--r--community/dockviz/APKBUILD2
-rw-r--r--community/doctl/APKBUILD4
-rw-r--r--community/domoticz/APKBUILD2
-rw-r--r--community/drone/APKBUILD2
-rw-r--r--community/dub/APKBUILD5
-rw-r--r--community/easypki/APKBUILD2
-rw-r--r--community/editorconfig-checker/APKBUILD2
-rw-r--r--community/eigen/APKBUILD2
-rw-r--r--community/exempi/APKBUILD2
-rw-r--r--community/frei0r-plugins/APKBUILD24
-rw-r--r--community/frp/APKBUILD2
-rw-r--r--community/fzf/APKBUILD2
-rw-r--r--community/gajim/APKBUILD (renamed from testing/gajim/APKBUILD)6
-rw-r--r--community/gdal/APKBUILD12
-rw-r--r--community/gdnsd/APKBUILD37
-rw-r--r--community/gdnsd/dclists.patch32
-rwxr-xr-xcommunity/gdnsd/gdnsd.initd50
-rw-r--r--community/gedit-plugins/APKBUILD6
-rw-r--r--community/gedit/APKBUILD4
-rw-r--r--community/geth/APKBUILD2
-rw-r--r--community/ginkgo/APKBUILD2
-rw-r--r--community/git-lfs/APKBUILD2
-rw-r--r--community/git-lfs2/APKBUILD2
-rw-r--r--community/git-sizer/APKBUILD2
-rw-r--r--community/gitea/APKBUILD2
-rw-r--r--community/github-cli/APKBUILD6
-rw-r--r--community/gitlab-release-cli/APKBUILD2
-rw-r--r--community/gitlab-runner/APKBUILD2
-rw-r--r--community/glab/APKBUILD2
-rw-r--r--community/glide/APKBUILD2
-rw-r--r--community/gmnitohtml/APKBUILD2
-rw-r--r--community/gnome-software-plugin-apk/APKBUILD15
-rw-r--r--community/gnome-software/0001-gs-external-appstream-utils-use-external-appstream-s.patch8
-rw-r--r--community/gnome-software/0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch9
-rw-r--r--community/gnome-software/0003-appstream-implement-parsing-media_baseurl.patch148
-rw-r--r--community/gnome-software/0003-lib-cleanup-public-headers-and-mark-gs-test.h-as-pub.patch81
-rw-r--r--community/gnome-software/APKBUILD17
-rw-r--r--community/gnome-tour/APKBUILD8
-rw-r--r--community/gnss-share/APKBUILD2
-rw-r--r--community/go-bindata-assetfs/APKBUILD2
-rw-r--r--community/go-bindata/APKBUILD2
-rw-r--r--community/go-ipfs/APKBUILD2
-rw-r--r--community/go-md2man/APKBUILD2
-rw-r--r--community/go-msgauth/APKBUILD2
-rw-r--r--community/go-sendxmpp/APKBUILD4
-rw-r--r--community/go-task/APKBUILD2
-rw-r--r--community/go/APKBUILD6
-rw-r--r--community/gocryptfs/APKBUILD2
-rw-r--r--community/gogs/APKBUILD8
-rw-r--r--community/goimapnotify/APKBUILD2
-rw-r--r--community/gojq/APKBUILD2
-rw-r--r--community/gomplate/APKBUILD2
-rw-r--r--community/gomuks/APKBUILD2
-rw-r--r--community/gonic/APKBUILD2
-rw-r--r--community/gopass/APKBUILD2
-rw-r--r--community/gops/APKBUILD2
-rw-r--r--community/gotop/APKBUILD2
-rw-r--r--community/gource/APKBUILD2
-rw-r--r--community/govc/APKBUILD2
-rw-r--r--community/govendor/APKBUILD2
-rw-r--r--community/gpick/APKBUILD2
-rw-r--r--community/grafana-frontend/APKBUILD2
-rw-r--r--community/grafana/APKBUILD2
-rw-r--r--community/grpc/APKBUILD4
-rw-r--r--community/gst-editing-services/APKBUILD4
-rw-r--r--community/gst-libav/APKBUILD4
-rw-r--r--community/gst-plugins-bad/APKBUILD4
-rw-r--r--community/gst-plugins-good/APKBUILD20
-rw-r--r--community/gst-plugins-ugly/APKBUILD6
-rw-r--r--community/gtk4.0/APKBUILD4
-rw-r--r--community/hare/APKBUILD6
-rw-r--r--community/harec/APKBUILD6
-rw-r--r--community/hcloud/APKBUILD2
-rw-r--r--community/hd-idle/APKBUILD2
-rw-r--r--community/headlines/APKBUILD2
-rw-r--r--community/hey/APKBUILD2
-rw-r--r--community/hugo/APKBUILD2
-rw-r--r--community/hut/APKBUILD2
-rw-r--r--community/hydroxide/APKBUILD4
-rw-r--r--community/i2pd/APKBUILD2
-rw-r--r--community/icinga2/APKBUILD2
-rw-r--r--community/img/APKBUILD2
-rw-r--r--community/influxdb/APKBUILD2
-rw-r--r--community/inkscape/APKBUILD6
-rw-r--r--community/inkscape/poppler-22.03.patch60
-rw-r--r--community/inkscape/poppler-22.04.patch144
-rw-r--r--community/innoextract/APKBUILD2
-rw-r--r--community/intel-gmmlib/APKBUILD4
-rw-r--r--community/intel-media-driver/APKBUILD2
-rw-r--r--community/irtt/APKBUILD2
-rw-r--r--community/jool-modules-lts/APKBUILD2
-rw-r--r--community/k3s/APKBUILD2
-rw-r--r--community/k9s/APKBUILD2
-rw-r--r--community/kactivities-stats/APKBUILD2
-rw-r--r--community/kactivities/APKBUILD2
-rw-r--r--community/kactivitymanagerd/APKBUILD2
-rw-r--r--community/kdevelop/APKBUILD2
-rw-r--r--community/kdiff3/APKBUILD2
-rw-r--r--community/kea-hook-runscript/APKBUILD2
-rw-r--r--community/kea-hook-userchk-ldap/APKBUILD2
-rw-r--r--community/kea/APKBUILD2
-rw-r--r--community/kiln/APKBUILD8
-rw-r--r--community/kitinerary/APKBUILD2
-rw-r--r--community/kleopatra/APKBUILD2
-rw-r--r--community/krita/APKBUILD2
-rw-r--r--community/ktorrent/APKBUILD2
-rw-r--r--community/kubectx/APKBUILD2
-rw-r--r--community/lab/APKBUILD2
-rw-r--r--community/lagrange/APKBUILD4
-rw-r--r--community/lazygit/APKBUILD2
-rw-r--r--community/ledger/APKBUILD2
-rw-r--r--community/lego/APKBUILD2
-rw-r--r--community/libass/APKBUILD4
-rw-r--r--community/libcamera/APKBUILD2
-rw-r--r--community/libcdr/APKBUILD2
-rw-r--r--community/libcgroup/APKBUILD4
-rw-r--r--community/libcmis/APKBUILD2
-rw-r--r--community/libcouchbase/APKBUILD4
-rw-r--r--community/libdsme/APKBUILD6
-rw-r--r--community/libe-book/APKBUILD2
-rw-r--r--community/libetonyek/APKBUILD2
-rw-r--r--community/libixion/APKBUILD2
-rw-r--r--community/libkleo/APKBUILD2
-rw-r--r--community/libkml/APKBUILD2
-rw-r--r--community/libktorrent/APKBUILD2
-rw-r--r--community/libmbim/APKBUILD4
-rw-r--r--community/libmspub/APKBUILD2
-rw-r--r--community/libnymphcast/APKBUILD2
-rw-r--r--community/libodfgen/APKBUILD2
-rw-r--r--community/liborcus/APKBUILD2
-rw-r--r--community/libpagemaker/APKBUILD2
-rw-r--r--community/libphonenumber/APKBUILD2
-rw-r--r--community/libqmi/APKBUILD4
-rw-r--r--community/libreoffice/APKBUILD12
-rw-r--r--community/libreoffice/poppler-22.04.patch71
-rw-r--r--community/librevenge/APKBUILD2
-rw-r--r--community/libsigc++3/APKBUILD2
-rw-r--r--community/libstaroffice/APKBUILD2
-rw-r--r--community/libtorrent-rasterbar/APKBUILD2
-rw-r--r--community/libzmf/APKBUILD2
-rw-r--r--community/linux-tools/APKBUILD34
-rw-r--r--community/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch (renamed from main/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch)0
-rw-r--r--community/llvm11/APKBUILD (renamed from main/llvm11/APKBUILD)0
-rw-r--r--community/llvm11/fix-LLVMConfig-cmake-install-prefix.patch (renamed from main/llvm11/fix-LLVMConfig-cmake-install-prefix.patch)0
-rw-r--r--community/llvm11/fix-memory-mf_exec-on-aarch64.patch (renamed from main/llvm11/fix-memory-mf_exec-on-aarch64.patch)0
-rw-r--r--community/llvm11/gcc11.patch (renamed from main/llvm11/gcc11.patch)0
-rw-r--r--community/logstalgia/APKBUILD2
-rw-r--r--community/lucene++/APKBUILD2
-rw-r--r--community/lxd/APKBUILD2
-rw-r--r--community/matterbridge/APKBUILD2
-rw-r--r--community/mdds/APKBUILD2
-rw-r--r--community/meek/APKBUILD2
-rw-r--r--community/micro/APKBUILD2
-rw-r--r--community/miniflux/APKBUILD2
-rw-r--r--community/minify/APKBUILD2
-rw-r--r--community/mkvtoolnix/APKBUILD2
-rw-r--r--community/mnc/APKBUILD2
-rw-r--r--community/modemmanager/APKBUILD6
-rw-r--r--community/monero/APKBUILD2
-rw-r--r--community/mongodb-tools/APKBUILD2
-rw-r--r--community/mopidy/APKBUILD8
-rw-r--r--community/mpd/APKBUILD6
-rw-r--r--community/mpdscribble/APKBUILD2
-rw-r--r--community/mqttui/APKBUILD50
-rw-r--r--community/msgpack-cxx/APKBUILD2
-rw-r--r--community/mtxclient/APKBUILD2
-rw-r--r--community/mumble/APKBUILD4
-rw-r--r--community/mumble/Find-and-link-Poco-XML.patch40
-rw-r--r--community/mupen64plus/APKBUILD2
-rw-r--r--community/mycorrhiza/APKBUILD2
-rw-r--r--community/mygui/APKBUILD2
-rw-r--r--community/namecoin/APKBUILD2
-rw-r--r--community/ncmpcpp/APKBUILD2
-rw-r--r--community/nebula/APKBUILD2
-rw-r--r--community/net-cpp/APKBUILD2
-rw-r--r--community/networkmanager/APKBUILD6
-rw-r--r--community/nextcloud/APKBUILD6
-rw-r--r--community/nextcloud23/APKBUILD (renamed from community/nextcloud22/APKBUILD)20
-rw-r--r--community/nextcloud23/disable-integrity-check-as-default.patch (renamed from community/nextcloud22/disable-integrity-check-as-default.patch)0
-rw-r--r--community/nextcloud23/dont-update-htaccess.patch (renamed from community/nextcloud22/dont-update-htaccess.patch)0
-rw-r--r--community/nextcloud23/fpm-pool.conf (renamed from community/nextcloud22/fpm-pool.conf)0
-rw-r--r--community/nextcloud23/nextcloud-dont-chmod.patch (renamed from community/nextcloud22/nextcloud-dont-chmod.patch)0
-rw-r--r--community/nextcloud23/nextcloud23-config.php (renamed from community/nextcloud22/nextcloud22-config.php)0
-rw-r--r--community/nextcloud23/nextcloud23-initscript.post-install (renamed from community/nextcloud22/nextcloud22-initscript.post-install)0
-rw-r--r--community/nextcloud23/nextcloud23-mysql.cnf (renamed from community/nextcloud22/nextcloud22-mysql.cnf)0
-rw-r--r--community/nextcloud23/nextcloud23.confd (renamed from community/nextcloud22/nextcloud22.confd)0
-rw-r--r--community/nextcloud23/nextcloud23.cron (renamed from community/nextcloud22/nextcloud22.cron)0
-rw-r--r--community/nextcloud23/nextcloud23.logrotate (renamed from community/nextcloud22/nextcloud22.logrotate)0
-rw-r--r--community/nextcloud23/nextcloud23.post-upgrade (renamed from community/nextcloud22/nextcloud22.post-upgrade)0
-rw-r--r--community/nextcloud23/nextcloud23.pre-install (renamed from community/nextcloud22/nextcloud22.pre-install)0
-rw-r--r--community/nextcloud23/nextcloud23.pre-upgrade (renamed from community/nextcloud22/nextcloud22.pre-upgrade)0
-rw-r--r--community/nextcloud23/occ (renamed from community/nextcloud22/occ)0
-rw-r--r--community/nextcloud23/use-external-docs-if-local-not-avail.patch (renamed from community/nextcloud22/use-external-docs-if-local-not-avail.patch)0
-rw-r--r--community/nfpm/APKBUILD2
-rw-r--r--community/nheko/APKBUILD2
-rw-r--r--community/nomad/APKBUILD2
-rw-r--r--community/numix-icon-theme-circle/APKBUILD4
-rw-r--r--community/nut/APKBUILD (renamed from testing/nut/APKBUILD)12
-rw-r--r--community/nut/nut.pre-install (renamed from testing/nut/nut.pre-install)0
-rw-r--r--community/nut/upsd.initd (renamed from testing/nut/upsd.initd)0
-rw-r--r--community/nut/upsmon.initd (renamed from testing/nut/upsmon.initd)0
-rw-r--r--community/nvui/APKBUILD2
-rw-r--r--community/nymphrpc/APKBUILD2
-rw-r--r--community/olm/APKBUILD11
-rw-r--r--community/omxplayer/APKBUILD2
-rw-r--r--community/openexr/APKBUILD2
-rw-r--r--community/openimageio/APKBUILD2
-rw-r--r--community/openjdk11/APKBUILD18
-rw-r--r--community/openjdk17/APKBUILD13
-rw-r--r--community/openjdk8/APKBUILD45
-rw-r--r--community/openmw/APKBUILD2
-rw-r--r--community/openring/APKBUILD2
-rw-r--r--community/openscenegraph/APKBUILD2
-rw-r--r--community/opensmtpd-filter-rspamd/APKBUILD2
-rw-r--r--community/opensmtpd-filter-senderscore/APKBUILD2
-rw-r--r--community/openvdb/APKBUILD2
-rw-r--r--community/osl/APKBUILD2
-rw-r--r--community/packer/APKBUILD2
-rw-r--r--community/pamixer/APKBUILD2
-rw-r--r--community/pdal/APKBUILD6
-rw-r--r--community/pdns-recursor/APKBUILD2
-rw-r--r--community/pdns/APKBUILD2
-rw-r--r--community/pebble/APKBUILD2
-rw-r--r--community/perl-datetime-format-natural/APKBUILD6
-rw-r--r--community/perl-par-packer/APKBUILD8
-rw-r--r--community/php8-pecl-couchbase/APKBUILD14
-rw-r--r--community/php8-pecl-couchbase/cmake-build-type.patch11
-rw-r--r--community/php8-pecl-couchbase/cmake-fix-cache.patch11
-rw-r--r--community/php8/APKBUILD10
-rw-r--r--community/php8/content-encoding.patch42
-rw-r--r--community/php8/fix-curl-7.83-test.patch (renamed from testing/php81/fix-curl-7.83-test.patch)0
-rw-r--r--community/php81-brotli/APKBUILD (renamed from testing/php81-brotli/APKBUILD)0
-rw-r--r--community/php81-pecl-amqp/APKBUILD (renamed from testing/php81-pecl-amqp/APKBUILD)0
-rw-r--r--community/php81-pecl-apcu/APKBUILD (renamed from testing/php81-pecl-apcu/APKBUILD)0
-rw-r--r--community/php81-pecl-ast/APKBUILD (renamed from testing/php81-pecl-ast/APKBUILD)0
-rw-r--r--community/php81-pecl-couchbase/APKBUILD (renamed from testing/php81-pecl-couchbase/APKBUILD)18
-rw-r--r--community/php81-pecl-couchbase/cmake-build-type.patch11
-rw-r--r--community/php81-pecl-couchbase/cmake-fix-cache.patch11
-rw-r--r--community/php81-pecl-event/APKBUILD (renamed from testing/php81-pecl-event/APKBUILD)0
-rw-r--r--community/php81-pecl-igbinary/APKBUILD (renamed from testing/php81-pecl-igbinary/APKBUILD)0
-rw-r--r--community/php81-pecl-imagick/APKBUILD (renamed from testing/php81-pecl-imagick/APKBUILD)0
-rw-r--r--community/php81-pecl-lzf/APKBUILD (renamed from testing/php81-pecl-lzf/APKBUILD)0
-rw-r--r--community/php81-pecl-mailparse/APKBUILD (renamed from testing/php81-pecl-mailparse/APKBUILD)0
-rw-r--r--community/php81-pecl-maxminddb/APKBUILD (renamed from testing/php81-pecl-maxminddb/APKBUILD)0
-rw-r--r--community/php81-pecl-memcache/APKBUILD (renamed from testing/php81-pecl-memcache/APKBUILD)0
-rw-r--r--community/php81-pecl-memcache/version-fix.patch (renamed from testing/php81-pecl-memcache/version-fix.patch)0
-rw-r--r--community/php81-pecl-memcached/APKBUILD (renamed from testing/php81-pecl-memcached/APKBUILD)0
-rw-r--r--community/php81-pecl-mongodb/APKBUILD (renamed from testing/php81-pecl-mongodb/APKBUILD)0
-rw-r--r--community/php81-pecl-msgpack/APKBUILD (renamed from testing/php81-pecl-msgpack/APKBUILD)0
-rw-r--r--community/php81-pecl-msgpack/msgpack-162.patch (renamed from testing/php81-pecl-msgpack/msgpack-162.patch)0
-rw-r--r--community/php81-pecl-protobuf/APKBUILD (renamed from testing/php81-pecl-protobuf/APKBUILD)0
-rw-r--r--community/php81-pecl-psr/APKBUILD (renamed from testing/php81-pecl-psr/APKBUILD)0
-rw-r--r--community/php81-pecl-rdkafka/APKBUILD (renamed from testing/php81-pecl-rdkafka/APKBUILD)0
-rw-r--r--community/php81-pecl-redis/APKBUILD (renamed from testing/php81-pecl-redis/APKBUILD)0
-rw-r--r--community/php81-pecl-ssh2/APKBUILD (renamed from testing/php81-pecl-ssh2/APKBUILD)0
-rw-r--r--community/php81-pecl-swoole/APKBUILD (renamed from testing/php81-pecl-swoole/APKBUILD)0
-rw-r--r--community/php81-pecl-uploadprogress/APKBUILD (renamed from testing/php81-pecl-uploadprogress/APKBUILD)0
-rw-r--r--community/php81-pecl-uuid/APKBUILD (renamed from testing/php81-pecl-uuid/APKBUILD)0
-rw-r--r--community/php81-pecl-vips/APKBUILD (renamed from testing/php81-pecl-vips/APKBUILD)0
-rw-r--r--community/php81-pecl-xdebug/APKBUILD (renamed from testing/php81-pecl-xdebug/APKBUILD)0
-rw-r--r--community/php81-pecl-xhprof/APKBUILD (renamed from testing/php81-pecl-xhprof/APKBUILD)0
-rw-r--r--community/php81-pecl-yaml/APKBUILD (renamed from testing/php81-pecl-yaml/APKBUILD)0
-rw-r--r--community/php81-pecl-zstd/APKBUILD (renamed from testing/php81-pecl-zstd/APKBUILD)0
-rw-r--r--community/php81/APKBUILD (renamed from testing/php81/APKBUILD)8
-rw-r--r--community/php81/atomic-lsapi.patch (renamed from testing/php81/atomic-lsapi.patch)0
-rw-r--r--community/php81/disabled-tests.list (renamed from testing/php81/disabled-tests.list)0
-rw-r--r--community/php81/fix-curl-7.83-test.patch25
-rw-r--r--community/php81/fix-tests-devserver.patch (renamed from testing/php81/fix-tests-devserver.patch)0
-rw-r--r--community/php81/includedir.patch (renamed from testing/php81/includedir.patch)0
-rw-r--r--community/php81/install-pear.patch (renamed from testing/php81/install-pear.patch)0
-rw-r--r--community/php81/php81-fpm-version-suffix.patch (renamed from testing/php81/php81-fpm-version-suffix.patch)0
-rw-r--r--community/php81/php81-fpm.initd (renamed from testing/php81/php81-fpm.initd)0
-rw-r--r--community/php81/php81-fpm.logrotate (renamed from testing/php81/php81-fpm.logrotate)0
-rw-r--r--community/php81/php81-module.conf (renamed from testing/php81/php81-module.conf)0
-rw-r--r--community/php81/sharedir.patch (renamed from testing/php81/sharedir.patch)0
-rw-r--r--community/php81/xfail-openssl-1.1-test.patch (renamed from testing/php81/xfail-openssl-1.1-test.patch)0
-rw-r--r--community/phpmyadmin/APKBUILD4
-rw-r--r--community/piknik/APKBUILD2
-rw-r--r--community/plantuml/APKBUILD4
-rw-r--r--community/plasma-phonebook/APKBUILD4
-rw-r--r--community/poco/APKBUILD23
-rw-r--r--community/podman/APKBUILD2
-rw-r--r--community/poedit/APKBUILD2
-rw-r--r--community/poppler-qt5/APKBUILD4
-rw-r--r--community/portablexdr/APKBUILD13
-rw-r--r--community/postgis/APKBUILD2
-rw-r--r--community/process-cpp/APKBUILD2
-rw-r--r--community/prometheus-node-exporter/APKBUILD2
-rw-r--r--community/prometheus-snmp-exporter/APKBUILD24
-rw-r--r--community/prometheus/APKBUILD2
-rw-r--r--community/prosody-filer/APKBUILD2
-rw-r--r--community/pup/APKBUILD2
-rw-r--r--community/pushgateway/APKBUILD2
-rw-r--r--community/py3-airium/APKBUILD (renamed from testing/py3-airium/APKBUILD)4
-rw-r--r--community/py3-airium/exclude-tests.patch11
-rw-r--r--community/py3-ansible-compat/APKBUILD8
-rw-r--r--community/py3-apache-arrow/APKBUILD (renamed from testing/py3-apache-arrow/APKBUILD)17
-rw-r--r--community/py3-awesomeversion/APKBUILD4
-rw-r--r--community/py3-css-parser/10-remove-tests.patch (renamed from testing/py3-css-parser/10-remove-tests.patch)0
-rw-r--r--community/py3-css-parser/APKBUILD (renamed from testing/py3-css-parser/APKBUILD)0
-rw-r--r--community/py3-faker/APKBUILD4
-rw-r--r--community/py3-gst/APKBUILD4
-rw-r--r--community/py3-h2/APKBUILD12
-rw-r--r--community/py3-h2/hypothesis-6.6.patch109
-rw-r--r--community/py3-h2/skip-broken-tests.patch38
-rw-r--r--community/py3-matplotlib/APKBUILD12
-rw-r--r--community/py3-matplotlib/freetype.patch36
-rw-r--r--community/py3-mypy/APKBUILD10
-rw-r--r--community/py3-nbxmpp/APKBUILD (renamed from testing/py3-nbxmpp/APKBUILD)4
-rw-r--r--community/py3-niaaml/APKBUILD (renamed from testing/py3-niaaml/APKBUILD)4
-rw-r--r--community/py3-niaaml/do-not-package-tests.patch24
-rw-r--r--community/py3-niapy/APKBUILD (renamed from testing/py3-niapy/APKBUILD)0
-rw-r--r--community/py3-oci/APKBUILD4
-rw-r--r--community/py3-oletools/APKBUILD10
-rw-r--r--community/py3-openpyxl/APKBUILD (renamed from testing/py3-openpyxl/APKBUILD)0
-rw-r--r--community/py3-precis-i18n/APKBUILD (renamed from testing/py3-precis-i18n/APKBUILD)0
-rw-r--r--community/py3-pybind11/APKBUILD2
-rw-r--r--community/py3-pyswarms/APKBUILD (renamed from testing/py3-pyswarms/APKBUILD)1
-rw-r--r--community/py3-rasterio/APKBUILD2
-rw-r--r--community/py3-regex/APKBUILD10
-rw-r--r--community/py3-tcxreader/APKBUILD (renamed from testing/py3-tcxreader/APKBUILD)0
-rw-r--r--community/qbittorrent/APKBUILD2
-rw-r--r--community/quassel/APKBUILD2
-rw-r--r--community/rclone/APKBUILD2
-rw-r--r--community/rest-server/APKBUILD2
-rw-r--r--community/restic/APKBUILD2
-rw-r--r--community/riot-web/APKBUILD4
-rw-r--r--community/rippled/APKBUILD2
-rw-r--r--community/rocs/APKBUILD2
-rw-r--r--community/rtl8821ce-lts/APKBUILD2
-rw-r--r--community/rtpengine-lts/APKBUILD2
-rw-r--r--community/runc/APKBUILD10
-rw-r--r--community/rust-analyzer/APKBUILD6
-rw-r--r--community/sbctl/APKBUILD2
-rw-r--r--community/scribus/APKBUILD12
-rw-r--r--community/scribus/poppler-22.02-1.patch130
-rw-r--r--community/scribus/poppler-22.02-2.patch29
-rw-r--r--community/scribus/poppler-22.03.patch35
-rw-r--r--community/scribus/poppler-22.04.patch289
-rw-r--r--community/shfmt/APKBUILD6
-rw-r--r--community/skopeo/APKBUILD2
-rw-r--r--community/sleep-inhibitor/APKBUILD6
-rw-r--r--community/sshign/APKBUILD2
-rw-r--r--community/starship/APKBUILD12
-rw-r--r--community/starship/minimize-size.patch2
-rw-r--r--community/starship/use-libdbus.patch12
-rw-r--r--community/staticcheck/APKBUILD2
-rw-r--r--community/stellarium/APKBUILD2
-rw-r--r--community/step-cli/APKBUILD2
-rw-r--r--community/supercronic/APKBUILD2
-rw-r--r--community/superd/APKBUILD2
-rw-r--r--community/supertux/APKBUILD2
-rw-r--r--community/syncthing/APKBUILD2
-rw-r--r--community/tailscale/APKBUILD2
-rw-r--r--community/tcsh/APKBUILD4
-rw-r--r--community/tea/APKBUILD2
-rw-r--r--community/telegraf/APKBUILD2
-rw-r--r--community/termshark/APKBUILD2
-rw-r--r--community/terraform/APKBUILD30
-rw-r--r--community/thonny/APKBUILD5
-rw-r--r--community/thrift/APKBUILD2
-rw-r--r--community/tlstunnel/APKBUILD2
-rw-r--r--community/traefik/APKBUILD2
-rw-r--r--community/tut/APKBUILD6
-rw-r--r--community/tz/APKBUILD2
-rw-r--r--community/uarmsolver/APKBUILD (renamed from testing/uarmsolver/APKBUILD)0
-rw-r--r--community/uarmsolver/fix-uint.patch (renamed from testing/uarmsolver/fix-uint.patch)0
-rw-r--r--community/ugrep/APKBUILD4
-rw-r--r--community/umoci/APKBUILD2
-rw-r--r--community/v2ray/APKBUILD2
-rw-r--r--community/valhalla/APKBUILD2
-rw-r--r--community/vault/APKBUILD2
-rw-r--r--community/vectorscan/APKBUILD2
-rw-r--r--community/vicious/APKBUILD4
-rw-r--r--community/victoria-metrics/APKBUILD2
-rw-r--r--community/viddy/APKBUILD2
-rw-r--r--community/vigra/APKBUILD2
-rw-r--r--community/vouch-proxy/APKBUILD2
-rw-r--r--community/vtk/APKBUILD2
-rw-r--r--community/waf/APKBUILD8
-rw-r--r--community/wait4x/APKBUILD2
-rw-r--r--community/wasi-compiler-rt/APKBUILD6
-rw-r--r--community/wasi-libc/APKBUILD10
-rw-r--r--community/wasi-libcxx/APKBUILD6
-rwxr-xr-xcommunity/webhook/APKBUILD2
-rw-r--r--community/websocketd/APKBUILD2
-rw-r--r--community/widelands/APKBUILD2
-rw-r--r--community/wlcs/APKBUILD2
-rw-r--r--community/wlroots0.14/APKBUILD49
-rw-r--r--community/writefreely/APKBUILD2
-rw-r--r--community/wt/APKBUILD2
-rw-r--r--community/wuzz/APKBUILD2
-rw-r--r--community/xarchiver/APKBUILD6
-rw-r--r--community/xdg-desktop-portal-gtk/APKBUILD12
-rw-r--r--community/xdg-desktop-portal/APKBUILD9
-rw-r--r--community/xe-guest-utilities/APKBUILD2
-rw-r--r--community/xfce4-terminal/APKBUILD4
-rw-r--r--community/yarn/APKBUILD4
-rw-r--r--community/yggdrasil/APKBUILD2
-rw-r--r--community/yq/APKBUILD2
-rw-r--r--community/yubikey-touch-detector/APKBUILD2
-rw-r--r--community/zabbix/APKBUILD2
-rw-r--r--community/zanshin/APKBUILD2
-rw-r--r--community/zathura-cb/APKBUILD4
-rw-r--r--main/alpine-conf/APKBUILD4
-rw-r--r--main/boost1.77/APKBUILD42
-rw-r--r--main/boost1.77/boost-1.77-geometry.patch1320
-rw-r--r--main/boost1.77/boost-1.77-math-deprecated-include.patch40
-rw-r--r--main/boost1.78/0001-revert-cease-dependence-on-range.patch49
-rw-r--r--main/boost1.78/APKBUILD229
-rw-r--r--main/boost1.78/bjam-no-skip-install.patch73
-rw-r--r--main/boost1.78/boost-1.57.0-python-abi_letters.patch62
-rw-r--r--main/boost1.78/boost-1.57.0-python-libpython_dep.patch13
-rw-r--r--main/boost1.78/boost-1.78.0-interprocess-musl-include.patch23
-rw-r--r--main/botan/APKBUILD2
-rw-r--r--main/clucene/APKBUILD2
-rw-r--r--main/curl/APKBUILD15
-rw-r--r--main/dahdi-linux-lts/APKBUILD2
-rw-r--r--main/dmraid/APKBUILD12
-rw-r--r--main/doxygen/APKBUILD6
-rw-r--r--main/encfs/APKBUILD2
-rw-r--r--main/freetds/APKBUILD4
-rw-r--r--main/fribidi/APKBUILD4
-rw-r--r--main/fuse3/APKBUILD6
-rw-r--r--main/gst-plugins-base/APKBUILD4
-rw-r--r--main/gstreamer/APKBUILD4
-rw-r--r--main/haproxy/APKBUILD4
-rw-r--r--main/highlight/APKBUILD2
-rw-r--r--main/htop/APKBUILD4
-rw-r--r--main/intel-ucode/APKBUILD6
-rw-r--r--main/itstool/APKBUILD4
-rw-r--r--main/json-c/APKBUILD6
-rw-r--r--main/kamailio/APKBUILD8
-rw-r--r--main/kamailio/fix-openldap-2.5-symbol-conflict.patch46
-rw-r--r--main/keyutils/APKBUILD4
-rw-r--r--main/knot/APKBUILD2
-rw-r--r--main/libcap-ng/APKBUILD10
-rw-r--r--main/libcap/APKBUILD4
-rw-r--r--main/libmaxminddb/APKBUILD4
-rw-r--r--main/libnetfilter_log/APKBUILD25
-rw-r--r--main/libnetfilter_log/sys-types.patch21
-rw-r--r--main/libnetfilter_log/sys-types2.patch14
-rw-r--r--main/libsecret/APKBUILD9
-rw-r--r--main/libwebsockets/APKBUILD26
-rw-r--r--main/libxml2/APKBUILD6
-rw-r--r--main/linux-firmware/APKBUILD4
-rw-r--r--main/linux-lts/APKBUILD4
-rw-r--r--main/llvm13/APKBUILD4
-rw-r--r--main/lttng-ust/APKBUILD4
-rw-r--r--main/lua-resty-core/APKBUILD4
-rw-r--r--main/lua5.4/APKBUILD2
-rw-r--r--main/multipath-tools/APKBUILD2
-rw-r--r--main/nagios-plugins/APKBUILD12
-rw-r--r--main/nagios-plugins/check_mysql_query-fix-use-after-free.patch33
-rw-r--r--main/npm/APKBUILD4
-rw-r--r--main/nsd/APKBUILD4
-rw-r--r--main/openssl/APKBUILD6
-rw-r--r--main/openssl3/APKBUILD9
-rw-r--r--main/p11-kit/APKBUILD6
-rw-r--r--main/parted/APKBUILD12
-rw-r--r--main/parted/fix-truncate-tests.patch48
-rw-r--r--main/parted/make-tests.patch13
-rw-r--r--main/parted/skip-duplicate-bsd-test-on-s390x.patch20
-rw-r--r--main/pcsc-lite/APKBUILD8
-rw-r--r--main/perl-cgi/APKBUILD5
-rw-r--r--main/perl-dbix-searchbuilder/APKBUILD6
-rw-r--r--main/perl-devel-checklib/APKBUILD10
-rw-r--r--main/perl-http-daemon/APKBUILD4
-rw-r--r--main/perl-inline-c/APKBUILD17
-rw-r--r--main/perl-javascript-minifier-xs/APKBUILD8
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-net-http/APKBUILD6
-rw-r--r--main/perl-test-manifest/APKBUILD6
-rw-r--r--main/pjproject/APKBUILD11
-rw-r--r--main/poppler/APKBUILD11
-rw-r--r--main/postgresql14/APKBUILD8
-rw-r--r--main/ppp/APKBUILD13
-rw-r--r--main/py3-elementpath/APKBUILD4
-rw-r--r--main/py3-gobject3/APKBUILD6
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-snowballstemmer/APKBUILD8
-rw-r--r--main/rdiff-backup/APKBUILD3
-rw-r--r--main/rlog/APKBUILD33
-rw-r--r--main/source-highlight/APKBUILD2
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/tcpflow/APKBUILD2
-rw-r--r--main/thin-provisioning-tools/APKBUILD2
-rw-r--r--main/unixodbc/APKBUILD12
-rw-r--r--main/userspace-rcu/APKBUILD11
-rw-r--r--main/valgrind/APKBUILD19
-rw-r--r--main/xfsprogs/APKBUILD6
-rw-r--r--main/xl2tpd/APKBUILD8
-rw-r--r--main/xmlrpc-c/APKBUILD24
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-rw-r--r--main/zfs-lts/APKBUILD2
-rw-r--r--testing/6cord/APKBUILD2
-rw-r--r--testing/acmetool/APKBUILD2
-rw-r--r--testing/alpine-lift/APKBUILD2
-rw-r--r--testing/amule/APKBUILD2
-rw-r--r--testing/antibody/APKBUILD2
-rw-r--r--testing/apko/APKBUILD2
-rw-r--r--testing/aports-glmr/APKBUILD2
-rw-r--r--testing/apptainer/APKBUILD6
-rw-r--r--testing/ardour/APKBUILD5
-rw-r--r--testing/aspell-es/APKBUILD29
-rw-r--r--testing/atuin/APKBUILD170
-rw-r--r--testing/atuin/atuin-server.pre-install6
-rw-r--r--testing/atuin/atuin.confd19
-rw-r--r--testing/atuin/atuin.initd35
-rw-r--r--testing/atuin/atuin.logrotate6
-rw-r--r--testing/atuin/atuin.post-install7
-rw-r--r--testing/atuin/cargo-lock.patch1174
-rw-r--r--testing/atuin/cleanup-deps.patch21
-rw-r--r--testing/atuin/dont-create-config-dir-if-not-needed.patch45
-rw-r--r--testing/atuin/dont-pollute-shell-env.patch40
-rw-r--r--testing/atuin/server-log-without-ansi-style.patch16
-rw-r--r--testing/atuin/sqlx-use-system-libsqlite.patch15
-rw-r--r--testing/atuin/standalone-server.patch51
-rw-r--r--testing/atuin/use-system-tls.patch23
-rw-r--r--testing/bettercap/APKBUILD15
-rw-r--r--testing/bigbang/APKBUILD24
-rw-r--r--testing/bigbang/gcc11.patch10
-rw-r--r--testing/bigbang/werror.patch11
-rw-r--r--testing/blackbox_exporter/APKBUILD2
-rw-r--r--testing/blocky/APKBUILD2
-rw-r--r--testing/bombadillo/APKBUILD2
-rw-r--r--testing/booster/APKBUILD2
-rw-r--r--testing/boringproxy/APKBUILD2
-rw-r--r--testing/btcd/APKBUILD2
-rw-r--r--testing/btfs/APKBUILD2
-rw-r--r--testing/bzip3/APKBUILD39
-rw-r--r--testing/catcodec/APKBUILD5
-rw-r--r--testing/ceph17/APKBUILD2
-rw-r--r--testing/cfssl/APKBUILD2
-rw-r--r--testing/cgal/APKBUILD2
-rw-r--r--testing/chathistorysync/APKBUILD2
-rw-r--r--testing/cimg/APKBUILD4
-rw-r--r--testing/clash/APKBUILD2
-rw-r--r--testing/clementine/APKBUILD2
-rw-r--r--testing/cliphist/APKBUILD2
-rw-r--r--testing/clipman/APKBUILD2
-rw-r--r--testing/cloudflared/APKBUILD2
-rw-r--r--testing/cloudfoundry-cli/APKBUILD2
-rw-r--r--testing/codeblocks/APKBUILD2
-rw-r--r--testing/coin/APKBUILD2
-rw-r--r--testing/comics-downloader/APKBUILD2
-rw-r--r--testing/conntracct/APKBUILD2
-rw-r--r--testing/consul-replicate/APKBUILD2
-rw-r--r--testing/corerad/APKBUILD2
-rw-r--r--testing/cri-o/APKBUILD2
-rw-r--r--testing/cri-tools/APKBUILD2
-rw-r--r--testing/crowdsec/APKBUILD2
-rw-r--r--testing/ctop/APKBUILD2
-rw-r--r--testing/delve/APKBUILD2
-rw-r--r--testing/digikam/0001-Fix-build-with-akonadi-contacts-22.04.patch28
-rw-r--r--testing/digikam/APKBUILD90
-rw-r--r--testing/distrobuilder/APKBUILD2
-rw-r--r--testing/dive/APKBUILD2
-rw-r--r--testing/docker-volume-local-persist/APKBUILD2
-rw-r--r--testing/dockerize/APKBUILD2
-rw-r--r--testing/doggo/APKBUILD2
-rw-r--r--testing/dotnet5-bootstrap/APKBUILD354
-rw-r--r--testing/dotnet5-bootstrap/README.md12
-rw-r--r--testing/dotnet5-bootstrap/application-insights_fix-net40-location.patch22
-rw-r--r--testing/dotnet5-bootstrap/build_darc-fix-alpine.patch32
-rw-r--r--testing/dotnet5-bootstrap/build_musl-build.patch75
-rw-r--r--testing/dotnet5-bootstrap/installer_forgotten-MicrosoftAspNetCoreAppRuntimePac.patch29
-rw-r--r--testing/dotnet5-bootstrap/references_sh-build-fix.patch27
-rw-r--r--testing/dotnet5-bootstrap/roslyn_added-previously-built-artifacts-repo.patch30
-rw-r--r--testing/dotnet5-bootstrap/runtime_add-rid-for-alpine-315.patch190
-rw-r--r--testing/dotnet5-bootstrap/runtime_link-order.patch34
-rw-r--r--testing/dotnet5-bootstrap/runtime_non-portable-distrorid-fix-alpine.patch30
-rw-r--r--testing/dotnet5-bootstrap/runtime_use-latest-microsoftnetcoreplatformspackage.patch31
-rw-r--r--testing/dotnet5-bootstrap/sdk_add-zsh-compdef-completion-script.patch35
-rw-r--r--testing/dotnet5-bootstrap/sdk_telemetry-optout.patch26
-rw-r--r--testing/dotnet5-build/APKBUILD354
-rw-r--r--testing/dotnet5-build/README.md17
-rw-r--r--testing/dotnet5-build/application-insights_fix-net40-location.patch22
-rw-r--r--testing/dotnet5-build/build_darc-fix-alpine.patch32
-rw-r--r--testing/dotnet5-build/build_musl-build.patch75
-rw-r--r--testing/dotnet5-build/installer_forgotten-MicrosoftAspNetCoreAppRuntimePac.patch29
-rw-r--r--testing/dotnet5-build/references_sh-build-fix.patch27
-rw-r--r--testing/dotnet5-build/roslyn_added-previously-built-artifacts-repo.patch30
-rw-r--r--testing/dotnet5-build/runtime_add-rid-for-alpine-315.patch190
-rw-r--r--testing/dotnet5-build/runtime_add-rid-for-alpine-316.patch208
-rw-r--r--testing/dotnet5-build/runtime_clang13-support.patch79
-rw-r--r--testing/dotnet5-build/runtime_fix-musl-123.patch389
-rw-r--r--testing/dotnet5-build/runtime_link-order.patch34
-rw-r--r--testing/dotnet5-build/runtime_non-portable-distrorid-fix-alpine.patch30
-rw-r--r--testing/dotnet5-build/runtime_use-latest-microsoftnetcoreplatformspackage.patch31
-rw-r--r--testing/dotnet5-build/sdk_add-zsh-compdef-completion-script.patch35
-rw-r--r--testing/dotnet5-build/sdk_telemetry-optout.patch26
-rw-r--r--testing/dotnet5-runtime/APKBUILD139
-rw-r--r--testing/dotnet5-runtime/README.md25
-rw-r--r--testing/dotnet5-runtime/dotnet.sh12
-rw-r--r--testing/dotnet5-sdk/APKBUILD124
-rw-r--r--testing/dotnet5-sdk/README.md19
-rw-r--r--testing/dotnet5-stage0/APKBUILD195
-rw-r--r--testing/dotnet5-stage0/README.md18
-rw-r--r--testing/drone-cli/APKBUILD2
-rw-r--r--testing/dsnet/APKBUILD2
-rw-r--r--testing/dstask/APKBUILD2
-rw-r--r--testing/duf/APKBUILD2
-rw-r--r--testing/dune-configurator/APKBUILD65
-rw-r--r--testing/efm-langserver/APKBUILD2
-rw-r--r--testing/ejson/APKBUILD2
-rw-r--r--testing/elektra/APKBUILD2
-rw-r--r--testing/elvish/APKBUILD2
-rw-r--r--testing/emulationstation/APKBUILD2
-rw-r--r--testing/envconsul/APKBUILD2
-rw-r--r--testing/epic5/APKBUILD40
-rw-r--r--testing/esbuild/APKBUILD6
-rw-r--r--testing/esptool/APKBUILD4
-rw-r--r--testing/etcd/APKBUILD2
-rw-r--r--testing/exercism/APKBUILD2
-rw-r--r--testing/exoscale/APKBUILD2
-rw-r--r--testing/fclones/APKBUILD4
-rw-r--r--testing/filebeat/APKBUILD2
-rw-r--r--testing/fileshelter/APKBUILD2
-rw-r--r--testing/firectl/APKBUILD2
-rw-r--r--testing/flannel/APKBUILD2
-rw-r--r--testing/flare-engine/APKBUILD23
-rw-r--r--testing/flare-game/APKBUILD4
-rwxr-xr-xtesting/flare-game/flare-game-data-downloader.sh2
-rwxr-xr-xtesting/flare-game/flare-game.post-install2
-rw-r--r--testing/flarectl/APKBUILD4
-rw-r--r--testing/flightgear/APKBUILD2
-rw-r--r--testing/fnc/APKBUILD7
-rw-r--r--testing/fq/APKBUILD2
-rw-r--r--testing/freecad/APKBUILD2
-rw-r--r--testing/galera/APKBUILD2
-rw-r--r--testing/gb/APKBUILD2
-rw-r--r--testing/gearmand/APKBUILD2
-rw-r--r--testing/gemget/APKBUILD2
-rw-r--r--testing/geodns/APKBUILD2
-rw-r--r--testing/getting-things-gnome/APKBUILD15
-rw-r--r--testing/getting-things-gnome/remove-unused-keyword.patch19
-rw-r--r--testing/gfold/APKBUILD33
-rw-r--r--testing/git-bug/APKBUILD2
-rw-r--r--testing/glow/APKBUILD2
-rw-r--r--testing/gnome-metronome/APKBUILD14
-rw-r--r--testing/gnome-metronome/libadwaita-alpha4.patch11
-rw-r--r--testing/gnuradio/APKBUILD2
-rw-r--r--testing/go-acceptlanguageparser/APKBUILD2
-rw-r--r--testing/go-conf/APKBUILD2
-rw-r--r--testing/go-context/APKBUILD2
-rw-r--r--testing/go-httputils/APKBUILD2
-rw-r--r--testing/go-mtpfs/APKBUILD2
-rw-r--r--testing/go-mux/APKBUILD2
-rw-r--r--testing/go-nats/APKBUILD2
-rw-r--r--testing/go-nuid/APKBUILD2
-rw-r--r--testing/go-passbolt-cli/APKBUILD2
-rw-r--r--testing/go-phoenix/APKBUILD2
-rw-r--r--testing/go-pkac/APKBUILD2
-rw-r--r--testing/go-securecookie/APKBUILD2
-rw-r--r--testing/go-sloth/APKBUILD2
-rw-r--r--testing/go-spreed-turnservicecli/APKBUILD2
-rw-r--r--testing/go-uuid/APKBUILD2
-rw-r--r--testing/go-websocket/APKBUILD2
-rw-r--r--testing/gobuster/APKBUILD2
-rw-r--r--testing/gomaildrop/APKBUILD33
-rw-r--r--testing/gopls/APKBUILD2
-rw-r--r--testing/goreman/APKBUILD2
-rw-r--r--testing/gortr/APKBUILD2
-rw-r--r--testing/gosu/APKBUILD2
-rw-r--r--testing/gqrx/APKBUILD2
-rw-r--r--testing/gr-osmosdr/APKBUILD2
-rw-r--r--testing/gron/APKBUILD2
-rw-r--r--testing/grype/APKBUILD4
-rw-r--r--testing/gst-rtsp-server/APKBUILD4
-rw-r--r--testing/gstreamer-vaapi/APKBUILD4
-rw-r--r--testing/gx-go/APKBUILD2
-rw-r--r--testing/gx/APKBUILD2
-rw-r--r--testing/headscale/APKBUILD2
-rw-r--r--testing/helm/APKBUILD2
-rw-r--r--testing/heplify-server/APKBUILD2
-rw-r--r--testing/heplify/APKBUILD2
-rw-r--r--testing/hexer/APKBUILD2
-rw-r--r--testing/hilbish/APKBUILD51
-rw-r--r--testing/hilbish/hilbish.post-install3
l---------testing/hilbish/hilbish.post-upgrade1
-rw-r--r--testing/hilbish/hilbish.pre-deinstall3
-rw-r--r--testing/homer-app/APKBUILD2
-rw-r--r--testing/horizon/APKBUILD4
-rw-r--r--testing/horizon/werror.patch12
-rw-r--r--testing/hub/APKBUILD2
-rw-r--r--testing/ijq/APKBUILD2
-rw-r--r--testing/imath/APKBUILD2
-rw-r--r--testing/imgdiff/APKBUILD2
-rw-r--r--testing/jasper/APKBUILD41
-rw-r--r--testing/jfrog-cli/APKBUILD2
-rw-r--r--testing/kapow/APKBUILD2
-rw-r--r--testing/kbdd/APKBUILD48
-rw-r--r--testing/keybase-client/APKBUILD2
-rw-r--r--testing/kicad/APKBUILD2
-rw-r--r--testing/kine/APKBUILD2
-rw-r--r--testing/kompose/APKBUILD2
-rw-r--r--testing/kopia/APKBUILD2
-rw-r--r--testing/kops/APKBUILD2
-rw-r--r--testing/kubernetes/APKBUILD2
-rw-r--r--testing/kustomize/APKBUILD2
-rw-r--r--testing/lazydocker/APKBUILD2
-rw-r--r--testing/lf/APKBUILD2
-rw-r--r--testing/lgogdownloader/APKBUILD2
-rw-r--r--testing/libcork/APKBUILD2
-rw-r--r--testing/libcorkipset/APKBUILD2
-rw-r--r--testing/libnest2d/APKBUILD2
-rw-r--r--testing/libopenraw/APKBUILD2
-rw-r--r--testing/libretro-cannonball/APKBUILD2
-rw-r--r--testing/librime/APKBUILD2
-rw-r--r--testing/libtins/APKBUILD2
-rw-r--r--testing/libvolk/APKBUILD2
-rw-r--r--testing/lizardfs/APKBUILD2
-rw-r--r--testing/loki/APKBUILD2
-rw-r--r--testing/loolwsd/APKBUILD6
-rw-r--r--testing/lxd-feature/APKBUILD2
-rw-r--r--testing/lzdoom/0001-link-zipdir-against-fts.patch10
-rw-r--r--testing/lzdoom/0002-fix-musl-fts.patch10
-rw-r--r--testing/lzdoom/APKBUILD63
-rw-r--r--testing/maddy/APKBUILD2
-rw-r--r--testing/madonctl/APKBUILD2
-rw-r--r--testing/mage/APKBUILD2
-rw-r--r--testing/mailsec-check/APKBUILD2
-rw-r--r--testing/manticoresearch/APKBUILD2
-rw-r--r--testing/mapnik/APKBUILD2
-rw-r--r--testing/mapserver/APKBUILD2
-rw-r--r--testing/mautrix-whatsapp/APKBUILD2
-rw-r--r--testing/merlin/APKBUILD56
-rw-r--r--testing/metricbeat/APKBUILD2
-rw-r--r--testing/minikube/APKBUILD2
-rw-r--r--testing/minio-client/APKBUILD2
-rw-r--r--testing/mkcert/APKBUILD2
-rw-r--r--testing/mpd-mpris/APKBUILD25
-rw-r--r--testing/mqtt2prometheus/APKBUILD2
-rw-r--r--testing/mqttui/APKBUILD34
-rw-r--r--testing/mtg/APKBUILD2
-rw-r--r--testing/mynewt-newt/APKBUILD2
-rw-r--r--testing/navidrome/APKBUILD10
-rw-r--r--testing/nerdctl/APKBUILD2
-rw-r--r--testing/netdata-go-plugins/APKBUILD2
-rw-r--r--testing/nix/APKBUILD2
-rw-r--r--testing/nsq/APKBUILD2
-rw-r--r--testing/nut/openssl-1.1.patch70
-rw-r--r--testing/nvidia-src/AKMBUILD14
-rw-r--r--testing/nvidia-src/APKBUILD25
-rw-r--r--testing/nwg-bar/APKBUILD2
-rw-r--r--testing/nymphcast-mediaserver/APKBUILD9
-rw-r--r--testing/obfs4proxy/APKBUILD2
-rw-r--r--testing/ocaml-bigarray-compat/APKBUILD67
-rw-r--r--testing/ocaml-biniou/APKBUILD62
-rw-r--r--testing/ocaml-calendar/APKBUILD31
-rw-r--r--testing/ocaml-camomile/APKBUILD77
-rw-r--r--testing/ocaml-charinfo_width/APKBUILD68
-rw-r--r--testing/ocaml-cmdliner/APKBUILD52
-rw-r--r--testing/ocaml-cppo/APKBUILD45
-rw-r--r--testing/ocaml-csexp/APKBUILD63
-rw-r--r--testing/ocaml-ctypes/APKBUILD62
-rw-r--r--testing/ocaml-curses/APKBUILD73
-rw-r--r--testing/ocaml-easy-format/APKBUILD62
-rw-r--r--testing/ocaml-extlib/APKBUILD33
-rw-r--r--testing/ocaml-fileutils/APKBUILD71
-rw-r--r--testing/ocaml-gettext/0001-pr_gettext-stop-tracking-and-printing-untranslated-s.patch109
-rw-r--r--testing/ocaml-gettext/0002-pr_gettext-stop-printing-extracted-strings.patch26
-rw-r--r--testing/ocaml-gettext/0003-add-more-generated-files-to-.gitignore.patch44
-rw-r--r--testing/ocaml-gettext/APKBUILD100
-rw-r--r--testing/ocaml-gettext/ocaml-gettext-0.3.4-use-ocamlopt-g.patch33
-rw-r--r--testing/ocaml-integers/APKBUILD60
-rw-r--r--testing/ocaml-labltk/APKBUILD (renamed from unmaintained/ocaml-labltk/APKBUILD)17
-rw-r--r--testing/ocaml-lambda-term/APKBUILD96
-rw-r--r--testing/ocaml-libvirt/0001-Add-a-binding-for-virDomainCreateXML.patch213
-rw-r--r--testing/ocaml-libvirt/0001-Remove-unused-not_supported-function.patch57
-rw-r--r--testing/ocaml-libvirt/0001-Suppress-errors-to-stderr-and-use-thread-local-virEr.patch1864
-rw-r--r--testing/ocaml-libvirt/0001-Use-C99-standard-int64_t-instead-of-OCaml-defined-an.patch35
-rw-r--r--testing/ocaml-libvirt/0001-Use-g-warn-error.patch78
-rw-r--r--testing/ocaml-libvirt/0002-Don-t-bother-checking-return-from-virInitialize.patch32
-rw-r--r--testing/ocaml-libvirt/0002-Update-dependencies.patch44
-rw-r--r--testing/ocaml-libvirt/0003-Add-a-binding-for-virConnectGetAllDomainStats-RHBZ-1.patch393
-rw-r--r--testing/ocaml-libvirt/0004-examples-Print-more-stats-in-the-get_all_domain_stat.patch42
-rw-r--r--testing/ocaml-libvirt/0005-Change-binding-of-virConnectGetAllDomainStats-to-ret.patch127
-rw-r--r--testing/ocaml-libvirt/APKBUILD83
-rw-r--r--testing/ocaml-lwt/APKBUILD107
-rw-r--r--testing/ocaml-lwt/result_lseek_noinline.patch (renamed from unmaintained/ocaml-lwt/result_lseek_noinline.patch)0
-rw-r--r--testing/ocaml-lwt_log/APKBUILD78
-rw-r--r--testing/ocaml-menhir/APKBUILD50
-rw-r--r--testing/ocaml-mew/APKBUILD67
-rw-r--r--testing/ocaml-mew_vi/APKBUILD69
-rw-r--r--testing/ocaml-mmap/APKBUILD63
-rw-r--r--testing/ocaml-obuild/APKBUILD25
-rw-r--r--testing/ocaml-obytelib/APKBUILD37
-rw-r--r--testing/ocaml-ocplib-endian/APKBUILD62
-rw-r--r--testing/ocaml-ounit/APKBUILD64
-rw-r--r--testing/ocaml-ptmap/APKBUILD64
-rw-r--r--testing/ocaml-qcheck/APKBUILD49
-rw-r--r--testing/ocaml-qtest/APKBUILD52
-rw-r--r--testing/ocaml-react/APKBUILD69
-rw-r--r--testing/ocaml-result/APKBUILD59
-rw-r--r--testing/ocaml-seq/APKBUILD62
-rw-r--r--testing/ocaml-sha/APKBUILD54
-rw-r--r--testing/ocaml-stdlib-shims/APKBUILD36
-rw-r--r--testing/ocaml-topkg/APKBUILD62
-rw-r--r--testing/ocaml-trie/APKBUILD61
-rw-r--r--testing/ocaml-xml-light/APKBUILD39
-rw-r--r--testing/ocaml-yojson/APKBUILD66
-rw-r--r--testing/ocaml-zed/APKBUILD68
-rw-r--r--testing/ocamlclean/APKBUILD22
-rw-r--r--testing/ocamlclean/bump-magic.patch15
-rw-r--r--testing/ocamlclean/deprecated-pervasives.patch15
-rw-r--r--testing/ocamlclean/obytelib-dir.patch11
-rw-r--r--testing/openjdk18/APKBUILD14
-rw-r--r--testing/openrc-exporter/APKBUILD2
-rw-r--r--testing/openscad/APKBUILD2
-rw-r--r--testing/pcl/APKBUILD2
-rw-r--r--testing/perl-object-pad/APKBUILD4
-rw-r--r--testing/php7-pecl-couchbase/APKBUILD14
-rw-r--r--testing/php7-pecl-couchbase/cmake-build-type.patch11
-rw-r--r--testing/php7-pecl-couchbase/cmake-fix-cache.patch11
-rw-r--r--testing/php81-pecl-mcrypt/APKBUILD34
-rw-r--r--testing/php81-pecl-oauth/APKBUILD42
-rw-r--r--testing/php81-pecl-oauth/pcre.patch13
-rw-r--r--testing/php81-pecl-timezonedb/APKBUILD36
-rw-r--r--testing/php81-pecl-xlswriter/APKBUILD38
-rw-r--r--testing/php81-tideways_xhprof/APKBUILD36
-rw-r--r--testing/php81/content-encoding.patch42
-rw-r--r--testing/pingus/APKBUILD2
-rw-r--r--testing/prometheus-json-exporter/APKBUILD2
-rw-r--r--testing/prometheus-postgres-exporter/APKBUILD2
-rw-r--r--testing/prometheus-rethinkdb-exporter/APKBUILD2
-rw-r--r--testing/prometheus-unbound-exporter/APKBUILD2
-rw-r--r--testing/pulsar-client-cpp/APKBUILD2
-rw-r--r--testing/pulseview/APKBUILD2
-rw-r--r--testing/pulumi/APKBUILD2
-rw-r--r--testing/py3-anyio/APKBUILD4
-rw-r--r--testing/py3-blis/APKBUILD8
-rw-r--r--testing/py3-cryptography-latest/APKBUILD55
-rw-r--r--testing/py3-dataclasses-json/APKBUILD8
-rw-r--r--testing/py3-deepdiff/APKBUILD6
-rw-r--r--testing/py3-eventlet/APKBUILD6
-rw-r--r--testing/py3-fiona/APKBUILD2
-rw-r--r--testing/py3-marshmallow-enum/APKBUILD4
-rw-r--r--testing/py3-marshmallow/APKBUILD8
-rw-r--r--testing/py3-niaclass/APKBUILD6
-rw-r--r--testing/py3-niaclass/do-not-package-tests.patch23
-rw-r--r--testing/py3-pdal/APKBUILD2
-rw-r--r--testing/py3-pynest2d/APKBUILD2
-rw-r--r--testing/py3-stringcase/APKBUILD4
-rw-r--r--testing/py3-typing_inspect/APKBUILD9
-rw-r--r--testing/reg/APKBUILD2
-rw-r--r--testing/rekor/APKBUILD2
-rw-r--r--testing/rke/APKBUILD2
-rw-r--r--testing/rqlite/APKBUILD13
-rw-r--r--testing/ruuvi-prometheus/APKBUILD2
-rw-r--r--testing/satellite/APKBUILD2
-rw-r--r--testing/scalingo/APKBUILD2
-rw-r--r--testing/schroot/APKBUILD2
-rw-r--r--testing/seaweedfs/APKBUILD2
-rw-r--r--testing/secsipidx/APKBUILD2
-rw-r--r--testing/senpai/APKBUILD2
-rw-r--r--testing/simgear/APKBUILD2
-rw-r--r--testing/singularity/APKBUILD2
-rw-r--r--testing/sipexer/APKBUILD2
-rw-r--r--testing/slides/APKBUILD2
-rw-r--r--testing/snapper/APKBUILD2
-rw-r--r--testing/soju/APKBUILD2
-rw-r--r--testing/sops/APKBUILD6
-rw-r--r--testing/sos/APKBUILD2
-rw-r--r--testing/spdk/APKBUILD4
-rw-r--r--testing/speedtest-go/APKBUILD2
-rw-r--r--testing/speedtest_exporter/APKBUILD2
-rw-r--r--testing/spreed-webrtc/APKBUILD2
-rw-r--r--testing/ssh-cert-authority/APKBUILD2
-rw-r--r--testing/stargazer-gmi/APKBUILD4
-rw-r--r--testing/step-certificates/APKBUILD2
-rw-r--r--testing/strawberry/APKBUILD2
-rw-r--r--testing/sublime-music/APKBUILD4
-rw-r--r--testing/supercollider/APKBUILD4
-rw-r--r--testing/supercollider/sndfile.patch12
-rw-r--r--testing/supermin/APKBUILD21
-rw-r--r--testing/syft/APKBUILD4
-rw-r--r--testing/taskcafe/APKBUILD2
-rw-r--r--testing/tcl-lib/APKBUILD8
-rw-r--r--testing/terraform-provider-libvirt/APKBUILD2
-rw-r--r--testing/thanos/APKBUILD2
-rw-r--r--testing/tlsrouter/APKBUILD2
-rw-r--r--testing/trivy/APKBUILD2
-rw-r--r--testing/trunk-recorder/APKBUILD2
-rw-r--r--testing/tty-proxy/APKBUILD2
-rw-r--r--testing/tty-share/APKBUILD2
-rw-r--r--testing/uhd/APKBUILD2
-rw-r--r--testing/up/APKBUILD2
-rw-r--r--testing/utop/APKBUILD137
-rw-r--r--testing/vera++/APKBUILD2
-rw-r--r--testing/vim-go/APKBUILD2
-rw-r--r--testing/wesnoth/APKBUILD2
-rw-r--r--testing/wireguard-go/APKBUILD2
-rw-r--r--testing/wl-gammarelay/APKBUILD2
-rw-r--r--testing/wormhole-william/APKBUILD2
-rw-r--r--testing/wtfutil/APKBUILD2
-rw-r--r--testing/xload/APKBUILD17
-rw-r--r--testing/xmpp-dns/APKBUILD2
-rw-r--r--testing/ytt/APKBUILD2
-rw-r--r--testing/zabbix-agent2-alpine/APKBUILD2
-rw-r--r--testing/zfs-src/AKMBUILD2
-rw-r--r--testing/zfs-src/APKBUILD6
-rw-r--r--testing/zrepl/APKBUILD2
-rw-r--r--unmaintained/cryfs/0001-fix-for-python3.patch (renamed from testing/cryfs/0001-fix-for-python3.patch)0
-rw-r--r--unmaintained/cryfs/APKBUILD (renamed from testing/cryfs/APKBUILD)0
-rw-r--r--unmaintained/gnupg1/APKBUILD (renamed from community/gnupg1/APKBUILD)0
-rw-r--r--unmaintained/ocaml-biniou/APKBUILD54
-rw-r--r--unmaintained/ocaml-camomile/APKBUILD78
-rw-r--r--unmaintained/ocaml-cmdliner/APKBUILD40
-rw-r--r--unmaintained/ocaml-easy-format/APKBUILD51
-rw-r--r--unmaintained/ocaml-lambda-term/APKBUILD68
-rw-r--r--unmaintained/ocaml-lwt/APKBUILD111
-rw-r--r--unmaintained/ocaml-lwt_log/APKBUILD55
-rw-r--r--unmaintained/ocaml-menhir/APKBUILD41
-rw-r--r--unmaintained/ocaml-ounit/APKBUILD51
-rw-r--r--unmaintained/ocaml-react/APKBUILD57
-rw-r--r--unmaintained/ocaml-result/APKBUILD47
-rw-r--r--unmaintained/ocaml-topkg/APKBUILD47
-rw-r--r--unmaintained/ocaml-yojson/APKBUILD53
-rw-r--r--unmaintained/ocaml-zed/APKBUILD54
-rw-r--r--unmaintained/solidity/APKBUILD (renamed from testing/solidity/APKBUILD)2
-rw-r--r--unmaintained/utop/APKBUILD118
998 files changed, 10671 insertions, 9755 deletions
diff --git a/community/abiword/APKBUILD b/community/abiword/APKBUILD
index b617b7e6ab..f8e00d9343 100644
--- a/community/abiword/APKBUILD
+++ b/community/abiword/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abiword
pkgver=3.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="A fully-featured word processor"
url="https://www.abisource.com/"
# s390x and riscv64 blocked by librsvg
diff --git a/community/aerc/APKBUILD b/community/aerc/APKBUILD
index 5fbbd87570..572b4ca9c9 100644
--- a/community/aerc/APKBUILD
+++ b/community/aerc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=aerc
pkgver=0.9.0
-pkgrel=1
+pkgrel=2
pkgdesc="email client for your terminal"
url="https://aerc-mail.org"
arch="all"
diff --git a/community/age/APKBUILD b/community/age/APKBUILD
index 5d32e82ab7..b6d3c826e7 100644
--- a/community/age/APKBUILD
+++ b/community/age/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=age
pkgver=1.0.0
-pkgrel=4
+pkgrel=5
pkgdesc="Simple, modern and secure encryption tool"
url="https://github.com/FiloSottile/age"
license="BSD-3-Clause"
diff --git a/community/aircrack-ng/APKBUILD b/community/aircrack-ng/APKBUILD
index 1a34bd9c7e..e58b72a4ee 100644
--- a/community/aircrack-ng/APKBUILD
+++ b/community/aircrack-ng/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=aircrack-ng
-pkgver=1.6
-pkgrel=2
+pkgver=1.7
+pkgrel=0
pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
url="http://www.aircrack-ng.org"
arch="all !s390x" # tests fails on big-endian
@@ -38,5 +38,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="14a74feca23b802e4f67a3e3fceea315302b4f272b32215044fc98ea4d190b5782c5be34ccf601d8b6579e1440b62749d42a967dac8794c7b4f48c715dbeba43 aircrack-ng-1.6.tar.gz
-f57a8a78f164e06176600d8637e00350747aae21e91f261de9639255ea83594782c9d94474e901dac71c68e916a8951a22fc9ac2607eec65cb23954fe3656c07 make-check-fix.patch"
+sha512sums="
+3e6433cba1d6b122701245e8904480de9957dad033c1642cc45b30339e9391ffa21b39b2cc712bcba79bc2c2e26f2964be8f28a27081dc4bb323792cb7df2478 aircrack-ng-1.7.tar.gz
+f57a8a78f164e06176600d8637e00350747aae21e91f261de9639255ea83594782c9d94474e901dac71c68e916a8951a22fc9ac2607eec65cb23954fe3656c07 make-check-fix.patch
+"
diff --git a/community/akonadi/APKBUILD b/community/akonadi/APKBUILD
index 24fdadb3d7..7cb0fe083b 100644
--- a/community/akonadi/APKBUILD
+++ b/community/akonadi/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi
pkgver=22.04.0
-pkgrel=0
+pkgrel=1
pkgdesc="A cross-desktop storage service for PIM data and meta data providing concurrent read, write, and query access"
# armhf blocked by extra-cmake-modules
# s390x and riscv64 blocked by polkit
diff --git a/community/alembic/APKBUILD b/community/alembic/APKBUILD
index d79c379ded..4fdae1e118 100644
--- a/community/alembic/APKBUILD
+++ b/community/alembic/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=alembic
pkgver=1.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="Open framework for storing and sharing scene data"
url="https://www.alembic.io/"
arch="all !s390x" # alembic does not support big-endian, which s390x uses
diff --git a/community/alertmanager/APKBUILD b/community/alertmanager/APKBUILD
index 0eb49528d8..8975e2e15d 100644
--- a/community/alertmanager/APKBUILD
+++ b/community/alertmanager/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=alertmanager
pkgver=0.24.0
-pkgrel=1
+pkgrel=2
pkgdesc="Prometheus Alertmanager"
url="https://github.com/prometheus/alertmanager"
arch="all"
diff --git a/community/ali/APKBUILD b/community/ali/APKBUILD
index 7eef7b3ec2..73720b27d7 100644
--- a/community/ali/APKBUILD
+++ b/community/ali/APKBUILD
@@ -5,7 +5,7 @@ pkgver=0.7.5
# this is used for the help command to print the commit.
# needs to be changed on every release.
_rev=c0aa677
-pkgrel=3
+pkgrel=4
pkgdesc="Generate HTTP load and plot the results in real-time"
url="https://github.com/nakabonne/ali"
arch="all"
diff --git a/community/alkimia/APKBUILD b/community/alkimia/APKBUILD
index 670599b3f0..8f4c589ed8 100644
--- a/community/alkimia/APKBUILD
+++ b/community/alkimia/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=alkimia
-pkgver=8.1.0
-pkgrel=3
+pkgver=8.1.1
+pkgrel=0
# armhf blocked by qt5-qtdeclarative
# armhf, ppc64le, riscv64, s390x blocked by qt5-qtwebengine
# s390x and riscv64 blocked by polkit -> kio
@@ -58,5 +58,5 @@ package() {
}
sha512sums="
-c3d0851ec6e5af7f690059f2c80942bbe69c6bde946898ba4a124c344dd47e0fba4e6ed0a5320e36385c060c49d5eeaaca35bc0a41410ef4ad849a4f9541d4d3 alkimia-8.1.0.tar.xz
+3e96f5b32da3d8a7f23b3b0f0a0ba7923e472b972c06b35f918c7f00d1745fa747afb6b8fdc1d596b2c1d9757a8037de04a039047f47eb46383070721da05258 alkimia-8.1.1.tar.xz
"
diff --git a/community/alpine-repo-tools/APKBUILD b/community/alpine-repo-tools/APKBUILD
index 056e63acb5..2d686726b1 100644
--- a/community/alpine-repo-tools/APKBUILD
+++ b/community/alpine-repo-tools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=alpine-repo-tools
pkgver=0.2
-pkgrel=2
+pkgrel=3
pkgdesc="utilities to interact with Alpine Linux repositories"
url="https://gitlab.alpinelinux.org/alpine/infra/repo-tools"
arch="all"
diff --git a/community/amfora/APKBUILD b/community/amfora/APKBUILD
index 59901a8f27..a186a50103 100644
--- a/community/amfora/APKBUILD
+++ b/community/amfora/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: omni <omni@gitlab.alpinelinux.org>
pkgname=amfora
pkgver=1.9.2 # Don't forget to update main.commit below
-pkgrel=3
+pkgrel=4
pkgdesc="terminal browser for the Gemini protocol"
url="https://github.com/makeworld-the-better-one/amfora"
license="GPL-3.0-or-later"
diff --git a/community/android-tools/APKBUILD b/community/android-tools/APKBUILD
index 5d9bf77c67..be6e7327d9 100644
--- a/community/android-tools/APKBUILD
+++ b/community/android-tools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=android-tools
pkgver=31.0.3p1
-pkgrel=3
+pkgrel=4
pkgdesc="Android platform tools"
url="https://sites.google.com/a/android.com/tools/"
arch="x86 x86_64 aarch64 armv7 armhf"
diff --git a/community/ansible-lint/APKBUILD b/community/ansible-lint/APKBUILD
index 147206bb86..14ff7e7e25 100644
--- a/community/ansible-lint/APKBUILD
+++ b/community/ansible-lint/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible-lint
-pkgver=6.0.2
-pkgrel=1
+pkgver=6.1.0
+pkgrel=0
pkgdesc="check ansible playbooks"
url="https://github.com/ansible/ansible-lint"
arch="noarch"
@@ -58,5 +58,5 @@ package() {
}
sha512sums="
-a47e79c59dfcf3e36654247bd206581798f2559261142e3943b60e0688d75b5a6332832a9f9127f99b2faa6afff959a33c55fbc80aa5881f064725998420f679 ansible-lint-6.0.2.tar.gz
+c1ca5abe8e5f441a86db6a4b4fa03c2d87ed2277151ada9af34c3d8af6934d2c1d4b6bffbc11d6cfb7cd7601c9e43a041fe8a2b940fa0630532df05004e11d15 ansible-lint-6.1.0.tar.gz
"
diff --git a/community/anytun/APKBUILD b/community/anytun/APKBUILD
index 554b809651..9ab30eeb37 100644
--- a/community/anytun/APKBUILD
+++ b/community/anytun/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=anytun
pkgver=0.3.8
-pkgrel=4
+pkgrel=5
pkgdesc="Secure anycast tunneling protocol implementation for flexible and fault-tolerant VPNs"
options="!check" # No testsuite
url="https://www.anytun.org/"
diff --git a/community/apache-arrow/APKBUILD b/community/apache-arrow/APKBUILD
index dd78f4be00..abb06caff0 100644
--- a/community/apache-arrow/APKBUILD
+++ b/community/apache-arrow/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
# based on arch linux PKGBUILD
pkgname=apache-arrow
-pkgver=7.0.0
-pkgrel=4
+pkgver=8.0.0
+pkgrel=0
pkgdesc="multi-language toolbox for accelerated data interchange and in-memory processing"
url="https://arrow.apache.org/"
arch="all !s390x !riscv64" # missing glog-dev, thrift
@@ -19,11 +19,11 @@ makedepends="
gtest-dev
lz4-dev
openssl-dev
- rapidjson-dev
- re2-dev
protobuf-dev
- python3-dev
py3-numpy-dev
+ python3-dev
+ rapidjson-dev
+ re2-dev
samurai
snappy-dev
thrift-dev
@@ -53,7 +53,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=release \
+ -DCMAKE_BUILD_TYPE=Release \
-DARROW_DEPENDENCY_SOURCE=SYSTEM \
-DARROW_SIMD_LEVEL="$_SIMD" \
-DARROW_BUILD_TESTS=ON \
@@ -97,12 +97,12 @@ package() {
}
tools() {
- pkgdesc="extra tools"
+ pkgdesc="$pkgdesc (extra tools)"
amove usr/bin/plasma-store-server
}
sha512sums="
-6727ea625b1a4dc3fd452e94ef5e8fd7a5bdebcf44b105f0ba684687cf126163317caef9e91cfd3722a8defca1f0295741ed0dde2393e85d15559bddd7ecb9a2 apache-arrow-7.0.0.tar.gz
+8280ce775c05296e33a292241c976caee2bddda7da396ef3c5da700347cb616a932475140139a5e96027781e71f66466e27fcf6423440bf720fbc83faabf0f3d apache-arrow-8.0.0.tar.gz
7d3c3678f69e4a244a1f8fdc4e509e29f3c21f8a8e38e9c9e3188dad0297a964201157853abd57bad75df698ab9b005ad0fca12c2965bbc4a25ccb5fd19311bb 83ada4ec0f2cfe36f4168628d7f470e6199e663a.zip
b3af78d5045ee3a224cafcd6246acf5b347187972b8ab50d55e6bbf4120ca06a55a8f73bec0901ed279c0c2059e3b1e3b12bba68a8c4f3bb5a7f13d1766e4f13 acd375eb86a81cd856476fca0f52ba6036a067ff.zip
"
diff --git a/community/apk-file/APKBUILD b/community/apk-file/APKBUILD
index ed59a4e002..bc583dd29a 100644
--- a/community/apk-file/APKBUILD
+++ b/community/apk-file/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=apk-file
pkgver=0.3.6
-pkgrel=6
+pkgrel=7
pkgdesc="Command line front end for pkgs.alpinelinux.org"
options="chmod-clean"
url="https://github.com/genuinetools/apk-file"
diff --git a/community/asio/APKBUILD b/community/asio/APKBUILD
index a779360589..44e7841938 100644
--- a/community/asio/APKBUILD
+++ b/community/asio/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asio
pkgver=1.22.1
-pkgrel=0
+pkgrel=1
pkgdesc="Cross-platform C++ library for network programming"
url="https://think-async.com/Asio/"
arch="all"
diff --git a/community/aspcud/APKBUILD b/community/aspcud/APKBUILD
index ab7531c85b..ac1caf13c3 100644
--- a/community/aspcud/APKBUILD
+++ b/community/aspcud/APKBUILD
@@ -1,19 +1,19 @@
# Contributor: Anil Madhavapeddy <anil@recoil.org>
# Maintainer:
pkgname=aspcud
-pkgver=1.9.5
+pkgver=1.9.6
pkgrel=1
pkgdesc="Package dependency solver"
url="https://potassco.org/aspcud/"
arch="all"
license="MIT"
depends="boost clingo"
-makedepends="boost-dev cmake re2c"
+makedepends="boost-dev cmake re2c samurai"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/potassco/aspcud/archive/v$pkgver.tar.gz"
build() {
- cmake -B build \
+ cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr
cmake --build build
@@ -24,5 +24,5 @@ package() {
}
sha512sums="
-b6c85f7e67cbf8df8dd0ed4f8fd5f988e46bf3f9756e4cb8fadfae955ed70bc27279e8dddcfe8161543e5276a70d2103816fce8edebc240fef6b182841832106 aspcud-1.9.5.tar.gz
+a46183c2fd3b17881d48c3396164cded4b5214a2a8a31a499254533a8a71fb084a8b6f13ee1dc8eea72f7d9819caf2921f31a5ccc1cbd6611f9175e0bc10c14a aspcud-1.9.6.tar.gz
"
diff --git a/community/atools/APKBUILD b/community/atools/APKBUILD
index 2c116d5d8c..163cc518cd 100644
--- a/community/atools/APKBUILD
+++ b/community/atools/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=atools
pkgver=20.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Auxilary scripts for abuild"
url="https://gitlab.alpinelinux.org/Leo/atools"
arch="all"
diff --git a/community/autofs/0001-auto.master-change-paths-in-etc.patch b/community/autofs/0001-auto.master-change-paths-in-etc.patch
new file mode 100644
index 0000000000..c15f7a75f1
--- /dev/null
+++ b/community/autofs/0001-auto.master-change-paths-in-etc.patch
@@ -0,0 +1,42 @@
+From ad88cf33e0b4c4aa5487f5f873cb2b1bb094dd61 Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Tue, 10 May 2022 18:48:22 -0700
+Subject: [PATCH 1/2] auto.master: change paths in etc
+
+---
+ samples/auto.master | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/samples/auto.master b/samples/auto.master
+index 5483e3c..2bb64d9 100644
+--- a/samples/auto.master
++++ b/samples/auto.master
+@@ -4,7 +4,7 @@
+ # mount-point [map-type[,format]:]map [options]
+ # For details of the format look at auto.master(5).
+ #
+-/misc /etc/auto.misc
++/misc /etc/autofs/auto.misc
+ #
+ # NOTE: mounts done from a hosts map will be mounted with the
+ # "nosuid" and "nodev" options unless the "suid" and "dev"
+@@ -12,14 +12,14 @@
+ #
+ /net -hosts
+ #
+-# Include /etc/auto.master.d/*.autofs
++# Include /etc/autofs/auto.master.d/*.autofs
+ # To add an extra map using this mechanism you will need to add
+ # two configuration items - one /etc/auto.master.d/extra.autofs file
+ # (using the same line format as the auto.master file)
+ # and a separate mount map (e.g. /etc/auto.extra or an auto.extra NIS map)
+ # that is referred to by the extra.autofs file.
+ #
+-+dir:/etc/auto.master.d
+++dir:/etc/autofs/auto.master.d
+ #
+ # If you have fedfs set up and the related binaries, either
+ # built as part of autofs or installed from another package,
+--
+2.36.1
+
diff --git a/community/autofs/0002-musl-backport-fixes.patch b/community/autofs/0002-musl-backport-fixes.patch
new file mode 100644
index 0000000000..e15678c162
--- /dev/null
+++ b/community/autofs/0002-musl-backport-fixes.patch
@@ -0,0 +1,393 @@
+From f5f4eae173cfa61b3665e327d828f203fa6d72f3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 24 Dec 2021 22:02:20 +0800
+Subject: [PATCH 2/2] autofs-5.1.8 - fix bashism in configure
+
+configure scripts need to work with a POSIX-compliant shell,
+so let's not use a bashism here.
+
+```
+checking for res_query in -lresolv... yes
+checking for libhesiod... no
+./configure: 4880: test: 0: unexpected operator
+checking how to run the C preprocessor... gcc -E
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - fix missing include in hash.h
+
+Fixes a build failure with the musl libc:
+```
+../include/hash.h:74:8: error: unknown type name '__always_inline'
+ 74 | static __always_inline uint32_t hash_64(uint64_t val, unsigned int bits)
+ | ^~~~~~~~~~~~~~~
+```
+
+We need to include stddef.h from linux-headers to ensure _always_inline
+is always defined.
+
+Bug: https://bugs.gentoo.org/828918
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - define fallback dummy NSS config path
+
+On musl, _PATH_NSSWITCH_CONF won't be defined (it doesn't support NSS),
+so let's give it a dummy path when it's not defined by glibc.
+
+Fixes build failures like:
+```
+../include/nsswitch.h:27:23: error: '_PATH_NSSWITCH_CONF' undeclared (first use in this function)
+ 27 | #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
+ | ^~~~~~~~~~~~~~~~~~~
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - avoid internal stat.h definitions
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - add missing include to hash.h for _WORDSIZE
+
+Fixes build failure on musl like:
+```
+../include/hash.h:22:2: error: #error Wordsize not 32 or 64
+ 22 | #error Wordsize not 32 or 64
+ | ^~~~~
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - add missing include to log.h for pid_t
+
+Fixes build failures on musl like:
+```
+../include/log.h:49:8: error: unknown type name 'pid_t'
+ 49 | extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
+ | ^~~~~
+../include/log.h:49:51: error: unknown type name 'pid_t'; did you mean 'gid_t'?
+ 49 | extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
+ | ^~~~~
+ | gid_t
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - define _SWORD_TYPE for musl
+
+Copy the definition from glibc. Fixes build failures like:
+```
+automount.c:280:35: error: '__SWORD_TYPE' undeclared (first use in this function)
+ 280 | if (fs.f_type != (__SWORD_TYPE) AUTOFS_SUPER_MAGIC) {
+ | ^~~~~~~~~~~~
+automount.c:280:35: note: each undeclared identifier is reported only once for each function it appears in
+automount.c:280:48: error: expected ')' before numeric constant
+ 280 | if (fs.f_type != (__SWORD_TYPE) AUTOFS_SUPER_MAGIC) {
+ | ~ ^
+ | )
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - add autofs_strerror_r() helper for musl
+
+If using musl libc the XSI-compliant variant strerror_r() which returns
+an integer instead of a pointer so add a helper function to handle this
+case.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+Signed-off-by: Ian Kent <raven@themaw.net>
+
+autofs-5.1.8 - handle innetgr() not present in musl
+
+The function innetgr(3) may not be present in musl libc, add a check
+for this.
+
+Originally contributed by Fabian, modified by me.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+Signed-off-by: Ian Kent <raven@themaw.net>
+---
+ configure | 9 +++++----
+ configure.in | 8 ++++----
+ daemon/automount.c | 10 ++++++++++
+ daemon/lookup.c | 6 +++---
+ include/automount.h | 5 +++++
+ include/config.h.in | 3 +++
+ include/hash.h | 6 ++++++
+ include/log.h | 2 ++
+ include/nsswitch.h | 4 ++++
+ lib/log.c | 10 ++++++++++
+ modules/lookup_multi.c | 4 ++--
+ modules/parse_amd.c | 7 +++++++
+ 12 files changed, 61 insertions(+), 13 deletions(-)
+
+diff --git a/configure b/configure
+index 394a8d5..33446b0 100755
+--- a/configure
++++ b/configure
+@@ -4227,12 +4227,13 @@ fi
+
+
+
+-for ac_func in pipe2
++for ac_func in pipe2 innetgr
+ do :
+- ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
+-if test "x$ac_cv_func_pipe2" = xyes; then :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_PIPE2 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+diff --git a/configure.in b/configure.in
+index 750ffb4..68cbd44 100644
+--- a/configure.in
++++ b/configure.in
+@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_autofs.so)
+ AC_SUBST(HAVE_SSS_AUTOFS)
+ AC_SUBST(sssldir)
+
+-AC_CHECK_FUNCS(pipe2)
++AC_CHECK_FUNCS(pipe2 innetgr)
+
+ #
+ # Newer mounts have the -s (sloppy) option to ignore unknown options,
+@@ -262,7 +262,7 @@ if test -z "$HAVE_HESIOD" -o "$HAVE_HESIOD" != "0"
+ then
+ HAVE_HESIOD=0
+ AF_CHECK_LIBHESIOD()
+- if test "$HAVE_HESIOD" == "1"; then
++ if test "$HAVE_HESIOD" = "1"; then
+ AC_DEFINE(WITH_HESIOD,1,
+ [Define if using Hesiod as a source of automount maps])
+ fi
+@@ -337,11 +337,11 @@ AC_ARG_WITH(sasl,
+ SASL_FLAGS="-I${withval}/include"
+ fi
+ )
+-if test -z "$HAVE_SASL" -o "$HAVE_SASL" != "0" -a "$HAVE_LIBXML" == "1"
++if test -z "$HAVE_SASL" -o "$HAVE_SASL" != "0" -a "$HAVE_LIBXML" = "1"
+ then
+ HAVE_SASL=0
+ AC_CHECK_LIB(sasl2, sasl_client_start, HAVE_SASL=1 LIBSASL="$LIBSASL -lsasl2", , -lsasl2 $LIBS)
+- if test "$HAVE_SASL" == "1"; then
++ if test "$HAVE_SASL" = "1"; then
+ AC_DEFINE(WITH_SASL,1,
+ [Define if using SASL authentication with the LDAP module])
+ fi
+diff --git a/daemon/automount.c b/daemon/automount.c
+index cc28689..5dffce0 100644
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -48,6 +48,16 @@
+ #endif
+ #endif
+
++#ifndef __SWORD_TYPE
++#if __WORDSIZE == 32
++# define __SWORD_TYPE int
++#elif __WORDSIZE == 64
++# define __SWORD_TYPE long int
++#else
++#error
++#endif
++#endif
++
+ const char *program; /* Initialized with argv[0] */
+ const char *version = VERSION_STRING; /* Program version */
+ const char *libdir = AUTOFS_LIB_DIR; /* Location of library modules */
+diff --git a/daemon/lookup.c b/daemon/lookup.c
+index 0b281f8..4a286d6 100644
+--- a/daemon/lookup.c
++++ b/daemon/lookup.c
+@@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
+ return NSS_STATUS_NOTFOUND;
+ }
+
+- if (st.st_mode & __S_IEXEC)
++ if (st.st_mode & S_IEXEC)
+ type = src_prog;
+ else
+ type = src_file;
+@@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
+ return NSS_STATUS_NOTFOUND;
+ }
+
+- if (st.st_mode & __S_IEXEC)
++ if (st.st_mode & S_IEXEC)
+ type = src_prog;
+ else
+ type = src_file;
+@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
+ if (!S_ISREG(st.st_mode))
+ return NULL;
+
+- if (st.st_mode & __S_IEXEC)
++ if (st.st_mode & S_IEXEC)
+ type = "program";
+ else
+ type = "file";
+diff --git a/include/automount.h b/include/automount.h
+index 947ed16..d2d05d8 100644
+--- a/include/automount.h
++++ b/include/automount.h
+@@ -43,6 +43,11 @@
+
+ #define ENABLE_CORES 1
+
++#ifndef __GLIBC__
++# define strerror_r(N,B,S) autofs_strerror_r(N,B,S)
++char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */
++#endif
++
+ /* We MUST have the paths to mount(8) and umount(8) */
+ #ifndef HAVE_MOUNT
+ #error Failed to locate mount(8)!
+diff --git a/include/config.h.in b/include/config.h.in
+index 4e36b39..4f8daa8 100644
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -30,6 +30,9 @@
+ /* Define to 1 if you have the `getservbyname' function. */
+ #undef HAVE_GETSERVBYNAME
+
++/* Define to 1 if you have the `innetgr' function. */
++#undef HAVE_INNETGR
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+diff --git a/include/hash.h b/include/hash.h
+index 2447f29..0f1d7b5 100644
+--- a/include/hash.h
++++ b/include/hash.h
+@@ -3,6 +3,12 @@
+ /* Fast hashing routine for ints, longs and pointers.
+ (C) 2002 Nadia Yvette Chambers, IBM */
+
++#ifdef __GLIBC__
++#include <bits/wordsize.h>
++#else
++#include <bits/reg.h>
++#endif
++#include <linux/stddef.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+
+diff --git a/include/log.h b/include/log.h
+index 69eed96..a7b09f9 100644
+--- a/include/log.h
++++ b/include/log.h
+@@ -17,6 +17,8 @@
+ #ifndef LOG_H
+ #define LOG_H
+
++#include <unistd.h>
++
+ /* Define logging functions */
+
+ #define LOGOPT_NONE 0x0000
+diff --git a/include/nsswitch.h b/include/nsswitch.h
+index d3e4027..8376113 100644
+--- a/include/nsswitch.h
++++ b/include/nsswitch.h
+@@ -24,6 +24,10 @@
+ #include <netdb.h>
+ #include "list.h"
+
++#ifndef _PATH_NSSWITCH_CONF
++#define _PATH_NSSWITCH_CONF "/dev/null"
++#endif
++
+ #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
+
+ enum nsswitch_status {
+diff --git a/lib/log.c b/lib/log.c
+index 0cb47d7..aa4a180 100644
+--- a/lib/log.c
++++ b/lib/log.c
+@@ -364,3 +364,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) {
+
+ return ppid;
+ }
++
++#ifndef __GLIBC__
++# undef strerror_r
++char *autofs_strerror_r(int errnum, char *buf, size_t buflen) {
++ int s = strerror_r(errnum, buf, buflen);
++ if (s)
++ return NULL;
++ return buf;
++}
++#endif
+diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
+index fadd2ea..cf109de 100644
+--- a/modules/lookup_multi.c
++++ b/modules/lookup_multi.c
+@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
+ continue;
+ }
+
+- if (st.st_mode & __S_IEXEC)
++ if (st.st_mode & S_IEXEC)
+ type = src_prog;
+ else
+ type = src_file;
+@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
+ continue;
+ }
+
+- if (st.st_mode & __S_IEXEC)
++ if (st.st_mode & S_IEXEC)
+ type = src_prog;
+ else
+ type = src_file;
+diff --git a/modules/parse_amd.c b/modules/parse_amd.c
+index 163174c..5090060 100644
+--- a/modules/parse_amd.c
++++ b/modules/parse_amd.c
+@@ -425,6 +425,7 @@ static int sel_in_network(struct autofs_point *ap,
+ return ret;
+ }
+
++#ifdef HAVE_INNETGR
+ static int sel_netgrp(struct autofs_point *ap,
+ struct selector *s, struct substvar *sv)
+ {
+@@ -489,6 +490,7 @@ out:
+
+ return ret;
+ }
++#endif
+
+ static int eval_selector(struct autofs_point *ap,
+ struct amd_entry *this, struct substvar *sv)
+@@ -628,7 +630,12 @@ static int eval_selector(struct autofs_point *ap,
+ switch (s->sel->selector) {
+ case SEL_NETGRP:
+ case SEL_NETGRPD:
++#ifndef HAVE_INNETGR
++ error(logopt, MODPREFIX
++ "netgroups not available, function innetgr(3) not available");
++#else
+ ret = sel_netgrp(ap, s, sv);
++#endif
+ break;
+
+ default:
+--
+2.36.1
+
diff --git a/community/autofs/10-glibc.patch b/community/autofs/10-glibc.patch
deleted file mode 100644
index a02112eefd..0000000000
--- a/community/autofs/10-glibc.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur autofs-5.1.4-clean/daemon/Makefile autofs-5.1.4-patched/daemon/Makefile
---- autofs-5.1.4-clean/daemon/Makefile 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/daemon/Makefile 2018-06-15 20:58:25.362236144 +0300
-@@ -6,7 +6,7 @@
- include ../Makefile.rules
-
- SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
-- lookup.c state.c flag.c
-+ state.c flag.c
- OBJS = automount.o indirect.o direct.o spawn.o module.o mount.o \
- lookup.o state.o flag.o
-
-diff -Naur autofs-5.1.4-clean/daemon/automount.c autofs-5.1.4-patched/daemon/automount.c
---- autofs-5.1.4-clean/daemon/automount.c 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/daemon/automount.c 2018-06-15 20:58:25.365569508 +0300
-@@ -269,7 +269,7 @@
- return -1;
- }
-
-- if (fs.f_type != (__SWORD_TYPE) AUTOFS_SUPER_MAGIC) {
-+ if (fs.f_type != (long int) AUTOFS_SUPER_MAGIC) {
- crit(ap->logopt, "attempt to remove directory from a "
- "non-autofs filesystem!");
- crit(ap->logopt,
-diff -Naur autofs-5.1.4-clean/daemon/lookup.c autofs-5.1.4-patched/daemon/lookup.c
---- autofs-5.1.4-clean/daemon/lookup.c 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/daemon/lookup.c 2018-06-15 20:58:25.368902873 +0300
-@@ -382,7 +382,7 @@
- if (!S_ISREG(st.st_mode))
- return NSS_STATUS_NOTFOUND;
-
-- if (st.st_mode & __S_IEXEC)
-+ if (st.st_mode & S_IEXEC)
- type = src_prog;
- else
- type = src_file;
-@@ -942,7 +942,7 @@
- if (!S_ISREG(st.st_mode))
- return NSS_STATUS_NOTFOUND;
-
-- if (st.st_mode & __S_IEXEC)
-+ if (st.st_mode & S_IEXEC)
- type = src_prog;
- else
- type = src_file;
-diff -Naur autofs-5.1.4-clean/include/nsswitch.h autofs-5.1.4-patched/include/nsswitch.h
---- autofs-5.1.4-clean/include/nsswitch.h 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/include/nsswitch.h 2018-06-15 20:58:25.372236237 +0300
-@@ -24,7 +24,7 @@
- #include <netdb.h>
- #include "list.h"
-
--#define NSSWITCH_FILE _PATH_NSSWITCH_CONF
-+#define NSSWITCH_FILE "/dev/null"
-
- enum nsswitch_status {
- NSS_STATUS_UNKNOWN = -1,
-diff -Naur autofs-5.1.4-clean/include/rpc_subs.h autofs-5.1.4-patched/include/rpc_subs.h
---- autofs-5.1.4-clean/include/rpc_subs.h 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/include/rpc_subs.h 2018-06-15 20:58:25.358902779 +0300
-@@ -18,7 +18,7 @@
-
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
--#include <nfs/nfs.h>
-+#include <linux/nfs.h>
- #include <linux/nfs2.h>
- #include <linux/nfs3.h>
-
-diff -Naur autofs-5.1.4-clean/modules/lookup_multi.c autofs-5.1.4-patched/modules/lookup_multi.c
---- autofs-5.1.4-clean/modules/lookup_multi.c 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/modules/lookup_multi.c 2018-06-15 20:58:25.372236237 +0300
-@@ -247,7 +247,7 @@
- continue;
- }
-
-- if (st.st_mode & __S_IEXEC)
-+ if (st.st_mode & S_IEXEC)
- type = src_prog;
- else
- type = src_file;
-@@ -452,7 +452,7 @@
- continue;
- }
-
-- if (st.st_mode & __S_IEXEC)
-+ if (st.st_mode & S_IEXEC)
- type = src_prog;
- else
- type = src_file;
-diff -Naur autofs-5.1.4-clean/samples/auto.master autofs-5.1.4-patched/samples/auto.master
---- autofs-5.1.4-clean/samples/auto.master 2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/samples/auto.master 2018-06-15 20:58:25.362236144 +0300
-@@ -4,7 +4,7 @@
- # mount-point [map-type[,format]:]map [options]
- # For details of the format look at auto.master(5).
- #
--/misc /etc/auto.misc
-+/misc /etc/autofs/auto.misc
- #
- # NOTE: mounts done from a hosts map will be mounted with the
- # "nosuid" and "nodev" options unless the "suid" and "dev"
-@@ -12,14 +12,14 @@
- #
- /net -hosts
- #
--# Include /etc/auto.master.d/*.autofs
-+# Include /etc/autofs/auto.master.d/*.autofs
- # To add an extra map using this mechanism you will need to add
- # two configuration items - one /etc/auto.master.d/extra.autofs file
- # (using the same line format as the auto.master file)
- # and a separate mount map (e.g. /etc/auto.extra or an auto.extra NIS map)
- # that is referred to by the extra.autofs file.
- #
--+dir:/etc/auto.master.d
-++dir:/etc/autofs/auto.master.d
- #
- # If you have fedfs set up and the related binaries, either
- # built as part of autofs or installed from another package,
-
diff --git a/community/autofs/APKBUILD b/community/autofs/APKBUILD
index 43777cead9..1115de8ae5 100644
--- a/community/autofs/APKBUILD
+++ b/community/autofs/APKBUILD
@@ -1,21 +1,30 @@
# Contributor: Alex Laskin <alex@lask.in>
# Maintainer: Alex Laskin <alex@lask.in>
pkgname=autofs
-pkgver=5.1.6
-pkgrel=1
+pkgver=5.1.8
+pkgrel=0
pkgdesc="A kernel-based automounter for Linux"
url="https://www.kernel.org/pub/linux/daemons/autofs/"
arch="all"
license="GPL-2.0-or-later"
-makedepends="linux-headers automake flex bison rpcgen libtirpc-dev libnfs-dev coreutils"
+makedepends="
+ automake
+ bison
+ coreutils
+ flex
+ libnfs-dev
+ libtirpc-dev
+ linux-headers
+ rpcgen
+ "
subpackages="$pkgname-doc $pkgname-openrc"
options="!check" # no test suite provided
source="
https://www.kernel.org/pub/linux/daemons/$pkgname/v5/$pkgname-$pkgver.tar.xz
autofs.initd
autofs.confd
- pid_t.patch
- 10-glibc.patch
+ 0001-auto.master-change-paths-in-etc.patch
+ 0002-musl-backport-fixes.patch
"
prepare() {
@@ -55,8 +64,10 @@ package() {
rm -f "$pkgdir"/usr/share/man/man5/autofs.5
}
-sha512sums="dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2 autofs-5.1.6.tar.xz
+sha512sums="
+6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223 autofs-5.1.8.tar.xz
e7ffe40cf5f302f7de7cc59752699adad4be89fa78fa1a79c32ce4059ec2f563c0f107ca2cec850cabfb1cdebca5ff1f369167479423ab6cfe509225a799a00e autofs.initd
74884b94d8c5dc72579c9c0c9f13c8918ee0babe6fc1e6352bb79cfaf6f5ce3daa87a9b2ea2f34a4600c93a971b329aa0892785fe2efd42829fb7953a6130dd7 autofs.confd
-78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6 pid_t.patch
-0de8adc821fa59a9c5392ea5e4a3b540a39f38b8bb2ddde8d20ca4946e3d1467c80bb375d918a11e2331281e220da56e66c2aa1e974b9e6e40c7d3a3b4cdac5e 10-glibc.patch"
+562607fb77347680740a73242390cd199595779acd96033b7b9b4579ef57e8fc887bbcee227964ffeda1710798becd58e957e28c4dd875f2402c9d3989a04aef 0001-auto.master-change-paths-in-etc.patch
+e928f89147d29374b1daa97331a2aca858a2ac6de3f91e041806ebbc12ddc861d801921e20d3da3968f154bfbf916456c0cb98ac430b9dd515159436eb135f39 0002-musl-backport-fixes.patch
+"
diff --git a/community/autofs/pid_t.patch b/community/autofs/pid_t.patch
deleted file mode 100644
index 1766c34e98..0000000000
--- a/community/autofs/pid_t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/include/log.h b/include/log.h
-index 69eed96..14051cc 100644
---- a/include/log.h
-+++ b/include/log.h
-@@ -46,6 +46,8 @@ extern void log_crit(unsigned, const char* msg, ...);
- extern void log_debug(unsigned int, const char* msg, ...);
- extern void logmsg(const char* msg, ...);
-
-+#include <unistd.h> /* Required for pid_t */
-+
- extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
-
- #define debug(opt, msg, args...) \
-
diff --git a/community/bat/APKBUILD b/community/bat/APKBUILD
index 0baf323a64..4b220fef62 100644
--- a/community/bat/APKBUILD
+++ b/community/bat/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Chloe Kudryavtsev <toast@toast.cafe>
# Maintainer: Chloe Kudryavtsev <toast@toast.cafe>
pkgname=bat
-pkgver=0.20.0
-pkgrel=1
+pkgver=0.21.0
+pkgrel=0
pkgdesc="cat(1) clone with wings"
url="https://github.com/sharkdp/bat"
arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by rust/cargo
@@ -20,6 +20,10 @@ source="https://github.com/sharkdp/bat/archive/v$pkgver/bat-$pkgver.tar.gz
minimize-size.patch
"
+# secfixes:
+# 0.21.0-r0:
+# - CVE-2022-24713
+
prepare() {
default_prepare
cargo fetch --locked
@@ -49,6 +53,6 @@ package() {
}
sha512sums="
-22b4ad8f8a5ba55cb8b16aefda29e95fd55e60ed8c2d3f0de36f6a00b770d9ee7f86f4e5ca35bee4e9f22772ab4b3c327d21ebbec25dc0350d9fb89a9f9f22e7 bat-0.20.0.tar.gz
+113a8225bd297d9a18ad620c5509db1c4028d92387b70fb3eacc34b0ab9dabdd01a206d1b3062632830d8cf34cb12ea8ca6788a8ea985c5e5de57bf71306be70 bat-0.21.0.tar.gz
efa83937c5704bfa91d3d12a31aa2a798279ce4572259eb3b87ffdbb7dd873a9a480626f01db2aeac489c277d9fc64a97938ca4bcc5d964951f1f52c752556fb minimize-size.patch
"
diff --git a/community/bird_exporter/APKBUILD b/community/bird_exporter/APKBUILD
index 36cf9c3703..4face2a509 100644
--- a/community/bird_exporter/APKBUILD
+++ b/community/bird_exporter/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Thomas Liske <thomas@fiasko-nw.net>
pkgname=bird_exporter
pkgver=1.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Metric exporter for bird routing daemon to use with Prometheus"
url="https://github.com/czerwonk/bird_exporter"
arch="all"
diff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD
index 77dc945cd2..52bf03d45c 100644
--- a/community/bitcoin/APKBUILD
+++ b/community/bitcoin/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=bitcoin
-pkgver=22.0
-pkgrel=2
+pkgver=23.0
+pkgrel=1
pkgdesc="Decentralized P2P electronic cash system"
url="https://www.bitcoin.org/"
# x86: segfault in check
@@ -102,7 +102,7 @@ dev() {
}
sha512sums="
-a39dcc6e89f42c9da2d9aad503071c615bde76b17c829d2b460754691ad07c3eef66c36555252d31ddc8f3b13d0e6893e40cfb042ba20ef19144bcd15d89ceb2 bitcoin-22.0.tar.gz
+c76defcb54618ac46ab9cc92e6df40d9a3d0e387bf9c2f253c5b66052c2ad449c533a9bf823f54a1a1c2e63c3ef0aa04d3146d686f6859c1b6a0e5aa39d75904 bitcoin-23.0.tar.gz
98aa5ad81bdb4ae961b791bc978c39117cdf2d83c2181f92bebbb0db107d9b6e86eda265fb3f93ff8a5ca8a7754d7148818b98095d57201dff9363d60b97e7dd ssize_t.patch
6f3098a8da217c465b3d8ed66fd4d15f0a64f1aa813a18d72d0fa97cb612682d33554d6b4e9fbfd5c8c06950531ac15514cbafeb91ac0887c30f1527c3a20b13 use-c-locale.patch
c88ca4f0c8a3179dbac274db1719983352caa5074b236e59d8fe31ab45ffa99bd90c1a566c4459261a9dcdcc990b826f3466c77aa7a32cf9fb15529a510ac7fd bitcoin.initd
diff --git a/community/blender/APKBUILD b/community/blender/APKBUILD
index 81ddb5653f..71b296fcee 100644
--- a/community/blender/APKBUILD
+++ b/community/blender/APKBUILD
@@ -4,7 +4,7 @@
pkgname=blender
pkgver=3.1.2
_pkgver=${pkgver%.[0-9]}
-pkgrel=0
+pkgrel=1
pkgdesc="3D Creation/Animation/Publishing System"
url="https://www.blender.org/"
arch="x86_64 aarch64" # limited by openvdb
diff --git a/community/browserpass/APKBUILD b/community/browserpass/APKBUILD
index 84a9a3f100..6894583379 100644
--- a/community/browserpass/APKBUILD
+++ b/community/browserpass/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=browserpass
pkgver=3.0.8
-pkgrel=2
+pkgrel=3
pkgdesc="Browser extension for pass"
url="https://github.com/browserpass/browserpass-native"
arch="all"
diff --git a/community/buildah/APKBUILD b/community/buildah/APKBUILD
index 7d1d51e566..5b6a99fe08 100644
--- a/community/buildah/APKBUILD
+++ b/community/buildah/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=buildah
pkgver=1.26.1
-pkgrel=0
+pkgrel=1
pkgdesc="tool that facilitates building OCI container images"
url="https://github.com/containers/buildah"
license="Apache-2.0"
diff --git a/community/bzrtp/APKBUILD b/community/bzrtp/APKBUILD
index 29cc5da7a8..09b5c3e4a6 100644
--- a/community/bzrtp/APKBUILD
+++ b/community/bzrtp/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=bzrtp
-pkgver=5.0.50
-pkgrel=1
+pkgver=5.1.3
+pkgrel=0
pkgdesc="BZRTP is an opensource implementation of ZRTP keys exchange protocol"
url="https://gitlab.linphone.org/BC/public/bzrtp"
arch="all"
license="GPL-3.0-only"
-makedepends="cmake bctoolbox-dev sqlite-dev libxml2-dev"
-options="!check" # no tests
+makedepends="cmake bctoolbox-dev sqlite-dev libxml2-dev samurai"
+#options="!check" # no tests
subpackages="$pkgname-dev"
source="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/$pkgver/bzrtp-$pkgver.tar.gz"
@@ -16,7 +16,7 @@ build() {
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- cmake -B build \
+ cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
@@ -26,10 +26,15 @@ build() {
cmake --build build
}
+check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-5f621659430b13190f630854f417fe0fe8b972da7596d67bada8288fb3134b06f4a188620595c8b06985393c598858aea4855dabea6e2e95ad024d9ea1ed2f88 bzrtp-5.0.50.tar.gz
+fda353af7c9c7abcb4bd6b87ed1c57e01c3384373800046baa0790b00f38bfc79fb959fe8fa4233d52de5c10e5a90274e60a058e1044489782ae84d73b6530b6 bzrtp-5.1.3.tar.gz
"
diff --git a/community/cachefilesd/APKBUILD b/community/cachefilesd/APKBUILD
index b172d07069..715c1afad0 100644
--- a/community/cachefilesd/APKBUILD
+++ b/community/cachefilesd/APKBUILD
@@ -2,9 +2,9 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cachefilesd
pkgver=0.10.10
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace daemon acting as a backend for FS-Cache"
-url="http://people.redhat.com/~dhowells/fscache/"
+url="https://people.redhat.com/~dhowells/fscache/"
arch="all"
license="GPL"
depends="attr"
@@ -26,5 +26,7 @@ package() {
install -D -m 755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
}
-sha512sums="d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a cachefilesd-0.10.10.tar
-854b66470ace24caf24e979de3c1c12a426972bc745823b3a0f47ac80811ac5da4fa6a249e65386acdec2e7561178bb1d2c4b301a2178458f10496bb8eac5b2f cachefilesd.initd"
+sha512sums="
+d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a cachefilesd-0.10.10.tar
+854b66470ace24caf24e979de3c1c12a426972bc745823b3a0f47ac80811ac5da4fa6a249e65386acdec2e7561178bb1d2c4b301a2178458f10496bb8eac5b2f cachefilesd.initd
+"
diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD
index ae9b5ec2dd..2a942edc4b 100644
--- a/community/caddy/APKBUILD
+++ b/community/caddy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=caddy
pkgver=2.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="Fast, multi-platform web server with automatic HTTPS"
url="https://caddyserver.com/"
license="Apache-2.0"
diff --git a/community/cage/APKBUILD b/community/cage/APKBUILD
index 570d94fa79..3ae83d5b24 100644
--- a/community/cage/APKBUILD
+++ b/community/cage/APKBUILD
@@ -2,16 +2,18 @@
# Contributor: Will Sinatra <wpsinatra@gmail.com>
pkgname=cage
pkgver=0.1.4
-pkgrel=1
+pkgrel=2
pkgdesc="Wayland Kiosk"
url="https://www.hjdskes.nl/projects/cage/"
license="MIT"
arch="all"
options="!check" # no test suite
depends="xwayland"
-makedepends="meson wlroots0.14-dev wayland-protocols scdoc"
+makedepends="meson wlroots-dev wayland-protocols scdoc"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Hjdskes/cage/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Hjdskes/cage/archive/v$pkgver.tar.gz
+ wlroots-0.15.patch
+ "
build() {
abuild-meson \
@@ -26,4 +28,5 @@ package() {
sha512sums="
55773fac44bf9e98086e53cbc20d17e3aad7046bedfe638ef8f896543388481be3989fede6f950d4f8cb0583f701cbf79617dfa011c7777a7c8b22c9bcddd64f cage-0.1.4.tar.gz
+018a581abb6e4fa63b73896cf0fb299ef68215a5fbdd2f1526dc6dd82430e72cb9fd1a2d57f4a6f40856a247fea6adbd937e8b67ed10d9877b3f31f7dc6f2431 wlroots-0.15.patch
"
diff --git a/community/cage/wlroots-0.15.patch b/community/cage/wlroots-0.15.patch
new file mode 100644
index 0000000000..e5d411072f
--- /dev/null
+++ b/community/cage/wlroots-0.15.patch
@@ -0,0 +1,351 @@
+Patch-Source: https://github.com/Hjdskes/cage/commit/1a3ab3eb3ad0f4a1addb8f9a9427d8b369b19511
+Patch-Source: https://github.com/Hjdskes/cage/commit/395189fb051ed722c7b10b6cb11caa8f6904079c
+
+github-actions stuff removed
+
+From 1a3ab3eb3ad0f4a1addb8f9a9427d8b369b19511 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Mon, 9 Aug 2021 20:29:18 +0200
+Subject: [PATCH] build: allow using subproject for wlroots
+
+This is handy when testing cage with a newer wlroots copy, or
+when developing cage and wlroots patches in parallel.
+---
+ meson.build | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 3a84794..6b5bce6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,7 +34,7 @@ if is_freebsd
+ )
+ endif
+
+-wlroots = dependency('wlroots', version: '>= 0.14.0')
++wlroots = dependency('wlroots', version: '>= 0.14.0', fallback: ['wlroots', 'wlroots'])
+ wayland_protos = dependency('wayland-protocols', version: '>=1.14')
+ wayland_server = dependency('wayland-server')
+ pixman = dependency('pixman-1')
+@@ -65,12 +65,11 @@ server_protos = declare_dependency(
+ )
+
+ if get_option('xwayland')
+- wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1'
++ wlroots_has_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
+ if not wlroots_has_xwayland
+ error('Cannot build Cage with XWayland support: wlroots has been built without it')
+- else
+- have_xwayland = true
+ endif
++ have_xwayland = true
+ else
+ have_xwayland = false
+ endif
+From 395189fb051ed722c7b10b6cb11caa8f6904079c Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Wed, 11 Aug 2021 11:31:14 +0200
+Subject: [PATCH] Upgrade to wlroots 0.15
+
+- Update wlr_box includes to util/box.h: the wlroots header has
+ been moved upstream.
+- Subsurface fields have been moved
+- Create renderer and allocator, stop using wlr_backend_get_renderer
+- Initalize output rendering
+---
+ .github/workflows/main.yml | 8 ++++----
+ cage.c | 21 +++++++++++++++++----
+ meson.build | 2 +-
+ output.c | 5 +++++
+ render.c | 26 ++++++++------------------
+ server.h | 2 ++
+ util.c | 2 --
+ util.h | 2 +-
+ view.c | 5 ++---
+ view.h | 2 +-
+ xdg_shell.c | 1 -
+ xwayland.c | 1 -
+ 12 files changed, 41 insertions(+), 36 deletions(-)
+
+diff --git a/cage.c b/cage.c
+index 5392535..f9db7a9 100644
+--- a/cage.c
++++ b/cage.c
+@@ -19,6 +19,7 @@
+ #include <unistd.h>
+ #include <wayland-server-core.h>
+ #include <wlr/backend.h>
++#include <wlr/render/allocator.h>
+ #include <wlr/render/wlr_renderer.h>
+ #include <wlr/types/wlr_compositor.h>
+ #include <wlr/types/wlr_data_device.h>
+@@ -261,7 +262,6 @@ main(int argc, char *argv[])
+ struct wl_event_source *sigint_source = NULL;
+ struct wl_event_source *sigterm_source = NULL;
+ struct wl_event_source *sigchld_source = NULL;
+- struct wlr_renderer *renderer = NULL;
+ struct wlr_compositor *compositor = NULL;
+ struct wlr_data_device_manager *data_device_manager = NULL;
+ struct wlr_server_decoration_manager *server_decoration_manager = NULL;
+@@ -316,8 +316,21 @@ main(int argc, char *argv[])
+ goto end;
+ }
+
+- renderer = wlr_backend_get_renderer(server.backend);
+- wlr_renderer_init_wl_display(renderer, server.wl_display);
++ server.renderer = wlr_renderer_autocreate(server.backend);
++ if (!server.renderer) {
++ wlr_log(WLR_ERROR, "Unable to create the wlroots renderer");
++ ret = 1;
++ goto end;
++ }
++
++ server.allocator = wlr_allocator_autocreate(server.backend, server.renderer);
++ if (!server.allocator) {
++ wlr_log(WLR_ERROR, "Unable to create the wlroots allocator");
++ ret = 1;
++ goto end;
++ }
++
++ wlr_renderer_init_wl_display(server.renderer, server.wl_display);
+
+ wl_list_init(&server.views);
+ wl_list_init(&server.outputs);
+@@ -329,7 +342,7 @@ main(int argc, char *argv[])
+ goto end;
+ }
+
+- compositor = wlr_compositor_create(server.wl_display, renderer);
++ compositor = wlr_compositor_create(server.wl_display, server.renderer);
+ if (!compositor) {
+ wlr_log(WLR_ERROR, "Unable to create the wlroots compositor");
+ ret = 1;
+diff --git a/meson.build b/meson.build
+index 80e72dc..7c57967 100644
+--- a/meson.build
++++ b/meson.build
+@@ -35,7 +35,7 @@ if is_freebsd
+ )
+ endif
+
+-wlroots = dependency('wlroots', version: '>= 0.14.0', fallback: ['wlroots', 'wlroots'])
++wlroots = dependency('wlroots', version: '>= 0.15.0', fallback: ['wlroots', 'wlroots'])
+ wayland_protos = dependency('wayland-protocols', version: '>=1.14')
+ wayland_server = dependency('wayland-server')
+ pixman = dependency('pixman-1')
+diff --git a/output.c b/output.c
+index 0f4f6b2..60266e1 100644
+--- a/output.c
++++ b/output.c
+@@ -442,6 +442,11 @@ handle_new_output(struct wl_listener *listener, void *data)
+ struct cg_server *server = wl_container_of(listener, server, new_output);
+ struct wlr_output *wlr_output = data;
+
++ if (!wlr_output_init_render(wlr_output, server->allocator, server->renderer)) {
++ wlr_log(WLR_ERROR, "Failed to initialize output rendering");
++ return;
++ }
++
+ struct cg_output *output = calloc(1, sizeof(struct cg_output));
+ if (!output) {
+ wlr_log(WLR_ERROR, "Failed to allocate output");
+diff --git a/render.c b/render.c
+index 166a088..ffa960f 100644
+--- a/render.c
++++ b/render.c
+@@ -10,11 +10,11 @@
+ #include <wayland-server-core.h>
+ #include <wlr/backend.h>
+ #include <wlr/render/wlr_renderer.h>
+-#include <wlr/types/wlr_box.h>
+ #include <wlr/types/wlr_matrix.h>
+ #include <wlr/types/wlr_output.h>
+ #include <wlr/types/wlr_output_layout.h>
+ #include <wlr/types/wlr_surface.h>
++#include <wlr/util/box.h>
+ #include <wlr/util/log.h>
+ #include <wlr/util/region.h>
+
+@@ -27,8 +27,6 @@
+ static void
+ scissor_output(struct wlr_output *output, pixman_box32_t *rect)
+ {
+- struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
+-
+ struct wlr_box box = {
+ .x = rect->x1,
+ .y = rect->y1,
+@@ -41,7 +39,7 @@ scissor_output(struct wlr_output *output, pixman_box32_t *rect)
+ enum wl_output_transform transform = wlr_output_transform_invert(output->transform);
+ wlr_box_transform(&box, &box, transform, output_width, output_height);
+
+- wlr_renderer_scissor(renderer, &box);
++ wlr_renderer_scissor(output->renderer, &box);
+ }
+
+ struct render_data {
+@@ -52,8 +50,6 @@ static void
+ render_texture(struct wlr_output *wlr_output, pixman_region32_t *output_damage, struct wlr_texture *texture,
+ const struct wlr_box *box, const float matrix[static 9])
+ {
+- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
+-
+ pixman_region32_t damage;
+ pixman_region32_init(&damage);
+ pixman_region32_union_rect(&damage, &damage, box->x, box->y, box->width, box->height);
+@@ -66,7 +62,7 @@ render_texture(struct wlr_output *wlr_output, pixman_region32_t *output_damage,
+ pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
+ for (int i = 0; i < nrects; i++) {
+ scissor_output(wlr_output, &rects[i]);
+- wlr_render_texture_with_matrix(renderer, texture, matrix, 1.0f);
++ wlr_render_texture_with_matrix(wlr_output->renderer, texture, matrix, 1.0f);
+ }
+
+ damage_finish:
+@@ -134,13 +130,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage)
+ struct cg_server *server = output->server;
+ struct wlr_output *wlr_output = output->wlr_output;
+
+- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
+- if (!renderer) {
+- wlr_log(WLR_DEBUG, "Expected the output backend to have a renderer");
+- return;
+- }
+-
+- wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
++ wlr_renderer_begin(server->renderer, wlr_output->width, wlr_output->height);
+
+ if (!pixman_region32_not_empty(damage)) {
+ wlr_log(WLR_DEBUG, "Output isn't damaged but needs a buffer swap");
+@@ -149,7 +139,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage)
+
+ #ifdef DEBUG
+ if (server->debug_damage_tracking) {
+- wlr_renderer_clear(renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f});
++ wlr_renderer_clear(server->renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f});
+ }
+ #endif
+
+@@ -158,7 +148,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage)
+ pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
+ for (int i = 0; i < nrects; i++) {
+ scissor_output(wlr_output, &rects[i]);
+- wlr_renderer_clear(renderer, color);
++ wlr_renderer_clear(server->renderer, color);
+ }
+
+ // TODO: render only top view, possibly use focused view for this, see #35.
+@@ -178,8 +168,8 @@ output_render(struct cg_output *output, pixman_region32_t *damage)
+ /* Draw software cursor in case hardware cursors aren't
+ available. This is a no-op when they are. */
+ wlr_output_render_software_cursors(wlr_output, damage);
+- wlr_renderer_scissor(renderer, NULL);
+- wlr_renderer_end(renderer);
++ wlr_renderer_scissor(server->renderer, NULL);
++ wlr_renderer_end(server->renderer);
+
+ int output_width, output_height;
+ wlr_output_transformed_resolution(wlr_output, &output_width, &output_height);
+diff --git a/server.h b/server.h
+index 817637b..74970c5 100644
+--- a/server.h
++++ b/server.h
+@@ -25,6 +25,8 @@ struct cg_server {
+ struct wl_display *wl_display;
+ struct wl_list views;
+ struct wlr_backend *backend;
++ struct wlr_renderer *renderer;
++ struct wlr_allocator *allocator;
+
+ struct cg_seat *seat;
+ struct wlr_idle *idle;
+diff --git a/util.c b/util.c
+index 95de499..714c7e3 100644
+--- a/util.c
++++ b/util.c
+@@ -6,8 +6,6 @@
+ * See the LICENSE file accompanying this file.
+ */
+
+-#include <wlr/types/wlr_box.h>
+-
+ #include "util.h"
+
+ int
+diff --git a/util.h b/util.h
+index db6bc7d..b6281f3 100644
+--- a/util.h
++++ b/util.h
+@@ -1,7 +1,7 @@
+ #ifndef CG_UTIL_H
+ #define CG_UTIL_H
+
+-#include <wlr/types/wlr_box.h>
++#include <wlr/util/box.h>
+
+ /** Apply scale to a width or height. */
+ int scale_length(int length, int offset, float scale);
+diff --git a/view.c b/view.c
+index 3f3b0ed..33b59b4 100644
+--- a/view.c
++++ b/view.c
+@@ -12,7 +12,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <wayland-server-core.h>
+-#include <wlr/types/wlr_box.h>
+ #include <wlr/types/wlr_output.h>
+ #include <wlr/types/wlr_surface.h>
+
+@@ -235,10 +234,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface)
+ view->wlr_surface = surface;
+
+ struct wlr_subsurface *subsurface;
+- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) {
++ wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_below, current.link) {
+ subsurface_create(view, subsurface);
+ }
+- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) {
++ wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_above, current.link) {
+ subsurface_create(view, subsurface);
+ }
+
+diff --git a/view.h b/view.h
+index cd16e42..87477d0 100644
+--- a/view.h
++++ b/view.h
+@@ -5,9 +5,9 @@
+
+ #include <stdbool.h>
+ #include <wayland-server-core.h>
+-#include <wlr/types/wlr_box.h>
+ #include <wlr/types/wlr_surface.h>
+ #include <wlr/types/wlr_xdg_shell.h>
++#include <wlr/util/box.h>
+ #if CAGE_HAS_XWAYLAND
+ #include <wlr/xwayland.h>
+ #endif
+diff --git a/xdg_shell.c b/xdg_shell.c
+index 5bac6de..72ae43a 100644
+--- a/xdg_shell.c
++++ b/xdg_shell.c
+@@ -9,7 +9,6 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <wayland-server-core.h>
+-#include <wlr/types/wlr_box.h>
+ #include <wlr/types/wlr_xdg_shell.h>
+ #include <wlr/util/log.h>
+
+diff --git a/xwayland.c b/xwayland.c
+index 2aae0f9..ebd8e54 100644
+--- a/xwayland.c
++++ b/xwayland.c
+@@ -9,7 +9,6 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <wayland-server-core.h>
+-#include <wlr/types/wlr_box.h>
+ #include <wlr/util/log.h>
+ #include <wlr/xwayland.h>
+
diff --git a/community/calamares/APKBUILD b/community/calamares/APKBUILD
index 1bb6a0a97b..e9783d97c5 100644
--- a/community/calamares/APKBUILD
+++ b/community/calamares/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=calamares
pkgver=3.2.47
-pkgrel=5
+pkgrel=6
# armhf blocked by qt5-qtdeclarative
# ppc64le, s390x, and riscv64 blocked by qt5-qtwebengine
arch="all !armhf !ppc64le !s390x !riscv64"
diff --git a/community/calligra/APKBUILD b/community/calligra/APKBUILD
index f6e16fe27e..ac247e1719 100644
--- a/community/calligra/APKBUILD
+++ b/community/calligra/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=calligra
pkgver=3.2.1
-pkgrel=23
+pkgrel=25
pkgdesc="Office and graphic art suite by KDE"
# armhf blocked by extra-cmake-modules
# s390x and riscv64 blocked by polkit -> kio
@@ -63,6 +63,7 @@ makedepends="$makedepends
checkdepends="xvfb-run"
source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz
poppler-22.03.patch
+ poppler-22.04.patch
gcc11.patch
modernise-cmake.patch
fontconfig-linking.patch
@@ -92,7 +93,8 @@ package() {
sha512sums="
e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f calligra-3.2.1.tar.xz
-101cafc43865afa7097cf5ba5b754ec6566fefb9084a3589dd5b482231cf991fcea0b4ee4a42159b4ccc3f1234a75854af1008a1f8fa79872d61d3bd73030d1d poppler-22.03.patch
+f20c129525fe8665393d7f02758e070e953729e793235ccdda18478f925a10786141b73babae5ac6b68d9878dda41b437f3ce6b750dfae97de757c9d5852f283 poppler-22.03.patch
+2654b3f1dc8d1863ac4efd2ababe97171963a9a3c6275c422ec04fa802e4764ceb63ea1511edeed4feedced2282cf0fe67282f522f397961b0a940ad88f0def2 poppler-22.04.patch
8c56ac0e3347f97bb44d6abf4e3c2303898ce7a4556e0264440ba928e159e978f858a730c9ed07dcde2f0fdc32228d3cc5a565574bf52f43a53475501a640bc4 gcc11.patch
bbf56c7489af184fe3710108ce43b610f9723cbdf49246bc2bdff4d86d9171693afc64d6072680e6f785f8b15aea509ea0e8cfb84424d1ef1b4d3e876630005f modernise-cmake.patch
050d8a80cb2827cbd83835e198014a7a2c33b38a7200e9b5b07d80d4c2e801d0ac7879f7ed06ea9454e1eb37d617c1fe39db6f5a50466afddb9cdef18264c4b6 fontconfig-linking.patch
diff --git a/community/calligra/poppler-22.03.patch b/community/calligra/poppler-22.03.patch
index c2ace37021..4accd4b7a3 100644
--- a/community/calligra/poppler-22.03.patch
+++ b/community/calligra/poppler-22.03.patch
@@ -1,66 +1,74 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/bccf43ed23b3e0e7943c973f20faa1f2dc84d99c/trunk/poppler-22.03.0.patch
-edited to add <memory> import
-diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/CMakeLists.txt calligra-3.2.1/filters/karbon/pdf/CMakeLists.txt
---- calligra-3.2.1.orig/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300
-+++ calligra-3.2.1/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200
-@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0"
- add_definitions("-DHAVE_POPPLER_PRE_0_83")
- endif()
-
-+if(Poppler_VERSION VERSION_LESS "22.3.0")
-+ add_definitions("-DHAVE_POPPLER_PRE_22_3")
-+endif()
-+
- set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+Patch-Source: https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a
+From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Apr 2022 01:25:44 +0200
+Subject: [PATCH] PdfImport: Fix compile with newer poppler
+
+Brings a dependency on poppler-qt5 to be able to include the version
+header, honestly it's not strictly needed, one could do a
+check_cxx_source_compiles, but I don't care about Calligra enough to
+spend more time making it compile while it's using poppler the wrong
+way.
+---
+ CMakeLists.txt | 1 +
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/PdfImport.cpp | 9 +++++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 51f1d65b8e6..06bbad5c24c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG
+ calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
+ NOT_WIN "not supported on Windows"
+ PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
++ Poppler_FOUND "poppler qt5 headers not found"
+ )
+ calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index 8fddf1ad757..b71c92cbf04 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
-diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/Pdf2OdgImport.cpp calligra-3.2.1/filters/karbon/pdf/Pdf2OdgImport.cpp
---- calligra-3.2.1.orig/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300
-+++ calligra-3.2.1/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200
-@@ -22,6 +22,8 @@
- #include "PdfImportDebug.h"
- #include "SvgOutputDev.h"
+ calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop)
-+#include <memory>
-+
- #include <QString>
- #include <QFile>
+-target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core)
++target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5)
-@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport
- if (! globalParams)
- return KoFilter::NotImplemented;
+ install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
-+#ifdef HAVE_POPPLER_PRE_22_3
- GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
- PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-+#else
-+ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));
-+#endif
- if (! pdfDoc) {
- #ifdef HAVE_POPPLER_PRE_0_83
- delete globalParams;
-diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/PdfImport.cpp calligra-3.2.1/filters/karbon/pdf/PdfImport.cpp
---- calligra-3.2.1.orig/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300
-+++ calligra-3.2.1/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200
-@@ -22,6 +22,8 @@
- #include "PdfImportDebug.h"
- #include "SvgOutputDev.h"
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index abbe681b4e8..e97974fc133 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -17,6 +17,10 @@
-+#include <memory>
-+
- #include <QString>
- #include <QFile>
+ #include <kpluginfactory.h>
-@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co
++#include <poppler-version.h>
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
if (! globalParams)
return KoFilter::NotImplemented;
-+#ifdef HAVE_POPPLER_PRE_22_3
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
+#else
-+ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));
++ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
+#endif
if (! pdfDoc) {
- #ifdef HAVE_POPPLER_PRE_0_83
- delete globalParams;
+ globalParams.reset();
+ return KoFilter::StupidError;
+--
+GitLab
+
diff --git a/community/calligra/poppler-22.04.patch b/community/calligra/poppler-22.04.patch
new file mode 100644
index 0000000000..2295874a83
--- /dev/null
+++ b/community/calligra/poppler-22.04.patch
@@ -0,0 +1,95 @@
+Patch-Source: https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de
+From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Wed, 13 Apr 2022 14:45:33 +0200
+Subject: [PATCH] PdfImport: Fix compile with newer poppler
+
+Also fixes odg2pdf filter.
+
+Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
+by accid@kde.org.
+---
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++
+ filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index b71c92cbf04..4ce138ccdd6 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp)
+ add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS})
+ calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop)
+
+-target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core)
++target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5)
+
+ install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
+diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
+index 934e31dd5aa..a21eac97a77 100644
+--- a/filters/karbon/pdf/Pdf2OdgImport.cpp
++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
+@@ -27,6 +27,8 @@
+
+ #include <kpluginfactory.h>
+
++#include <poppler-version.h>
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -36,6 +38,8 @@
+ #include <PDFDoc.h>
+ #include <GlobalParams.h>
+
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json",
+ registerPlugin<Pdf2OdgImport>();)
+
+@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
++#endif
+ if (! pdfDoc) {
+ globalParams.reset();
+ return KoFilter::StupidError;
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 0e6e5a934ca..7caec15175a 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -22,6 +22,10 @@
+ #include <QPen>
+ #include <QImage>
+
++#include <poppler-version.h>
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ class SvgOutputDev::Private
+ {
+ public:
+@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ if (s->getLength() == 0)
+ return;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GfxFont * font = state->getFont();
++#else
++ std::shared_ptr<GfxFont> font = state->getFont();
++#endif
++
+
+ QString str;
+
+--
+GitLab
+
diff --git a/community/ceph/APKBUILD b/community/ceph/APKBUILD
index 1f0b144767..eb562e1e56 100644
--- a/community/ceph/APKBUILD
+++ b/community/ceph/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=ceph
pkgver=16.2.7
-pkgrel=5
+pkgrel=6
pkgdesc="Ceph is a distributed object store and file system"
pkgusers="ceph"
pkggroups="ceph"
diff --git a/community/cereal/APKBUILD b/community/cereal/APKBUILD
index 9e9d76fd3e..db27c26b1c 100644
--- a/community/cereal/APKBUILD
+++ b/community/cereal/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Adam Jensen <adam@acj.sh>
pkgname=cereal
pkgver=1.3.2
-pkgrel=0
+pkgrel=1
pkgdesc="A header-only C++11 library for serialization"
url="https://github.com/USCiLab/cereal"
arch="noarch"
diff --git a/community/chezmoi/APKBUILD b/community/chezmoi/APKBUILD
index 1a0785a54e..f3ffff33f1 100644
--- a/community/chezmoi/APKBUILD
+++ b/community/chezmoi/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=chezmoi
-pkgver=2.15.2
-pkgrel=0
+pkgver=2.15.4
+pkgrel=1
pkgdesc="Manage your dotfiles across multiple machines, securely."
url="https://www.chezmoi.io/"
arch="all"
@@ -47,5 +47,5 @@ doc() {
}
sha512sums="
-b3753c585caffcc8c1d3cebac4b4282ea08a8d0835d95c85209ca79173c41eaa0841024f22416eaaccbd90683f01da116a3b733a142bb9c55e496d16f4b901cb chezmoi-2.15.2.tar.gz
+b4316e76590d6f2c44d6842aa595182571b7152949c1c63fceb5257db2fe865026bb6a65dc992b8f1a9fd69cf850073275df375aa650e422dbc53809503f35be chezmoi-2.15.4.tar.gz
"
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index fc16e9a1a5..005ce4948e 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chromium
-pkgver=101.0.4951.54
+pkgver=101.0.4951.64
pkgrel=0
pkgdesc="Chromium web browser"
url="https://www.chromium.org/Home"
@@ -21,7 +21,7 @@ makedepends="
elfutils
elfutils-dev
eudev-dev
- ffmpeg4-dev
+ ffmpeg-dev
findutils
flac-dev
freetype-dev
@@ -105,11 +105,9 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
musl-v8-monotonic-pthread-cont_timedwait.patch
nasm.patch
- gcc-arm.patch
elf-arm.patch
fix-narrowing-cast.patch
- use-deprecated-ffmpeg-api.patch
fix-unittests-sandbox.patch
@@ -121,7 +119,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
revert-use-ffile-compilation-dir.patch
chromium-VirtualCursor-standard-layout.patch
- unbundle-ffmpeg-av_stream_get_first_dts.patch
credentials-header.patch
@@ -130,9 +127,48 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
memory-tagging-arm64.patch
libxml-unbundle.patch
fix-missing-cstdint-include-musl.patch
+ fix-no-member-named-tie-in-namespace-std.patch
+ iwyu-add-utility-for-std-exchange.patch
"
# secfixes:
+# 101.0.4951.64-r0:
+# - CVE-2022-1633
+# - CVE-2022-1634
+# - CVE-2022-1635
+# - CVE-2022-1636
+# - CVE-2022-1637
+# - CVE-2022-1638
+# - CVE-2022-1639
+# - CVE-2022-1640
+# - CVE-2022-1641
+# 101.0.4951.54-r0:
+# - CVE-2022-1477
+# - CVE-2022-1478
+# - CVE-2022-1479
+# - CVE-2022-1481
+# - CVE-2022-1482
+# - CVE-2022-1483
+# - CVE-2022-1484
+# - CVE-2022-1485
+# - CVE-2022-1486
+# - CVE-2022-1487
+# - CVE-2022-1488
+# - CVE-2022-1489
+# - CVE-2022-1490
+# - CVE-2022-1491
+# - CVE-2022-1492
+# - CVE-2022-1493
+# - CVE-2022-1494
+# - CVE-2022-1495
+# - CVE-2022-1496
+# - CVE-2022-1497
+# - CVE-2022-1498
+# - CVE-2022-1499
+# - CVE-2022-1500
+# - CVE-2022-1501
+# 100.0.4896.127-r0:
+# - CVE-2022-1364
# 99.0.4844.84-r0:
# - CVE-2022-1096
# 98.0.4758.102-r0:
@@ -747,7 +783,7 @@ angle() {
}
sha512sums="
-6c80afd5f9674e48d683a9fde91d3bc3fb6265e966a14ec8c5ec5dfea395924c08e872425f27b8da3a3ec46f4b765ef4546318a0bad23241e5f4a8671bdf95b3 chromium-101.0.4951.54.tar.xz
+ca1ba0994c75eda67f37a9e8333beb595b237b7266503cca4c259c48b8687214b35703fdda0d6cfd2c7bbdce0b66d68cede3bc22581453f035a173caf7d4985f chromium-101.0.4951.64.tar.xz
f554ccc5d8a5c066634357878c89944cc591809ea6f6c6ef5b35e970e9674e0b3be8fddb06c0d333ddc65211fa09ae5e0b4b483ca70048156c29607c5487c017 test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
@@ -768,10 +804,8 @@ ded02360a36283973b9abb4150de3d964749a58017fbbd9f09fb6cb29ec97a8ac99ccadd953633bb
2e5a83826239849d096aead033eb519338b84e6fbbf58abfcd7cfe40d0b3070b66bcc825ec84406484d73d1a333f1b9d23a8ab44987ab5c8b187076c84cd668b musl-crashpad.patch
556cc2ba28184a75745f13c673605327f5be590be179eb3f941dc0abded854a814e5da1432a28fb8d4dcdcd66ffd4c94ee1a8824d2cd93b632f48e9310dbc3fa musl-v8-monotonic-pthread-cont_timedwait.patch
7957aae04e8ef3badbc98c982ba1acb1b9ef5e665440116c704512f11554d7b64ba3643b7ff7d00476a6686324033b0cf762deb78ce798619226380953b9dc9c nasm.patch
-ad4ddc25df7aa1de2038b7adb86d27679ecdb7e3e16c0eec994e947a08c41504b6fb41166f7868ff5f58ce8191c78800cbb91d259c864840fa5af1d7ba5d43a1 gcc-arm.patch
9b1441fe42421ef9ead86a5143bf997d989bd53a8969cdfdf4e0c45f847efc8c1d127e15fb05e2ef5dbefbb228cbdc2849404d74997ca56265599e12e5efd6e4 elf-arm.patch
e60f381c557a15598d71e33b7aacc63be4a8e17b16cdd95047df5e5e9577ad925864ffd64597d5dbc9a4516de13b3f17c26099b36692165df8c66b1b4d399ce9 fix-narrowing-cast.patch
-ce562436249c4caf275c59aaa4e19ac910af26d11e7e053c6fe281ddd2ad9e1f1046e2a5be9567f8880d6901879bc86a61145cf1cc604816f5e1f9afb851577c use-deprecated-ffmpeg-api.patch
54f07ee9d85577e284e04460e79132fa6769251ceb045561cea811dde0369e9e4cdbcf26566235b0d12c649be4d46fea294f7c6a4e2a75109dc3282e6e7d7993 fix-unittests-sandbox.patch
c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec30984415ced27a5e20985df8c91295de34af3c84557fa5b91 chromium-revert-drop-of-system-java.patch
8d11b2ba811fdd6280784bfafcef073238324941b4c33e7c9a5ccfde8506242d06e5136d697f047bab3838b43a666f1da404af7b4f4ff9a0c6bf6bdb8448e5b2 scoped-file.patch
@@ -780,10 +814,11 @@ c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec3
ad10d3ac758b43caf034791ea50e4588f4979a07a9c4f71763d4987750db261f22cccb30279899878b14e8c9b9aef66fd81f1686e7198768db7513e340aa65ee quiche-arena-size.patch
2fdd0b2fd403dd4440533288f7e08bb8480702c42c7571ea764aac18ba5eaf72494793c77e4244991d12f45e5acfceae0772995b11d323916c07cb53c43a2f59 revert-use-ffile-compilation-dir.patch
0fc131ef4ad32964815744080f40cc2566c70da1cd4ddaf1da8456d1c86e67e3ebf38f43208d17d40b646744e8e662f5b314e236a1c90bc6f8b936313e42a3cf chromium-VirtualCursor-standard-layout.patch
-4d184faf083a82e2a51480b8513b14c81a8d03a821fd25bd41523093e064bc2ced8e23fdc37da548d9e1e171784263436b82be373aa7307b4da41ee8b3b26a89 unbundle-ffmpeg-av_stream_get_first_dts.patch
274858323d040ac8c51bac90b6ef91bb075d7b8d92d73952ed700c10a8bae2c2115fb2a9cc6912de79be226c141d7106839fc3486e22c0206e75cb6d8ff65ee6 credentials-header.patch
a018cf58b9e34f73d588961f2f9a36de67267060fb2e77ebc562974c6c92a59009161e374cf9bbdc35e8bf1a7e90f0b90117a0d494dcd2e2bb2f5e6534925d0b musl-tid-caching.patch
63e5b25c49af484964b3ac723da1c2f348812572a2e24ad412d2fb9eb7eec9ddc0e76568e76d1f352cdc562bc5003c93e04ee519a82e8568f48484d1682e237f memory-tagging-arm64.patch
17b54042c58cd448c7e26dca1504bb48d85fdd7c2385930e639c283493a5e430923041f01cde5a5dfaa32fbb7f0a645baca55b202d56d3f245fb4febdf026da2 libxml-unbundle.patch
eab2742eb6d25c40ea87fdb318efbc58383212ca3ab3317f65db6c47f45717d55076d1b0d526eb968daa32e6b000b84e8a6d434f6b8e3303f92455465c2870fc fix-missing-cstdint-include-musl.patch
+a7dd65fca2e4a928ed7cf7b5fbe4027a954429920d962d15228915b0d6a81b4f2988adfea38eb6bdc6145880e1b63ee84e103bbf1a05e7fc114cc32ce060856b fix-no-member-named-tie-in-namespace-std.patch
+4d268992ddb341e70f4e730c82c676c0c95b3958bc9553bbe83383cebde7373c79a8e9aeef47c7af2add8353263b02ccfd7e5bd864f544a584361a02d30374ec iwyu-add-utility-for-std-exchange.patch
"
diff --git a/community/chromium/fix-no-member-named-tie-in-namespace-std.patch b/community/chromium/fix-no-member-named-tie-in-namespace-std.patch
new file mode 100644
index 0000000000..d9f8e65a68
--- /dev/null
+++ b/community/chromium/fix-no-member-named-tie-in-namespace-std.patch
@@ -0,0 +1,29 @@
+Patch-Source: https://chromium-review.googlesource.com/c/chromium/src/+/3581869
+From 68c9c63c0b148ff5246a0cdad59000697bbd8645 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov@igalia.com>
+Date: Tue, 12 Apr 2022 15:11:34 +0000
+Subject: [PATCH] Fix no member named 'tie' in namespace 'std'
+
+Bug: None
+Change-Id: I8a097af2b16b738fa9bbb8231536bca85522f350
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3581869
+Auto-Submit: Maksim Sisov <msisov@igalia.com>
+Reviewed-by: Matt Menke <mmenke@chromium.org>
+Commit-Queue: Matt Menke <mmenke@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#991529}
+---
+ net/base/address_list.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/base/address_list.h b/net/base/address_list.h
+index 029af1aded3..a93093e41f3 100644
+--- a/net/base/address_list.h
++++ b/net/base/address_list.h
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+
+ #include <string>
++#include <tuple>
+ #include <utility>
+ #include <vector>
+
diff --git a/community/chromium/gcc-arm.patch b/community/chromium/gcc-arm.patch
deleted file mode 100644
index 9eaa240e84..0000000000
--- a/community/chromium/gcc-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./third_party/zlib/BUILD.gn.orig
-+++ ./third_party/zlib/BUILD.gn
-@@ -21,7 +21,7 @@
- !(is_win && !is_clang)) {
- # TODO(richard.townsend@arm.com): Optimizations temporarily disabled for
- # Windows on Arm MSVC builds, see http://crbug.com/v8/10012.
-- if (arm_use_neon) {
-+ if (arm_use_neon && is_clang) {
- use_arm_neon_optimizations = true
- }
- }
diff --git a/community/chromium/iwyu-add-utility-for-std-exchange.patch b/community/chromium/iwyu-add-utility-for-std-exchange.patch
new file mode 100644
index 0000000000..b79206d0f9
--- /dev/null
+++ b/community/chromium/iwyu-add-utility-for-std-exchange.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
+From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 25 Apr 2022 23:18:30 +0000
+Subject: [PATCH] IWYU: add utility for std::exchange
+
+Bug: 957519
+Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
+Reviewed-by: Wez <wez@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#995855}
+---
+ base/third_party/symbolize/symbolize.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
+index 99029a968d5..278078f6071 100644
+--- a/base/third_party/symbolize/symbolize.h
++++ b/base/third_party/symbolize/symbolize.h
+@@ -61,6 +61,7 @@
+ #ifdef HAVE_SYMBOLIZE
+
+ #include <algorithm>
++#include <utility>
+
+ #if defined(__ELF__) // defined by gcc
+ #if defined(__OpenBSD__)
diff --git a/community/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch b/community/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch
deleted file mode 100644
index dae1adde0b..0000000000
--- a/community/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
-index 16e20744706..6a079b32221 100644
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
- "libavformat",
- "libavutil",
- ]
-+ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
- }
-
- buildflag_header("ffmpeg_features") {
diff --git a/community/chromium/use-deprecated-ffmpeg-api.patch b/community/chromium/use-deprecated-ffmpeg-api.patch
deleted file mode 100644
index f0ec736f98..0000000000
--- a/community/chromium/use-deprecated-ffmpeg-api.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-- size_t id_size = 0;
-+ int id_size = 0;
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-- size_t settings_size = 0;
-+ int settings_size = 0;
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
- } else {
-- size_t side_data_size = 0;
-+ int side_data_size = 0;
- uint8_t* side_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- packet->size - data_offset);
- }
-
-- size_t skip_samples_size = 0;
-+ int skip_samples_size = 0;
- const uint32_t* skip_samples_ptr =
- reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
diff --git a/community/clamav/APKBUILD b/community/clamav/APKBUILD
index 81cdbe46c2..39574e4dc7 100644
--- a/community/clamav/APKBUILD
+++ b/community/clamav/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=clamav
-pkgver=0.104.2
-pkgrel=1
+pkgver=0.104.3
+pkgrel=0
pkgusers="clamav"
pkggroups="clamav"
pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
@@ -261,7 +261,7 @@ milter() {
}
sha512sums="
-8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5 clamav-0.104.2.tar.gz
+d38a2427df29813e4d0f41d480cda85f6175e617c397ab39d913000fa43fcb44f1e0b97d7bd558bc62369e8caeeb2b3aeb4b3dd575b9da4abb91f8b67a6b8431 clamav-0.104.3.tar.gz
20a52291d00e0b8e6e0cd7b31484a577045dfa8e2481fe1e4e1640e6f6d9317114c7fd53211a2bf9edcea4e084789b4820d7ceeaaf17346d581524683289e698 link-fts.patch
8a7e20d83ba004a701f91df94561d5df1ca6819df5bc7d0830279f51ad2e0f14fb003fd22db4a7de784c68ca4af504896b88f189124549a092a0689514456947 cmake-fix-race-condition-with-parallel-builds.patch
d886d810de66e8da800384c1e8192f7da4352402ffc3b33cfbca93d81a2235d8c902ca9d436b9be70f00740b4555e1efbf09bf9f84059095a1a297b27581cd20 clamd.initd
diff --git a/community/clickclack/APKBUILD b/community/clickclack/APKBUILD
index 8720ef504e..e6c7942628 100644
--- a/community/clickclack/APKBUILD
+++ b/community/clickclack/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Maarten van Gompel <proycon@anaproy.nl>
pkgname=clickclack
-pkgver=0.2.2
+pkgver=0.2.3
pkgrel=0
pkgdesc="Haptic/audio feedback daemon for virtual keyboards like svkbd and wvkbd"
url="https://git.sr.ht/~proycon/clickclack"
@@ -18,4 +18,4 @@ package() {
make PREFIX=/usr DESTDIR="$pkgdir" install
}
-sha512sums="d462b7b995d32f2ed836d2ec99c52d8af06282d195f63b1030a619f69142bff889ece9ff1ac3622b0108509e847b6383cd5bbead6915342b0dc76fca2db7a137 clickclack-0.2.2.tar.gz"
+sha512sums="fa45400fbae77eb75f659be25aa9f364eb3a841fe9cd1e4db96f573ec1689f215a2396b4888e675d725f25b3242e34bf477294373c9066184c09599b93deb23f clickclack-0.2.3.tar.gz"
diff --git a/community/cloudi/APKBUILD b/community/cloudi/APKBUILD
index 3cc99bc6b1..73e0fa0095 100644
--- a/community/cloudi/APKBUILD
+++ b/community/cloudi/APKBUILD
@@ -29,7 +29,7 @@
pkgname=cloudi
pkgver=2.0.4
-pkgrel=3
+pkgrel=5
pkgdesc="Cloud computing framework for efficient, scalable, and stable soft-realtime event processing."
url="https://cloudi.org/"
license="MIT"
diff --git a/community/cni-plugin-dnsname/APKBUILD b/community/cni-plugin-dnsname/APKBUILD
index 683ff48da3..b8cd3e31bb 100644
--- a/community/cni-plugin-dnsname/APKBUILD
+++ b/community/cni-plugin-dnsname/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jordan Christiansen <xordspar0@gmail.com>
pkgname=cni-plugin-dnsname
pkgver=1.3.1
-pkgrel=4
+pkgrel=5
pkgdesc="Name resolution for containers"
url="https://github.com/containers/dnsname"
license="Apache-2.0"
diff --git a/community/cni-plugin-flannel/APKBUILD b/community/cni-plugin-flannel/APKBUILD
index 857dfa0c50..3f5bec1e63 100644
--- a/community/cni-plugin-flannel/APKBUILD
+++ b/community/cni-plugin-flannel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Robert Günzler <r@gnzler.io>
pkgname=cni-plugin-flannel
pkgver=1.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="networking plugin, designed to work with flannel network fabric"
options="!check"
url="https://github.com/flannel-io/cni-plugin/"
diff --git a/community/cni-plugins/APKBUILD b/community/cni-plugins/APKBUILD
index d96dc9c1d4..212f7b970d 100644
--- a/community/cni-plugins/APKBUILD
+++ b/community/cni-plugins/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cni-plugins
pkgver=1.1.1
-pkgrel=2
+pkgrel=3
pkgdesc="Some standard networking plugins, maintained by the CNI team"
options="!check"
url="https://www.cni.dev/"
diff --git a/community/consul-template/APKBUILD b/community/consul-template/APKBUILD
index 50931fd359..16a8338a4e 100644
--- a/community/consul-template/APKBUILD
+++ b/community/consul-template/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=consul-template
pkgver=0.29.0
-pkgrel=0
+pkgrel=1
pkgdesc="Generic template rendering and notifications with Consul"
url="https://www.consul.io/"
arch="all"
diff --git a/community/consul/APKBUILD b/community/consul/APKBUILD
index d2dcc5eb25..df645dae69 100644
--- a/community/consul/APKBUILD
+++ b/community/consul/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=consul
pkgver=1.12.0
-pkgrel=0
+pkgrel=1
pkgdesc="Tool for service discovery, monitoring and configuration"
url="https://www.consul.io"
# riscv64 blocked by dependency boltdb
diff --git a/community/containerd/APKBUILD b/community/containerd/APKBUILD
index 96fc646ac8..f29f2dab1f 100644
--- a/community/containerd/APKBUILD
+++ b/community/containerd/APKBUILD
@@ -6,7 +6,7 @@ pkgname=containerd
# NOTE: containerd's Makefile tries to get REVISION from git, but we're building from a tarball.
_commit=212e8b6fa2f44b9c21b2798135fc6fb7c53efc16
pkgver=1.6.4
-pkgrel=0
+pkgrel=1
pkgdesc="An open and reliable container runtime"
url="https://containerd.io/"
arch="all"
diff --git a/community/coredns/APKBUILD b/community/coredns/APKBUILD
index aa675a72f8..d778f7b56d 100644
--- a/community/coredns/APKBUILD
+++ b/community/coredns/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Mark Pashmfouroush <mark@markpash.me>
pkgname=coredns
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.9.2
+pkgrel=0
pkgdesc="fast and flexible DNS server"
url="https://github.com/coredns/coredns"
license="Apache-2.0"
@@ -58,7 +58,7 @@ cleanup_srcdir() {
}
sha512sums="
-67cf380aacb795b79fc62f41c92939ce672cf4e803abf52dfe950eed2d6820d700a319efe997c44b6f406b57ee139354f2ad0e1f5fc88c997833b138495a83b2 coredns-1.9.1.tar.gz
+b85d9c3dde5c8ea8f6c6ed2f1df4dc2f84206edbc7151a65cb006a2cb070dde276f0ac2bbebb762c8150bf0a1df3faa6447d65972082a556b1e512ff9c09150a coredns-1.9.2.tar.gz
90300a3035b00b58f362b2c12dfaeee21b889e10e90600523b5785c907dfbd7e515c3269dd29a9d4c758990e78ede8343edfac0bc022bd3a23652543ba2d42d3 coredns.confd
06d9fcf227e064f8ea21f4f003d33611aabf2d75b2e6e097dc10af1db42ea823d15c26649e52584da4fb4a85e87b3f27959a44ce873f176c2a082624f6845f38 coredns.initd
c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece coredns.logrotated
diff --git a/community/cosign/APKBUILD b/community/cosign/APKBUILD
index 79b9b31092..e53ef4af1e 100644
--- a/community/cosign/APKBUILD
+++ b/community/cosign/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=cosign
pkgver=1.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="container signing tool with support for ephemeral keys and Sigstore signing"
url="https://github.com/sigstore/cosign"
arch="all"
@@ -22,6 +22,7 @@ subpackages="
$pkgname-zsh-completion
"
source="https://github.com/sigstore/cosign/archive/v$pkgver/cosign-$pkgver.tar.gz"
+options="!check"
# secfixes:
# 1.5.2-r0:
diff --git a/community/croc/APKBUILD b/community/croc/APKBUILD
index 80d73c75cc..16021a617d 100644
--- a/community/croc/APKBUILD
+++ b/community/croc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=croc
pkgver=9.5.5
-pkgrel=0
+pkgrel=1
pkgdesc="Easily and securely send things from one computer to another"
url="https://github.com/schollz/croc"
license="MIT"
diff --git a/community/curlie/APKBUILD b/community/curlie/APKBUILD
index d0d6e82f67..0aca1cb00c 100644
--- a/community/curlie/APKBUILD
+++ b/community/curlie/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=curlie
pkgver=1.6.7
-pkgrel=3
+pkgrel=4
pkgdesc="Curlie is a frontend to curl that adds the ease of use of httpie"
url="https://github.com/rs/curlie"
arch="all"
diff --git a/community/dasel/APKBUILD b/community/dasel/APKBUILD
index fef767f623..f51a328136 100644
--- a/community/dasel/APKBUILD
+++ b/community/dasel/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=dasel
pkgver=1.24.3
-pkgrel=0
+pkgrel=1
pkgdesc="Query and modify data structures using selector strings"
url="https://daseldocs.tomwright.me/"
license="MIT"
diff --git a/community/dbus-cpp/APKBUILD b/community/dbus-cpp/APKBUILD
index 23f01f9f8b..ff501ed351 100644
--- a/community/dbus-cpp/APKBUILD
+++ b/community/dbus-cpp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=dbus-cpp
pkgver=5.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="A header-only dbus-binding leveraging C++-11"
url="https://gitlab.com/ubports/core/lib-cpp/dbus-cpp"
arch="all"
diff --git a/community/delta/APKBUILD b/community/delta/APKBUILD
index 66b7e0b39b..0eb7e68d19 100644
--- a/community/delta/APKBUILD
+++ b/community/delta/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Aleks Bunin <alpinelinux@compuix.com>
# Maintainer: Aleks Bunin <alpinelinux@compuix.com>
pkgname=delta
-pkgver=0.12.1
-pkgrel=1
+pkgver=0.13.0
+pkgrel=0
pkgdesc="Syntax-highlighting pager for git and diff output"
url="https://github.com/dandavison/delta"
license="MIT"
@@ -13,6 +13,10 @@ makedepends="
"
source="$pkgname-$pkgver.tar.gz::https://github.com/dandavison/delta/archive/refs/tags/$pkgver.tar.gz"
+# secfixes:
+# 0.13.0-r0:
+# - CVE-2022-24713
+
prepare() {
default_prepare
@@ -41,5 +45,5 @@ package() {
}
sha512sums="
-70796f2008fbf085c6caae67165f7273a3026269851609d1b9e613aa04017715fb73bc0b5116c501acae623a32d348948f3d3afc1c99b343b623347526667471 delta-0.12.1.tar.gz
+d7dbaaab345ef3a8db04fb7ce6337d4cb104d148a069d4b47ffbe46c73ebff197a083a7ac061b51196754a5046dcfc1f71b633e8bfead1ebd9324cc624ba4313 delta-0.13.0.tar.gz
"
diff --git a/community/dendrite/APKBUILD b/community/dendrite/APKBUILD
index 3a1246303c..20d08dfb26 100644
--- a/community/dendrite/APKBUILD
+++ b/community/dendrite/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=dendrite
pkgver=0.8.2
-pkgrel=0
+pkgrel=1
pkgdesc="Second-generation Matrix homeserver written in Go"
url="https://github.com/matrix-org/dendrite"
license="Apache-2.0"
diff --git a/community/dep/APKBUILD b/community/dep/APKBUILD
index 1325eeb679..678b7ed9c3 100644
--- a/community/dep/APKBUILD
+++ b/community/dep/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ed Robinson <edward-robinson@cookpad.com>
pkgname=dep
pkgver=0.5.4
-pkgrel=7
+pkgrel=8
pkgdesc="Go dependency management tool"
url="https://github.com/golang/dep"
arch="all !riscv64"
diff --git a/community/direnv/APKBUILD b/community/direnv/APKBUILD
index b863672082..88db98f825 100644
--- a/community/direnv/APKBUILD
+++ b/community/direnv/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=direnv
pkgver=2.31.0
-pkgrel=1
+pkgrel=2
pkgdesc="Environment variable switcher for the shell"
url="https://direnv.net"
license="MIT"
diff --git a/community/dnscrypt-proxy/APKBUILD b/community/dnscrypt-proxy/APKBUILD
index 3a4bde124c..2db74e5781 100644
--- a/community/dnscrypt-proxy/APKBUILD
+++ b/community/dnscrypt-proxy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ian Bashford <ianbashford@gmail.com>
pkgname=dnscrypt-proxy
pkgver=2.1.1
-pkgrel=4
+pkgrel=5
pkgdesc="Tool for securing communications between a client and a DNS resolver"
url="https://dnscrypt.info"
arch="all"
diff --git a/community/dnsdist/APKBUILD b/community/dnsdist/APKBUILD
index 52c86e9044..19c2058864 100644
--- a/community/dnsdist/APKBUILD
+++ b/community/dnsdist/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com>
pkgname=dnsdist
pkgver=1.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="dnsdist is a highly DNS-, DoS-, and abuse-aware loadbalancer."
url="https://dnsdist.org/"
# s390x blocked by h2o
diff --git a/community/docker-cli-buildx/APKBUILD b/community/docker-cli-buildx/APKBUILD
index 2603aabd63..36cf6d5ab2 100644
--- a/community/docker-cli-buildx/APKBUILD
+++ b/community/docker-cli-buildx/APKBUILD
@@ -3,7 +3,7 @@
pkgname=docker-cli-buildx
_commit=6224def4dd2c3d347eee19db595348c50d7cb491
pkgver=0.8.2
-pkgrel=1
+pkgrel=2
pkgdesc="A Docker CLI plugin for extended build capabilities"
url="https://docs.docker.com/engine/reference/commandline/buildx_build"
arch="all"
diff --git a/community/docker-cli-compose/APKBUILD b/community/docker-cli-compose/APKBUILD
index 897d494906..862a4518e5 100644
--- a/community/docker-cli-compose/APKBUILD
+++ b/community/docker-cli-compose/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com>
pkgname=docker-cli-compose
pkgver=2.5.0
-pkgrel=0
+pkgrel=1
pkgdesc="A Docker CLI plugin for extended build capabilities"
url="https://docs.docker.com/compose/cli-command"
arch="all"
diff --git a/community/docker-credential-ecr-login/APKBUILD b/community/docker-credential-ecr-login/APKBUILD
index 8f749d9c68..d65a409a83 100644
--- a/community/docker-credential-ecr-login/APKBUILD
+++ b/community/docker-credential-ecr-login/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ty Sarna <ty@sarna.org>
pkgname=docker-credential-ecr-login
pkgver=0.5.0
-pkgrel=5
+pkgrel=6
pkgdesc="Credential helper for Docker to use the AWS Elastic Container Registry"
url="https://github.com/awslabs/amazon-ecr-credential-helper"
arch="x86_64 aarch64"
diff --git a/community/docker-registry/APKBUILD b/community/docker-registry/APKBUILD
index 6778d39dfd..61100c23ff 100644
--- a/community/docker-registry/APKBUILD
+++ b/community/docker-registry/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=docker-registry
pkgver=2.8.1
-pkgrel=2
+pkgrel=3
pkgdesc="An implementation of the Docker Registry HTTP API V2 for use with docker 1.6+"
url="https://github.com/docker/distribution"
# riscv64 blocked by dependency panicwrap
diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD
index 50fdc1ec6b..f73c903585 100644
--- a/community/docker/APKBUILD
+++ b/community/docker/APKBUILD
@@ -5,7 +5,7 @@ pkgname=docker
pkgver=20.10.15
_cli_commit=fd82621d35d2d9662854c8351976d5cc1e4186ce # https://github.com/docker/cli/commits/v$pkgver
_moby_commit=4433bf67ba0a3f686ffffce04d0709135e0b37eb # https://github.com/moby/moby/commits/v$pkgver
-pkgrel=0
+pkgrel=1
pkgdesc="Pack, ship and run any application as a lightweight container"
url="https://www.docker.io/"
arch="all"
diff --git a/community/dockviz/APKBUILD b/community/dockviz/APKBUILD
index 162ce4497e..01183624d8 100644
--- a/community/dockviz/APKBUILD
+++ b/community/dockviz/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=dockviz
pkgver=0.6.3
-pkgrel=7
+pkgrel=8
pkgdesc="Visualizing Docker Data"
url="https://github.com/justone/dockviz"
arch="all"
diff --git a/community/doctl/APKBUILD b/community/doctl/APKBUILD
index 2cb97bb7ce..5255664213 100644
--- a/community/doctl/APKBUILD
+++ b/community/doctl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Will Sinatra <wpsinatra@gmail.com>
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
pkgname=doctl
-pkgver=1.74.0
+pkgver=1.75.0
pkgrel=0
pkgdesc="Official command line interface for the DigitalOcean API"
url="https://github.com/digitalocean/doctl"
@@ -51,5 +51,5 @@ package() {
}
sha512sums="
-0a49d18c9cf087281eabba61ff9afe1302e8a619e5d7ec26a5b386a66b3500cc04a1597900bc17954c6da564560dc67d2c3294aa1fdabdc867f00e117d06e6a7 doctl-1.74.0.tar.gz
+bb9029383305a40373bec4bb1684130c8687066ba9524262c179211b5bf31cbb3a0e9f5b75bb783436260a5a9ad01df50d0ad98b999ee3d6f7a77468fa5e1fce doctl-1.75.0.tar.gz
"
diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD
index 3e0d9df46d..1a73b9d119 100644
--- a/community/domoticz/APKBUILD
+++ b/community/domoticz/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Johannes Heimansberg <git@jhe.dedyn.io>
pkgname=domoticz
pkgver=2022.1
-pkgrel=1
+pkgrel=2
pkgdesc="Open source Home Automation System"
url="https://www.domoticz.com/"
arch="all"
diff --git a/community/drone/APKBUILD b/community/drone/APKBUILD
index d035ca5439..749c1a3ca8 100644
--- a/community/drone/APKBUILD
+++ b/community/drone/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=drone
pkgver=2.11.1
-pkgrel=3
+pkgrel=4
pkgdesc="Container-Native, Continuous Delivery Platform"
url="https://drone.io/"
license="Apache-2.0"
diff --git a/community/dub/APKBUILD b/community/dub/APKBUILD
index 1635096223..516ff5f6ea 100644
--- a/community/dub/APKBUILD
+++ b/community/dub/APKBUILD
@@ -5,13 +5,16 @@ pkgver=1.28.0
pkgrel=0
pkgdesc="Package and build management system for D"
url="https://code.dlang.org/"
-arch="x86_64" # gdc does not work on 32 bit at this point
+arch="x86_64 aarch64"
license="MIT"
depends="libcurl"
makedepends="chrpath ldc bash curl-dev"
subpackages="$pkgname-zsh-completion:zsh:noarch $pkgname-doc:doc:noarch"
source="$pkgname-$pkgver.zip::https://github.com/dlang/dub/archive/v$pkgver.zip"
+# pass on edge but fail on 3.16(edge) ..
+[ "$CARCH" = "aarch64" ] && options="$options !check"
+
build() {
# Default abuild.conf has '-Os' which gdmd doesn't support
# Since we later build the man pages using dub, make it persistent
diff --git a/community/easypki/APKBUILD b/community/easypki/APKBUILD
index 8b16904426..52b7d2ea7f 100644
--- a/community/easypki/APKBUILD
+++ b/community/easypki/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=easypki
pkgver=1.1.0
-pkgrel=11
+pkgrel=12
pkgdesc="Creating a certificate authority the easy way"
url="https://github.com/google/easypki"
arch="all"
diff --git a/community/editorconfig-checker/APKBUILD b/community/editorconfig-checker/APKBUILD
index a3d1244df3..84d9a40fb6 100644
--- a/community/editorconfig-checker/APKBUILD
+++ b/community/editorconfig-checker/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=editorconfig-checker
pkgver=2.4.0
-pkgrel=3
+pkgrel=4
pkgdesc="A tool to verify that your files are in harmony with your .editorconfig"
url="https://editorconfig-checker.github.io/"
license="MIT"
diff --git a/community/eigen/APKBUILD b/community/eigen/APKBUILD
index a004d8551b..5b588b3d07 100644
--- a/community/eigen/APKBUILD
+++ b/community/eigen/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Bradley J Chambers <brad.chambers@gmail.com>
pkgname=eigen
pkgver=3.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Eigen is a C++ template library for linear algebra"
url="https://eigen.tuxfamily.org/"
arch="noarch"
diff --git a/community/exempi/APKBUILD b/community/exempi/APKBUILD
index f7fa76980a..dd1825c768 100644
--- a/community/exempi/APKBUILD
+++ b/community/exempi/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=exempi
pkgver=2.5.2
-pkgrel=2
+pkgrel=3
pkgdesc="A library to parse XMP metadata"
url="https://wiki.freedesktop.org/libopenraw/Exempi/"
arch="all !s390x"
diff --git a/community/frei0r-plugins/APKBUILD b/community/frei0r-plugins/APKBUILD
index c2d48f4156..26a330d918 100644
--- a/community/frei0r-plugins/APKBUILD
+++ b/community/frei0r-plugins/APKBUILD
@@ -1,26 +1,34 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=frei0r-plugins
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.8.0
+pkgrel=0
pkgdesc="A minimalistic plugin API for video sources and filters"
url="https://frei0r.dyne.org/"
arch="all"
options="!check" # No test suite.
license="GPL-2.0-or-later"
-makedepends="cmake gavl-dev cairo-dev"
+depends_dev="$pkgname"
+makedepends="
+ cairo-dev
+ cmake
+ gavl-dev
+ samurai
+ "
subpackages="$pkgname-dev"
source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz"
build() {
- cmake -B build \
- -DCMAKE_BUILD_TYPE=None \
+ cmake -B build -G Ninja \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr
- make -C build
+ cmake --build build
}
package() {
- DESTDIR="$pkgdir" make -C build install
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="8c80e8e0ce8c302e633ea1f6ff4e2a141fd7a8bcb7fce25dc7f1f6521be11258a3efa1074c224c7323e6a17bc405413385be193a5c787e2f276252b50477ebce frei0r-plugins-1.7.0.tar.gz"
+sha512sums="
+b9933b5e46da6e6b4ae242ec48b3ca4e51fb21d7924fd83375bf6628437b194697dd2bff43a42220bd5e6bc4c50b0352480d6986956f110eb966e1005b51dc35 frei0r-plugins-1.8.0.tar.gz
+"
diff --git a/community/frp/APKBUILD b/community/frp/APKBUILD
index 204bd10b04..1ca2f93ba6 100644
--- a/community/frp/APKBUILD
+++ b/community/frp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: wener <wenermail@gmail.com>
pkgname=frp
pkgver=0.39.1
-pkgrel=2
+pkgrel=3
pkgdesc="A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet."
url="https://github.com/fatedier/frp"
arch="all"
diff --git a/community/fzf/APKBUILD b/community/fzf/APKBUILD
index be9d05cc9e..fb1abb3ab2 100644
--- a/community/fzf/APKBUILD
+++ b/community/fzf/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=fzf
pkgver=0.30.0
-pkgrel=1
+pkgrel=2
pkgdesc="A command-line fuzzy finder"
url="https://github.com/junegunn/fzf"
arch="all"
diff --git a/testing/gajim/APKBUILD b/community/gajim/APKBUILD
index f9f8143959..bf7f24933c 100644
--- a/testing/gajim/APKBUILD
+++ b/community/gajim/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Peter Shkenev <santurysim@gmail.com>
# Maintainer: Peter Shkenev <santurysim@gmail.com>
pkgname=gajim
-pkgver=1.3.3
+pkgver=1.4.0
pkgrel=0
-_pkgver_suffix="-2"
+_pkgver_suffix=""
pkgdesc="A full featured and easy to use XMPP client"
url="https://gajim.org/"
arch="noarch"
@@ -43,5 +43,5 @@ package() {
sha512sums="
-e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442 gajim-1.3.3-2.tar.gz
+9fb2b967325d04d7cfa8cb97d0dcebdd5cfd8b8a0a4f8928e7d8c547d90567b7fb0d84d48cdd151b5e38ce72f65de2679c8cc1543ff3ed25d792e6de070042a0 gajim-1.4.0.tar.gz
"
diff --git a/community/gdal/APKBUILD b/community/gdal/APKBUILD
index 7ee7851e19..9cbe83ee13 100644
--- a/community/gdal/APKBUILD
+++ b/community/gdal/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Trevor R.H. Clarke <trevor@notcows.com>
# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
pkgname=gdal
-pkgver=3.4.3
+pkgver=3.5.0
pkgrel=0
pkgdesc="A translator library for raster and vector geospatial data formats"
url="https://gdal.org/"
@@ -105,6 +105,7 @@ build() {
--with-cpp14 \
--with-dods-root=/usr \
--with-poppler \
+ --with-python \
$_with_java \
--with-mysql
make
@@ -114,7 +115,7 @@ build() {
if [ "$_with_java" != "no" ]; then
cd "$builddir/swig/java"
- make
+ make JAVA_HOME=/usr/lib/jvm/default-jvm
fi
}
@@ -127,10 +128,7 @@ _py3() {
pkgdesc="$pkgdesc (Python3 bindings)"
depends="py3-numpy"
- mkdir -p "$subpkgdir"/usr/lib/
- cd "$builddir"/swig/python
- python3 setup.py install --prefix=/usr --root="$subpkgdir"
- rm -rf "${subpkgdir:?}"/usr/bin
+ amove usr/lib/python3*
}
_java() {
@@ -174,7 +172,7 @@ check() {
}
sha512sums="
-c6e15fd93d25e91554cf346e7cbeda84bbe8c43e34d2cc8cf44758fbfe81d2cbb46504474c1611de54dea189618b78f25a98645086264fd46e0afd60db38ac87 gdal-3.4.3.tar.gz
+a5a7c8b250c1dc73d9d7a82c32a7cf46284ac54428991fb106b7efbfd1f7712893014c7626a1d059db8e7921a6209172cd99d1749b4024fd8302b72517fc3042 gdal-3.5.0.tar.gz
63ab07b2de79a5ff95c7a33bd7b431fd4f3d0407cfc9d47df55eaff858064a9869b241bae7d93b4b86fc2995d65cb2bed3e3767659ed9a6d92e00771910cf72c 10-atoll.patch
15d8c25f1fdbb050ffa4082e16c7f506a50dd2827d947b663e532876c9d303982b6effb10c2eff50323aab867f5e48215736679d6a5b92f0e2266a09ad5aac53 20-userfaultfd-detection.patch
"
diff --git a/community/gdnsd/APKBUILD b/community/gdnsd/APKBUILD
index 3ed31eb9e3..279174411e 100644
--- a/community/gdnsd/APKBUILD
+++ b/community/gdnsd/APKBUILD
@@ -1,18 +1,40 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=gdnsd
-pkgver=2.4.3
+pkgver=3.8.0
pkgrel=0
pkgdesc="Geographic Authoritative DNS server"
-url="https://github.com/blblack/gdnsd/"
+url="https://github.com/gdnsd/gdnsd/"
arch="all"
license="GPL-3.0-or-later"
-makedepends="userspace-rcu-dev libev-dev libcap-dev libmaxminddb-dev ragel autoconf automake libtool"
-checkdepends="perl perl-libwww perl-socket6 perl-io-socket-inet6 perl-http-daemon perl-test-harness perl-test-harness-utils"
+makedepends="
+ autoconf
+ automake
+ libcap-dev
+ libev-dev
+ libmaxminddb-dev
+ libsodium-dev
+ libtool
+ ragel
+ userspace-rcu-dev
+ "
+checkdepends="
+ perl
+ perl-libwww
+ perl-socket6
+ perl-io-socket-inet6
+ perl-http-daemon
+ perl-test-harness
+ perl-test-harness-utils
+ "
install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
source="https://github.com/gdnsd/gdnsd/releases/download/v$pkgver/gdnsd-$pkgver.tar.xz
+ dclists.patch
gdnsd.initd"
+options="!check" # missing perl modules for tests
+
+[ "$CARCH" = "riscv64" ] && options="$options textrels"
# secfixes:
# 2.4.3-r0:
@@ -44,6 +66,7 @@ package() {
}
sha512sums="
-b9a53c3d003880822ebe257a83a13c61cb8c5e1f7c0a0116cf6cbdc505b759e8d28e19b1d7029a0fcc3c93997255fb8a12cb70715f0628392682840f03cc47d2 gdnsd-2.4.3.tar.xz
-27b6ed95452072ddbf767c87202bde8f70fb5272395a599ad6fec1bd5d0eaf1cefc217abf08531e5e0c0d7846018e31ffd215c0f8e92b151fc0e419cdc81e3f1 gdnsd.initd
+165c5576b1142a873dcd54b42f1b58a3ecd1958b274eb5e3c09fbd918b5851f554213605b062dea966cc7502d6e91ec79e32c121aba23ea4e560db6b488106af gdnsd-3.8.0.tar.xz
+ad1519c076e0f8b55ce9e202790cf64b1ab81f10b1c770fcd050acc96ad7d99a0be1bd7bd0791de3d920e1a85993131f9638934567792a060b8dfe52f7e00bea dclists.patch
+7e66f9d3dab3a36334d47740f12ee7f3ffd363d416bd1fcca4b339db8ba858419555751786247ffc4e5faf68c6b5fa87b84c04ffa25133a17b186bdf83c365b9 gdnsd.initd
"
diff --git a/community/gdnsd/dclists.patch b/community/gdnsd/dclists.patch
new file mode 100644
index 0000000000..9390d094ad
--- /dev/null
+++ b/community/gdnsd/dclists.patch
@@ -0,0 +1,32 @@
+--- a/libgdmaps/dclists.c
++++ b/libgdmaps/dclists.c
+@@ -60,13 +60,6 @@
+ // used on true shutdown of the whole gdmap (only debug
+ // mode for the real plugin).
+
+-struct dclists {
+- unsigned count; // count of unique result lists
+- unsigned old_count; // count from object we cloned from
+- uint8_t** list; // strings of dc numbers
+- const dcinfo_t* info; // dclists_t doesn't own "info", just uses it for reference a lot
+-};
+-
+ dclists_t* dclists_new(const dcinfo_t* info)
+ {
+ const unsigned num_dcs = dcinfo_get_count(info);
+--- a/libgdmaps/dclists.h
++++ b/libgdmaps/dclists.h
+@@ -28,6 +28,13 @@
+ #include <inttypes.h>
+ #include <stdbool.h>
+
++struct dclists {
++ unsigned count; // count of unique result lists
++ unsigned old_count; // count from object we cloned from
++ uint8_t** list; // strings of dc numbers
++ const dcinfo_t* info; // dclists_t doesn't own "info", just uses it for reference a lot
++};
++
+ typedef struct dclists dclists_t;
+
+ typedef enum {
diff --git a/community/gdnsd/gdnsd.initd b/community/gdnsd/gdnsd.initd
index e8a75e846b..fc9028cebd 100755
--- a/community/gdnsd/gdnsd.initd
+++ b/community/gdnsd/gdnsd.initd
@@ -1,20 +1,15 @@
#!/sbin/openrc-run
name="gdnsd daemon"
-extra_commands="configtest"
-extra_started_commands="reload fastrestart"
+extra_commands="checkconf"
+extra_started_commands="reload"
description="Geographic Authoritative DNS server"
-description_configtest="Run syntax tests for configuration files only."
-description_reload="Signal running gdnsd to reload configuration files"
-description_fastrestart="Optimized restart sequence (minimizes down time)"
-
-if [ -z "${GDNSD_CONFFILE}" ]; then
- if [ "${SVCNAME}" = "gdnsd" ]; then
- GDNSD_ROOT=system
- else
- GDNSD_ROOT=/var/gdnsd/${SVCNAME}
- fi
-fi
+description_configtest="Run syntax tests for configuration files only"
+description_reload="Reload zone data"
+command_background=true
+pidfile=/var/run/${RC_SVCNAME}.pid
+command="/usr/sbin/gdnsd"
+command_args="start"
depend() {
need net
@@ -23,31 +18,18 @@ depend() {
provide auth-dns
}
-act() {
- ebegin "$1 ${SVCNAME}"
- /usr/sbin/gdnsd -d ${GDNSD_ROOT} $2
+checkconf() {
+ ebegin "Checking configuration of ${RC_SVCNAME}"
+ gdnsd checkconf
eend $?
}
-configtest() {
- act "Checking configuration" checkconf
-}
-
-start() {
- act "Starting" start
-}
-
-stop () {
- if [ "${RC_CMD}" = "restart" ]; then
- configtest || return 1
- fi
- act "Stopping" stop
-}
-
-fastrestart() {
- act "Restarting" restart
+stop_pre() {
+ checkconf
}
reload() {
- act "Reloading" reload
+ ebegin "Reloading ${RC_SVCNAME} zone data"
+ gdnsdctl reload-zones
+ eend $?
}
diff --git a/community/gedit-plugins/APKBUILD b/community/gedit-plugins/APKBUILD
index 81ed84ebbd..818515810e 100644
--- a/community/gedit-plugins/APKBUILD
+++ b/community/gedit-plugins/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gedit-plugins
-pkgver=41.0
-pkgrel=1
+pkgver=42.0
+pkgrel=0
pkgdesc="Plugins for gedit, the GNOME text editor"
url="https://gitlab.gnome.org/GNOME/gedit/blob/master/plugins/list-of-gedit-plugins.md"
arch="all"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
-e0389e8be68406fdcd3c9537b2d2dad0faf19d9a49804a7b5d9cf8e1006254906605dd0b14e2fa1eb7a22d6533d9b55d7f5593fe01a5b412df6361c8b9089f34 gedit-plugins-41.0.tar.xz
+b7b6b6c71538ca767e20e4bdde0a5530657bf3d444fee5e1b2918b768188f224acfd2a44c4b0b6203ee3bde9ec47d2bacb0e25426cf49e500120461d44ae6b9a gedit-plugins-42.0.tar.xz
"
diff --git a/community/gedit/APKBUILD b/community/gedit/APKBUILD
index dbb17c4e56..af6a3e4b0f 100644
--- a/community/gedit/APKBUILD
+++ b/community/gedit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gedit
-pkgver=41.0
+pkgver=42.0
pkgrel=0
pkgdesc="gedit is the GNOME text editor"
url="https://wiki.gnome.org/Apps/Gedit"
@@ -39,5 +39,5 @@ package() {
}
sha512sums="
-97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e gedit-41.0.tar.xz
+d0f3c05e0a6f96634cc2deb24d95d906e5bb9d380b248a810560b60ac8590831fb25672a41e143fe7bba3882a08ec7ec85208f896751a7b66cabe4ade00cdaca gedit-42.0.tar.xz
"
diff --git a/community/geth/APKBUILD b/community/geth/APKBUILD
index ed4c836345..90e4813739 100644
--- a/community/geth/APKBUILD
+++ b/community/geth/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=geth
pkgver=1.10.17
-pkgrel=1
+pkgrel=2
pkgdesc="Official Go implementation of the Ethereum protocol"
url="https://geth.ethereum.org/"
arch="all !aarch64" # build fails
diff --git a/community/ginkgo/APKBUILD b/community/ginkgo/APKBUILD
index e0877a4881..8bc31ce673 100644
--- a/community/ginkgo/APKBUILD
+++ b/community/ginkgo/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=ginkgo
pkgver=2.1.4
-pkgrel=0
+pkgrel=1
pkgdesc="Modern Testing Framework for Go"
url="https://onsi.github.io/ginkgo/"
license="MIT"
diff --git a/community/git-lfs/APKBUILD b/community/git-lfs/APKBUILD
index e5de249380..5ac0545a82 100644
--- a/community/git-lfs/APKBUILD
+++ b/community/git-lfs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=git-lfs
pkgver=3.1.4
-pkgrel=0
+pkgrel=1
pkgdesc="Git extension for versioning large files"
url="https://git-lfs.github.io/"
arch="all"
diff --git a/community/git-lfs2/APKBUILD b/community/git-lfs2/APKBUILD
index 17bcef963c..c5f26e0aad 100644
--- a/community/git-lfs2/APKBUILD
+++ b/community/git-lfs2/APKBUILD
@@ -3,7 +3,7 @@
pkgname=git-lfs2
_projname=git-lfs
pkgver=2.13.3
-pkgrel=3
+pkgrel=4
pkgdesc="Git extension for versioning large files (version 2.x)"
url="https://git-lfs.github.io/"
arch="all"
diff --git a/community/git-sizer/APKBUILD b/community/git-sizer/APKBUILD
index 191e756226..dbd5154657 100644
--- a/community/git-sizer/APKBUILD
+++ b/community/git-sizer/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=git-sizer
pkgver=1.5.0
-pkgrel=3
+pkgrel=4
pkgdesc="Compute various size metrics for a Git repository"
url="https://github.com/github/git-sizer"
license="MIT"
diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD
index 5e6e24e68a..f1aa88f6ef 100644
--- a/community/gitea/APKBUILD
+++ b/community/gitea/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: 6543 <6543@obermui.de>
pkgname=gitea
pkgver=1.16.7
-pkgrel=0
+pkgrel=1
pkgdesc="A self-hosted Git service written in Go"
url="https://gitea.io"
# armhf: failing tests
diff --git a/community/github-cli/APKBUILD b/community/github-cli/APKBUILD
index 627f7e4727..b1aa85e837 100644
--- a/community/github-cli/APKBUILD
+++ b/community/github-cli/APKBUILD
@@ -2,7 +2,7 @@
# Contributor Andrei Jiroh Eugenio Halili <ajhalili2006@gmail.com>
# Maintainer: Andrei Jiroh Eugenio Halili <ajhalili2006@gmail.com>
pkgname=github-cli
-pkgver=2.8.0
+pkgver=2.10.1
pkgrel=0
pkgdesc="CLI for dealing with GitHub"
options="net" # Need to fetch modules
@@ -16,7 +16,7 @@ subpackages="
$pkgname-bash-completion
$pkgname-zsh-completion
"
-source="https://github.com/cli/cli/archive/v$pkgver/github-cli-$pkgver-$pkgver.tar.gz
+source="https://github.com/cli/cli/archive/v$pkgver/github-cli-$pkgver.tar.gz
no-ignore-goflags.patch
"
builddir="$srcdir/cli-$pkgver"
@@ -58,6 +58,6 @@ package() {
sha512sums="
-c46248a4b2376ff9df07198e9c29bd37dcd6c3a8b50081bfe0686f329b2bec8087506b435a17161af59f06fa26cda630a473c3e9d5470f8cc0c6cf5e25d9cea7 github-cli-2.8.0-2.8.0.tar.gz
+4d80e0dd7bf9fc4216b680b3d221600a9d2ee1e1e45962480964341c4a4fa40b93ff812719eee1567b6c8059261c54f60f12bd4f2fda24013fae59667cdcc533 github-cli-2.10.1.tar.gz
873b931af40952b2e1b82d7d825d301a5334be40e9df34fc192160e564a26d13d7de4d13d48cfe08119f9b4741c25051068d062181e23f80abefad1d18155357 no-ignore-goflags.patch
"
diff --git a/community/gitlab-release-cli/APKBUILD b/community/gitlab-release-cli/APKBUILD
index d4e9e27299..846c85e0ea 100644
--- a/community/gitlab-release-cli/APKBUILD
+++ b/community/gitlab-release-cli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Olliver Schinagl <oliver@schinagl.nl>
pkgname=gitlab-release-cli
pkgver=0.10.0
-pkgrel=3
+pkgrel=4
pkgdesc="GitLab Release command-line tool"
url="https://gitlab.com/gitlab-org/release-cli"
license="MIT"
diff --git a/community/gitlab-runner/APKBUILD b/community/gitlab-runner/APKBUILD
index 6ff47fc038..3dad5f1747 100644
--- a/community/gitlab-runner/APKBUILD
+++ b/community/gitlab-runner/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gitlab-runner
pkgver=14.10.0
-pkgrel=0
+pkgrel=1
# first 8 chars of the git hash of the release, see
# https://gitlab.com/gitlab-org/gitlab-runner/-/tags
# PLEASE update this, since they're used to determine what version of
diff --git a/community/glab/APKBUILD b/community/glab/APKBUILD
index fe25fc83a6..28446904fb 100644
--- a/community/glab/APKBUILD
+++ b/community/glab/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: solidnerd <niclas@mietz.io>
pkgname=glab
pkgver=1.22.0
-pkgrel=2
+pkgrel=3
pkgdesc="Open source GitLab CLI tool written in Go"
url="https://github.com/profclems/glab"
arch="all"
diff --git a/community/glide/APKBUILD b/community/glide/APKBUILD
index 08f4e349a6..e6181de498 100644
--- a/community/glide/APKBUILD
+++ b/community/glide/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=glide
pkgver=0.13.3
-pkgrel=5
+pkgrel=6
pkgdesc="Vendor Package Management for Golang"
url="https://github.com/Masterminds/glide"
arch="all"
diff --git a/community/gmnitohtml/APKBUILD b/community/gmnitohtml/APKBUILD
index bc82158897..a2192f9d1e 100644
--- a/community/gmnitohtml/APKBUILD
+++ b/community/gmnitohtml/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stacy Harper <contact@stacyharper.net>
pkgname=gmnitohtml
pkgver=0.1.1
-pkgrel=4
+pkgrel=5
pkgdesc="Gemini text to HTML converter"
options="!check" # No testsuite
url="https://git.sr.ht/~adnano/gmnitohtml"
diff --git a/community/gnome-software-plugin-apk/APKBUILD b/community/gnome-software-plugin-apk/APKBUILD
index 4e5af60244..9c181352d3 100644
--- a/community/gnome-software-plugin-apk/APKBUILD
+++ b/community/gnome-software-plugin-apk/APKBUILD
@@ -1,14 +1,15 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com>
pkgname=gnome-software-plugin-apk
-pkgver=0.9.2
-pkgrel=1
+pkgver=0.10.0
+pkgrel=0
pkgdesc="APK plugin for GNOME Software"
url="https://github.com/Cogitri/gnome-software-plugin-apk"
arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # apk-polkit-rs
license="GPL-2.0-or-later"
-makedepends="meson gnome-software-dev apk-polkit-rs-dev"
-options="!check" # no tests
+makedepends="meson gnome-software-dev apk-polkit-rs-dev appstream-dev"
+checkdepends="py3-dbusmock"
+options="!check" # Tests will fail if gnome-software-plugin-apk is installed
subpackages="$pkgname-dbg"
source="$pkgname-$pkgver.tar.gz::https://github.com/Cogitri/gnome-software-plugin-apk/archive/v$pkgver.tar.gz"
@@ -21,6 +22,10 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
+check() {
+ meson test --no-rebuild -C output
+}
+
sha512sums="
-ad43fb7faa4b1915166c5513316573fddda5491f2a46300e66219198deb6aa4df2388897dc4f8fd4135548cd67da4201fde1acb48957b35474859b75ff222f81 gnome-software-plugin-apk-0.9.2.tar.gz
+070812ebd5da29f0b88dab3875600f2a17bb9df30dea4db8682d9c4a3878006b4e25c28b1b58bc12e6712b10c4c708da70368695d82ab8e5ed07543ba3406955 gnome-software-plugin-apk-0.10.0.tar.gz
"
diff --git a/community/gnome-software/0001-gs-external-appstream-utils-use-external-appstream-s.patch b/community/gnome-software/0001-gs-external-appstream-utils-use-external-appstream-s.patch
index bf750c6746..7881ae6a40 100644
--- a/community/gnome-software/0001-gs-external-appstream-utils-use-external-appstream-s.patch
+++ b/community/gnome-software/0001-gs-external-appstream-utils-use-external-appstream-s.patch
@@ -1,7 +1,7 @@
-From 3a7f4e433b9909ae1a92f7bd25de37dbefc76db8 Mon Sep 17 00:00:00 2001
+From 715db5606279efbb5b47ae734db7ffd407b25d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Tue, 28 Dec 2021 20:03:00 +0100
-Subject: [PATCH 1/5] gs-external-appstream-utils: use
+Subject: [PATCH] gs-external-appstream-utils: use
external-appstream-system-wide key
The key had been defined when it was introduced, but it was not
@@ -22,7 +22,7 @@ in this commit
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gs-external-appstream-utils.c b/lib/gs-external-appstream-utils.c
-index 73c56744..39d71b29 100644
+index 73c567443..39d71b299 100644
--- a/lib/gs-external-appstream-utils.c
+++ b/lib/gs-external-appstream-utils.c
@@ -236,7 +236,7 @@ gs_external_appstream_refresh_url (GsPlugin *plugin,
@@ -35,5 +35,5 @@ index 73c56744..39d71b29 100644
cache_age,
cancellable,
--
-2.25.1
+2.36.1
diff --git a/community/gnome-software/0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch b/community/gnome-software/0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch
index e86f07854f..13364c0c7c 100644
--- a/community/gnome-software/0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch
+++ b/community/gnome-software/0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch
@@ -1,8 +1,7 @@
-From 413f67451c89d269d3b373cefd4b3a9bb500960e Mon Sep 17 00:00:00 2001
+From c877bd004188fbfb2a7ff5ee539614a77d89e741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Fri, 31 Dec 2021 00:46:38 +0100
-Subject: [PATCH 2/5] gs-external-appstream-utils: hash url to allow same
- basename
+Subject: [PATCH] gs-external-appstream-utils: hash url to allow same basename
Component files generated by tools like appstream-generator all
have the same basename: Components-$(ARCH).xml.gz
@@ -19,7 +18,7 @@ basename solves this problem.
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/lib/gs-external-appstream-utils.c b/lib/gs-external-appstream-utils.c
-index 39d71b29..82c5f700 100644
+index 39d71b299..82c5f7001 100644
--- a/lib/gs-external-appstream-utils.c
+++ b/lib/gs-external-appstream-utils.c
@@ -87,6 +87,7 @@ gs_external_appstream_get_modification_date (const gchar *file_path)
@@ -107,5 +106,5 @@ index 39d71b29..82c5f700 100644
}
--
-2.25.1
+2.36.1
diff --git a/community/gnome-software/0003-appstream-implement-parsing-media_baseurl.patch b/community/gnome-software/0003-appstream-implement-parsing-media_baseurl.patch
deleted file mode 100644
index c454041898..0000000000
--- a/community/gnome-software/0003-appstream-implement-parsing-media_baseurl.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 55c53080dbbd2d81ebd0c3d98bb0e0831d6064d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
-Date: Sat, 15 Jan 2022 22:51:10 +0100
-Subject: [PATCH 3/5] appstream: implement parsing media_baseurl
-
-This property was not documented for XML data until quite
-recently: https://github.com/ximion/appstream/pull/371
-
-However, remote icons and screenshots generated with appstream-generator
-only contain urls relative to media_baseurl property. Fix all relative uris
-prepending the corresponding media_baseurl for those objects to be downloadable.
----
- lib/gs-appstream.c | 19 +++++++++
- lib/gs-appstream.h | 2 +
- plugins/core/gs-plugin-appstream.c | 64 ++++++++++++++++++++++++++++++
- 3 files changed, 85 insertions(+)
-
-diff --git a/lib/gs-appstream.c b/lib/gs-appstream.c
-index df91dd0f..8e157595 100644
---- a/lib/gs-appstream.c
-+++ b/lib/gs-appstream.c
-@@ -1824,3 +1824,22 @@ gs_appstream_component_add_extra_info (XbBuilderNode *component)
- break;
- }
- }
-+
-+/* Resolve any media URIs which are actually relative
-+ * paths against the media_baseurl property */
-+void
-+gs_appstream_component_fix_url (XbBuilderNode *component, const gchar *baseurl)
-+{
-+ const gchar *text = xb_builder_node_get_text (component);
-+ g_autofree gchar *url = NULL;
-+
-+ if (text == NULL)
-+ return;
-+
-+ if (g_str_has_prefix (text, "http:") ||
-+ g_str_has_prefix (text, "https:"))
-+ return;
-+
-+ url = g_strconcat (baseurl, "/", text, NULL);
-+ xb_builder_node_set_text (component, url , -1);
-+}
-diff --git a/lib/gs-appstream.h b/lib/gs-appstream.h
-index 5bddf913..fbc68a1a 100644
---- a/lib/gs-appstream.h
-+++ b/lib/gs-appstream.h
-@@ -72,5 +72,7 @@ void gs_appstream_component_add_icon (XbBuilderNode *component,
- const gchar *str);
- void gs_appstream_component_add_provide (XbBuilderNode *component,
- const gchar *str);
-+void gs_appstream_component_fix_url (XbBuilderNode *component,
-+ const gchar *baseurl);
-
- G_END_DECLS
-diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
-index 5d61c5b6..950316f2 100644
---- a/plugins/core/gs-plugin-appstream.c
-+++ b/plugins/core/gs-plugin-appstream.c
-@@ -133,6 +133,60 @@ gs_plugin_appstream_add_origin_keyword_cb (XbBuilderFixup *self,
- return TRUE;
- }
-
-+static void
-+gs_plugin_appstream_media_baseurl_free (gpointer user_data)
-+{
-+ g_string_free ((GString *) user_data, TRUE);
-+}
-+
-+static gboolean
-+gs_plugin_appstream_media_baseurl_cb (XbBuilderFixup *self,
-+ XbBuilderNode *bn,
-+ gpointer user_data,
-+ GError **error)
-+{
-+ GString *baseurl = user_data;
-+ if (g_strcmp0 (xb_builder_node_get_element (bn), "components") == 0) {
-+ const gchar *url = xb_builder_node_get_attr (bn, "media_baseurl");
-+ if (url == NULL) {
-+ g_string_truncate (baseurl, 0);
-+ return TRUE;
-+ }
-+ g_string_assign (baseurl, url);
-+ return TRUE;
-+ }
-+
-+ if (baseurl->len == 0)
-+ return TRUE;
-+
-+ if (g_strcmp0 (xb_builder_node_get_element (bn), "icon") == 0) {
-+ const gchar *type = xb_builder_node_get_attr (bn, "type");
-+ if (g_strcmp0 (type, "remote") != 0)
-+ return TRUE;
-+ gs_appstream_component_fix_url (bn, baseurl->str);
-+ } else if (g_strcmp0 (xb_builder_node_get_element (bn), "screenshots") == 0) {
-+ GPtrArray *screenshots = xb_builder_node_get_children (bn);
-+ for (guint i = 0; i < screenshots->len; i++) {
-+ XbBuilderNode *screenshot = g_ptr_array_index (screenshots, i);
-+ GPtrArray *children = NULL;
-+ /* Type-check for security */
-+ if (g_strcmp0 (xb_builder_node_get_element (screenshot), "screenshot") != 0) {
-+ continue;
-+ }
-+ children = xb_builder_node_get_children (screenshot);
-+ for (guint j = 0; j < children->len; j++) {
-+ XbBuilderNode *child = g_ptr_array_index (children, j);
-+ const gchar *element = xb_builder_node_get_element (child);
-+ if (g_strcmp0 (element, "image") != 0 &&
-+ g_strcmp0 (element, "video") != 0)
-+ continue;
-+ gs_appstream_component_fix_url (child, baseurl->str);
-+ }
-+ }
-+ }
-+ return TRUE;
-+}
-+
- static gboolean
- gs_plugin_appstream_load_appdata_fn (GsPlugin *plugin,
- XbBuilder *builder,
-@@ -398,6 +452,8 @@ gs_plugin_appstream_load_appstream_fn (GsPlugin *plugin,
- #if LIBXMLB_CHECK_VERSION(0,3,1)
- g_autoptr(XbBuilderFixup) fixup4 = NULL;
- #endif
-+ g_autoptr(XbBuilderFixup) fixup5 = NULL;
-+ GString *media_baseurl = g_string_new (NULL);
- g_autoptr(XbBuilderSource) source = xb_builder_source_new ();
-
- /* add support for DEP-11 files */
-@@ -453,6 +509,14 @@ gs_plugin_appstream_load_appstream_fn (GsPlugin *plugin,
- xb_builder_source_add_fixup (source, fixup4);
- #endif
-
-+ /* prepend media_baseurl to remote relative URLs */
-+ fixup5 = xb_builder_fixup_new ("MediaBaseUrl",
-+ gs_plugin_appstream_media_baseurl_cb,
-+ media_baseurl,
-+ gs_plugin_appstream_media_baseurl_free);
-+ xb_builder_fixup_set_max_depth (fixup5, 3);
-+ xb_builder_source_add_fixup (source, fixup5);
-+
- /* success */
- xb_builder_import_source (builder, source);
- return TRUE;
---
-2.25.1
-
diff --git a/community/gnome-software/0003-lib-cleanup-public-headers-and-mark-gs-test.h-as-pub.patch b/community/gnome-software/0003-lib-cleanup-public-headers-and-mark-gs-test.h-as-pub.patch
new file mode 100644
index 0000000000..79fa0e1b91
--- /dev/null
+++ b/community/gnome-software/0003-lib-cleanup-public-headers-and-mark-gs-test.h-as-pub.patch
@@ -0,0 +1,81 @@
+From d971b745734ae13219f5f66684ad4127923ab3e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
+Date: Tue, 22 Feb 2022 22:26:35 +0100
+Subject: [PATCH] lib: cleanup public headers and mark gs-test.h as public
+
+Backport of https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/1192
+to fix building test in the out-of-tree plugin
+---
+ lib/gs-app-list-private.h | 1 -
+ lib/gs-app-list.h | 1 +
+ lib/gs-plugin-job.h | 2 +-
+ lib/gs-plugin-loader.h | 2 +-
+ lib/meson.build | 1 +
+ 5 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/gs-app-list-private.h b/lib/gs-app-list-private.h
+index 3bf908c16..9f540a620 100644
+--- a/lib/gs-app-list-private.h
++++ b/lib/gs-app-list-private.h
+@@ -33,7 +33,6 @@ typedef enum {
+ GS_APP_LIST_FLAG_LAST /*< skip >*/
+ } GsAppListFlags;
+
+-GsAppList *gs_app_list_copy (GsAppList *list);
+ guint gs_app_list_get_size_peak (GsAppList *list);
+ void gs_app_list_filter_duplicates (GsAppList *list,
+ GsAppListFilterFlags flags);
+diff --git a/lib/gs-app-list.h b/lib/gs-app-list.h
+index 1330e8048..80e5e5976 100644
+--- a/lib/gs-app-list.h
++++ b/lib/gs-app-list.h
+@@ -65,6 +65,7 @@ typedef gboolean (*GsAppListFilterFunc) (GsApp *app,
+ gpointer user_data);
+
+ GsAppList *gs_app_list_new (void);
++GsAppList *gs_app_list_copy (GsAppList *list);
+ void gs_app_list_add (GsAppList *list,
+ GsApp *app);
+ void gs_app_list_add_list (GsAppList *list,
+diff --git a/lib/gs-plugin-job.h b/lib/gs-plugin-job.h
+index 2bd619c63..47420b4fe 100644
+--- a/lib/gs-plugin-job.h
++++ b/lib/gs-plugin-job.h
+@@ -10,7 +10,7 @@
+
+ #include <glib-object.h>
+
+-#include "gs-app-list-private.h"
++#include "gs-app-list.h"
+ #include "gs-category.h"
+ #include "gs-plugin-types.h"
+
+diff --git a/lib/gs-plugin-loader.h b/lib/gs-plugin-loader.h
+index 71fd35af8..bd56bc0d4 100644
+--- a/lib/gs-plugin-loader.h
++++ b/lib/gs-plugin-loader.h
+@@ -16,8 +16,8 @@
+ #include "gs-category-manager.h"
+ #include "gs-odrs-provider.h"
+ #include "gs-plugin-event.h"
+-#include "gs-plugin-private.h"
+ #include "gs-plugin-job.h"
++#include "gs-plugin.h"
+
+ G_BEGIN_DECLS
+
+diff --git a/lib/meson.build b/lib/meson.build
+index 3b8c92339..ceb2ea9a9 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -26,6 +26,7 @@ libgnomesoftware_public_headers = [
+ 'gs-plugin-types.h',
+ 'gs-plugin-vfuncs.h',
+ 'gs-remote-icon.h',
++ 'gs-test.h',
+ 'gs-utils.h'
+ ]
+
+--
+2.36.1
+
diff --git a/community/gnome-software/APKBUILD b/community/gnome-software/APKBUILD
index a3b28c6adf..c77b04eb15 100644
--- a/community/gnome-software/APKBUILD
+++ b/community/gnome-software/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com>
pkgname=gnome-software
-pkgver=41.3
-pkgrel=1
+pkgver=41.5
+pkgrel=0
pkgdesc="Software lets you install and update applications and system extensions"
url="https://wiki.gnome.org/Apps/Software"
# s390x and riscv64 blocked by polkit
@@ -18,8 +18,9 @@ subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg
source="https://download.gnome.org/sources/gnome-software/${pkgver%.*}/gnome-software-$pkgver.tar.xz
0001-gs-external-appstream-utils-use-external-appstream-s.patch
0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch
- 0003-appstream-implement-parsing-media_baseurl.patch
- org.gnome.software.gschema.override"
+ 0003-lib-cleanup-public-headers-and-mark-gs-test.h-as-pub.patch
+ org.gnome.software.gschema.override
+ "
case "$CARCH" in
x86|x86_64|aarch64|armv7) makedepends="$makedepends fwupd-dev" ;;
@@ -77,9 +78,9 @@ flatpak_plugin() {
}
sha512sums="
-7b19ed7e3b6f8662b6351fbb6eddb45f99cdbf9e6912e11b36301cdfd6f62cb3256da031e6640f9ad397384a23530d11488c78a1af60ce130a99838f97f8a0ed gnome-software-41.3.tar.xz
-9f08078c9f0df149bc3be65fdcd47e7e1c11023c9fdbfe3fa63bb7f67883cd2ac654e8aa941d1b222b85d600a9cfeed8fb1d0d43091236c8e0e137d4035705a1 0001-gs-external-appstream-utils-use-external-appstream-s.patch
-c4ca14d981da8fc93800178aeb2480c8bcaa524a0db283613047e769d4dd8aa9ee603d86cf1353818454e14e25d68b11858e2658e6ff5d7b3fa57c075800deb2 0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch
-986cf69e34d61daea61d6555efc2e4805baf07d6a71fdf0c1e35fd38aef64b50924f64b5650d26d1a5c9841d29cffd3bb2cc869f55ba0c1763b929d5e21cb7b9 0003-appstream-implement-parsing-media_baseurl.patch
+60701d50dd8e7fa01c05c8ee7823b053d40b0fa145419601ece732827527d4d7ae9af178b5b6622ac4d729d3d430c14981a2fd4b0f086dd6d05a49fd507f2cb6 gnome-software-41.5.tar.xz
+52e4f99a4e1e2e688b1dcb146bcad3f3ba0e804af841d3837de5a7905f90689dc6258e625476a5fa402e8cfb5f7b814f3bdb0cf0dfab5ca8ebbf6193099e9916 0001-gs-external-appstream-utils-use-external-appstream-s.patch
+467e023cc953f1d7caf83a4087f7f6311f64d20da32dafb2a97bd7488bb597e2d407d1166937c1776c0add199508ac45f361d7754687f638e518dbfaa8f80c6e 0002-gs-external-appstream-utils-hash-url-to-allow-same-b.patch
+4f3248916d8d15753dc22580e71a37cbfd42bb81ee0befcc51cbbbc5ce8a6573be9dae8d049c9c10fbdcf6292b83fda0d2175d1f6554e7ee8f08024ce6bdffe9 0003-lib-cleanup-public-headers-and-mark-gs-test.h-as-pub.patch
dc83eba4b5da759b6bc72d0f30ba4e9338684eb0d32d3e2b7989341ee6f8efc15b09dda88d1dc3cc6a2de0a2ae22a41c2fdbfe352b5d7c7ecff44c2d6035e17f org.gnome.software.gschema.override
"
diff --git a/community/gnome-tour/APKBUILD b/community/gnome-tour/APKBUILD
index 7795e68f5d..b272ad97ac 100644
--- a/community/gnome-tour/APKBUILD
+++ b/community/gnome-tour/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gnome-tour
-pkgver=40.0
+pkgver=42.0
pkgrel=0
pkgdesc="GNOME Tour & Greeter"
url="https://gitlab.gnome.org/GNOME/gnome-tour"
# s390x and riscv64 blocked by cargo
arch="all !s390x !riscv64"
license="GPL-3.0-or-later"
-makedepends="meson cargo glib-dev gtk+3.0-dev libhandy1-dev"
+makedepends="meson cargo glib-dev gtk4.0-dev libadwaita-dev"
checkdepends="appstream-glib desktop-file-utils"
subpackages="$pkgname-lang"
source="https://download.gnome.org/sources/gnome-tour/${pkgver%.*}/gnome-tour-$pkgver.tar.xz"
@@ -26,4 +26,6 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="5d0d695422e8dace19e2e1a33d0ee8eebbf4d804622bc2f91b4367d5d8b3ba298b5da7dce2c34e2bb00ce06895172d4b9da3d34f80c8896d52af8b95339ae46e gnome-tour-40.0.tar.xz"
+sha512sums="
+b42705ab0458ea0af99ba60c831bc9c84e6122cbbec12a9f7ae2aa83f09c847675221fc9b1867bf6562eab12daa8a4c6deac575cc137d7631d108972fe1271f8 gnome-tour-42.0.tar.xz
+"
diff --git a/community/gnss-share/APKBUILD b/community/gnss-share/APKBUILD
index 9c1b2f2901..19becaa155 100644
--- a/community/gnss-share/APKBUILD
+++ b/community/gnss-share/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=gnss-share
pkgver=0.4
-pkgrel=2
+pkgrel=3
pkgdesc="GNSS location provider, supporting multiple concurrent clients"
url="https://gitlab.com/postmarketOS/gnss-share"
arch="all"
diff --git a/community/go-bindata-assetfs/APKBUILD b/community/go-bindata-assetfs/APKBUILD
index aaf86e1b04..3a6faac895 100644
--- a/community/go-bindata-assetfs/APKBUILD
+++ b/community/go-bindata-assetfs/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Matthias Neugebauer <mtneug@mailbox.org>
pkgname=go-bindata-assetfs
pkgver=1.0.1
-pkgrel=6
+pkgrel=7
pkgdesc="small utility which generates Go code to serve any file with net/http"
url="https://github.com/elazarl/go-bindata-assetfs"
arch="all"
diff --git a/community/go-bindata/APKBUILD b/community/go-bindata/APKBUILD
index bebc9960ea..ef0c0f066b 100644
--- a/community/go-bindata/APKBUILD
+++ b/community/go-bindata/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=go-bindata
pkgver=3.1.3
-pkgrel=9
+pkgrel=10
pkgdesc="A small utility which generates Go code from any file"
url="https://github.com/go-bindata/go-bindata"
arch="all"
diff --git a/community/go-ipfs/APKBUILD b/community/go-ipfs/APKBUILD
index af9de6e940..52ec54bf49 100644
--- a/community/go-ipfs/APKBUILD
+++ b/community/go-ipfs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=go-ipfs
pkgver=0.12.2
-pkgrel=1
+pkgrel=2
pkgdesc="Inter Platnetary File System (IPFS), a peer-to-peer hypermedia distribution protocol"
url="https://ipfs.io/"
# aarch64: FTBFS (go build segfaults)
diff --git a/community/go-md2man/APKBUILD b/community/go-md2man/APKBUILD
index a9f6915844..0b59debb9a 100644
--- a/community/go-md2man/APKBUILD
+++ b/community/go-md2man/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com>
pkgname=go-md2man
pkgver=2.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="Utility to convert markdown to man pages"
options="net"
url="https://github.com/cpuguy83/go-md2man"
diff --git a/community/go-msgauth/APKBUILD b/community/go-msgauth/APKBUILD
index 3df0927880..0a0171edbc 100644
--- a/community/go-msgauth/APKBUILD
+++ b/community/go-msgauth/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=go-msgauth
pkgver=0.6.2
-pkgrel=5
+pkgrel=6
pkgdesc="Go utilities for DKIM, DMARC, and Authentication-Results"
url="https://github.com/emersion/go-msgauth"
arch="all"
diff --git a/community/go-sendxmpp/APKBUILD b/community/go-sendxmpp/APKBUILD
index eaa493123d..64126db643 100644
--- a/community/go-sendxmpp/APKBUILD
+++ b/community/go-sendxmpp/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Anjandev Momi <anjan@momi.ca>
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=go-sendxmpp
-pkgver=0.4.0
+pkgver=0.5.0
pkgrel=0
pkgdesc="Tool to send messages to an XMPP contact or MUC"
url="https://salsa.debian.org/mdosch/go-sendxmpp"
@@ -24,5 +24,5 @@ package() {
}
sha512sums="
-50472539acf450a3608438c536c8fcf70bbbf817957222e9b698eb5568438502ab39dab8088b2e067927ecad1c148ed05f5d3830aec8a2fa05c15febe2641efd go-sendxmpp-v0.4.0.tar.gz
+ac1a8ce01268b068e50437fe9563317d39cc5c386c1f9b91c0221d71d4bf2ee02162506daf2935c6fe38bf5392eec9b73f6e2403ca6b35b95a6292fdb40b10fa go-sendxmpp-v0.5.0.tar.gz
"
diff --git a/community/go-task/APKBUILD b/community/go-task/APKBUILD
index 1e46b44570..a9b11876f4 100644
--- a/community/go-task/APKBUILD
+++ b/community/go-task/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=go-task
pkgver=3.12.0
-pkgrel=1
+pkgrel=2
pkgdesc="Task runner written in Go, installed as go-task"
url="https://taskfile.dev/"
arch="all"
diff --git a/community/go/APKBUILD b/community/go/APKBUILD
index c2d684ab5f..186aaf22e5 100644
--- a/community/go/APKBUILD
+++ b/community/go/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=go
# go binaries are statically linked, security updates require rebuilds
-pkgver=1.18.1
-pkgrel=1
+pkgver=1.18.2
+pkgrel=0
pkgdesc="Go programming language compiler"
url="https://go.dev/"
arch="all"
@@ -208,7 +208,7 @@ package() {
}
sha512sums="
-baa053e2d713b235b9285c946b4f0842085a5224d1f4cbe92a446fbf97ed9f7289c8d4ba212fb31dd2e4eac39bb4c015f478543a1856594c2d1fc331c946f571 go1.18.1.src.tar.gz
+9214cbc051cf26b49ab1bd4d8d30b060865944b831578a9ea7fcfe33f84009f77932a39f2948efbfc412b151e4734a3bc1f8332f3bea11b35a912b0e23a4118f go1.18.2.src.tar.gz
6017caacf77c2911e9e882878fdaa2ed066b76b7e97b2ad776bc33d96b21cabc802966473946642c86a8f985c69adcc5e7ea61684f6d0dbacd468a6aad687229 allow-unshare-to-return-enosys.patch
9e1d052cb030281093fc3f6862986b9d81a15ca344cb8be90eddd7a97e0ab74f8b022e79f6beefad81a53b041878c4644e8143ef7eeca4fc1757df97c73ff15b force-external-link-on-ppc64le.patch
"
diff --git a/community/gocryptfs/APKBUILD b/community/gocryptfs/APKBUILD
index d55f47cc0c..a772093ab7 100644
--- a/community/gocryptfs/APKBUILD
+++ b/community/gocryptfs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=gocryptfs
pkgver=2.2.1
-pkgrel=3
+pkgrel=4
pkgdesc="Encrypted overlay filesystem written in Go"
url="https://github.com/rfjakob/gocryptfs"
# riscv64 fails to build https://gitlab.alpinelinux.org/alpine/aports/-/issues/12793
diff --git a/community/gogs/APKBUILD b/community/gogs/APKBUILD
index 5b72be05dd..d032a7ed58 100644
--- a/community/gogs/APKBUILD
+++ b/community/gogs/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: 7heo <7heo@mail.com>
# Maintainer:
pkgname=gogs
-pkgver=0.12.6
-pkgrel=1
+pkgver=0.12.7
+pkgrel=0
pkgdesc="Painless self-hosted Git service"
url="https://gogs.io/"
arch="all"
@@ -21,6 +21,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/gogs/gogs/archive/v$pkgver.t
$pkgname.ini"
# secfixes:
+# 0.12.7-r0:
+# - CVE-2022-1464
# 0.12.6-r0:
# - CVE-2022-0870
# - CVE-2022-0871
@@ -59,7 +61,7 @@ package() {
}
sha512sums="
-a6363d60f593cbbbfbed649eabb27466cf6463d2922fad1c48091105a31fb7032371f1c2cdf597eeaa02bff4b2b4f24d38a8fc91beadef267c01431a8d2b96f6 gogs-0.12.6.tar.gz
+0591cee315e8f1bb10aef69cbc52dcb11e5fa4206629c63a44ee8923e00bb085163f03045bb7ee67488ada60e9a85f9a47aeda674bbbc7fa976f3a9dcc6a570e gogs-0.12.7.tar.gz
be5a9ef2cae1ee2e8106feb6a997ae06519af91fe57f746d20996e79c332c93bb43fc53f79ff4e8ce13222afc6f3dc7bc5cbb758ef201b03e49d809c87c8c4c7 gogs.initd
52ce41c05c263b790221a04d13d2eb9bba689e4bd72daf5b6af31416e80a485a46bae19e18581d7bde879307283847e6486686a2fe4140fe38ebb6f315e11a86 gogs.confd
1d8cc4d9c96887de50d281f49d7f0bae963318a56a9e6cc46052d72236e446d20eb6228b8f51e24d5dbe63bf459040fb3556e9554fa242f3bef3969e11d18b06 gogs.ini
diff --git a/community/goimapnotify/APKBUILD b/community/goimapnotify/APKBUILD
index de4244b10a..214bf8ef0e 100644
--- a/community/goimapnotify/APKBUILD
+++ b/community/goimapnotify/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=goimapnotify
pkgver=2.3.7
-pkgrel=3
+pkgrel=4
pkgdesc="execute scripts on IMAP mailbox changes using IDLE, golang version"
url="https://gitlab.com/shackra/goimapnotify"
arch="all"
diff --git a/community/gojq/APKBUILD b/community/gojq/APKBUILD
index 29f521358b..e0175b1e38 100644
--- a/community/gojq/APKBUILD
+++ b/community/gojq/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=gojq
pkgver=0.12.7
-pkgrel=2
+pkgrel=3
pkgdesc="Pure Go implementation of jq"
url="https://github.com/itchyny/gojq"
license="MIT"
diff --git a/community/gomplate/APKBUILD b/community/gomplate/APKBUILD
index 6ba266655a..85f07cb8e8 100644
--- a/community/gomplate/APKBUILD
+++ b/community/gomplate/APKBUILD
@@ -2,7 +2,7 @@
pkgname=gomplate
_goname="github.com/hairyhenderson/$pkgname"
pkgver=3.10.0
-pkgrel=5
+pkgrel=6
pkgdesc="A versatile Go template processor"
url="https://github.com/hairyhenderson/gomplate"
arch="all !s390x" # FAIL: TestCreateContext with SIGSEGV
diff --git a/community/gomuks/APKBUILD b/community/gomuks/APKBUILD
index 27dc338e83..c6d160ea4e 100644
--- a/community/gomuks/APKBUILD
+++ b/community/gomuks/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Julian Weigt <juw@posteo.de>
pkgname=gomuks
pkgver=0.2.4
-pkgrel=3
+pkgrel=4
pkgdesc="terminal-based Matrix client written in Go"
url="https://github.com/tulir/gomuks"
arch="all"
diff --git a/community/gonic/APKBUILD b/community/gonic/APKBUILD
index 80a8d09055..ad75ea91b4 100644
--- a/community/gonic/APKBUILD
+++ b/community/gonic/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alex McGrath <amk@amk.ie>
pkgname=gonic
pkgver=0.14.0
-pkgrel=3
+pkgrel=4
pkgdesc="Subsonic compatible music streaming server"
url="https://github.com/sentriz/gonic"
arch="all"
diff --git a/community/gopass/APKBUILD b/community/gopass/APKBUILD
index a84221cc12..1fe151c184 100644
--- a/community/gopass/APKBUILD
+++ b/community/gopass/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=gopass
pkgver=1.14.1
-pkgrel=0
+pkgrel=1
pkgdesc="The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."
url="https://www.gopass.pw"
arch="all"
diff --git a/community/gops/APKBUILD b/community/gops/APKBUILD
index cf20a24cdc..42267ebfbe 100644
--- a/community/gops/APKBUILD
+++ b/community/gops/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=gops
pkgver=0.3.23
-pkgrel=0
+pkgrel=1
pkgdesc="List and diagnose Go processes currently running on your system"
url="https://github.com/google/gops"
license="BSD-3-Clause"
diff --git a/community/gotop/APKBUILD b/community/gotop/APKBUILD
index f9c987acdc..3c122a9462 100644
--- a/community/gotop/APKBUILD
+++ b/community/gotop/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=gotop
pkgver=4.1.3
-pkgrel=2
+pkgrel=3
pkgdesc="Terminal based graphical activity monitor"
url="https://github.com/xxxserxxx/gotop"
arch="all"
diff --git a/community/gource/APKBUILD b/community/gource/APKBUILD
index d1cd6e0cad..9fe912e66c 100644
--- a/community/gource/APKBUILD
+++ b/community/gource/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=gource
pkgver=0.53
-pkgrel=0
+pkgrel=1
pkgdesc="Software version control visualization"
url="https://gource.io/"
arch="all !s390x"
diff --git a/community/govc/APKBUILD b/community/govc/APKBUILD
index 9fb2a5c8df..7d8d20ea5e 100644
--- a/community/govc/APKBUILD
+++ b/community/govc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=govc
pkgver=0.28.0
-pkgrel=0
+pkgrel=1
pkgdesc="vSphere CLI built on top of govmomi"
url="https://github.com/vmware/govmomi/tree/master/govc"
arch="all"
diff --git a/community/govendor/APKBUILD b/community/govendor/APKBUILD
index ad813f99a7..5eded612a7 100644
--- a/community/govendor/APKBUILD
+++ b/community/govendor/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=govendor
pkgver=1.0.9
-pkgrel=9
+pkgrel=10
pkgdesc="Go vendor tool that works with the standard vendor file"
url="https://github.com/kardianos/govendor"
# riscv64 is broken
diff --git a/community/gpick/APKBUILD b/community/gpick/APKBUILD
index c4a71e79d9..18d2aa4548 100644
--- a/community/gpick/APKBUILD
+++ b/community/gpick/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: knuxify <knuxify@gmail.com>
pkgname=gpick
pkgver=0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Advanced color picker written in C++ using GTK+ toolkit"
url="http://gpick.org"
arch="all"
diff --git a/community/grafana-frontend/APKBUILD b/community/grafana-frontend/APKBUILD
index b2fb89d2f7..f489d5d2d6 100644
--- a/community/grafana-frontend/APKBUILD
+++ b/community/grafana-frontend/APKBUILD
@@ -13,7 +13,7 @@
pkgname=grafana-frontend
pkgver=8.5.2
-pkgrel=0
+pkgrel=1
pkgdesc="Open source, feature rich metrics dashboard and graph editor (frontend files)"
url="https://grafana.com"
arch="noarch"
diff --git a/community/grafana/APKBUILD b/community/grafana/APKBUILD
index b63193b9ca..281fefc81a 100644
--- a/community/grafana/APKBUILD
+++ b/community/grafana/APKBUILD
@@ -5,7 +5,7 @@
pkgname=grafana
pkgver=8.5.2
-pkgrel=0
+pkgrel=1
_commit=90701be19c # git rev-parse --short HEAD
_stamp=1651563854 # git --no-pager show -s --format=%ct
pkgdesc="Open source, feature rich metrics dashboard and graph editor"
diff --git a/community/grpc/APKBUILD b/community/grpc/APKBUILD
index 89f2856414..b8b8f35787 100644
--- a/community/grpc/APKBUILD
+++ b/community/grpc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: wener <wenermail@gmail.com>
# Maintainer: wener <wenermail@gmail.com>
pkgname=grpc
-pkgver=1.46.0
+pkgver=1.46.1
pkgrel=0
pkgdesc="The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"
url="https://grpc.io/"
@@ -105,7 +105,7 @@ cli() {
}
sha512sums="
-0245c2123751cd092de4331c692a0282f7ff678805afb5bf746822286991117540270d9654b064236de8192c85d33255104f332b1ac13af5716b1f01ad49ef40 grpc-v1.46.0.tar.gz
+8598708beaf14523c0a9e18f9a5a78d49b2406e3641f7b956a5b61de7ab3e2088c4ac3780fd20d0a84da6bfa1af45f6a0023ffa9761ffad46f5aee0fba3e0eae grpc-v1.46.1.tar.gz
5c5eaf6ff9f3c1bca025b7ef0234ba97232ba85b43e6354a92f49b7208f5c47581ebaf18bf58618498e5d264f2620c2b6676e81bb0f7df77112b96ba271ececf googletest-0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz
7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5 01-chttp2-maybe-uninitialized.patch
"
diff --git a/community/gst-editing-services/APKBUILD b/community/gst-editing-services/APKBUILD
index affcad2f6c..726936ea06 100644
--- a/community/gst-editing-services/APKBUILD
+++ b/community/gst-editing-services/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gst-editing-services
-pkgver=1.20.1
+pkgver=1.20.2
pkgrel=0
pkgdesc="GStreamer Editing Services Library"
url="https://gstreamer.freedesktop.org"
@@ -31,5 +31,5 @@ package() {
}
sha512sums="
-1329bcc7f05248b7571a7b47debe88649b717c43b14ba5213708c8fd5740171c95f31ba03fd51aa2df22e8c61f87b9f58a396f122cd4ea2a891c8a1b2e33b0c2 gst-editing-services-1.20.1.tar.xz
+a9f9dd196d838fab8727de6fd0c52fde6a1b56ba801b7b608e0f2d30abc38bf586f02c20bedcb1ba384089cf97e8d0db1719ed1c9e8c18c7e56ff732bb8e5de5 gst-editing-services-1.20.2.tar.xz
"
diff --git a/community/gst-libav/APKBUILD b/community/gst-libav/APKBUILD
index 6173e4fd52..f97b980168 100644
--- a/community/gst-libav/APKBUILD
+++ b/community/gst-libav/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-libav
-pkgver=1.20.1
+pkgver=1.20.2
pkgrel=0
pkgdesc="GStreamer streaming media framework libav plugin"
url="https://gstreamer.freedesktop.org"
@@ -33,5 +33,5 @@ doc() {
}
sha512sums="
-5f4169ac03aec715b56d8bff5e45f471150b1997f785f1ad3dc687f9c76060d5bfaafe0ee51f460e53394adceaf41cb64875ce818c16c0111ee171b5dff46854 gst-libav-1.20.1.tar.xz
+845acd0144f333fc532c35a854a9773cef70c96b097995a684911b9ac3fe45aaf75011454e736427dbd6afabaf07459fd22cf7ce8543066e1d5547ee1992e2ca gst-libav-1.20.2.tar.xz
"
diff --git a/community/gst-plugins-bad/APKBUILD b/community/gst-plugins-bad/APKBUILD
index 1df0bdff78..f72547a68e 100644
--- a/community/gst-plugins-bad/APKBUILD
+++ b/community/gst-plugins-bad/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-bad
-pkgver=1.20.1
+pkgver=1.20.2
pkgrel=0
pkgdesc="GStreamer streaming media framework bad plug-ins"
url="https://gstreamer.freedesktop.org"
@@ -54,5 +54,5 @@ package() {
}
sha512sums="
-3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6 gst-plugins-bad-1.20.1.tar.xz
+3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70 gst-plugins-bad-1.20.2.tar.xz
"
diff --git a/community/gst-plugins-good/APKBUILD b/community/gst-plugins-good/APKBUILD
index 374f8e8044..1195489529 100644
--- a/community/gst-plugins-good/APKBUILD
+++ b/community/gst-plugins-good/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-good
-pkgver=1.20.1
-pkgrel=0
+pkgver=1.20.2
+pkgrel=2
pkgdesc="GStreamer streaming media framework good plug-ins"
url="https://gstreamer.freedesktop.org"
arch="all"
license="GPL-2.0-or-later LGPL-2.0-or-later"
-subpackages="$pkgname-lang $pkgname-gtk"
+subpackages="$pkgname-lang $pkgname-gtk $pkgname-qt"
replaces="gst-plugins-good1"
makedepends="cairo-dev flac-dev gdk-pixbuf-dev glib-dev gst-plugins-base-dev
gstreamer-dev gtk+3.0-dev jack-dev lame-dev libavc1394-dev libcaca-dev
@@ -14,18 +14,16 @@ makedepends="cairo-dev flac-dev gdk-pixbuf-dev glib-dev gst-plugins-base-dev
libogg-dev libpng-dev libshout-dev libsm-dev libsoup-dev libvpx-dev
libxdamage-dev libxext-dev libxv-dev linux-headers meson mpg123-dev
orc-compiler orc-dev taglib-dev v4l-utils-dev wavpack-dev zlib-dev
- pulseaudio-dev"
+ pulseaudio-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev"
ldpath="/usr/lib/gstreamer-1.0"
source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz"
case "$CARCH" in
- armhf)
- # 2 failures
- options="$options !check"
+armhf|s390x|ppc64le)
+ # really flaky tests
+ options="$options !check"
;;
- *)
- makedepends="$makedepends qt5-qtdeclarative-dev qt5-qtx11extras-dev"
- subpackages="$subpackages $pkgname-qt"
+*)
;;
esac
@@ -86,5 +84,5 @@ gtk() {
}
sha512sums="
-6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e gst-plugins-good-1.20.1.tar.xz
+a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933 gst-plugins-good-1.20.2.tar.xz
"
diff --git a/community/gst-plugins-ugly/APKBUILD b/community/gst-plugins-ugly/APKBUILD
index 762f35b19f..a77e81304a 100644
--- a/community/gst-plugins-ugly/APKBUILD
+++ b/community/gst-plugins-ugly/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-ugly
-pkgver=1.20.1
-pkgrel=1
+pkgver=1.20.2
+pkgrel=0
pkgdesc="GStreamer streaming media framework ugly plug-ins"
url="https://gstreamer.freedesktop.org"
arch="all"
@@ -46,5 +46,5 @@ doc() {
}
sha512sums="
-cf4db5da474cba86e19ed399014dff8d0ed3a51feaaaf3a25779af23f5996b6d28c8c9237ad7b4d47051e4336c3b2b467094aed39bf15c8c25b7a6fe9508e6d5 gst-plugins-ugly-1.20.1.tar.xz
+bbe6c60003dc180084995aa00c8aefc5238f9e826db03f5cadac4a39900f2e9ca529b8f63787ca59c830e12bf4f426408b185ca228bd5e9255c2a4f452a48d6a gst-plugins-ugly-1.20.2.tar.xz
"
diff --git a/community/gtk4.0/APKBUILD b/community/gtk4.0/APKBUILD
index 9a6fbc3aa8..60a9b2252c 100644
--- a/community/gtk4.0/APKBUILD
+++ b/community/gtk4.0/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com>
pkgname=gtk4.0
pkgver=4.6.3
-pkgrel=0
+pkgrel=1
pkgdesc="The GTK Toolkit (v4)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
diff --git a/community/hare/APKBUILD b/community/hare/APKBUILD
index 44871b99df..c60cfda40f 100644
--- a/community/hare/APKBUILD
+++ b/community/hare/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=hare
-pkgver="0_git20220504"
-_commit=d9870303ec34c851b5d5a06402d8009dac76d174
+pkgver="0_git20220510"
+_commit=f7ca9eff38cc46681dc08c5bae1a6b914d067e56
pkgrel=0
pkgdesc="The Hare systems programming language"
url="https://harelang.org"
@@ -36,7 +36,7 @@ package() {
}
sha512sums="
-4786549847392d4ff9a15cad9f248e81b2b880182375912bf9b1947b11fa7b7303587843acbddb21415f4e70161ee2552719ce72896c2529a927b73a678d26f4 hare-d9870303ec34c851b5d5a06402d8009dac76d174.tar.gz
+b872fdea3644612aaa97c2cfa711810056d7536e042abca5f4279227a73297cd6081936f5acb20fbafd8edfdf34f03f484ab73e87656c543edc1452bdea85457 hare-f7ca9eff38cc46681dc08c5bae1a6b914d067e56.tar.gz
c30c2979a94d73f5bbb39c3fa250d155548fb07ba93cb4a2111eede51be5fd9017e2b4291f4f16657718e6bc414b90b583a14df572fab4579d26c5680a279dcb config.aarch64.mk
6980757c09987363817de0599b59334817831f1c5782ae48a94b88c5b10aa1ab32fdc6c76911d02d1c100d78db98f1ca2167ecdf9580fc4d9bc560577f6fe89e config.riscv64.mk
159c2f56f9617a97ecbe2b1ab94c98beb798fa575463bdcfba281a023202df481714c16536e213e859468b50cdd9f339224d8a3b3d57e139a58412b3efba6d84 config.x86_64.mk
diff --git a/community/harec/APKBUILD b/community/harec/APKBUILD
index 3dd05b0173..ee84e77eb7 100644
--- a/community/harec/APKBUILD
+++ b/community/harec/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=harec
-pkgver="0_git20220504"
-_commit=fba0a9b547a3462d65a45ec93f78a07da58beabf
+pkgver="0_git20220510"
+_commit=4a97bd2bafbd6e89f692c18477a08d8112dbd6e1
pkgrel=0
pkgdesc="The Hare compiler"
url="https://harelang.org"
@@ -27,5 +27,5 @@ package() {
}
sha512sums="
-c1a78c7b1d7841631c52d7ecb70460c5b0d0e76d8c2672b2be24dad2a5948b56442ae8dbef6c601a3f881f91ed9fb8c1aff2f82d91d366a13fe4fef1e962396b harec-fba0a9b547a3462d65a45ec93f78a07da58beabf.tar.gz
+e0d7c73034766c70adef1e4c339d1ae2fbe1546f1c40c2881d6c0632200c33aca0f84eeca04f42744a342c0667081f69bbaa2912c7ca7d266e627a26e68cf822 harec-4a97bd2bafbd6e89f692c18477a08d8112dbd6e1.tar.gz
"
diff --git a/community/hcloud/APKBUILD b/community/hcloud/APKBUILD
index 25fd5e0dd8..e9be5abb8d 100644
--- a/community/hcloud/APKBUILD
+++ b/community/hcloud/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=hcloud
pkgver=1.29.5
-pkgrel=0
+pkgrel=1
pkgdesc="Command-line interface for Hetzner Cloud"
url="https://github.com/hetznercloud/cli"
license="MIT"
diff --git a/community/hd-idle/APKBUILD b/community/hd-idle/APKBUILD
index 5d25e2566e..465bf16560 100644
--- a/community/hd-idle/APKBUILD
+++ b/community/hd-idle/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dermot Bradley <dermot_bradley@yahoo.com>
pkgname=hd-idle
pkgver=1.16
-pkgrel=1
+pkgrel=2
pkgdesc="spin down idle hard disks"
url="https://github.com/adelolmo/hd-idle"
arch="all"
diff --git a/community/headlines/APKBUILD b/community/headlines/APKBUILD
index 6bc614ec64..1e91a2eda5 100644
--- a/community/headlines/APKBUILD
+++ b/community/headlines/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Adam Plumb <adamplumb@gmail.com>
pkgname=headlines
pkgver=0.7.0
-pkgrel=0
+pkgrel=1
pkgdesc="GTK4 Reddit client written in C++"
url="https://gitlab.com/caveman250/Headlines"
arch="all !s390x !riscv64"
diff --git a/community/hey/APKBUILD b/community/hey/APKBUILD
index d4202505a0..034d65e01b 100644
--- a/community/hey/APKBUILD
+++ b/community/hey/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=hey
pkgver=0.1.4
-pkgrel=5
+pkgrel=6
pkgdesc="HTTP load generator"
url="https://github.com/rakyll/hey"
arch="all"
diff --git a/community/hugo/APKBUILD b/community/hugo/APKBUILD
index e8df6346fa..12b5741aef 100644
--- a/community/hugo/APKBUILD
+++ b/community/hugo/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Thomas Boerger <thomas@webhippie.de>
pkgname=hugo
pkgver=0.98.0
-pkgrel=0
+pkgrel=1
pkgdesc="Fast and flexible static site generator written in Go"
url="https://gohugo.io/"
license="Apache-2.0"
diff --git a/community/hut/APKBUILD b/community/hut/APKBUILD
index 303d1d37d1..96c3384c32 100644
--- a/community/hut/APKBUILD
+++ b/community/hut/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Maxim Karasev <begs@disroot.org>
pkgname=hut
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="command-line tool for sr.ht"
url="https://sr.ht/~emersion/hut"
arch="all"
diff --git a/community/hydroxide/APKBUILD b/community/hydroxide/APKBUILD
index f2f564aa43..cf6247c84b 100644
--- a/community/hydroxide/APKBUILD
+++ b/community/hydroxide/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Dekedro <dekedro@tankers.xyz>
pkgname=hydroxide
-pkgver=0.2.22
+pkgver=0.2.23
pkgrel=0
pkgdesc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
url="https://github.com/emersion/hydroxide"
@@ -19,5 +19,5 @@ package() {
}
sha512sums="
-02bbf8be6d89c7c029a1f018abfce702b15b3499181dad769b6df444780731dc8e268bad4bdf259283b989802e3d50d163c58f00bc12cb7b081efa9a04528678 hydroxide-0.2.22.tar.gz
+9f2c9b59cb7c1dfcfec9cc626767f340b1d5caea4db69e81de6b87c4bcf26840d14cd6568a0d3aad36d8e31184e2f1827a5e27745338bc2f38265ce64fe2d4a4 hydroxide-0.2.23.tar.gz
"
diff --git a/community/i2pd/APKBUILD b/community/i2pd/APKBUILD
index e4db2fcf21..74f3d0baa6 100644
--- a/community/i2pd/APKBUILD
+++ b/community/i2pd/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: l-n-s <supervillain@riseup.net>
pkgname=i2pd
pkgver=2.41.0
-pkgrel=0
+pkgrel=1
pkgdesc="I2P Router written in C++"
url="https://github.com/PurpleI2P/i2pd"
arch="all"
diff --git a/community/icinga2/APKBUILD b/community/icinga2/APKBUILD
index 7a04ea4721..fabea918a9 100644
--- a/community/icinga2/APKBUILD
+++ b/community/icinga2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=icinga2
pkgver=2.13.3
-pkgrel=0
+pkgrel=1
pkgdesc="An open source host, service and network monitoring program"
url="https://icinga.com"
arch="all !armhf !armv7 !s390x"
diff --git a/community/img/APKBUILD b/community/img/APKBUILD
index 2f0214dbd3..9050c67923 100644
--- a/community/img/APKBUILD
+++ b/community/img/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=img
pkgver=0.5.11
-pkgrel=7
+pkgrel=8
pkgdesc="Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder"
url="https://github.com/genuinetools/img"
arch="aarch64 x86_64"
diff --git a/community/influxdb/APKBUILD b/community/influxdb/APKBUILD
index f8722af17f..0827123f2c 100644
--- a/community/influxdb/APKBUILD
+++ b/community/influxdb/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=influxdb
pkgver=1.8.10
-pkgrel=3
+pkgrel=4
_commit=688e697c51 # git rev-parse --short HEAD
_branch=${pkgver%.*}
pkgdesc="Scalable datastore for metrics, events, and real-time analytics"
diff --git a/community/inkscape/APKBUILD b/community/inkscape/APKBUILD
index 731af50a35..a1583fe457 100644
--- a/community/inkscape/APKBUILD
+++ b/community/inkscape/APKBUILD
@@ -3,7 +3,7 @@ pkgname=inkscape
pkgver=1.1.2
_pkgdate=2022-02-04
_pkgcommit=0a00cf5339
-pkgrel=3
+pkgrel=5
pkgdesc="A vector-based drawing program - svg compliant"
url="https://inkscape.org/"
arch="all"
@@ -40,6 +40,7 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-view $pkgname-bash
source="https://media.inkscape.org/dl/resources/file/inkscape-$pkgver.tar.xz
fix-Werror.patch
poppler-22.03.patch
+ poppler-22.04.patch
"
options="!check" # cxxtest hangs at least on x86_64
builddir="$srcdir"/$pkgname-${pkgver}_${_pkgdate}_$_pkgcommit
@@ -80,5 +81,6 @@ doc() {
sha512sums="
55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16 inkscape-1.1.2.tar.xz
b46f11f9604b7103d7caafe299f6a356af02504b451b532628d6ef859cf773c1d122eecb5274ac0d354acff34b625099dca22462002c161d8c0fc705ee0c1be7 fix-Werror.patch
-f51c366811232ab68964bb1653080b59b41584f325ae5148f7e34cb866c38fc22cc59caef57992b8b49352926a2df80d47f8a69e143f5be6551499044ff4471e poppler-22.03.patch
+a14a0efb669cd1c3d0228d475fea61a9375b5ab66cdcb72941f3b5c5fd92ceb453be0583be23b6b7e67e6d2df909143546ded4f3c85c1bb8aebbc26bbd449986 poppler-22.03.patch
+6223a172462aeed758d3eaf971037ea2ec6495e510a27223dae3793095fc6c5c6d4cbdc1a1941785ecff2afd0a65c13ca4ef42cbf8b731bc89230617b4e2cf5b poppler-22.04.patch
"
diff --git a/community/inkscape/poppler-22.03.patch b/community/inkscape/poppler-22.03.patch
index b8be4a81d2..153f171665 100644
--- a/community/inkscape/poppler-22.03.patch
+++ b/community/inkscape/poppler-22.03.patch
@@ -1,27 +1,51 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/2002e19be1e19a1e775daea73252c8a699e8af47/trunk/poppler-22.03.0.patch
-edited to add <memory> import
+Patch-Source: https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75
+From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 20 Mar 2022 22:41:51 -0300
+Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
+
+This change ensures that Inkscape will build against Poppler 22.03 after
+the changes that were made to the constructor of `PDFDoc`.
+
+See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
+
+Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
+---
+ src/extension/internal/pdfinput/pdf-input.cpp | 3 +--
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index e6204f650c..b2424e996e 100644
+index 3dabc94ba2..079b0dc713 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -44,6 +44,7 @@
- #include <gtkmm/radiobutton.h>
- #include <gtkmm/scale.h>
- #include <utility>
-+#include <memory>
-
- #include "document-undo.h"
- #include "extension/input.h"
-@@ -668,8 +668,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
// poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
// glib gstdio.c
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+ pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password
-+#else
- GooString *filename_goo = new GooString(uri);
- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
-+#endif
+- GooString *filename_goo = new GooString(uri);
+- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
if (!pdf_doc->isOk()) {
int error = pdf_doc->getErrorCode();
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 87a19d4c42..50b617c25c 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
++#else
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+ #define _POPPLER_CONST_83 const
+ #else
+--
+GitLab
+
diff --git a/community/inkscape/poppler-22.04.patch b/community/inkscape/poppler-22.04.patch
new file mode 100644
index 0000000000..8699e18507
--- /dev/null
+++ b/community/inkscape/poppler-22.04.patch
@@ -0,0 +1,144 @@
+Patch-Source: https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b
+From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
+From: Rafael Siejakowski <rs@rs-math.net>
+Date: Mon, 4 Apr 2022 22:09:39 -0300
+Subject: [PATCH] Compatibility with Poppler 22.04
+
+Replace vanilla pointers with std::shared_ptr for pointers to fonts;
+eliminate manual ref-counting.
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 14 ++++++++------
+ .../internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ src/extension/internal/pdfinput/svg-builder.cpp | 7 +------
+ src/extension/internal/pdfinput/svg-builder.h | 1 -
+ 4 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index feecefa043..d6e2ede4f3 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -30,6 +30,7 @@
+ #include "Gfx.h"
+ #include "pdf-parser.h"
+ #include "util/units.h"
++#include "poppler-transition-api.h"
+
+ #include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
+ // TODO not good that numArgs is ignored but args[] is used:
+ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ {
+- GfxFont *font = res->lookupFont(args[0].getName());
++ auto font = res->lookupFont(args[0].getName());
+
+ if (!font) {
+ // unsetting the font (drawing no text) is better than using the
+@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ fflush(stdout);
+ }
+
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ font->incRefCnt();
++#endif
+ state->setFont(font, args[1].getNum());
+ fontChanged = gTrue;
+ }
+@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
+ #else
+ void PdfParser::doShowText(GooString *s) {
+ #endif
+- GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+ CharCode code;
+@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
+ #endif
+ int len, n, uLen;
+
+- font = state->getFont();
++ auto font = state->getFont();
+ wMode = font->getWMode();
+
+ builder->beginString(state);
+@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
+ if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
+ code, u, uLen)) {*/
+- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
+- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
++ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
++ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
+ pushResources(resDict);
+- }
++ }
+ if (charProc.isStream()) {
+ //parse(&charProc, gFalse); // TODO: parse into SVG font
+ } else {
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 50b617c25c..dc9e47e45b 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 4, 0)
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
++#else
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 3, 0)
+ #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
+ #else
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index eede668893..901cc8cddb 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
+
+ void SvgBuilder::_init() {
+ _font_style = nullptr;
+- _current_font = nullptr;
+ _font_specification = nullptr;
+ _font_scaling = 1;
+ _need_font_update = true;
+@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
+ _need_font_update = false;
+ updateTextMatrix(state); // Ensure that we have a text matrix built
+
+- if (_font_style) {
+- //sp_repr_css_attr_unref(_font_style);
+- }
+ _font_style = sp_repr_css_attr_new();
+- GfxFont *font = state->getFont();
++ auto font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+ _font_specification = font->getName()->getCString();
+@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
+ sp_repr_css_set_property(_font_style, "writing-mode", "tb");
+ }
+
+- _current_font = font;
+ _invalidated_style = true;
+ }
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index fb4e64fa19..e91febd717 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -204,7 +204,6 @@ private:
+ std::vector<SvgGraphicsState> _state_stack;
+
+ SPCSSAttr *_font_style; // Current font style
+- GfxFont *_current_font;
+ const char *_font_specification;
+ double _font_scaling;
+ bool _need_font_update;
+--
+GitLab
+
diff --git a/community/innoextract/APKBUILD b/community/innoextract/APKBUILD
index 2bf7f02c37..fd37fd1278 100644
--- a/community/innoextract/APKBUILD
+++ b/community/innoextract/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Koloberdin <koloberdin@gmail.com>
pkgname=innoextract
pkgver=1.9
-pkgrel=3
+pkgrel=4
pkgdesc="A tool to extract installers created by Inno Setup"
url="https://constexpr.org/innoextract/"
arch="all"
diff --git a/community/intel-gmmlib/APKBUILD b/community/intel-gmmlib/APKBUILD
index fcff25f77a..75dbc57768 100644
--- a/community/intel-gmmlib/APKBUILD
+++ b/community/intel-gmmlib/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: psykose <alice@ayaya.dev>
pkgname=intel-gmmlib
-pkgver=22.1.2
+pkgver=22.1.3
pkgrel=0
pkgdesc="Intel Graphics Memory Management Library"
options="!check" # tests can't run in check(), only on install
@@ -35,5 +35,5 @@ package() {
}
sha512sums="
-fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53 intel-gmmlib-22.1.2.tar.gz
+cbf0164e7604f6214f6e1d3d9a283d385fac0efbd83afad02a76e3090d680ec000b17a257d5e004c296764330888dbd0a3e5bd46a760ac5c5f3e67436a7c9437 intel-gmmlib-22.1.3.tar.gz
"
diff --git a/community/intel-media-driver/APKBUILD b/community/intel-media-driver/APKBUILD
index ca29e39b54..90facd3c2b 100644
--- a/community/intel-media-driver/APKBUILD
+++ b/community/intel-media-driver/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: psykose <alice@ayaya.dev>
pkgname=intel-media-driver
pkgver=22.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="Intel Media Driver for VAAPI - Broadwell+ iGPUs"
options="!check" # tests can't run in check(), only on install
url="https://github.com/intel/media-driver"
diff --git a/community/irtt/APKBUILD b/community/irtt/APKBUILD
index d2aecec48c..9f671a988e 100644
--- a/community/irtt/APKBUILD
+++ b/community/irtt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Thomas Liske <thomas@fiasko-nw.net>
pkgname=irtt
pkgver=0.9.1
-pkgrel=6
+pkgrel=7
pkgdesc="Isochronous Round-Trip Tester"
url="https://github.com/heistp/irtt"
arch="all"
diff --git a/community/jool-modules-lts/APKBUILD b/community/jool-modules-lts/APKBUILD
index e5cb8cc6e9..ed69dc4bde 100644
--- a/community/jool-modules-lts/APKBUILD
+++ b/community/jool-modules-lts/APKBUILD
@@ -21,7 +21,7 @@ fi
# Kernel version
# Keep in sync with main/linux-lts!
_kpkg=linux-$_flavor
-_kver=5.15.38
+_kver=5.15.39
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/community/k3s/APKBUILD b/community/k3s/APKBUILD
index 5ffb9c2a59..c448569b5e 100644
--- a/community/k3s/APKBUILD
+++ b/community/k3s/APKBUILD
@@ -3,7 +3,7 @@
pkgname=k3s
_pkgver=1.22.9+k3s1
pkgver=${_pkgver/+k3s/.}
-pkgrel=0
+pkgrel=1
pkgdesc="Lightweight Kubernetes. 5 less than k8s"
url="https://k3s.io"
arch="all !riscv64" # outdated prometheus/procfs module
diff --git a/community/k9s/APKBUILD b/community/k9s/APKBUILD
index f0cc252a6d..c2c085e318 100644
--- a/community/k9s/APKBUILD
+++ b/community/k9s/APKBUILD
@@ -3,7 +3,7 @@
pkgname=k9s
_pkgname=github.com/derailed/k9s
pkgver=0.25.18
-pkgrel=3
+pkgrel=4
_commit=6085039f # git rev-parse --short HEAD
_date=2021-12-28T17:08:34UTC # git show -s --format=%ci | date -u +%FT%T%Z
pkgdesc="Kubernetes TUI"
diff --git a/community/kactivities-stats/APKBUILD b/community/kactivities-stats/APKBUILD
index 7f0b996556..5c2fb1d7f4 100644
--- a/community/kactivities-stats/APKBUILD
+++ b/community/kactivities-stats/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
pkgname=kactivities-stats
pkgver=5.93.0
-pkgrel=0
+pkgrel=1
arch="all !armhf" # armhf blocked by qt5-qtdeclarative
pkgdesc="A library for accessing the usage data collected by the activities system"
url="https://community.kde.org/Frameworks"
diff --git a/community/kactivities/APKBUILD b/community/kactivities/APKBUILD
index 333b39f3a5..f603153a87 100644
--- a/community/kactivities/APKBUILD
+++ b/community/kactivities/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kactivities
pkgver=5.93.0
-pkgrel=0
+pkgrel=1
# armhf blocked by qt5-qtdeclarative
arch="all !armhf"
pkgdesc="Core components for the KDE's Activities"
diff --git a/community/kactivitymanagerd/APKBUILD b/community/kactivitymanagerd/APKBUILD
index 78585ec0f7..1e4a80ea09 100644
--- a/community/kactivitymanagerd/APKBUILD
+++ b/community/kactivitymanagerd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kactivitymanagerd
pkgver=5.24.5
-pkgrel=0
+pkgrel=1
pkgdesc="System service to manage user's activities and track the usage patterns"
# armhf blocked by qt5-qtdeclarative
# s390x and riscv64 blocked by polkit -> kio
diff --git a/community/kdevelop/APKBUILD b/community/kdevelop/APKBUILD
index 16b1a490cd..f2e859fc91 100644
--- a/community/kdevelop/APKBUILD
+++ b/community/kdevelop/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kdevelop
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
# armhf blocked by extra-cmake-modules
# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
arch="all !armhf !ppc64le !s390x !riscv64"
diff --git a/community/kdiff3/APKBUILD b/community/kdiff3/APKBUILD
index 7c1bbe7d9b..88e2e3b7a6 100644
--- a/community/kdiff3/APKBUILD
+++ b/community/kdiff3/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kdiff3
pkgver=1.9.5
-pkgrel=1
+pkgrel=2
# armhf blocked by extra-cmake-modules
# s390x, riscv64 blocked by polkit -> kparts
arch="all !armhf !s390x !riscv64"
diff --git a/community/kea-hook-runscript/APKBUILD b/community/kea-hook-runscript/APKBUILD
index c06a3f6620..5380ba629b 100644
--- a/community/kea-hook-runscript/APKBUILD
+++ b/community/kea-hook-runscript/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Steve Holweg <skytep@gmail.com>
pkgname=kea-hook-runscript
pkgver=1.4.0
-pkgrel=5
+pkgrel=6
pkgdesc="This a hook for the Kea DHCP server that allows to run an external script."
url="https://github.com/zorun/kea-hook-runscript"
arch="all !armhf !armv7 !s390x" # limited by kea
diff --git a/community/kea-hook-userchk-ldap/APKBUILD b/community/kea-hook-userchk-ldap/APKBUILD
index a4f9e7bfcf..c1422c6a96 100644
--- a/community/kea-hook-userchk-ldap/APKBUILD
+++ b/community/kea-hook-userchk-ldap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=kea-hook-userchk-ldap
pkgver=0.1.0
-pkgrel=12
+pkgrel=13
pkgdesc="Kea DHCP hook for checking user access in LDAP"
url="https://github.com/cvut/kea-hook-userchk-ldap/"
arch="all !armhf !armv7 !s390x" # limited by kea
diff --git a/community/kea/APKBUILD b/community/kea/APKBUILD
index 7d4ab9de5b..a593e4fa87 100644
--- a/community/kea/APKBUILD
+++ b/community/kea/APKBUILD
@@ -7,7 +7,7 @@ pkgname=kea
# Odd-numbered versions are development versions.
# NOTE: When bumping, always rebuild all kea hooks (kea-* aports)!
pkgver=2.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="DHCPv4 and DHCPv6 server from ISC"
url="https://kea.isc.org/"
arch="all"
diff --git a/community/kiln/APKBUILD b/community/kiln/APKBUILD
index fad3233e47..431e1e154c 100644
--- a/community/kiln/APKBUILD
+++ b/community/kiln/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stacy Harper <contact@stacyharper.net>
pkgname=kiln
pkgver=0.3.0
-pkgrel=0
+pkgrel=1
pkgdesc="Simple static site generator for Gemini sites"
url="https://git.sr.ht/~adnano/kiln"
arch="all"
@@ -15,16 +15,16 @@ source="
"
build() {
- go build -v -o bin/$pkgname --tags extended
- make docs
+ make VERSION=$pkgver
}
package() {
- install -Dm755 "$builddir"/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+ install -Dm755 "$builddir"/$pkgname "$pkgdir"/usr/bin/$pkgname
install -Dm644 "$builddir"/docs/*.1 -t "$pkgdir"/usr/share/man/man1
cp -a "$builddir"/templates "$pkgdir"/usr/share/$pkgname
}
+
sha512sums="
375b1e161a78c807619459c296945530381b900c49d446291f9152c840c080bed111c7b008414ffe151a41d8c6ca5b9cccc2009abc2dce043ad436aaea412ce6 kiln-0.3.0.tar.gz
"
diff --git a/community/kitinerary/APKBUILD b/community/kitinerary/APKBUILD
index 280cf858fb..6fa9a244e3 100644
--- a/community/kitinerary/APKBUILD
+++ b/community/kitinerary/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kitinerary
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
# armhf blocked by qt5-qtdeclarative
# ppc64le FTBFS
arch="all !armhf !ppc64le"
diff --git a/community/kleopatra/APKBUILD b/community/kleopatra/APKBUILD
index 7614d2a3d0..2db21bf2c2 100644
--- a/community/kleopatra/APKBUILD
+++ b/community/kleopatra/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kleopatra
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
# riscv64 disabled due to missing rust in recursive dependency
arch="all !armhf !s390x !riscv64"
url="https://www.kde.org/applications/utilities/kleopatra/"
diff --git a/community/krita/APKBUILD b/community/krita/APKBUILD
index 39497d32cf..c892532ffc 100644
--- a/community/krita/APKBUILD
+++ b/community/krita/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=krita
pkgver=5.0.6
-pkgrel=0
+pkgrel=1
# armhf and armv7 blocked by build failures
arch="all !armv7 !armhf"
url="https://krita.org/"
diff --git a/community/ktorrent/APKBUILD b/community/ktorrent/APKBUILD
index ec9e10c02b..c5d7e469e2 100644
--- a/community/ktorrent/APKBUILD
+++ b/community/ktorrent/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=ktorrent
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
# armhf blocked by extra-cmake-modules
# ppc64le, s390x and riscv64 blocked by polkit -> plasma-workspace
arch="all !armhf !ppc64le !s390x !riscv64"
diff --git a/community/kubectx/APKBUILD b/community/kubectx/APKBUILD
index 1d4ae69e65..def3fb74fd 100644
--- a/community/kubectx/APKBUILD
+++ b/community/kubectx/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=kubectx
pkgver=0.9.4
-pkgrel=4
+pkgrel=5
pkgdesc="Faster way to switch between clusters and namespaces in kubectl"
url="https://kubectx.dev/"
license="Apache-2.0"
diff --git a/community/lab/APKBUILD b/community/lab/APKBUILD
index c4060969c6..6bdf2dad4d 100644
--- a/community/lab/APKBUILD
+++ b/community/lab/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=lab
pkgver=0.24.0
-pkgrel=0
+pkgrel=1
pkgdesc="Git Wrapper for GitLab"
url="https://zaquestion.github.io/lab/"
arch="all"
diff --git a/community/lagrange/APKBUILD b/community/lagrange/APKBUILD
index b8d14f283b..9b9e3182e7 100644
--- a/community/lagrange/APKBUILD
+++ b/community/lagrange/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=lagrange
-pkgver=1.13.3
+pkgver=1.13.4
pkgrel=0
pkgdesc="Beautiful Gemini client"
url="https://gmi.skyjake.fi/lagrange"
@@ -30,5 +30,5 @@ package() {
}
sha512sums="
-6614a3551b80a113e9e2844aadcb73f4390f7adfc07d17f2c7333758970ebf93a2327ecf6a08ff095d85c1e699bd4104c13ba5b514fc619293a1d657239eed6f lagrange-1.13.3.tar.gz
+6bffde1e52516f77245d99b299e1be049b8dbbcc03e6228ff9c88d9e176b362dead64faefe26ad08b0a435b60bf5c395b21ed2bd9b0c1d7fa6e36dd8b8d76670 lagrange-1.13.4.tar.gz
"
diff --git a/community/lazygit/APKBUILD b/community/lazygit/APKBUILD
index 7908a36202..739dfd0c49 100644
--- a/community/lazygit/APKBUILD
+++ b/community/lazygit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Thomas Deutsch <thomas@tuxpeople.org>
pkgname=lazygit
pkgver=0.34
-pkgrel=0
+pkgrel=1
pkgdesc="Simple terminal UI for git commands"
url="https://github.com/jesseduffield/lazygit"
arch="all"
diff --git a/community/ledger/APKBUILD b/community/ledger/APKBUILD
index 3709c2e22c..602bbaa1b4 100644
--- a/community/ledger/APKBUILD
+++ b/community/ledger/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Apo Apangona <apo@apangona.de>
pkgname=ledger
pkgver=3.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Double-entry accounting system with a command-line reporting interface"
url="https://www.ledger-cli.org/"
arch="all"
diff --git a/community/lego/APKBUILD b/community/lego/APKBUILD
index d13004b286..23727115b7 100644
--- a/community/lego/APKBUILD
+++ b/community/lego/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=lego
pkgver=4.5.3
-pkgrel=3
+pkgrel=4
pkgdesc="Let's Encrypt client and ACME library written in Go"
url="https://github.com/go-acme/lego"
license="MIT"
diff --git a/community/libass/APKBUILD b/community/libass/APKBUILD
index 6b72af3205..6455553c57 100644
--- a/community/libass/APKBUILD
+++ b/community/libass/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libass
-pkgver=0.15.2
+pkgver=0.16.0
pkgrel=0
pkgdesc="Portable library for SSA/ASS subtitle rendering"
url="https://github.com/libass/libass"
@@ -39,5 +39,5 @@ package() {
}
sha512sums="
-4a352d2d21d8a7f25d593f0456cd057912589e55c0709dbf33150d23253fa7859da41584238f03c51782e066a0f92c6849c36b6210324cdb57ed01539921a39b libass-0.15.2.tar.xz
+ada605f5887da06aa1d072a52f8baaba64b62008ccb377560d71d5a030c1f5434d6c60fe39a156e063f553b8a07b4dfe954e4d035036888a629c6e663ce60ba9 libass-0.16.0.tar.xz
"
diff --git a/community/libcamera/APKBUILD b/community/libcamera/APKBUILD
index c946ea4fee..657e0de369 100644
--- a/community/libcamera/APKBUILD
+++ b/community/libcamera/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=libcamera
pkgver=0_git20211109
-pkgrel=3
+pkgrel=4
_commit="f2a1817275db8fb77acb5f2771b7577be8642194"
pkgdesc="Linux camera framework"
url="https://libcamera.org/"
diff --git a/community/libcdr/APKBUILD b/community/libcdr/APKBUILD
index 89d96ef0c4..fe4e834cc2 100644
--- a/community/libcdr/APKBUILD
+++ b/community/libcdr/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libcdr
pkgver=0.1.7
-pkgrel=4
+pkgrel=5
pkgdesc="Import filter and tools for Corel DRAW files"
url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
arch="all"
diff --git a/community/libcgroup/APKBUILD b/community/libcgroup/APKBUILD
index 7906bb4984..d395317958 100644
--- a/community/libcgroup/APKBUILD
+++ b/community/libcgroup/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: psykose <alice@ayaya.dev>
# Maintainer: psykose <alice@ayaya.dev>
pkgname=libcgroup
-pkgver=2.0.1
+pkgver=2.0.2
pkgrel=0
pkgdesc="cgroup library"
url="https://github.com/libcgroup/libcgroup"
@@ -55,5 +55,5 @@ _tools() {
}
sha512sums="
-035a21a4d4c389e143af60c3d8574281356477889cbe42e64fffb0f5d8cac2c00c9716bc01a922cc706d78542cf07e05bfbcea6ce62c15aa0d92768377d4ab7b libcgroup-2.0.1.tar.gz
+824d4408bcd1e2848358c57ed02cdf5ccf1e20a3963dac26e15140985da3d88ced7d583e0c6108ad1b11729ee608f0018e3726fb59211f2e04417fd3e4fd1c9f libcgroup-2.0.2.tar.gz
"
diff --git a/community/libcmis/APKBUILD b/community/libcmis/APKBUILD
index 020b05615c..c0d8b2b572 100644
--- a/community/libcmis/APKBUILD
+++ b/community/libcmis/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libcmis
pkgver=0.5.2
-pkgrel=5
+pkgrel=6
pkgdesc="CMIS protocol client library"
url="https://github.com/tdf/libcmis"
arch="all"
diff --git a/community/libcouchbase/APKBUILD b/community/libcouchbase/APKBUILD
index 2d8d06468b..6e68ad0ce4 100644
--- a/community/libcouchbase/APKBUILD
+++ b/community/libcouchbase/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Nathan Johnson <nathan@nathanjohnson.info>
# Maintainer: Nathan Johnson <nathan@nathanjohnson.info>
pkgname=libcouchbase
-pkgver=3.2.5
+pkgver=3.3.0
pkgrel=0
pkgdesc="C client library for Couchbase"
url="https://developer.couchbase.com/community"
@@ -74,7 +74,7 @@ utils() {
}
sha512sums="
-9dc1fda01a53c9b2261d7e2a84534aedefaad478c412421f282d2ae307cfa8fd509d32a8ddeaadd1c86b1f0a84c3c46af620659055d4f20cff6b5f8b68b9a447 libcouchbase-3.2.5.tar.gz
+c2e7b51a2a211776e729d1b97388b4bbd10711d651650489b142af7a5778a1b78170dcca20ec631651a5b2907e87a4b351091242dcf6573db9012b64d5b7375f libcouchbase-3.3.0.tar.gz
270123c57e6e760721ad337db154b8d90bddb81e38c644b854a36e2383fe95f3214227943e7040aa409d5d5ab101681369000054e4738c2a2d1facd0eee923e3 fix_libdir.patch
72319b86fdd91728723ccb091e72199788a84e2ec9ea12c0fcd1ed686eb155ec11e0addbff96735f83e7f31764a85650f0483b6e76d3a8bee16f71b2751fe4a9 fix_socktest.patch
"
diff --git a/community/libdsme/APKBUILD b/community/libdsme/APKBUILD
index 2dec13d22a..cc7df39d01 100644
--- a/community/libdsme/APKBUILD
+++ b/community/libdsme/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libdsme
-pkgver=0.66.6
-pkgrel=2
+pkgver=0.66.7
+pkgrel=0
pkgdesc="Libraries for programs that communicate with the Device State Management Entity"
arch="all"
url="https://github.com/sailfishos/libdsme"
@@ -32,5 +32,5 @@ package() {
rm -rf "$pkgdir"/opt
}
sha512sums="
-29fe4f3b9accc200392be8450c93825cbc1aaca9558a7419f51fe0d4bdc8f7b3f9c1b8c7da1cd3f9e66cced4a7c26dd25faed9b8b990755bd4f618035e1f01f2 libdsme-0.66.6.tar.gz
+c3fdd6b6206d980ba0c08c574aba19edb5a5d103a21630597dd4d900c046a08a1d3960b8c8b47e25b60997464451d51afae5449ddbc6784781f827c274538c08 libdsme-0.66.7.tar.gz
"
diff --git a/community/libe-book/APKBUILD b/community/libe-book/APKBUILD
index 0d31bac0a6..1da27d13e8 100644
--- a/community/libe-book/APKBUILD
+++ b/community/libe-book/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libe-book
pkgver=0.1.3
-pkgrel=14
+pkgrel=15
pkgdesc="Import filter and tools for various ebook formats"
url="https://sourceforge.net/projects/libebook/"
arch="all"
diff --git a/community/libetonyek/APKBUILD b/community/libetonyek/APKBUILD
index 789f6cbd84..240c253a01 100644
--- a/community/libetonyek/APKBUILD
+++ b/community/libetonyek/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libetonyek
pkgver=0.1.10
-pkgrel=0
+pkgrel=1
pkgdesc="Import filter and tools for Apple Keynote presentations"
url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
arch="all"
diff --git a/community/libixion/APKBUILD b/community/libixion/APKBUILD
index 0a1d311958..e671176605 100644
--- a/community/libixion/APKBUILD
+++ b/community/libixion/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libixion
pkgver=0.16.1
-pkgrel=2
+pkgrel=3
pkgdesc="A general purpose formula parser & interpreter"
url="https://gitlab.com/ixion/ixion"
arch="all"
diff --git a/community/libkleo/APKBUILD b/community/libkleo/APKBUILD
index 9509cbaf62..a922353af5 100644
--- a/community/libkleo/APKBUILD
+++ b/community/libkleo/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libkleo
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
pkgdesc="KDE PIM cryptographic library"
# armhf blocked by extra-cmake-modules
# s390x and riscv64 blocked by polkit -> kpimtextedit
diff --git a/community/libkml/APKBUILD b/community/libkml/APKBUILD
index f1406970d4..671c976a25 100644
--- a/community/libkml/APKBUILD
+++ b/community/libkml/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
pkgname=libkml
pkgver=1.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="Reference implementation of OGC KML 2.2"
url="https://github.com/libkml/libkml"
arch="all"
diff --git a/community/libktorrent/APKBUILD b/community/libktorrent/APKBUILD
index 27e7164d15..cc9513593b 100644
--- a/community/libktorrent/APKBUILD
+++ b/community/libktorrent/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libktorrent
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
# armhf blocked by extra-cmake-modules
# s390x and riscv64 blocked by polkit -> kio
arch="all !armhf !s390x !riscv64"
diff --git a/community/libmbim/APKBUILD b/community/libmbim/APKBUILD
index 7719703a89..56669e8cd9 100644
--- a/community/libmbim/APKBUILD
+++ b/community/libmbim/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=libmbim
-pkgver=1.26.2
+pkgver=1.26.4
pkgrel=0
pkgdesc="MBIM modem protocol helper library"
url="https://www.freedesktop.org/wiki/Software/libmbim/"
@@ -44,5 +44,5 @@ tools() {
}
sha512sums="
-7cce1fa6ff5630a1cc565a2198544de9f4a1db20b30304fac96de6c698eaf56b17fe6ccb089151623d4484d88fda6abe980bced19dfbf0d3ef425fc954fb5844 libmbim-1.26.2.tar.xz
+a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8 libmbim-1.26.4.tar.xz
"
diff --git a/community/libmspub/APKBUILD b/community/libmspub/APKBUILD
index 11a5342ca5..b63056d04a 100644
--- a/community/libmspub/APKBUILD
+++ b/community/libmspub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libmspub
pkgver=0.1.4
-pkgrel=12
+pkgrel=13
pkgdesc="Import filter and tools for MS Publisher files"
url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
arch="all"
diff --git a/community/libnymphcast/APKBUILD b/community/libnymphcast/APKBUILD
index be2b132b51..67f06125e8 100644
--- a/community/libnymphcast/APKBUILD
+++ b/community/libnymphcast/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libnymphcast
pkgver=0.1
-pkgrel=0
+pkgrel=1
arch="all"
url="https://github.com/MayaPosch/libnymphcast"
pkgdesc="NymphCast Client Library"
diff --git a/community/libodfgen/APKBUILD b/community/libodfgen/APKBUILD
index 1670f33da1..2c6063b302 100644
--- a/community/libodfgen/APKBUILD
+++ b/community/libodfgen/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libodfgen
pkgver=0.1.8
-pkgrel=1
+pkgrel=2
pkgdesc="Import filter and tools for Open Document Format"
url="https://sourceforge.net/projects/libwpd/"
arch="all"
diff --git a/community/liborcus/APKBUILD b/community/liborcus/APKBUILD
index 6da6294537..d7240fbd67 100644
--- a/community/liborcus/APKBUILD
+++ b/community/liborcus/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=liborcus
pkgver=0.16.1
-pkgrel=2
+pkgrel=3
pkgdesc="Library for processing spreadsheet documents"
url="https://gitlab.com/orcus/orcus"
arch="all"
diff --git a/community/libpagemaker/APKBUILD b/community/libpagemaker/APKBUILD
index 4758108d9c..9ff0e4e082 100644
--- a/community/libpagemaker/APKBUILD
+++ b/community/libpagemaker/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libpagemaker
pkgver=0.0.4
-pkgrel=3
+pkgrel=4
pkgdesc="Import filter and tools for PageMaker"
url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
arch="all"
diff --git a/community/libphonenumber/APKBUILD b/community/libphonenumber/APKBUILD
index 968ebae267..94db390205 100644
--- a/community/libphonenumber/APKBUILD
+++ b/community/libphonenumber/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libphonenumber
pkgver=8.12.44
-pkgrel=3
+pkgrel=4
pkgdesc="Library for parsing, formatting, and validating international phone numbers."
url="https://github.com/google/libphonenumber"
arch="all"
diff --git a/community/libqmi/APKBUILD b/community/libqmi/APKBUILD
index 3b24e355ce..24e083152a 100644
--- a/community/libqmi/APKBUILD
+++ b/community/libqmi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=libqmi
-pkgver=1.30.4
+pkgver=1.30.6
pkgrel=0
pkgdesc="QMI modem protocol helper library"
url="https://www.freedesktop.org/wiki/Software/libqmi"
@@ -46,5 +46,5 @@ utils() {
}
sha512sums="
-969c3e3fc8086c38e9192070eca155f5309947cdd1cfc9b883c27d80c6af2d069098a59e193bf1786260ab4fe4d05375555b5081dd173a88b33d84d409fa4a59 libqmi-1.30.4.tar.xz
+6dc9819bb45063ea827b989e99e8e889db0ce6ebec62586003ea385bd54bd76f3e79d63e3f2b57e19da5f42ed87d7aa11aa024a805ec86a6b203981eb7922a76 libqmi-1.30.6.tar.xz
"
diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index 525088cfc2..b4444e7f6e 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libreoffice
-pkgver=7.2.6.2
-pkgrel=2
+pkgver=7.2.7.2
+pkgrel=1
pkgdesc="LibreOffice - Meta package for the full office suite"
url="https://www.libreoffice.org/"
# missing openjdk11 on riscv64
@@ -155,6 +155,7 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-
skia-freetype2.11.diff
autoconf-boost-macros.patch
poppler-22.03.patch
+ poppler-22.04.patch
"
# secfixes:
@@ -516,9 +517,9 @@ sdk() {
}
sha512sums="
-2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242 libreoffice-7.2.6.2.tar.xz
-0025d2b59820f71a6d5a9dbaadc31f15735ecb4362479ab1a54f4a11b2cfedeb487d7f278d2fea1974b528f966fad38bca1c13999478021aa18ed842b28fdd07 libreoffice-dictionaries-7.2.6.2.tar.xz
-74653c0182b1abba60a920d35b48c997bb58b0fd2211fdd662d300709190f2e0e98328800399ca7521d7f6488b4f185a30da2d70754b5c9d0a1713e95b19085a libreoffice-translations-7.2.6.2.tar.xz
+b73efc86b6827ad3df6c6c562fe96c65f96b2559bda2c977ddcc02c7a59986acc776d1decac767abac41095a2e4475e9584a5a1b8d88f7327520b9af6d58421a libreoffice-7.2.7.2.tar.xz
+ce1c0f8a52568e3a0438a49b7786960b111b110c8ed6ca5ab38cc620c6cb3383e4a3556eb5b88340b9304dfa9c173510dca8c76e77d1e26fc8c62b0ec318251d libreoffice-dictionaries-7.2.7.2.tar.xz
+584f2829244228c2f0cb437d06a43a8b016ad5e495e762fe625178b51fbd84764bdc0e8722826fe0b670f41a44225a86af9e1251d54e2573df4cb958be22b953 libreoffice-translations-7.2.7.2.tar.xz
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -553,4 +554,5 @@ d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b
0bb43bd6999d66e0068b172e0b7d4af5ca953721f9959ba55b2d189de5bbcc407ff14139b8945ad4043d5398190b87bac3a8df8b19d8f2fc200c0ae9a2825ad0 skia-freetype2.11.diff
10e160c9e4d50e084dbb08b8fdb086b3a7d1344b0218157b9f789f26bc95b9f02ca317b82379fa74ef069aba7bd5b9204ebdf15adb0a168ccd9f1a7b170e136a autoconf-boost-macros.patch
54a09bcede209e54917d94e1b21807f686c61415a7b2b29ba37fce3b741087808b5ed31f348512a2bf4aa9a7104115c27ffe8a5db651d8db0190d10a18abd078 poppler-22.03.patch
+299b0ec05c6980d05629d2ccb357921b738a8d679d8129859129ee7059f8a85f2b5288533f51901444aa83107bd263ec36c79c24f325a300f02090e8814cf255 poppler-22.04.patch
"
diff --git a/community/libreoffice/poppler-22.04.patch b/community/libreoffice/poppler-22.04.patch
new file mode 100644
index 0000000000..6eb2f4c3c7
--- /dev/null
+++ b/community/libreoffice/poppler-22.04.patch
@@ -0,0 +1,71 @@
+Patch-Source: https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd
+
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2022-04-26 16:11:01 UTC
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* g
+ {
+ // TODO(P3): Unfortunately, need to read stream twice, since
+ // we must write byte count to stdout before
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( pBuf )
+ {
+ aNewFont.isEmbedded = true;
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ gfree(pBuf);
++#endif
+ }
+ }
+
+@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
+ return;
+
+ int nSize = 0;
+- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( !pBuf )
+ return;
+
+ // ---sync point--- see SYNC STREAMS above
+ fflush(stdout);
+-
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#else
++ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#endif
+ {
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ exit(1); // error
+ }
+ // ---sync point--- see SYNC STREAMS above
+ fflush(g_binary_out);
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ }
+
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
+ {
+ assert(state);
+
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ GfxFont *gfxFont = state->getFont();
++#else
++ GfxFont *gfxFont = state->getFont().get();
++#endif
+ if( !gfxFont )
+ return;
+
diff --git a/community/librevenge/APKBUILD b/community/librevenge/APKBUILD
index 89ea52c690..6733f7185f 100644
--- a/community/librevenge/APKBUILD
+++ b/community/librevenge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=librevenge
pkgver=0.0.4
-pkgrel=6
+pkgrel=7
pkgdesc="Base library for writing document import filters"
url="https://sourceforge.net/projects/libwpd/"
arch="all"
diff --git a/community/libsigc++3/APKBUILD b/community/libsigc++3/APKBUILD
index 93468a3234..ede2a7e009 100644
--- a/community/libsigc++3/APKBUILD
+++ b/community/libsigc++3/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=libsigc++3
pkgver=3.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Typesafe callback system for standard C++"
url="https://github.com/libsigcplusplus/libsigcplusplus"
arch="all"
diff --git a/community/libstaroffice/APKBUILD b/community/libstaroffice/APKBUILD
index 76c6c40530..b06dc961d2 100644
--- a/community/libstaroffice/APKBUILD
+++ b/community/libstaroffice/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libstaroffice
pkgver=0.0.7
-pkgrel=2
+pkgrel=3
pkgdesc="Import filter for StarOffice documents"
url="https://github.com/fosnola/libstaroffice"
arch="all"
diff --git a/community/libtorrent-rasterbar/APKBUILD b/community/libtorrent-rasterbar/APKBUILD
index 6b2ed6b3aa..1e8a82c32f 100644
--- a/community/libtorrent-rasterbar/APKBUILD
+++ b/community/libtorrent-rasterbar/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: psykose <alice@ayaya.dev>
pkgname=libtorrent-rasterbar
pkgver=2.0.6
-pkgrel=0
+pkgrel=1
pkgdesc="Feature complete C++ bittorrent implementation"
url="https://www.rasterbar.com/products/libtorrent"
arch="all"
diff --git a/community/libzmf/APKBUILD b/community/libzmf/APKBUILD
index 5b046503e0..52dd13b8b2 100644
--- a/community/libzmf/APKBUILD
+++ b/community/libzmf/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libzmf
pkgver=0.0.2
-pkgrel=10
+pkgrel=11
pkgdesc="Import filter and tools for Zoner Callisto/Draw documents"
url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
arch="all"
diff --git a/community/linux-tools/APKBUILD b/community/linux-tools/APKBUILD
index 2cc819144f..90fa0ac628 100644
--- a/community/linux-tools/APKBUILD
+++ b/community/linux-tools/APKBUILD
@@ -5,7 +5,7 @@
pkgname=linux-tools
pkgver=5.15.35
_kernver=${pkgver%.*}
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel tools meta package"
url="https://www.kernel.org/"
arch="all"
@@ -15,7 +15,8 @@ depends_dev="pciutils-dev readline-dev gettext-dev"
makedepends="$depends_dev elfutils-dev bash linux-headers flex bison diffutils
zlib-dev findutils python3 ncurses-dev
automake autoconf libtool libudev-zero-dev sysfsutils-dev glib-dev"
-subpackages="perf perf-bash-completion:bashcomp:noarch cpupower cpupower-openrc
+subpackages="perf perf-bash-completion:perf_bashcomp:noarch
+ cpupower cpupower-openrc cpupower-bash-completion:cpupower_bashcomp:noarch
$pkgname-gpio $pkgname-iio $pkgname-doc $pkgname-dev
$pkgname-tmon $pkgname-usbip $pkgname-usbip-openrc"
source="https://kernel.org/pub/linux/kernel/v5.x/linux-$_kernver.tar.xz
@@ -74,7 +75,9 @@ package() {
( cd tools/usb/usbip ;
make DESTDIR="$pkgdir" install; )
- mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
+ # perf completion is wrongly installed in /etc/bash_completion.d
+ mv "$pkgdir"/etc/bash_completion.d/* "$pkgdir"/usr/share/bash-completion/completions/
+ rmdir "$pkgdir"/etc/bash_completion.d
}
cpupower() {
@@ -95,6 +98,14 @@ cpupower() {
"$pkgdir"/etc/conf.d/$subpkgname
}
+cpupower_bashcomp() {
+ pkgdesc="Bash completion for cpupower"
+ install_if="cpupower=$pkgver-r$pkgrel bash-completion"
+ mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
+ mv "$pkgdir"/usr/share/bash-completion/completions/cpupower \
+ "$subpkgdir"/usr/share/bash-completion/completions/
+}
+
usbip() {
pkgdesc="utilities for USB device sharing over IP network"
replaces="usbip-utils"
@@ -118,8 +129,25 @@ perf() {
"$pkgdir"/usr/bin/trace \
"$subpkgdir"/usr/bin
mv "$pkgdir"/usr/lib/traceevent \
+ "$pkgdir"/usr/lib/perf \
"$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/libexec "$subpkgdir"/usr/
+
+ # /usr/share/perf-core is apprently not installed on all arches
+ if [ -e "$pkgdir"/usr/share/perf-core ]; then
+ mkdir -p "$subpkgdir"/usr/share
+ mv "$pkgdir"/usr/share/perf-core \
+ "$subpkgdir"/usr/share/
+ fi
+}
+
+perf_bashcomp() {
+ replaces="$pkgname-bash-completion" # Backward compatibility
+ pkgdesc="Bash completion for perf"
+ install_if="perf=$pkgver-r$pkgrel bash-completion"
+ mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
+ mv "$pkgdir"/usr/share/bash-completion/completions/perf \
+ "$subpkgdir"/usr/share/bash-completion/completions/
}
gpio() {
diff --git a/main/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/community/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
index 3fdf2264e9..3fdf2264e9 100644
--- a/main/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+++ b/community/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
diff --git a/main/llvm11/APKBUILD b/community/llvm11/APKBUILD
index ec23b0fc5e..ec23b0fc5e 100644
--- a/main/llvm11/APKBUILD
+++ b/community/llvm11/APKBUILD
diff --git a/main/llvm11/fix-LLVMConfig-cmake-install-prefix.patch b/community/llvm11/fix-LLVMConfig-cmake-install-prefix.patch
index 4516ebe0ee..4516ebe0ee 100644
--- a/main/llvm11/fix-LLVMConfig-cmake-install-prefix.patch
+++ b/community/llvm11/fix-LLVMConfig-cmake-install-prefix.patch
diff --git a/main/llvm11/fix-memory-mf_exec-on-aarch64.patch b/community/llvm11/fix-memory-mf_exec-on-aarch64.patch
index c4166ed9a8..c4166ed9a8 100644
--- a/main/llvm11/fix-memory-mf_exec-on-aarch64.patch
+++ b/community/llvm11/fix-memory-mf_exec-on-aarch64.patch
diff --git a/main/llvm11/gcc11.patch b/community/llvm11/gcc11.patch
index 0e6647b67c..0e6647b67c 100644
--- a/main/llvm11/gcc11.patch
+++ b/community/llvm11/gcc11.patch
diff --git a/community/logstalgia/APKBUILD b/community/logstalgia/APKBUILD
index 3999ba37a2..c30310b881 100644
--- a/community/logstalgia/APKBUILD
+++ b/community/logstalgia/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=logstalgia
pkgver=1.1.2
-pkgrel=5
+pkgrel=6
pkgdesc="A website access log visualisation tool"
url="https://logstalgia.io/"
arch="all"
diff --git a/community/lucene++/APKBUILD b/community/lucene++/APKBUILD
index 1756988c6a..c8eb19c68f 100644
--- a/community/lucene++/APKBUILD
+++ b/community/lucene++/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lucene++
pkgver=3.0.8
-pkgrel=5
+pkgrel=6
pkgdesc="C++ port of the popular Java Lucene library"
url="https://github.com/luceneplusplus/LucenePlusPlus"
arch="all"
diff --git a/community/lxd/APKBUILD b/community/lxd/APKBUILD
index 1c5111a3e8..d0625a34cb 100644
--- a/community/lxd/APKBUILD
+++ b/community/lxd/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Leonardo Arena <larena@alpinelinux.org>
pkgname=lxd
pkgver=4.0.9 # only LTS releases
-pkgrel=2
+pkgrel=3
pkgdesc="A container hypervisor and a new user experience for LXC - 'LTS' release channel"
url="https://linuxcontainers.org/lxd/"
arch="all"
diff --git a/community/matterbridge/APKBUILD b/community/matterbridge/APKBUILD
index c9e1fdaeda..9ebdc9d674 100644
--- a/community/matterbridge/APKBUILD
+++ b/community/matterbridge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
pkgname=matterbridge
pkgver=1.25.1
-pkgrel=0
+pkgrel=1
_commit=051e6e76 # git rev-parse --short HEAD
pkgdesc="Bridges between a growing number of chat protocols"
url="https://github.com/42wim/matterbridge"
diff --git a/community/mdds/APKBUILD b/community/mdds/APKBUILD
index 5c9a4af50c..18a804ec2e 100644
--- a/community/mdds/APKBUILD
+++ b/community/mdds/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=mdds
pkgver=1.7.0
-pkgrel=1
+pkgrel=2
pkgdesc="Multi-dimensional data index algorithm"
url="https://gitlab.com/mdds/mdds"
arch="noarch"
diff --git a/community/meek/APKBUILD b/community/meek/APKBUILD
index c6ead459a6..a96d99b1ff 100644
--- a/community/meek/APKBUILD
+++ b/community/meek/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: kpcyrd <git@rxv.cc>
pkgname=meek
pkgver=0.37.0
-pkgrel=4
+pkgrel=5
pkgdesc="A pluggable transport proxy written in Go"
url="https://trac.torproject.org/projects/tor/wiki/doc/meek"
arch="all !riscv64" # fails to build on riscv64
diff --git a/community/micro/APKBUILD b/community/micro/APKBUILD
index 6212579f8e..ea5301b29b 100644
--- a/community/micro/APKBUILD
+++ b/community/micro/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Justin Berthault <justin.berthault@zaclys.net>
pkgname=micro
pkgver=2.0.10
-pkgrel=6
+pkgrel=7
# This will need to be updated along with version as it cannot currently be
# obtained from the tarball, and is necessary if the user is to make error
# reports upsteam.
diff --git a/community/miniflux/APKBUILD b/community/miniflux/APKBUILD
index 0204caf61c..3e47bebe8b 100644
--- a/community/miniflux/APKBUILD
+++ b/community/miniflux/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Frédéric Guillot <fred@miniflux.net>
pkgname=miniflux
pkgver=2.0.36
-pkgrel=2
+pkgrel=3
pkgdesc="Minimalist and opionated feed reader"
url="https://miniflux.app/"
arch="all"
diff --git a/community/minify/APKBUILD b/community/minify/APKBUILD
index 9191b8f1ac..9e8779fc2d 100644
--- a/community/minify/APKBUILD
+++ b/community/minify/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Wesley van Tilburg <justwesley@protonmail.com>
pkgname=minify
pkgver=2.11.2
-pkgrel=1
+pkgrel=2
pkgdesc="Minifier CLI for HTML, CSS, JS, JSON, SVG and XML"
url="https://github.com/tdewolff/minify"
arch="all"
diff --git a/community/mkvtoolnix/APKBUILD b/community/mkvtoolnix/APKBUILD
index b8c5c4c5a1..5fd221b9ce 100644
--- a/community/mkvtoolnix/APKBUILD
+++ b/community/mkvtoolnix/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=mkvtoolnix
pkgver=67.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="Set of tools to create, edit and inspect Matroska files"
url="https://mkvtoolnix.download/index.html"
# armhf blocked by qtmultimedia -> qtdeclarative
diff --git a/community/mnc/APKBUILD b/community/mnc/APKBUILD
index 66b7b19e74..be4602ea73 100644
--- a/community/mnc/APKBUILD
+++ b/community/mnc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=mnc
pkgver=0.4
-pkgrel=3
+pkgrel=4
arch="all"
url="https://git.sr.ht/~anjan/mnc"
pkgdesc="get the time in seconds to next cron job"
diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD
index 6d40dec095..b6d49cd726 100644
--- a/community/modemmanager/APKBUILD
+++ b/community/modemmanager/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=modemmanager
-pkgver=1.18.6
-pkgrel=1
+pkgver=1.18.8
+pkgrel=0
pkgdesc="ModemManager library"
url="http://www.freedesktop.org/wiki/Software/ModemManager"
arch="all !s390x !riscv64" # limited by polkit
@@ -80,7 +80,7 @@ libmm() {
}
sha512sums="
-9b6bd1fd4e4bc3055db655acd2651359dc0f8db4d9ad6235abc24cb02be2dcf0eb78a64b97e48b1110e5cfbe1cf6394e808024264917eab8b439f8b3dec184e6 ModemManager-1.18.6.tar.gz
+287cb50ee46826410c1cfdab9789cd25bc46ef47dab923fe709858f866364039e26cb6e5d42c9e424f8db9eb0de7b5086b5aff41a112173d9871410bfda2f58f ModemManager-1.18.8.tar.gz
6fab86c27502b29be0c6610d835a3249a4a81993eb986cff2c3ea9393fadd3f693ba4bb0532ae0e50a83d359559511859dd05f7ea2f0cb52839f535a7e49f8a0 modemmanager.rules
9f74a2473b9cc7be42a467809639f5720ab251d13f29f8bbd4fd9a13edb80c10c5ee50fbe50819bfe67f231805b92f007c3e7403c46ab998dc843e1f9549659b modemmanager.initd
"
diff --git a/community/monero/APKBUILD b/community/monero/APKBUILD
index 28e0d35dc2..36dd95917b 100644
--- a/community/monero/APKBUILD
+++ b/community/monero/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=monero
pkgver=0.17.3.0
-pkgrel=1
+pkgrel=2
_ver_randomx=1.1.10
_ver_supercop=633500ad8c8759995049ccd022107d1fa8a1bbc9
pkgdesc="Secure, private, untraceable cryptocurrency"
diff --git a/community/mongodb-tools/APKBUILD b/community/mongodb-tools/APKBUILD
index d59841c763..93a0b7af83 100644
--- a/community/mongodb-tools/APKBUILD
+++ b/community/mongodb-tools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Mikael Jenkler <mikael@jenkler.com>
pkgname=mongodb-tools
pkgver=4.2.14
-pkgrel=6
+pkgrel=7
pkgdesc="The MongoDB tools provide import, export, and diagnostic capabilities."
url="https://github.com/mongodb/mongo-tools"
arch="all !s390x !riscv64" # rv64 hangs
diff --git a/community/mopidy/APKBUILD b/community/mopidy/APKBUILD
index 3679d8428a..ebe88df934 100644
--- a/community/mopidy/APKBUILD
+++ b/community/mopidy/APKBUILD
@@ -4,11 +4,11 @@
# Contributor: Galen Abell <galen@galenabell.com>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=mopidy
-pkgver=3.2.0
-pkgrel=5
+pkgver=3.3.0
+pkgrel=0
pkgdesc="Mopidy is an extensible music server"
url="https://www.mopidy.com/"
-arch="all"
+arch="noarch"
license="Apache-2.0"
depends="
gst-plugins-base
@@ -87,7 +87,7 @@ package() {
}
sha512sums="
-cbca5c2f6784754c06f9f6fd80aa0379b606ed4a52f31dfa27c165869cf65171b6203f683ee1150319ab51feae45dadaaa338e22d26af3511cdf56e8f3d81145 mopidy-v3.2.0.tar.gz
+9cad7d5013defb9f7edee17b48120286a0b3be568eba15c60fc5363f8ee2ab9041dd79574b2ce1a14a941f41f53101f588e0d0283ee01b82499bc6ffe001cee2 mopidy-v3.3.0.tar.gz
eb66e8e826640a939b1ba51569ab7fab041b8b5e8823ea2d5f05596faf1de8882fd8c1c32bdb92534e759243fb5ff741bda0d2ebb3282af542d1287c8c68b5ea mopidy.conf
0c438058500ab7559baae21b03b10e2b80b10c77776b240b2100da1f4c84ea8efe24dc7a38a95034e75605eaf5d21604d13e5b8c7358778c555ddb6372a49388 logging.conf
8492ac223c32e4a0bb0ae64348ed0a5928cc98c0ce713eff5948b12e09860f83a9de5377117f85fd9ad54643201aadd84f68494e773aa8c1bba97fa992bd9dbe mopidy.initd
diff --git a/community/mpd/APKBUILD b/community/mpd/APKBUILD
index 9c12575f81..bf04c66bc7 100644
--- a/community/mpd/APKBUILD
+++ b/community/mpd/APKBUILD
@@ -4,12 +4,12 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=mpd
-pkgver=0.23.6
+pkgver=0.23.7
case $pkgver in
*.*.*) _branch=${pkgver%.*};;
*.*) _branch=$pkgver;;
esac
-pkgrel=3
+pkgrel=1
pkgdesc="Music daemon that plays MP3, FLAC, Ogg Vorbis files and Audio CDs"
url="https://musicpd.org/"
pkgusers="mpd"
@@ -120,7 +120,7 @@ package() {
}
sha512sums="
-1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d mpd-0.23.6.tar.xz
+2a6b3eb2c8b61a22861ae75fe2f62c8ec6cd391f029438577127e309b910e99d7b735e40afae96d52ed4f161195a0ce7cb89cc51ad45df5a18e04736c16ce3a6 mpd-0.23.7.tar.xz
f60f6f3e921d20732c1a4c31a97f28660b43fd649e767d6c39661b6a90145231a79ad3f740ae0d706380b245ad040e98b661a513463c54cea161d1f64fc261e0 stacksize.patch
8547f685adf3cdc7b2aab7bedeed8c72242011c6f1e01750415ac21eba5ecf6b416239f527adbc904f72439c5d476249148cfb89965e33de1be69421e02c18e0 mpd.initd
41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7 mpd.confd
diff --git a/community/mpdscribble/APKBUILD b/community/mpdscribble/APKBUILD
index efa6fb47a4..f707d66969 100644
--- a/community/mpdscribble/APKBUILD
+++ b/community/mpdscribble/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=mpdscribble
pkgver=0.24
-pkgrel=0
+pkgrel=1
pkgdesc="last.fm client for mpd"
options="!check" # No test target
url="https://github.com/MusicPlayerDaemon/mpdscribble"
diff --git a/community/mqttui/APKBUILD b/community/mqttui/APKBUILD
new file mode 100644
index 0000000000..4f6128be23
--- /dev/null
+++ b/community/mqttui/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: guddaff <guddaff@protonmail.com>
+# Maintainer: guddaff <guddaff@protonmail.com>
+pkgname=mqttui
+pkgver=0.16.2
+pkgrel=2
+pkgdesc="Subscribe to a MQTT Topic or publish something quickly from the terminal"
+url="https://github.com/EdJoPaTo/mqttui"
+# ppc64le: blocked by ring
+# riscv64, s390x: blocked by cargo/rust
+arch="all !ppc64le !riscv64 !s390x"
+license="GPL-3.0-or-later"
+makedepends="cargo"
+subpackages="
+ $pkgname-bash-completion
+ $pkgname-fish-completion
+ $pkgname-zsh-completion
+ "
+source="https://github.com/EdJoPaTo/mqttui/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+
+export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
+export CARGO_PROFILE_RELEASE_LTO="true"
+export CARGO_PROFILE_RELEASE_OPT_LEVEL="s"
+export CARGO_PROFILE_RELEASE_PANIC="abort"
+
+prepare() {
+ default_prepare
+
+ cargo fetch --locked
+}
+
+build() {
+ cargo build --release --frozen
+}
+
+check() {
+ cargo test --frozen
+}
+
+package() {
+ cargo install --locked --path . --root="$pkgdir/usr"
+ rm "$pkgdir"/usr/.crates*
+
+ install -Dm644 "target/completions/$pkgname.bash" "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+ install -Dm644 "target/completions/$pkgname.fish" -t "$pkgdir"/usr/share/fish/completions/
+ install -Dm644 "target/completions/_$pkgname" -t "$pkgdir"/usr/share/zsh/site-functions/
+}
+
+sha512sums="
+9fddfd538cc8a802bab6073d79e230c34cb9f8c22a14597d80f2dd272d627297b14959f0a459ceb70ac7cfe4622cec47db7aed0ef6329b377b51a9d72da93a39 mqttui-0.16.2.tar.gz
+"
diff --git a/community/msgpack-cxx/APKBUILD b/community/msgpack-cxx/APKBUILD
index 8c2ab5456e..9e95a67d86 100644
--- a/community/msgpack-cxx/APKBUILD
+++ b/community/msgpack-cxx/APKBUILD
@@ -3,7 +3,7 @@
pkgname=msgpack-cxx
# When bumping, rebuild all aports with msgpack-cxx-dev in makedepends.
pkgver=4.1.1
-pkgrel=0
+pkgrel=1
pkgdesc="An efficient object serialization library for C++"
url="https://msgpack.org"
arch="all"
diff --git a/community/mtxclient/APKBUILD b/community/mtxclient/APKBUILD
index 0605b229a9..db20dde84b 100644
--- a/community/mtxclient/APKBUILD
+++ b/community/mtxclient/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=mtxclient
pkgver=0.7.0
-pkgrel=0
+pkgrel=1
pkgdesc="Client API library for Matrix, built on top of Boost.Asio"
url="https://github.com/nheko-reborn/mtxclient"
arch="all"
diff --git a/community/mumble/APKBUILD b/community/mumble/APKBUILD
index b506638bc9..5074874a3a 100644
--- a/community/mumble/APKBUILD
+++ b/community/mumble/APKBUILD
@@ -4,7 +4,7 @@
pkgname=mumble
pkgver=1.4.230
_libver=1.4.0
-pkgrel=2
+pkgrel=4
pkgdesc="Low-latency, high quality voice chat software"
url="https://wiki.mumble.info/"
arch="all"
@@ -45,6 +45,7 @@ source="https://github.com/mumble-voip/mumble/releases/download/v$pkgver/mumble-
libgen.patch
no-rnnoise.patch
musl-1.2.3.patch
+ Find-and-link-Poco-XML.patch
"
builddir="$srcdir/$pkgname-$pkgver.src"
@@ -162,4 +163,5 @@ sha512sums="
2dac9e8e321c7a9837a0e4e2b368c39ffa525012316063e02ae5286c215967e88007a4d89590c251e11020e3d50f8f08eb050a3a02526f758d128b7b061580d2 libgen.patch
7b82a4333e49253e0a6048741a710bace18ebbf156565365b843888d7f3e02cc9e43c411e2e9a914109f14db2b45f1db0a393cbd8399ec9ccf27d60419e551ff no-rnnoise.patch
2cc0a17a31bf9a436ea97447f958b7a93e96b0fcd020e5389ccfc413b6498b5176294d2b9c788a68cdfac47dabca8e6e28699f5ad184dcde4d30feb88d2e99b3 musl-1.2.3.patch
+04de486f19f2893f55f1ab14531b2a13f12e40f07ba3feec92fe0d86190c6da91cb96691f17ead15927764409e73ccba7aa54328e9e6e5dd9bcc3784b727c562 Find-and-link-Poco-XML.patch
"
diff --git a/community/mumble/Find-and-link-Poco-XML.patch b/community/mumble/Find-and-link-Poco-XML.patch
new file mode 100644
index 0000000000..f2cdb2fae3
--- /dev/null
+++ b/community/mumble/Find-and-link-Poco-XML.patch
@@ -0,0 +1,40 @@
+From 5e0962474cbed1dbfea34afd8eeb6cd71dc518d3 Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Tue, 5 Apr 2022 18:49:13 -0500
+Subject: [PATCH] BUILD(cmake): Find and link Poco::XML
+
+Without this, building against the latest poco snapshot results in
+errors like:
+
+/usr/bin/ld: /builddir/build/BUILD/mumble-1.4.230.src/src/mumble/PluginManifest.cpp:72: undefined reference to `typeinfo for Poco::XML::Element'
+
+(cherry picked from commit fefdd79ebcd53a3035967789d004938ee39e2030)
+
+# Conflicts:
+# src/mumble/CMakeLists.txt
+---
+ src/mumble/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
+index 4530dc7531..be37fd6742 100644
+--- a/src/mumble/CMakeLists.txt
++++ b/src/mumble/CMakeLists.txt
+@@ -384,11 +384,16 @@ target_include_directories(mumble
+ "${PLUGINS_DIR}"
+ )
+
+-find_pkg(Poco COMPONENTS Zip)
++find_pkg(Poco
++ COMPONENTS
++ XML
++ Zip
++)
+
+ if(TARGET Poco::Zip)
+ target_link_libraries(mumble
+ PRIVATE
++ Poco::XML
+ Poco::Zip
+ )
+ else()
diff --git a/community/mupen64plus/APKBUILD b/community/mupen64plus/APKBUILD
index 0dc9b74c41..78ac9a1dc3 100644
--- a/community/mupen64plus/APKBUILD
+++ b/community/mupen64plus/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alex McGrath <amk@amk.ie>
pkgname=mupen64plus
pkgver=2.5
-pkgrel=1
+pkgrel=2
pkgdesc="Mupen64Plus is a cross-platform plugin-based N64 emulator."
url="https://mupen64plus.org/"
# build fails or is not officially supported for this release for all but x86_64
diff --git a/community/mycorrhiza/APKBUILD b/community/mycorrhiza/APKBUILD
index 00f25c8a8d..320930c7c0 100644
--- a/community/mycorrhiza/APKBUILD
+++ b/community/mycorrhiza/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Umar Getagazov <umar@handlerug.me>
pkgname=mycorrhiza
pkgver=1.9.0
-pkgrel=1
+pkgrel=2
pkgdesc="Lightweight wiki engine based on Git"
url="https://mycorrhiza.wiki/"
arch="all"
diff --git a/community/mygui/APKBUILD b/community/mygui/APKBUILD
index 94598ce5ee..6c2902449e 100644
--- a/community/mygui/APKBUILD
+++ b/community/mygui/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=mygui
pkgver=3.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="A multilayer and overlappable GUI System"
# Note: only tested on the following archs, may work on others too but not
# adding them until this has been confirmed
diff --git a/community/namecoin/APKBUILD b/community/namecoin/APKBUILD
index 0239ab7ce4..10c68bab5d 100644
--- a/community/namecoin/APKBUILD
+++ b/community/namecoin/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=namecoin
pkgver=22.0
-pkgrel=0
+pkgrel=1
pkgdesc="Namecoin is a peer to peer DNS based on bitcoin"
url="https://www.namecoin.org/"
#x86: Test failures
diff --git a/community/ncmpcpp/APKBUILD b/community/ncmpcpp/APKBUILD
index 8021207d08..47238efa15 100644
--- a/community/ncmpcpp/APKBUILD
+++ b/community/ncmpcpp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Matthieu Monnier <matthieu.monnier@enalean.com>
pkgname=ncmpcpp
pkgver=0.9.2
-pkgrel=6
+pkgrel=7
pkgdesc="Ncurses based MPD client inspired by ncmpc"
url="http://rybczak.net/ncmpcpp"
arch="all"
diff --git a/community/nebula/APKBUILD b/community/nebula/APKBUILD
index 0051f221c1..584bed798e 100644
--- a/community/nebula/APKBUILD
+++ b/community/nebula/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=nebula
pkgver=1.5.2
-pkgrel=3
+pkgrel=4
pkgdesc="Scalable overlay networking tool with a focus on performance, simplicity and security"
url="https://github.com/slackhq/nebula"
license="MIT"
diff --git a/community/net-cpp/APKBUILD b/community/net-cpp/APKBUILD
index e6135346cf..927e5e8cef 100644
--- a/community/net-cpp/APKBUILD
+++ b/community/net-cpp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=net-cpp
pkgver=3.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="A simple yet beautiful networking API for C++11"
url="https://gitlab.com/ubports/core/lib-cpp/net-cpp"
arch="all"
diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD
index 820646e179..88601213c6 100644
--- a/community/networkmanager/APKBUILD
+++ b/community/networkmanager/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=networkmanager
-pkgver=1.34.0
-pkgrel=4
+pkgver=1.38.0
+pkgrel=0
pkgdesc="Network Management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
# s390x and riscv64 blocked by polkit
@@ -275,7 +275,7 @@ _default_plugin() {
}
sha512sums="
-f00a75abc26c4a85e23565f9ce103a8a0675b0820df439e06749057202cf01823273ffd0b1d80afa31d7b50cf2cbdce041d781e2dd70c49ee68946b45c2b0ac9 NetworkManager-1.34.0.tar.xz
+0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940 NetworkManager-1.38.0.tar.xz
7056d53372bc15f7a87dbc864dc8c3e0be5e283aeb94e957b2056d9f8298b6426965cbda04b3eaafde633411bcf1dbc862e6837d6fac42c3ed4bd5cc3cef908a wwan-no-libsystemd.patch
0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf
5ac6d11b588c479de9c7e1fef79ed0a2c04dc159a2173636a6a77a2867c839cc1609860756109e9e794f23a02238a6d94834d8fb6fcb81a6be3ef1dbf4a34e6f networkmanager.initd
diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 094a74f8c3..4f83c532d7 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=nextcloud
-pkgver=23.0.3
+pkgver=24.0.0
pkgrel=0
-_replaced_ver=22
+_replaced_ver=23
pkgdesc="A safe home for all your data"
url="https://nextcloud.com/"
arch="noarch"
@@ -246,7 +246,7 @@ _package_app() {
}
sha512sums="
-406e9c0615447ffa9f77104e067d1d6b73262d78388e531ebcd8de3a759260a26bf08461997a8513ce910b8de81775d6ccad65a26f38e159014aebf6a555aa23 nextcloud-23.0.3.tar.bz2
+1a284fb862536a65a9e9ae623a01d94a8116f8b0664861b7fcdce7fc815c50822bc4e7c7dc221698cf72dea294f45026d54d7030448d4e9fa425eb20e39fe072 nextcloud-24.0.0.tar.bz2
aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch
aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch
diff --git a/community/nextcloud22/APKBUILD b/community/nextcloud23/APKBUILD
index 34fc6531a4..6969bac7d9 100644
--- a/community/nextcloud22/APKBUILD
+++ b/community/nextcloud23/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=nextcloud22
+pkgname=nextcloud23
_pkgname=nextcloud
-pkgver=22.2.6
+pkgver=23.0.4
pkgrel=0
-_replaced_ver=21
-pkgdesc="Transitional package to allow upgrade to version 23"
+_replaced_ver=22
+pkgdesc="Transitional package to allow upgrade to version 24"
url="https://nextcloud.com/"
arch="noarch"
license="AGPL-3.0-only"
@@ -247,16 +247,16 @@ _package_app() {
}
sha512sums="
-e221026b08096c7a99043a37300a33f0396f475b121406e4d2c6fe295b4bd3d8d21ecf0c2b5a352b0ca5a66fdb6f882a945ed8ecb2cc5b3c54ad27681d78b3bf nextcloud-22.2.6.tar.bz2
+f43acf7c9df6e3105d9085bf9b4c95eebca83812980b933cd57920dec5684c34fe47e8f5395aa7eed806c75f13049790a30b2f8abce8738f9e8a55b24280871f nextcloud-23.0.4.tar.bz2
aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch
aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch
df1a16414a278c205876ec86c210a02a9009954e2d4f9033ff3c9b76c371e2764ef3587db5a4b8f76302655c6c8688c8729d1685279a77d279d3839cc359fbcd use-external-docs-if-local-not-avail.patch
-5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1 nextcloud22-config.php
-7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud22.logrotate
-dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud22.confd
-cf129b405601cc6ac09b2e976bb1e2673e41d4e15e0e21466767b7a1481476825fa327b0e515f454b3c9ae67ca245fd8762885ff9a4df800189de53ae88b7cc2 nextcloud22.cron
-b9ad5434c384c96608f00d65c45f782e279c6756da8fb706f62ecaf7b7aa420077cb6989da5e85becc47418884ec0672e7db874174454ca679fdca84a50f537f nextcloud22-mysql.cnf
+5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1 nextcloud23-config.php
+7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud23.logrotate
+dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud23.confd
+cf129b405601cc6ac09b2e976bb1e2673e41d4e15e0e21466767b7a1481476825fa327b0e515f454b3c9ae67ca245fd8762885ff9a4df800189de53ae88b7cc2 nextcloud23.cron
+b9ad5434c384c96608f00d65c45f782e279c6756da8fb706f62ecaf7b7aa420077cb6989da5e85becc47418884ec0672e7db874174454ca679fdca84a50f537f nextcloud23-mysql.cnf
78ef204ee7c12b228c0b7b04333514e561c1c8e19153f5507224fa4fdd112aaaa6331747014f3b72181298f52ecd4223bcff4bd963b49b49153265254b07e79b fpm-pool.conf
36724da58515b7117e2b927c44fc2f3ed37f3fc1b56d062868fadb2251b9fcc21f48af6fc6726414f61c32812c49e6bd851f12328664c9e5c435f7237369046a occ
"
diff --git a/community/nextcloud22/disable-integrity-check-as-default.patch b/community/nextcloud23/disable-integrity-check-as-default.patch
index 54ea7a51e0..54ea7a51e0 100644
--- a/community/nextcloud22/disable-integrity-check-as-default.patch
+++ b/community/nextcloud23/disable-integrity-check-as-default.patch
diff --git a/community/nextcloud22/dont-update-htaccess.patch b/community/nextcloud23/dont-update-htaccess.patch
index aecaebc715..aecaebc715 100644
--- a/community/nextcloud22/dont-update-htaccess.patch
+++ b/community/nextcloud23/dont-update-htaccess.patch
diff --git a/community/nextcloud22/fpm-pool.conf b/community/nextcloud23/fpm-pool.conf
index cae9acce21..cae9acce21 100644
--- a/community/nextcloud22/fpm-pool.conf
+++ b/community/nextcloud23/fpm-pool.conf
diff --git a/community/nextcloud22/nextcloud-dont-chmod.patch b/community/nextcloud23/nextcloud-dont-chmod.patch
index 214550871d..214550871d 100644
--- a/community/nextcloud22/nextcloud-dont-chmod.patch
+++ b/community/nextcloud23/nextcloud-dont-chmod.patch
diff --git a/community/nextcloud22/nextcloud22-config.php b/community/nextcloud23/nextcloud23-config.php
index 035fb790ec..035fb790ec 100644
--- a/community/nextcloud22/nextcloud22-config.php
+++ b/community/nextcloud23/nextcloud23-config.php
diff --git a/community/nextcloud22/nextcloud22-initscript.post-install b/community/nextcloud23/nextcloud23-initscript.post-install
index e16e94472f..e16e94472f 100644
--- a/community/nextcloud22/nextcloud22-initscript.post-install
+++ b/community/nextcloud23/nextcloud23-initscript.post-install
diff --git a/community/nextcloud22/nextcloud22-mysql.cnf b/community/nextcloud23/nextcloud23-mysql.cnf
index ff90630b68..ff90630b68 100644
--- a/community/nextcloud22/nextcloud22-mysql.cnf
+++ b/community/nextcloud23/nextcloud23-mysql.cnf
diff --git a/community/nextcloud22/nextcloud22.confd b/community/nextcloud23/nextcloud23.confd
index b24f26d7f1..b24f26d7f1 100644
--- a/community/nextcloud22/nextcloud22.confd
+++ b/community/nextcloud23/nextcloud23.confd
diff --git a/community/nextcloud22/nextcloud22.cron b/community/nextcloud23/nextcloud23.cron
index 7c69a23173..7c69a23173 100644
--- a/community/nextcloud22/nextcloud22.cron
+++ b/community/nextcloud23/nextcloud23.cron
diff --git a/community/nextcloud22/nextcloud22.logrotate b/community/nextcloud23/nextcloud23.logrotate
index 19e17fdf4d..19e17fdf4d 100644
--- a/community/nextcloud22/nextcloud22.logrotate
+++ b/community/nextcloud23/nextcloud23.logrotate
diff --git a/community/nextcloud22/nextcloud22.post-upgrade b/community/nextcloud23/nextcloud23.post-upgrade
index 898b0ea547..898b0ea547 100644
--- a/community/nextcloud22/nextcloud22.post-upgrade
+++ b/community/nextcloud23/nextcloud23.post-upgrade
diff --git a/community/nextcloud22/nextcloud22.pre-install b/community/nextcloud23/nextcloud23.pre-install
index e9cf53919c..e9cf53919c 100644
--- a/community/nextcloud22/nextcloud22.pre-install
+++ b/community/nextcloud23/nextcloud23.pre-install
diff --git a/community/nextcloud22/nextcloud22.pre-upgrade b/community/nextcloud23/nextcloud23.pre-upgrade
index f444e78f49..f444e78f49 100644
--- a/community/nextcloud22/nextcloud22.pre-upgrade
+++ b/community/nextcloud23/nextcloud23.pre-upgrade
diff --git a/community/nextcloud22/occ b/community/nextcloud23/occ
index fbb3afa633..fbb3afa633 100644
--- a/community/nextcloud22/occ
+++ b/community/nextcloud23/occ
diff --git a/community/nextcloud22/use-external-docs-if-local-not-avail.patch b/community/nextcloud23/use-external-docs-if-local-not-avail.patch
index 62b60117a8..62b60117a8 100644
--- a/community/nextcloud22/use-external-docs-if-local-not-avail.patch
+++ b/community/nextcloud23/use-external-docs-if-local-not-avail.patch
diff --git a/community/nfpm/APKBUILD b/community/nfpm/APKBUILD
index 210b0efa73..a7fa1eba0f 100644
--- a/community/nfpm/APKBUILD
+++ b/community/nfpm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=nfpm
pkgver=2.15.1
-pkgrel=1
+pkgrel=2
pkgdesc="a simple apk, Deb and RPM packager without external dependencies"
url="https://nfpm.goreleaser.com/"
arch="all !riscv64"
diff --git a/community/nheko/APKBUILD b/community/nheko/APKBUILD
index 195ec44517..4a58dcf160 100644
--- a/community/nheko/APKBUILD
+++ b/community/nheko/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=nheko
pkgver=0.9.3
-pkgrel=0
+pkgrel=1
pkgdesc="Qt5-based client for Matrix protocol"
url="https://github.com/Nheko-Reborn/nheko/releases"
# armhf blocked by qt5-qtmultimedia
diff --git a/community/nomad/APKBUILD b/community/nomad/APKBUILD
index 1fcfc2cb2e..318b9ef720 100644
--- a/community/nomad/APKBUILD
+++ b/community/nomad/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Matthias Neugebauer <mtneug@mailbox.org>
pkgname=nomad
pkgver=1.2.6 # remember to update GIT_COMMIT below
-pkgrel=0
+pkgrel=1
pkgdesc="easy-to-use, flexible, and performant workload orchestrator"
url="https://www.nomadproject.io/"
arch="all !riscv64 !x86"
diff --git a/community/numix-icon-theme-circle/APKBUILD b/community/numix-icon-theme-circle/APKBUILD
index 9273eadd6c..33138ceac5 100644
--- a/community/numix-icon-theme-circle/APKBUILD
+++ b/community/numix-icon-theme-circle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=numix-icon-theme-circle
-pkgver=22.03.01
+pkgver=22.04.06
pkgrel=0
pkgdesc="Official icon theme from the Numix project"
url="https://github.com/numixproject/numix-icon-theme-circle"
@@ -25,5 +25,5 @@ light() {
}
sha512sums="
-162d8d5c3cf4d15a8b6b84337cfe8b9e42c1fc56c68716ba218f3717fbfc13a0deaee0f90dfd72cc4003c4cc6e8b4a29204d1c67ca5204f84c1e038fc7364cb4 numix-icon-theme-circle-22.03.01.tar.gz
+33c82be025426a44fa7aa7401030f98b79921675923cadfdfb2f6af0b0949dfa6dbac83ea675d8faa0fce01cc6497c0fd1dadca4243958527195b5b57ee211b9 numix-icon-theme-circle-22.04.06.tar.gz
"
diff --git a/testing/nut/APKBUILD b/community/nut/APKBUILD
index 427913b6f4..c408966fbe 100644
--- a/testing/nut/APKBUILD
+++ b/community/nut/APKBUILD
@@ -2,22 +2,21 @@
# Contributor: Kozak Ivan <kozak-iv@yandex.ru>
# Maintainer: Kozak Ivan <kozak-iv@yandex.ru>
pkgname=nut
-pkgver=2.7.4
-pkgrel=10
+pkgver=2.8.0
+pkgrel=0
pkgdesc="Network UPS tools"
url="https://networkupstools.org/"
arch="all"
license="GPL-2.0-or-later"
depends="hidapi eudev udev-init-scripts-openrc"
# openssl1.1-compat-dev because of net-snmp
-depends_dev="openssl1.1-compat-dev libusb-compat-dev net-snmp-dev neon-dev nss-dev"
+depends_dev="openssl1.1-compat-dev libusb-dev net-snmp-dev neon-dev nss-dev"
makedepends="$depends_dev libtool autoconf automake"
pkgusers=$pkgname
pkggroups=$pkgname
install="$pkgname.pre-install"
subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion $pkgname-openrc"
-source="https://networkupstools.org/source/2.7/nut-$pkgver.tar.gz
- openssl-1.1.patch
+source="https://networkupstools.org/source/${pkgver%.*}/nut-$pkgver.tar.gz
upsd.initd
upsmon.initd
"
@@ -81,8 +80,7 @@ package() {
}
sha512sums="
-320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a nut-2.7.4.tar.gz
-2b6f5df0c7084a0e86474b36d4c567b995c76e2f8fda788a7dffa6d8ecd6b41698ca8376ac228cdbfd805e3406611e7f003e4492d98c74658ed785d7320ab866 openssl-1.1.patch
+3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 nut-2.8.0.tar.gz
5fce1247815e36a0e787f28dfec215077a42b046f6ce35a5ad3cf94479dfc26303d3cf4d5f760d5851ed5273ee398572c36cd354af0645cbebc1f1560414e222 upsd.initd
32470ae473fc363131787cd57f13d40763898947d56d032790ba7f3a5eaa8038b602f7e395ca44f6c5adce8ee5ec496e30ca0eaadb3c78a38015677aea751e12 upsmon.initd
"
diff --git a/testing/nut/nut.pre-install b/community/nut/nut.pre-install
index 6d67c81a67..6d67c81a67 100644
--- a/testing/nut/nut.pre-install
+++ b/community/nut/nut.pre-install
diff --git a/testing/nut/upsd.initd b/community/nut/upsd.initd
index e9b7a22fce..e9b7a22fce 100644
--- a/testing/nut/upsd.initd
+++ b/community/nut/upsd.initd
diff --git a/testing/nut/upsmon.initd b/community/nut/upsmon.initd
index 4a7efe8ba4..4a7efe8ba4 100644
--- a/testing/nut/upsmon.initd
+++ b/community/nut/upsmon.initd
diff --git a/community/nvui/APKBUILD b/community/nvui/APKBUILD
index d1eedd4602..2f8a048546 100644
--- a/community/nvui/APKBUILD
+++ b/community/nvui/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nvui
pkgver=0.2.1
-pkgrel=4
+pkgrel=5
pkgdesc="A modern frontend for Neovim"
url="https://github.com/rohit-px2/nvui"
arch="all !riscv64" # blocked by neovim
diff --git a/community/nymphrpc/APKBUILD b/community/nymphrpc/APKBUILD
index 5c123fc90d..27e7905f65 100644
--- a/community/nymphrpc/APKBUILD
+++ b/community/nymphrpc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=nymphrpc
pkgver=0.1
-pkgrel=0
+pkgrel=1
arch="all"
url="https://github.com/MayaPosch/NymphRPC"
pkgdesc="Versatile and fast remote procedure call library"
diff --git a/community/olm/APKBUILD b/community/olm/APKBUILD
index e224019d86..60edd231b3 100644
--- a/community/olm/APKBUILD
+++ b/community/olm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=olm
-pkgver=3.2.10
+pkgver=3.2.11
pkgrel=0
pkgdesc="Implementation of the olm and megolm cryptographic ratchets"
arch="all"
@@ -9,9 +9,10 @@ url="https://gitlab.matrix.org/matrix-org/olm"
license="Apache-2.0"
makedepends="
cmake
- python3-dev
py3-cffi
py3-setuptools
+ python3-dev
+ samurai
"
checkdepends="
py3-pytest
@@ -24,8 +25,8 @@ source="https://gitlab.matrix.org/matrix-org/olm/-/archive/$pkgver/olm-$pkgver.t
subpackages="$pkgname-dev py3-olm:py3"
build() {
- cmake -B build \
- -DCMAKE_BUILD_TYPE=None \
+ cmake -B build -G Ninja \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
cmake --build build
@@ -62,5 +63,5 @@ py3() {
DESTDIR="$subpkgdir" make -C "$builddir"/python install-python3
}
sha512sums="
-e4b4e1a4b5afbf537780db21a7639609581f9be7f52d8bec572db38e9e2bae43138c1214aa23a87fb5c66f3ce47f566950c9689b27426ea894afa444fc3829c7 olm-3.2.10.tar.gz
+dfb44880ee3fc510d9a599a8571feec2395e9048036556b4591448096fc031534151c677aea4106f712a37e886b565de6109db96ed6c8bd302a3ee7caf88ae50 olm-3.2.11.tar.gz
"
diff --git a/community/omxplayer/APKBUILD b/community/omxplayer/APKBUILD
index fe74bf71e0..346d3d43ef 100644
--- a/community/omxplayer/APKBUILD
+++ b/community/omxplayer/APKBUILD
@@ -2,7 +2,7 @@
pkgname=omxplayer
pkgver=0.20190102
_commitid=f06235cc9690a6d58187514452df8cf8fcdaacec
-pkgrel=3
+pkgrel=4
pkgdesc="Commandline OMX player for Raspberry Pi"
url="https://github.com/popcornmix/omxplayer"
arch="armhf armv7"
diff --git a/community/openexr/APKBUILD b/community/openexr/APKBUILD
index 0e46c4faac..8e15bda9f0 100644
--- a/community/openexr/APKBUILD
+++ b/community/openexr/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Mark Riedesel <mark+alpine@klowner.com>
pkgname=openexr
pkgver=3.1.5
-pkgrel=0
+pkgrel=1
pkgdesc="A high dynamic-range image file format library"
url="https://www.openexr.com/"
arch="all"
diff --git a/community/openimageio/APKBUILD b/community/openimageio/APKBUILD
index 842336fb1b..9f78d0b6d1 100644
--- a/community/openimageio/APKBUILD
+++ b/community/openimageio/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=openimageio
pkgver=2.3.15.0
-pkgrel=0
+pkgrel=1
pkgdesc="Image I/O library supporting a multitude of image formats"
options="!check" # more than 10% of all tests fail
url="https://sites.google.com/site/openimageio/"
diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD
index a20dc2aebe..86c04b9837 100644
--- a/community/openjdk11/APKBUILD
+++ b/community/openjdk11/APKBUILD
@@ -3,7 +3,7 @@
pkgname=openjdk11
pkgver=11.0.15_p10
_pkgver=${pkgver%_p*}-ga
-pkgrel=0
+pkgrel=1
pkgdesc="Oracle OpenJDK 11"
provider_priority=11
url="https://github.com/openjdk/jdk11u"
@@ -36,7 +36,7 @@ makedepends="autoconf
libxtst-dev
linux-headers
zlib-dev"
-depends="$pkgname-jmods $pkgname-demos $pkgname-doc $pkgname-jdk" # for the virtual openjdk11 package
+depends="$pkgname-jdk $pkgname-demos $pkgname-doc" # for the virtual openjdk11 package
subpackages="$pkgname-jmods:_jmods:noarch
$pkgname-demos:_demos:noarch
$pkgname-doc:_doc:noarch
@@ -366,9 +366,15 @@ _jre_headless() {
mkdir -p "$_toroot"
mv "$_fromroot/lib" "$_toroot"
+ # ct.sym should stay in -jdk
+ mkdir "$_fromroot/lib"
+ mv "$_toroot/lib/ct.sym" "$_fromroot/lib"
+
mkdir -p "$_toroot/bin"
for i in java \
+ jfr \
jjs \
+ jrunscript \
keytool \
pack200 \
rmid \
@@ -377,6 +383,11 @@ _jre_headless() {
mv "$_fromroot/bin/$i" "$_toroot/bin/$i"
done
+ # jaotc only available on x86_64
+ if [ "$CARCH" = "x86_64" ]; then
+ mv "$_fromroot/bin/jaotc" "$_toroot/bin/jaotc"
+ fi
+
mv "$_fromroot/legal" "$_toroot"
mv "$_fromroot/conf" "$_toroot"
mv "$_fromroot/release" "$_toroot"
@@ -395,13 +406,14 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 11 (JDK)"
- depends="$pkgname-jre"
+ depends="$pkgname-jre $pkgname-jmods"
provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
mkdir -p "$_toroot"
mv "$_fromroot/bin" "$_toroot"
+ mv "$_fromroot/lib" "$_toroot"
mv "$_fromroot/include" "$_toroot"
}
diff --git a/community/openjdk17/APKBUILD b/community/openjdk17/APKBUILD
index 63500fba04..6c3108be11 100644
--- a/community/openjdk17/APKBUILD
+++ b/community/openjdk17/APKBUILD
@@ -3,7 +3,7 @@
pkgname=openjdk17
pkgver=17.0.3_p7
_pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
pkgdesc="Oracle OpenJDK 17"
provider_priority=17
url="https://github.com/openjdk/jdk17u"
@@ -34,7 +34,7 @@ makedepends="autoconf
libxtst-dev
linux-headers
zlib-dev"
-depends="$pkgname-jmods $pkgname-demos $pkgname-doc $pkgname-jdk" # for the virtual openjdk16 package
+depends="$pkgname-jdk $pkgname-demos $pkgname-doc" # for the virtual openjdk16 package
subpackages="$pkgname-jmods:_jmods:noarch
$pkgname-demos:_demos:noarch
$pkgname-doc:_doc:noarch
@@ -275,10 +275,14 @@ _jre_headless() {
mkdir -p "$_toroot"
mv "$_fromroot/lib" "$_toroot"
+ # ct.sym should stay in -jdk
+ mkdir "$_fromroot/lib"
+ mv "$_toroot/lib/ct.sym" "$_fromroot/lib"
+
mkdir -p "$_toroot/bin"
for i in java \
jfr \
- jpackage \
+ jrunscript \
keytool \
rmiregistry; do
mv "$_fromroot/bin/$i" "$_toroot/bin/$i"
@@ -302,13 +306,14 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 17 (JDK)"
- depends="$pkgname-jre"
+ depends="$pkgname-jre $pkgname-jmods"
provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
mkdir -p "$_toroot"
mv "$_fromroot/bin" "$_toroot"
+ mv "$_fromroot/lib" "$_toroot"
mv "$_fromroot/include" "$_toroot"
}
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 277d45b507..92045b14e5 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -2,10 +2,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=openjdk8
-_icedteaver=3.21.0
+_icedteaver=3.22.0
# pkgver is <JDK version>.<JDK update>.<JDK build>
# Check https://icedtea.classpath.org/wiki/Main_Page when updating!
-pkgver=8.312.07
+pkgver=8.322.06
pkgrel=0
pkgdesc="OpenJDK 8 provided by IcedTea"
provider_priority=8
@@ -84,14 +84,7 @@ _dropsver=$_icedteaver
_dropsurl="https://icedtea.classpath.org/download/drops/icedtea8/$_dropsver"
source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.xz
- openjdk-$_dropsver.tar.xz::$_dropsurl/openjdk.tar.xz
- corba-$_dropsver.tar.xz::$_dropsurl/corba.tar.xz
- jaxp-$_dropsver.tar.xz::$_dropsurl/jaxp.tar.xz
- jaxws-$_dropsver.tar.xz::$_dropsurl/jaxws.tar.xz
- jdk-$_dropsver.tar.xz::$_dropsurl/jdk.tar.xz
- langtools-$_dropsver.tar.xz::$_dropsurl/langtools.tar.xz
- hotspot-$_dropsver.tar.xz::$_dropsurl/hotspot.tar.xz
- nashorn-$_dropsver.tar.xz::$_dropsurl/nashorn.tar.xz
+ openjdk-$_dropsver.tar.xz::$_dropsurl/openjdk-git.tar.xz
icedtea-hotspot-musl.patch
icedtea-hotspot-musl-ppc.patch
@@ -113,6 +106,20 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x
builddir="$srcdir/icedtea-$_icedteaver"
# secfixes:
+# 8.322.06-r0:
+# - CVE-2022-21248
+# - CVE-2022-21283
+# - CVE-2022-21293
+# - CVE-2022-21294
+# - CVE-2022-21282
+# - CVE-2022-21296
+# - CVE-2022-21299
+# - CVE-2022-21305
+# - CVE-2022-21340
+# - CVE-2022-21341
+# - CVE-2022-21349
+# - CVE-2022-21360
+# - CVE-2022-21365
# 8.312.07-r0:
# - CVE-2021-35550
# - CVE-2021-35556
@@ -285,13 +292,6 @@ build() {
--with-parallel-jobs=${JOBS:-2} \
--with-hotspot-build=default \
--with-openjdk-src-zip="$srcdir/openjdk-$_dropsver.tar.xz" \
- --with-hotspot-src-zip="$srcdir/hotspot-$_dropsver.tar.xz" \
- --with-corba-src-zip="$srcdir/corba-$_dropsver.tar.xz" \
- --with-jaxp-src-zip="$srcdir/jaxp-$_dropsver.tar.xz" \
- --with-jaxws-src-zip="$srcdir/jaxws-$_dropsver.tar.xz" \
- --with-jdk-src-zip="$srcdir/jdk-$_dropsver.tar.xz" \
- --with-langtools-src-zip="$srcdir/langtools-$_dropsver.tar.xz" \
- --with-nashorn-src-zip="$srcdir/nashorn-$_dropsver.tar.xz" \
--with-jdk-home="$_bootstrap_java_home" \
--with-pkgversion="Alpine $pkgver-r$pkgrel" \
--with-curves="nist+" \
@@ -405,15 +405,8 @@ demos() {
}
sha512sums="
-874f91f3c3311d7017efb91aaff4e2fb660f55c58a626bcf5b120b7158df15e9b94abda7cd28f9620ad76c50bfa89cc8c1d251c193404c0db51ff1430167b018 icedtea-3.21.0.tar.xz
-6a1706dfcb5e5d79191c01db6da30ca0ca48cea628a26a3a35f6e43c710091e25c97ec95122e8bc19b4ac69ede27a8dae37b49e1a7e4db07a635ded69e2e0336 openjdk-3.21.0.tar.xz
-55110b92c6eddeb29eab97cbe644d8cc171a489b9fa806c81e4af88a1e5e3e6776fb97371715782935222944464f68e7d6783c46bd0d0de5659123f46c577a7a corba-3.21.0.tar.xz
-ff14c9b63cee2a7b9213872b8710b1c5b901ccaf4122c8ddf5d8437d1cdd35cf9af50f461d05f004b74802ba8a21c7e9f288ec080b2b5f7daad065d40dc39258 jaxp-3.21.0.tar.xz
-e21bd36b6cfa92f648856532647150243f2184943dc6f5003fea02cf69aa9b6a94fb18d6478db28d5ee5e3af9b780122c0539fd3207cf4dfcb69a042835c13d6 jaxws-3.21.0.tar.xz
-06385f14d093be250aa530d0659576d75aed57b0264ec7329d6b2c9309cf4ed660a9ecbfb6f199868ae23aedfbdb97036fccda501c00e9d2e3b1562c92b0ed37 jdk-3.21.0.tar.xz
-949366138278104fc06452d8227bbe5d0829a9124503928cab34e5e9df37e25d25964a5c755e46d9ca74e63f1b318b2e3366f8f08e144524a8043bc2a7ca626e langtools-3.21.0.tar.xz
-678f6c53db5858ba828e063eeeddb727dbeb0586ff26a4287f9735dc01ad00ddcd9f41fa65343b81d5f5c512a944f47a447d4bdc929ca26ba78a68a7e3dfc1cd hotspot-3.21.0.tar.xz
-eda17f94ed2f34dd5bc4670dd3340d50de956723213948fd15963b0a589433bbe2e0ba8be7761974754b6a5d875ef58c31839daa6fef7215af552842f787bb44 nashorn-3.21.0.tar.xz
+dc5825dbf2cab3967bcfd9635724428b7e8c0859d05587a1b8d648cc509066489f6518998f923c2ec8a4d6b30556ef5fda534dfab69bde9e0f046f970d8b4dfa icedtea-3.22.0.tar.xz
+f1fb1d67a25d54c906804fea5edbdc4a6af89c94c54972526a6869a8f2dd84fcf1c2caeba13ea3fdfe89690a0fa5441fa8e1ecf07966e37ecfeec81718ac96e1 openjdk-3.22.0.tar.xz
28709285390a997adbd56ebda42ef718fbc08daf572b8568f484436d255514f9d25f033e3333dff8aa352fc9846057ac5bb42fa955d3e5e44eddc96dc273c07c icedtea-hotspot-musl.patch
86e77c1e5e8a48f121e608dce5eafad7a714e4029b55dbd554c2c94633b49a4239f71a40a41273b54d62fcdcfdee21340c8b85f96001cf15b719b02a520e8d9a icedtea-hotspot-musl-ppc.patch
19459dbb922f5a71cd15b53199481498626a783c24f91d2544d55b7dddd2cdb34a64bbf0226b99548612dd1743af01b3f9ff32c30abbbc90ce727ca2dbbbd1f9 icedtea-hotspot-noagent-musl.patch
diff --git a/community/openmw/APKBUILD b/community/openmw/APKBUILD
index f880eabe58..1d4d042720 100644
--- a/community/openmw/APKBUILD
+++ b/community/openmw/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=openmw
pkgver=0.47.0
-pkgrel=1
+pkgrel=2
pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind"
# Note: only tested on the following archs, may work on others too but not
# adding them until this has been confirmed
diff --git a/community/openring/APKBUILD b/community/openring/APKBUILD
index 503cb385a5..61642dc2f5 100644
--- a/community/openring/APKBUILD
+++ b/community/openring/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=openring
pkgver=1.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="a webring for static site generators"
url="https://sr.ht/~sircmpwn/openring/"
arch="all"
diff --git a/community/openscenegraph/APKBUILD b/community/openscenegraph/APKBUILD
index 9e0e4cb363..b8afd5b493 100644
--- a/community/openscenegraph/APKBUILD
+++ b/community/openscenegraph/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=openscenegraph
pkgver=3.6.5
-pkgrel=6
+pkgrel=7
pkgdesc="High performance 3D graphics toolkit"
url="http://www.openscenegraph.org/"
arch="all"
diff --git a/community/opensmtpd-filter-rspamd/APKBUILD b/community/opensmtpd-filter-rspamd/APKBUILD
index 2ce0735e0c..690be41110 100644
--- a/community/opensmtpd-filter-rspamd/APKBUILD
+++ b/community/opensmtpd-filter-rspamd/APKBUILD
@@ -3,7 +3,7 @@
pkgname=opensmtpd-filter-rspamd
_pkgname=filter-rspamd
pkgver=0.1.7
-pkgrel=5
+pkgrel=6
pkgdesc="OpenSMTPD filter integration for Rspamd"
url="https://github.com/poolpOrg/filter-rspamd"
license="ISC"
diff --git a/community/opensmtpd-filter-senderscore/APKBUILD b/community/opensmtpd-filter-senderscore/APKBUILD
index e0b9aa1fb8..bcddf169b1 100644
--- a/community/opensmtpd-filter-senderscore/APKBUILD
+++ b/community/opensmtpd-filter-senderscore/APKBUILD
@@ -3,7 +3,7 @@
pkgname=opensmtpd-filter-senderscore
_pkgname=filter-senderscore
pkgver=0.1.1
-pkgrel=6
+pkgrel=7
pkgdesc="OpenSMTPD senderscore filter"
url="https://github.com/poolpOrg/filter-senderscore"
license="ISC"
diff --git a/community/openvdb/APKBUILD b/community/openvdb/APKBUILD
index e23278bf45..c5096ff1e5 100644
--- a/community/openvdb/APKBUILD
+++ b/community/openvdb/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=openvdb
pkgver=9.0.0
-pkgrel=4
+pkgrel=5
pkgdesc="Sparse volume data structure and tools"
url="https://www.openvdb.org/"
arch="aarch64 x86_64" # tests fail on all other arches
diff --git a/community/osl/APKBUILD b/community/osl/APKBUILD
index b2c5e05af4..cc2a6cd6af 100644
--- a/community/osl/APKBUILD
+++ b/community/osl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=osl
pkgver=1.11.17.0
-pkgrel=2
+pkgrel=3
pkgdesc="Advanced shading language for production GI renderers"
options="!check" # All tests fail
url="https://opensource.imageworks.com/osl.html"
diff --git a/community/packer/APKBUILD b/community/packer/APKBUILD
index 33c51a53a9..5fe386b49d 100644
--- a/community/packer/APKBUILD
+++ b/community/packer/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Galen Abell <galen@galenabell.com>
pkgname=packer
pkgver=1.8.0
-pkgrel=2
+pkgrel=3
pkgdesc="tool for creating machine images for multiple platforms"
url="https://www.packer.io/"
license="MPL-2.0"
diff --git a/community/pamixer/APKBUILD b/community/pamixer/APKBUILD
index 845e518b3b..30a81f562e 100644
--- a/community/pamixer/APKBUILD
+++ b/community/pamixer/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alex McGrath <amk@amk.ie>
pkgname=pamixer
pkgver=1.5
-pkgrel=1
+pkgrel=2
pkgdesc="pulseaudio command line mixer"
url="https://github.com/cdemoulins/pamixer"
arch="all"
diff --git a/community/pdal/APKBUILD b/community/pdal/APKBUILD
index bc6197932a..89af4a92c0 100644
--- a/community/pdal/APKBUILD
+++ b/community/pdal/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bradley J Chambers <brad.chambers@gmail.com>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=pdal
-pkgver=2.3.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
pkgdesc="PDAL is a C++ BSD library for translating and manipulating point cloud data."
url="https://pdal.io/"
arch="all"
@@ -93,5 +93,5 @@ package() {
}
sha512sums="
-9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05 PDAL-2.3.0-src.tar.gz
+655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623 PDAL-2.4.0-src.tar.gz
"
diff --git a/community/pdns-recursor/APKBUILD b/community/pdns-recursor/APKBUILD
index 8d371a3685..c0c1bf2920 100644
--- a/community/pdns-recursor/APKBUILD
+++ b/community/pdns-recursor/APKBUILD
@@ -2,7 +2,7 @@
_pkgname=pdns-recursor # upstream package name
pkgname=pdns-recursor
pkgver=4.6.2
-pkgrel=0
+pkgrel=1
pkgdesc="PowerDNS Recursive Server"
url="https://www.powerdns.com/"
arch="all !s390x" # broken context
diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD
index e65e0210c4..51ebb52eda 100644
--- a/community/pdns/APKBUILD
+++ b/community/pdns/APKBUILD
@@ -7,7 +7,7 @@
# Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com>
pkgname=pdns
pkgver=4.6.2
-pkgrel=0
+pkgrel=1
pkgdesc="PowerDNS Authoritative Server"
url="https://www.powerdns.com/"
# s390x blocked by failing testsuite
diff --git a/community/pebble/APKBUILD b/community/pebble/APKBUILD
index 0f6329ef47..e0956fa6f6 100644
--- a/community/pebble/APKBUILD
+++ b/community/pebble/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=pebble
pkgver=2.3.1
-pkgrel=4
+pkgrel=5
pkgdesc="small RFC 8555 ACME test server not for a production certificate authority"
url="https://github.com/letsencrypt/pebble"
# riscv64 blocked by syscall dependency
diff --git a/community/perl-datetime-format-natural/APKBUILD b/community/perl-datetime-format-natural/APKBUILD
index a179b527cf..a2f4fe553f 100644
--- a/community/perl-datetime-format-natural/APKBUILD
+++ b/community/perl-datetime-format-natural/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=perl-datetime-format-natural
_pkgreal=DateTime-Format-Natural
-pkgver=1.12
+pkgver=1.13
pkgrel=0
pkgdesc="Create machine readable date/time with natural parsing logic"
url="https://metacpan.org/release/DateTime-Format-Natural"
@@ -34,4 +34,6 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="c2685815e76d7208d2491a01bc93e0c15657325fc1e9b33b85f123085814b9d4554a25b575241605a6c819f1627486b093bf08eeb25bb55531e15a15ddf158c8 DateTime-Format-Natural-1.12.tar.gz"
+sha512sums="
+1fb1862232ba32558c573b17a1d167b13c49eb3e118c9a068baf303e627d79f5dc448dbd7d4b402a8de88b9d987c5b798176b5aacdbef3d4a96c5ce33d3aff32 DateTime-Format-Natural-1.13.tar.gz
+"
diff --git a/community/perl-par-packer/APKBUILD b/community/perl-par-packer/APKBUILD
index 18bda974e4..d880ee727c 100644
--- a/community/perl-par-packer/APKBUILD
+++ b/community/perl-par-packer/APKBUILD
@@ -4,8 +4,8 @@
pkgname=perl-par-packer
#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
_pkgreal=PAR-Packer
-pkgver=1.052
-pkgrel=3
+pkgver=1.054
+pkgrel=0
pkgdesc="App::Packer::Backend interface, for generating stand-alone executables, perl scripts and PAR files"
url="https://metacpan.org/release/PAR-Packer/"
arch="all"
@@ -34,4 +34,6 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="5acd1efcb2bf6ebfca46e88f840cd8575f601443037fbf627f4a03b88119628a66ae522cd8de2488f0a143e6320c94e8b47f45db0ecffa61593715c848ebd379 PAR-Packer-1.052.tar.gz"
+sha512sums="
+ead965ad9cfa650deb8390b1d9294a61f4d656f269ea4b1a31315a1c5a268185fa5969e7703a2a436dc2627a433632cdeb42f2fb20998dac07bcc1eeeb38c4aa PAR-Packer-1.054.tar.gz
+"
diff --git a/community/php8-pecl-couchbase/APKBUILD b/community/php8-pecl-couchbase/APKBUILD
index 37523306e2..972a4f4474 100644
--- a/community/php8-pecl-couchbase/APKBUILD
+++ b/community/php8-pecl-couchbase/APKBUILD
@@ -2,15 +2,18 @@
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
pkgname=php8-pecl-couchbase
_extname=couchbase
-pkgver=3.2.2
+pkgver=4.0.0
pkgrel=0
pkgdesc="PHP 8.0 extension for Couchbase - PECL"
url="https://pecl.php.net/package/couchbase"
arch="all"
license="Apache-2.0"
depends="php8-pecl-igbinary"
-makedepends="php8-dev libcouchbase-dev chrpath"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
+makedepends="php8-dev openssl-dev linux-headers chrpath cmake ccache"
+source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
+ cmake-build-type.patch
+ cmake-fix-cache.patch
+ "
builddir="$srcdir/$_extname-$pkgver"
build() {
@@ -27,6 +30,7 @@ check() {
package() {
make INSTALL_ROOT="$pkgdir" install
chrpath -d "$pkgdir"/usr/lib/php8/modules/$_extname.so
+ chrpath -d "$pkgdir"/usr/lib/php8/modules/libcouchbase_php_core.so
local _confdir="$pkgdir"/etc/php8/conf.d
mkdir -p $_confdir
@@ -34,5 +38,7 @@ package() {
}
sha512sums="
-eb91d6620179c38f17310953b710e13aee3845614a55ef43e0704dcb104c1d2ea3923a0a0fe965a35c2378b8782a58f0dc973c43372a1539dcf21a6b537e4cb5 php-pecl-couchbase-3.2.2.tgz
+5a2571c18f4d0fd46239eed10b77271260352bda38ad5695db65dc7a47f14bab00cfa4a98c646544f7e2865939ae5f981edbc6f63216a0ee537a5a9666198f1e php-pecl-couchbase-4.0.0.tgz
+e61589d1a17968a4980e41a79351d5fa26dc6ecfca8430f87304bd309e1d738eb026b0206694069acce6cf8992a3701f9d0ebe372050a178087c5bee04166e13 cmake-build-type.patch
+56c0ea44a55aa5622adbd3e5de435c30696897474f102a62882a54bbb75b8bbf3e9b055766fc8db68623bc7e2561e9b180bbd7de3b8e4cf8aad0853dce3f7b3a cmake-fix-cache.patch
"
diff --git a/community/php8-pecl-couchbase/cmake-build-type.patch b/community/php8-pecl-couchbase/cmake-build-type.patch
new file mode 100644
index 0000000000..fbc63b2952
--- /dev/null
+++ b/community/php8-pecl-couchbase/cmake-build-type.patch
@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -50,7 +50,7 @@
+ COUCHBASE_PHP_LIBDIR : ${phplibdir}
+ "
+ ${CMAKE} -S ${COUCHBASE_CMAKE_SOURCE_DIRECTORY} -B${COUCHBASE_CMAKE_BUILD_DIRECTORY} \
+- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
++ -DCMAKE_BUILD_TYPE=MinSizeRel \
+ -DCMAKE_C_COMPILER="${CC}" \
+ -DCMAKE_CXX_COMPILER="${CXX}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}" \
diff --git a/community/php8-pecl-couchbase/cmake-fix-cache.patch b/community/php8-pecl-couchbase/cmake-fix-cache.patch
new file mode 100644
index 0000000000..da05e0671b
--- /dev/null
+++ b/community/php8-pecl-couchbase/cmake-fix-cache.patch
@@ -0,0 +1,11 @@
+--- a/src/deps/couchbase-cxx-transactions/CMakeLists.txt
++++ b/src/deps/couchbase-cxx-transactions/CMakeLists.txt
+@@ -80,7 +80,7 @@
+ if (APPLE AND NOT DEFINED OPENSSL_ROOT_DIR)
+ # look in typical brew location - missed by the openssl finder
+ message(STATUS "no OPENSSL_ROOT_DIR specified, using MacOS, so defaulting to homebrew location")
+- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1", CACHE INTERNAL "")
++ set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1" CACHE INTERNAL "")
+ endif()
+ message(STATUS "APPLE: '${APPLE}', SSL: '${OPENSSL_ROOT_DIR}'")
+ find_package(OpenSSL REQUIRED)
diff --git a/community/php8/APKBUILD b/community/php8/APKBUILD
index 84cb779496..f17ef61f10 100644
--- a/community/php8/APKBUILD
+++ b/community/php8/APKBUILD
@@ -25,8 +25,8 @@
pkgname=php8
_pkgreal=php
-pkgver=8.0.18
-pkgrel=1
+pkgver=8.0.19
+pkgrel=0
_apiver=20200930
_suffix=${pkgname#php}
# Is this package the default (latest) PHP version?
@@ -101,7 +101,7 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz
fix-tests-devserver.patch
xfail-openssl-1.1-test.patch
atomic-lsapi.patch
- content-encoding.patch
+ fix-curl-7.83-test.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -619,7 +619,7 @@ _mv() {
}
sha512sums="
-fda43f5bcb2aba7c2777331b41d2d8bb35c0b8508feef1a2fbff15105acfd7a41e0a4f1f9111e5cf1091e5df04ac4c737ec939c5bd5d85535b3b3ebb0450bc21 php-8.0.18.tar.xz
+106aa7c9f4804b8ce3518d7e6da4dc8f2a4df2f0b5d7369776737e0b13d4cd6be375694b78271fd1d007d4e0892009dc2a7214c1652462ebf128b74f845787e8 php-8.0.19.tar.xz
8a9a63cddfd9bdde23db85a7be0711e14688bab35b580abd0184d370c54de80b72cbdeb369570cd23927154984f024eaad5d222d53d9e19130fb2e8758dd4540 php8-fpm.initd
cd3a96d3febde3b6657ed80ff58945641443e84e5e0fd3d9df29e640e9549bc452a3412f1999fa02ae1ee2b64c08040998fa75805f67e0252741c376e26e1c3c php8-fpm.logrotate
95f536addfbb28fbca8b14da46d95a3595369d6e98d345f55f0fda1b12bdefd1579a27505424e7d1088a987d330798253cec9bd42b544bb567189cba746217c7 php8-module.conf
@@ -631,5 +631,5 @@ f634ac591576dff87487d239578420364edb56e977535c4a5ab799d360a799179edf1e7e6a4e6b6e
1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
996b9a542858b0385a300265194afc57eddb72b9d7e4dcdf63b4f1ba7d3588e67309030acc73f00af1717168becd50b1d3582fcb88605e9892fd683a33cae023 xfail-openssl-1.1-test.patch
465b38c089d938a4a072b2eff3edaf928455bf873f5eeb65ff3bee9614f5f45c70f285abb50809c2e2d9d259395acae38bd649860ca3b8d65e43447082a51552 atomic-lsapi.patch
-c703c56d8b0de2da15fa23212c31a5058fdad283a1fb7a31c9755ccdde3555d21c28c78a6f68286a28f5afa590719a8ea4bf61937ae311ec1b0145c1ed33639b content-encoding.patch
+be6a57063414bd255def54d5f6e42cbdc3baec55c8eaf9c8ca6e96d0cb3fec942ebb1868806850859d34c5c45d03a2abfec3fecd1aef04524da8eda01d9041ed fix-curl-7.83-test.patch
"
diff --git a/community/php8/content-encoding.patch b/community/php8/content-encoding.patch
deleted file mode 100644
index 313985faf3..0000000000
--- a/community/php8/content-encoding.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 792012885d1926ffc96bed3280e7e9560a54a9ad Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 12 Apr 2022 17:18:00 +0200
-Subject: [PATCH] Fix GH-8218: ob_end_clean does not reset Content-Encoding
- header
-
-Patch-source: https://github.com/php/php-src/pull/8353
-
-The fix for GH-7953 introduced a regression by being to deliberate
-adding the respective headers. These must only be added, if the
-handler starts, but is not finalizing.
----
- ext/iconv/iconv.c | 2 +-
- ext/zlib/zlib.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
-index 7a66c965e3cb..f23aa90f52db 100644
---- a/ext/iconv/iconv.c
-+++ b/ext/iconv/iconv.c
-@@ -311,7 +311,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c
- mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;
- }
-
-- if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START))) {
-+ if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL)))) {
- size_t len;
- char *p = strstr(get_output_encoding(), "//");
-
-diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
-index f7cf0d5dac76..774a31e18cd4 100644
---- a/ext/zlib/zlib.c
-+++ b/ext/zlib/zlib.c
-@@ -281,7 +281,7 @@ static int php_zlib_output_handler(void **handler_context, php_output_context *o
- return FAILURE;
- }
-
-- if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START)) {
-+ if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL))) {
- int flags;
-
- if (SUCCESS == php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags)) {
diff --git a/testing/php81/fix-curl-7.83-test.patch b/community/php8/fix-curl-7.83-test.patch
index b087acfb28..b087acfb28 100644
--- a/testing/php81/fix-curl-7.83-test.patch
+++ b/community/php8/fix-curl-7.83-test.patch
diff --git a/testing/php81-brotli/APKBUILD b/community/php81-brotli/APKBUILD
index 85693760c6..85693760c6 100644
--- a/testing/php81-brotli/APKBUILD
+++ b/community/php81-brotli/APKBUILD
diff --git a/testing/php81-pecl-amqp/APKBUILD b/community/php81-pecl-amqp/APKBUILD
index cb95ed3fe9..cb95ed3fe9 100644
--- a/testing/php81-pecl-amqp/APKBUILD
+++ b/community/php81-pecl-amqp/APKBUILD
diff --git a/testing/php81-pecl-apcu/APKBUILD b/community/php81-pecl-apcu/APKBUILD
index 1a2ec9e174..1a2ec9e174 100644
--- a/testing/php81-pecl-apcu/APKBUILD
+++ b/community/php81-pecl-apcu/APKBUILD
diff --git a/testing/php81-pecl-ast/APKBUILD b/community/php81-pecl-ast/APKBUILD
index cabb24c988..cabb24c988 100644
--- a/testing/php81-pecl-ast/APKBUILD
+++ b/community/php81-pecl-ast/APKBUILD
diff --git a/testing/php81-pecl-couchbase/APKBUILD b/community/php81-pecl-couchbase/APKBUILD
index dcb3eb9b57..0806fc63bb 100644
--- a/testing/php81-pecl-couchbase/APKBUILD
+++ b/community/php81-pecl-couchbase/APKBUILD
@@ -2,15 +2,18 @@
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
pkgname=php81-pecl-couchbase
_extname=couchbase
-pkgver=3.2.2
+pkgver=4.0.0
pkgrel=0
pkgdesc="PHP 8.1 extension for Couchbase - PECL"
url="https://pecl.php.net/package/couchbase"
-arch="all"
+arch="all !riscv64" # ftbfs
license="Apache-2.0"
depends="php81-pecl-igbinary"
-makedepends="php81-dev libcouchbase-dev chrpath"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
+makedepends="php81-dev openssl-dev linux-headers chrpath cmake ccache"
+source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
+ cmake-build-type.patch
+ cmake-fix-cache.patch
+ "
builddir="$srcdir/$_extname-$pkgver"
build() {
@@ -27,6 +30,9 @@ check() {
package() {
make INSTALL_ROOT="$pkgdir" install
chrpath -d "$pkgdir"/usr/lib/php81/modules/$_extname.so
+ chrpath -d "$pkgdir"/usr/lib/php81/modules/libcouchbase_php_core.so
+ #TODO split separate package
+ # mv "$pkgdir"/usr/lib/php81/modules/libcouchbase_php_core.so "$pkgdir"/usr/lib
local _confdir="$pkgdir"/etc/php81/conf.d
mkdir -p $_confdir
@@ -34,5 +40,7 @@ package() {
}
sha512sums="
-eb91d6620179c38f17310953b710e13aee3845614a55ef43e0704dcb104c1d2ea3923a0a0fe965a35c2378b8782a58f0dc973c43372a1539dcf21a6b537e4cb5 php-pecl-couchbase-3.2.2.tgz
+5a2571c18f4d0fd46239eed10b77271260352bda38ad5695db65dc7a47f14bab00cfa4a98c646544f7e2865939ae5f981edbc6f63216a0ee537a5a9666198f1e php-pecl-couchbase-4.0.0.tgz
+e61589d1a17968a4980e41a79351d5fa26dc6ecfca8430f87304bd309e1d738eb026b0206694069acce6cf8992a3701f9d0ebe372050a178087c5bee04166e13 cmake-build-type.patch
+56c0ea44a55aa5622adbd3e5de435c30696897474f102a62882a54bbb75b8bbf3e9b055766fc8db68623bc7e2561e9b180bbd7de3b8e4cf8aad0853dce3f7b3a cmake-fix-cache.patch
"
diff --git a/community/php81-pecl-couchbase/cmake-build-type.patch b/community/php81-pecl-couchbase/cmake-build-type.patch
new file mode 100644
index 0000000000..fbc63b2952
--- /dev/null
+++ b/community/php81-pecl-couchbase/cmake-build-type.patch
@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -50,7 +50,7 @@
+ COUCHBASE_PHP_LIBDIR : ${phplibdir}
+ "
+ ${CMAKE} -S ${COUCHBASE_CMAKE_SOURCE_DIRECTORY} -B${COUCHBASE_CMAKE_BUILD_DIRECTORY} \
+- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
++ -DCMAKE_BUILD_TYPE=MinSizeRel \
+ -DCMAKE_C_COMPILER="${CC}" \
+ -DCMAKE_CXX_COMPILER="${CXX}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}" \
diff --git a/community/php81-pecl-couchbase/cmake-fix-cache.patch b/community/php81-pecl-couchbase/cmake-fix-cache.patch
new file mode 100644
index 0000000000..da05e0671b
--- /dev/null
+++ b/community/php81-pecl-couchbase/cmake-fix-cache.patch
@@ -0,0 +1,11 @@
+--- a/src/deps/couchbase-cxx-transactions/CMakeLists.txt
++++ b/src/deps/couchbase-cxx-transactions/CMakeLists.txt
+@@ -80,7 +80,7 @@
+ if (APPLE AND NOT DEFINED OPENSSL_ROOT_DIR)
+ # look in typical brew location - missed by the openssl finder
+ message(STATUS "no OPENSSL_ROOT_DIR specified, using MacOS, so defaulting to homebrew location")
+- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1", CACHE INTERNAL "")
++ set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1" CACHE INTERNAL "")
+ endif()
+ message(STATUS "APPLE: '${APPLE}', SSL: '${OPENSSL_ROOT_DIR}'")
+ find_package(OpenSSL REQUIRED)
diff --git a/testing/php81-pecl-event/APKBUILD b/community/php81-pecl-event/APKBUILD
index f9b8de1607..f9b8de1607 100644
--- a/testing/php81-pecl-event/APKBUILD
+++ b/community/php81-pecl-event/APKBUILD
diff --git a/testing/php81-pecl-igbinary/APKBUILD b/community/php81-pecl-igbinary/APKBUILD
index 55af2086dd..55af2086dd 100644
--- a/testing/php81-pecl-igbinary/APKBUILD
+++ b/community/php81-pecl-igbinary/APKBUILD
diff --git a/testing/php81-pecl-imagick/APKBUILD b/community/php81-pecl-imagick/APKBUILD
index 292dae4d82..292dae4d82 100644
--- a/testing/php81-pecl-imagick/APKBUILD
+++ b/community/php81-pecl-imagick/APKBUILD
diff --git a/testing/php81-pecl-lzf/APKBUILD b/community/php81-pecl-lzf/APKBUILD
index fa2c45cc86..fa2c45cc86 100644
--- a/testing/php81-pecl-lzf/APKBUILD
+++ b/community/php81-pecl-lzf/APKBUILD
diff --git a/testing/php81-pecl-mailparse/APKBUILD b/community/php81-pecl-mailparse/APKBUILD
index fc2712a5b5..fc2712a5b5 100644
--- a/testing/php81-pecl-mailparse/APKBUILD
+++ b/community/php81-pecl-mailparse/APKBUILD
diff --git a/testing/php81-pecl-maxminddb/APKBUILD b/community/php81-pecl-maxminddb/APKBUILD
index a208ad9301..a208ad9301 100644
--- a/testing/php81-pecl-maxminddb/APKBUILD
+++ b/community/php81-pecl-maxminddb/APKBUILD
diff --git a/testing/php81-pecl-memcache/APKBUILD b/community/php81-pecl-memcache/APKBUILD
index 6d5df4b171..6d5df4b171 100644
--- a/testing/php81-pecl-memcache/APKBUILD
+++ b/community/php81-pecl-memcache/APKBUILD
diff --git a/testing/php81-pecl-memcache/version-fix.patch b/community/php81-pecl-memcache/version-fix.patch
index e9ceba4307..e9ceba4307 100644
--- a/testing/php81-pecl-memcache/version-fix.patch
+++ b/community/php81-pecl-memcache/version-fix.patch
diff --git a/testing/php81-pecl-memcached/APKBUILD b/community/php81-pecl-memcached/APKBUILD
index 53248d64b4..53248d64b4 100644
--- a/testing/php81-pecl-memcached/APKBUILD
+++ b/community/php81-pecl-memcached/APKBUILD
diff --git a/testing/php81-pecl-mongodb/APKBUILD b/community/php81-pecl-mongodb/APKBUILD
index 3b19ee4a8c..3b19ee4a8c 100644
--- a/testing/php81-pecl-mongodb/APKBUILD
+++ b/community/php81-pecl-mongodb/APKBUILD
diff --git a/testing/php81-pecl-msgpack/APKBUILD b/community/php81-pecl-msgpack/APKBUILD
index 5706f9f892..5706f9f892 100644
--- a/testing/php81-pecl-msgpack/APKBUILD
+++ b/community/php81-pecl-msgpack/APKBUILD
diff --git a/testing/php81-pecl-msgpack/msgpack-162.patch b/community/php81-pecl-msgpack/msgpack-162.patch
index 5eef192e9a..5eef192e9a 100644
--- a/testing/php81-pecl-msgpack/msgpack-162.patch
+++ b/community/php81-pecl-msgpack/msgpack-162.patch
diff --git a/testing/php81-pecl-protobuf/APKBUILD b/community/php81-pecl-protobuf/APKBUILD
index 79e4786cb3..79e4786cb3 100644
--- a/testing/php81-pecl-protobuf/APKBUILD
+++ b/community/php81-pecl-protobuf/APKBUILD
diff --git a/testing/php81-pecl-psr/APKBUILD b/community/php81-pecl-psr/APKBUILD
index fb8efb6863..fb8efb6863 100644
--- a/testing/php81-pecl-psr/APKBUILD
+++ b/community/php81-pecl-psr/APKBUILD
diff --git a/testing/php81-pecl-rdkafka/APKBUILD b/community/php81-pecl-rdkafka/APKBUILD
index b91e9ecc24..b91e9ecc24 100644
--- a/testing/php81-pecl-rdkafka/APKBUILD
+++ b/community/php81-pecl-rdkafka/APKBUILD
diff --git a/testing/php81-pecl-redis/APKBUILD b/community/php81-pecl-redis/APKBUILD
index 155b73fa5e..155b73fa5e 100644
--- a/testing/php81-pecl-redis/APKBUILD
+++ b/community/php81-pecl-redis/APKBUILD
diff --git a/testing/php81-pecl-ssh2/APKBUILD b/community/php81-pecl-ssh2/APKBUILD
index da3f269ea5..da3f269ea5 100644
--- a/testing/php81-pecl-ssh2/APKBUILD
+++ b/community/php81-pecl-ssh2/APKBUILD
diff --git a/testing/php81-pecl-swoole/APKBUILD b/community/php81-pecl-swoole/APKBUILD
index 9af1938963..9af1938963 100644
--- a/testing/php81-pecl-swoole/APKBUILD
+++ b/community/php81-pecl-swoole/APKBUILD
diff --git a/testing/php81-pecl-uploadprogress/APKBUILD b/community/php81-pecl-uploadprogress/APKBUILD
index 6784851576..6784851576 100644
--- a/testing/php81-pecl-uploadprogress/APKBUILD
+++ b/community/php81-pecl-uploadprogress/APKBUILD
diff --git a/testing/php81-pecl-uuid/APKBUILD b/community/php81-pecl-uuid/APKBUILD
index 4074ebe330..4074ebe330 100644
--- a/testing/php81-pecl-uuid/APKBUILD
+++ b/community/php81-pecl-uuid/APKBUILD
diff --git a/testing/php81-pecl-vips/APKBUILD b/community/php81-pecl-vips/APKBUILD
index 401ddacda7..401ddacda7 100644
--- a/testing/php81-pecl-vips/APKBUILD
+++ b/community/php81-pecl-vips/APKBUILD
diff --git a/testing/php81-pecl-xdebug/APKBUILD b/community/php81-pecl-xdebug/APKBUILD
index 6b57793c25..6b57793c25 100644
--- a/testing/php81-pecl-xdebug/APKBUILD
+++ b/community/php81-pecl-xdebug/APKBUILD
diff --git a/testing/php81-pecl-xhprof/APKBUILD b/community/php81-pecl-xhprof/APKBUILD
index 766693ebfd..766693ebfd 100644
--- a/testing/php81-pecl-xhprof/APKBUILD
+++ b/community/php81-pecl-xhprof/APKBUILD
diff --git a/testing/php81-pecl-yaml/APKBUILD b/community/php81-pecl-yaml/APKBUILD
index 3ee6920ecf..3ee6920ecf 100644
--- a/testing/php81-pecl-yaml/APKBUILD
+++ b/community/php81-pecl-yaml/APKBUILD
diff --git a/testing/php81-pecl-zstd/APKBUILD b/community/php81-pecl-zstd/APKBUILD
index ddca971057..ddca971057 100644
--- a/testing/php81-pecl-zstd/APKBUILD
+++ b/community/php81-pecl-zstd/APKBUILD
diff --git a/testing/php81/APKBUILD b/community/php81/APKBUILD
index b6f88a19ce..ba29603d7a 100644
--- a/testing/php81/APKBUILD
+++ b/community/php81/APKBUILD
@@ -25,8 +25,8 @@
pkgname=php81
_pkgreal=php
-pkgver=8.1.5
-pkgrel=2
+pkgver=8.1.6
+pkgrel=0
_apiver=20210902
_suffix=${pkgname#php}
# Is this package the default (latest) PHP version?
@@ -102,7 +102,6 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz
fix-tests-devserver.patch
xfail-openssl-1.1-test.patch
atomic-lsapi.patch
- content-encoding.patch
fix-curl-7.83-test.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -619,7 +618,7 @@ _mv() {
}
sha512sums="
-184d3738dbd8207a84cfb11dcc1edf352c57da49f484fe791d8c786ab8921189fdaf459b98e3bd6a5f73ae968510e8a8566f41a69640c74adb35363d6c07c439 php-8.1.5.tar.xz
+df5ab8e90aced1cc904c6abd25f42b0c59a327fe4f7b518591c23820e711952f3b1e70b31a1c2e90282621891400b492fb099cbadafcd0ef7991ccc2962156de php-8.1.6.tar.xz
7dc9f55b12998355a6a6b5cf277285058e66928215f8d0109448d06fb696a74c674f83d18a81bf03f4f0bee06e77979e9a4ee5c81c7fdebff91447f8e697cc69 php81-fpm.initd
98bb27864f1ece80fef18cb286885c8c18de8f9d1076507b6a24df07e33aa400623b90401375e7ebe55d9ff802069d281642ec7d3a58ef8727121aabe7643241 php81-fpm.logrotate
2e3b22b4adbc81c6120757095c89e56642f3e8bf7724af2926f2667759ef082cdcff416334aad87f704a61fcb5b2c11830f17759ac771a3dd4e47d9bc5c7cf72 php81-module.conf
@@ -631,6 +630,5 @@ f43ab399c3b4a2b9a3a329acd32d9cbc690cad697dd0a0e87f3d654028b88af7dd1cd80cbf970c6f
1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
d90e839cfae1cbb42c1dfb0fb73defa55154dbef69bc9a8206e561c2d0ceb43ca778e35dcfa3224570deabe7d59d35dac3f21d0c4bd82ac92cebd5477a30a89d xfail-openssl-1.1-test.patch
465b38c089d938a4a072b2eff3edaf928455bf873f5eeb65ff3bee9614f5f45c70f285abb50809c2e2d9d259395acae38bd649860ca3b8d65e43447082a51552 atomic-lsapi.patch
-c703c56d8b0de2da15fa23212c31a5058fdad283a1fb7a31c9755ccdde3555d21c28c78a6f68286a28f5afa590719a8ea4bf61937ae311ec1b0145c1ed33639b content-encoding.patch
be6a57063414bd255def54d5f6e42cbdc3baec55c8eaf9c8ca6e96d0cb3fec942ebb1868806850859d34c5c45d03a2abfec3fecd1aef04524da8eda01d9041ed fix-curl-7.83-test.patch
"
diff --git a/testing/php81/atomic-lsapi.patch b/community/php81/atomic-lsapi.patch
index 39cf1823f0..39cf1823f0 100644
--- a/testing/php81/atomic-lsapi.patch
+++ b/community/php81/atomic-lsapi.patch
diff --git a/testing/php81/disabled-tests.list b/community/php81/disabled-tests.list
index 02cccecd09..02cccecd09 100644
--- a/testing/php81/disabled-tests.list
+++ b/community/php81/disabled-tests.list
diff --git a/community/php81/fix-curl-7.83-test.patch b/community/php81/fix-curl-7.83-test.patch
new file mode 100644
index 0000000000..b087acfb28
--- /dev/null
+++ b/community/php81/fix-curl-7.83-test.patch
@@ -0,0 +1,25 @@
+From a4179e4c92b6365d39e09cb9cd63c476848013af Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Wed, 27 Apr 2022 12:37:39 +0200
+Subject: [PATCH] Fix test for curl 7.83.0
+Patch-Source: https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af
+
+libcurl 7.83.0 removed some trailing exclamation marks from error
+messages[1]; we have to cater to that.
+
+[1] <https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7>
+---
+ ext/curl/tests/curl_basic_007.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt
+index 3b53658d6a7e..3834e4674f82 100644
+--- a/ext/curl/tests/curl_basic_007.phpt
++++ b/ext/curl/tests/curl_basic_007.phpt
+@@ -20,5 +20,5 @@ curl_close($ch);
+
+ ?>
+ --EXPECTF--
+-string(%d) "No URL set!%w"
++string(%d) "No URL set%A"
+ int(3)
diff --git a/testing/php81/fix-tests-devserver.patch b/community/php81/fix-tests-devserver.patch
index 5447980b98..5447980b98 100644
--- a/testing/php81/fix-tests-devserver.patch
+++ b/community/php81/fix-tests-devserver.patch
diff --git a/testing/php81/includedir.patch b/community/php81/includedir.patch
index 7c172a0b27..7c172a0b27 100644
--- a/testing/php81/includedir.patch
+++ b/community/php81/includedir.patch
diff --git a/testing/php81/install-pear.patch b/community/php81/install-pear.patch
index 1c9f07f89d..1c9f07f89d 100644
--- a/testing/php81/install-pear.patch
+++ b/community/php81/install-pear.patch
diff --git a/testing/php81/php81-fpm-version-suffix.patch b/community/php81/php81-fpm-version-suffix.patch
index b73459dc70..b73459dc70 100644
--- a/testing/php81/php81-fpm-version-suffix.patch
+++ b/community/php81/php81-fpm-version-suffix.patch
diff --git a/testing/php81/php81-fpm.initd b/community/php81/php81-fpm.initd
index 87a54b27f6..87a54b27f6 100644
--- a/testing/php81/php81-fpm.initd
+++ b/community/php81/php81-fpm.initd
diff --git a/testing/php81/php81-fpm.logrotate b/community/php81/php81-fpm.logrotate
index 29f2a7d594..29f2a7d594 100644
--- a/testing/php81/php81-fpm.logrotate
+++ b/community/php81/php81-fpm.logrotate
diff --git a/testing/php81/php81-module.conf b/community/php81/php81-module.conf
index b8b782b254..b8b782b254 100644
--- a/testing/php81/php81-module.conf
+++ b/community/php81/php81-module.conf
diff --git a/testing/php81/sharedir.patch b/community/php81/sharedir.patch
index e780ccab00..e780ccab00 100644
--- a/testing/php81/sharedir.patch
+++ b/community/php81/sharedir.patch
diff --git a/testing/php81/xfail-openssl-1.1-test.patch b/community/php81/xfail-openssl-1.1-test.patch
index 18fefe6479..18fefe6479 100644
--- a/testing/php81/xfail-openssl-1.1-test.patch
+++ b/community/php81/xfail-openssl-1.1-test.patch
diff --git a/community/phpmyadmin/APKBUILD b/community/phpmyadmin/APKBUILD
index 94053e3ce7..b9e04b1454 100644
--- a/community/phpmyadmin/APKBUILD
+++ b/community/phpmyadmin/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Matt Smith <mcs@darkregion.net>
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
pkgname=phpmyadmin
-pkgver=5.1.3
+pkgver=5.2.0
pkgrel=0
pkgdesc="A Web-based PHP tool for administering MySQL"
url="https://www.phpmyadmin.net/"
@@ -113,6 +113,6 @@ doc() {
}
sha512sums="
-c8894f22a57f859b6744d49222ddf12c5146bd3b4929ae7ffdbb35832c34fd6b431ac6ba47af855335dcc9360c62295992d52ca5106a75d4dbb098368d155e62 phpMyAdmin-5.1.3-all-languages.tar.xz
+69658f94908e279e80f7cb76ac108090d704f27bc3f3206ff7d69c0aac4119ee42696ce66f98be6bc11e3532ca0d47916c1a2a8c915c3af6d1e5be6aa1d925a5 phpMyAdmin-5.2.0-all-languages.tar.xz
ba5776800f5c7b6cbb4ae594ec77c4d3e0d0bd319d109c676bd6c969054967baef99cab1a30c2efa26487b2ec03ef9b81d035a4323003565cffb19b08fdce9f5 phpmyadmin.apache2.conf
"
diff --git a/community/piknik/APKBUILD b/community/piknik/APKBUILD
index e309e521be..ec5660ad49 100644
--- a/community/piknik/APKBUILD
+++ b/community/piknik/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=piknik
pkgver=0.10.1
-pkgrel=5
+pkgrel=6
pkgdesc="Copy/paste anything over the network"
url="https://github.com/jedisct1/piknik"
arch="all"
diff --git a/community/plantuml/APKBUILD b/community/plantuml/APKBUILD
index ff005ee975..5a9b6b39fd 100644
--- a/community/plantuml/APKBUILD
+++ b/community/plantuml/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Krystian Chachuła <krystian@krystianch.com>
pkgname=plantuml
-pkgver=1.2022.3
+pkgver=1.2022.5
pkgrel=0
pkgdesc="Draw UML diagrams, using a simple and human readable text description"
url="https://plantuml.com/"
@@ -26,6 +26,6 @@ package() {
}
sha512sums="
-c90cc11686bff42f56ed35de90eb29a5bcb662c4d0003132b64f9913dff3caa52aed39ca269e2f42b45945a9cbe4713f8717c89af6a6ccd163fcbdf887e275fa plantuml-1.2022.3.tar.gz
+9e69cc4bf5bcc993ee93569ee9149c564592090890e6f9e88a5ca600b46cc55118ec58bc771f51db76e2a7301fda9f32b57e28056a949c5f9ad886b94460d970 plantuml-1.2022.5.tar.gz
cab64f1676cbd495752eda31f2ee4ab7d976253fe523a6db5b55fd9a165f1530da0d34196494ce38b0aaad6525f4f1e1e7fe60307ad220146b5a654d96c9d060 plantuml.run
"
diff --git a/community/plasma-phonebook/APKBUILD b/community/plasma-phonebook/APKBUILD
index a59cf95af8..0fc6036d02 100644
--- a/community/plasma-phonebook/APKBUILD
+++ b/community/plasma-phonebook/APKBUILD
@@ -1,14 +1,16 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-phonebook
pkgver=22.04
-pkgrel=0
+pkgrel=1
pkgdesc="Contacts application which allows adding, modifying and removing contacts"
# armhf blocked by extra-cmake-modules
arch="all !armhf"
url="https://invent.kde.org/kde/plasma-phonebook"
license="LicenseRef-KDE-Accepted-GPL"
depends="
+ kirigami-addons
kirigami2
+ kpeoplevcard
qt5-qtbase-sqlite
qt5-qtquickcontrols
"
diff --git a/community/poco/APKBUILD b/community/poco/APKBUILD
index 746c20af6e..e028ceac9c 100644
--- a/community/poco/APKBUILD
+++ b/community/poco/APKBUILD
@@ -1,13 +1,26 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=poco
-pkgver=1.11.1
+pkgver=1.11.2
pkgrel=0
pkgdesc="C++ class libraries for building network- and internet-based applications"
url="https://pocoproject.org/"
arch="all" # fails to build on soft-float
license="BSL-1.0"
-makedepends="cmake chrpath openssl1.1-compat-dev linux-headers zlib-dev pcre-dev expat-dev sqlite-dev mariadb-connector-c-dev unixodbc-dev libpq-dev"
+makedepends="
+ chrpath
+ cmake
+ expat-dev
+ libpq-dev
+ linux-headers
+ mariadb-connector-c-dev
+ openssl1.1-compat-dev
+ pcre-dev
+ samurai
+ sqlite-dev
+ unixodbc-dev
+ zlib-dev
+ "
source="https://pocoproject.org/releases/poco-$pkgver/poco-$pkgver-all.tar.gz
cxxflags.patch
"
@@ -17,8 +30,8 @@ options="!check" # No testsuite
builddir="$srcdir/$pkgname-$pkgver-all"
build() {
- cmake -B build \
- -DCMAKE_BUILD_TYPE=None \
+ cmake -B build -G Ninja \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr
cmake --build build
}
@@ -28,6 +41,6 @@ package() {
}
sha512sums="
-58e698e56479696b84231b969af1f014af6595c07b59dc12fbda2d336cd02341b6c673ef60638fb72c192d0217622ace80e34f02098ca6a71f3958fa0bacc864 poco-1.11.1-all.tar.gz
+191a80f0a131bad44c77b9f2ec0bc4f39a51ccd8a33323c04efc8762b222b11c88cbcbf085a405dd886adcc48efa76b465570182babb4eb886b7afbf2b4649fd poco-1.11.2-all.tar.gz
fd1fb85cc3ee7d3ffa13871b4dc47ce737277cbd2236b92cb12176d84aee5e754674828061f4a6ab92eed23918cdf3ab8f2d51f3276211cda77c9587c08985cf cxxflags.patch
"
diff --git a/community/podman/APKBUILD b/community/podman/APKBUILD
index 9964badc67..0ec74f05a2 100644
--- a/community/podman/APKBUILD
+++ b/community/podman/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=podman
pkgver=4.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="Simple management tool for pods, containers and images"
url="https://podman.io/"
license="Apache-2.0"
diff --git a/community/poedit/APKBUILD b/community/poedit/APKBUILD
index 8df2240872..6a1511ad5f 100644
--- a/community/poedit/APKBUILD
+++ b/community/poedit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=poedit
pkgver=2.4.2
-pkgrel=6
+pkgrel=7
pkgdesc="cross-platform translations editor"
url="https://www.poedit.net"
arch="all"
diff --git a/community/poppler-qt5/APKBUILD b/community/poppler-qt5/APKBUILD
index aceea3ab9d..8b301d46c8 100644
--- a/community/poppler-qt5/APKBUILD
+++ b/community/poppler-qt5/APKBUILD
@@ -5,7 +5,7 @@
pkgname=poppler-qt5
_pkgname=poppler
-pkgver=22.03.0
+pkgver=22.05.0
pkgrel=0
pkgdesc="PDF rendering library based on xpdf 3.0"
url="https://poppler.freedesktop.org/"
@@ -75,5 +75,5 @@ package() {
}
sha512sums="
-f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569 poppler-22.03.0.tar.xz
+629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737 poppler-22.05.0.tar.xz
"
diff --git a/community/portablexdr/APKBUILD b/community/portablexdr/APKBUILD
index a384fc0cc6..1fb7926631 100644
--- a/community/portablexdr/APKBUILD
+++ b/community/portablexdr/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=portablexdr
pkgver=4.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="external data representation (XDR) library"
-url="http://people.redhat.com/~rjones/portablexdr/"
+url="https://people.redhat.com/~rjones/portablexdr/"
arch="all"
license="GPL-2.0-or-later"
makedepends="libtool"
@@ -21,7 +21,8 @@ prepare() {
}
build() {
- ./configure --prefix=/usr \
+ ./configure \
+ --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
@@ -41,7 +42,9 @@ rpcgen() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="47f2402e7ed9f2f518e2a45e76e8ad6c4b1e7ae1bd9408ca4dca3d0883697e755460ee64eef405e23b1840ad3b89ad54555bdf59dc8bae3cd8b67086d6ab3b1f portablexdr-4.9.1.tar.gz
+sha512sums="
+47f2402e7ed9f2f518e2a45e76e8ad6c4b1e7ae1bd9408ca4dca3d0883697e755460ee64eef405e23b1840ad3b89ad54555bdf59dc8bae3cd8b67086d6ab3b1f portablexdr-4.9.1.tar.gz
4d7dd2c6a40438ca9df8da93dad91295802ddd0cf51f4c2710a0213c34255f119a1c397c8aee9ffb6499baba2c3a39ce2f7ef5a46a2ce87cd8e881f8ab41d1c2 portablexdr-4.9.1-no-config-h.patch
f650a12897256a7194ec125dcac008b4a75b1907bfddcc34c4d23f40f93718072c9958b9eca7afeb1e356a64b5189d71077f765b5592b847d3473b2ee346ae8f portablexdr-build-use-intptr_t-and-uintptr_t-to-cast-ptr-to-int.patch
-8057db443cdb956945a40c2cf9d1f4d59086bd8affc819e36be146c50a7109bf18bd47e1ff69979d1e9187413d37836426b02cec6761987cf1c3483f6ed1f911 quad-types.patch"
+8057db443cdb956945a40c2cf9d1f4d59086bd8affc819e36be146c50a7109bf18bd47e1ff69979d1e9187413d37836426b02cec6761987cf1c3483f6ed1f911 quad-types.patch
+"
diff --git a/community/postgis/APKBUILD b/community/postgis/APKBUILD
index 2b601c4fb5..b41e57a7ff 100644
--- a/community/postgis/APKBUILD
+++ b/community/postgis/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bjoern Schilberg <bjoern@intevation.de>
pkgname=postgis
pkgver=3.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="spatial database extender for PostgreSQL object-relational database"
url="https://postgis.net/"
arch="all"
diff --git a/community/process-cpp/APKBUILD b/community/process-cpp/APKBUILD
index 8460662a38..6d7eda9d1c 100644
--- a/community/process-cpp/APKBUILD
+++ b/community/process-cpp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=process-cpp
pkgver=3.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="A simple convenience library for handling processes in C++11"
url="https://gitlab.com/ubports/core/lib-cpp/process-cpp"
arch="all"
diff --git a/community/prometheus-node-exporter/APKBUILD b/community/prometheus-node-exporter/APKBUILD
index ed13fd7fad..05ed7e0e9b 100644
--- a/community/prometheus-node-exporter/APKBUILD
+++ b/community/prometheus-node-exporter/APKBUILD
@@ -3,7 +3,7 @@
pkgname=prometheus-node-exporter
_pkgname=node_exporter
pkgver=1.3.1
-pkgrel=3
+pkgrel=4
pkgdesc="Prometheus exporter for machine metrics"
url="https://github.com/prometheus/node_exporter"
license="Apache-2.0"
diff --git a/community/prometheus-snmp-exporter/APKBUILD b/community/prometheus-snmp-exporter/APKBUILD
index 89d14c449e..86932cde3c 100644
--- a/community/prometheus-snmp-exporter/APKBUILD
+++ b/community/prometheus-snmp-exporter/APKBUILD
@@ -2,15 +2,15 @@
pkgname=prometheus-snmp-exporter
_pkgname=snmp_exporter
pkgver=0.20.0
-pkgrel=5
-pkgdesc="Description"
+pkgrel=7
+pkgdesc="SNMP Exporter for Prometheus"
url="https://github.com/prometheus/snmp_exporter"
# riscv64: prometheus/procfs needs updating
arch="all !riscv64"
license="Apache-2.0"
makedepends="go net-snmp-dev"
install="$pkgname.pre-install"
-subpackages="$pkgname-openrc"
+subpackages="$pkgname-doc $pkgname-openrc"
source="
$pkgname-$pkgver.tar.gz::https://github.com/prometheus/snmp_exporter/archive/v$pkgver.tar.gz
snmp-exporter.initd
@@ -18,12 +18,11 @@ source="
"
builddir="$srcdir/$_pkgname-$pkgver"
+export GOFLAGS="$GOFLAGS -modcacherw -trimpath"
build() {
- go build
- cd generator
- go build
- cd ..
+ go build -o bin/snmp_exporter
+ go build -o bin/generator ./generator
}
check() {
@@ -31,10 +30,9 @@ check() {
}
package() {
- # Replace with proper package command(s)
- install -Dm755 snmp_exporter \
+ install -Dm755 bin/snmp_exporter \
"$pkgdir"/usr/bin/snmp_exporter
- install -Dm755 generator/generator \
+ install -Dm755 bin/generator \
"$pkgdir"/usr/bin/snmp_exporter-generator
install -Dm644 snmp.yml \
"$pkgdir"/etc/prometheus/snmp.yml
@@ -50,6 +48,8 @@ package() {
"$pkgdir"/etc/conf.d/snmp-exporter
}
-sha512sums="fe09033e713f12b5a6ad79445def55c8d94c75cbee5e4e7c4683e853c1a8335005462d607e0c7306d2ee6e70178edeb9b6cff0c35aa6d36a4d0fa5ce45cedb51 prometheus-snmp-exporter-0.20.0.tar.gz
+sha512sums="
+fe09033e713f12b5a6ad79445def55c8d94c75cbee5e4e7c4683e853c1a8335005462d607e0c7306d2ee6e70178edeb9b6cff0c35aa6d36a4d0fa5ce45cedb51 prometheus-snmp-exporter-0.20.0.tar.gz
a11085f14e192ff277107dbbb12857a3043dbce1acadbbdf94a88d2b921745f9556cad3c0a81a0113349d322e02b1705831967af3ecc0f95259e759ade9ff5ad snmp-exporter.initd
-489cb298e215bd9647aa5293d456106eb26a73f5fbd9d42fab68de26d273ebb612dba01ba113ce58521b543a2f82a10ad86dc35056ef8d0438b39e77be61f67e snmp-exporter.confd"
+489cb298e215bd9647aa5293d456106eb26a73f5fbd9d42fab68de26d273ebb612dba01ba113ce58521b543a2f82a10ad86dc35056ef8d0438b39e77be61f67e snmp-exporter.confd
+"
diff --git a/community/prometheus/APKBUILD b/community/prometheus/APKBUILD
index b8eddf03a6..2a21a6d049 100644
--- a/community/prometheus/APKBUILD
+++ b/community/prometheus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=prometheus
pkgver=2.34.0
-pkgrel=2
+pkgrel=3
pkgdesc="The Prometheus monitoring system and time series database"
url="https://github.com/prometheus/prometheus"
arch="all !riscv64" # npm
diff --git a/community/prosody-filer/APKBUILD b/community/prosody-filer/APKBUILD
index 8085e9e65d..8da33fba4b 100644
--- a/community/prosody-filer/APKBUILD
+++ b/community/prosody-filer/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=prosody-filer
pkgver=1.0.2
-pkgrel=6
+pkgrel=7
pkgdesc="Golang mod_http_upload_external server for Prosody and Ejabberd"
url="https://github.com/ThomasLeister/prosody-filer"
arch="all"
diff --git a/community/pup/APKBUILD b/community/pup/APKBUILD
index 8fff1dc5f8..e9c49b4d80 100644
--- a/community/pup/APKBUILD
+++ b/community/pup/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Erwan Rouchet <lucidiot@brainshit.fr>
pkgname=pup
pkgver=0.4.0
-pkgrel=6
+pkgrel=7
pkgdesc="HTML parser for the command line"
url="https://github.com/ericchiang/pup"
arch="all"
diff --git a/community/pushgateway/APKBUILD b/community/pushgateway/APKBUILD
index 62c5b5fa5d..8595c8cf8b 100644
--- a/community/pushgateway/APKBUILD
+++ b/community/pushgateway/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=pushgateway
pkgver=1.4.2
-pkgrel=3
+pkgrel=4
pkgdesc="Prometheus push acceptor for ephemeral and batch jobs"
url="https://github.com/prometheus/pushgateway"
license="Apache-2.0"
diff --git a/testing/py3-airium/APKBUILD b/community/py3-airium/APKBUILD
index 3bec14836e..d653d58962 100644
--- a/testing/py3-airium/APKBUILD
+++ b/community/py3-airium/APKBUILD
@@ -10,7 +10,8 @@ license="MIT"
depends="python3"
makedepends="py3-setuptools"
checkdepends="pytest"
-source="https://gitlab.com/kamichal/airium/-/archive/v$pkgver/airium-v$pkgver.tar.gz"
+source="https://gitlab.com/kamichal/airium/-/archive/v$pkgver/airium-v$pkgver.tar.gz
+ exclude-tests.patch"
builddir="$srcdir/airium-v$pkgver/"
build() {
@@ -36,4 +37,5 @@ package() {
sha512sums="
2aa504fe899a8aead7674dc734688911d2d380df71d2f0413b89a70810ad557543e24a1f0268fc0d5829e70b0e88d08330239e4599fb9955953999d77f770fdb airium-v0.2.3.tar.gz
+493bd3d65bf34b80b149b95a4e449af7b2fd15b5500041ded3e44d4e19a9d0f82e10a139cde80119c516c81a4951d3d55eaa8fefb731d19a72a3595b8f517f99 exclude-tests.patch
"
diff --git a/community/py3-airium/exclude-tests.patch b/community/py3-airium/exclude-tests.patch
new file mode 100644
index 0000000000..b0a0f284cb
--- /dev/null
+++ b/community/py3-airium/exclude-tests.patch
@@ -0,0 +1,11 @@
+--- ./setup.py.orig
++++ ./setup.py
+@@ -29,7 +29,7 @@
+ 'No templates needed. Serves pure pythonic library with no dependencies.',
+ long_description=long_description,
+ long_description_content_type='text/markdown',
+- packages=find_packages(),
++ packages=find_packages(exclude=["tests"]),
+ requires=[],
+ install_requires=[],
+ keywords='natural html generator compiler template-less',
diff --git a/community/py3-ansible-compat/APKBUILD b/community/py3-ansible-compat/APKBUILD
index 9c60ea5bc3..ed0d5090bc 100644
--- a/community/py3-ansible-compat/APKBUILD
+++ b/community/py3-ansible-compat/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sean McAvoy <seanmcavoy@gmail.com>
# Maintainer: Sean McAvoy <seanmcavoy@gmail.com>
pkgname=py3-ansible-compat
-pkgver=2.0.0
-pkgrel=1
+pkgver=2.0.3
+pkgrel=0
pkgdesc="functions that help interacting with various versions of Ansible"
url="https://github.com/ansible-community/ansible-compat"
arch="all"
@@ -30,7 +30,7 @@ check() {
# FIXME: bad tests leave around state and fail on builders
# on subsequent runs
PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest -v \
- -k "not test_install_galaxy_role"
+ -k "not test_runtime_install_role and not test_install_galaxy_role"
}
package() {
@@ -39,5 +39,5 @@ package() {
}
sha512sums="
-2b2aade5a201e6edbd5000b0e19497eb5ed5eaf9633edd502c19596b3d1018212f5504f1abad5bc225a8128ad5bb118fcea664b3a927490bcb3636e00ec16fd9 ansible-compat-2.0.0.tar.gz
+0887e5da23041d02be0371bfd9569256252c586f80cd92ab855b32172328989c8160e57169aff6d72f1c3c89c9d3a00b56293e3badc0dc4aad135b1992d06599 ansible-compat-2.0.3.tar.gz
"
diff --git a/testing/py3-apache-arrow/APKBUILD b/community/py3-apache-arrow/APKBUILD
index 4cd7523c7e..608213af1b 100644
--- a/testing/py3-apache-arrow/APKBUILD
+++ b/community/py3-apache-arrow/APKBUILD
@@ -2,14 +2,15 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
# based on arch linux PKGBUILD
pkgname=py3-apache-arrow
-pkgver=7.0.0
+pkgver=8.0.0
pkgrel=0
pkgdesc="multi-language toolbox for accelerated data interchange and in-memory processing"
url="https://arrow.apache.org/"
-arch="all !riscv64" # missing glog-dev
+arch="all !s390x !riscv64" # missing glog-dev, thrift
license="Apache-2.0"
makedepends="
apache-arrow-dev
+ apache-arrow-static
bzip2-dev
cython
gtest-dev
@@ -32,11 +33,6 @@ subpackages="$pkgname-dev"
source="https://downloads.apache.org/arrow/arrow-$pkgver/apache-arrow-$pkgver.tar.gz"
builddir="$srcdir/apache-arrow-$pkgver"
-# s390x segaults when testing
-case "$CARCH" in
- s390x) options="!check" ;;
-esac
-
build() {
cd python
@@ -45,7 +41,7 @@ build() {
*) _SIMD="DEFAULT" ;;
esac
export PYARROW_WITH_PARQUET=1
- python3 setup.py build_ext --inplace --extra-cmake-args="-DARROW_SIMD_LEVEL=$_SIMD"
+ python3 setup.py build_ext --inplace --extra-cmake-args="-DARROW_SIMD_LEVEL=$_SIMD -DPYARROW_BUILD_DATASET=ON"
}
check() {
@@ -64,7 +60,8 @@ check() {
--deselect=pyarrow/tests/test_pandas.py::TestConvertStructTypes::test_from_numpy_nested \
--deselect=pyarrow/tests/test_schema.py::test_schema_sizeof \
--deselect=pyarrow/tests/test_serialization.py::test_primitive_serialization \
- --deselect=pyarrow/tests/test_serialization.py::test_integer_limits
+ --deselect=pyarrow/tests/test_serialization.py::test_integer_limits \
+ --deselect=pyarrow/tests/parquet/test_dataset.py::test_partitioned_dataset
}
package() {
@@ -73,5 +70,5 @@ package() {
}
sha512sums="
-6727ea625b1a4dc3fd452e94ef5e8fd7a5bdebcf44b105f0ba684687cf126163317caef9e91cfd3722a8defca1f0295741ed0dde2393e85d15559bddd7ecb9a2 apache-arrow-7.0.0.tar.gz
+8280ce775c05296e33a292241c976caee2bddda7da396ef3c5da700347cb616a932475140139a5e96027781e71f66466e27fcf6423440bf720fbc83faabf0f3d apache-arrow-8.0.0.tar.gz
"
diff --git a/community/py3-awesomeversion/APKBUILD b/community/py3-awesomeversion/APKBUILD
index 2f886c7179..6ecb09fcfe 100644
--- a/community/py3-awesomeversion/APKBUILD
+++ b/community/py3-awesomeversion/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=py3-awesomeversion
-pkgver=22.4.2
+pkgver=22.5.1
pkgrel=0
pkgdesc="Python module to deal with versions"
url="https://github.com/ludeeus/awesomeversion"
@@ -37,6 +37,6 @@ package() {
}
sha512sums="
-9364bd7eb21b451cf280a7ae3b53f84b14e5cc6ac1b8c238b19145252e9a224f09869929ca3caee26cdd6a3ffa4e1326f8a65402bf74537bcc43b46b4b3b5b46 py3-awesomeversion-22.4.2.tar.gz
+5b07f1b82822fde827dfec7ee8a19a1557fa054b166045cfd1b5c0d2a2fc32809a72699018f18443fc216e7580829271f3383ad653ba80eb45b3184bcbfc052e py3-awesomeversion-22.5.1.tar.gz
2f60fed1123467d581ed6ba172d25421ee3d8592729d1a922e7ba9de0ddace767bcd654acfce378bb056fd678027a27dc4a20047ef04c4c949eae89b2186d14b version-placeholder.patch
"
diff --git a/testing/py3-css-parser/10-remove-tests.patch b/community/py3-css-parser/10-remove-tests.patch
index 582e2bb3e5..582e2bb3e5 100644
--- a/testing/py3-css-parser/10-remove-tests.patch
+++ b/community/py3-css-parser/10-remove-tests.patch
diff --git a/testing/py3-css-parser/APKBUILD b/community/py3-css-parser/APKBUILD
index c63877e452..c63877e452 100644
--- a/testing/py3-css-parser/APKBUILD
+++ b/community/py3-css-parser/APKBUILD
diff --git a/community/py3-faker/APKBUILD b/community/py3-faker/APKBUILD
index c9a7974a8a..0f382ac89c 100644
--- a/community/py3-faker/APKBUILD
+++ b/community/py3-faker/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=py3-faker
_pyname=Faker
-pkgver=13.11.0
+pkgver=13.11.1
pkgrel=0
pkgdesc="Python package that generates fake data for you"
url="https://faker.readthedocs.io/en/master"
@@ -39,5 +39,5 @@ package() {
}
sha512sums="
-74acf9d05a769851217f8a05a3ef84ac95af2b5c4292f05ff7f8be2670de9815074dc3fddb8d88170568910c0c4f2764d4ee61ccba5743071d9cf48f52520216 Faker-13.11.0.tar.gz
+291517669143119099ac6bcc69a08091fb156728c465198079f764996849d8416ccaf169e1cf0d0dd02d99b2090494084dad7fdef9dfd2702411701bf71f54b5 Faker-13.11.1.tar.gz
"
diff --git a/community/py3-gst/APKBUILD b/community/py3-gst/APKBUILD
index 4494d6a37d..700f32c6b4 100644
--- a/community/py3-gst/APKBUILD
+++ b/community/py3-gst/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: psykose <alice@ayaya.dev>
pkgname=py3-gst
-pkgver=1.20.1
+pkgver=1.20.2
pkgrel=0
pkgdesc="GStreamer Python3 bindings"
url="https://cgit.freedesktop.org/gstreamer/gst-python/"
@@ -30,5 +30,5 @@ package() {
}
sha512sums="
-16819b7b8c564af8d0cc5f3d5a64921c45523865d705d5f4580bf644aeaacf24fd1922f27c3729e8334e710d318646ee5250ac26045f863fedaf1c8481724750 gst-python-1.20.1.tar.xz
+99af8bad76f930e6c11dcacac013ffe30670ad77259ebe96ee6059a9c359fd1a9c9b22188856f2f19f31469c152b3ad269ba821d06ef92f0c92b3b0fe0eac0d2 gst-python-1.20.2.tar.xz
"
diff --git a/community/py3-h2/APKBUILD b/community/py3-h2/APKBUILD
index 7900164d8f..026a485dc0 100644
--- a/community/py3-h2/APKBUILD
+++ b/community/py3-h2/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=py3-h2
_pkgname=h2
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.1.0
+pkgrel=0
pkgdesc="HTTP/2 State-Machine based protocol implementation"
url="https://github.com/python-hyper/h2"
arch="noarch"
@@ -17,7 +17,7 @@ depends="
makedepends="py3-setuptools"
checkdepends="py3-pytest py3-hypothesis"
source="$_pkgname-$pkgver.tar.gz::https://github.com/python-hyper/h2/archive/refs/tags/v$pkgver.tar.gz
- hypothesis-6.6.patch"
+ skip-broken-tests.patch"
builddir="$srcdir/$_pkgname-$pkgver"
replaces="py-h2" # Backwards compatibility
@@ -35,5 +35,7 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="ae145421549ecd29845b100e3895f1088598142824d82cf0b59293b0f647939e4acd0ff809187cabd67a3a524a0337cc925a3f17624c86767bd87a2d18a59b2b h2-4.0.0.tar.gz
-c92a5577338b6ef355a203a2a74ba3d6b997458a179fa7d12eaf4a0f89fe430a2c90a586791afd0c1563d94352586d59aacfb34926c67e5ec7d2236b2c0fcff2 hypothesis-6.6.patch"
+sha512sums="
+4e9cf88b3ae702a8a42bded775ad337809787fe8172d501c230d55abbf1edd764acf3b227f2e58756d882499661ffcf6bbdd4812a4d938c04fac3f1aa2390b28 h2-4.1.0.tar.gz
+a6de0d6342ac3e3b107d5f6863e8b2434d361ac9efbf9eb3fed1e25660ae9d69b8cf5a97cb6d3e94265e4c4aa6d70d2051f050067d7f1ffb59997bfc670e75fb skip-broken-tests.patch
+"
diff --git a/community/py3-h2/hypothesis-6.6.patch b/community/py3-h2/hypothesis-6.6.patch
deleted file mode 100644
index 69a0456be4..0000000000
--- a/community/py3-h2/hypothesis-6.6.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 0646279dab694a89562846c810202ce2c0b49be3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 8 Mar 2021 19:16:26 +0100
-Subject: [PATCH] Workaround the issues with hypothesis 6.6
-
-Hypothesis 6.6 will produce:
-
- E hypothesis.errors.FailedHealthCheck: test/test_flow_control_window.py::TestAutomaticFlowControl::test_mixing_update_forms uses the 'frame_factory' fixture, which is reset between function calls but not between test cases generated by `@given(...)`. You can change it to a module- or session-scoped fixture if it is safe to reuse; if not we recommend using a context manager inside your test function. See https://docs.pytest.org/en/latest/fixture.html#sharing-test-data for details on fixture scope.
- E See https://hypothesis.readthedocs.io/en/latest/healthchecks.html for more information about this. If you want to disable just this health check, add HealthCheck.function_scoped_fixture to the suppress_health_check settings for this test.
-
-Since the tests already workaround the problem,
-acknowledging https://github.com/HypothesisWorks/hypothesis-python/issues/377,
-we can safely disable the check.
-
-Hypothesis 5.49 introduced the function_scoped_fixture health check value,
-hence it is now the lowest required version of hypothesis.
----
- test/test_basic_logic.py | 3 ++-
- test/test_flow_control_window.py | 7 ++++++-
- tox.ini | 2 +-
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_basic_logic.py b/test/test_basic_logic.py
-index fb54fe50..8c8f3b7d 100644
---- a/test/test_basic_logic.py
-+++ b/test/test_basic_logic.py
-@@ -21,7 +21,7 @@
-
- from . import helpers
-
--from hypothesis import given
-+from hypothesis import given, settings, HealthCheck
- from hypothesis.strategies import integers
-
-
-@@ -790,6 +790,7 @@ def test_headers_are_lowercase(self, frame_factory):
- assert c.data_to_send() == expected_frame.serialize()
-
- @given(frame_size=integers(min_value=2**14, max_value=(2**24 - 1)))
-+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
- def test_changing_max_frame_size(self, frame_factory, frame_size):
- """
- When the user changes the max frame size and the change is ACKed, the
-diff --git a/test/test_flow_control_window.py b/test/test_flow_control_window.py
-index 24b345aa..7a445af1 100644
---- a/test/test_flow_control_window.py
-+++ b/test/test_flow_control_window.py
-@@ -7,7 +7,7 @@
- """
- import pytest
-
--from hypothesis import given
-+from hypothesis import given, settings, HealthCheck
- from hypothesis.strategies import integers
-
- import h2.config
-@@ -715,6 +715,7 @@ def _setup_connection_and_send_headers(self, frame_factory):
- return c
-
- @given(stream_id=integers(max_value=0))
-+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
- def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
- """
- Flow control acknowledgements must be done on a stream ID that is
-@@ -740,6 +741,7 @@ def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
- )
-
- @given(size=integers(max_value=-1))
-+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
- def test_cannot_acknowledge_less_than_zero(self, frame_factory, size):
- """
- The user must acknowledge at least 0 bytes.
-@@ -837,6 +839,7 @@ def test_acknowledging_streams_we_never_saw(self, frame_factory):
- c.acknowledge_received_data(2048, stream_id=101)
-
- @given(integers(min_value=1025, max_value=DEFAULT_FLOW_WINDOW))
-+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
- def test_acknowledging_1024_bytes_when_empty_increments(self,
- frame_factory,
- increment):
-@@ -873,6 +876,7 @@ def test_acknowledging_1024_bytes_when_empty_increments(self,
- # This test needs to use a lower cap, because otherwise the algo will
- # increment the stream window anyway.
- @given(integers(min_value=1025, max_value=(DEFAULT_FLOW_WINDOW // 4) - 1))
-+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
- def test_connection_only_empty(self, frame_factory, increment):
- """
- If the connection flow control window is empty, but the stream flow
-@@ -916,6 +920,7 @@ def test_connection_only_empty(self, frame_factory, increment):
- assert c.data_to_send() == expected_data
-
- @given(integers(min_value=1025, max_value=DEFAULT_FLOW_WINDOW))
-+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
- def test_mixing_update_forms(self, frame_factory, increment):
- """
- If the user mixes ackowledging data with manually incrementing windows,
-diff --git a/tox.ini b/tox.ini
-index 69291df6..1f5e538b 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -15,7 +15,7 @@ deps =
- pytest==6.0.2
- pytest-cov==2.10.1
- pytest-xdist==2.1.0
-- hypothesis>=5.5,<6
-+ hypothesis>=5.49,<7
- commands =
- pytest --cov-report=xml --cov-report=term --cov=h2 {posargs}
-
diff --git a/community/py3-h2/skip-broken-tests.patch b/community/py3-h2/skip-broken-tests.patch
new file mode 100644
index 0000000000..975ba09b46
--- /dev/null
+++ b/community/py3-h2/skip-broken-tests.patch
@@ -0,0 +1,38 @@
+--- a/test/test_basic_logic.py
++++ b/test/test_basic_logic.py
+@@ -789,6 +789,9 @@
+
+ assert c.data_to_send() == expected_frame.serialize()
+
++ import platform
++ @pytest.mark.skipif(platform.machine() == "i686", reason="Test broken on x86")
++ @pytest.mark.skipif(platform.machine() == "s390x", reason="Test broken on s390x")
+ @given(frame_size=integers(min_value=2**14, max_value=(2**24 - 1)))
+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+ def test_changing_max_frame_size(self, frame_factory, frame_size):
+--- a/test/test_flow_control_window.py
++++ b/test/test_flow_control_window.py
+@@ -5,6 +5,7 @@
+
+ Tests of the flow control management in h2
+ """
++import platform
+ import pytest
+
+ from hypothesis import given, settings, HealthCheck
+@@ -714,6 +715,7 @@
+ c.clear_outbound_data_buffer()
+ return c
+
++ @pytest.mark.skipif(platform.machine() == "s390x", reason="Test broken on s390x")
+ @given(stream_id=integers(max_value=0))
+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+ def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
+@@ -875,6 +877,7 @@
+
+ # This test needs to use a lower cap, because otherwise the algo will
+ # increment the stream window anyway.
++ @pytest.mark.skipif(platform.machine() == "i686", reason="Test broken on x86")
+ @given(integers(min_value=1025, max_value=(DEFAULT_FLOW_WINDOW // 4) - 1))
+ @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+ def test_connection_only_empty(self, frame_factory, increment):
diff --git a/community/py3-matplotlib/APKBUILD b/community/py3-matplotlib/APKBUILD
index 25a317e9cf..d499c39765 100644
--- a/community/py3-matplotlib/APKBUILD
+++ b/community/py3-matplotlib/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
pkgname=py3-matplotlib
_pyname=matplotlib
-pkgver=3.5.1
-pkgrel=4
+pkgver=3.5.2
+pkgrel=0
pkgdesc="Python3 library for plots"
url="https://matplotlib.org"
# riscv64: ftbfs
@@ -41,7 +41,7 @@ checkdepends="
ttf-opensans
"
source="https://github.com/matplotlib/$_pyname/archive/v$pkgver/matplotlib-v$pkgver.tar.gz
- https://github.com/boomanaiden154/matplotlib-test-images/releases/download/matplotlib-$pkgver/matplotlib-images.tar.gz
+ $pkgname-images-$pkgver.tar.gz::https://github.com/boomanaiden154/matplotlib-test-images/releases/download/matplotlib-$pkgver/matplotlib-images.tar.gz
freetype.patch
test.patch
"
@@ -80,8 +80,8 @@ package() {
rm -r "$pkgdir/usr/lib/python3.10/site-packages/mpl_toolkits/tests/"
}
sha512sums="
-c6cee81a9d06b879eb64204d64f8cdedea2533927ab1023202ab999e2503bc41a40716901679eb79b131fff3e413942d501e3c6ef82b053170088b56d0a7ce26 matplotlib-v3.5.1.tar.gz
-157324ac666a95e213a99a6f2ae2626dac161178e8e5f3d1f64030a139ca99a71d6c0581a17c40ccc37ba894194865bdbb81eb97b242fa865054da9737f02124 matplotlib-images.tar.gz
-b56a3c6c2e4f0ec6db42df794b29184e0c1a2661ce443ac9e029aa7fd541a668df2244b8b6c26cc9a03cb818334551a817d5793d21fb14e63f324538dc54fdc3 freetype.patch
+9b6e87aeee69e106c90d1f915d2f97bf42a538bc00d885c884d2723355c2339c2cf036d2d80097db50ffa6c48a3118d96ad4cec7ff38368b19ce33eaae75f396 matplotlib-v3.5.2.tar.gz
+8807fb1243b89059f75b7fd119890693c8e148d21bc1011d649a17b737facbba8a0fd5fb80e7628e1c0269e55a7c0c76f5ead948e7a2598f37347ee47f32ab23 py3-matplotlib-images-3.5.2.tar.gz
+7f1360a96c9cad4946ff55ef68c8b5875c446015e1084cc65e164a62e354b0819cac51e169b7b3cd5e96e2aa68f8f27b116bd67e6daa70a9f2e53981d3081e0e freetype.patch
fdadf88a5fd04924e1b07e291e0d4805d1aaabf09a92fa7d3e5d63f612f3492035a46432b123e2e4fc4552effb17618949731da552067a4c512afdbccd2928e6 test.patch
"
diff --git a/community/py3-matplotlib/freetype.patch b/community/py3-matplotlib/freetype.patch
index 11e8109ee7..253eb1d833 100644
--- a/community/py3-matplotlib/freetype.patch
+++ b/community/py3-matplotlib/freetype.patch
@@ -1,8 +1,8 @@
Patch-Source: https://src.fedoraproject.org/rpms/python-matplotlib/raw/rawhide/f/0002-Set-FreeType-version-to-2.11.0-and-update-tolerances.patch
-From 3e06485b38ce4059ac3019a521e6efa446a24d5d Mon Sep 17 00:00:00 2001
+From 200afb4b8503031e1aad437482b2bc61b1cede32 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 14 Feb 2020 06:05:42 -0500
-Subject: [PATCH 2/4] Set FreeType version to 2.11.0 and update tolerances.
+Subject: [PATCH 2/3] Set FreeType version to 2.11.0 and update tolerances.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@@ -29,10 +29,10 @@ index bc800e1322..10ff904c8e 100644
from matplotlib import ft2font
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 39b2478637..98878513b5 100644
+index eb4c34382b..03b92d34fa 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
-@@ -6594,7 +6594,7 @@ def test_normal_axes():
+@@ -6710,7 +6710,7 @@ def test_normal_axes():
]
for nn, b in enumerate(bbaxis):
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@@ -41,7 +41,7 @@ index 39b2478637..98878513b5 100644
target = [
[150.0, 119.999, 930.0, 11.111],
-@@ -6612,7 +6612,7 @@ def test_normal_axes():
+@@ -6728,7 +6728,7 @@ def test_normal_axes():
target = [85.5138, 75.88888, 1021.11, 1017.11]
targetbb = mtransforms.Bbox.from_bounds(*target)
@@ -51,10 +51,10 @@ index 39b2478637..98878513b5 100644
# test that get_position roundtrips to get_window_extent
axbb = ax.get_position().transformed(fig.transFigure).bounds
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index a717eace83..64b9262143 100644
+index 8fd3cc5a35..b1e0fa57cd 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -411,7 +411,7 @@ def test_hidden_axes():
+@@ -431,7 +431,7 @@ def test_hidden_axes():
extents1 = np.copy(axs[0, 0].get_position().extents)
np.testing.assert_allclose(
@@ -130,10 +130,10 @@ index e9b01b160d..beab853489 100644
diff --git a/setupext.py b/setupext.py
-index e41ab98fe1..ff7f45d804 100644
+index 90bc304531..7ae976b8fa 100644
--- a/setupext.py
+++ b/setupext.py
-@@ -167,12 +167,18 @@ _freetype_hashes = {
+@@ -167,6 +167,12 @@ _freetype_hashes = {
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
'2.10.1':
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
@@ -143,17 +143,19 @@ index e41ab98fe1..ff7f45d804 100644
+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
+ '2.11.0':
+ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
+ '2.11.1':
+ 'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b'
}
- # This is the version of FreeType to use when building a local version. It
+@@ -174,7 +180,7 @@ _freetype_hashes = {
# must match the value in lib/matplotlib.__init__.py and also needs to be
# changed below in the embedded windows build script (grep for "REMINDER" in
# this file). Also update the cache path in `.circleci/config.yml`.
--LOCAL_FREETYPE_VERSION = '2.6.1'
-+LOCAL_FREETYPE_VERSION = '2.11.0'
- LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
-
- # Also update the cache path in `.circleci/config.yml`.
-@@ -581,6 +587,7 @@ class FreeType(SetupPackage):
+-TESTING_VERSION_OF_FREETYPE = '2.6.1'
++TESTING_VERSION_OF_FREETYPE = '2.11.0'
+ if sys.platform.startswith('win') and platform.machine() == 'ARM64':
+ # older versions of freetype are not supported for win/arm64
+ # Matplotlib tests will not pass
+@@ -590,6 +596,7 @@ class FreeType(SetupPackage):
ext.extra_objects.insert(
0, str(src_path / 'objs' / '.libs' / libfreetype))
ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
@@ -162,5 +164,5 @@ index e41ab98fe1..ff7f45d804 100644
def do_custom_build(self, env):
# We're using a system freetype
--
-2.31.1
+2.35.1
diff --git a/community/py3-mypy/APKBUILD b/community/py3-mypy/APKBUILD
index 9b59786532..225d4dd05c 100644
--- a/community/py3-mypy/APKBUILD
+++ b/community/py3-mypy/APKBUILD
@@ -1,14 +1,18 @@
# Contributor: Justin Berthault <justin.berthault@zaclys.net>
# Maintainer: Justin Berthault <justin.berthault@zaclys.net>
pkgname=py3-mypy
-pkgver=0.941
+pkgver=0.950
pkgrel=0
pkgdesc="Optional static typing for Python (PEP484)"
options="!check" # Tests fail on builders, pass on CI
url="https://www.mypy-lang.org/"
arch="noarch"
license="MIT"
-depends="py3-mypy-extensions py3-toml py3-typing-extensions py3-typed-ast"
+depends="
+ py3-mypy-extensions
+ py3-tomli
+ py3-typing-extensions
+ "
makedepends="python3-dev py3-setuptools"
checkdepends="py3-pytest py3-pytest-xdist py3-lxml py3-virtualenv"
source="https://files.pythonhosted.org/packages/source/m/mypy/mypy-$pkgver.tar.gz"
@@ -32,5 +36,5 @@ package() {
}
sha512sums="
-b29f3debbc0b79afad5417e8db5784c3a725a4dfbed69c22af91558ab798f6bc4f8ad59fbdeb22d16e6e4b3abc21a9bbb71e2075acc5494ace0bc13513880c73 mypy-0.941.tar.gz
+4766c5a28e3e248263a8d35aecd231667dfea8c3423cbacd2bb07a356f0e00be4f8cff82e3f417c141f088ce946589f98c5a1e3a80fe129f7d362bb8f099dfab mypy-0.950.tar.gz
"
diff --git a/testing/py3-nbxmpp/APKBUILD b/community/py3-nbxmpp/APKBUILD
index 1f77ea8686..16d6d671ae 100644
--- a/testing/py3-nbxmpp/APKBUILD
+++ b/community/py3-nbxmpp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Peter Shkenev <santurysim@gmail.com>
pkgname=py3-nbxmpp
_pkgname=nbxmpp
-pkgver=2.0.6
+pkgver=3.0.1
pkgrel=0
pkgdesc="A non-blocking XMPP implementation for python"
url="https://dev.gajim.org/gajim/python-nbxmpp/"
@@ -25,5 +25,5 @@ package() {
}
sha512sums="
-258cdc253b91e8550f26236f80fe16ad112c58fd936337a5b11563db8d2535004475ed7bdf5a78172640cd6d6dc86c654f2feb1d4b38a62b92566768c74d65a0 nbxmpp-2.0.6.tar.gz
+29c4d63e22893db11831f3496774b077d29de2f58ab3f9f76e9be8a527428a38e1f9fe6510b9f39e92c859f333ccdafb98b148141744e3fbb8b598b611fcf646 nbxmpp-3.0.1.tar.gz
"
diff --git a/testing/py3-niaaml/APKBUILD b/community/py3-niaaml/APKBUILD
index 10d099053e..63af0ac643 100644
--- a/testing/py3-niaaml/APKBUILD
+++ b/community/py3-niaaml/APKBUILD
@@ -11,7 +11,8 @@ license="MIT"
depends="python3 py3-numpy py3-pandas py3-niapy py3-scikit-learn"
checkdepends="python3-dev py3-pytest"
makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/N/NiaAML/NiaAML-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/N/NiaAML/NiaAML-$pkgver.tar.gz
+do-not-package-tests.patch"
builddir="$srcdir/$_pkgorig-$pkgver"
build() {
@@ -28,4 +29,5 @@ package() {
sha512sums="
a4b1df54746b0d97f3b9a7a1c1a38f860123e77f8cb9eda8a88a64d3afd3512e25467dc686f32d83537175d92d25db1aeb1bdd89a598ac47cbe64dd5f61e6a6c py3-niaaml-1.1.7.tar.gz
+438062e2ee0ab4aae2f8629301bb68cdb95e8ea008cfba54648a31030e702323223f84a51c4932f6894e00a78c01361b150d6014ac279cad2d4badc672c53fb0 do-not-package-tests.patch
"
diff --git a/community/py3-niaaml/do-not-package-tests.patch b/community/py3-niaaml/do-not-package-tests.patch
new file mode 100644
index 0000000000..f26298231a
--- /dev/null
+++ b/community/py3-niaaml/do-not-package-tests.patch
@@ -0,0 +1,24 @@
+--- a/setup.py
++++ b/setup.py
+@@ -10,12 +10,8 @@
+ 'niaaml.preprocessing.encoding',
+ 'niaaml.preprocessing.feature_selection',
+ 'niaaml.preprocessing.feature_transform',
+- 'niaaml.preprocessing.imputation',
+- 'niaaml.tests']
++ 'niaaml.preprocessing.imputation']
+
+-package_data = \
+-{'': ['*'], 'niaaml.tests': ['tests_files/*']}
+-
+ install_requires = \
+ ['niapy>=2.0.0,<3.0.0',
+ 'numpy>=1.19.1,<2.0.0',
+@@ -33,7 +29,6 @@
+ 'maintainer_email': None,
+ 'url': 'https://github.com/lukapecnik/NiaAML',
+ 'packages': packages,
+- 'package_data': package_data,
+ 'install_requires': install_requires,
+ 'python_requires': '>=3.6.2,<4.0.0',
+ }
diff --git a/testing/py3-niapy/APKBUILD b/community/py3-niapy/APKBUILD
index befc341a44..befc341a44 100644
--- a/testing/py3-niapy/APKBUILD
+++ b/community/py3-niapy/APKBUILD
diff --git a/community/py3-oci/APKBUILD b/community/py3-oci/APKBUILD
index 4453dd63e0..0fd9220849 100644
--- a/community/py3-oci/APKBUILD
+++ b/community/py3-oci/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=py3-oci
-pkgver=2.66.0
+pkgver=2.67.0
pkgrel=0
pkgdesc="Oracle Cloud Infrastructure Python SDK"
url="https://docs.oracle.com/en-us/iaas/tools/python/2.53.1/index.html"
@@ -28,6 +28,6 @@ package() {
}
sha512sums="
-b8fd022933a7515a3ece55065f94404450c20fe787dbfbc9a434a410ad04835ed1012d8371927eded95259cdeb9b9cdbd8f325216ad018723fbf7e69fd39ba3b py3-oci.2.66.0.zip
+872d9fce9f1ad287986a2e09a601249ed67095549254960f90cee39a8ffc921cffabb1e9b4c2bce4c7e0366d93c5b7d8144ce1d80e469787d5a0905eea9e68dd py3-oci.2.67.0.zip
e88495f19a3b9bd4b4b086007e2c93d6200aa316e93c1ec58b31794afb58967994f061a5ad1346edbbecd9119cea7a60c1e2ac6cba99f78b4e349b8f594ce01f vcr.patch
"
diff --git a/community/py3-oletools/APKBUILD b/community/py3-oletools/APKBUILD
index 40c5e67816..5485ff2b16 100644
--- a/community/py3-oletools/APKBUILD
+++ b/community/py3-oletools/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=py3-oletools
-pkgver=0.60
-pkgrel=1
+pkgver=0.60.1
+pkgrel=0
pkgdesc="tools to analyze security characteristics of MS Office and OLE files"
url="https://www.decalage.info/python/oletools"
arch="noarch"
@@ -31,8 +31,8 @@ build() {
}
check() {
- # deselected test returns unknown file type
- pytest --deselect tests/oleid/test_basic.py::TestOleIDBasic::test_all
+ # deselected test returns unknown file type, test_xlm returns 2 instead of 3 macros
+ pytest --deselect tests/oleid/test_basic.py::TestOleIDBasic::test_all --deselect tests/olevba/test_basic.py::TestOlevbaBasic::test_xlm
}
package() {
@@ -40,6 +40,6 @@ package() {
}
sha512sums="
-2e29bd29e013812a9c9fdfed237232d499632692861caadb1281fd71e6f8d59a4270a5c82aab119c77cb058aec8c08c54c96c177bb77464c63704869b29bd06f py3-oletools-0.60.tar.gz
+c867c8f1c3d2b8217ae54ba13ae5566ccca173a8824e2d3ea83d22dad0d3b30508135a677e77838318ee1a1950fd1d477968806c0fb9e8302c4a23d4665e02fb py3-oletools-0.60.1.tar.gz
a7f015fac09f36fffb971818519d7d0d87884eb80580c068f5e7460427fc713272a3a4ed78d321f65d8ad47e61966e4a9db52b50736bace3f80f44df17ec8de2 unbundle.patch
"
diff --git a/testing/py3-openpyxl/APKBUILD b/community/py3-openpyxl/APKBUILD
index ee955e16aa..ee955e16aa 100644
--- a/testing/py3-openpyxl/APKBUILD
+++ b/community/py3-openpyxl/APKBUILD
diff --git a/testing/py3-precis-i18n/APKBUILD b/community/py3-precis-i18n/APKBUILD
index a6ad1e322b..a6ad1e322b 100644
--- a/testing/py3-precis-i18n/APKBUILD
+++ b/community/py3-precis-i18n/APKBUILD
diff --git a/community/py3-pybind11/APKBUILD b/community/py3-pybind11/APKBUILD
index d5f57c2024..0e515e0c63 100644
--- a/community/py3-pybind11/APKBUILD
+++ b/community/py3-pybind11/APKBUILD
@@ -2,7 +2,7 @@
pkgname=py3-pybind11
_pkgname=pybind11
pkgver=2.6.2
-pkgrel=3
+pkgrel=4
pkgdesc="Seamless operability between C++11 and Python"
url="https://github.com/pybind/pybind11"
arch="noarch"
diff --git a/testing/py3-pyswarms/APKBUILD b/community/py3-pyswarms/APKBUILD
index 278df47012..a507d9ed67 100644
--- a/testing/py3-pyswarms/APKBUILD
+++ b/community/py3-pyswarms/APKBUILD
@@ -37,6 +37,7 @@ check() {
}
package() {
+ rm -rf tests/
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/community/py3-rasterio/APKBUILD b/community/py3-rasterio/APKBUILD
index db252314a0..53686c7bc2 100644
--- a/community/py3-rasterio/APKBUILD
+++ b/community/py3-rasterio/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
pkgname=py3-rasterio
pkgver=1.2.10
-pkgrel=1
+pkgrel=2
pkgdesc="Fast and direct raster I/O for use with Numpy and SciPy"
url="https://pypi.python.org/pypi/rasterio"
arch="all"
diff --git a/community/py3-regex/APKBUILD b/community/py3-regex/APKBUILD
index 2bedd6d43f..0d8f95c90a 100644
--- a/community/py3-regex/APKBUILD
+++ b/community/py3-regex/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=py3-regex
-pkgver=2021.11.1
-pkgrel=1
+pkgver=2022.4.24
+pkgrel=0
pkgdesc="More featureful implementation of the 're' module"
-url="https://bitbucket.org/mrabarnett/mrab-regex"
+url="https://github.com/mrabarnett/mrab-regex"
arch="all"
-license="CNRI-Python"
+license="Apache-2.0"
depends="python3"
makedepends="python3-dev py3-setuptools"
options="!check" # no tests
@@ -22,5 +22,5 @@ package() {
}
sha512sums="
-98efb00a88548ec63759f82870775d192ad2456d6c7b6362837e66980f029356fc270e991cf40ea049ead4c98d2baf8bb9a19b118ded7fb24a0bd6efcc1f6916 regex-2021.11.1.tar.gz
+2b9e83c7164986eceed5ae0e33aca9075afa022398684bb688064394cfa43f06b0ce72c15fb7ceee55b7793072c7b1d7709513faedce4719f0c406164e9e0593 regex-2022.4.24.tar.gz
"
diff --git a/testing/py3-tcxreader/APKBUILD b/community/py3-tcxreader/APKBUILD
index 8c413d223e..8c413d223e 100644
--- a/testing/py3-tcxreader/APKBUILD
+++ b/community/py3-tcxreader/APKBUILD
diff --git a/community/qbittorrent/APKBUILD b/community/qbittorrent/APKBUILD
index 76569c0a19..ef74a4983a 100644
--- a/community/qbittorrent/APKBUILD
+++ b/community/qbittorrent/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: psykose <alice@ayaya.dev>
pkgname=qbittorrent
pkgver=4.4.2
-pkgrel=4
+pkgrel=5
pkgdesc="qBittorrent client"
url="https://www.qbittorrent.org/"
arch="all !s390x" # qt6-qttools
diff --git a/community/quassel/APKBUILD b/community/quassel/APKBUILD
index ca1ae1e238..75a9c64b57 100644
--- a/community/quassel/APKBUILD
+++ b/community/quassel/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=quassel
pkgver=0.14.0
-pkgrel=2
+pkgrel=3
url="https://www.quassel-irc.org/"
pkgdesc="Distributed IRC client - metapackage"
arch="all"
diff --git a/community/rclone/APKBUILD b/community/rclone/APKBUILD
index 7209294447..638095ac04 100644
--- a/community/rclone/APKBUILD
+++ b/community/rclone/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Chloe Kudryavtsev <toast@toast.cafe>
pkgname=rclone
pkgver=1.58.1
-pkgrel=0
+pkgrel=1
pkgdesc="Rsync for cloud storage"
url="https://rclone.org/"
# riscv64 blocked by binutils-gold
diff --git a/community/rest-server/APKBUILD b/community/rest-server/APKBUILD
index 6955656080..23c2ded48f 100644
--- a/community/rest-server/APKBUILD
+++ b/community/rest-server/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=rest-server
pkgver=0.11.0
-pkgrel=2
+pkgrel=3
pkgdesc="A high performance HTTP server that implements restic's REST backend API"
url="https://github.com/restic/rest-server"
arch="all"
diff --git a/community/restic/APKBUILD b/community/restic/APKBUILD
index 028a28f2e6..10cb07bb33 100644
--- a/community/restic/APKBUILD
+++ b/community/restic/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=restic
pkgver=0.13.1
-pkgrel=1
+pkgrel=2
pkgdesc="Fast, secure, efficient backup program"
url="https://restic.net/"
# armhf: https://github.com/restic/restic/issues/3505
diff --git a/community/riot-web/APKBUILD b/community/riot-web/APKBUILD
index e3314a22ae..b47d23eba6 100644
--- a/community/riot-web/APKBUILD
+++ b/community/riot-web/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=riot-web
-pkgver=1.10.11
+pkgver=1.10.12
pkgrel=0
pkgdesc="A glossy Matrix collaboration client for the web"
url="https://riot.im/"
@@ -33,5 +33,5 @@ package() {
}
sha512sums="
-003f865ed5e8ab89d8427338229af944123222e5f36dac10432e7f83beef20b992746a69a39f56ecf3bcc722644eff387d663f327b558620061ec43114a1bd63 element-v1.10.11.tar.gz
+ad89d30d7599bc515546107a116570e27c0d943ed34878f846ee4dd2564d8d43b277f3a194e3beb5982fba78cd2fe650e3c24f38063ec4e48fe6956f3e679a95 element-v1.10.12.tar.gz
"
diff --git a/community/rippled/APKBUILD b/community/rippled/APKBUILD
index d33917234e..5ebe4ece54 100644
--- a/community/rippled/APKBUILD
+++ b/community/rippled/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=rippled
pkgver=1.9.0
-pkgrel=0
+pkgrel=1
pkgdesc="Blockchain daemon implementing the Ripple Consensus Ledger"
options="net !check" # FIXME: 1 failure, rippled testsuite doesn't tell which one it is
url="https://ripple.com/"
diff --git a/community/rocs/APKBUILD b/community/rocs/APKBUILD
index 47144c21d5..32794a243b 100644
--- a/community/rocs/APKBUILD
+++ b/community/rocs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=rocs
pkgver=22.04.0
-pkgrel=1
+pkgrel=2
# armhf blocked by extra-cmake-modules
# s390x blocked by kxmlgui
# riscv64 disabled due to missing rust in recursive dependency
diff --git a/community/rtl8821ce-lts/APKBUILD b/community/rtl8821ce-lts/APKBUILD
index f60bb22c24..a1baa4e626 100644
--- a/community/rtl8821ce-lts/APKBUILD
+++ b/community/rtl8821ce-lts/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
-_kver=5.15.38
+_kver=5.15.39
_krel=0
_flavor="$FLAVOR"
[ -z "$_flavor" ] && _flavor=lts
diff --git a/community/rtpengine-lts/APKBUILD b/community/rtpengine-lts/APKBUILD
index cf2c0cd319..70bd6be5c3 100644
--- a/community/rtpengine-lts/APKBUILD
+++ b/community/rtpengine-lts/APKBUILD
@@ -5,7 +5,7 @@ _ver=10.3.1.7
_rel=0
# kernel version
-_kver=5.15.38
+_kver=5.15.39
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/community/runc/APKBUILD b/community/runc/APKBUILD
index 4e0fb15890..cebde5de0e 100644
--- a/community/runc/APKBUILD
+++ b/community/runc/APKBUILD
@@ -4,9 +4,9 @@
pkgname=runc
pkgdesc="CLI tool for spawning and running containers according to the OCI specification"
url="https://www.opencontainers.org"
-_commit=52de29d7e0f8c0899bd7efb8810dd07f0073fa87
-pkgver=1.1.1
-pkgrel=1
+_commit=a916309fff0f838eb94e928713dbc3c0d0ac7aa4
+pkgver=1.1.2
+pkgrel=0
arch="all"
license="Apache-2.0"
makedepends="bash go go-md2man libseccomp-dev libtool"
@@ -16,6 +16,8 @@ builddir="$srcdir/src/github.com/opencontainers/runc"
options="!check"
# secfixes:
+# 1.1.2-r0:
+# - CVE-2022-29162
# 1.0.3-r0:
# - CVE-2021-43784
# 1.0.0_rc95-r0:
@@ -44,5 +46,5 @@ package() {
}
sha512sums="
-baf622e7edae9b68d2fa255f02359d770489c7578be3c6379a5d939b4f1dfa697ec9eb4ef7dce252e64ee5225f76c06e45182a9b92b68a952e21e3f5f91450d0 runc-1.1.1.tar.gz
+61d8cc82f49e3bc1cf4cc4ae18a9d9c8f4ae93e8380ce6fa9034b154bd1b915339ee65babdf7518021d015a3c31545fcbad5bbf0c4579c7eb50988877121f049 runc-1.1.2.tar.gz
"
diff --git a/community/rust-analyzer/APKBUILD b/community/rust-analyzer/APKBUILD
index c7df3222c1..fd099529c6 100644
--- a/community/rust-analyzer/APKBUILD
+++ b/community/rust-analyzer/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: S.M Mukarram Nainar <theone@sm2n.ca>
# Maintainer: S.M Mukarram Nainar <theone@sm2n.ca>
pkgname=rust-analyzer
-pkgver=2022.05.02
+pkgver=2022.05.09
_pkgver=${pkgver//./-}
-pkgrel=1
+pkgrel=0
pkgdesc="A Rust compiler front-end for IDEs"
url="https://github.com/rust-lang/rust-analyzer"
# armhf, armv7, x86: some tests fail, not supported by upstream
@@ -40,5 +40,5 @@ package() {
}
sha512sums="
-a8de7c62e7a1f4cdeaad9d3773cbbe6081e484b5a71eac412124088d21304242441858426356c897569657481c06b0dbd01f05a191bf2d01274cfb6847d43960 rust-analyzer-2022.05.02.tar.gz
+347c530a158dd7430a35e8330b556030eaa3747645d37dcbdb432fdbd0b1f12971fe586c159fd5c73d6a3b074b266fe7a8f9e622a20f591f9dd9469ec7282f5e rust-analyzer-2022.05.09.tar.gz
"
diff --git a/community/sbctl/APKBUILD b/community/sbctl/APKBUILD
index ac9456f935..c83b81b0fd 100644
--- a/community/sbctl/APKBUILD
+++ b/community/sbctl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: psykose <alice@ayaya.dev>
pkgname=sbctl
pkgver=0.9
-pkgrel=0
+pkgrel=1
pkgdesc="Secure Boot key manager"
url="https://github.com/Foxboron/sbctl/"
arch="all"
diff --git a/community/scribus/APKBUILD b/community/scribus/APKBUILD
index 114d0e3070..9016ba38b3 100644
--- a/community/scribus/APKBUILD
+++ b/community/scribus/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=scribus
pkgver=1.5.8
-pkgrel=3
+pkgrel=5
pkgdesc="libre desktop publishing"
url="https://www.scribus.net/"
arch="all"
@@ -16,8 +16,10 @@ makedepends="cmake boost-dev cairo-dev cups-dev harfbuzz-dev hunspell-dev
subpackages="$pkgname-doc $pkgname-lang"
source="https://downloads.sourceforge.net/scribus/scribus-$pkgver.tar.xz
fix-util_debug.cpp.patch
- poppler-22.02.patch
+ poppler-22.02-1.patch
+ poppler-22.02-2.patch
poppler-22.03.patch
+ poppler-22.04.patch
"
langdir="/usr/share/scribus/translations"
@@ -48,6 +50,8 @@ package() {
sha512sums="
eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d scribus-1.5.8.tar.xz
b56359d5e7aa3001cef6a9d6330e5c32a4c7570880b9eeeb79f6ff0ea7a050a5f3964ad0fef653a437e200dfc5d714a8a9c6b30158bbb1abf5d4bc98445f5205 fix-util_debug.cpp.patch
-fba5da56416c8a84d66e664ccd07cb4fc451de7bc94effa8bcbd1240cc0370ba4a43c89e4283e8a67627cb1070a6a398c196a368c5825f93c349d38574b0805d poppler-22.02.patch
-f696e1be43d9280829260545888cc83c575e10cbfc766e7c4899fed0521716566149becd1895d721469ca5e9d2c531487eda1547b2d8c3831388e657235fa3fb poppler-22.03.patch
+d854a141ddfb66e079bf5f1bf4b8ae6c6c2384838033b423aebbfa78cdc93d649a2979df790b67f1b8ceb6865dfed40a5d42deeb2a7fd3f675b6a5f82d6f5264 poppler-22.02-1.patch
+8e91318722006af7ad034bc6f17f331978cd169b6435f148631d2016b03f5207990d4e07fa4ad5ce26dc1c2fcdda8d3aa1689374146da9d181733254f5ca005a poppler-22.02-2.patch
+a441e281555b5ae640e275e130424ffb35975825fa530a40dc051fec6cc0aaa0303f7fb7e6ef767abd4ed661c95aacc8f3dfe7e35e858450a8bf5ce493480175 poppler-22.03.patch
+8c13e54b62ea0aebaff9a4f55742159906218bc920c19c9467b975d2e182fe2ea72e71adf29506b9c9a88fb7367365a1bc018d1774f56bb4c4ed6100b97d72d2 poppler-22.04.patch
"
diff --git a/community/scribus/poppler-22.02-1.patch b/community/scribus/poppler-22.02-1.patch
new file mode 100644
index 0000000000..ccd65774b8
--- /dev/null
+++ b/community/scribus/poppler-22.02-1.patch
@@ -0,0 +1,130 @@
+Patch-Source: https://github.com/scribusproject/scribus/commit/https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92
+From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Feb 2022 23:12:52 +0000
+Subject: [PATCH] #16734: Build break with poppler 22.2.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++-----
+ 1 file changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 5894bf2ad6..3650c96f52 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
+
+ #include "slaoutput.h"
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#include <memory>
++#include <optional>
++#endif
++
+ #include <poppler/GlobalParams.h>
+ #include <poppler/poppler-config.h>
+ #include <poppler/FileSpec.h>
+@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+ GfxFont *gfxFont;
+- GfxFontLoc *fontLoc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ const GooString * fileName = nullptr;
++ std::unique_ptr<FoFiTrueType> ff;
++#else
++ GfxFontLoc * fontLoc = nullptr;
++ GooString * fileName = nullptr;
++ FoFiTrueType * ff = nullptr;
++#endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+- FoFiTrueType *ff;
+ Object refObj, strObj;
+- GooString *fileName;
+- char *tmpBuf;
++ char *tmpBuf = nullptr;
+ int tmpBufLen = 0;
+- int *codeToGID;
+- const double *textMat;
++ int *codeToGID = nullptr;
++ const double *textMat = nullptr;
+ double m11, m12, m21, m22, fontSize;
+ SplashCoord mat[4];
+ int n = 0;
+@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
+ SplashCoord matrix[6];
+
+ m_font = nullptr;
+- fileName = nullptr;
+- tmpBuf = nullptr;
+- fontLoc = nullptr;
+
+ gfxFont = state->getFont();
+ if (!gfxFont)
+@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+ else
+ { // gfxFontLocExternal
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ fileName = fontLoc->pathAsGooString();
++#else
+ fileName = fontLoc->path;
++#endif
+ fontType = fontLoc->fontType;
+ }
+
+@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (ff)
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());
++ ff.reset();
++#else
+ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
+- n = 256;
+ delete ff;
++#endif
++ n = 256;
+ }
+ else
+ {
+@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (! ff)
+ goto err2;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
++ ff.reset();
++#else
+ codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
+ delete ff;
++#endif
+ }
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+ id,
+@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
+ mat[3] = -m22;
+ m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
+ return;
+
+ err2:
+ delete id;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
++
+ err1:
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
diff --git a/community/scribus/poppler-22.02-2.patch b/community/scribus/poppler-22.02-2.patch
new file mode 100644
index 0000000000..41bcd8dc9b
--- /dev/null
+++ b/community/scribus/poppler-22.02-2.patch
@@ -0,0 +1,29 @@
+Patch-Source: https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f
+From f75c1613db67f4067643d0218a2db3235e42ec9f Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Thu, 3 Feb 2022 19:46:13 +0000
+Subject: [PATCH] Small update vs latest code in poppler
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24885 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 3650c96f52..a6f4e00fa9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
+ delete id;
+ else
+ {
+- if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
++ fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);
++ if (!fontLoc)
+ {
+- error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+
diff --git a/community/scribus/poppler-22.03.patch b/community/scribus/poppler-22.03.patch
index d185b2765c..ed7aeb19b9 100644
--- a/community/scribus/poppler-22.03.patch
+++ b/community/scribus/poppler-22.03.patch
@@ -1,38 +1,51 @@
-Patch-Source: https://github.com/archlinux/svntogit-community/blob/b51bcb6c80f4b4102b4d59dcded7901a4e30a3bb/trunk/poppler-22.03.0.patch
-diff -upr scribus-1.5.8.orig/scribus/plugins/import/pdf/importpdf.cpp scribus-1.5.8/scribus/plugins/import/pdf/importpdf.cpp
---- scribus-1.5.8.orig/scribus/plugins/import/pdf/importpdf.cpp 2022-01-23 18:16:01.000000000 +0200
-+++ scribus-1.5.8/scribus/plugins/import/pdf/importpdf.cpp 2022-03-02 14:03:29.851352471 +0200
-@@ -90,7 +90,11 @@ QImage PdfPlug::readThumbnail(const QStr
+Patch-Source: https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d
+From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Mar 2022 22:22:53 +0000
+Subject: [PATCH] #16764: Build break with poppler 22.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 154e58a3f0..392dcd9e64 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
#endif
globalParams->setErrQuiet(gTrue);
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
-+ PDFDoc pdfDoc{std::make_unique<GooString>(fname)};
++ PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };
+#else
PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
+#endif
if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
return QImage();
-@@ -343,7 +347,11 @@ bool PdfPlug::c