community/lagrange/APKBUILD

 # Contributor: Michał Polański <michal@polanski.me>
 # Maintainer: Michał Polański <michal@polanski.me>
 pkgname=lagrange
-pkgver=1.4.2
+pkgver=1.5.0
 pkgrel=0
 pkgdesc="Beautiful Gemini client"
 url="https://gmi.skyjake.fi/lagrange"
@@ -23,5 +23,5 @@ package() {
 }
 
 sha512sums="
-ea0c8331011ba3d64b3e3053ec1a36016f49da188165552db90cb7f8bf2c46d4c42fd197d5d8edd4e243abb9821e7d520f1e5d12bbc6f49917f8b417329cb291  lagrange-1.4.2.tar.gz
+157c0bf3eee446ed66f9ad90a24aaee763a0a88834c9cecfafd95112e35f22f569766cb56567dde97a18b96a2485885374962571b0d0545d356b9fc65e9994b1  lagrange-1.5.0.tar.gz
 "

community/lua-rapidjson/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=lua-rapidjson
 _rockname=rapidjson
-pkgver=0.6.1
+pkgver=0.7.1
 pkgrel=0
 pkgdesc="A JSON module for Lua based on the very fast RapidJSON library"
 url="https://github.com/xpol/lua-rapidjson"
@@ -77,6 +77,8 @@ _subpackage() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="45a4ed54b84739bbec538e4a58c0162201ae3b65ea03d171c637f6868568402a45ceccaef123e7a1fbf8244aa41912bc0491f0233bcc839634568a0edbc0f274  lua-rapidjson-0.6.1.tar.gz
-9bfe86c75765d0684f33b660129c3ab90629b8518b05d14aa99ea15e6eb39dcb0a56e9a705f2dcae0f463e7ed92c8759628b0fbdaeee43aff34ac7e5b6c6bf10  disable-c-cxx-flag-march.patch
-f42ec35dac0dec1cdd33f7275ec9576f5b2e5f7dc473a6ff434eab483632b30d884c3918d72a3ba495e2e2cfbc56488172e128eb2f9cb65c6b1c840e46ccd70a  use-dromozoa-utf8.patch"
+sha512sums="
+e84157ddf000605cf41faf359eb51223867203cccd3c0d3597b1bc8e237ad6eda85ddf7854d97f1c57551e601f9a4389ac51143b4c51c27d21344b71e5a084dd  lua-rapidjson-0.7.1.tar.gz
+90c17874ea1f5d62f5c812fbcc45bf56c734589a6ab07247dadfe76d0f8aaadb4e7e490b7ff89bc742f5b11ccf9d88a339507c321826cb91a99586f42058a757  disable-c-cxx-flag-march.patch
+f42ec35dac0dec1cdd33f7275ec9576f5b2e5f7dc473a6ff434eab483632b30d884c3918d72a3ba495e2e2cfbc56488172e128eb2f9cb65c6b1c840e46ccd70a  use-dromozoa-utf8.patch
+"

community/lua-rapidjson/disable-c-cxx-flag-march.patch

 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -33,8 +33,8 @@
-         set(PLAT "linux")
-         set(LINK_FLAGS "-shared")
+@@ -33,10 +33,6 @@
      endif(APPLE)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fPIC -march=native")
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fPIC -march=native")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fPIC")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fPIC")
+     add_compile_options(-g -Wall -fPIC)
+     include(CheckCXXCompilerFlag)
+-    CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_ARCH_NATIVE)
+-    if (COMPILER_SUPPORTS_ARCH_NATIVE)
+-        add_compile_options(-march=native)
+-    endif()
  else(UNIX)
      if(WIN32)
          set(PLAT "win32")

testing/opendmarc/APKBUILD → community/opendmarc/APKBUILD

 # Contributor: Hidde van der Heide <hvanderheide@nexuz.net>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=opendmarc
-pkgver=1.3.2
-pkgrel=0
+pkgver=1.4.1.1
+pkgrel=2
 pkgdesc="A free open source implementation of the DMARC specification"
-url="http://www.trusteddomain.org/opendmarc/"
+url="https://github.com/trusteddomainproject/OpenDMARC"
 arch="all"
 license="BSD-3-Clause Sendmail"
