core: bump, update.

Cut a release. Signed-off-by: Dilyn Corner <[email protected]>
dilyn-corner · Dec 18, 2024 · 4ab6f8a · 4ab6f8a
1 parent e2d6ee2
commit 4ab6f8a
Show file tree

Hide file tree

Showing 161 changed files with 13,257 additions and 605 deletions.
diff --git a/README b/README
@@ -12,177 +12,19 @@ The master branch is for:
 
 Other branches are for:
 1) Strangeness
+2) Fun
 
 
-The structure of this repository
+The structure of this branch
 ________________________________________________________________________________
 
-The master branch is very finicky and I would not recommend using it for a usual
-system; use it as a reference for building packages. As an example, many build
-scripts have been modified to make use of meson or cmake when available, leaving
-perhaps a large amount of overhead in the build system. Not to mention the fact
-that it is intended for wyverkiss. Additionally, due to my distaste for GPL,
-much of the core system has changed to include e.g. toybox, nawk, and pax. A lot
-of utilities are gone because of dropping busybox, but I would like to assume
-that I'll be just fine.  We will see. Some current issues:
+This branch is intended to be a daily driver on the bleeding edge. Ouch.
 
-* toybox mdev does NOT work. Use something else, or handle /dev perms manually.
-* python expects gnugrep; endianness must be specified.
+It isn't meant to be useable by everyone and it certainly isn't *for* anyone.
+However, it is the version I use.
 
