Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/apr/PKGBUILD9
-rw-r--r--extra/doxygen/PKGBUILD23
-rw-r--r--extra/kamoso/PKGBUILD6
-rw-r--r--extra/libjpeg-turbo/PKGBUILD18
-rw-r--r--extra/libxkbcommon/PKGBUILD28
-rw-r--r--extra/linux-pae/PKGBUILD6
-rw-r--r--extra/linux-pae/config2
-rw-r--r--extra/linux-zen/PKGBUILD65
-rw-r--r--extra/linux-zen/config49
-rw-r--r--extra/numactl/PKGBUILD8
-rw-r--r--extra/numactl/numactl-2.0.11-minor-major.patch11
-rw-r--r--extra/wayland/PKGBUILD31
12 files changed, 235 insertions, 21 deletions
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
new file mode 100644
index 00000000..a12769da
--- /dev/null
+++ b/extra/apr/PKGBUILD
@@ -0,0 +1,9 @@
+# flagged out-of-date upstream, temporary patch
+
+# works only partially! (I cannot overload pkgver for instance in source)
+pkgver=1.6.5
+
+source[0]='https://www.apache.org/dist/apr/apr-1.6.5.tar.bz2'
+source[1]='https://www.apache.org/dist/apr/apr-1.6.5.tar.bz2.asc'
+sha256sums[0]='a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105'
+
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
new file mode 100644
index 00000000..9152a88c
--- /dev/null
+++ b/extra/doxygen/PKGBUILD
@@ -0,0 +1,23 @@
+if [ "${CARCH}" = "i486" ]; then
+ # no qt5
+ makedepends=(${makedepends[@]//qt5-base/})
+
+ # no TeX
+ makedepends=(${makedepends[@]//texlive-core/})
+ makedepends=(${makedepends[@]//texlive-latexextra/})
+
+ # no Graphviz
+ makedepends=(${makedepends[@]//graphviz/})
+
+ # no ghostscript
+ makedepends=(${makedepends[@]//ghostscript/})
+
+ eval "$(
+ declare -f build | \
+ sed '
+ /make docs/d
+ s|-Dbuild_doc:BOOL=ON|-Dbuild_doc:BOOL=OFF|
+ s|-Dbuild_wizard:BOOL=ON|-Dbuild_wizard:BOOL=OFF|
+ '
+ )"
+fi
diff --git a/extra/kamoso/PKGBUILD b/extra/kamoso/PKGBUILD
deleted file mode 100644
index c992c934..00000000
--- a/extra/kamoso/PKGBUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-# fixes:
-# [ 77%] Generating gstqtvideosinkmarshal.h, gstqtvideosinkmarshal.c
-# /usr/bin/env: ‘/usr/bin/python’: No such file or directory
-# make[2]: *** [src/elements/gstqtvideosink/CMakeFiles/gstkamosoqt5videosink.dir/build.make:62: src/elements/gstqtvideosink/gstqtvideosinkmarshal.h] Error 127
-# should also happen upstream, actually
-makedepends+=(python)
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
new file mode 100644
index 00000000..e33bc686
--- /dev/null
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -0,0 +1,18 @@
+if [ "${CARCH}" = "i486" ]; then
+ # no Java
+ makedepends=(${makedepends[@]//jdk8-openjdk/})
+ eval "$(
+ declare -f build | \
+ sed '
+ s/-DWITH_JAVA=1/-DWITH_JAVA=0/
+ '
+ )"
+
+ # no SIMD optimizations
+ eval "$(
+ declare -f build | \
+ sed '
+ s/cmake/cmake -DWITH_SIMD=0/
+ '
+ )"
+fi
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
new file mode 100644
index 00000000..802fc9c2
--- /dev/null
+++ b/extra/libxkbcommon/PKGBUILD
@@ -0,0 +1,28 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+ # no documentation
+ makedepends=(${makedepends[@]//graphviz/})
+ makedepends=(${makedepends[@]//doxygen/})
+
+ eval "$(
+ declare -f build | \
+ sed '
+ s/arch-meson/arch-meson -Denable-docs=false/
+ '
+ )"
+
+ eval "$(
+ declare -f package_libxkbcommon | \
+ sed '
+ /mv.*doc/d
+ '
+ )"
+
+ eval "$(
+ declare -f package_libxkbcommon-doc | \
+ sed '
+ /mv.*doc/d
+ '
+ )"
+fi
+
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 9e0dbdc9..83773abd 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux-pae # Build stock -ARCH kernel
-pkgver='4.18.10'
+pkgver='4.18.11'
_srcname=linux-${pkgver}
pkgrel='1'
arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('10604f7f8ccab5e7ce71f2e87d1410be679cd11c29c6c608ce35df1db40991de'
+sha256sums=('36d319f5a6caf5dd6ab2a4802b800799b56ef5963d742f2d147fabadf4822c8c'
'SKIP'
- '5a87b99396ebe3e88c3848bcea394d6cbe6924546ca375b9d48e134b6daef502'
+ 'e8884986b8b50a560ba6b4be383955b97c98e4cb148aa2bc2387a4869e020bb3'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index ed8a67c6..6df3f170 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.10-1 Kernel Configuration
+# Linux/x86 4.18.11-1 Kernel Configuration
#
#
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index e5262aa2..96976146 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 2edc3f8d648d3f161a9593c0a41332dae246cdfd
+# upstream git revision: 43d12d0306ae85803a356caabd0b384eb917c80e
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = 'fd5a7203579777ab2c0deb3bcdf94ded8a4422fefc81506b98c3bce8070b5a8f' ]; then
- sha256sums[${i}]='e7d5065e6e43f11c1964010da469e6b9e38a73aba40fac99a8cdace18be86ae2'
+ if [ "${sha256sums[${i}]}" = '8a852e70606513c77fc513d6ef970273345cc895d90e3f283ae103853bf50c41' ]; then
+ sha256sums[${i}]='0fa2c1eef3f46e1e0f22aa6a4da555cca6234bcd12c8aae84503ce5f6c178348'
fi
done
@@ -17,3 +17,62 @@ eval "$(
}
'
)"
+
+# use our tarballer instead of cloning from git
+for ((i=0; i<${#source[@]}; i++)); do
+ infos=$(
+ printf '%s\n' "${source[${i}]}" | \
+ sed -n '
+ s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@
+ T
+ p
+ '
+ )
+ if [ -n "${infos}" ]; then
+ source[${i}]=$(
+ type="${infos%% *}"
+ infos="${infos#* }"
+ if [ -n "${infos%% *}" ]; then
+ prefix="${infos%% *}"
+ else
+ prefix=''
+ fi
+ infos="${infos#* }"
+ repo="${infos%% *}"
+ repo64=$(
+ printf '%s' "${repo}" | \
+ base64 -w0 | \
+ sed 's/=/%3D/g'
+ )
+ infos="${infos#* }"
+ if [ "${infos%% *}" = '?signed' ]; then
+ key_check=$(
+ printf '&valid_keys='
+ printf '%s,' "${validpgpkeys[@]}" | \
+ sed 's/,$//'
+ )
+ else
+ key_check=''
+ fi
+ infos="${infos#* }"
+ if [ -z "${prefix}" ]; then
+ prefix="${repo%.git}"
+ prefix="${prefix##*/}"
+ fi
+ prefix_64=$(
+ printf '%s/' "${prefix}" | \
+ base64 -w0 | \
+ sed 's/=/%3D/g'
+ )
+
+ printf '%s-%s.tar.gz::https://archive-server.archlinux32.org/?t=%s&p=%s&r=%s%s&%s\n' \
+ "${prefix}" \
+ "${pkgver}" \
+ "${type}" \
+ "${prefix_64}" \
+ "${repo64}" \
+ "${key_check}" \
+ "${infos}"
+ )
+ fi
+done
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index 0f7ee4d3..cc18ead9 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.6-zen1 Kernel Configuration
+# Linux/x86 4.18.10-zen1 Kernel Configuration
#
#
@@ -78,8 +78,11 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_USELIB is not set
-# CONFIG_AUDIT is not set
+CONFIG_AUDIT=y
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
#
# IRQ subsystem
@@ -355,7 +358,15 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_SIG=y
+# CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
# CONFIG_MODULE_COMPRESS_GZIP is not set
CONFIG_MODULE_COMPRESS_XZ=y
@@ -1194,6 +1205,7 @@ CONFIG_NETFILTER_XT_SET=m
#
# Xtables targets
#
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -9281,9 +9293,10 @@ CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
CONFIG_EARLY_PRINTK_EFI=y
# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+CONFIG_X86_PTDUMP_CORE=y
# CONFIG_X86_PTDUMP is not set
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_WX is not set
+CONFIG_DEBUG_WX=y
CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -9324,18 +9337,36 @@ CONFIG_SECURITY_INFINIBAND=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
CONFIG_HARDENED_USERCOPY=y
CONFIG_HARDENED_USERCOPY_FALLBACK=y
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
CONFIG_SECURITY_YAMA=y
-# CONFIG_INTEGRITY is not set
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
@@ -9439,7 +9470,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m
@@ -9469,7 +9500,7 @@ CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -9534,6 +9565,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y
#
# Certificates for signature checking
#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
CONFIG_SYSTEM_TRUSTED_KEYRING=y
CONFIG_SYSTEM_TRUSTED_KEYS=""
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
@@ -9592,6 +9624,7 @@ CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_XXHASH=m
+CONFIG_AUDIT_GENERIC=y
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_842_COMPRESS=m
CONFIG_842_DECOMPRESS=m
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
new file mode 100644
index 00000000..54510d20
--- /dev/null
+++ b/extra/numactl/PKGBUILD
@@ -0,0 +1,8 @@
+source+=('numactl-2.0.11-minor-major.patch')
+md5sums+=('ef6533742f4392431bccf935626281e5')
+sha1sums+=('791e2fc154bd3d3fa644f00775bef941943a6e59')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../numactl-2.0.11-minor-major.patch
+}
diff --git a/extra/numactl/numactl-2.0.11-minor-major.patch b/extra/numactl/numactl-2.0.11-minor-major.patch
new file mode 100644
index 00000000..d95e5525
--- /dev/null
+++ b/extra/numactl/numactl-2.0.11-minor-major.patch
@@ -0,0 +1,11 @@
+diff -rauN numactl-2.0.11/affinity.c numactl-2.0.11-minor-major-patch/affinity.c
+--- numactl-2.0.11/affinity.c 2015-12-10 22:24:17.000000000 +0100
++++ numactl-2.0.11-minor-major-patch/affinity.c 2018-09-26 18:17:54.138713285 +0200
+@@ -43,6 +43,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ #include <regex.h>
++#include <sys/sysmacros.h>
+ #include "numa.h"
+ #include "numaint.h"
+ #include "sysfs.h"
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
new file mode 100644
index 00000000..e4e996bc
--- /dev/null
+++ b/extra/wayland/PKGBUILD
@@ -0,0 +1,31 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+ # no documentation
+ makedepends=(${makedepends[@]//graphviz/})
+ makedepends=(${makedepends[@]//doxygen/})
+ makedepends=(${makedepends[@]//xmlto/})
+ makedepends=(${makedepends[@]//docbook-xsl/})
+
+ eval "$(
+ declare -f build | \
+ sed '
+ s/configure/configure --disable-documentation/
+ '
+ )"
+
+ eval "$(
+ declare -f package_wayland | \
+ sed '
+ /mv.*doc,man/d
+ '
+ )"
+
+ eval "$(
+ declare -f package_wayland-docs | \
+ sed '
+ /mv.*docs/d
+ '
+ )"
+
+fi
+

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.