-makedepends="libmilter-dev libspf2-dev"
+makedepends="libmilter-dev libspf2-dev autoconf automake libtool"
 pkgusers="$pkgname"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc"
-source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz
-	netdb_defines.patch
-	fix-153-duplicate-dkim-auth_result-sections.patch
-	fix-193-sql-strict-mode-compatibility.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${pkgname}-${pkgver//./-}.tar.gz
 	dmarcfail-fix-shebang.patch
+	fix-importstats-ignores-HistoryFile-path.patch
 	config-defaults.patch
 	$pkgname.initd
+	$pkgname.confd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/OpenDMARC-rel-${pkgname}-${pkgver//./-}"
 
 prepare() {
 	default_prepare
-	update_config_guess
-	update_config_sub
+	autoreconf -vi
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -44,13 +41,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	opendmarc/opendmarc -V
+
+	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
@@ -58,16 +54,18 @@ package() {
 	install -m 644 -D "$builddir"/opendmarc/opendmarc.conf.sample \
 		./etc/$pkgname/opendmarc.conf
 	install -m 755 -D "$srcdir"/$pkgname.initd ./etc/init.d/$pkgname
+	install -m 644 -D "$srcdir"/$pkgname.confd ./etc/conf.d/$pkgname
 	install -m 750 -o $pkgusers -g mail -d ./var/spool/$pkgname
 
 	# Not needed, standard SPDX licenses.
 	rm -Rf ./usr/share/doc/$pkgname/LICENSE*
 }
 
-sha512sums="6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748  opendmarc-1.3.2.tar.gz
-a6808ac27264c84a8f7210ccc67f03028bc3644542c4def30824e6342a3fb207615c7b4b21f38084523df0b4dd777fbb6e9d3802bb50b41d3c5b0ce29ebfeff7  netdb_defines.patch
-90036e48151d054e43e68f739c4a9cb029b5a698910a566a59148673f9a3329ba7550038fba73538309bf7c43374615819f0351623f273c1ef139129fb2bc5fc  fix-153-duplicate-dkim-auth_result-sections.patch
-b9b7ce647f58e28f28862aa70b43c23579c453ecf839fde57524826193b099c4865e1da0b97eb7bcccf169c9343fd8f1187de4bbad37e1920561c790ac0ca7c2  fix-193-sql-strict-mode-compatibility.patch
+sha512sums="
+ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6  opendmarc-1.4.1.1.tar.gz
 a8585104490d42ecb2acce40df2e36fc5ed6155fecb16a9de5606703b1b3f5fc7f84f2933350fa3ff8f7da133bc251f30dc33b9c1310bc64e801179de68df026  dmarcfail-fix-shebang.patch
-ea19017a1e2cab4fe388bca45f44f2f3d71c3212e7f5b312e13e0b7af7cd4180bf5ec1e441e65f0ac33e8d98241b4d980a56fe8afc16a443d304cfab06d2bd95  config-defaults.patch
-db4a9c79bbf4c54ae70a61d1501b1fb044b2242b43b82b34365b1c1e45429290f3aa89a78711e9fae5518753ddb3e15de2ef68118dae275ed6a6d6be9b2c03ec  opendmarc.initd"
+0c663a3f1341707bf2e83e6d418b2696b461afdc64cfe94d5bb6013d2832d48e8347524a942d2c56743e3fd0075f2d0481df032de38b220dfacefb16349b6a3f  fix-importstats-ignores-HistoryFile-path.patch
+6854cbd0357f444f596658bf55ba00534ffb87aebe872ac7ae4329c8e0132be1c12bed528741ecb3561621fc3b9c747eb094e0a90f53efe70f78aa4d2e515e16  config-defaults.patch
+d3ddde80f609c6d4d7be547d7285bab3775284c05102b36a243a7389461e6304a0e1658a46ec0785195daa3ce89a939eab05203cd35e3a080fd04ccbfdd9e07a  opendmarc.initd
+325a16efdd66e49fc15583d9ced38d70032601707fb82569e5967745a11d1fa216e720b3122929614ab0a322468a22a0bdd9cab9110fe24da231ef5a337177df  opendmarc.confd
+"

testing/opendmarc/config-defaults.patch → community/opendmarc/config-defaults.patch

@@ -5,16 +5,16 @@ Also remove options for supervisor and options that need root privileges
 
 --- a/opendmarc/opendmarc.conf.sample
 +++ b/opendmarc/opendmarc.conf.sample
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  ##  provided, the name of the host running the filter (as returned by the
- ##  gethostname(3) function) will be used.  
+ ##  gethostname(3) function) will be used.
  #
 -# AuthservID name
 +AuthservID HOSTNAME
  
  ##  AuthservIDWithJobID { true | false }
  ##  	default "false"
-@@ -35,46 +35,6 @@
+@@ -36,46 +36,6 @@
  #
  # AuthservIDWithJobID false
  
@@ -61,13 +61,12 @@ Also remove options for supervisor and options that need root privileges
  ##  BaseDirectory (string)
  ##  	default (none)
  ##
-@@ -84,18 +44,8 @@
+@@ -85,17 +45,7 @@
  ##  directory.  It's also useful for arranging that any crash dumps will be
  ##  saved to a specific location.
  #
 -# BaseDirectory /var/run/opendmarc
-+BaseDirectory /run/opendmarc
- 
+-
 -##  ChangeRootDirectory (string)
 -##  	default (none)
 -##
@@ -75,31 +74,40 @@ Also remove options for supervisor and options that need root privileges
 -##  the process to the one specified here prior to beginning execution.
 -##  chroot(2) requires superuser access.  A warning will be generated if
 -##  UserID is not also set.
--# 
+-#
 -# ChangeRootDirectory /var/chroot/opendmarc
--
++BaseDirectory /run/opendmarc
+ 
  ##  CopyFailuresTo (string)
  ##  	default (none)
+@@ -127,7 +77,7 @@
+ ##  This list will be concatenated with DomainWhitelist (if provided).
  ##
-@@ -175,7 +125,7 @@
+ # 
+-# DomainWhitelistFile /usr/local/etc/opendmarc/whitelist.domains
++# DomainWhitelistFile /etc/opendmarc/whitelist.domains
+ 
+ ##  DomainWhitelistSize
+ ##  	default 3000
+@@ -211,7 +161,7 @@
  ##  rather periodically imported into a relational database from which the
  ##  aggregate reports can be extracted by a tool such as opendmarc-import(8).
  #
 -# HistoryFile /var/run/opendmarc.dat
-+# HistoryFile /var/spool/opendmarc/opendmarc.dat
++HistoryFile /var/spool/opendmarc/opendmarc.dat
  
- ##  IgnoreAuthenticatedClients { true | false }
+ ##  HoldQuarantinedMessages { true | false }
  ##  	default "false"
-@@ -193,7 +143,7 @@
+@@ -256,7 +206,7 @@
  ##  connections are to be ignored by the filter.  If not specified, defaults
  ##  to "127.0.0.1" only.
  #
 -# IgnoreHosts /usr/local/etc/opendmarc/ignore.hosts
-+# IgnoreHosts /etc/opendmarc/ignore.hosts
++IgnoreHosts /etc/opendmarc/ignore.hosts
  
  ##  IgnoreMailFrom domain[,...]
  ##  	default (none)
-@@ -212,14 +162,6 @@
+@@ -275,14 +225,6 @@
  #
  # MilterDebug 0
  
@@ -114,7 +122,7 @@ Also remove options for supervisor and options that need root privileges
  ##  PublicSuffixList path
  ##  	default (none)
  ##
-@@ -284,7 +226,7 @@
+@@ -357,7 +299,7 @@
  ##  either in the configuration file or on the command line.  If an IP
  ##  address is used, it must be enclosed in square brackets.
  #
@@ -123,7 +131,7 @@ Also remove options for supervisor and options that need root privileges
  
  ##  SoftwareHeader { true | false }
  ##  	default "false"
-@@ -294,7 +236,7 @@
+@@ -367,7 +309,7 @@
  ##  delivery.  The product's name, version, and the job ID are included in
  ##  the header field's contents.
  #
@@ -132,8 +140,8 @@ Also remove options for supervisor and options that need root privileges
  
  ##  SPFIgnoreResults { true | false }
  ##	default "false"
-@@ -303,7 +245,7 @@
- ##  message.  This is useful if you want the filter to perfrom SPF checks
+@@ -376,7 +318,7 @@
+ ##  message.  This is useful if you want the filter to perform SPF checks
  ##  itself, or because you don't trust the arriving header.
  #
 -# SPFIgnoreResults false
@@ -141,7 +149,7 @@ Also remove options for supervisor and options that need root privileges
  
  ##  SPFSelfValidate { true | false }
  ##	default false
-@@ -316,14 +258,14 @@
+@@ -389,14 +331,14 @@
  ##  is also set, it never looks for SPF results in headers and
  ##  always performs the SPF check itself when this is set.
  #
@@ -158,7 +166,7 @@ Also remove options for supervisor and options that need root privileges
  
  ##  SyslogFacility facility-name
  ##  	default "mail"
-@@ -354,13 +296,4 @@
+@@ -427,13 +369,4 @@
  ##  specific file mode on creation regardless of the process umask.  See
  ##  umask(2) for more information.
  #

community/opendmarc/fix-importstats-ignores-HistoryFile-path.patch

+Opendmarc-importstats ignores the value set for HistoryFile in opendmarc.conf.
+The attached patch fixes this by using grep and sed to get the actual history file.
+
+Patch is based on https://src.fedoraproject.org/rpms/opendmarc/blob/f34/f/opendmarc-1.4.0-ticket159-179.patch,
+but with fixed opendmarc.conf path.
+
+See-Also: https://sourceforge.net/p/opendmarc/tickets/159/
+
+diff --color -Nur OpenDMARC-rel-opendmarc-1-4-0.orig/configure.ac OpenDMARC-rel-opendmarc-1-4-0/configure.ac
+--- OpenDMARC-rel-opendmarc-1-4-0.orig/configure.ac	2021-04-25 10:35:04.260874195 -0700
++++ OpenDMARC-rel-opendmarc-1-4-0/configure.ac	2021-04-25 10:32:44.443652511 -0700
+@@ -521,6 +521,7 @@
+ 		reports/opendmarc-expire.8
+ 		reports/opendmarc-import
+ 		reports/opendmarc-import.8
++		reports/opendmarc-importstats
+ 		reports/opendmarc-importstats.8
+ 		reports/opendmarc-params
+ 		reports/opendmarc-params.8
+diff --color -Nur OpenDMARC-rel-opendmarc-1-4-0.orig/reports/opendmarc-importstats OpenDMARC-rel-opendmarc-1-4-0/reports/opendmarc-importstats
+--- OpenDMARC-rel-opendmarc-1-4-0.orig/reports/opendmarc-importstats	2021-01-28 09:35:29.000000000 -0800
++++ OpenDMARC-rel-opendmarc-1-4-0/reports/opendmarc-importstats	1969-12-31 16:00:00.000000000 -0800
+@@ -1,26 +0,0 @@
+-#!/bin/sh
+-##
+-## Copyright (c) 2012, The Trusted Domain Project.  All rights reserved.
+-##
+-## opendmarc-importstats -- import opendmarc output to MySQL
+-##
+-## This is intended to be used via a crontab.  If import is successful,
+-## this code exits quietly so there's no output.  If it fails, it does
+-## "ls -l" on the temporary file, so that cron generates mail to whever
+-## ran the job.
+-
+-## setup
+-statsdb="/var/tmp/dmarc.dat"
+-# OPENDMARC_PASSWORD="password"; export OPENDMARC_PASSWORD
+-
+-if [ -s $statsdb ]
+-then
+-	mv $statsdb ${statsdb}.OLD.$$
+-
+-	if opendmarc-import < ${statsdb}.OLD.$$
+-	then
+-		rm ${statsdb}.OLD.$$
+-	else
+-		ls -l ${statsdb}.OLD.$$
+-	fi
+-fi
+diff --color -Nur OpenDMARC-rel-opendmarc-1-4-0.orig/reports/opendmarc-importstats.in OpenDMARC-rel-opendmarc-1-4-0/reports/opendmarc-importstats.in
+--- OpenDMARC-rel-opendmarc-1-4-0.orig/reports/opendmarc-importstats.in	1969-12-31 16:00:00.000000000 -0800
++++ OpenDMARC-rel-opendmarc-1-4-0/reports/opendmarc-importstats.in	2021-04-25 10:34:02.958776971 -0700
+@@ -0,0 +1,27 @@
++#!/bin/sh
++##
++## Copyright (c) 2012, The Trusted Domain Project.  All rights reserved.
++##
++## opendmarc-importstats -- import opendmarc output to MySQL
++##
++## This is intended to be used via a crontab.  If import is successful,
++## this code exits quietly so there's no output.  If it fails, it does
++## "ls -l" on the temporary file, so that cron generates mail to whever
++## ran the job.
++
++## setup
++statsdb="$(grep ^HistoryFile @sysconfdir@/opendmarc/opendmarc.conf | sed 's/^HistoryFile\s\+//')"
++[ -z "$statsdb" ] && exit 0
++# OPENDMARC_PASSWORD="password"; export OPENDMARC_PASSWORD
++
++if [ -s "$statsdb" ]
++then
++       mv "$statsdb" "${statsdb}.OLD.$$"
++
++       if @sbindir@/opendmarc-import < ${statsdb}.OLD.$$
++       then
++               rm "${statsdb}.OLD.$$"
++       else
++               ls -l "${statsdb}.OLD.$$"
++       fi
++fi

community/opendmarc/opendmarc.confd

+# Configuration for /etc/init.d/opendmarc
+
+# Path to the OpenDMARC configuration file.
+#cfgfile="/etc/opendmarc/$RC_SVCNAME.conf"
+
+# User (and group) to run opendmarc.
+#command_user="opendmarc:mail"
+
+# Additional arguments to pass to opendmarc.
+#command_args=
+
+# Run with OpenRC's daemon supervisor.
+# Replace with an empty string or remove to disable supervisor.
+supervisor=supervise-daemon

testing/opendmarc/opendmarc.initd → community/opendmarc/opendmarc.initd

 #!/sbin/openrc-run
-supervisor=supervise-daemon
-
 extra_commands="checkconfig"
 
 description="Domain-based Message Authentication, Reporting & Conformance (DMARC) Milter"

community/perl-extutils-cppguess/APKBUILD

@@ -4,8 +4,8 @@
 pkgname=perl-extutils-cppguess
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=ExtUtils-CppGuess
-pkgver=0.21
-pkgrel=1
+pkgver=0.22
+pkgrel=0
 pkgdesc="guess C++ compiler and flags"
 url="https://metacpan.org/release/ExtUtils-CppGuess/"
 arch="noarch"
@@ -33,4 +33,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e48e4815ac9db4e8bb91de101f1d22aed95c770cf6fa2ea5e38094643fe96bc9fe69b0e5a76ba8aa53a653753f93526edab8b1604d864bb2b3a50223617f84d9  ExtUtils-CppGuess-0.21.tar.gz"
+sha512sums="
+a509f54089488a0e149e3bbb483e83d7a5af0777441c2b2ac05383a21bd2f7174c41689062e1c9193dcaf2d2a605621faf9e1bba9ab308353218d4556c41c2dc  ExtUtils-CppGuess-0.22.tar.gz
+"

community/plasmatube/APKBUILD

 # Contributor: Ralf Rachinger <ralfrachinger@gmail.com>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasmatube
-pkgver=0_git20210529
+pkgver=0_git20210530
 pkgrel=0
-_commit="bdb19bfeff2fe3caf92612264c95fc3b5596ab0f"
+_commit="7427989bbe4e0356a8355103f3bcb883a09a7de7"
 pkgdesc="Kirigami YouTube video player based on Invidious"
 arch="all !armhf !s390x !mips64" # armhf blocked by extra-cmake-modules and mips64, s390x blocked by polkit
-url="https://invent.kde.org/lnj/plasmatube"
+url="https://invent.kde.org/plasma-mobile/plasmatube"
 license="GPL-3.0-or-later AND CC0-1.0"
 depends="
 	gst-libav
@@ -26,7 +26,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtquickcontrols2-dev
 	"
-source="https://invent.kde.org/lnj/plasmatube/-/archive/$_commit/plasmatube-$_commit.tar.gz"
+source="https://invent.kde.org/plasma-mobile/plasmatube/-/archive/$_commit/plasmatube-$_commit.tar.gz"
 options="!check" # No tests
 builddir="$srcdir/$pkgname-$_commit"
 
@@ -48,5 +48,5 @@ package() {
 }
 
 sha512sums="
-0001b96f6ba71bc24a8ef64a5cfcb65c53220a97d72f07e61e980aea59d6ebd3272607d88b31b62122fd3cbbb0272b1c7024e38563017d01b96d801a02642820  plasmatube-bdb19bfeff2fe3caf92612264c95fc3b5596ab0f.tar.gz
+614ac9fdd0a0fcdff976bfaeeb0870cebff34baec231b55fd3212d6d6e964ac495ce626e3b43447de0a9b881b6ce08b7fd4e7d335c2ccdadcf3d1f43f94f06dd  plasmatube-7427989bbe4e0356a8355103f3bcb883a09a7de7.tar.gz
 "

community/postgresql-pg_cron/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: G.J.R. Timmer <gjr.timmer@gmail.com>
 pkgname=postgresql-pg_cron
 _projname=pg_cron
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=0
 pkgdesc="Cron-based scheduler for PostgreSQL 9.5+"
 url="https://github.com/citusdata/pg_cron"
@@ -32,4 +32,6 @@ package() {
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="226b0df820dd28c2a210f6cbd3e0047cb9fab037ec02596170d5bee86d81827e3340d53117c83d309c5106eeb7ac748506faa7a8903df3fbdd600f092f00d34e  pg_cron-1.3.0.tar.gz"
+sha512sums="
+e9758e1c3dfa12be05a9a24060d46a90299a821e0067690f07ea3356faade5fb3c157259aa553bbdb0fdb5582baedc8e51fb119ea0e78a5c88fb8bd3e6d047a6  pg_cron-1.3.1.tar.gz
+"

community/py3-pyside6/APKBUILD

@@ -4,7 +4,9 @@ pkgver=6.0.4
 pkgrel=0
 pkgdesc="Enables the use of Qt6 APIs in Python applications"
 url="https://doc.qt.io/qtforpython-6/"
-arch="all !mips64" # blocked by py3-shiboken6
+# mips64: blocked by py3-shiboken6
+# armhf: ftbts
+arch="all !mips64 !armhf"
 license="LGPL-3.0-only AND GPL-2.0-only"
 depends="py3-shiboken6"
 makedepends="

community/ruby-ffi/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ruby-ffi
 _gemname=ffi
-pkgver=1.13.1
+pkgver=1.15.1
 pkgrel=0
 pkgdesc="Ruby FFI library"
 url="https://github.com/ffi/ffi"
@@ -11,8 +11,10 @@ license="BSD-3-Clause"
 checkdepends="ruby-bigdecimal ruby-fiddle ruby-rspec"
 makedepends="libffi-dev ruby ruby-dev"
 install="$pkgname.post-install"
-source="$pkgname-$pkgver.tar.gz::https://github.com/ffi/$_gemname/archive/$pkgver.tar.gz
-	gemspec.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ffi/$_gemname/archive/v$pkgver.tar.gz
+	musl-compat.patch
+	gemspec.patch
+	"
 builddir="$srcdir/$_gemname-$pkgver"
 
 build() {
@@ -33,7 +35,10 @@ check() {
 		mips*)  exclude='spec/ffi/long_double_spec.rb' ;;
 	esac
 
-	GEM_PATH='dist:.gem' rspec --exclude-pattern "$exclude"
+	# LD_LIBRARY_PATH is a workaround to fix test
+	# `Library ffi_lib interprets INPUT() in loader scripts` in library_spec.
+	GEM_PATH='dist:.gem' LD_LIBRARY_PATH="$builddir/spec/ffi/fixtures" \
+		rspec --exclude-pattern "$exclude"
 }
 
 package() {
@@ -60,5 +65,8 @@ package() {
 	find lib/ffi/platform/* -prune ! -name "$carch-linux" -exec rm -rf {} +
 }
 
-sha512sums="f0077518c9ced54881e40a0047440edb4e40ba0ba89fc814a489bcbaf52e08e9a773e28f453f579162439e247151b994936695fe0b1ed5fb429d9bfd85b845ef  ruby-ffi-1.13.1.tar.gz
-4ed0d22ad42dd6b3a20532af09bca0501c7d90fb087d49f7b8e537579aa98ab42bfc21d0f647b601524d72e8187327780b4ee45208d36b6a6507d2cc1b0b7cc2  gemspec.patch"
+sha512sums="
+1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a  ruby-ffi-1.15.1.tar.gz
+c4400693bd34ade9a06af86e564dee35ee3e3fcd59adec135531c8ebaca7c70e8f4082272f7ae6356bab8c9c5e545cc889d553ac6bf5fb823568cc743a647d62  musl-compat.patch
+7e14c924c720eb34ec1f95fe385ff1e535193522133af93c1591b3d049f05027ba31ca284ffb7a2c68935d0fe6472d666e2f313931f662d669d2116ef03ebb3b  gemspec.patch
+"

community/ruby-ffi/gemspec.patch

@@ -5,7 +5,7 @@
      s.metadata['mailing_list_uri'] = 'http://groups.google.com/group/ruby-ffi'
    end
 -  s.files = `git ls-files -z`.split("\x0").reject do |f|
--    f =~ /^(bench|gen|libtest|nbproject|spec)/
+-    f =~ /^(\.|bench|gen|libtest|nbproject|spec)/
 -  end
 -
 -  # Add libffi git files

community/ruby-ffi/musl-compat.patch

+Fix handling of ldscript.so files.
+
+--- a/lib/ffi/library.rb
++++ b/lib/ffi/library.rb
+@@ -114,7 +114,7 @@
+ 
+             rescue Exception => ex
+               ldscript = false
+-              if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)/
++              if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format|Exec format error)/
+                 if File.binread($1) =~ /(?:GROUP|INPUT) *\( *([^ \)]+)/
+                   libname = $1
+                   ldscript = true

community/ruby-mini_portile2/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ruby-mini_portile2
 _gemname=${pkgname#ruby-}
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=0
 pkgdesc="Simplistic port-like solution for developers"
 url="https://github.com/flavorjones/mini_portile"
@@ -33,4 +33,6 @@ package() {
 		"$geminstdir"/Rakefile
 }
 
-sha512sums="dc696d1bebf2dabe227d5a7b49843da7317cd7ffff49e3078ca6b6608154e177dafcc7ddce7bd1c94b78fcbf97c3428cee716cea232ac94e11b2ca86de18a66b  mini_portile2-2.5.1.gem"
+sha512sums="
+79e03ccb616d94d8ae6eca28246ccf367d2f46666e3ccdaf64656c2457f70a8859ffbbec928166ea27dc6521a7f6046f42f0ef12671db98ac094466dd5c90ede  mini_portile2-2.5.2.gem
+"

community/ruby-nokogiri/APKBUILD

@@ -2,42 +2,27 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ruby-nokogiri
 _gemname=${pkgname#ruby-}
-pkgver=1.10.10
+pkgver=1.11.6
 pkgrel=0
 pkgdesc="An HTML, XML, SAX, and Reader parser"
 url="https://nokogiri.org/"
 arch="all !s390x"
 license="MIT"
-depends="ruby ruby-mini_portile2"
-makedepends="ruby-dev libxml2-dev libxslt-dev"
-checkdepends="ruby-minitest ruby-test-unit"
+depends="ruby"
+makedepends="ruby-dev ruby-mini_portile2 libxml2-dev libxslt-dev"
+checkdepends="ruby-json ruby-minitest ruby-test-unit"
 source="https://github.com/sparklemotion/$_gemname/archive/v$pkgver/$_gemname-$pkgver.tar.gz
-	https://rubygems.org/downloads/$_gemname-$pkgver.gem
-	remove-simplecov.patch
-	skip-tests-broken-on-musl.patch
+	gemspec-fix-deps.patch
+	test-helper-remove-unnecessary-deps.patch
 	"
 builddir="$srcdir/$_gemname-$pkgver"
-options="!check" # some tests check error messages generated by libxml2
 
 # secfixes:
+#   1.11.6-r0:
+#     - CVE-2020-26247
 #   1.10.4-r0:
 #     - CVE-2019-5477
 
-prepare() {
-	default_prepare
-
-	# Generate gemspec (there's no gemspec in the source).
-	gem specification -l --ruby "$srcdir"/$_gemname-$pkgver.gem \
-		> "$builddir"/$_gemname.gemspec
-
-	# Remove bundled external libraries etc.
-	sed -i \
-		-e 's|, "ports/archives/[^"][^"]*"||g' \
-		-e 's|, "ports/patches/[^"][^"]*"||g' \
-		-e '\@mini_portile@d' \
-		$_gemname.gemspec
-}
-
 build() {
 	gem build $_gemname.gemspec
 	gem install \
@@ -52,15 +37,18 @@ build() {
 	# Remove unnecessary files and rubbish...
 	find dist/extensions/ -name mkmf.log -delete
 	cd dist/gems/$_gemname-$pkgver/
-	rm -rf ext/ patches/ lib/nokogiri/*.so *.md *.yml
+	rm -rf ext/ patches/
+	rm *.md *.yml
+	rm lib/*.jar
+	rm lib/nokogiri/*.so
+	rm lib/nokogiri/css/*.rex lib/nokogiri/css/*.y
 }
 
 check() {
 	local extpath=$(dirname dist/extensions/*/*/$_gemname-$pkgver/gem_make.out)
 
-	# Note: This is copied from Fedora package.
-	export LANG=ja_JP.UTF-8
-	ruby -I.:test:dist/gems/$_gemname-$pkgver/lib:$extpath \
+	# Note: This is based on Fedora package.
+	LANG="C.UTF-8" RUBYLIB=".:dist/gems/$_gemname-$pkgver/lib:test:$extpath" ruby \
 		-e 'require "test/helper"' \
 		-e 'Dir.glob("test/**/test_*.rb") {|f| require f }'
 }
@@ -74,7 +62,8 @@ package() {
 	cp -r bin extensions gems specifications "$gemdir"/
 }
 
-sha512sums="2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a  nokogiri-1.10.10.tar.gz
-b4628df47dbd8b9123a6f0625829e745a19d26539d54b2748c985d6fdda978072bdcd136df2f47535984186eae7fb318b67d59f1ea413777f1a146bc78e0dae2  nokogiri-1.10.10.gem
-b3346647e55ded3c20775458f35f85c81222a7147c8e4040db0e09f1161e999d824570e29f4fc5bd34b9808ea047b9d2308ea32718b46143cceb777ffa2e63a6  remove-simplecov.patch
-5f92d4cf87751c404a33dfbdc035dd5b54163eccdc46b4f515e6d6367a9573cf3fc4ef3c12c5b9e099b20f6c563d5a573acb1c2716890e492bfb26aa91f2cb5d  skip-tests-broken-on-musl.patch"
+sha512sums="
+a9d2977ba5a12cb252ee615cffbbf043227e78d746ecba4bfcd82fa825f5ef9fdb74feae27115b16cd65da6dd189e4ac88f1d605e776dfbc52aaf2e0e3044381  nokogiri-1.11.6.tar.gz
+87911f3fa1fa26f2bb5f2abc851fa29527aeab276da05ddb45d92be960a2d742361f388c91d836fad8d43550a7b05822e05806f1591868edd1c82f09f6f1e20e  gemspec-fix-deps.patch
+81c05ac93387a5f6f0b3e7389f7c14cc9398344f91061e2cf57682a53979cecbf5c0f05913d8f1b320887fa123fa18421fea8043bb757a9bcca692e4fec84448  test-helper-remove-unnecessary-deps.patch
+"

community/ruby-nokogiri/gemspec-fix-deps.patch

+racc and mini_portile2 are needed only to build native extension.
+
+--- a/nokogiri.gemspec
++++ b/nokogiri.gemspec
+@@ -262,8 +262,8 @@
+   spec.extra_rdoc_files += Dir.glob("README.md")
+   spec.rdoc_options = ["--main", "README.md"]
+ 
+-  spec.add_runtime_dependency("racc", "~> 1.4")
+-  spec.add_runtime_dependency("mini_portile2", "~> 2.5.0") unless java_p # keep version in sync with extconf.rb
++  spec.add_development_dependency("racc", "~> 1.4")
++  spec.add_development_dependency("mini_portile2", "~> 2.5.0") unless java_p # keep version in sync with extconf.rb
+ 
+   spec.add_development_dependency("bundler", "~> 2.2")
+   spec.add_development_dependency("concourse", "~> 0.41")