-Any packages that use a GPL license will end up in the gpl directory, regardless
-of their position in the system hierarchy. Ideally, there will be almost no GPL
-in the core, runtime system.
+The intention is minimalism; a system that does the bare minimum to keep itself
+running and gets out of your way. It's a power user's system.
 
 
-For the curious
-________________________________________________________________________________
-
-Here is a roughly current list of all the licenses each package in this
-repository uses. The real question is how one feels about GPL-compatible (what I
-would think of as semi-GPL) licenses (PSF, MPL).
-
-The list doesn't go into the nuances of several licenses. Big examples are
-things like mesa or llvm - projects which inherit extra licenses because of code
-blobs they borrow. In general, I am semi-fine with this (if not wholly forced to
-accept it).
-
-NOTES:
-    * chromium is built using some bundled libs and programs, the biggest being
-        ffmpeg and x264. This makes chromium de facto GPL.
-    * zfs bundles util-linux for libblkid and libuuid. libblkid is BSD, but
-        libuuid is GPLv2.
-    * some packages include their own makefiles. Please be aware of this before
-        building packages. Currently,
-        {zlib-ng, musl, zfs, zstd, elftoolchain, netbsd-curses, wpa_supplicant}
-    * qemu, basu, dbus, glib, pipewire, xdg-desktop-portal{-wlr} only exist for
-        my job. The system can build and run just fine without them.
-    * the most GNU- and GPL-free system I've been able to achieve on this
-        system: alsa-{lib,utils}, linux, libuuid, and chromium's bundled
-        dependencies.
-
-    +-------------------+---------------+---------------------+---------------+
-    | CORE              | LICENSE       | EXTRA               | LICENSE       |
-    +-------------------+---------------+---------------------+---------------+
-    | b3sum             | Public Domain | aerc                | MIT           |
-    | baseinit          | MIT           | cairo               | MPLv1.1       |
-    | byacc             | Public Domain | chromium            | BSD 3-Clause  |
-    | bzip2             | bzip2         | cozette-font        | MIT           |
-    | cmake             | BSD 3-Clause  | dbus                | Academic      |
-    | curl              | MIT           | dhcpcd              | BSD           |
-    | flex              | Public Domain | elftoolchain        | MIT           |
-    | fossil            | BSD 2-Clause  | exercism            | MIT           |
-    | kiss              | MIT           | expat               | BSD           |
-    | libressl          | MIT           | fantasque-nerd-font | MIT           |
-    | llvm              | ISC           | fontconfig          | MIT           |
-    | m4                | Apache-2.0    | freetype-harfbuzz   | BSD           |
-    | make              | BSD/ISC       | go                  | BSD 3-Clause  |
-    | musl              | BSD 2-Clause  | gopls               | BSD 3-Clause  |
-    | nawk              | MIT           | gotop               | MIT           |
-    | oksh              | MIT           | iana-etc            | Public Domain |
-    | openntpd          | ISC           | iosevka-nerd-font   | OFL           |
-    | otools            | BSD-style     | libdrm              | MIT           |
-    | samurai           | Apache-2.0    | libffi              | MIT           |
-    | sm                | MIT           | libinput            | X11           |
-    | smdev             | MIT           | libpciaccess        | X11           |
-    | toybox            | 0BSD          | libpng              | libpngv2      |
-    | xz                | Public Domain | libudev-zero        | ISC           |
-    | zfs               | CDDL          | libva               | MIT           |
-    | zlib-ng           | zlib          | libwebp             | BSD 3-Clause  |
-    | zstd              | BSD 3-Clause  | libxml2             | MIT           |
-    +-------------------+---------------+ mesa                | MIT           |
-    | WAYLAND           | LICENSE       | meson               | Apache-2.0    |
-    +-------------------+---------------+ netbsd-curses       | BSD 3-Clause  |
-    | foot              | MIT           | nodejs              | MIT           |
-    | grim              | MIT           | nss                 | MPLv2         |
-    | libxkcommon       | MIT           | openssh             | BSD           |
-    | seatd             | MIT           | opus                | BSD 3-Clause  |
-    | slurp             | MIT           | perl                | Artistic      |
-    | wayfire           | MIT           | pipewire            | MIT           |
-    | wayland           | MIT           | pixman              | MIT           |
-    | wayland-protocols | MIT           | pkgconf             | ISC           |
-    | wbg               | MIT           | python              | PSFv2         |
-    | wev               | MIT           | sdl2                | BSD 3-Clause  | 
-    | wayclip           | ISC           | sqlite              | Public Domain |
-    | wlroots           | MIT           | tzdata              | Public Domain |
-    | xdp-wlr           | MIT           | vim                 | Vim           |
-    | xkeyboard-config  | MIT           | wpa_supplicant      | BSD 3-Clause  |
-    +-------------------+---------------+---------------------+---------------+
-    | GPL               | LICENSE       |
-    +-------------------+---------------+
-    | alsa-lib          | GPLv2.1       |
-    | alsa-utils        | GPLv2         |
-    | basu              | LGPLv2.1      |
-    | glib              | GPLv2.1       |
-    | linux-headers     | GPLv2         |
-    | qemu              | GPLv2         |
-    | xdp               | GPLv2.1       |
-    +-------------------+---------------+
----
-
-
-My other stuff
-________________________________________________________________________________
-
-I am the maintainer of a couple other repositories:
-
-KISS-haskell https://github.com/dilyn-corner/KISS-haskell - a KISS-compliant
-repository that contains a bootstrappable ghc.
-
-KISS-kde https://github.com/dilyn-corner/KISS-kde - A KISS-compliant
-repository that brings the wonders of a plasma desktop to KISS.
-
-KISS-static https://github.com/dilyn-corner/KISS-static - A KISS-compliant
-repository that provides a static KISS rootfs.
-
-dotfiles https://github.com/dilyn-corner/dotfiles - Just a simple way to
-maintain my dotfiles and share screenshots. Don't use it, just marvel.
-
-
----
-
-Useful fork-facts
-________________________________________________________________________________
-
-
-This is more-so for me and anyone like me who is both new to Git(hub) and forks.
-
-Keeping up
-________________________________________________________________________________
-
-
-If you want to keep your fork in-line with upstream, there's a very
-straightforward way of doing this! [1] Simply add the upstream
-repository as a remote URL for git to track, and then you will be able to pull
-down any changes upstream makes and merge them into your fork.
-
-git remote add upstream $upstreamURL # Add upstream to your remotes
-git fetch upstream                   # Fetch upstream's changes
-git checkout master                  # Switch to master
-git merge upstream/master            # Merge upstream's master branch
-
-Suppose upstream is _very_ busy while you do your work. They push a lot of
-changes that you wish you had while you're working on your branch. If you
-merge upstream into your branch, you'll have some hairy commit messages they
-won't _super_ appreciate when you make your PR. So you can rebase instead. It's
-very handy.
-
-git checkout -b $newBranch
-> You do work
-> You commit your work
-> They do work
-> They push their work
-> You want their work
-git fetch upstream
-git rebase upstream/master
-
-Rebasing [2] is essentially just a patch of the work you did based off
-the commit you made your fork from, that you can then simply slide into the
-history without making it look wonky (with a bunch of merge commit messages).
-
-This will be edited heavily in the future maybe hopefully probably. [3]
-
-1. https://www.atlassian.com/git/tutorials/git-forks-and-upstreams
-
-2. https://git-scm.com/book/en/v2/Git-Branching-Rebasing
-
-3. https://medium.com/@catalinaturlea/clean-git-history-a-step-by-step-guide-eefc0ad8696d
+PRs welcome, issues appreciated.
diff --git a/core/b3sum/build b/core/b3sum/build
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-make LDFLAGS="$LDFLAGS -static"
-make PREFIX=/usr DESTDIR="$1" install
+gmake LDFLAGS="$LDFLAGS -static"
+gmake PREFIX=/usr DESTDIR="$1" install
 
 # Install the license
 install -Dm644 LICENSE "$1/usr/share/LICENSES/b3sum.license"
