summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--legacy/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch (renamed from system/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch)0
-rw-r--r--legacy/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch (renamed from system/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch)0
-rw-r--r--legacy/mkinitfs/0001-generate-mkinitfs.conf.patch (renamed from system/mkinitfs/0001-generate-mkinitfs.conf.patch)0
-rw-r--r--legacy/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch (renamed from system/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch)0
-rw-r--r--legacy/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch (renamed from system/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch)0
-rw-r--r--legacy/mkinitfs/0001-skip-hooks-on-diskless-install.patch (renamed from system/mkinitfs/0001-skip-hooks-on-diskless-install.patch)0
-rw-r--r--legacy/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch (renamed from system/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch)0
-rw-r--r--legacy/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch (renamed from system/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch)0
-rw-r--r--legacy/mkinitfs/APKBUILD (renamed from system/mkinitfs/APKBUILD)0
-rw-r--r--legacy/mkinitfs/mkinitfs.post-install (renamed from system/mkinitfs/mkinitfs.post-install)0
l---------legacy/mkinitfs/mkinitfs.post-upgrade (renamed from system/mkinitfs/mkinitfs.post-upgrade)0
-rw-r--r--legacy/mkinitfs/mkinitfs.pre-upgrade (renamed from system/mkinitfs/mkinitfs.pre-upgrade)0
-rw-r--r--legacy/mkinitfs/mkinitfs.trigger (renamed from system/mkinitfs/mkinitfs.trigger)0
-rw-r--r--system/apk-tools/APKBUILD12
-rw-r--r--system/pcre/APKBUILD9
-rw-r--r--system/pcre/ppc64-elfv2-fix.patch25
-rw-r--r--user/xf86-video-nouveau/APKBUILD41
-rw-r--r--user/xf86-video-nouveau/dont-strcmp-null.patch33
18 files changed, 109 insertions, 11 deletions
diff --git a/system/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch b/legacy/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch
index 012738163..012738163 100644
--- a/system/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch
+++ b/legacy/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch
diff --git a/system/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch b/legacy/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
index 8b01d294a..8b01d294a 100644
--- a/system/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
+++ b/legacy/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
diff --git a/system/mkinitfs/0001-generate-mkinitfs.conf.patch b/legacy/mkinitfs/0001-generate-mkinitfs.conf.patch
index a556879d7..a556879d7 100644
--- a/system/mkinitfs/0001-generate-mkinitfs.conf.patch
+++ b/legacy/mkinitfs/0001-generate-mkinitfs.conf.patch
diff --git a/system/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch b/legacy/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
index e6e580a14..e6e580a14 100644
--- a/system/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
+++ b/legacy/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
diff --git a/system/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch b/legacy/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
index 7681be46b..7681be46b 100644
--- a/system/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
+++ b/legacy/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
diff --git a/system/mkinitfs/0001-skip-hooks-on-diskless-install.patch b/legacy/mkinitfs/0001-skip-hooks-on-diskless-install.patch
index a20ebc200..a20ebc200 100644
--- a/system/mkinitfs/0001-skip-hooks-on-diskless-install.patch
+++ b/legacy/mkinitfs/0001-skip-hooks-on-diskless-install.patch
diff --git a/system/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch b/legacy/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
index aef8293a1..aef8293a1 100644
--- a/system/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
+++ b/legacy/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
diff --git a/system/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch b/legacy/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch
index bcc4e0d49..bcc4e0d49 100644
--- a/system/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch
+++ b/legacy/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch
diff --git a/system/mkinitfs/APKBUILD b/legacy/mkinitfs/APKBUILD
index fe21413e3..fe21413e3 100644
--- a/system/mkinitfs/APKBUILD
+++ b/legacy/mkinitfs/APKBUILD
diff --git a/system/mkinitfs/mkinitfs.post-install b/legacy/mkinitfs/mkinitfs.post-install
index a2a404b09..a2a404b09 100644
--- a/system/mkinitfs/mkinitfs.post-install
+++ b/legacy/mkinitfs/mkinitfs.post-install
diff --git a/system/mkinitfs/mkinitfs.post-upgrade b/legacy/mkinitfs/mkinitfs.post-upgrade
index 78caf2e57..78caf2e57 120000
--- a/system/mkinitfs/mkinitfs.post-upgrade
+++ b/legacy/mkinitfs/mkinitfs.post-upgrade
diff --git a/system/mkinitfs/mkinitfs.pre-upgrade b/legacy/mkinitfs/mkinitfs.pre-upgrade
index 0ece527f9..0ece527f9 100644
--- a/system/mkinitfs/mkinitfs.pre-upgrade
+++ b/legacy/mkinitfs/mkinitfs.pre-upgrade
diff --git a/system/mkinitfs/mkinitfs.trigger b/legacy/mkinitfs/mkinitfs.trigger
index e8acc9785..e8acc9785 100644
--- a/system/mkinitfs/mkinitfs.trigger
+++ b/legacy/mkinitfs/mkinitfs.trigger
diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD
index 2ba1d846b..746468fab 100644
--- a/system/apk-tools/APKBUILD
+++ b/system/apk-tools/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
pkgname=apk-tools
-pkgver=2.9.1
-pkgrel=2
-pkgdesc="Alpine Package Keeper - package manager for alpine"
+pkgver=2.10.1
+pkgrel=0
+pkgdesc="Alpine Package Keeper - package manager"
url="https://git.alpinelinux.org/cgit/apk-tools/"
arch="all"
license="GPL-2.0-only"
@@ -13,8 +13,6 @@ makedepends_host="zlib-dev openssl openssl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-static"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
- 0001-solver-allow-names-with-only-one-provider-to-be-auto.patch
- openssl-compat.patch
"
prepare() {
@@ -68,6 +66,4 @@ static() {
"$subpkgdir"/sbin/apk.static
}
-sha512sums="4ffb8d1716bbb94421b1cc4277beb47d369c429f4c3bf597d08949abb7586d30c4504edf2f775bea3b93614a280c12391b956ca8f914fb0ec27799a4a005a145 apk-tools-2.9.1.tar.xz
-5ca2d2f2646032ed8f9f86357e986b054045a80ddb944be6a540566ff7092f38591ec8dfc7ac06b9daededa95e86c0e892ead55f9e8907eb318aed76644f7f97 0001-solver-allow-names-with-only-one-provider-to-be-auto.patch
-5640b746cd3c6d966d5f778ffe2307902503b1fc966bedb35b50dedee34ec3d5fe2c7f200dfd3893d6640150ff6dd4efd2df9aa110b4a7fd162b84904dacb493 openssl-compat.patch"
+sha512sums="f994dba20b9ba7ee0ad4cbd9d137f65b814851f348f0d5eb75eb60c7d6a21f88648b472239e14298eaf1348c517de00652432e7f8c8abd54565914c7d49e3cd3 apk-tools-2.10.1.tar.xz"
diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD
index f58826716..eb2d468a9 100644
--- a/system/pcre/APKBUILD
+++ b/system/pcre/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pcre
pkgver=8.42
-pkgrel=0
+pkgrel=1
pkgdesc="Perl-compatible regular expression library"
url="http://pcre.sourceforge.net"
arch="all"
@@ -13,6 +13,7 @@ checkdepends="paxmark"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
libpcrecpp libpcre16 libpcre32"
source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2
+ ppc64-elfv2-fix.patch
"
# secfixes:
@@ -25,7 +26,8 @@ builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
- ([ "$CARCH" = "s390x" ] || [ "$CARCH" = "ppc64" ]) && _enable_jit="" || _enable_jit="--enable-jit"
+ local _enable_jit="--enable-jit"
+ [ "$CARCH" = "s390x" ] && _enable_jit=""
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -87,4 +89,5 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d pcre-8.42.tar.bz2"
+sha512sums="b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d pcre-8.42.tar.bz2
+61f06b2fb1d1d0d512056da4b8eb4905948b45a26ee177b0bcc6d25a75ffbdaff29c4b52ec461a7287b4f47ae20dbec31382188934e855c960f5877c31948a4b ppc64-elfv2-fix.patch"
diff --git a/system/pcre/ppc64-elfv2-fix.patch b/system/pcre/ppc64-elfv2-fix.patch
new file mode 100644
index 000000000..040f93ee9
--- /dev/null
+++ b/system/pcre/ppc64-elfv2-fix.patch
@@ -0,0 +1,25 @@
+diff -Naur pcre-8.42-original/sljit/sljitConfigInternal.h pcre-8.42/sljit/sljitConfigInternal.h
+--- pcre-8.42-original/sljit/sljitConfigInternal.h 2018-03-13 16:15:23.000000000 +0000
++++ pcre-8.42/sljit/sljitConfigInternal.h 2018-09-13 01:16:46.640000000 +0000
+@@ -530,7 +530,7 @@
+ #endif /* !SLJIT_FUNC */
+
+ #ifndef SLJIT_INDIRECT_CALL
+-#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)) \
++#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && ((defined _CALL_ELF && _CALL_ELF == 1) || (!defined _CALL_ELF))) \
+ || ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && defined _AIX)
+ /* It seems certain ppc compilers use an indirect addressing for functions
+ which makes things complicated. */
+diff -Naur pcre-8.42-original/sljit/sljitNativePPC_common.c pcre-8.42/sljit/sljitNativePPC_common.c
+--- pcre-8.42-original/sljit/sljitNativePPC_common.c 2018-01-08 10:25:56.000000000 +0000
++++ pcre-8.42/sljit/sljitNativePPC_common.c 2018-09-13 01:21:00.360000000 +0000
+@@ -42,7 +42,8 @@
+ #include <sys/cache.h>
+ #endif
+
+-#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
++#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN) \
++ || (defined _CALL_ELF && _CALL_ELF == 2)
+ #define SLJIT_PASS_ENTRY_ADDR_TO_CALL 1
+ #endif
+
diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD
new file mode 100644
index 000000000..700e82d37
--- /dev/null
+++ b/user/xf86-video-nouveau/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=xf86-video-nouveau
+pkgver=1.0.15
+pkgrel=2
+pkgdesc="Open-source X.org drivers for nVidia video cards"
+url="https://nouveau.freedesktop.org/"
+arch="all"
+license="MIT"
+depends="mesa-dri-nouveau"
+makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev"
+subpackages="$pkgname-doc"
+source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2
+ dont-strcmp-null.patch
+ "
+
+build() {
+ cd "$builddir"
+ export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285 xf86-video-nouveau-1.0.15.tar.bz2
+4cd8b3b9996989a8c9302a5ba77aa9f794fde7559d9f131d5bb4b3174d68be85140834719384c22686b63c89242bdf09696c0c1a98b632f7e3a4f46522f49c3b dont-strcmp-null.patch"
diff --git a/user/xf86-video-nouveau/dont-strcmp-null.patch b/user/xf86-video-nouveau/dont-strcmp-null.patch
new file mode 100644
index 000000000..23c4fd216
--- /dev/null
+++ b/user/xf86-video-nouveau/dont-strcmp-null.patch
@@ -0,0 +1,33 @@
+From 69aecdd305defdd014bc92b82acc6000988511cf Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 13 Jun 2017 09:23:42 -0400
+Subject: modesetting: Validate the atom for enum properties
+
+The client could have said anything here, and if what they said doesn't
+actually name an atom NameForAtom() will return NULL, and strcmp() will
+be unhappy about that.
+
+[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc]
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/drmmode_display.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 2b71c9c..04a0b57 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -1081,7 +1081,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
+ if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
+ return FALSE;
+ memcpy(&atom, value->data, 4);
+- name = NameForAtom(atom);
++ if (!(name = NameForAtom(atom)))
++ return FALSE;
+
+ /* search for matching name string, then set its value down */
+ for (j = 0; j < p->mode_prop->count_enums; j++) {
+--
+cgit v1.1
+
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-24 02:49:44 +0000