diff --git a/core/b3sum/checksums b/core/b3sum/checksums
@@ -1 +1,2 @@
-3a78d3bbb0e553359035da0c5ce9a2eaadcc658d412dc12f9075caa1bbd74c5e
+c96984c55c4861da5e5fd3953969e85157c238a97dc3752048451b51f3b65e32aa
+63a31131622893ed08f5be67ce01290678dc75d2363a3d2072de6b4031790411dd
diff --git a/core/b3sum/depends b/core/b3sum/depends
@@ -0,0 +1 @@
+gmake make
diff --git a/core/b3sum/patches/01-prevent-executable-stack.patch b/core/b3sum/patches/01-prevent-executable-stack.patch
@@ -0,0 +1,22 @@
+From d995c3d31b42d09a568a0a658bcbcd3814164ca9 Mon Sep 17 00:00:00 2001
+From: Michael Forney <[email protected]>
+Date: Mon, 1 Jan 2024 19:23:04 -0800
+Subject: [PATCH] Add .note.GNU-stack to prevent executable stack
+
+---
+ blake3_cpuid.S | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/blake3_cpuid.S b/blake3_cpuid.S
+index f6b72ba..436121b 100644
+--- a/blake3_cpuid.S
++++ b/blake3_cpuid.S
+@@ -23,4 +23,5 @@ blake3_xgetbv:
+ .section .init_array,"aw"
+ .align	8
+ .quad	blake3_detect_cpu_features
++.section .note.GNU-stack,"",@progbits
+ #endif
+-- 
+2.45.2
+
diff --git a/core/b3sum/sources b/core/b3sum/sources
@@ -1 +1,2 @@
-https://git.sr.ht/~mcf/b3sum/archive/cb4111ccc8061039b014fbb657c72f78984f1069.tar.gz
+https://git.sr.ht/~mcf/b3sum/archive/434e6e5bf8e79105911c82c66815c1b1f109e445.tar.gz
+patches/01-prevent-executable-stack.patch
diff --git a/core/b3sum/version b/core/b3sum/version
@@ -1 +1 @@
-1.3.1 2
+1.5.0 1
diff --git a/core/baseinit/build b/core/baseinit/build
diff --git a/core/baseinit/checksums b/core/baseinit/checksums
diff --git a/core/baseinit/patches/toybox.patch b/core/baseinit/patches/toybox.patch
diff --git a/core/baseinit/patches/tweaks.patch b/core/baseinit/patches/tweaks.patch
diff --git a/core/baseinit/sources b/core/baseinit/sources
diff --git a/core/baseinit/version b/core/baseinit/version
diff --git a/core/baselayout/checksums b/core/baselayout/checksums
@@ -1,13 +1,13 @@
-570907214599286ebbe57c285038b37dd36bd42dc2efebe5b8043ae00c150fbb
-d29d23ed217b1899e5045e6645cab8164bf054565284d362c5dbb885d04439cd
-b54fab62aa208a7a6140cea42736676c8a57a4312c9ad667dfc39fb571219dd2
-8aae5ab74e397a54f4b34c0f3eeec9bf50a2ad2c25dadfde6e377461951f127b
-f774084837e806ccf383a25440f9860333edc39636641de552e783bee5e20bdf
-5a34541a2e0af23aba50177ec5151a2c874588478dbf62a013c2db9b20402194
-247378e4a8a8464ef0e58aef7e6ab264c546424721e570a9791a661e36e8087a
-98a4ed3598dc1b0701f450aba0d831a3bc912e032bf92225f8d3634cf17447d0
-3b261890ffb02c40996c7214b31db6267f0ee900d098d27bd4b1306998592c9a
-86c91cdc57997efbb94fa4d881be6a00f0d0148f912de66be1d45f1947a6d7e1
-07a4b57209d264c357270c4aa59ba8686eaeb984dcbb54861e396b8db01a8ad3
-f7124e3036aef9b92974e50a351d575eed653bd9fad38fb92c2c12957da91fee
-b878528c01b217a4eb011e1109a97b1773abc734f76ca49b54a2ae52e6911dbd
+570907214599286ebbe57c285038b37dd36bd42dc2efebe5b8043ae00c150fbb92
+d29d23ed217b1899e5045e6645cab8164bf054565284d362c5dbb885d04439cda1
+b54fab62aa208a7a6140cea42736676c8a57a4312c9ad667dfc39fb571219dd248
+8aae5ab74e397a54f4b34c0f3eeec9bf50a2ad2c25dadfde6e377461951f127b8d
+f774084837e806ccf383a25440f9860333edc39636641de552e783bee5e20bdf4b
+5a34541a2e0af23aba50177ec5151a2c874588478dbf62a013c2db9b2040219470
+247378e4a8a8464ef0e58aef7e6ab264c546424721e570a9791a661e36e8087a2a
+af6b42ccbdd1ff73e20ef2372b5c22f1bb2a2486db5a6e7241052c9d6227e9063c
+3b261890ffb02c40996c7214b31db6267f0ee900d098d27bd4b1306998592c9afb
+86c91cdc57997efbb94fa4d881be6a00f0d0148f912de66be1d45f1947a6d7e137
+07a4b57209d264c357270c4aa59ba8686eaeb984dcbb54861e396b8db01a8ad3d0
+f7124e3036aef9b92974e50a351d575eed653bd9fad38fb92c2c12957da91feeed
+b878528c01b217a4eb011e1109a97b1773abc734f76ca49b54a2ae52e6911dbd00