PR#96: libre\iceweasel: 123.0.parabola1, sync with upstreams - abslibre

file added

+49

		`@@ -0,0 +1,49 @@`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: csslayer <wengxt AT gmail com>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - replace webengine dependency with webkit`
		`+ # use '-DENABLE_BROWSER=OFF' instead, if we ever need to drop 'qt5-webkit'`
		`+`
		`+`
		`+ # FTBS armv7h: because qt5-webit FTBS`
		`+ # FTBS i686: Could not find a configuration file for package "Fcitx5Core" that is compatible with requested version "5.1.6".`
		`+`
		`+`
		`+ pkgname=fcitx5-chinese-addons`
		`+ pkgver=5.1.3`
		`+ pkgrel=1`
		`+ pkgrel=1.parabola1`
		`+ pkgdesc="Addons related to Chinese, including IME previous bundled inside fcitx4"`
		`+ arch=('x86_64')`
		`+ arch+=('armv7h' 'i686')`
		`+ url="https://github.com/fcitx/fcitx5-chinese-addons"`
		`+ license=('GPL')`
		`+ conflicts=('fcitx')`
		`+ depends=('curl' 'fcitx5-qt' 'libime' 'opencc' 'qt5-webengine')`
		`+ depends=( ${depends[*]/qt5-webengine/qt5-webkit} )`
		`+ makedepends=('boost' 'extra-cmake-modules' 'fcitx5-lua' 'fmt' 'ninja')`
		`+ optdepends=('fcitx5-lua: Lua and imeapi support from pinyin')`
		`+ source=("https://download.fcitx-im.org/fcitx5/$pkgname/$pkgname-${pkgver}_dict.tar.xz"{,.sig})`
		`+ sha512sums=('4ea52ec45af70b552d8d4af3ed077662d6d839d3984bc41858b4710fe5b1dc169c63e223770f5400718c1c18aa745e77305f242409fa1cc523cee8475eb2e9ff'`
		`+ 'SKIP')`
		`+ validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian <wengxt@gmail.com>`
		`+`
		`+ build() {`
		`+ cd $pkgname-$pkgver`
		`+`
		`+ cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DUSE_WEBKIT=ON .`
		`+ ninja`
		`+ }`
		`+`
		`+ check() {`
		`+ cd $pkgname-$pkgver`
		`+ ninja test`
		`+ }`
		`+`
		`+ package() {`
		`+ cd $pkgname-$pkgver`
		`+ DESTDIR="$pkgdir" ninja install`
		`+ }`

libre/fcitx5-chinese-addons/keys/pgp/2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9.asc

file added

+37

		`@@ -0,0 +1,37 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQENBEyUvwkBCAD0P0fGutq6L7iixhhOMCaxvTwmT84oEcNP816hNo2+YSEws8Xp`
		`+ 6uv94czWDyC1ibzh++mStReE7RioieiKtH/sYrfS1M2Gwv3kGYzekx5qKx92nczt`
		`+ Ed08ufho3s3Qcw4QV0IT8JLdnqCWOTHwcPeyLJ0ZZH9fseqHfrlsbVIlFI7BnMZy`
		`+ TW4xTvgX1jJ9A5m5JWW70iaOX+Yom1k5WRUDm8RtzzK0IAkdXwYHbrVCRNumbQK5`
		`+ ZtNZr3EmBxDt3lzpzD1Ow1EStRpVgd0YVzHtv5N5o46Tp0L9j1br64zUbiOPrRss`
		`+ pVhpo0w9Mx70ay8JCBZqSBGM8GOSpsyP6g0FABEBAAG0H1dlbmcgWHVldGlhbiA8`
		`+ d2VuZ3h0QGdtYWlsLmNvbT6JATsEEwECACUCGwMGCwkIBwMCBhUIAgkKCwQWAgMB`
		`+ Ah4BAheABQJPZPw5AhkBAAoJEI6LiYy/JBL5EDIH/2H0nZqZ8sYwO1WoF6kfvxJB`
		`+ DotsuYxDOAXqQ8MzS16XFHavIyFjeYnFQHDbTHGzMLPATSmEb8HjCFgEfvHIJYjX`
		`+ 57ufZI7mt9Kg79jjRFIo65JwvtFYVxUHztHQCjYCLOU8Eqnm6FKkgpjQ1xL5QLnP`
		`+ fBbetUYv5Lk2C6XJthOHEO/oACvt092pU2Qgu5eMtkMBihaCzwvp9emIHjy0aJO+`
		`+ Pw1B2x2ppfdmRYPPyxd2FjiF1JEe9E5UIEsKMpF4qLiSqNQulEOq9Dh/+Xq7Hp+D`
		`+ y9z8LxMZYMwOAImwEL9BO0PvJ5/piUhK8ityafBa0RSojIHHYqf4gt12b2aQ2bK0`
		`+ KldlbmcgWHVldGlhbiA8Y3NzbGF5ZXJAY2hha3JhLXByb2plY3Qub3JnPokBOAQT`
		`+ AQIAIgUCT2T7HwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQjouJjL8k`
		`+ EvmxVggAhbwpKqVYIOulwtVcU9Fbi3C91tDlMRDoGOhWzywhhILLqj0ynQdI9rh0`
		`+ sgEgsmd/cagY5NzROduxlgeYl8CMsG5HjTAcDqmJBgIw6Hd5wpIoR/LNXw0k5nnR`
		`+ JMn7UXtGUTqUU/dGe94Ssqeh94cYpeJ/M2yE+vsKqOS2w0fJJ+pShVY27uPiG7LS`
		`+ xPgoNBKde3PhX6uVIUU9jb4O/sYfRCHvqY6PhOymMl+ns/L8HQ0HDCgeDZc9vXGJ`
		`+ Vgxq1zt4vnff7Nvnn0NzPHjeyJJOLO4q3QCKX7rWADv9JYQ6ffcZusw9IUwgDOA6`
		`+ Gw4PYFcj57axk+89/HXyMssPnhT3YrkBDQRMlL8JAQgAvZzurDyA/sLup7IeY3Wa`
		`+ +Xyqm3oGE9IDxJtgDt85IVp+T5tp3jGk2VUWtXjchzc+XjTpsf+5r/SB0tzBxaDd`
		`+ vijmfeLtKA32pmWEqlnM3NglBOTZP97D5aCnmmiNpS9cbRVZ9gFAQlXgevB3IaDD`
		`+ esC1I2jO6+OjaZwj/4fhPaZCe1XsIM0HBotPpI5Jlv1Pj4JD8hglGZ6Fd9ws1WQ7`
		`+ u+53xOsJ6ArgpPVyv1LEXcjEn0G1xAtezX2MdZ5aZ25wxuquleT8C/aX8H7xCT/0`
		`+ BUC+ZDUZchzU/kvJ79tXbWJw96XEL9MfzPjE+vejk6JVOU570+1gNKuVHllNJJGq`
		`+ 9QARAQABiQEfBBgBAgAJBQJMlL8JAhsMAAoJEI6LiYy/JBL5nXEIAIngpMxcbP/b`
		`+ BGnZgz5hbLSuOw76w7vo9xDi7aHGr74T0Kn/tecirx32RtW6DQv1ebbSOJ/8PlDl`
		`+ maCCBsVJbFN9I6zKbfSG8SFfrgHG1P/zMLUD6WLHP8nyKU6LecYoZ7HQZab3MSD4`
		`+ Ir0A405OvqlqiuLyBxNMVCDc4y/BEjf52RQKg5URlHK3bSU5Bhjv+lOTjM8Sw5la`
		`+ El1MZ4WnQ09KSy8lyVRtmKDsFS/Fozgby/3ly1wEC4mHmymDpfe3yB+8SbFPolcz`
		`+ jPpr6RDKYPy6fNYVhwdd3CT1h1QuuIdpHdHFqF16PSmHdyVPhAmqOXN2K0838LAf`
		`+ zFnVmg8Glng=`
		`+ =tbsk`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

libre/flashrom-stable/PKGBUILD

file removed

-38

		`@@ -1,38 +0,0 @@`
		`- # Maintainer (aur): Nico Huber <nico.h@gmx.de>`
		`- # Maintainer: Wael Karram <wael@waelk.tech>`
		`-`
		`- # Parabola Changes and Rationale:`
		`- # - This package exists as a replacement for the rusty 'flashrom'.`
		`- # Most of the newer development is happening in this branch too, as part of Coreboot.`
		`- # - Change of compilation targets to what is relevant for Parabola.`
		`-`
		`- pkgname="flashrom-stable"`
		`- pkgdesc="Flashrom is a utility which can be used to detect, read, erase, or write BIOS chips (DIP, PLCC, SPI)."`
		`- pkgver=1.1`
		`- pkgrel=1`
		`- url="https://review.coreboot.org/plugins/gitiles/flashrom-stable"`
		`- license=('GPL')`
		`- source=("https://download.flashrom.org/flashrom-stable/releases/flashrom-stable-v${pkgver}.tar.bz2"`
		`- "https://download.flashrom.org/flashrom-stable/releases/flashrom-stable-v${pkgver}.tar.bz2.asc")`
		`- validpgpkeys=('2853079C9C66AB7E82C64966A5C163B7E557CAEB') # Nico Huber - GPG`
		`- sha256sums=('8f7a5cefcb59be9994464031af5fea8e073b58e51b2b312155fecdd8298f1141'`
		`- 'SKIP')`
		`- depends=('pciutils' 'libusb' 'libftdi' 'libjaylink' 'libgpiod')`
		`- optdepends=("dmidecode: for SMBIOS/DMI table decoder support")`
		`- provides=("flashrom")`
		`- conflicts=("flashrom")`
		`- arch=('armv7h' 'i686' 'x86_64')`
		`-`
		`- build() {`
		`- cd "${srcdir}/${pkgname}-v${pkgver}"`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/${pkgname}-v${pkgver}"`
		`- install -d "${pkgdir}/usr/bin"`
		`- install -d "${pkgdir}/usr/man/man8"`
		`- install -m 0755 flashrom "${pkgdir}/usr/bin/"`
		`- install -m 0644 flashrom.8 "${pkgdir}/usr/man/man8/"`
		`- install -m 0755 util/ich_descriptors_tool/ich_descriptors_tool "${pkgdir}/usr/bin/"`
		`- }`

libre/hplip/0025_fix-Werror-format-security.patch

file removed

-47

		`@@ -1,47 +0,0 @@`
		`- --- hplip-3.22.6/protocol/hp_ipp.c 2022-06-28 20:44:38.000000000 +0200`
		`- +++ hplip-3.22.6/protocol/hp_ipp.c.new 2022-06-28 20:56:14.336097721 +0200`
		`- @@ -110,7 +110,7 @@`
		`- }`
		`-`
		`- if ( info == NULL )`
		`- - snprintf( info,sizeof(info), name );`
		`- + snprintf( info, sizeof(info), "%s", name );`
		`-`
		`- sprintf( printer_uri, "ipp://localhost/printers/%s", name );`
		`-`
		`- --- hplip-3.22.6/protocol/hp_ipp.c 2022-06-28 21:08:10.000000000 +0200`
		`- +++ hplip-3.22.6/protocol/hp_ipp.c.new 2022-06-28 21:14:15.921484059 +0200`
		`- @@ -511,27 +511,27 @@`
		`-`
		`- if ( strcmp(attr_name, "printer-name") == 0 &&`
		`- val_tag == IPP_TAG_NAME ) {`
		`- - snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) );`
		`- + snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) );`
		`- }`
		`- else if ( strcmp(attr_name, "device-uri") == 0 &&`
		`- val_tag == IPP_TAG_URI ) {`
		`- - snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) );`
		`- + snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) );`
		`- }`
		`- else if ( strcmp(attr_name, "printer-uri-supported") == 0 &&`
		`- val_tag == IPP_TAG_URI ) {`
		`- - snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) );`
		`- + snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) );`
		`- }`
		`- else if ( strcmp(attr_name, "printer-info") == 0 &&`
		`- val_tag == IPP_TAG_TEXT ) {`
		`- - snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) );`
		`- + snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) );`
		`- }`
		`- else if ( strcmp(attr_name, "printer-location") == 0 &&`
		`- val_tag == IPP_TAG_TEXT ) {`
		`- - snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) );`
		`- + snprintf(t_printer->location,sizeof(t_printer->location),"%s", ippGetString(attr, 0, NULL) );`
		`- }`
		`- else if ( strcmp(attr_name, "printer-make-and-model") == 0 &&`
		`- val_tag == IPP_TAG_TEXT ) {`
		`- - snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) );`
		`- + snprintf(t_printer->make_model,sizeof(t_printer->make_model),"%s", ippGetString(attr, 0, NULL) );`
		`- }`
		`- else if ( strcmp(attr_name, "printer-state") == 0 &&`
		`- val_tag == IPP_TAG_ENUM ) {`

libre/hplip/PKGBUILD

file modified

+4 -8

		`@@ -17,9 +17,9 @@`


		`pkgname=hplip`
		`- pkgver=3.23.5`
		`- pkgrel=1`
		`- pkgrel+=.parabola2`
		`+ pkgver=3.23.12`
		`+ pkgrel=2`
		`+ pkgrel+=.parabola1`
		`epoch=1`
		`pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"`
		`arch=('x86_64')`
		`@@ -47,20 +47,18 @@`
		`0018-Allow-non-JPEG-scanning-on-the-HP-DeskJet-3520-All-i.patch`
		`0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch`
		`0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch`
		`- 0025_fix-Werror-format-security.patch`
		`# use the one from Fedora`
		`hplip-configure-python.patch`
		`python3.diff`
		`reproducible-gzip.patch)`
		`source_armv7h=(0001-Remove-ImageProcessor.patch) # x86-only`
		`- sha512sums=('f7e8c431dece035c3e8709baffad7de923ec16ec168f0c1ab64e7aa72e2b3452bf510e3f98b1d0a783bf444869affc452c7adf8fdc2075fed341c64b55ec7c3e'`
		`+ sha512sums=('7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956fd221f7e1561635508103ae944f19e04d6052d3f8928f2c9685fdcdcf515df'`
		`'SKIP'`
		`'a12aaeece5285ffb86bdbc24871bf512fbc1f29da44ae51ded314378032662074a42b8aca23bebb378bf78ed15bb7f99da59bfb4cd456f3458e7a5ef42a900f8'`
		`'f79b3f09d022178099f38b9eae1792396e730eb5352a03d088e6610d92b3895f3f65bb92089ce7f5b21d794f9716ceb176d29ca7283e8a48bb04cf6aba305a2f'`
		`'93e29a9ef893636b2b84443e75525c4ed42531d6e68a182dfbb725c3919c77b966b5e7d9381a34d3b5853423995a7b15efb69ce3e500ec72b25b65b2ad6bd64c'`
		`'22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'`
		`'763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'`
		`- 'b7e67bccb2516f4d98e4c5ea55f7d2299d95bfdc341dbc0149af1423169bedcd8bcfdb125c92f373e9e7be57ea284fef80a8343035fb42572b9cb927929cd257'`
		`'089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'`
		`'b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14'`
		`'379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f')`
		`@@ -81,8 +79,6 @@`
		`patch -Np1 -i "${srcdir}"/python3.diff`
		`# fix model support / Debian patch / FS#74942`
		`patch -Np1 -i "${srcdir}"/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch`
		`- # fix -Werror=format-security build error with gcc 12`
		`- patch -Np1 -i "${srcdir}"/0025_fix-Werror-format-security.patch`
		`# https://bugs.launchpad.net/hplip/+bug/1879445`
		`# broken scanning - https://bugs.archlinux.org/task/66704`
		`patch -Np1 -i ../hplip-configure-python.patch`

libre/iceweasel/9004-FSDG-misc.patch

file modified

+8 -10

		`@@ -186,14 +186,13 @@`
		-<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M76 2H4a2 2 0 0 0-2 2v72a2 2 0 0 0 2 2h72a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2ZM4 0a4 4 0 0 0-4 4v72a4 4 0 0 0 4 4h72a4 4 0 0 0 4-4V4a4 4 0 0 0-4-4H4Zm3.08 7.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm20.434-2.27h2.27v2.27h2.27V7.08h4.541v2.27h2.27v2.27H36.596v2.27h-4.541v2.271h-2.27v-2.27h-2.271v-2.27h2.27V9.35h2.27V7.08Zm-4.541 4.54h-2.27V9.35h2.27v2.27Zm2.27 11.352v-4.54h2.27v-2.27h4.541V13.89h4.541v2.27h4.54v2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.271v2.271h-2.27Zm-4.54 2.27V18.433h2.27v4.54h2.27v2.27h-4.54Zm0 0v2.271h-9.081v-2.27h9.08Zm11.351-2.27h-2.27v-2.27h2.27v2.27Zm2.27 0h-2.27v4.541h-2.27v-2.27h-2.27v2.27h2.27v2.27h4.54V22.973Zm2.271 0v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v6.811h4.54v-2.27h-2.27v-4.54Zm2.27 0h-2.27v-2.27h2.27v2.27Zm4.542-6.81h-2.27V22.971h-2.271v2.27h2.27v2.271h2.27v2.27h-2.27v2.27h2.27v-2.27h2.271v2.27h2.27v2.271h2.27v-4.54h2.271v2.27h2.27v2.27h-2.27v2.27h-2.27v2.27h-4.541v6.811h2.27v2.271h4.541v4.541h-6.811v-2.27h-2.27v2.27h-2.27v-2.27h-4.541v2.27h-4.541v-2.27h-4.54v2.27h2.27v2.27h2.27v2.27H45.675v4.541h2.271v2.27h-2.27v2.271h-2.27v-4.54h-4.541v-2.27h-2.27v-2.271h-2.27v2.27h2.27v2.27h-2.27v2.27h-2.271v-2.27h-2.27v-2.27h-2.271v-4.54h2.27v2.27h2.27v-2.27h-2.27v-2.271h2.27v-2.27h-4.54v-2.27h2.27v-2.271h-2.27v-4.54h2.27v-2.271h-2.27v-6.811h2.27v-2.27h-2.27v2.27h-4.54v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54h-2.27V36.593H13.89v-4.54h-2.27v-2.27h2.27v-2.271H7.08v6.811h2.27v4.54h4.54v2.271h-2.27v2.27H9.35v-2.27H7.08v2.27h2.27v2.27H7.08v2.271h2.27v-2.27h2.27v2.27h2.27v-4.54h4.541v-2.27h-2.27v-4.541h2.27v2.27h2.27v2.27h2.271v2.27h-2.27v2.27h-2.27v2.271h-2.27v2.27H11.62v2.271H7.08v2.27h4.54v-2.27h4.541v2.27h9.081v9.081h4.541v4.541h-2.27v4.541h4.54v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-2.271h2.27v-2.27h2.27v2.27h2.271v2.27h-2.27v6.811H45.675v-4.54h2.271v4.54h2.27v-4.54h2.271v4.54h6.811v-2.27h2.27v2.27h2.27v-2.27h-2.27v-2.27h-4.54v-2.27h-9.081v-2.271H59.297v2.27h2.27v-2.27h2.27v4.54h4.541v4.541h2.271v-2.27h2.27v-4.54h-2.27v-2.271h2.27v-2.27h-2.27v-2.27h2.27v-4.541h-2.27v-4.541h2.27V27.513h-2.27v-2.27h-2.27v2.27h-6.811v-2.27h-4.541v2.27h-2.27v-2.27h-2.271v-2.27h2.27v-4.541h-4.54v-2.27Zm2.27-6.812h2.27v4.54h-2.27v2.271h-2.27v-4.54h2.27V9.35Zm0 0h-6.811V7.08h6.811v2.27Zm0 13.622v-2.27h-2.27v2.27h2.27Zm9.081 6.811v2.27h2.27v2.271h-2.27v2.27h-2.27v4.541h-4.54v2.27h2.27v2.27h4.54v-2.27h2.27v4.541h-2.27v4.541h2.27v6.811h2.271v2.27h-2.27v2.27h4.54v-4.54h2.271v-4.54h-2.27v-4.541h2.27v-4.541h-2.27v-4.54h2.27v-6.811h-2.27v-2.271h2.27v-2.27h-4.54v2.27h-2.271v-2.27h-2.27Zm6.812 24.974h-2.27v2.27h2.27v-2.27Zm0-4.54h-4.541v-2.27h4.54v2.27Zm-4.541-9.082h2.27v2.27h-2.27v-2.27Zm-2.27 0v-4.54h2.27v4.54h-2.27Zm4.54-4.54v-2.27h-2.27v2.27h2.27Zm0 0h2.27v2.27h-2.27v-2.27Zm-4.54 4.54v2.27h-2.27v-2.27h2.27Zm0-11.352v-2.27h-2.27v2.27h2.27ZM57.028 68.38h-2.27v2.27h2.27v-2.27Zm-24.974 0h-2.27v2.27h2.27v-2.27ZM20.702 47.946v2.27h2.27v2.271h-4.54v-4.54h2.27Zm2.27-2.27v2.27h-2.27v-2.27h2.27Zm2.27 0v2.27h2.271v-2.27h-2.27Zm0 0h-2.27v-2.27h2.27v2.27Zm-2.27-9.082v2.27h-2.27v-2.27h2.27Zm0 0h2.27v-2.27h-2.27v2.27ZM9.35 34.324v-2.27h2.27v2.27H9.35Zm15.893 20.433h2.27v-2.27h-2.27v2.27ZM41.135 66.11v4.541h2.27v-4.54h-2.27Zm6.811-4.54v-2.27h2.27v2.27h-2.27Zm-2.27-6.812h-2.27v-2.27h2.27v2.27Zm0 0v2.27h2.27v-2.27h-2.27Zm4.54-20.433v2.27h2.271v-2.27h-2.27Zm2.271-9.081h-2.27v2.27h2.27v-2.27Zm4.54-18.163H72.92v15.892H57.028V7.08Zm4.541 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm34.056 0h2.27v2.27h-2.27v-2.27Zm15.892 0h6.811v6.811H61.57V11.621Zm-4.54 43.137h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .663 1.99l.002.01c-.741-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.024.024 0 0 0-.013 0l-.003.002-.004.003.002-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.967 1.967 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.855 4.855 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.076.031-.15.07-.218.117-.23.163-.444.347-.641.549a5.73 5.73 0 0 0-.613.735 5.535 5.535 0 0 0-.88 1.986l-.008.043c-.013.057-.057.346-.065.41l-.002.014c-.057.298-.092.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.743 6.743 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006l.001.007h-.001Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.567 3.567 0 0 0-.608-.795c-2.038-2.038-.534-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.153-.011.23-.011a3.308 3.308 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="M37.666 37.134c.053.034.096.063.135.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.462.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.684 1.684 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.237-.234-.35-.347-.45-.432a1.973 1.973 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.72 5.72 0 0 0-.616.733 5.538 5.538 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.023.023 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.018 38.433a1.351 1.351 0 0 0-.099-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.916 2.916 0 0 1-.853-.164 3.497 3.497 0 0 1-.192-.08c-.037-.016-.074-.033-.11-.052l.004.003c.455.311 2.706 1.071 5.06-.846l.003-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.684 1.684 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66a6.81 6.81 0 0 1 .664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.023.023 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.495 3.495 0 0 1-.193-.079c-.037-.017-.074-.033-.11-.053l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .779-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.988 1.988 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.538 5.538 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.742 6.742 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.50741)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68221)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.53635 14.55876 -9.55479 1.0083 41.594 32.091)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
		`\ No newline at end of file`
		`diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js`
		`- index 1208a5dbcd..ff91f7421e 100644`
		`+ index bf97580d81..4d66df1d06 100644`
		`--- a/browser/components/preferences/moreFromMozilla.js`
		`+++ b/browser/components/preferences/moreFromMozilla.js`
		`- @@ -81,38 +81,7 @@ var gMoreFromMozillaPane = {`
		`- },`
		`-`
		`+ @@ -82,36 +82,6 @@ var gMoreFromMozillaPane = {`
		`renderProducts() {`
		`- - let products = [`
		`+ const isRegionUS = Region.home.toLowerCase() === "us";`
		`+ let products = [`
		`- {`
		`- id: "firefox-mobile",`
		`- title_string_id: "more-from-moz-firefox-mobile-title",`
		`@@ -224,11 +223,9 @@`
		`- },`
		`- },`
		`- },`
		`- - ];`
		`- + let products = [];`
		`-`
		`- if (BrowserUtils.shouldShowVPNPromo()) {`
		`- const vpn = {`
		`+ {`
		`+ id: "mozilla-monitor",`
		`+ title_string_id: "more-from-moz-mozilla-monitor-title",`
		`diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js`
		`index 115a67c962..3f9b72b021 100644`
		`--- a/browser/components/preferences/preferences.js`
		`@@ -1169,6 +1166,7 @@`
		`--monitor-brand-name = Firefox Monitor`
		`+-monitor-brand-name = Iceweasel Monitor`
		`-monitor-brand-short-name = Monitor`
		`+ -mozmonitor-brand-name = Mozilla Monitor`
		`-pocket-brand-name = Pocket`
		`--send-brand-name = Firefox Send`
		`--screenshots-brand-name = Firefox Screenshots`

libre/iceweasel/PKGBUILD

file modified

+8 -8

		`@@ -70,10 +70,10 @@`

		`pkgname=iceweasel`
		`epoch=1`
		`- pkgver=122.0.1`
		`+ pkgver=123.0.1`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`- _brandingver=120.0`
		`+ _brandingver=123.0`
		`_brandingrel=1`
		`pkgdesc="Standalone web browser derived from Mozilla Firefox"`
		`url=https://wiki.parabola.nu/Iceweasel`
		`@@ -177,16 +177,16 @@`
		`'3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger`
		`)`

		`- sha256sums=('36f19c9a748eec2fd6d3a1594d0f1d7b715eaa1d9ed6d7eeda9db8478dcf36d6'`
		`+ sha256sums=('d5dcb955b65e0f164a90cac0760724486e36e896221b98f244801dfd045d741c'`
		`'SKIP'`
		`'9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop`
		`# identity-icons-brand.svg`
		`- sha256sums+=('a5eed3c1f31a253f90b0284e0caf17bd35b3fa35197cfc403cb1bd987ecd56eb' # *.branding.tar.xz`
		`+ sha256sums+=('3a365374e3565a8963b000410cdd863d2fe3b4da9f63aa90d4150d1e1822102b' # *.branding.tar.xz`
		`'SKIP'`
		`'b6b100d7749387362bda9c8c8c19fe742870ec8a7a39172878b8dbfe773efeee' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`'8f530e41f19675bd74e62f5182f7975a24b690d5d17420fbe8a5365d55b71910' # 9002-FSDG-preference-defaults.patch`
		`'07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch`
		`- '6d1b95deba71e6e0569fe4aff460ca1c0734c9f3a56b6c56809b7414a82189e5' # 9004-FSDG-misc.patch`
		`+ '47050470053380f81391eb0631d9977bcc3abaeab632331bdce8576a0ceae1f9' # 9004-FSDG-misc.patch`
		`'c1d57c2b5b3621b34a4c5e7cc6e83170cfa576965b341c71e750e610440f490c' # process-json-files.py`
		`'86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in`
		`sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0' # avoid-libxul-OOM-python-check.patch`
		`@@ -194,16 +194,16 @@`
		`'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch`
		`'2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch`
		`'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch`
		`- b2sums=('ea4346b88c7f3e7e2126eed6b0f4b1460e70fa430944a7263d42ac762e10c8440967ebbae25ceff15e7afb451e1a890ab7e97ff60619a465152e9ff6a7691653'`
		`+ b2sums=('837f2edf2dcf51f19d8cad1f8234723236f318defa1196885b019e46878b377a24a83093ccbf8ef43e7ea94ddd1520f2918bcea520c59379453d40251ff972d6'`
		`'SKIP'`
		`'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop`
		`# identity-icons-brand.svg`
		`- b2sums+=('d6ccdc46fce7cfc4bb35a6b09deee8cd96b9076c599c1f031b4d2c5a9c2722bdf98dd14eddde50422e9a1b88f24d425c8a5f1e861877a367c6ff5365e61258c0' # *.branding.tar.xz`
		`+ b2sums+=('96ee9ddf3306db08e9d3e6efdae87900e088aedebadb4b703524f2396ebd26e67120298bb6ec7fee2363e9fe4a83395b1a314ef34732b059870cdf161eaecc8b' # *.branding.tar.xz`
		`'SKIP'`
		`'adb8c96328cbc6f8c7e50207b89c2d4c68733dd1fdcd341ae2ac4a3a1702430c2e5983e4249682153e0e593e0f54ab0258ed01d849589e8dc77c8729beccf3e7' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`'97bc57322635a7fa5d55b087303ece6f982104db5ef945393e74722acd783262bcc63e5cd3e5748eae9f07a9add59925898b67a2e20fa8420d4c7bfc4cd39867' # 9002-FSDG-preference-defaults.patch`
		`'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch`
		`- '043d0abcd81a3826104868c3885d4b102949616a787e7bf3f2bc502d46d9fdf9fb9c2ee6578e0907cb6083c985dda2dc2862b8e63504eda130d28eadd06489a8' # 9004-FSDG-misc.patch`
		`+ '1d7c896bc1b447e833e3f15410d5db16983d002042de23f3e456a40e8cca23a2c82db6b0f73b5095b51de4f48258039ab37b410653b7c7e8653d2996eaab2019' # 9004-FSDG-misc.patch`
		`'74e81a58faa219d6a822caae0212896561ecf8d97f736b9b23c6aec2b6e9dbd284702093ee1c75bd99638d8f86c4755542ae4b0dfa0ce8a25064e3430a6f2135' # process-json-files.py`
		`'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in`
		`b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882' # avoid-libxul-OOM-python-check.patch`

libre/jami-daemon/PKGBUILD

file removed

-71

		`@@ -1,71 +0,0 @@`
		`- # Maintainer (arch): Bruno Pagani <archange@archlinux.org>`
		`- # Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>`
		`- # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`-`
		`-`
		`- # parabola changes and rationale:`
		`- # - no changes - build in tandem with 'jami-qt'`
		`-`
		`- # NOTE: jami-{daemon,libclient,qt} versions are all tightly coupled`
		`- # implied build order: jami-daemon <- jami-libclient <- jami-qt`
		`-`
		`-`
		`- pkgname=jami-daemon`
		`- pkgver=20220505`
		`- pkgrel=1`
		`- pkgrel+=.parabola2`
		`- pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (daemon component)"`
		`- arch=(x86_64)`
		`- arch+=(armv7h i686)`
		`- url="https://jami.net"`
		`- license=(GPL3)`
		`- groups=(jami)`
		`- depends=(glibc opendht gnutls nettle libgit2 libsecp256k1 ffmpeg speexdsp`
		`- fmt yaml-cpp jsoncpp zlib dbus-c++ alsa-lib libpulse jack`
		`- libupnp libnatpmp openssl webrtc-audio-processing systemd-libs`
		`- libarchive)`
		`- # portaudio needs a not-yet-upstream patch https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/650`
		`- makedepends=(git cmake perl asio msgpack-c msgpack-cxx restinio systemd meson)`
		`- checkdepends=(cppunit)`
		`- _commit=8750049b0ce58133b05c90330df6fd3464dadd1d`
		`- _pjprojectver=e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a`
		`- source=(git+https://git.jami.net/savoirfairelinux/${pkgname}.git#commit=${_commit}`
		`- https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz)`
		`- noextract=(pjproject-${_pjprojectver}.tar.gz)`
		`- sha512sums=(SKIP a1ed0519ddf8dc91f47042497530cbcb1c8736506d0c2b677751a3368c0a202952ff563946664705dbf5806bed8ade784885db62f8278a204f516a4e60917b1e)`
		`-`
		`- # pkgver() {`
		`- # cd ${pkgname}`
		`- # TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD`
		`- # }`
		`-`
		`- prepare() {`
		`- cd ${pkgname}`
		`- cp ../pjproject-${_pjprojectver}.tar.gz contrib/tarballs`
		`- mkdir contrib/native`
		`- }`
		`-`
		`- build() {`
		`- cd ${pkgname}/contrib/native`
		`- export CXXFLAGS+=' -fpermissive'`
		`- ../bootstrap \`
		`- --disable-downloads \`
		`- --disable-all \`
		`- --enable-pjproject`
		`- make DEPS_pjproject=`
		`-`
		`- cd "${srcdir}"`
		`- arch-meson ${pkgname} build -D interfaces=library,dbus -D opensl=disabled -D portaudio=disabled \`
		`- $( ((CHECKFUNC)) && echo -D tests=true) \`
		`- -D pkg_config_path="${PWD}/${pkgname}/contrib/$(cc -dumpmachine)/lib/pkgconfig"`
		`- meson compile -C build`
		`- }`
		`-`
		`- #check() {`
		`- # https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/649`
		`- # meson test -C build --print-errorlogs`
		`- #}`
		`-`
		`- package() {`
		`- meson install -C build --destdir "${pkgdir}"`
		`- }`

libre/jami-libclient/PKGBUILD

file removed

-46

		`@@ -1,46 +0,0 @@`
		`- # Maintainer (arch): Bruno Pagani <archange@archlinux.org>`
		`- # Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>`
		`- # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`-`
		`-`
		`- # parabola changes and rationale:`
		`- # - no changes - build in tandem with 'jami-qt'`
		`-`
		`- # NOTE: jami-{daemon,libclient,qt} versions are all tightly coupled`
		`- # implied build order: jami-daemon <- jami-libclient <- jami-qt`
		`-`
		`-`
		`- pkgname=jami-libclient`
		`- pkgver=20220505`
		`- pkgrel=1`
		`- pkgrel+=.parabola2`
		`- pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (client communication library)"`
		`- arch=(x86_64)`
		`- arch+=(armv7h i686)`
		`- url="https://jami.net"`
		`- license=(GPL3)`
		`- groups=(jami)`
		`- depends=(jami-daemon qt6-base)`
		`- makedepends=(git cmake qt6-tools)`
		`- provides=(libjamiclient)`
		`- conflicts=(libjamiclient)`
		`- replaces=(libjamiclient)`
		`- _commit=c5bca2933fb02ef7f81e8fe0772801a4f97fd1f5`
		`- source=(git+https://git.jami.net/savoirfairelinux/jami-libclient.git#commit=${_commit})`
		`- md5sums=(SKIP)`
		`-`
		`- # pkgver() {`
		`- # cd ${pkgname}`
		`- # TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD`
		`- # }`
		`-`
		`- build() {`
		`- cmake -B build -S jami-libclient \`
		`- -DCMAKE_INSTALL_PREFIX=/usr \`
		`- -DCMAKE_BUILD_TYPE=Release`
		`- make -C build`
		`- }`
		`-`
		`- package() {`
		`- make -C build DESTDIR="${pkgdir}" install`
		`- }`

libre/jami/PKGBUILD ~~libre/jami-qt/PKGBUILD~~

file renamed

+102 -24

		`@@ -5,31 +5,59 @@`
		`# parabola changes and rationale:`
		`# - build without qt6-webengine`
		`# - pin to strongly-coupled dependency versions`
		`+ # - build from source-ball rather than VCS`
		`+ # - build as split package ('jami-daemon'+'jami-qt' PKGBUILDs)`
		`+ # jami-{daemon,qt} versions are tightly inter-dependent;`
		`+ # so they always need rebuild together anyways`
		`+ # the release source-ball includes both;`
		`+ # so separate PKGBUILDs and build jobs are not necessary`

		`- # NOTE: jami-{daemon,libclient,qt} versions are all tightly coupled`
		`- # implied build order: jami-daemon <- jami-libclient <- jami-qt`

		`-`
		`- pkgname=jami-qt`
		`- pkgver=20220505`
		`+ pkgbase=jami`
		`+ pkgname=(jami-daemon jami-qt)`
		`+ pkgver=20240125.0`
		`pkgrel=1`
		`- pkgrel+=.parabola2`
		`+ pkgrel+=.parabola1`
		`pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (Qt client)"`
		`arch=(x86_64)`
		`arch+=(armv7h i686)`
		`url="https://jami.net"`
		`license=(GPL3)`
		`groups=(jami)`
		`- depends=(jami-libclient glib2 gdk-pixbuf2 libnm libnotify qrencode`
		`- qt6-declarative qt6-multimedia qt6-networkauth qt6-svg`
		`- qt6-5compat qt6-webengine qt6-webchannel)`
		`- depends=( ${depends[*]/qt6-webengine/} ) # non-free`
		`- makedepends=(git cmake python qt6-tools)`
		`- replaces=(jami-gnome)`
		`- conflicts=(jami-gnome)`
		`- _commit=dd0dc87a0110b55f7f5ee450e13520c683e78650`
		`- source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit})`
		`- md5sums=(SKIP)`
		`+`
		`+ depends=(glibc opendht gnutls nettle libgit2 libsecp256k1 libsecp256k1.so ffmpeg speexdsp`
		`+ fmt yaml-cpp jsoncpp zlib alsa-lib libpulse jack libupnp libnatpmp`
		`+ openssl webrtc-audio-processing systemd-libs libarchive) # daemon`
		`+ depends+=(jami-daemon glib2 gdk-pixbuf2 libnm libnotify qrencode`
		`+ qt6-declarative qt6-multimedia qt6-svg qt6-5compat qt6-webengine`
		`+ qt6-webchannel qt6-shadertools) # client`
		`+ depends=( ${depends[*]/qt6-webengine/} )`
		`+ depends=( ${depends[*]/jami-daemon/} )`
		`+ # depends+=( qt6-positioning )`
		`+ makedepends=(git cmake perl asio msgpack-c msgpack-cxx restinio systemd meson) # daemon`
		`+ makedepends+=(git cmake python qt6-networkauth qt6-tools) # client`
		`+ makedepends=( ${makedepends[*]/git/} )`
		`+`
		`+ source=(https://ftp.gnu.org/gnu/jami/jami-${pkgver}.tar.gz{,.sig}`
		`+ qt-6.6.patch)`
		`+ # _pjprojectver=311bd018fc07aaf62d4c2d2494e08b5ee97e6846 # 2023-10-19 (arch PKGBUILD)`
		`+ # _pjprojectver=8d32e0b87ee3c747412be34fc9916a4e209f2e8f # 2024-01-08`
		`+ _pjprojectver=e12ea3bfa81cc4f46031599f80707e81133f1353 # 2024-02-18`
		`+ # _dhtnetver=fe79669b400d5e6a521fd1408dae02e0d4e50a5b # 2023-10-31 (arch PKGBUILD)`
		`+ # _dhtnetver=41848a2c770d7eb0940d731014b81643f85e0d07 # 2024-01-22`
		`+ _dhtnetver=18d344dce9bc9a683d73721a6efbc5cd8eb33828 # 2024-03-02`
		`+ source+=(https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz`
		`+ dhtnet-$_dhtnetver.tar.gz::https://review.jami.net/plugins/gitiles/dhtnet/+archive/$_dhtnetver.tar.gz)`
		`+ noextract=(pjproject-${_pjprojectver}.tar.gz`
		`+ dhtnet-${_dhtnetver}.tar.gz)`
		`+ sha256sums=('27a5d689db39a5f23a1f57cc258898abdb56c3426c1a9280d3d1b2e96551c3f2' # 20240125.0`
		`+ 'SKIP'`
		`+ '61d7ca804ed18650274f233cd60a811518859b4c6739ecc246414c35c4b8d906')`
		`+ # sha256sums+=('7416e3879eb6c20b4a86f4bc86ca91053c580c7641a3f938a4a196183e9a80b4' # 2024-01-08`
		`+ # '5b25af3dbd3a6f9c423062e58356e8e56f5bdeb9e342b79b2baf1ee623b3ee4d') # 2024-01-22`
		`+ sha256sums+=('9e1e6362f144eaa743da79c6b818349eb188943e24e0553efd178a220346ab19' # 2024-02-18`
		`+ '76ed18742c496814d2aa5e0f953a38adbd0e7c8b51ddb8be68bbdb8502d054ec') # 2024-03-02`
		`+ validpgpkeys=('BE6273738E616D6D1B3A08E8A21A020248816103')`


		`_version_constraint() # (dep_pkgname [precision])`
		`@@ -82,23 +110,73 @@`
		`}`


		`- # pkgver() {`
		`- # cd jami-client-qt`
		`- # TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD`
		`- # }`
		`+ prepare() {`
		`+ ## prepare daemon ##`
		`+`
		`+ cd "${srcdir}"/${pkgbase}-${pkgver}/daemon`
		`+`
		`+ cp "${srcdir}"/pjproject-${_pjprojectver}.tar.gz contrib/tarballs/`
		`+ cp "${srcdir}"/dhtnet-$_dhtnetver.tar.gz contrib/tarballs/`
		`+ mkdir contrib/native`
		`+`
		`+`
		`+ ## prepare client ##`
		`+`
		`+ cd "${srcdir}"/${pkgbase}-${pkgver}`
		`+`
		`+ # Drop strict Qt version check. Qt is ABI stable and jami is not using any private API`
		`+ # corresponds to arch patch: 'drop-qt-version-check.patch'`
		`+ sed -i '/Qt build version mismatch!/d' src/app/mainapplication.cpp`
		`+ ! grep "Qt build version mismatch!" src/app/mainapplication.cpp \|\|`
		`+ ! echo "ERROR: patches need re-working" \|\| return 1`
		`+`
		`+ # Workaround for running with Qt 6.6 https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1397`
		`+ echo "applying qt-6.6.patch"`
		`+ patch -p1 < "${srcdir}"/qt-6.6.patch`
		`+ }`

		`build() {`
		`- cmake -B build -S jami-client-qt \`
		`+ echo "building dependencies" # diff this section against 'jami-daemon' PKGBUILD`
		`+ cd "${srcdir}"/${pkgbase}-${pkgver}/daemon/contrib/native`
		`+ ../bootstrap \`
		`+ --disable-downloads \`
		`+ --disable-all \`
		`+ --enable-pjproject \`
		`+ --enable-dhtnet`
		`+ make DEPS_pjproject= DEPS_dhtnet=pjproject`
		`+`
		`+ echo "building daemon" # diff this section against 'jami-daemon' PKGBUILD`
		`+ cd "${srcdir}"/${pkgbase}-${pkgver}/daemon`
		`+ arch-meson . build -D interfaces=library -D opensl=disabled -D portaudio=disabled \`
		`+ $( ((CHECKFUNC)) && echo -D tests=true) \`
		`+ -D pkg_config_path="${PWD}/contrib/$(cc -dumpmachine)/lib/pkgconfig"`
		`+ meson compile -C build`
		`+`
		`+ echo "building client" # diff this section against 'jami-qt' PKGBUILD`
		`+ cd "${srcdir}"/${pkgbase}-${pkgver}`
		`+ cmake -B build -S ${pkgbase}-${pkgver} \`
		`-DCMAKE_INSTALL_PREFIX=/usr \`
		`- -DCMAKE_BUILD_TYPE=None \`
		`+ -DCMAKE_BUILD_TYPE=Release \`
		`+ -DWITH_DAEMON_SUBMODULE=false \`
		`+ -DENABLE_LIBWRAP=OFF \`
		`-DWITH_WEBENGINE=false \`
		`-Wno-dev`
		`make -C build`
		`}`

		`- package() {`
		`+ package_jami-daemon() {`
		`+ : # TODO: fails to build`
		`+ # ../src/jamidht/archive_account_manager.cpp:660:29: error: ‘aesGetKey’ is not a member of ‘dht::crypto’`
		`+ # tried with the both of the unversioned external dependencies at the revisions the arch PKGBUILD uses`
		`+ # and also the revisions which were apparently current when the jami source-ball was made,`
		`+ # and also the current revisions today - all fail with same error`
		`+ }`
		`+`
		`+ package_jami-qt() {`
		`# pin to current 'qt5-base' libs`
		`- depends+=($(_version_constraint 'qt5-base' 3))`
		`+ depends+=( $(_version_constraint 'qt5-base' 3) )`
		`+ replaces=(jami-gnome jami-libclient)`
		`+ conflicts=(jami-gnome jami-libclient)`

		`make -C build DESTDIR="${pkgdir}" install`
		`}`

libre/jami/qt-6.6.patch

file added

+13

		`@@ -0,0 +1,13 @@`
		`+ diff --git a/src/app/instancemanager.cpp b/src/app/instancemanager.cpp`
		`+ index 79154097..fbd620c4 100644`
		`+ --- a/src/app/instancemanager.cpp`
		`+ +++ b/src/app/instancemanager.cpp`
		`+ @@ -224,7 +224,7 @@ InstanceManager::~InstanceManager()`
		`+ bool`
		`+ InstanceManager::tryToRun(const QByteArray& startUri)`
		`+ {`
		`+ - return pimpl_->tryToRun(startUri);`
		`+ + return true;`
		`+ }`
		`+`
		`+ void`

libre/libretools/PKGBUILD

file modified

+2 -6

		`@@ -16,9 +16,9 @@`
		`validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker`
		`'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin`

		`- pkgrel=1`
		`+ pkgrel=2`
		`arch=('any')`
		`- #makedepends=(ruby-ronn-ng)`
		`+ makedepends=(ruby-ronn-ng)`
		`checkdepends=(`
		`bats`
		`git`
		`@@ -31,10 +31,6 @@`

		`build() {`
		`cd "$srcdir/$pkgbase-$pkgver"`
		`-`
		`- # Disable the manpages for now.`
		`- sed -i 's/enable_manpages.*/enable_manpages =/' config.mk`
		`-`
		`make`
		`}`

libre/openttd/PKGBUILD

file modified

+24 -25

		`@@ -1,6 +1,8 @@`
		`# Maintainer (arch): Vesa Kaihlavirta <vegai@iki.fi>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+`

		`# parabola changes and rationale:`
		`# - removed recommendation for non-free openttd-opensfx`
		`@@ -9,42 +11,39 @@`
		`# make transition easier for Parabola contributors. See the comments in`
		`# the icu-*-compat PKGBUILDs for more details.`

		`+`
		`pkgname=openttd`
		`- pkgver=1.9.3`
		`+ pkgver=13.4`
		`pkgrel=2`
		`- pkgrel+=.parabola7`
		`- pkgdesc='An engine for running Transport Tycoon Deluxe.'`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`+ pkgrel+=.parabola1`
		`+ pkgdesc='Engine for running Transport Tycoon Deluxe'`
		`+ arch=(x86_64)`
		`+ arch+=(i686 armv7h)`
		`url='https://www.openttd.org'`
		`- license=('GPL')`
		`- depends=('libpng' 'sdl' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz' 'fluidsynth')`
		`+ license=(GPL)`
		`+ depends=(fluidsynth fontconfig hicolor-icon-theme)`
		`depends+=('libicui18n.so' 'libicuuc.so')`
		`+ makedepends=(cmake ninja)`
		`optdepends=('openttd-opengfx: free graphics')`
		`- source=("https://proxy.binaries.openttd.org/openttd-releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")`
		`- sha256sums=('1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846')`
		`+ source=("https://cdn.$pkgname.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz")`
		`+ b2sums=('0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550')`

		`- build() {`
		`- cd ${pkgname}-${pkgver}`

		`+ build() {`
		`# http://site.icu-project.org/download/61#TOC-Migration-Issues`
		`CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'`

		`- ./configure \`
		`- --prefix-dir=/usr \`
		`- --binary-name=${pkgname} \`
		`- --binary-dir=bin \`
		`- --data-dir=share/${pkgname} \`
		`- --install-dir="${pkgdir}" \`
		`- --doc-dir=share/doc/${pkgname} \`
		`- --with-fluidsynth \`
		`- --menu-name="OpenTTD"`
		`-`
		`- make`
		`+ cmake \`
		`+ -B build \`
		`+ -D CMAKE_BUILD_TYPE=Release \`
		`+ -D CMAKE_INSTALL_BINDIR=bin \`
		`+ -D CMAKE_INSTALL_DATADIR=/usr/share \`
		`+ -D CMAKE_INSTALL_PREFIX=/usr \`
		`+ -G Ninja \`
		`+ -S $pkgname-$pkgver`
		`+ ninja -C build`
		`}`

		`package() {`
		`- cd ${pkgname}-${pkgver}`
		`-`
		`- make install`
		`+ DESTDIR="$pkgdir" ninja -C build install`
		`}`

libre/parabola-keyring/PKGBUILD

file modified

+4 -3

		`@@ -8,17 +8,18 @@`
		# upon a `git push` to the 'master' branch of hackers.git.
		`# The autobuilder will modify this PKGBUILD, replacing $pkgver and $_gitrev,`
		`# build and publish the package, and commit the modified PKGBUILD to abslibre.`
		`+ #`
		`# To generate a new keyring:`
		`# $ KEY_ID=<YOUR_40_CHAR_KEY_ID> # 'pgp_keyid' in your hackers.git YAML file`
		`# $ cd /path/to/hackers.git/`
		`# $ gpg --armor --no-emit-version --export $KEY_ID > keys/$KEY_ID.asc`
		`- # $ git commit -m 'update my key' keys/$KEY_ID.asc`
		`+ # $ git commit -S -m 'update my key' keys/$KEY_ID.asc`
		`# $ git push parabola master`


		`pkgname=parabola-keyring`
		`- pkgver=20231102`
		`- _gitrev=6d0f709e9fc83e276e379335b9475ef11b9f23e9`
		`+ pkgver=20240226`
		`+ _gitrev=65997cbdcc54a7ee10bc0179f2692ca05968e67d`
		`pkgrel=1`
		`pkgdesc="Parabola GNU/Linux-libre PGP keyring"`
		`arch=(any)`

libre/ruby-json/PKGBUILD

file added

+115

		`@@ -0,0 +1,115 @@`
		`+ # Maintainer: Luke T. Shumaker <lukeshu@parabola.nu>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Maintainer (arch): Andreas 'Segaja' Schleifer <segaja at archlinux dot org>`
		`+`
		`+ # Parabola changes and rationale:`
		`+ # - generator.c contains non-free code from CVTUTF`
		`+ # https://labs.parabola.nu/issues/674`
		`+ # https://bugs.ruby-lang.org/issues/11844`
		`+ # https://github.com/flori/json/issues/277`
		`+`
		`+ _name=json`
		`+ pkgname="ruby-json"`
		`+ pkgver=2.7.1`
		`+ pkgrel=1`
		`+ pkgdesc="JSON implementation for Ruby"`
		`+ arch=(x86_64)`
		`+ url="https://github.com/flori/json"`
		`+ license=(Ruby)`
		`+ depends=(`
		`+ glibc`
		`+ ruby`
		`+ )`
		`+ makedepends=(`
		`+ ragel`
		`+ ruby-rake`
		`+ ruby-rdoc`
		`+ )`
		`+ checkdepends=(`
		`+ ruby-test-unit`
		`+ ruby-test-unit-ruby-core`
		`+ )`
		`+ source=($url/archive/v$pkgver/$pkgname-$pkgver.tar.gz)`
		`+ sha512sums=('ce0a1399f0974e3919e85af9aa50e982a5e1adff7312f716033f6a19ce7044b046e037f19fcf43adaeff402c882bd0a3b045e93c245287a7f947754125eb39c6')`
		`+ b2sums=('f1339558107ee1f4b9a54b63d601c9c4a78ed1a4cc148c3c57d963d5536a1b8ced66dd7cd4b7ea9bc2c5ee5fcb3801c028671884484e16ea7d57d0a49e16f317')`
		`+`
		`+ # Parabola: Mundane packaging considerations.`
		`+ arch+=(armv7h i686)`
		`+ pkgrel+=.parabola1`
		`+ makedepends+=(rubygems)`
		`+`
		`+ # Parabola: Replace the CVTUTF code with a free implementation.`
		`+ # https://github.com/flori/json/pull/567`
		`+ _commit=6e75be64c896e093075ec99bf94a3f5fc576c283`
		`+ source=("ruby-json-${_commit}.tar.gz::https://github.com/parabola-gnulinuxlibre/ruby-json/archive/${_commit}.tar.gz")`
		`+`
		`+ prepare() {`
		`+ mv "ruby-json-${_commit}" "$_name-$pkgver" # Parabola`
		`+ cd $_name-$pkgver`
		`+`
		`+ # update gemspec/Gemfile to allow newer version of the dependencies`
		`+ sed -i -e 's\|~>\|>=\|g' $_name.gemspec`
		`+ }`
		`+`
		`+ build() {`
		`+ local gemdir="$(gem env gemdir)"`
		`+ local gem_install_options=(`
		`+ --local`
		`+ --verbose`
		`+ --ignore-dependencies`
		`+ --no-user-install`
		`+ --install-dir tmp_install/$gemdir`
		`+ --bindir tmp_install/usr/bin`
		`+ $_name-$pkgver.gem`
		`+ )`
		`+ local unrepro_files=(`
		`+ tmp_install/$gemdir/cache/`
		`+ tmp_install/$gemdir/gems/$_name-$pkgver/vendor/`
		`+ tmp_install/$gemdir/doc/$_name-$pkgver/ri/ext/`
		`+ )`
		`+`
		`+ cd $_name-$pkgver`
		`+`
		`+ gem build $_name.gemspec`
		`+ gem install "${gem_install_options[@]}"`
		`+`
		`+ # remove unrepreducible files`
		`+ rm -frv "${unrepro_files[@]}"`
		`+`
		`+ find tmp_install/$gemdir/gems/ \`
		`+ -type f \`
		`+ \( \`
		`+ -iname "*.o" -o \`
		`+ -iname "*.c" -o \`
		`+ -iname "*.so" -o \`
		`+ -iname "*.time" -o \`
		`+ -iname "gem.build_complete" -o \`
		`+ -iname "Makefile" \`
		`+ \) \`
		`+ -delete`
		`+`
		`+ find tmp_install/$gemdir/extensions/ \`
		`+ -type f \`
		`+ \( \`
		`+ -iname "mkmf.log" -o \`
		`+ -iname "gem_make.out" \`
		`+ \) \`
		`+ -delete`
		`+ }`
		`+`
		`+ check() {`
		`+ local gemdir="$(gem env gemdir)"`
		`+`
		`+ cd $_name-$pkgver`
		`+`
		`+ #GEM_HOME="tmp_install/$gemdir" rake test # Parabola: bootstrapping problem, idk`
		`+ }`
		`+`
		`+ package() {`
		`+ cd $_name-$pkgver`
		`+`
		`+ mv -v tmp_install/* "$pkgdir/"`
		`+`
		`+ install -vDm 0644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"`
		`+ install -vDm 0644 ./*.md -t "$pkgdir/usr/share/doc/$pkgname/"`
		`+ }`

libre/ruby/0001-Prep-to-use-Parabola-s-patched-ruby-json.patch

file added

+61

		`@@ -0,0 +1,61 @@`
		`+ From 32d1de432d60e363880b23797cd354eb789ea2e8 Mon Sep 17 00:00:00 2001`
		`+ From: "Luke T. Shumaker" <lukeshu@lukeshu.com>`
		`+ Date: Thu, 22 Feb 2024 21:55:39 -0700`
		`+ Subject: [PATCH 1/1] Prep to use Parabola's patched ruby-json`
		`+`
		`+ ---`
		`+ LEGAL \| 25 -------------------------`
		`+ tool/sync_default_gems.rb \| 1 -`
		`+ 2 files changed, 26 deletions(-)`
		`+`
		`+ diff --git a/LEGAL b/LEGAL`
		`+ index 2a7964e771..cde3ec3940 100644`
		`+ --- a/LEGAL`
		`+ +++ b/LEGAL`
		`+ @@ -688,31 +688,6 @@ mentioned below.`
		`+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
		`+ SUCH DAMAGE.`
		`+`
		`+ -[ext/json/generator/generator.c]`
		`+ -`
		`+ - The file contains the following copyright notice.`
		`+ -`
		`+ - >>>`
		`+ - Copyright 2001-2004:: Unicode, Inc.`
		`+ -`
		`+ - Disclaimer::`
		`+ -`
		`+ - This source code is provided as is by Unicode, Inc. No claims are`
		`+ - made as to fitness for any particular purpose. No warranties of any`
		`+ - kind are expressed or implied. The recipient agrees to determine`
		`+ - applicability of information provided. If this file has been`
		`+ - purchased on magnetic or optical media from Unicode, Inc., the`
		`+ - sole remedy for any claim will be exchange of defective media`
		`+ - within 90 days of receipt.`
		`+ -`
		`+ - Limitations on Rights to Redistribute This Code::`
		`+ -`
		`+ - Unicode, Inc. hereby grants the right to freely use the information`
		`+ - supplied in this file in the creation of products supporting the`
		`+ - Unicode Standard, and to make copies of this file in any form`
		`+ - for internal or external distribution as long as this notice`
		`+ - remains attached.`
		`+ -`
		`+ [ext/nkf/nkf-utf8/config.h]`
		`+ [ext/nkf/nkf-utf8/nkf.c]`
		`+ [ext/nkf/nkf-utf8/utf8tbl.c]`
		`+ diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb`
		`+ index 77854a6a48..96c739c8cc 100644`
		`+ --- a/tool/sync_default_gems.rb`
		`+ +++ b/tool/sync_default_gems.rb`
		`+ @@ -125,7 +125,6 @@ def sync_default_gems(gem)`
		`+ rm_rf("test/json/lib")`
		`+ cp_r("#{upstream}/lib", "ext/json")`
		`+ cp_r("#{upstream}/json.gemspec", "ext/json")`
		`+ - cp_r("#{upstream}/VERSION", "ext/json")`
		`+ rm_rf(%w[ext/json/lib/json/ext ext/json/lib/json/pure.rb ext/json/lib/json/pure])`
		+ `git checkout ext/json/extconf.rb ext/json/parser/prereq.mk ext/json/generator/depend ext/json/parser/depend ext/json/depend`
		`+ when "psych"`
		`+ --`
		`+ 2.43.2`
		`+`

libre/ruby/PKGBUILD

file modified

+77 -48

		`@@ -13,67 +13,88 @@`


		`# parabola changes and rationale:`
		`- # - generator.c in bundled json extension.`
		`+ # - replace non-free 'generator.c' in bundled JSON extension`
		`# https://labs.parabola.nu/issues/674`
		`# https://bugs.ruby-lang.org/issues/11844`
		`# https://github.com/flori/json/issues/277`
		`+ # https://github.com/flori/json/pull/567`
		`+ # - specify which BSD license`


		`pkgname=(ruby ruby-docs ruby-stdlib ruby-bundledgems)`
		`- pkgver=3.0.4`
		`- pkgrel=17`
		`+ pkgver=3.0.6`
		`pkgrel=1`
		`- pkgrel+=.parabola1`
		`- _jsonver=2.5.1`
		`- _srcrel=1 # increment this to rebuild the sourceball without bumping pkgver`
		`arch=(x86_64)`
		`- arch+=(armv7h i686)`
		`url='https://www.ruby-lang.org/en/'`
		`- license=(BSD2 custom)`
		`- makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk)`
		`- options=(debug !emptydirs !lto) # Disable LTO until fixes for https://bugs.ruby-lang.org/issues/18062 released`
		`- source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz)`
		`- source+=(json-${_jsonver}.tar.gz::https://github.com/flori/json/archive/v${_jsonver}.tar.gz`
		`- remove-json-ext.patch`
		`- add-json_pure.patch`
		`- json-libre.patch)`
		`- sha512sums=('53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b')`
		`- sha512sums+=('4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087'`
		`- 'e3cb4d17872d69d7bc2697b751e27c7f76edbf996f4e3007241cd8a60d2251056cf8dd858f249c0b28088da5b969c63bc5c0d52eef9c95e52e190234d3e46609'`
		`- 'c3933f1c6d7ddf669e0cfd8ffdd60abeb59a10bdfcab05a1c1b826ab65bed7019df85c15dd8af0b127a5728d5f6c322fcd724e0b9ecf0d9cdb5d28956050cc9a'`
		`- 'bb2cc232a0b096a3c40e219258aaa008183ed9a1f8b3bfd5f84680809f4b60e659f02e1db24480b30e6f11ad726b258da9dab17462621e8bfb8f9b6ed98dfbfd')`
		`+ license=(BSD custom)`
		`+ makedepends=(doxygen gdbm graphviz libffi libyaml openssl ttf-dejavu tk)`
		`+ options=(!emptydirs !lto) # Disable LTO until fixes for https://bugs.ruby-lang.org/issues/18062 released`
		`+ _osslver=3.0.0`
		`+ source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz`
		`+ ruby-openssl-$_osslver.tar.xz::https://github.com/ruby/openssl/archive/refs/tags/v$_osslver.tar.gz)`
		`+ sha512sums=('086516c563673692aa9cb63b82617397f8b845641b3eb09833989292d31f987af808ac1ae9aa6b0eee1688e5f3f7a0777017bfd4027142152ca939eba2b1a551'`
		`+ 'SKIP'`
		`+ '076d2924b61c4f7704b47718a33732fb5285a3af39f328ed9e83add36589da99dfae73b3e893398fc3f2a74dcbead0b66edc682040fa1b48f9530894c7187f95')`
		`+ b2sums=('461878ce72f6ec33365c21ab84db52225533f9967f005405b1675a49e77a11a737a8de7eed9c59fcddb2685ae2fb9ac879ad8252a112ccf51ca7bf1c8e9d118d'`
		`+ 'SKIP'`
		`+ '2eeb64caf188d79137686a8c5f0aa9d27860b3a3da8e0d4082f749beaa600928d814fe8cd70a6921358066603ce453d92838c1bce32509574ea333b6ca567fc8')`
		`+`
		`+ # Parabola: Mundane packaging considerations.`
		`+ license=( ${license[*]/BSD/custom:BSD-2-Clause} )`
		`+ arch+=(armv7h i686)`
		`+ pkgrel+=.parabola1`
		`+ options+=(debug)`
		`+`
		`+ # Parabola: Replace the CVTUTF code with a free implementation.`
		`+ # https://github.com/flori/json/pull/567`
		`+ # We need to do this in mksource() (not of prepare()) so that the`
		`+ # .src.pkg.tar file doesn't include nonfree sources.`
		`+ _jsonver=6e75be64c896e093075ec99bf94a3f5fc576c283`
		`+ _srcrel=1 # increment this to rebuild the sourceball (mksource, _jsonver) without bumping pkgver`
		`+ mksource=("${source[0]}"`
		`+ "ruby-json-${_jsonver}.tar.gz::https://github.com/parabola-gnulinuxlibre/ruby-json/archive/${_jsonver}.tar.gz"`
		`+ 0001-Prep-to-use-Parabola-s-patched-ruby-json.patch)`
		`+ mksha512sums=('abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8'`
		`+ 'ce0a1399f0974e3919e85af9aa50e982a5e1adff7312f716033f6a19ce7044b046e037f19fcf43adaeff402c882bd0a3b045e93c245287a7f947754125eb39c6'`
		`+ 'e2df05dea2014edd025f1ebeb9bffe121bfb49e4b45dc906f74b947f0d9f869dec5fee385533a2cf26057fcd226a0d0905b94ee8ca8a3f38cf511c39fa22ab12')`
		`+ mkb2sums=('e1fca86cdf267fc2289ef4d605fdf0023265c3a291ca4088361c0acd64310a7c41bf0750b4ac762157c20ceaa5df8bdc0a67374bcad9654bca5c3fc8630ff89c'`
		`+ 'f1339558107ee1f4b9a54b63d601c9c4a78ed1a4cc148c3c57d963d5536a1b8ced66dd7cd4b7ea9bc2c5ee5fcb3801c028671884484e16ea7d57d0a49e16f317'`
		`+ 'b0ec9e3d834c4260211838ce45211dde552b0f679b05fe523469e52416bc89ddc835746355b2b8bae9dcf1a26733d2968b134fa67712e5f60180134569470a73')`
		`+ source=("https://repo.parabola.nu/other/ruby-libre/ruby-${pkgver}-libre${_srcrel}.tar.gz"{,.sig} "${source[@]:1}")`
		`+ mkdepends=(ruby)`
		`+ mksource() {`
		`+ mkdir "$srcdir/ruby"`
		`+ mv -T "$srcdir/ruby-$pkgver" "$srcdir/ruby/ruby"`
		`+`
		`+ mkdir "$srcdir/flori"`
		`+ mv -T "$srcdir/ruby-json-$_jsonver" "$srcdir/flori/json"`
		`+`
		`+ pushd "$srcdir/ruby/ruby"`
		`+ patch -p1 -i ../../0001-Prep-to-use-Parabola-s-patched-ruby-json.patch`
		`+ ruby tool/sync_default_gems.rb json`
		`+ popd`
		`+`
		`+ mv -T "$srcdir/ruby/ruby" "$srcdir/ruby-${pkgver}"`
		`+ rm -rf -- "$srcdir/ruby" "$srcdir/flori"`
		`+ }`


		`prepare() {`
		`- cd "$srcdir/json-${_jsonver}"`
		`-`
		`- # Modify 'json' so that it doesn't try to load (non-free!) 'json/ext'`
		`- msg "applying json-libre.patch"`
		`- rm -rf -- json.gemspec ext lib/json/ext*`
		`- patch -p1 -i ../json-libre.patch`
		`-`
		`- # Now remove the json ext from the ruby sources`
		`- cd "$srcdir/ruby-${pkgver}"`
		`- msg "applying remove-json-ext.patch"`
		`- rm -r ext/json test/json`
		`- patch -p1 -i ../remove-json-ext.patch`
		`-`
		`- # and insert the json_pure lib instead`
		`- msg "applying add-json_pure.patch"`
		`- cp -r ../json-${_jsonver}/lib/* -t lib/`
		`- cp ../json-${_jsonver}/json_pure.gemspec -t lib/json/`
		`- cp -rT ../json-${_jsonver}/tests test/json`
		`- sed -i "s/File.read(\"VERSION\").chomp/\"${_jsonver}\"/g" lib/json/json_pure.gemspec`
		`- patch -p1 -i ../add-json_pure.patch`
		`-`
		`- # Clean up the original json sources`
		`- cd "$srcdir"`
		`- rm -rf "json-${_jsonver}"`
		`+ cd ruby-${pkgver}`
		`+ rm -rf ext/openssl test/openssl`
		`+ mv ../openssl-$_osslver/ext/openssl ext`
		`+ mv ../openssl-$_osslver/lib ext/openssl`
		`+ mv ../openssl-$_osslver/{History.md,openssl.gemspec} ext/openssl`
		`+ mv ../openssl-$_osslver/test/openssl test`
		`}`

		`build() {`
		`cd ruby-${pkgver}`

		`+ # this uses malloc_usable_size, which is incompatible with fortification level 3`
		`+ export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"`
		`+ export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"`
		`+`
		`./configure \`
		`--prefix=/usr \`
		`--sysconfdir=/etc \`
		`@@ -90,6 +111,10 @@`
		`check() {`
		`cd ruby-${pkgver}`

		`+ # this uses malloc_usable_size, which is incompatible with fortification level 3`
		`+ export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"`
		`+ export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"`
		`+`
		`make test`
		`}`

		`@@ -168,6 +193,7 @@`
		`net-http`
		`open-uri`
		`psych`
		`+ racc`
		`rdoc`
		`reline`
		`stringio`
		`@@ -177,6 +203,7 @@`
		`)`

		`for stdlib_gem in "${stdlib_gems[@]}"; do`
		`+ # Parabola: We've replaced "x86_64-linux" with -linux".`
		`rm --force --recursive --verbose \`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/${stdlib_gem} \`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/${stdlib_gem}.rb \`
		`@@ -184,8 +211,7 @@`
		`"${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/${stdlib_gem}-*.gemspec`
		`done`

		`- touch "$(ls -d "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux)"/json # kludge to minimize the diff below`
		`-`
		`+ # Parabola: We've replaced "x86_64-linux" with -linux".`
		`rm --recursive --verbose \`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/English.rb \`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/io/console \`
		`@@ -198,7 +224,8 @@`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/io/console.so \`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/io/nonblock.so \`
		`"${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/io/wait.so \`
		`- "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/json`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/json \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/racc`
		`}`

		`package_ruby-docs() {`
		`@@ -269,7 +296,7 @@`
		`#ruby-prime # removed in 3.1.2`
		`#ruby-pstore`
		`ruby-psych`
		`- #ruby-racc`
		`+ ruby-racc`
		`ruby-rdoc`
		`#ruby-readline`
		`#ruby-readline-ext`
		`@@ -325,3 +352,5 @@`
		`#ruby-prime`
		`)`
		`}`
		`+`
		`+ # vim: tabstop=2 shiftwidth=2 expandtab:`

libre/ruby/add-json_pure.patch

file removed

-23

		`@@ -1,23 +0,0 @@`
		`- diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc`
		`- index 268293a..8063bbf 100644`
		`- --- a/doc/maintainers.rdoc`
		`- +++ b/doc/maintainers.rdoc`
		`- @@ -348,6 +348,9 @@`
		`- Nobuyuki Nakada (nobu)`
		`- https://github.com/ruby/io-wait`
		`- https://rubygems.org/gems/io-wait`
		`- +[ext/json]`
		`- + NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)`
		`- + https://github.com/flori/json`
		`- [ext/nkf]`
		`- NARUSE, Yui (naruse)`
		`- https://github.com/ruby/nkf`
		`- diff --git a/lib/json/.document b/lib/json/.document`
		`- new file mode 100644`
		`- index 0000000000..7ae6b614de`
		`- --- /dev/null`
		`- +++ b/lib/json/.document`
		`- @@ -0,0 +1,3 @@`
		`- +*.rb`
		`- +add/*.rb`
		`- +pure/*.rb`

libre/ruby/json-libre.patch

file removed

-32

		`@@ -1,32 +0,0 @@`
		`- --- a/lib/json.rb 2020-12-22 07:48:50.000000000 -0500`
		`- +++ b/lib/json.rb 2021-04-29 12:34:01.408506564 -0500`
		`- @@ -575,9 +575,5 @@`
		`- module JSON`
		`- require 'json/version'`
		`-`
		`- - begin`
		`- - require 'json/ext'`
		`- - rescue LoadError`
		`- - require 'json/pure'`
		`- - end`
		`- + require 'json/pure'`
		`- end`
		`- --- a/tests/test_helper.rb 2020-12-22 07:48:50.000000000 -0500`
		`- +++ b/tests/test_helper.rb 2021-04-29 12:32:24.248506757 -0500`
		`- @@ -1,14 +1,5 @@`
		`- -case ENV['JSON']`
		`- -when 'pure'`
		`- - $:.unshift File.join(__dir__, '../lib')`
		`- - require 'json/pure'`
		`- -when 'ext'`
		`- - $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')`
		`- - require 'json/ext'`
		`- -else`
		`- - $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')`
		`- - require 'json'`
		`- -end`
		`- +$:.unshift File.join(__dir__, '../lib')`
		`- +require 'json'`
		`-`
		`- require 'test/unit'`
		`- begin`

libre/ruby/remove-json-ext.patch

file removed

-105

		`@@ -1,105 +0,0 @@`
		`- diff --git a/LEGAL b/LEGAL`
		`- index 565c4c9..0a7cc0f 100644`
		`- --- a/LEGAL`
		`- +++ b/LEGAL`
		`- @@ -688,31 +688,6 @@`
		`- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
		`- SUCH DAMAGE.`
		`-`
		`- -[ext/json/generator/generator.c]`
		`- -`
		`- - The file contains the following copyright notice.`
		`- -`
		`- - >>>`
		`- - Copyright 2001-2004:: Unicode, Inc.`
		`- -`
		`- - Disclaimer::`
		`- -`
		`- - This source code is provided as is by Unicode, Inc. No claims are`
		`- - made as to fitness for any particular purpose. No warranties of any`
		`- - kind are expressed or implied. The recipient agrees to determine`
		`- - applicability of information provided. If this file has been`
		`- - purchased on magnetic or optical media from Unicode, Inc., the`
		`- - sole remedy for any claim will be exchange of defective media`
		`- - within 90 days of receipt.`
		`- -`
		`- - Limitations on Rights to Redistribute This Code::`
		`- -`
		`- - Unicode, Inc. hereby grants the right to freely use the information`
		`- - supplied in this file in the creation of products supporting the`
		`- - Unicode Standard, and to make copies of this file in any form`
		`- - for internal or external distribution as long as this notice`
		`- - remains attached.`
		`- -`
		`- [ext/nkf/nkf-utf8/config.h]`
		`- [ext/nkf/nkf-utf8/nkf.c]`
		`- [ext/nkf/nkf-utf8/utf8tbl.c]`
		`- diff --git a/common.mk b/common.mk`
		`- index 3706aeb..9bf5627 100644`
		`- --- a/common.mk`
		`- +++ b/common.mk`
		`- @@ -1051,8 +1051,7 @@`
		`- realclean-srcs-ext::`
		`- $(Q)$(RM) $(EXT_SRCS)`
		`-`
		`- -EXTRA_SRCS = $(srcdir)/ext/json/parser/parser.c \`
		`- - $(srcdir)/ext/date/zonetab.h \`
		`- +EXTRA_SRCS = $(srcdir)/ext/date/zonetab.h \`
		`- $(empty)`
		`-`
		`- srcs-extra: $(EXTRA_SRCS)`
		`- @@ -1166,11 +1165,6 @@`
		`- Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \`
		`- RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C`
		`-`
		`- -$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk`
		`- - $(ECHO) generating $@`
		`- - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \`
		`- - Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"`
		`- -`
		`- $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date/prereq.mk`
		`- $(ECHO) generating $@`
		`- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \`
		`- diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc`
		`- index 98de9f2..268293a 100644`
		`- --- a/doc/maintainers.rdoc`
		`- +++ b/doc/maintainers.rdoc`
		`- @@ -348,10 +348,6 @@`
		`- Nobuyuki Nakada (nobu)`
		`- https://github.com/ruby/io-wait`
		`- https://rubygems.org/gems/io-wait`
		`- -[ext/json]`
		`- - NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)`
		`- - https://github.com/flori/json`
		`- - https://rubygems.org/gems/json`
		`- [ext/nkf]`
		`- NARUSE, Yui (naruse)`
		`- https://github.com/ruby/nkf`
		`- diff --git a/ext/.document b/ext/.document`
		`- index 6a49157..97e5120 100644`
		`- --- a/ext/.document`
		`- +++ b/ext/.document`
		`- @@ -36,9 +36,6 @@`
		`- io/console/lib`
		`- io/nonblock/nonblock.c`
		`- io/wait/wait.c`
		`- -json/generator/generator.c`
		`- -json/lib`
		`- -json/parser/parser.c`
		`- monitor/lib`
		`- monitor/monitor.c`
		`- nkf/lib`
		`- diff --git a/ext/Setup b/ext/Setup`
		`- index ac79c86..e1b8d40 100644`
		`- --- a/ext/Setup`
		`- +++ b/ext/Setup`
		`- @@ -20,9 +20,6 @@`
		`- #io/console`
		`- #io/nonblock`
		`- #io/wait`
		`- -#json`
		`- -#json/generator`
		`- -#json/parser`
		`- #nkf`
		`- #objspace`
		`- #openssl`

libre/systemd/.SRCINFO

file modified

+94 -52

		`@@ -1,11 +1,12 @@`
		`pkgbase = systemd`
		`- pkgver = 253`
		`- pkgrel = 1.parabola1`
		`+ pkgver = 255.4`
		`+ pkgrel = 2.parabola1`
		`url = https://www.github.com/systemd/systemd`
		`arch = x86_64`
		`arch = i686`
		`arch = armv7h`
		`arch = ppc64le`
		`+ license = LGPL-2.1-or-later`
		`makedepends = acl`
		`makedepends = cryptsetup`
		`makedepends = docbook-xsl`
		`@@ -48,20 +49,21 @@`
		`makedepends = llvm`
		`makedepends = curl`
		`makedepends = gnutls`
		`- options = strip`
		`- source = git+https://github.com/systemd/systemd-stable#tag=eb0f8fc41511dda1f9e0d19e830cc8c6668a2628?signed`
		`- source = git+https://github.com/systemd/systemd#tag=v253?signed`
		`+ makedepends = python-pyelftools`
		`+ makedepends = libpwquality`
		`+ makedepends = qrencode`
		`+ makedepends = python-pefile`
		`+ conflicts = mkinitcpio<38-1`
		`+ source = git+https://github.com/systemd/systemd-stable#tag=4003dd6754e3446691402d3cc389fbfd4faccc90?signed`
		`+ source = git+https://github.com/systemd/systemd#tag=v255?signed`
		`source = 0001-Use-Arch-Linux-device-access-groups.patch`
		`- source = 0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch`
		`+ source = 0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch`
		`source = 0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch`
		`source = 0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch`
		`source = 0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch`
		`source = 0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch`
		`- source = 0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch`
		`- source = 0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch`
		`- source = initcpio-hook-udev`
		`- source = initcpio-install-systemd`
		`- source = initcpio-install-udev`
		`+ source = 0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch`
		`+ source = 0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch`
		`source = parabola.conf`
		`source = loader.conf`
		`source = splash-parabola.bmp`
		`@@ -70,7 +72,8 @@`
		`source = 20-systemd-sysusers.hook`
		`source = 30-systemd-binfmt.hook`
		`source = 30-systemd-catalog.hook`
		`- source = 30-systemd-daemon-reload.hook`
		`+ source = 30-systemd-daemon-reload-system.hook`
		`+ source = 30-systemd-daemon-reload-user.hook`
		`source = 30-systemd-hwdb.hook`
		`source = 30-systemd-sysctl.hook`
		`source = 30-systemd-tmpfiles.hook`
		`@@ -83,42 +86,41 @@`
		`sha512sums = SKIP`
		`sha512sums = SKIP`
		`sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e`
		`- sha512sums = 52e607f5b11e66ad71333c1b03119575b1018c74df4e98376c28e59a21a348e3010d95863d818fdd5175acccbd627047a70a579671909288e10d28b247e494ca`
		`- sha512sums = 0e87e6770343e9c1a1b57548c8d9d985df1d3be60e6199825e61ce5c1321cb1924db81feea099bba8cb94fdce9d1ca7f41b0c030d681a9453d5d5bad05cffc25`
		`- sha512sums = 0f571decd80622feffa6fe694ba33628a1c2f62db3a83bf03b5e3fc720b25f91567c5a0412aaebc554cd5ad889b63ded404cb7b2eb217677b070e0527bf302a2`
		`- sha512sums = 9ba07104a1b26f736274813624b08e59f3e5a9035e6277f566a1d012372d1d60fe9ffbeff1b24e0319133d175e5e65caa99a71eaa213372486fa1edb1145c4a3`
		`- sha512sums = e8576f581dc6706bdd495128972d2ac90acf76a15117d67b792fb9ad5a2dd5597c96338965632857085ddd8362c9cb022d180f4aa29a026f953236d01756dbca`
		`- sha512sums = 6c7c10cbded0e75677064a6c5fb4e79c21b0fea167104a95b65a856cd255f8d73e2b706ddbee86b357c35440f32e1f390217a85e41a10302955023df825e1017`
		`- sha512sums = 73fd324d90c8f86596544ce16d2571b510e4d97a2fdf1e11fd73c9408bafb3938ece4b6e4b4fccfca40856172b010b9a7ad116da7c8738cf9673b676e8525edd`
		`- sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73`
		`- sha512sums = c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b`
		`- sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6`
		`+ sha512sums = b01d28646bca80c33192a10728218427b95246f904d921d00451bd32673f6352aefe6a8168942e796f4b7d1682921cc5c6adb895c9d9cdc0365606bfd4eca391`
		`+ sha512sums = fb1f75ded29d635c9e746ce76a99ace4e79694eea6d6ec7e8a84d7700e92ee5698576b979e16d71316c3e9276f285e3db248f74e8e55a8cf719456f6abc362b1`
		`+ sha512sums = 03df948013f353e3fb6db745a01520c2dc8278b823e57178aca1c59786b81dd8a2e10e7f603e33028e1e9084a753cb7a09ebd4b4291dbdda30a16eba39628866`
		`+ sha512sums = 2e89361d6af47464b91a04dc4be7a941ff12894b56831702deb6063d8d386141ff04989d1ecb39dbc452d83caacd5830c8eb6b06350c4bee6ccd3383aa2b1c8f`
		`+ sha512sums = 0b634f674468e6c859e7faff9bbf9d310a2c1feac2ceb4bfd5cb132e9b706f512908c1c905c72181395a5f0d0af40600e62ef46ce1ab534beb0b8d16aba0a2be`
		`+ sha512sums = 819331360737c59bc6fa2ca681da16bdae599d83289d619da802c4ffff2fe3b72852b11d50caecc058c80022b6b5158c5309560670fa2c30c08e9bb14b7e0454`
		`+ sha512sums = eb4ca9b4460f19ac93885d8e22ae4e844d0798918d692d84333e4f1b5ae6fa28a2443d156e31202c1c05f97c3f61531a8822f1b0e66ccc00e20743b871322aa8`
		`sha512sums = 70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8`
		`sha512sums = 6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9`
		`sha512sums = a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c`
		`sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19`
		`- sha512sums = a586f62b92268ae1e8a9310b02693548fb114292e1252953b4c9475d29e2817b5042a612f3b3ef09fb5b18126e2c3486ff49dd764d97644f0c510ae0200e075b`
		`+ sha512sums = 3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886`
		`sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5`
		`sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7`
		`sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc`
		`- sha512sums = 63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254`
		`+ sha512sums = a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a`
		`+ sha512sums = 190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d`
		`sha512sums = a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154`
		`sha512sums = 9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de`
		`sha512sums = da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc`
		`sha512sums = a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3`
		`sha512sums = 825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97`
		`- makedepends_x86_64 = gnu-efi-libs`
		`- makedepends_i686 = gnu-efi-libs`
		`+ makedepends_x86_64 = lib32-gcc-libs`
		`makedepends_i686 = pkgconf`

		`pkgname = systemd`
		`pkgdesc = system and service manager`
		`install = systemd.install`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = MIT-0`
		`depends = bash`
		`depends = cryptsetup`
		`depends = libcryptsetup.so`
		`depends = dbus`
		`+ depends = dbus-units`
		`depends = kbd`
		`depends = hwdata`
		`depends = systemd-libs`
		`@@ -126,20 +128,23 @@`
		`depends = libelf`
		`depends = pcre2`
		`depends = libssl.so`
		`- depends = systemd-common=253-1.parabola1`
		`+ depends = systemd-common=255.4-2.parabola1`
		`depends = udev`
		`- optdepends = libmicrohttpd: remote journald capabilities`
		`+ optdepends = libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote`
		`optdepends = quota-tools: kernel-level quota management`
		`optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries`
		`+ optdepends = systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image`
		`optdepends = polkit: allow administration as unprivileged user`
		`- optdepends = python: Unified Kernel Image with ukify`
		`optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw`
		`optdepends = gnutls: systemd-journal-gatewayd and systemd-journal-remote`
		`+ optdepends = qrencode: show QR codes`
		`+ optdepends = iptables: firewall features`
		`optdepends = libbpf: support BPF programs`
		`+ optdepends = libpwquality: check password quality`
		`optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token`
		`optdepends = libp11-kit: support PKCS#11`
		`optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2`
		`- provides = systemd-tools=253`
		`+ provides = systemd-tools=255.4`
		`conflicts = systemd-tools`
		`replaces = systemd-tools`
		`backup = etc/pam.d/systemd-user`
		`@@ -160,7 +165,10 @@`

		`pkgname = systemd-libs`
		`pkgdesc = systemd client libraries metapackage`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`+ license = MIT-0`
		`depends = libsystemd`
		`depends = libudev`
		`depends = nss-systemd`
		`@@ -173,29 +181,37 @@`

		`pkgname = systemd-resolvconf`
		`pkgdesc = systemd resolvconf replacement (for use with systemd-resolved)`
		`- license = LGPL2.1`
		`depends = systemd`
		`provides = openresolv`
		`provides = resolvconf`
		`- conflicts = openresolv`
		`+ conflicts = resolvconf`
		`replaces = notsystemd-resolvconf`

		`pkgname = systemd-sysvcompat`
		`pkgdesc = sysvinit compat for systemd`
		`- license = LGPL2.1`
		`depends = systemd`
		`provides = init`
		`conflicts = sysvinit`
		`conflicts = init`

		`+ pkgname = systemd-ukify`
		`+ pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image`
		`+ depends = binutils`
		`+ depends = python-cryptography`
		`+ depends = python-pefile`
		`+ depends = systemd`
		`+ optdepends = python-pillow: Show the size of splash image`
		`+ optdepends = sbsigntools: Sign the embedded kernel`
		`+ provides = ukify`
		`+`
		`pkgname = systemd-common`
		`pkgdesc = systemd files shared between split packages`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`depends = acl`
		`depends = audit`
		`depends = gcc-libs`
		`depends = glibc`
		`- depends = iptables`
		`depends = kmod`
		`depends = libacl.so`
		`depends = libaudit.so`
		`@@ -219,22 +235,28 @@`

		`pkgname = systemd-udev`
		`pkgdesc = Userspace device file manager`
		`- license = GPL2`
		`- depends = systemd-common=253-1.parabola1`
		`+ license = LGPL-2.1-or-later`
		`+ license = GPL-2.0-or-later`
		`+ depends = systemd-common=255.4-2.parabola1`
		`depends = systemd-libudev`
		`depends = hwdata`
		`depends = kmod`
		`depends = libkmod.so`
		`depends = util-linux`
		`depends = zlib`
		`- provides = udev=253`
		`+ provides = udev=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = udev`
		`replaces = udev`
		`+ backup = etc/udev/iocost.conf`
		`backup = etc/udev/udev.conf`

		`pkgname = systemd-libsystemd`
		`pkgdesc = systemd client library`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`+ license = MIT-0`
		`depends = gcc-libs`
		`depends = glibc`
		`depends = libcap`
		`@@ -244,62 +266,82 @@`
		`depends = xz`
		`depends = zstd`
		`provides = libsystemd.so`
		`- provides = libsystemd-standalone=253`
		`+ provides = libsystemd-standalone=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = libsystemd-standalone`
		`replaces = libsystemd-standalone`

		`pkgname = systemd-libudev`
		`pkgdesc = systemd library for enumerating and introspecting local devices`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`depends = gcc-libs`
		`depends = glibc`
		`depends = libcap`
		`depends = libcap.so`
		`provides = libudev.so`
		`- provides = libudev=253`
		`+ provides = libudev=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = libudev`
		`replaces = libudev`

		`pkgname = systemd-nss-systemd`
		`pkgdesc = NSS module providing user and group resolution for dynamic users and groups`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`depends = gcc-libs`
		`depends = glibc`
		`depends = libcap`
		`depends = libcap.so`
		`- provides = nss-systemd=253`
		`+ depends = libcrypt.so`
		`+ depends = libcrypto.so`
		`+ depends = libxcrypt`
		`+ depends = openssl`
		`+ provides = nss-systemd=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = nss-systemd`
		`replaces = nss-systemd`

		`pkgname = systemd-nss-myhostname`
		`pkgdesc = NSS module providing hostname resolution for the locally configured system hostname`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`depends = gcc-libs`
		`depends = glibc`
		`depends = libcap`
		`depends = libcap.so`
		`- provides = nss-myhostname=253`
		`+ provides = nss-myhostname=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = nss-myhostname`
		`replaces = nss-myhostname`

		`pkgname = systemd-nss-mymachines`
		`pkgdesc = NSS module providing hostname resolution for local systemd-machined container instances`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`depends = gcc-libs`
		`depends = glibc`
		`depends = libcap`
		`depends = libcap.so`
		`- provides = nss-mymachines=253`
		`+ provides = nss-mymachines=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = nss-mymachines`
		`replaces = nss-mymachines`

		`pkgname = systemd-nss-resolve`
		`pkgdesc = NSS module providing hostname resolution via systemd-resolved`
		`- license = LGPL2.1`
		`+ license = LGPL-2.1-or-later`
		`+ license = CC0-1.0`
		`+ license = GPL-2.0-or-later WITH Linux-syscall-note`
		`depends = gcc-libs`
		`depends = glibc`
		`depends = libcap`
		`depends = libcap.so`
		`- provides = nss-resolve=253`
		`+ provides = nss-resolve=255.4`
		`+ conflicts = mkinitcpio<38-1`
		`conflicts = nss-resolve`
		`replaces = nss-resolve`

libre/systemd/0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch

file added

+53

		`@@ -0,0 +1,53 @@`
		`+ From 17e2c00bf8323360dde0333497ea709cf47a399f Mon Sep 17 00:00:00 2001`
		`+ From: Luke Shumaker <lukeshu@parabola.nu>`
		`+ Date: Sat, 17 Dec 2016 00:56:43 -0500`
		`+ Subject: [PATCH 1/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of`
		`+ "Linux Boot Manager"`
		`+`
		`+ ---`
		`+ man/bootctl.xml \| 6 +++---`
		`+ src/boot/bootctl-install.c \| 2 +-`
		`+ 2 files changed, 4 insertions(+), 4 deletions(-)`
		`+`
		`+ diff --git a/man/bootctl.xml b/man/bootctl.xml`
		`+ index 68e47747ff..841f7df36f 100644`
		`+ --- a/man/bootctl.xml`
		`+ +++ b/man/bootctl.xml`
		`+ @@ -475,10 +475,10 @@`
		`+`
		`+ <varlistentry>`
		`+ <term><option>--efi-boot-option-description=</option></term>`
		`+ - <listitem><para>Description of the entry added to the firmware's boot option list. Defaults to <literal>Linux`
		`+ + <listitem><para>Description of the entry added to the firmware's boot option list. Defaults to <literal>Systemd`
		`+ Boot Manager</literal>.</para>`
		`+`
		`+ - <para>Using the default entry name <literal>Linux Boot Manager</literal> is generally preferable as only`
		`+ + <para>Using the default entry name <literal>Systemd Boot Manager</literal> is generally preferable as only`
		`+ one bootloader installed to a single ESP partition should be used to boot any number of OS installations`
		`+ found on the various disks installed in the system. Specifically distributions should not use this flag`
		`+ to install a branded entry in the boot option list. However in situations with multiple disks, each with`
		`+ @@ -570,7 +570,7 @@ Available Boot Loaders on ESP:`
		`+ File: └─/EFI/BOOT/BOOTX64.EFI (systemd-boot 251`
		`+`
		`+ Boot Loaders Listed in EFI Variables:`
		`+ - Title: Linux Boot Manager`
		`+ + Title: Systemd Boot Manager`
		`+ ID: 0x0001`
		`+ Status: active, boot-order`
		`+ Partition: /dev/disk/by-partuuid/…`
		`+ diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c`
		`+ index bacbbb2939..0239fc200f 100644`
		`+ --- a/src/boot/bootctl-install.c`
		`+ +++ b/src/boot/bootctl-install.c`
		`+ @@ -639,7 +639,7 @@ static int remove_from_order(uint16_t slot) {`
		`+ }`
		`+`
		`+ static const char *pick_efi_boot_option_description(void) {`
		`+ - return arg_efi_boot_option_description ?: "Linux Boot Manager";`
		`+ + return arg_efi_boot_option_description ?: "Systemd Boot Manager";`
		`+ }`
		`+`
		`+ static int install_variables(`
		`+ --`
		`+ 2.44.0`
		`+`

libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch

file removed

-225

		`@@ -1,225 +0,0 @@`
		`- From 1cc4d5dc91d40549520370131909f50887a25f12 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:19:20 -0400`
		`- Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux`
		`-`
		`- This is not a blind replacement of "Linux" with "GNU/Linux". In some`
		`- cases, "Linux" is (correctly) used to refer to just the kernel. In others,`
		`- it is in a string for which code must also be adjusted; these instances`
		`- are not included in this commit.`
		`- ---`
		`- man/daemon.xml \| 4 ++--`
		`- man/journald.conf.xml \| 2 +-`
		`- man/machinectl.xml \| 2 +-`
		`- man/sd-bus-errors.xml \| 2 +-`
		`- man/sd_bus_error_add_map.xml \| 2 +-`
		`- man/sd_uid_get_state.xml \| 2 +-`
		`- man/systemd-detect-virt.xml \| 4 ++--`
		`- man/systemd-machine-id-setup.xml \| 2 +-`
		`- man/systemd-resolved.service.xml \| 6 +++---`
		`- man/systemd.exec.xml \| 2 +-`
		`- man/systemd.socket.xml \| 2 +-`
		`- man/systemd.xml \| 4 ++--`
		`- 12 files changed, 17 insertions(+), 17 deletions(-)`
		`-`
		`- diff --git a/man/daemon.xml b/man/daemon.xml`
		`- index db95d2f75b..850b333ccf 100644`
		`- --- a/man/daemon.xml`
		`- +++ b/man/daemon.xml`
		`- @@ -142,7 +142,7 @@`
		`- <refsect2>`
		`- <title>New-Style Daemons</title>`
		`-`
		`- - <para>Modern services for Linux should be implemented as`
		`- + <para>Modern services for GNU/Linux should be implemented as`
		`- new-style daemons. This makes it easier to supervise and control`
		`- them at runtime and simplifies their implementation.</para>`
		`-`
		`- @@ -287,7 +287,7 @@`
		`- as detailed in the <ulink`
		`- url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB`
		`- Linux Standard Base Core Specification</ulink>. This method of`
		`- - activation is supported ubiquitously on Linux init systems, both`
		`- + activation is supported ubiquitously on GNU/Linux init systems, both`
		`- old-style and new-style systems. Among other issues, SysV init`
		`- scripts have the disadvantage of involving shell scripts in the`
		`- boot process. New-style init systems generally employ updated`
		`- diff --git a/man/journald.conf.xml b/man/journald.conf.xml`
		`- index 50c33e4792..a17389c7dc 100644`
		`- --- a/man/journald.conf.xml`
		`- +++ b/man/journald.conf.xml`
		`- @@ -129,7 +129,7 @@`
		`- <term><varname>SplitMode=</varname></term>`
		`-`
		`- <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or`
		`- - <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access`
		`- + <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access`
		`- control is managed per file, and the journal daemon will assign users read access to their journal files. If`
		`- <literal>uid</literal>, all regular users (with UID outside the range of system users, dynamic service users,`
		`- and the nobody user) will each get their own journal files, and system users will log to the system journal.`
		`- diff --git a/man/machinectl.xml b/man/machinectl.xml`
		`- index 2ecbe0f0ab..dfba772eb3 100644`
		`- --- a/man/machinectl.xml`
		`- +++ b/man/machinectl.xml`
		`- @@ -854,7 +854,7 @@`
		`- <para>The <command>machinectl</command> tool operates on machines`
		`- and images whose names must be chosen following strict`
		`- rules. Machine names must be suitable for use as hostnames`
		`- - following a conservative subset of DNS and UNIX/Linux`
		`- + following a conservative subset of DNS and GNU/Linux`
		`- semantics. Specifically, they must consist of one or more`
		`- non-empty label strings, separated by dots. No leading or trailing`
		`- dots are allowed. No sequences of multiple dots are allowed. The`
		`- diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml`
		`- index f3b1515c78..55ab2f8668 100644`
		`- --- a/man/sd-bus-errors.xml`
		`- +++ b/man/sd-bus-errors.xml`
		`- @@ -100,7 +100,7 @@`
		`-`
		`- <para>In addition to this list, in sd-bus, the special error`
		`- namespace <literal>System.Error.</literal> is used to map`
		`- - arbitrary Linux system errors (as defined by <citerefentry`
		`- + arbitrary GNU/Linux system errors (as defined by <citerefentry`
		`- project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)`
		`- to D-Bus errors and back. For example, the error`
		`- <constant>EUCLEAN</constant> is mapped to`
		`- diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml`
		`- index a49b554459..838c183855 100644`
		`- --- a/man/sd_bus_error_add_map.xml`
		`- +++ b/man/sd_bus_error_add_map.xml`
		`- @@ -56,7 +56,7 @@`
		`-`
		`- <para>The <function>sd_bus_error_add_map()</function> call may be`
		`- used to register additional mappings for converting D-Bus errors`
		`- - to Linux <varname>errno</varname>-style errors. The mappings`
		`- + to GNU/Linux <varname>errno</varname>-style errors. The mappings`
		`- defined with this call are consulted by calls such as`
		`- <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>`
		`- or`
		`- diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml`
		`- index 087a2d539d..1170f3ea0a 100644`
		`- --- a/man/sd_uid_get_state.xml`
		`- +++ b/man/sd_uid_get_state.xml`
		`- @@ -163,7 +163,7 @@`
		`-`
		`- <listitem><para>An input parameter was invalid (out of range, or <constant>NULL</constant>,`
		`- where that is not accepted). This is also returned if the passed user ID is`
		`- - <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on Linux.`
		`- + <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux.`
		`- </para></listitem>`
		`- </varlistentry>`
		`-`
		`- diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml`
		`- index a92d83fe29..c03e08c61d 100644`
		`- --- a/man/systemd-detect-virt.xml`
		`- +++ b/man/systemd-detect-virt.xml`
		`- @@ -155,12 +155,12 @@`
		`-`
		`- <row>`
		`- <entry><varname>lxc</varname></entry>`
		`- - <entry>Linux container implementation by LXC</entry>`
		`- + <entry>Container implementation by LXC</entry>`
		`- </row>`
		`-`
		`- <row>`
		`- <entry><varname>lxc-libvirt</varname></entry>`
		`- - <entry>Linux container implementation by libvirt</entry>`
		`- + <entry>Container implementation by libvirt</entry>`
		`- </row>`
		`-`
		`- <row>`
		`- diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml`
		`- index f1695b6ddb..8bfb72f55d 100644`
		`- --- a/man/systemd-machine-id-setup.xml`
		`- +++ b/man/systemd-machine-id-setup.xml`
		`- @@ -55,7 +55,7 @@`
		`- and is different for every booted instance of the`
		`- VM.</para></listitem>`
		`-`
		`- - <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the`
		`- + <listitem><para>Similarly, if run inside a container environment and a UUID is configured for the`
		`- container, this is used to initialize the machine ID. For details, see the documentation of the <ulink`
		`- url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem>`
		`-`
		`- diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml`
		`- index 7003c36db7..50577843cb 100644`
		`- --- a/man/systemd-resolved.service.xml`
		`- +++ b/man/systemd-resolved.service.xml`
		`- @@ -49,7 +49,7 @@`
		`- API as defined by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related`
		`- resolver functions, including`
		`- <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>.`
		`- - This API is widely supported, including beyond the Linux platform. In its current form it does not`
		`- + This API is widely supported, including beyond the GNU/Linux platform. In its current form it does not`
		`- expose DNSSEC validation status information however, and is synchronous only. This API is backed by the`
		`- glibc Name Service Switch`
		`- (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>).`
		`- @@ -321,7 +321,7 @@ search foobar.com barbar.com`
		`- <itemizedlist>`
		`- <listitem><para><command>systemd-resolved</command> maintains the`
		`- <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional`
		`- - Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also`
		`- + GNU/Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also`
		`- contains a list of search domains that are in use by systemd-resolved. The list of search domains is`
		`- always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not`
		`- be used directly by applications, but only through a symlink from`
		`- @@ -337,7 +337,7 @@ search foobar.com barbar.com`
		`- </para></listitem>`
		`-`
		`- <listitem><para><command>systemd-resolved</command> maintains the`
		`- - <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux`
		`- + <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux`
		`- programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept`
		`- up-to-date, containing information about all known DNS servers. Note the file format's limitations: it`
		`- does not know a concept of per-interface DNS servers and hence only contains system-wide DNS server`
		`- diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml`
		`- index bad21ceb0c..81abe6dcb2 100644`
		`- --- a/man/systemd.exec.xml`
		`- +++ b/man/systemd.exec.xml`
		`- @@ -517,7 +517,7 @@`
		`- <literal>-</literal>, except for the first character which must be one of a-z, A-Z and`
		`- <literal>_</literal> (i.e. digits and <literal>-</literal> are not permitted as first character). The`
		`- user/group name must have at least one character, and at most 31. These restrictions are made in`
		`- - order to avoid ambiguities and to ensure user/group names and unit files remain portable among Linux`
		`- + order to avoid ambiguities and to ensure user/group names and unit files remain portable among GNU/Linux`
		`- systems. For further details on the names accepted and the names warned about see <ulink`
		`- url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para>`
		`-`
		`- diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml`
		`- index 1f1f99800f..086cab483e 100644`
		`- --- a/man/systemd.socket.xml`
		`- +++ b/man/systemd.socket.xml`
		`- @@ -292,7 +292,7 @@`
		`- project='man-pages'><refentrytitle>mq_overview</refentrytitle><manvolnum>7</manvolnum></citerefentry>`
		`- for details). This expects a valid message queue name (i.e. beginning with`
		`- <literal>/</literal>). Behavior otherwise is very similar to the <varname>ListenFIFO=</varname>`
		`- - directive above. On Linux message queue descriptors are actually file descriptors and can be`
		`- + directive above. On GNU/Linux message queue descriptors are actually file descriptors and can be`
		`- inherited between processes.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- diff --git a/man/systemd.xml b/man/systemd.xml`
		`- index 1a68301d50..3aec7bc926 100644`
		`- --- a/man/systemd.xml`
		`- +++ b/man/systemd.xml`
		`- @@ -37,7 +37,7 @@`
		`- <refsect1>`
		`- <title>Description</title>`
		`-`
		`- - <para>systemd is a system and service manager for Linux operating systems. When run as first process on`
		`- + <para>systemd is a system and service manager for GNU/Linux operating systems. When run as first process on`
		`- boot (as PID 1), it acts as init system that brings up and maintains userspace services. Separate`
		`- instances are started for logged-in users to start their services.</para>`
		`-`
		`- @@ -745,7 +745,7 @@`
		`-`
		`- <para>When run as the system instance, systemd parses a number of options listed below. They can be`
		`- specified as kernel command line arguments which are parsed from a number of sources depending on the`
		`- - environment in which systemd is executed. If run inside a Linux container, these options are parsed from`
		`- + environment in which systemd is executed. If run inside a container, these options are parsed from`
		`- the command line arguments passed to systemd itself, next to any of the command line options listed in`
		`- the Options section above. If run outside of Linux containers, these arguments are parsed from`
		`- <filename>/proc/cmdline</filename> and from the <literal>SystemdOptions</literal> EFI variable`
		`- --`
		`- 2.43.0`
		`-`

libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch

file modified

+52 -10

		`@@ -1,21 +1,63 @@`
		`- From 25576ff4a4b0bad85e6cbce92f72d5bf9af842ce Mon Sep 17 00:00:00 2001`
		`+ From 293085b65a8b11ce0be42c78e9deeaa36b4ff1ec Mon Sep 17 00:00:00 2001`
		`From: Luke Shumaker <lukeshu@parabola.nu>`
		`Date: Wed, 25 May 2016 12:23:40 -0400`
		`Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"`
		`instead of "Linux"`

		`---`
		`+ man/check-os-release-simple.py \| 2 +-`
		`+ man/check-os-release.py \| 2 +-`
		`+ man/check-os-release.sh \| 2 +-`
		`man/kernel-install.xml \| 2 +-`
		`man/os-release.xml \| 2 +-`
		`src/basic/os-util.c \| 2 +-`
		`src/kernel-install/90-loaderentry.install.in \| 2 +-`
		`- 4 files changed, 4 insertions(+), 4 deletions(-)`
		`+ 7 files changed, 7 insertions(+), 7 deletions(-)`

		`+ diff --git a/man/check-os-release-simple.py b/man/check-os-release-simple.py`
		`+ index ce73c77b14..9ad899a814 100644`
		`+ --- a/man/check-os-release-simple.py`
		`+ +++ b/man/check-os-release-simple.py`
		`+ @@ -4,7 +4,7 @@`
		`+ import platform`
		`+ os_release = platform.freedesktop_os_release()`
		`+`
		`+ -pretty_name = os_release.get('PRETTY_NAME', 'Linux')`
		`+ +pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux')`
		`+ print(f'Running on {pretty_name!r}')`
		`+`
		`+ if 'fedora' in [os_release.get('ID', 'linux'),`
		`+ diff --git a/man/check-os-release.py b/man/check-os-release.py`
		`+ index 19b193ec76..373b77ed06 100644`
		`+ --- a/man/check-os-release.py`
		`+ +++ b/man/check-os-release.py`
		`+ @@ -29,7 +29,7 @@ def read_os_release():`
		`+`
		`+ os_release = dict(read_os_release())`
		`+`
		`+ -pretty_name = os_release.get('PRETTY_NAME', 'Linux')`
		`+ +pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux')`
		`+ print(f'Running on {pretty_name!r}')`
		`+`
		`+ if 'debian' in [os_release.get('ID', 'linux'),`
		`+ diff --git a/man/check-os-release.sh b/man/check-os-release.sh`
		`+ index 12f7ee12cc..084647a38b 100644`
		`+ --- a/man/check-os-release.sh`
		`+ +++ b/man/check-os-release.sh`
		`+ @@ -4,7 +4,7 @@`
		`+ test -e /etc/os-release && os_release='/etc/os-release' \|\| os_release='/usr/lib/os-release'`
		`+ . "${os_release}"`
		`+`
		`+ -echo "Running on ${PRETTY_NAME:-Linux}"`
		`+ +echo "Running on ${PRETTY_NAME:-GNU/Linux}"`
		`+`
		`+ if [ "${ID:-linux}" = "debian" ] \|\| [ "${ID_LIKE#debian}" != "${ID_LIKE}" ]; then`
		`+ echo "Looks like Debian!"`
		`diff --git a/man/kernel-install.xml b/man/kernel-install.xml`
		`- index e50aeee949..449529a31b 100644`
		`+ index c05176a5dc..df8b11b4ee 100644`
		`--- a/man/kernel-install.xml`
		`+++ b/man/kernel-install.xml`
		`- @@ -105,7 +105,7 @@`
		`+ @@ -135,7 +135,7 @@`
		`<filename>$BOOT/loader/entries/<replaceable>ENTRY-TOKEN</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.`
		`The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in`
		`<filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former`
		`@@ -25,10 +67,10 @@`
		`<para>If <varname>$KERNEL_INSTALL_LAYOUT</varname> is not "bls", this plugin does nothing.</para></listitem>`

		`diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index 113ef9fc18..f1c5fb5e56 100644`
		`+ index f2e0f3ecb7..4aad523fa4 100644`
		`--- a/man/os-release.xml`
		`+++ b/man/os-release.xml`
		`- @@ -183,7 +183,7 @@`
		`+ @@ -188,7 +188,7 @@`

		`<listitem><para>A pretty operating system name in a format suitable for presentation to the`
		`user. May or may not contain a release code name or OS version of some kind, as suitable. If not`
		`@@ -38,10 +80,10 @@`
		`<para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem>`
		`</varlistentry>`
		`diff --git a/src/basic/os-util.c b/src/basic/os-util.c`
		`- index bf844e5b7f..72a70e9314 100644`
		`+ index dbd067fd44..c03a76862d 100644`
		`--- a/src/basic/os-util.c`
		`+++ b/src/basic/os-util.c`
		`- @@ -379,5 +379,5 @@ const char os_release_pretty_name(const char pretty_name, const char *name) {`
		`+ @@ -438,5 +438,5 @@ const char os_release_pretty_name(const char pretty_name, const char *name) {`
		`* exists mostly to ensure we use the same logic wherever possible. */`

		`return empty_to_null(pretty_name) ?:`
		`@@ -49,7 +91,7 @@`
		`+ empty_to_null(name) ?: "GNU/Linux";`
		`}`
		`diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in`
		`- index e8e8cf37c3..47d4e30a9b 100755`
		`+ index a52dd812e4..00b4c6917d 100755`
		`--- a/src/kernel-install/90-loaderentry.install.in`
		`+++ b/src/kernel-install/90-loaderentry.install.in`
		`@@ -66,7 +66,7 @@ elif [ -f /usr/lib/os-release ]; then`
		`@@ -62,5 +104,5 @@`
		`SORT_KEY="$IMAGE_ID"`
		`[ -z "$SORT_KEY" ] && SORT_KEY="$ID"`
		`--`
		`- 2.43.0`
		`+ 2.44.0`

libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch

file modified

+4 -4

		`@@ -1,4 +1,4 @@`
		`- From eaa1a0fe805213be13db72f1f7008340c41f53b4 Mon Sep 17 00:00:00 2001`
		`+ From 8984b62da1706d9d3288b4d51aabc75e90765f43 Mon Sep 17 00:00:00 2001`
		`From: Luke Shumaker <lukeshu@parabola.nu>`
		`Date: Wed, 25 May 2016 12:24:56 -0400`
		`Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of`
		`@@ -9,10 +9,10 @@`
		`1 file changed, 1 insertion(+), 1 deletion(-)`

		`diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index f1c5fb5e56..6352a5288a 100644`
		`+ index 4aad523fa4..17617520c2 100644`
		`--- a/man/os-release.xml`
		`+++ b/man/os-release.xml`
		`- @@ -139,7 +139,7 @@`
		`+ @@ -144,7 +144,7 @@`
		`<term><varname>NAME=</varname></term>`

		`<listitem><para>A string identifying the operating system, without a version component, and`
		`@@ -22,5 +22,5 @@`

		`<para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>.`
		`--`
		`- 2.43.0`
		`+ 2.44.0`

libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch

file modified

+45 -6

		`@@ -1,4 +1,4 @@`
		`- From 53e55360f909b054d2d389261bceb072dadd3d23 Mon Sep 17 00:00:00 2001`
		`+ From b249fe3f66b562b0490e978d8d2010fa7b1712fc Mon Sep 17 00:00:00 2001`
		`From: Luke Shumaker <lukeshu@parabola.nu>`
		`Date: Wed, 25 May 2016 12:28:30 -0400`
		`Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of`
		`@@ -7,14 +7,53 @@`
		`As far as I can tell, no code in this repository actually uses the ID`
		`field, so this is just a man page change.`
		`---`
		`- man/os-release.xml \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+ man/check-os-release-simple.py \| 2 +-`
		`+ man/check-os-release.py \| 2 +-`
		`+ man/check-os-release.sh \| 2 +-`
		`+ man/os-release.xml \| 2 +-`
		`+ 4 files changed, 4 insertions(+), 4 deletions(-)`

		`+ diff --git a/man/check-os-release-simple.py b/man/check-os-release-simple.py`
		`+ index 9ad899a814..63ea424891 100644`
		`+ --- a/man/check-os-release-simple.py`
		`+ +++ b/man/check-os-release-simple.py`
		`+ @@ -7,6 +7,6 @@ os_release = platform.freedesktop_os_release()`
		`+ pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux')`
		`+ print(f'Running on {pretty_name!r}')`
		`+`
		`+ -if 'fedora' in [os_release.get('ID', 'linux'),`
		`+ +if 'fedora' in [os_release.get('ID', 'gnu-linux'),`
		`+ *os_release.get('ID_LIKE', '').split()]:`
		`+ print('Looks like Fedora!')`
		`+ diff --git a/man/check-os-release.py b/man/check-os-release.py`
		`+ index 373b77ed06..09aebd7a4f 100644`
		`+ --- a/man/check-os-release.py`
		`+ +++ b/man/check-os-release.py`
		`+ @@ -32,6 +32,6 @@ os_release = dict(read_os_release())`
		`+ pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux')`
		`+ print(f'Running on {pretty_name!r}')`
		`+`
		`+ -if 'debian' in [os_release.get('ID', 'linux'),`
		`+ +if 'debian' in [os_release.get('ID', 'gnu-linux'),`
		`+ *os_release.get('ID_LIKE', '').split()]:`
		`+ print('Looks like Debian!')`
		`+ diff --git a/man/check-os-release.sh b/man/check-os-release.sh`
		`+ index 084647a38b..c02b4e6743 100644`
		`+ --- a/man/check-os-release.sh`
		`+ +++ b/man/check-os-release.sh`
		`+ @@ -6,6 +6,6 @@ test -e /etc/os-release && os_release='/etc/os-release' \|\| os_release='/usr/lib/`
		`+`
		`+ echo "Running on ${PRETTY_NAME:-GNU/Linux}"`
		`+`
		`+ -if [ "${ID:-linux}" = "debian" ] \|\| [ "${ID_LIKE#debian}" != "${ID_LIKE}" ]; then`
		`+ +if [ "${ID:-gnu-linux}" = "debian" ] \|\| [ "${ID_LIKE#debian}" != "${ID_LIKE}" ]; then`
		`+ echo "Looks like Debian!"`
		`+ fi`
		`diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index 6352a5288a..e0e1724a16 100644`
		`+ index 17617520c2..5e2569d289 100644`
		`--- a/man/os-release.xml`
		`+++ b/man/os-release.xml`
		`- @@ -152,7 +152,7 @@`
		`+ @@ -157,7 +157,7 @@`
		`<listitem><para>A lower-case string (no spaces or other characters outside of 0–9, a–z, ".", "_"`
		`and "-") identifying the operating system, excluding any version information and suitable for`
		`processing by scripts or usage in generated filenames. If not set, a default of`
		`@@ -24,5 +63,5 @@`

		`<para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem>`
		`--`
		`- 2.43.0`
		`+ 2.44.0`

libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch

file modified

+20 -6

		`@@ -1,18 +1,32 @@`
		`- From d1a98f85e13118c4f6ab81f5d854429034629f9e Mon Sep 17 00:00:00 2001`
		`+ From 3219b6368eaa5c264d8d5ac1db0d6343abaaeb7f Mon Sep 17 00:00:00 2001`
		`From: Luke Shumaker <lukeshu@parabola.nu>`
		`Date: Wed, 25 May 2016 12:31:20 -0400`
		`Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"`
		`instead of "linux"`

		`---`
		`+ man/hostname.xml \| 2 +-`
		`src/resolve/resolved-manager.c \| 4 ++--`
		`- 1 file changed, 2 insertions(+), 2 deletions(-)`
		`+ 2 files changed, 3 insertions(+), 3 deletions(-)`

		`+ diff --git a/man/hostname.xml b/man/hostname.xml`
		`+ index a3dae72fd9..6beca463ec 100644`
		`+ --- a/man/hostname.xml`
		`+ +++ b/man/hostname.xml`
		`+ @@ -79,7 +79,7 @@`
		`+ <listitem><para>Otherwise, a fallback hostname configured at compilation time will be used`
		`+ (<literal>&FALLBACK_HOSTNAME;</literal>).</para></listitem>`
		`+`
		`+ - <!-- what about the "linux" fallback fallback? -->`
		`+ + <!-- what about the "gnu-linux" fallback? -->`
		`+ </itemizedlist>`
		`+`
		`+ <para>Effectively, the static hostname has higher priority than a transient hostname, which has higher`
		`diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c`
		`- index 6c6c98566f..be7830289b 100644`
		`+ index b52619e287..f380c23ec4 100644`
		`--- a/src/resolve/resolved-manager.c`
		`+++ b/src/resolve/resolved-manager.c`
		`- @@ -370,7 +370,7 @@ static int determine_hostnames(char full_hostname, char llmnr_hostname, char`
		`+ @@ -373,7 +373,7 @@ static int determine_hostnames(char full_hostname, char llmnr_hostname, char`
		`static char* fallback_hostname(void) {`

		`/* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it`
		`@@ -21,7 +35,7 @@`
		`* instead. */`

		`_cleanup_free_ char *n = get_default_hostname();`
		`- @@ -378,7 +378,7 @@ static char* fallback_hostname(void) {`
		`+ @@ -381,7 +381,7 @@ static char* fallback_hostname(void) {`
		`return NULL;`

		`if (is_localhost(n))`
		`@@ -31,5 +45,5 @@`
		`return TAKE_PTR(n);`
		`}`
		`--`
		`- 2.43.0`
		`+ 2.44.0`

libre/systemd/0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch

file added

+38

		`@@ -0,0 +1,38 @@`
		`+ From a54699c6754bab04fa27f3593b919ed0060b3957 Mon Sep 17 00:00:00 2001`
		`+ From: Luke Shumaker <lukeshu@parabola.nu>`
		`+ Date: Wed, 25 May 2016 12:32:21 -0400`
		`+ Subject: [PATCH 6/7] FSDG: man/: Mention Parabola instead of Arch`
		`+`
		`+ Ideally, we'd use FSDG distros for all of the examples, but doing so is`
		`+ beyond my knowledge. Bill Auger and I have agreed to not remove examples`
		`+ for non-FSDG distros that don't have a replacement.`
		`+ ---`
		`+ man/systemd-nspawn.xml \| 10 +++++-----`
		`+ 1 file changed, 5 insertions(+), 5 deletions(-)`
		`+`
		`+ diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml`
		`+ index e1e6d84fa3..afec5663ca 100644`
		`+ --- a/man/systemd-nspawn.xml`
		`+ +++ b/man/systemd-nspawn.xml`
		`+ @@ -1832,13 +1832,13 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>`
		`+`
		`+ <example>`
		`+ <title>Boot a minimal`
		`+ - <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>`
		`+ + <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>`
		`+`
		`+ - <programlisting># pacstrap -c ~/arch-tree/ base`
		`+ -# systemd-nspawn -bD ~/arch-tree/</programlisting>`
		`+ + <programlisting># pacstrap -c ~/parabola-tree/ base`
		`+ +# systemd-nspawn -bD ~/parabola-tree/</programlisting>`
		`+`
		`+ - <para>This installs a minimal Arch Linux distribution into the`
		`+ - directory <filename>~/arch-tree/</filename> and then boots an OS`
		`+ + <para>This installs a minimal Parabola GNU/Linux-libre distribution into the`
		`+ + directory <filename>~/parabola-tree/</filename> and then boots an OS`
		`+ in a namespace container in it.</para>`
		`+ </example>`
		`+`
		`+ --`
		`+ 2.44.0`
		`+`

libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch

file removed

-281

		`@@ -1,281 +0,0 @@`
		`- From 68dc7c247a7e279c75d4be3407cf45d0a7d03c65 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:32:21 -0400`
		`- Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples`
		`-`
		`- ---`
		`- man/custom-entities.ent.in \| 3 +--`
		`- man/machinectl.xml \| 4 ++-`
		`- man/os-release.xml \| 50 ++++++++++++++++--------------------`
		`- man/systemd-nspawn.xml \| 52 ++++++++++++++++++++------------------`
		`- 4 files changed, 53 insertions(+), 56 deletions(-)`
		`-`
		`- diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in`
		`- index 0376e0feb9..7b86b76ca2 100644`
		`- --- a/man/custom-entities.ent.in`
		`- +++ b/man/custom-entities.ent.in`
		`- @@ -17,5 +17,4 @@`
		`- <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">`
		`- <!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s">`
		`- <!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s">`
		`- -<!ENTITY fedora_latest_version "36">`
		`- -<!ENTITY fedora_cloud_release "1.5">`
		`- +<!ENTITY blag_latest_version "140">`
		`- diff --git a/man/machinectl.xml b/man/machinectl.xml`
		`- index dfba772eb3..a2a08a025d 100644`
		`- --- a/man/machinectl.xml`
		`- +++ b/man/machinectl.xml`
		`- @@ -939,11 +939,12 @@`
		`- to open a shell in it.</para>`
		`- </example>`
		`-`
		`- +<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.`
		`- <example>`
		`- <title>Download a Fedora image, set a root password in it, start`
		`- it as a service</title>`
		`-`
		`- - <programlisting># machinectl pull-raw --verify=no \`
		`- + <programlisting># machinectl pull-raw -&2D;verify=no \`
		`- https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \`
		`- Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64`
		`- # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64`
		`- @@ -958,6 +959,7 @@`
		`- the machine started as system service. With the last command a`
		`- login prompt into the container is requested.</para>`
		`- </example>`
		`- +-->`
		`-`
		`- <example>`
		`- <title>Exports a container image as tar file</title>`
		`- diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index e0e1724a16..4118b59d34 100644`
		`- --- a/man/os-release.xml`
		`- +++ b/man/os-release.xml`
		`- @@ -142,7 +142,7 @@`
		`- suitable for presentation to the user. If not set, a default of <literal>NAME=GNU/Linux</literal> may`
		`- be used.</para>`
		`-`
		`- - <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>.`
		`- + <para>Examples: <literal>NAME=BLAG</literal>, <literal>NAME="gNewSense"</literal>.`
		`- </para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -155,7 +155,7 @@`
		`- <literal>ID=gnu-linux</literal> may be used. Note that even though this string may not include`
		`- characters that require shell quoting, quoting may nevertheless be used.</para>`
		`-`
		`- - <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem>`
		`- + <para>Examples: <literal>ID=blag</literal>, <literal>ID=gnewsense</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -172,9 +172,9 @@`
		`- closely the local operating system relates to the listed ones, starting with the closest. This`
		`- field is optional.</para>`
		`-`
		`- - <para>Examples: for an operating system with <literal>ID=centos</literal>, an assignment of`
		`- + <para>Examples: for an operating system with <literal>ID=blag</literal>, an assignment of`
		`- <literal>ID_LIKE="rhel fedora"</literal> would be appropriate. For an operating system with`
		`- - <literal>ID=ubuntu</literal>, an assignment of <literal>ID_LIKE=debian</literal> is appropriate.`
		`- + <literal>ID=gnewsense</literal>, an assignment of <literal>ID_LIKE=gnewsense</literal> is appropriate.`
		`- </para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -185,7 +185,7 @@`
		`- user. May or may not contain a release code name or OS version of some kind, as suitable. If not`
		`- set, a default of <literal>PRETTY_NAME="GNU/Linux"</literal> may be used</para>`
		`-`
		`- - <para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem>`
		`- + <para>Example: <literal>PRETTY_NAME="BLAG 210k (Spartakus)"</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -195,7 +195,7 @@`
		`- url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as`
		`- proposed by the NIST. This field is optional.</para>`
		`-`
		`- - <para>Example: <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal></para></listitem>`
		`- + <para>Example: <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal></para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -238,7 +238,7 @@`
		`- information, possibly including a release code name, and suitable for presentation to the`
		`- user. This field is optional.</para>`
		`-`
		`- - <para>Examples: <literal>VERSION=17</literal>, <literal>VERSION="17 (Beefy Miracle)"</literal>.`
		`- + <para>Examples: <literal>VERSION=210k</literal>, <literal>VERSION="210k (Spartakus)"</literal>.`
		`- </para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -250,7 +250,7 @@`
		`- or release code name, and suitable for processing by scripts or usage in generated filenames. This`
		`- field is optional.</para>`
		`-`
		`- - <para>Examples: <literal>VERSION_ID=17</literal>, <literal>VERSION_ID=11.04</literal>.`
		`- + <para>Examples: <literal>VERSION_ID=210k</literal>, <literal>VERSION_ID=7.0</literal>.`
		`- </para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -346,7 +346,7 @@`
		`- need to be referenced, it is recommended to provide an online landing page linking all available`
		`- resources.</para>`
		`-`
		`- - <para>Examples: <literal>HOME_URL="https://fedoraproject.org/"</literal>,`
		`- + <para>Examples: <literal>HOME_URL="https://www.blagblagblag.org/"</literal>,`
		`- <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -493,25 +493,19 @@`
		`- <example>`
		`- <title><filename>os-release</filename> file for Fedora Workstation</title>`
		`-`
		`- - <programlisting>NAME=Fedora`
		`- -VERSION="32 (Workstation Edition)"`
		`- -ID=fedora`
		`- -VERSION_ID=32`
		`- -PRETTY_NAME="Fedora 32 (Workstation Edition)"`
		`- -ANSI_COLOR="0;38;2;60;110;180"`
		`- -LOGO=fedora-logo-icon`
		`- -CPE_NAME="cpe:/o:fedoraproject:fedora:32"`
		`- -HOME_URL="https://fedoraproject.org/"`
		`- -DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f32/system-administrators-guide/"`
		`- -SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help"`
		`- -BUG_REPORT_URL="https://bugzilla.redhat.com/"`
		`- -REDHAT_BUGZILLA_PRODUCT="Fedora"`
		`- -REDHAT_BUGZILLA_PRODUCT_VERSION=32`
		`- -REDHAT_SUPPORT_PRODUCT="Fedora"`
		`- -REDHAT_SUPPORT_PRODUCT_VERSION=32`
		`- -PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy"`
		`- -VARIANT="Workstation Edition"`
		`- -VARIANT_ID=workstation</programlisting>`
		`- + <programlisting>NAME=Parabola`
		`- +VERSION="rolling-release"`
		`- +ID=parabola`
		`- +ID_LIKE=arch`
		`- +VERSION_ID=rolling-release`
		`- +PRETTY_NAME="Parabola GNU/Linux-libre"`
		`- +ANSI_COLOR="1;35"`
		`- +LOGO=parabola-logo-icon`
		`- +CPE_NAME="cpe:/o:parabola:parabola:rolling-release"`
		`- +HOME_URL="https://www.parabola.nu/"`
		`- +DOCUMENTATION_URL="https://wiki.parabola.nu/"`
		`- +SUPPORT_URL="https://labs.parabola.nu/projects/parabola-community-forum/boards"`
		`- +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>`
		`- </example>`
		`-`
		`- <example>`
		`- diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml`
		`- index e2c751692f..1b0ca65e4b 100644`
		`- --- a/man/systemd-nspawn.xml`
		`- +++ b/man/systemd-nspawn.xml`
		`- @@ -1638,11 +1638,12 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>`
		`- <refsect1>`
		`- <title>Examples</title>`
		`-`
		`- +<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.`
		`- <example>`
		`- <title>Download a`
		`- <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title>`
		`-`
		`- - <programlisting># machinectl pull-raw --verify=no \`
		`- + <programlisting># machinectl pull-raw -&2D;verify=no \`
		`- https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \`
		`- Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64`
		`- # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64</programlisting>`
		`- @@ -1651,37 +1652,36 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>`
		`- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>`
		`- and opens a shell in it.</para>`
		`- </example>`
		`- +-->`
		`-`
		`- <example>`
		`- - <title>Build and boot a minimal Fedora distribution in a container</title>`
		`- + <title>Build and boot a minimal BLAG distribution in a container</title>`
		`-`
		`- - <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \`
		`- - --repo=fedora --repo=updates --setopt=install_weak_deps=False install \`
		`- - passwd dnf fedora-release vim-minimal systemd systemd-networkd`
		`- -# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting>`
		`- + <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \`
		`- + --disablerepo='*' --enablerepo=blag --enablerepo=updates install \`
		`- + systemd passwd dnf blag-release vim-minimal glibc-minimal-langpack`
		`- +# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting>`
		`-`
		`- - <para>This installs a minimal Fedora distribution into the`
		`- - directory <filename index="false">/var/lib/machines/f&fedora_latest_version;</filename>`
		`- + <para>This installs a minimal BLAG distribution into the`
		`- + directory <filename index="false">/var/lib/machines/blag&blag_latest_version;</filename>`
		`- and then boots that OS in a namespace container. Because the installation`
		`- is located underneath the standard <filename>/var/lib/machines/</filename>`
		`- directory, it is also possible to start the machine using`
		`- - <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para>`
		`- + <command>systemd-nspawn -M blag&blag_latest_version;</command>.</para>`
		`- </example>`
		`-`
		`- <example>`
		`- - <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>`
		`- + <title>Spawn a shell in a container of a minimal gNewSense unstable distribution</title>`
		`-`
		`- - <programlisting># debootstrap unstable ~/debian-tree/`
		`- -# systemd-nspawn -D ~/debian-tree/</programlisting>`
		`- + <programlisting># debootstrap ucclia ~/gnewsense-tree/`
		`- +# systemd-nspawn -D ~/gnewsense-tree/</programlisting>`
		`-`
		`- - <para>This installs a minimal Debian unstable distribution into`
		`- - the directory <filename>~/debian-tree/</filename> and then`
		`- + <para>This installs a minimal gNewSense Ucclia distribution into`
		`- + the directory <filename>~/gnewsense-tree/</filename> and then`
		`- spawns a shell from this image in a namespace container.</para>`
		`-`
		`- <para><command>debootstrap</command> supports`
		`- - <ulink url="https://www.debian.org">Debian</ulink>,`
		`- - <ulink url="https://www.ubuntu.com">Ubuntu</ulink>,`
		`- - and <ulink url="https://www.tanglu.org">Tanglu</ulink>`
		`- + <ulink url="http://www.gnewsense.org">gNewSense</ulink>`
		`- out of the box, so the same command can be used to install any of those. For other`
		`- distributions from the Debian family, a mirror has to be specified, see`
		`- <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.`
		`- @@ -1690,29 +1690,31 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>`
		`-`
		`- <example>`
		`- <title>Boot a minimal`
		`- - <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>`
		`- + <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>`
		`-`
		`- - <programlisting># pacstrap -c ~/arch-tree/ base`
		`- -# systemd-nspawn -bD ~/arch-tree/</programlisting>`
		`- + <programlisting># pacstrap -c ~/parabola-tree/ base`
		`- +# systemd-nspawn -bD ~/parabola-tree/</programlisting>`
		`-`
		`- - <para>This installs a minimal Arch Linux distribution into the`
		`- - directory <filename>~/arch-tree/</filename> and then boots an OS`
		`- + <para>This installs a minimal Parabola GNU/Linux-libre distribution into the`
		`- + directory <filename>~/parabola-tree/</filename> and then boots an OS`
		`- in a namespace container in it.</para>`
		`- </example>`
		`-`
		`- +<!-- TODO: This example needs switched to an FSDG OS`
		`- <example>`
		`- <title>Install the`
		`- <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>`
		`- rolling distribution</title>`
		`-`
		`- - <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \`
		`- + <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \`
		`- https://download.opensuse.org/tumbleweed/repo/oss tumbleweed`
		`- -# zypper --root=/var/lib/machines/tumbleweed refresh`
		`- -# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \`
		`- +# zypper -&2Droot=/var/lib/machines/tumbleweed refresh`
		`- +# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \`
		`- systemd shadow zypper openSUSE-release vim`
		`- # systemd-nspawn -M tumbleweed passwd root`
		`- # systemd-nspawn -M tumbleweed -b</programlisting>`
		`- </example>`
		`- +-->`
		`-`
		`- <example>`
		`- <title>Boot into an ephemeral snapshot of the host system</title>`
		`- --`
		`- 2.43.0`
		`-`

libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch

file removed

-26

		`@@ -1,26 +0,0 @@`
		`- From 93acf8d3c8c4650ada73119508d703fe1dcb142e Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Sat, 17 Dec 2016 00:56:43 -0500`
		`- Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of`
		`- "Linux Boot Manager"`
		`-`
		`- ---`
		`- src/boot/bootctl-install.c \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c`
		`- index c795e75bc3..c373b30241 100644`
		`- --- a/src/boot/bootctl-install.c`
		`- +++ b/src/boot/bootctl-install.c`
		`- @@ -635,7 +635,7 @@ static int remove_from_order(uint16_t slot) {`
		`- }`
		`-`
		`- static const char *pick_efi_boot_option_description(void) {`
		`- - return arg_efi_boot_option_description ?: "Linux Boot Manager";`
		`- + return arg_efi_boot_option_description ?: "Systemd Boot Manager";`
		`- }`
		`-`
		`- static int install_variables(`
		`- --`
		`- 2.43.0`
		`-`

libre/systemd/0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch

file added

+1132

The added file is too large to be shown here, see it at: libre/systemd/0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch

libre/systemd/30-systemd-daemon-reload-system.hook ~~libre/systemd/30-systemd-daemon-reload.hook~~

file renamed

+1 -1

		`@@ -8,4 +8,4 @@`
		`[Action]`
		`Description = Reloading system manager configuration...`
		`When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload`
		`+ Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-system`

libre/systemd/30-systemd-daemon-reload-user.hook

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ [Trigger]`
		`+ Type = Path`
		`+ Operation = Install`
		`+ Operation = Upgrade`
		`+ Operation = Remove`
		`+ Target = usr/lib/systemd/user/*`
		`+`
		`+ [Action]`
		`+ Description = Reloading user manager configuration...`
		`+ When = PostTransaction`
		`+ Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-user`

libre/systemd/PKGBUILD

file modified

+214 -167

		`@@ -2,6 +2,7 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Contributor: bill-auger <bill-auger@programmer.net>`

		`# Tips for the maintainer (i.e.: future me?):`
		`#`
		`@@ -20,6 +21,7 @@`
		# - `systemd-libs`: `libsystemd.so`, `libudev.so`, and the NSS modules
		# - `systemd-resolvconf`: resolvconf(1)
		# - `systemd-sysvcompat`: init(1), halt(8), poweroff(8), reboot(8), shutdown(8)
		+ # - `systemd-ukify`: ukify(1)
		`# * historical systemd pkgname=() values:`
		# - `udev`: existed as a split package 2012-02 to 2012-05, when it merged into
		# `systemd-tools`
		`@@ -74,30 +76,43 @@`
		# - `nss-resolve`: `libnss_resolve.so`

		`pkgbase=systemd`
		`- pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')`
		`+ pkgname=('systemd'`
		`+ 'systemd-libs'`
		`+ 'systemd-resolvconf'`
		`+ 'systemd-sysvcompat'`
		`+ 'systemd-ukify')`
		`pkgname+=('systemd-common' 'systemd-udev')`
		`# We split Arch's systemd-libs into systemd-$X, for the following $X:`
		`_systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')`
		`pkgname+=("${_systemd_libs[@]/#/systemd-}")`
		`- _tag='eb0f8fc41511dda1f9e0d19e830cc8c6668a2628' # git rev-parse v${_tag_name}`
		`- _tag_name=253`
		`- pkgver="${_tag_name/-/}"`
		`- pkgrel=1`
		`- pkgrel+=.parabola3`
		`+ _tag='4003dd6754e3446691402d3cc389fbfd4faccc90' # git rev-parse v${_tag_name}`
		`+ _tag_name=255.4`
		`+ # Upstream versioning is incompatible with pacman's version comparisons so we`
		`+ # replace tildes with the empty string to make sure pacman's version comparing`
		`+ # does the right thing for rc versions:`
		`+ # ➜ vercmp 255~rc1 255`
		`+ # 1`
		`+ # ➜ vercmp 255rc1 255`
		`+ # -1`
		`+ pkgver="${_tag_name/~/}"`
		`+ pkgrel=2`
		`+ pkgrel+=.parabola1`
		`arch=('x86_64')`
		`arch+=('i686' 'armv7h' 'ppc64le')`
		`+ license=('LGPL-2.1-or-later')`
		`url='https://www.github.com/systemd/systemd'`
		`makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'`
		`'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'`
		`'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'`
		`- 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'`
		`+ 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'git'`
		`'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'`
		`'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'`
		`- 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls')`
		`- makedepends=(${makedepends[*]/gnu-efi-libs}) # don't include on non-x86 (FIXME(lukeshu): why not on ARM, EFI is a thing there)`
		- makedepends_i686=('gnu-efi-libs' 'pkgconf') # FIXME(lukeshu): Why do we need to request `pkgconf` on i686?
		`- makedepends_x86_64=('gnu-efi-libs')`
		`- options=('strip')`
		`+ 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'`
		`+ 'libpwquality' 'qrencode' 'lib32-gcc-libs' 'python-pefile')`
		`+ makedepends=(${makedepends[*]/lib32-gcc-libs}) # only include lib32-gcc-libs on x86_64`
		`+ makedepends_x86_64=('lib32-gcc-libs')`
		+ makedepends_i686=('pkgconf') # FIXME(lukeshu): Why do we need to request `pkgconf` on i686?
		`+ conflicts=("mkinitcpio<38-1")`
		`validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>`
		`'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com>`
		`'9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github@gmail.com>`
		`@@ -105,17 +120,13 @@`
		`source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"`
		`"git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"`
		`'0001-Use-Arch-Linux-device-access-groups.patch'`
		`- '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'`
		`+ '0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch'`
		`'0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'`
		`'0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'`
		`'0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'`
		`'0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'`
		`- '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'`
		`- '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch'`
		`- # mkinitcpio files`
		`- 'initcpio-hook-udev'`
		`- 'initcpio-install-systemd'`
		`- 'initcpio-install-udev'`
		`+ '0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch'`
		`+ '0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'`
		`# bootloader files`
		`'parabola.conf'`
		`'loader.conf'`
		`@@ -127,7 +138,8 @@`
		`'20-systemd-sysusers.hook'`
		`'30-systemd-binfmt.hook'`
		`'30-systemd-catalog.hook'`
		`- '30-systemd-daemon-reload.hook'`
		`+ '30-systemd-daemon-reload-system.hook'`
		`+ '30-systemd-daemon-reload-user.hook'`
		`'30-systemd-hwdb.hook'`
		`'30-systemd-sysctl.hook'`
		`'30-systemd-tmpfiles.hook'`
		`@@ -136,25 +148,23 @@`
		`sha512sums=('SKIP'`
		`'SKIP'`
		`'3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'`
		`- '52e607f5b11e66ad71333c1b03119575b1018c74df4e98376c28e59a21a348e3010d95863d818fdd5175acccbd627047a70a579671909288e10d28b247e494ca'`
		`- '0e87e6770343e9c1a1b57548c8d9d985df1d3be60e6199825e61ce5c1321cb1924db81feea099bba8cb94fdce9d1ca7f41b0c030d681a9453d5d5bad05cffc25'`
		`- '0f571decd80622feffa6fe694ba33628a1c2f62db3a83bf03b5e3fc720b25f91567c5a0412aaebc554cd5ad889b63ded404cb7b2eb217677b070e0527bf302a2'`
		`- '9ba07104a1b26f736274813624b08e59f3e5a9035e6277f566a1d012372d1d60fe9ffbeff1b24e0319133d175e5e65caa99a71eaa213372486fa1edb1145c4a3'`
		`- 'e8576f581dc6706bdd495128972d2ac90acf76a15117d67b792fb9ad5a2dd5597c96338965632857085ddd8362c9cb022d180f4aa29a026f953236d01756dbca'`
		`- '6c7c10cbded0e75677064a6c5fb4e79c21b0fea167104a95b65a856cd255f8d73e2b706ddbee86b357c35440f32e1f390217a85e41a10302955023df825e1017'`
		`- '73fd324d90c8f86596544ce16d2571b510e4d97a2fdf1e11fd73c9408bafb3938ece4b6e4b4fccfca40856172b010b9a7ad116da7c8738cf9673b676e8525edd'`
		`- 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'`
		`- 'c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b'`
		`- 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'`
		`+ 'b01d28646bca80c33192a10728218427b95246f904d921d00451bd32673f6352aefe6a8168942e796f4b7d1682921cc5c6adb895c9d9cdc0365606bfd4eca391'`
		`+ 'fb1f75ded29d635c9e746ce76a99ace4e79694eea6d6ec7e8a84d7700e92ee5698576b979e16d71316c3e9276f285e3db248f74e8e55a8cf719456f6abc362b1'`
		`+ '03df948013f353e3fb6db745a01520c2dc8278b823e57178aca1c59786b81dd8a2e10e7f603e33028e1e9084a753cb7a09ebd4b4291dbdda30a16eba39628866'`
		`+ '2e89361d6af47464b91a04dc4be7a941ff12894b56831702deb6063d8d386141ff04989d1ecb39dbc452d83caacd5830c8eb6b06350c4bee6ccd3383aa2b1c8f'`
		`+ '0b634f674468e6c859e7faff9bbf9d310a2c1feac2ceb4bfd5cb132e9b706f512908c1c905c72181395a5f0d0af40600e62ef46ce1ab534beb0b8d16aba0a2be'`
		`+ '819331360737c59bc6fa2ca681da16bdae599d83289d619da802c4ffff2fe3b72852b11d50caecc058c80022b6b5158c5309560670fa2c30c08e9bb14b7e0454'`
		`+ 'eb4ca9b4460f19ac93885d8e22ae4e844d0798918d692d84333e4f1b5ae6fa28a2443d156e31202c1c05f97c3f61531a8822f1b0e66ccc00e20743b871322aa8'`
		`'70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'`
		`'6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'`
		`'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'`
		`'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'`
		`- 'a586f62b92268ae1e8a9310b02693548fb114292e1252953b4c9475d29e2817b5042a612f3b3ef09fb5b18126e2c3486ff49dd764d97644f0c510ae0200e075b'`
		`+ '3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886'`
		`'299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'`
		`'0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'`
		`'2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'`
		`- '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'`
		`+ 'a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a'`
		`+ '190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d'`
		`'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'`
		`'9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'`
		`'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'`
		`@@ -173,18 +183,16 @@`
		`# add upstream repository for cherry-picking`
		`git remote add -f upstream ../systemd`

		`- local _c`
		`+ local _c _l`
		`for _c in "${_backports[@]}"; do`
		`- if [[ $_c == .. ]]; then`
		`- git log --oneline --reverse "${_c}"`
		`- else`
		`- git log --oneline -1 "${_c}"`
		`- fi`
		`- git cherry-pick -n -m1 "${_c}"`
		`+ if [[ "${_c}" == .. ]]; then _l='--reverse'; else _l='--max-count=1'; fi`
		`+ git log --oneline "${_l}" "${_c}"`
		`+ git cherry-pick --mainline 1 --no-commit "${_c}"`
		`done`
		`for _c in "${_reverts[@]}"; do`
		`- git log --oneline -1 "${_c}"`
		`- git revert -n "${_c}"`
		`+ if [[ "${_c}" == .. ]]; then _l='--reverse'; else _l='--max-count=1'; fi`
		`+ git log --oneline "${_l}" "${_c}"`
		`+ git revert --mainline 1 --no-commit "${_c}"`
		`done`

		`# Replace cdrom/dialout/tape groups with optical/uucp/storage`
		`@@ -193,6 +201,7 @@`
		`# apply FSDG patches`
		`local _patch`
		`for _patch in "$srcdir"/????-FSDG-*.patch; do`
		`+ echo "applying $_patch"`
		`patch -Np1 -i "$_patch"`
		`done`
		`}`
		`@@ -219,21 +228,26 @@`
		`fi`

		`local _meson_options=(`
		`- # internal version comparison is incompatible with pacman:`
		`- # 249~rc1 < 249 < 249.1 < 249rc`
		`- -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-parabola"`
		`+ -Dversion-tag="${_tag_name}-${pkgrel}-parabola"`
		`+ # We use the version without tildes as the shared library tag because`
		`+ # pacman looks at the shared library version.`
		`-Dshared-lib-tag="${pkgver}-${pkgrel}"`
		`-Dmode=release`

		`+ -Dapparmor=false`
		`+ -Dbootloader=true`
		`+ -Dxenctrl=false`
		`-Dbpf-framework=true`
		`-Dima=false`
		`-Dlibidn2=true`
		`-Dlz4=true`
		`-Dman=true`
		`+ -Dnscd=false`
		`+ -Dselinux=false`

		`# We disable DNSSEC by default, it still causes trouble:`
		`# https://github.com/systemd/systemd/issues/10579`
		`-`
		`+`
		`-Ddbuspolicydir=/usr/share/dbus-1/system.d`
		`-Ddefault-dnssec=no`
		`-Ddefault-hierarchy=unified`
		`@@ -255,69 +269,91 @@`
		`-Dsbat-distro-version="${pkgver}"`
		`-Dsbat-distro-url="https://www.parabola.nu/packages/libre/${CARCH}/${pkgname}/"`
		`)`
		`- if [ "$CARCH" != "armv7h" ]; then`
		`- # FIXME(lukeshu): Why do we turn off -Dgnu-efi on ARM? EFI is a`
		`- # thing on ARM.`
		`- _meson_options+=(-Dgnu-efi=true)`
		`- fi`

		`arch-meson "$pkgbase-stable" build "${_meson_options[@]}"`

		`meson compile -C build`

		`# Go ahead and split the package now. It's easier this way, because`
		`- # we can use mv instead of awkward, error-prone rm/cp pairs.`
		`- rm -rf "$srcdir/dest"`
		+ # we can use `mv` instead of awkward+error-prone pairs of `rm`ing
		`+ # the files in package_systemd() and then re-creating them in the`
		`+ # other package_ functions.`

		# Put things in the main `systemd` package by default.
		`meson install -C build --destdir "$srcdir/dest/systemd"`

		- # Pull out `systemd-common`.
		`- install -dm755 "$srcdir/dest/common"/usr/lib/systemd`
		`- mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/"libsystemd-shared-${pkgver}-${pkgrel}.so"`
		`-`
		- # Pull out `systemd-libsystemd`.
		`- install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}`
		`- mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd`
		`- mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc`
		`- mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/`
		`- mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/`
		`-`
		- # Pull out `systemd-libudev`.
		`- install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include}`
		`- mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h`
		`- mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc`
		`- mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/`
		`- mv "$srcdir/dest"/systemd/usr/share/man/man3/udev -t "$srcdir/dest"/libudev/usr/share/man/man3/`
		`-`
		- # Pull out `systemd-udev`.
		`- install -dm755 "$srcdir/dest/udev"/{etc,usr/lib}`
		`- mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/`
		`- mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/`
		+ # Parabola: Pull out `systemd-common`.
		`+ install -dm755 "$srcdir/dest/systemd-common"/usr/lib/systemd`
		`+ mv -T "$srcdir/dest"/systemd{,-common}/usr/lib/systemd/"libsystemd-shared-${pkgver}-${pkgrel}.so"`
		`+`
		+ # Pull out `systemd-libs`.
		`+ install -d -m0755 "$srcdir/dest/systemd-libs"/usr/{lib,share/man/man8}`
		`+ mv "$srcdir/dest/systemd"/usr/lib/lib{nss,systemd,udev}.so -t "$srcdir/dest/systemd-libs"/usr/lib/`
		`+ mv "$srcdir/dest/systemd"/usr/lib/pkgconfig -t "$srcdir/dest/systemd-libs"/usr/lib/`
		`+ mv "$srcdir/dest/systemd"/usr/include -t "$srcdir/dest/systemd-libs"/usr/`
		`+ mv "$srcdir/dest/systemd"/usr/share/man/man3 -t "$srcdir/dest/systemd-libs"/usr/share/man/`
		`+ mv "$srcdir/dest/systemd"/usr/share/man/man8/{nss-,libnss_}* -t "$srcdir/dest/systemd-libs"/usr/share/man/man8/`
		`+`
		+ # Parabola: Further split `systemd-libs`
		`+ {`
		+ # Pull out `systemd-libsystemd`.
		`+ install -dm755 "$srcdir/dest/systemd-libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}`
		`+ mv -T "$srcdir/dest"/systemd-{libs,libsystemd}/usr/include/systemd`
		`+ mv -T "$srcdir/dest"/systemd-{libs,libsystemd}/usr/lib/pkgconfig/libsystemd.pc`
		`+ mv "$srcdir/dest/systemd-libs"/usr/lib/libsystemd.so* -t "$srcdir/dest/systemd-libsystemd"/usr/lib/`
		`+ mv "$srcdir/dest/systemd-libs"/usr/share/man/man3/{SD,sd,libsystemd}* -t "$srcdir/dest/systemd-libsystemd"/usr/share/man/man3/`
		`+`
		+ # Pull out `systemd-libudev`.
		`+ install -dm755 "$srcdir/dest/systemd-libudev"/usr/{lib/pkgconfig,share/man/man3,include}`
		`+ mv -T "$srcdir/dest"/systemd-{libs,libudev}/usr/include/libudev.h`
		`+ mv -T "$srcdir/dest"/systemd-{libs,libudev}/usr/lib/pkgconfig/libudev.pc`
		`+ mv "$srcdir/dest/systemd-libs"/usr/lib/libudev.so* -t "$srcdir/dest/systemd-libudev"/usr/lib/`
		`+ mv "$srcdir/dest/systemd-libs"/usr/share/man/man3/udev -t "$srcdir/dest/systemd-libudev"/usr/share/man/man3/`
		`+`
		+ # Pull out `systemd-nss-*`.
		`+ local nssmodule`
		`+ for nssmodule in systemd myhostname mymachines resolve; do`
		`+ install -dm755 "$srcdir/dest/systemd-nss-$nssmodule"/usr/{lib,share/man/man8}`
		`+ mv -t "$srcdir/dest/systemd-nss-$nssmodule"/usr/share/man/man8/ -- \`
		`+ "$srcdir/dest/systemd-libs"/usr/share/man/man8/nss-$nssmodule.8 \`
		`+ "$srcdir/dest/systemd-libs"/usr/share/man/man8/libnss_$nssmodule.*.8`
		`+ mv -t "$srcdir/dest/systemd-nss-$nssmodule"/usr/lib/ -- \`
		`+ "$srcdir/dest/systemd-libs"/usr/lib/libnss_$nssmodule.so*`
		`+ done`
		`+`
		+ # Verify that there's nothing left in `systemd-libs`.
		`+ diff -u /dev/null <(find "$srcdir/dest/systemd-libs" -not -type d)`
		`+ }`
		`+`
		+ # Parabola: Pull out `systemd-udev`.
		+ # NB: Must do this after pulling out `systemd-libudev`.
		`+ install -dm755 "$srcdir/dest/systemd-udev"/{etc,usr/lib}`
		`+ mv -T "$srcdir/dest"/systemd{,-udev}/etc/udev/`
		`+ mv -T "$srcdir/dest"/systemd{,-udev}/usr/lib/udev/`
		`while read -d '' -r file; do`
		`- install -dm755 "$srcdir/dest/udev/${file%/*}"`
		`- mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file"`
		`+ install -dm755 "$srcdir/dest/systemd-udev/${file%/*}"`
		`+ mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/systemd-udev/$file"`
		`done < <(find "$srcdir/dest/systemd" $ -name 'udev' -o -name 'hwdb' $ -printf '%P\0')`

		- # Pull out `systemd-nss-*`.
		`- local nssmodule`
		`- for nssmodule in systemd myhostname mymachines resolve; do`
		`- install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}`
		`- mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \`
		`- "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \`
		`- "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8`
		`- mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/`
		`- done`
		+ # Pull out `systemd-ukify`.
		`+ install -d -m0755 "$srcdir/dest/systemd-ukify"/usr/{bin,lib/{systemd,kernel/install.d},share/man/man1}`
		`+ mv "$srcdir/dest/systemd"/usr/bin/ukify -t "$srcdir/dest/systemd-ukify"/usr/bin/`
		`+ mv "$srcdir/dest/systemd"/usr/lib/systemd/ukify -t "$srcdir/dest/systemd-ukify"/usr/lib/systemd/`
		`+ mv "$srcdir/dest/systemd"/usr/share/man/man1/ukify.1 -t "$srcdir/dest/systemd-ukify"/usr/share/man/man1/`
		`+ # we move the ukify hook itself, but keep 90-uki-copy.install in place,`
		`+ # because there are other ways to generate UKIs w/o ukify, e.g. w/ mkinitcpio`
		`+ mv "$srcdir/dest/systemd"/usr/lib/kernel/install.d/60-ukify.install -t "$srcdir/dest/systemd-ukify"/usr/lib/kernel/install.d`

		# Pull out `systemd-sysvcompat`.
		`- install -dm755 "$srcdir/dest/sysvcompat"/usr/share/man/man{1,8}`
		`- mv "$srcdir/dest/systemd"/usr/share/man/man1/init.1 \`
		`- -t "$srcdir/dest/sysvcompat"/usr/share/man/man1`
		`- mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 \`
		`- -t "$srcdir/dest/sysvcompat"/usr/share/man/man8`
		`-`
		- # Tidy up the main `systemd` package.
		`- rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}`
		`+ install -d -m0755 "$srcdir/dest/systemd-sysvcompat"/usr/{bin,share/man/man{1,8}}`
		`+ mv "$srcdir/dest/systemd"/usr/share/man/man1/init.1 -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man1/`
		`+ mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8/`
		`+ mv "$srcdir/dest/systemd"/usr/bin/{halt,init,poweroff,reboot,shutdown} -t "$srcdir/dest/systemd-sysvcompat"/usr/bin/`
		`+`
		+ # Pull out `systemd-resolvconf`.
		`+ install -d -m0755 "$srcdir/dest/systemd-resolvconf"/usr/{bin,share/man/man1}`
		`+ mv "$srcdir/dest/systemd"/usr/share/man/man1/resolvconf.1 -t "$srcdir/dest/systemd-resolvconf"/usr/share/man/man1/`
		`+ mv "$srcdir/dest/systemd"/usr/bin/resolvconf -t "$srcdir/dest/systemd-resolvconf"/usr/bin/`
		`}`

		`check() {`
		`@@ -335,7 +371,7 @@`
		`# 537/1081 systemd:test / test-sigbus TIMEOUT 30.36s killed by signal 15 SIGTERM`
		`# 559/1081 systemd:test / test-fileio FAIL 1.93s killed by signal 6 SIGABRT`
		`[[ "${CARCH}" == armv7h ]] \|\|`
		`- meson test -C build`
		`+ meson test -C build --print-errorlogs`
		`}`

		`# How we use this function might seem like "overthinking it", and it`
		`@@ -345,13 +381,13 @@`
		`# Resolve short names, to make calling code readable.`
		`# Where, relative to $srcdir, each .so file lives.`
		`declare -A paths=(`
		`- [libsystemd-shared]="dest/common/usr/lib/systemd/libsystemd-shared-${pkgver}-${pkgrel}.so"`
		`- [libsystemd]='dest/libsystemd/usr/lib/libsystemd.so'`
		`- [libudev]='dest/libudev/usr/lib/libudev.so'`
		`- [libnss_systemd]='dest/nss-systemd/usr/lib/libnss_systemd.so.2'`
		`- [libnss_myhostname]='dest/nss-myhostname/usr/lib/libnss_myhostname.so.2'`
		`- [libnss_mymachines]='dest/nss-mymachines/usr/lib/libnss_mymachines.so.2'`
		`- [libnss_resolve]='dest/nss-resolve/usr/lib/libnss_resolve.so.2'`
		`+ [libsystemd-shared]="dest/systemd-common/usr/lib/systemd/libsystemd-shared-${pkgver}-${pkgrel}.so"`
		`+ [libsystemd]='dest/systemd-libsystemd/usr/lib/libsystemd.so'`
		`+ [libudev]='dest/systemd-libudev/usr/lib/libudev.so'`
		`+ [libnss_systemd]='dest/systemd-nss-systemd/usr/lib/libnss_systemd.so.2'`
		`+ [libnss_myhostname]='dest/systemd-nss-myhostname/usr/lib/libnss_myhostname.so.2'`
		`+ [libnss_mymachines]='dest/systemd-nss-mymachines/usr/lib/libnss_mymachines.so.2'`
		`+ [libnss_resolve]='dest/systemd-nss-resolve/usr/lib/libnss_resolve.so.2'`
		`)`

		`local libname libfile txtfile mode`
		`@@ -411,24 +447,31 @@`

		`package_systemd() {`
		`pkgdesc='system and service manager'`
		`- license=('GPL2' 'LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash # Parabola: ends up in systemd-common`
		`+ 'GPL-2.0-or-later' # udev # Parabola: ends up in systemd-udev`
		`+ 'MIT-0' # documentation and config files`
		`+ )`
		`depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'`
		`- 'dbus-units' 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so'`
		`+ 'dbus-units' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so'`
		`'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs' 'libidn2' 'lz4' 'pam'`
		`'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'`
		`- 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so'`
		`+ 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so'`
		`'openssl' 'libcrypto.so' 'libssl.so')`
		`provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")`
		`replaces=('nss-myhostname' 'systemd-tools' 'udev')`
		`conflicts=('nss-myhostname' 'systemd-tools' 'udev')`
		`- optdepends=('libmicrohttpd: remote journald capabilities'`
		`+ optdepends=('libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote'`
		`'quota-tools: kernel-level quota management'`
		`'systemd-sysvcompat: symlink package to provide sysvinit binaries'`
		`+ 'systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image'`
		`'polkit: allow administration as unprivileged user'`
		`- 'python: Unified Kernel Image with ukify'`
		`'curl: systemd-journal-upload, machinectl pull-tar and pull-raw'`
		`'gnutls: systemd-journal-gatewayd and systemd-journal-remote'`
		`+ 'qrencode: show QR codes'`
		`+ 'iptables: firewall features'`
		`'libbpf: support BPF programs'`
		`+ 'libpwquality: check password quality'`
		`'libfido2: unlocking LUKS2 volumes with FIDO2 token'`
		`'libp11-kit: support PKCS#11'`
		`'tpm2-tss: unlocking LUKS2 volumes with TPM2')`
		`@@ -447,12 +490,13 @@`
		`etc/systemd/system.conf`
		`etc/systemd/timesyncd.conf`
		`etc/systemd/user.conf`
		`+ etc/udev/iocost.conf`
		`etc/udev/udev.conf)`
		`install=systemd.install`

		`# Parabola: Split the package.`
		- license=('LGPL2.1') # The GPL2 parts end up in `systemd-udev`
		# (the "eval"/"outputvar" parts are so that `makepkg --printsrcinfo` works)
		`+ license=($(eval "printf '%s\n' \"\${${outputvar:-license}[@]}\"\|grep -vFx -e CC0-1.0 -e GPL-2.0-or-later")) # the CC0 parts end up in systemd-common, the GPL2 parts end up in systemd-udev`
		`depends=($(eval "printf '%s\n' \"\${${outputvar:-depends}[@]}\"\|grep -vFx -f <(_lib_deps libsystemd-shared)"))`
		`depends+=("systemd-common=$pkgver-$pkgrel" 'udev')`
		`provides=($(eval "printf '%s\n' \"\${${outputvar:-provides}[@]}\"\|grep -v -e nss-myhostname -e ^udev="))`
		`@@ -465,21 +509,6 @@`
		`# we'll create this on installation`
		`rmdir "$pkgdir"/var/log/journal/remote`

		`- # Parabola: Commented out because we do ~this in build():`
		`- #`
		`- ## # runtime libraries shipped with systemd-libs`
		`- ## install -d -m0755 systemd-libs`
		`- ## mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}.so systemd-libs`
		`- ##`
		`- ## # manpages shipped with systemd-sysvcompat`
		`- ## rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8`
		`-`
		`- # executable (symlinks) shipped with systemd-sysvcompat`
		`- rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown}`
		`-`
		`- # files shipped with systemd-resolvconf`
		`- rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}`
		`-`
		`# avoid a potential conflict with [core]/filesystem`
		`rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}`
		`sed -i -e '/^C \/etc\/nsswitch\.conf/d' \`
		`@@ -488,19 +517,11 @@`
		`# ship default policy to leave services disabled`
		`echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset`

		`- # add mkinitcpio hooks`
		`- install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd`
		`- #install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev # Parabola: moved to package_systemd-udev()`
		`- #install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev # Parabola: moved to package_systemd-udev()`
		`-`
		`# The group 'systemd-journal' is allocated dynamically and may have varying`
		`# gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles`
		`# will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)`
		`install -d -o root -g root -m 2755 "$pkgdir"/var/log/journal`

		`- # match directory owner/group and mode from [extra]/polkit`
		`- install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d`
		`-`
		`# add example bootctl configuration`
		`install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf`
		`install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf`
		`@@ -518,7 +539,11 @@`
		`package_systemd-libs() {`
		`pkgdesc='systemd client libraries'`
		`depends=('glibc' 'gcc-libs' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd')`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ 'MIT-0' # documentation`
		`+ )`
		`provides=('libsystemd' 'libsystemd.so' 'libudev.so')`
		`conflicts=('libsystemd')`
		`replaces=('libsystemd')`
		`@@ -533,41 +558,41 @@`
		`depends=("${_systemd_libs[@]}")`
		# (the "eval"/"outputvar" parts are so that `makepkg --printsrcinfo` works)
		`provides=($(eval "printf '%s\n' \"\${${outputvar:-provides}[@]}\"\|grep -v -e '\.so$'"))`
		`+ return`
		`+`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-resolvconf() {`
		`pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'`
		`- license=('LGPL2.1')`
		`depends=('systemd')`
		`provides=('openresolv' 'resolvconf')`
		`- conflicts=('openresolv')`
		`+ conflicts=('resolvconf')`

		`replaces+=('notsystemd-resolvconf') # notsystemd-resolvconf should have never existed`

		`- install -d -m0755 "$pkgdir"/usr/bin`
		`- ln -s resolvectl "$pkgdir"/usr/bin/resolvconf`
		`-`
		`- install -d -m0755 "$pkgdir"/usr/share/man/man1`
		`- ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-sysvcompat() {`
		`pkgdesc='sysvinit compat for systemd'`
		`- license=('GPL2')`
		`conflicts=('sysvinit')`
		`depends=('systemd')`

		`- license=('LGPL2.1') # Arch's license is wrong.`
		`provides=('init')`
		`conflicts+=('init')`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`+ }`

		`- install -d -m0755 "$pkgdir"/usr/bin`
		`- ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init`
		`- for tool in halt poweroff reboot shutdown; do`
		`- ln -s systemctl "$pkgdir"/usr/bin/$tool`
		`- done`
		`+ package_systemd-ukify() {`
		`+ pkgdesc='Combine kernel and initrd into a signed Unified Kernel Image'`
		`+ provides=('ukify')`
		`+ depends=('binutils' 'python-cryptography' 'python-pefile' 'systemd')`
		`+ optdepends=('python-pillow: Show the size of splash image'`
		`+ 'sbsigntools: Sign the embedded kernel')`
		`+`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`# vim:ft=sh syn=sh et sw=2:`
		`@@ -576,104 +601,126 @@`

		`package_systemd-common() {`
		`pkgdesc='systemd files shared between split packages'`
		`- license=('LGPL2.1')`
		`depends=($(_lib_deps libsystemd-shared))`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ )`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook`
		`}`

		`package_systemd-udev() {`
		`pkgdesc='Userspace device file manager'`
		`- license=('GPL2') # NB: different than the rest`
		`+ license+=('GPL-2.0-or-later')`
		`depends=("systemd-common=$pkgver-$pkgrel" 'systemd-libudev'`
		`'hwdata' 'kmod' 'libkmod.so' 'util-linux' 'zlib')`
		`- backup=(etc/udev/udev.conf)`
		`+ backup=(etc/udev/iocost.conf`
		`+ etc/udev/udev.conf)`

		`provides+=("${pkgname#systemd-}=$pkgver")`
		`conflicts+=("${pkgname#systemd-}")`
		`replaces+=("${pkgname#systemd-}")`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`-`
		`- # add mkinitcpio hooks`
		`- install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev`
		`- install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`

		`# pacman hooks`
		`install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks {udev,hwdb}.hook`
		`}`

		`+ # TODO(lukeshu): I might have been over-zealous adding the licenses`
		+ # for `siphash` and `src/basic/linux/*` to the following packages;
		`+ # audit whether those packages actually inclode that code.`
		`+`
		`package_systemd-libsystemd() {`
		`pkgdesc='systemd client library'`
		`depends=($(_lib_deps libsystemd))`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ 'MIT-0' # documentation`
		`+ )`
		`provides=('libsystemd.so')`

		`provides+=("libsystemd-standalone=$pkgver")`
		`conflicts+=('libsystemd-standalone')`
		`replaces+=('libsystemd-standalone')`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-libudev() {`
		`pkgdesc='systemd library for enumerating and introspecting local devices'`
		`depends=($(_lib_deps libudev))`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ )`
		`provides=('libudev.so')`

		`provides+=("${pkgname#systemd-}=$pkgver")`
		`conflicts+=("${pkgname#systemd-}")`
		`replaces+=("${pkgname#systemd-}")`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-nss-systemd() {`
		`pkgdesc='NSS module providing user and group resolution for dynamic users and groups'`
		`depends=($(_lib_deps libnss_systemd))`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ )`

		`provides+=("${pkgname#systemd-}=$pkgver")`
		`conflicts+=("${pkgname#systemd-}")`
		`replaces+=("${pkgname#systemd-}")`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-nss-myhostname() {`
		`pkgdesc='NSS module providing hostname resolution for the locally configured system hostname'`
		`depends=($(_lib_deps libnss_myhostname))`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ )`

		`provides+=("${pkgname#systemd-}=$pkgver")`
		`conflicts+=("${pkgname#systemd-}")`
		`replaces+=("${pkgname#systemd-}")`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-nss-mymachines() {`
		`pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances'`
		`depends=($(_lib_deps libnss_mymachines))`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ )`

		`provides+=("${pkgname#systemd-}=$pkgver")`
		`conflicts+=("${pkgname#systemd-}")`
		`replaces+=("${pkgname#systemd-}")`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

		`package_systemd-nss-resolve() {`
		`pkgdesc='NSS module providing hostname resolution via systemd-resolved'`
		`depends=($(_lib_deps libnss_resolve))`
		`- license=('LGPL2.1')`
		`+ license+=(`
		`+ 'CC0-1.0' # siphash`
		`+ 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*`
		`+ )`

		`provides+=("${pkgname#systemd-}=$pkgver")`
		`conflicts+=("${pkgname#systemd-}")`
		`replaces+=("${pkgname#systemd-}")`

		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"`
		`}`

libre/systemd/initcpio-hook-udev

file removed

-22

		`@@ -1,22 +0,0 @@`
		`- #!/usr/bin/ash`
		`-`
		`- run_earlyhook() {`
		`- kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf`
		`- systemd-tmpfiles --prefix=/dev --create --boot`
		`- /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never`
		`- udevd_running=1`
		`- }`
		`-`
		`- run_hook() {`
		`- msg ":: Triggering uevents..."`
		`- udevadm trigger --action=add --type=subsystems`
		`- udevadm trigger --action=add --type=devices`
		`- udevadm settle`
		`- }`
		`-`
		`- run_cleanuphook() {`
		`- udevadm control --exit`
		`- udevadm info --cleanup-db`
		`- }`
		`-`
		`- # vim: set ft=sh ts=4 sw=4 et:`

libre/systemd/initcpio-install-systemd

file removed

-152

		`@@ -1,152 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- add_systemd_unit() {`
		`- # Add a systemd unit file to the initcpio image. Hard dependencies on binaries`
		`- # and other unit files will be discovered and added.`
		`- # $1: path to rules file (or name of rules file)`
		`-`
		`- local unit= rule= entry= key= value= binary= dep=`
		`-`
		`- unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")`
		`- if [[ -z $unit ]]; then`
		`- # complain about not found unit file`
		`- return 1`
		`- fi`
		`-`
		`- add_file "$unit"`
		`-`
		`- while IFS='=' read -r key values; do`
		`- read -ra values <<< "$values"`
		`-`
		`- case $key in`
		`- Requires\|OnFailure)`
		`- # only add hard dependencies (not Wants)`
		`- map add_systemd_unit "${values[@]}"`
		`- ;;`
		`- Exec*)`
		`- # do not add binaries unless they are required,`
		`- # strip special executable prefixes`
		`- case ${values[0]} in`
		`- -*) ;;`
		`- !!*) add_binary "${values[0]#!!}" ;;`
		`- *) add_binary "${values[0]#[@!:+]}" ;;`
		`- esac`
		`- ;;`
		`- esac`
		`-`
		`- done <"$unit"`
		`-`
		`- # preserve reverse soft dependency`
		`- for dep in {/usr,}/lib/systemd/system/.wants/${unit##/}; do`
		`- if [[ -L $dep ]]; then`
		`- add_symlink "$dep"`
		`- fi`
		`- done`
		`-`
		`- # add hard dependencies`
		`- if [[ -d $unit.requires ]]; then`
		`- for dep in "$unit".requires/*; do`
		`- add_systemd_unit ${dep##*/}`
		`- done`
		`- fi`
		`- }`
		`-`
		`- add_systemd_drop_in() {`
		`- local unit=$1 dropin_name=$2`
		`-`
		`- mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"`
		`- cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"`
		`- }`
		`-`
		`- build() {`
		`- local rules unit`
		`-`
		`- add_binary /usr/bin/kmod /usr/bin/modprobe`
		`- add_binary /usr/bin/mount`
		`- add_binary /usr/bin/sulogin`
		`- add_binary /usr/bin/umount`
		`- add_binary /usr/lib/systemd/systemd /init`
		`-`
		`- map add_binary \`
		`- /usr/bin/journalctl \`
		`- /usr/bin/systemd-tmpfiles \`
		`- /usr/lib/systemd/systemd-hibernate-resume \`
		`- /usr/lib/systemd/systemd-shutdown \`
		`- /usr/lib/systemd/systemd-sulogin-shell \`
		`- /usr/lib/systemd/system-generators/systemd-fstab-generator \`
		`- /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \`
		`- /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator`
		`-`
		`- # udev rules and systemd units`
		`- map add_udev_rule "$rules" \`
		`- 50-udev-default.rules \`
		`- 60-persistent-storage.rules \`
		`- 64-btrfs.rules \`
		`- 80-drivers.rules \`
		`- 99-systemd.rules`
		`-`
		`- map add_systemd_unit \`
		`- initrd-cleanup.service \`
		`- initrd-fs.target \`
		`- initrd-parse-etc.service \`
		`- initrd-root-fs.target \`
		`- initrd-root-device.target \`
		`- initrd-switch-root.service \`
		`- initrd-switch-root.target \`
		`- initrd-udevadm-cleanup-db.service \`
		`- initrd.target \`
		`- kmod-static-nodes.service \`
		`- local-fs.target \`
		`- local-fs-pre.target \`
		`- paths.target \`
		`- reboot.target \`
		`- slices.target \`
		`- sockets.target \`
		`- swap.target \`
		`- systemd-fsck@.service \`
		`- systemd-hibernate-resume@.service \`
		`- systemd-journald-audit.socket \`
		`- systemd-journald-dev-log.socket \`
		`- systemd-journald.service \`
		`- systemd-modules-load.service \`
		`- systemd-pcrphase-initrd.service \`
		`- systemd-tmpfiles-setup-dev.service \`
		`- systemd-udevd-control.socket \`
		`- systemd-udevd-kernel.socket \`
		`- systemd-udevd.service \`
		`- systemd-udev-trigger.service \`
		`- timers.target \`
		`- rescue.target \`
		`- emergency.target`
		`-`
		`- add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"`
		`- add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"`
		`-`
		`- printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \`
		`- 'passwd: files' \`
		`- 'group: files' \`
		`- 'shadow: files'`
		`-`
		`- echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd"`
		`- echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"`
		`- getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video \| awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"`
		`-`
		`- add_dir "/etc/modules-load.d"`
		`- (`
		`- . "$_f_config"`
		`- set -f`
		`- printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"`
		`- )`
		`- }`
		`-`
		`- help() {`
		`- cat <<HELPEOF`
		`- This will install a basic systemd setup in your initramfs, and is meant to`
		`- replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime`
		`- components will need to be ported, and will not work as intended. You also may`
		`- wish to still include the 'base' hook (before this hook) to ensure that a`
		`- rescue shell exists on your initramfs.`
		`- HELPEOF`
		`- }`
		`-`
		`- # vim: set ft=sh ts=4 sw=4 et:`

libre/systemd/initcpio-install-udev

file removed

-33

		`@@ -1,33 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- build() {`
		`- local rules tool`
		`-`
		`- map add_binary \`
		`- '/usr/lib/systemd/systemd-udevd' \`
		`- '/usr/bin/udevadm' \`
		`- '/usr/bin/systemd-tmpfiles'`
		`-`
		`- map add_udev_rule \`
		`- '50-udev-default.rules' \`
		`- '60-persistent-storage.rules' \`
		`- '64-btrfs.rules' \`
		`- '80-drivers.rules'`
		`-`
		`- map add_file \`
		`- '/usr/lib/udev/ata_id' \`
		`- '/usr/lib/udev/scsi_id'`
		`-`
		`- add_runscript`
		`- }`
		`-`
		`- help() {`
		`- cat <<HELPEOF`
		`- This hook adds the udev daemon to the initramfs, allowing for dynamic loading`
		`- of modules and reliable detection of the root device via tags (e.g. UUID or`
		`- LABEL). Do not remove this hook unless you are using the systemd hook, or you`
		`- know what you're doing.`
		`- HELPEOF`
		`- }`
		`-`
		`- # vim: set ft=sh ts=4 sw=4 et:`

libre/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc

file modified

+8 -8

		`@@ -8,13 +8,13 @@`
		`slt7vGKlUjHBqYCUCp336BVDOY5k2c6U52bsMvfywVAAFf4cDn3S9QHDyaYkur2R`
		`aqMrA/4giC+bF/K1sn4MHacr97QxEeeGNM6KG4z4QDmLeNdAANmJOLQaQFH+84Qj`
		`r8KyRV0zd0sioh3419AsZ/o41W4cIahovJKWyDcNwKI0tP2y3KZDVtmD26RQ/BO4`
		`- aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QqTGVubmFydCBQ`
		`- b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcuZGU+iF4EExECABYECwoEAwMV`
		`- AwIDFgIBAheABQJGZKVoABIHZUdQRwABAQkQMn8mlRoBXMSoAACcCNTEt7jdZvVV`
		`- eAYZQu5caidHZvUAnArwD7mJLWddEUK2XXWOeyOY+0WmtCtMZW5uYXJ0IFBvZXR0`
		`- ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5uZXQ+iGMEExECACMCGwMGCwkIBwMC`
		`- BBUCCAMEFgIDAQIeAQIXgAUCRmSlaQIZAQAKCRAyfyaVGgFcxNX0AKDeFj3gF+Fl`
		`- CMgnw1JWu/fM5H8pYgCg7VRzOxtpEEiDSw37hv4eifyo7P60L0xlbm5hcnQgUG9l`
		`+ aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QrTGVubmFydCBQ`
		`+ b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcubmV0PohjBBMRAgAjAhsDBgsJ`
		`+ CAcDAgQVAggDBBYCAwECHgECF4AFAkZkpWkCGQEACgkQMn8mlRoBXMTV9ACg3hY9`
		`+ 4BfhZQjIJ8NSVrv3zOR/KWIAoO1UczsbaRBIg0sN+4b+Hon8qOz+tCpMZW5uYXJ0`
		`+ IFBvZXR0ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5kZT6IXgQTEQIAFgQLCgQD`
		`+ AxUDAgMWAgECF4AFAkZkpWgAEgdlR1BHAAEBCRAyfyaVGgFcxKgAAJwI1MS3uN1m`
		`+ 9VV4BhlC7lxqJ0dm9QCcCvAPuYktZ10RQrZddY57I5j7Raa0L0xlbm5hcnQgUG9l`
		`dHRlcmluZyAoTGlzYSkgPGxwb2V0dGVyaW5nQGxpc2EuZGU+iEkEMBECAAkFAk6K`
		`PXcCHSAACgkQMn8mlRoBXMSZNgCgjKt+QUMXVT1a2h25RkUyiiBPeAYAnRpV0f+q`
		`i9N55hov5qCieRGUdvVctDJMZW5uYXJ0IFBvZXR0ZXJpbmcgKFJlZCBIYXQpIDxs`
		`@@ -68,5 +68,5 @@`
		`lxylMpd1HfOt6MZYk0we0Ed7vVEPEjE08YF6sC0Qk1b7crk/t0GLOdYtABEBAAGI`
		`SQQYEQIACQUCToo80gIbDAAKCRAyfyaVGgFcxNUwAKCvb0Lisf/Rll5vPLqGGIci`
		`sDadOQCg30tdWRaNvasUMaTQL+fqE/pFzeI=`
		`- =mDgC`
		`+ =uJel`
		`-----END PGP PUBLIC KEY BLOCK-----`

libre/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc

file modified

+98 -63

		`@@ -11,32 +11,32 @@`
		`Ma7QO1FF/513xsW2QyPr/QNvuJ4GT/SyIgz+6Ln/z8wHCJQw8CM7vFRgOCuy2U3R`
		`srO926muRbl97pqRmCXbb+OJQMcYaA841FPKHq52kUTeGqkiJW4RocckcEGqhxhh`
		`zj8KjIb2wBgkYviFQWKLIpZBVxKSAjVXTl/Bzk9m2ZPETjMZKtz09xtloQARAQAB`
		`- tCRMdWNhIEJvY2Nhc3NpIDxsYm9jY2Fzc0Bicm9jYWRlLmNvbT6JAjMEMAEKAB0F`
		`- AlmjNzMWHSBwcmV2aW91cyBqb2IncyBlbWFpbAAKCRCoHOoivIx+LrsiEACrsaP6`
		`- nhe3llzk6Ey3vFrPqUZV2BeWMYSZWYqCbIdbAyc1GkuuxdRYryJm6+mD0Z6zWjQK`
		`- R/t/7rfVdM6V7SvczCxUj4WBZUwHMCDt+30aUgyqBjqy5aVXtHBqv6ubOB/gDq0O`
		`- MNarguvZBNuHOMqhl5UvnZna2l2erQirVEq5c9DwASQ9x+FhzdnxkvQxDVwv3xzj`
		`- apVFiahrUmYAF6futJSYhAve329plcuqdM04S2lsnRAu6FqwFM/BRbsU7C9IWvw9`
		`- KhIq04n1UsQYOAkPrB7Bz8xgmy58wQJ19ViKk4/+aVfWGubHK5wSbRroKMUO+s/j`
		`- qxQngmhVyavVN7z3xVBgq8FEVkrtTEkhunqdl3JbqMjQd2y2BQ3KHQjNOA5R+B2S`
		`- fmbxfDcBol3MYjLpy7j6DRCaJ5+ttmtF5VxZg+zAhOmcO0QCaCGrsLtAnk4Hs8DY`
		`- bXFao54sxCcTa1Makl9aS6/oUQiUb7m60ApLAPP2xn3fBtgaKXn+sFIs5LZehl9L`
		`- rvJE5Afz5/W9za0yl18Ppnyu2Qcd+i1XAOTHfEgpYIQ12YvR7AdvOMpeCVKLVWQU`
		`- Z2vGhfJC+lJ4CA7YYTSykzeVEhFx82xevPHgnbVNQOuMr2aD/4pUQYDYjsT3l38H`
		`- LKMPPjDTLHrG/ifIe2m2ABzvZo/jU0xKmvSqN7QnTHVjYSBCb2NjYXNzaSA8bHVj`
		`- YS5ib2NjYXNzaUBnbWFpbC5jb20+iQI6BBMBCAAkAhsDBQsJCAcDBRUKCQgLBRYC`
		`- AwEAAh4BAheABQJUyrTCAhkBAAoJEKgc6iK8jH4u0v4P/j4khogtZxsjKZKGvtw6`
		`- GVYq7v8CoAetP7L/Sz307dO7pMPtuTktQxQvlMFm3JVtRCHQo+NVgf5BnIMYgLCf`
		`- 2yduR+0gAK/APwuC1S/7k9sBDUOh/Vm02NuXlL5V4qgPkS/TW3lC6xF9OHKIfMVJ`
		`- k694+Iu5HJF7WLGfV/NeX83G5bZ3t4nLE1GbJno3rdJUOcG84XBs1InhrBdlrZLb`
		`- d52zB81x8R5hVWsSYR8GyLhTdliuMdZX5K8ehrre8R/KijKdGh9eDA9kt45yxrp/`
		`- ZDeNMjtZoJWfEvsrQaXFbel34w4TwcoWP/wycrb3KRCC986O8G0ohCZmg8cHX4VP`
		`- pgjGvR+QsgrYUcZnRrOHRPuxYSHRY9B6J4YV0M6rTP0l/p+JbAh562nB14SgDPNd`
		`- BmQd9E2nDORfHtGV8hNSqSjdSJaX/DlLu3jHYcXIUdVvmiyoX42ELEZqpkYaSR6A`
		`- T/1FFy8XM3yltQc0zGfBX8pBbxXUNn0/sqv5r8pX52YSz/u8CPS/IXMIltzyp5yo`
		`- 5ZU4uNj23M4GMRZrXO+3o9XFkYkjeL6W90tym8hbIAjrwaLuQ6xO67wDyJcPER/M`
		`- nyQaUGd+WrXiyKjdUo/qdUg/BsXkLC26uREzS8+QpIiWIEK9LYy+cLdL7QCQqOEp`
		`- GX0icGHSYLHVxHKUnxmW0eP2tCBMdWNhIEJvY2Nhc3NpIDxibHVjYUBkZWJpYW4u`
		`+ tCdMdWNhIEJvY2Nhc3NpIDxsdWNhLmJvY2Nhc3NpQGdtYWlsLmNvbT6JAjoEEwEI`
		`+ ACQCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlTKtMICGQEACgkQqBzqIryM`
		`+ fi7S/g/+PiSGiC1nGyMpkoa+3DoZViru/wKgB60/sv9LPfTt07ukw+25OS1DFC+U`
		`+ wWbclW1EIdCj41WB/kGcgxiAsJ/bJ25H7SAAr8A/C4LVL/uT2wENQ6H9WbTY25eU`
		`+ vlXiqA+RL9NbeULrEX04coh8xUmTr3j4i7kckXtYsZ9X815fzcbltne3icsTUZsm`
		`+ ejet0lQ5wbzhcGzUieGsF2Wtktt3nbMHzXHxHmFVaxJhHwbIuFN2WK4x1lfkrx6G`
		`+ ut7xH8qKMp0aH14MD2S3jnLGun9kN40yO1mglZ8S+ytBpcVt6XfjDhPByhY//DJy`
		`+ tvcpEIL3zo7wbSiEJmaDxwdfhU+mCMa9H5CyCthRxmdGs4dE+7FhIdFj0HonhhXQ`
		`+ zqtM/SX+n4lsCHnracHXhKAM810GZB30TacM5F8e0ZXyE1KpKN1Ilpf8OUu7eMdh`
		`+ xchR1W+aLKhfjYQsRmqmRhpJHoBP/UUXLxczfKW1BzTMZ8FfykFvFdQ2fT+yq/mv`
		`+ ylfnZhLP+7wI9L8hcwiW3PKnnKjllTi42PbczgYxFmtc77ej1cWRiSN4vpb3S3Kb`
		`+ yFsgCOvBou5DrE7rvAPIlw8RH8yfJBpQZ35ateLIqN1Sj+p1SD8GxeQsLbq5ETNL`
		`+ z5CkiJYgQr0tjL5wt0vtAJCo4SkZfSJwYdJgsdXEcpSfGZbR4/a0JEx1Y2EgQm9j`
		`+ Y2Fzc2kgPGxib2NjYXNzQGJyb2NhZGUuY29tPokCMwQwAQoAHQUCWaM3MxYdIHBy`
		`+ ZXZpb3VzIGpvYidzIGVtYWlsAAoJEKgc6iK8jH4uuyIQAKuxo/qeF7eWXOToTLe8`
		`+ Ws+pRlXYF5YxhJlZioJsh1sDJzUaS67F1FivImbr6YPRnrNaNApH+3/ut9V0zpXt`
		`+ K9zMLFSPhYFlTAcwIO37fRpSDKoGOrLlpVe0cGq/q5s4H+AOrQ4w1quC69kE24c4`
		`+ yqGXlS+dmdraXZ6tCKtUSrlz0PABJD3H4WHN2fGS9DENXC/fHONqlUWJqGtSZgAX`
		`+ p+60lJiEC97fb2mVy6p0zThLaWydEC7oWrAUz8FFuxTsL0ha/D0qEirTifVSxBg4`
		`+ CQ+sHsHPzGCbLnzBAnX1WIqTj/5pV9Ya5scrnBJtGugoxQ76z+OrFCeCaFXJq9U3`
		`+ vPfFUGCrwURWSu1MSSG6ep2XcluoyNB3bLYFDcodCM04DlH4HZJ+ZvF8NwGiXcxi`
		`+ MunLuPoNEJonn622a0XlXFmD7MCE6Zw7RAJoIauwu0CeTgezwNhtcVqjnizEJxNr`
		`+ UxqSX1pLr+hRCJRvubrQCksA8/bGfd8G2Bopef6wUizktl6GX0uu8kTkB/Pn9b3N`
		`+ rTKXXw+mfK7ZBx36LVcA5Md8SClghDXZi9HsB284yl4JUotVZBRna8aF8kL6UngI`
		`+ DthhNLKTN5USEXHzbF688eCdtU1A64yvZoP/ilRBgNiOxPeXfwcsow8+MNMsesb+`
		`+ J8h7abYAHO9mj+NTTEqa9Ko3tCBMdWNhIEJvY2Nhc3NpIDxibHVjYUBkZWJpYW4u`
		`b3JnPokCNwQTAQoAIQUCWab4pwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAK`
		`CRCoHOoivIx+Lmx3D/0f5NxiLYPDpxPOJDnEGUNqLiHlnyHwlHidV1xROfh8F6Wk`
		`DrEAO5YfkASJjqBYJY93ZiZU/ROUdpcct9sN0K1Vw4yTAHFYpYO2G9oc3ax+3ly0`
		`@@ -166,41 +166,76 @@`
		`7CUkKJUiAOOd35RVF97Fa3Wos00ExCGKOhQbaiIhw7M6csjukIl1WWYOk+DVxcwq`
		`wWj5kWulF0whKe8O7gQR+L/2yFnJmNhjUHf+7j3v4zpiiY7ez222AR7kTKozGBT4`
		`RayGNmulYD8nkPiDcdXh8Lh0WvI52qBPEi9uWIlbk7QuLQ+t8VPNgXOrPFcMTuWp`
		`- glhgv4r7uQENBFieLj4BCADUpbwnWqJsjL6la8HdROHY/LePMvWiCJAK1tZX6Had`
		`- W07FxCMlQPOhX6jjYI85BmYM1AZpEDRLqdkAUf6+lSY9VywXy6G8DsQTSiO+Fn6D`
		`- WEJ9yYelLIQW0xMJcWd55D9+tDlJFFfiE2OLjrSoxPRGjhB7iajsdNlD6JTjuJq6`
		`- 0zAcxF7J2o6KeeswHVYooz460MLuVq3BeyNxH/d9B/y5n3ibSVgJc8PYkDRN2Y+I`
		`- LuAXd/ia0GTphTM5j9R+mCJDuRRVZAgNfa9AJMPJ0QbIFnRdnwRTEGt6LYA/AIoB`
		`- gwjiveTfr8N2LArDARNP6rV+Ugf3rW2bZPEoCv82bsx3ABEBAAGJAjwEGAEKACYC`
		`- GwwWIQSp6pCBck/64EhMNaGoHOoivIx+LgUCYdhwmAUJEqBD2QAKCRCoHOoivIx+`
		`- Ls0QD/9Sp9ixzu1w8PNEPfEKYqGdNf0GkfMy8WCukJVOQZPqSDyS+ysmy/TXbRMc`
		`- HRRh/Oqe93MS01CticR39MPQq8glYcqdLnyhHRHGEd2gHnOL4wUf6LidxJpmuF0n`
		`- LSeD73EmlvTmJ3hgagx51DdRq4q/mZjy5Z39G81UfkA0e3KjkoLQetJmTMflqcMT`
		`- lED/Itp6SbAbg4tHhNmGyGIJk8CsrHgt7kYFTrEz71S9/9aPAPr7EUiWOzlVaXQ5`
		`- Mwk8AAf96dfdJgH33kyYeQ7TjdK94ihWPiMuRhEJja7wtJA4jZ7tHZRALa/n0PHv`
		`- pPxdUUb8HKK9E9og9rR+bo5vikiLR0SkI4+PO0OZiP+HkX8tTO1EtIwaBux5i/U1`
		`- l/cGlrkS+A/ZxWLkmohwf6jzRyt8q4RxLTODfO4zaic8orL3QYOIJKbjhy0vWS5U`
		`- sDMZrxGeYDqjcEkPvf0zxhf+1wYIQc5OjLHYVVu+e5rDUHtsF9NRdZbOzNqKR4PI`
		`- bEbbfDu9OGOCHL3q5D+g2tIk44CM+ntyyZJEq9Edhvb11d3+TMIJevi4z8NVxLaj`
		`- YQcZK324YNKzhVVSYeF2fMSM3qhCbS8eN5Iok9v8nzqkYdGVXOQ6ks185kI+rYNn`
		`- qCDri9kFpwtK0vwGsz744uiBEOYjHBuxw8MXqRGtwu8XiDpmIbkBDQRYni5MAQgA`
		`- nBzmeIfxaXebmSJjwbH1ScEHIATXoDs1FtVumWTmfGS851lqoMBoemWPZleBoMTO`
		`- za5cnv6EzPIGYRYLSd+GTDOAzNdnuHxULm8gUqEdoQ8+GwcTXCSjOsvuZJvIWjJ3`
		`- Siz3JRnTsM8hrYoztZZhDQqsmqmCyrmw5IsxInDfTd6XrdJ834TOS87pJTwFzrt3`
		`- B4UuhMMGX8IWjPsGZ0ZRBbUMhAxt07+JV2lW9o7AA0H733NHjhZ4/mjn62WpDVFz`
		`- HIkvdVaNbb5hGXrJHbRIqQUj4tX32uYEkpd0Uy7KEtqh/HI+tW1nL47Ba6EEY+3I`
		`- vFO+XJiy5Zhoe0kuNiLebwARAQABiQI8BBgBCgAmAhsgFiEEqeqQgXJP+uBITDWh`
		`- qBzqIryMfi4FAmHYcJgFCRKgQ8sACgkQqBzqIryMfi4asg/+Ovrrh8qk0+deeE8I`
		`- mtz8yIM8eYKBE7OuRsSTAVjscfHGS9XtW5OF+vnJfPQoNo7YUABaFgLhZ7BNHsh+`
		`- nrm9QSiw85DRYM0quqWbzpzY3tH/KUaVZUoc1stAJwLcPEkhfPh87LVSkx7MWrZ1`
		`- lVfYadDQwZUoeCjvnHlNVaUVGcWdDgM4Og9L0T4b4hkUCZssB+w6pyz4exWH35QC`
		`- 7eNlp2TSK4yxnmttITUFOUD+pB+mbMmJt6oCxOCjrv5lgziOUTWuxdWRNjPhZTYI`
		`- iTg6E7ph0V0wVyWjdKDwHIbvQLddYX7jcABn62l2dOmxh3Y0hSBB+ZY1dNdh5kOb`
		`- IicVd++QB1vzcvZWSPvoH/tCg575Pao1NN+gif8BeiHFPyKiKWC6dg/dc/y5jw7F`
		`- WIoGuhNIh1MRHaD/IC1zlRzp/DoK5+BS7Wg22Ligjc6ZD6ID2bIr335xp5J8mhPV`
		`- 6KvvxbTjBfuMcpeQrMimhEXaFnDcbdc3F/CZC28/rj2PRkaT19gJMarwfR2nOOKb`
		`- cc6Gyu89Z6hX3C+XoY1g+yTQIUIhkJ7/Ftk9u080Y3NZL9N78S3GPY3LK26jIYrO`
		`- l2PknJYEIPmEar4Bl2916bQzDLBq3NFLnMYnew8F8LSev1y4qIZ3/acvTq4xrewa`
		`- 7Szf8D81gDVfUGaNHpI+gyi18iY=`
		`- =0qtE`
		`+ glhgv4r7iQI2BCgBCgAgFiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAmMPwxECHQEA`
		`+ CgkQqBzqIryMfi5mMw//WFnEIjSh5zhrWFBPD8572A03Ot6VjuKbHRUXUGvkU8i7`
		`+ cVXwJC7P/nCNUYcvvLLzxxlx6cMdWs9EohtM+Syfx5l1JjL4kz8DN1dF1/p0+5IZ`
		`+ ZN1Mqp4X4mRa4k8QDve/TkuGvSWyj4bDQ48X8jyKeyFNYJI6AQ9zv1FV4qBOtwvx`
		`+ WEEDoXXfa8RUw2UzQ8NfA+W5LLhwLGrFwBkJNXU6MDytOI30lIJjq1rlkuTKLU4T`
		`+ UGmuiXepbglyHSpK1nOZ4TAHIngXvrwyQfUOjrQyux8Dk8RWFF/yhSU4RSYpPmTF`
		`+ Jv40xMYk6tt21OkGAKU+S83oVRM133FJxI92Bm/JCM3vpeR9sJPO62Y0lv+XL8wU`
		`+ A1YeN+5XDxDNVZdRa0O8RMjLNRPvV7qSFWNqP0b4wrbBlXeslcI2m0i1plCMFZSv`
		`+ AuIy3R/mTFhsE8TVpW0uCueV+o6MQ2MpTnTSSSMuo+aeXeUkp1cbh6qCDdjlLz0L`
		`+ 3eexkJfuC2Ti3Ytq1E5Go8nKNpPRF/wOToj3s9g07LnNMw5plZLxEVfUtZE1CThY`
		`+ L8iZkSInfZdomyxHtmDrZFlhD4IWlRAqiSU8HU0rwJ1s/czZy3etjwpX6fVSDr8r`
		`+ lhNbjZqKzdNNaofy6j4s3E9Nls4e0fIcvmbZAu01XO3rkdlJM7MsASWbq7XWNrC5`
		`+ AQ0EWJ4uPgEIANSlvCdaomyMvqVrwd1E4dj8t48y9aIIkArW1lfodp1bTsXEIyVA`
		`+ 86FfqONgjzkGZgzUBmkQNEup2QBR/r6VJj1XLBfLobwOxBNKI74WfoNYQn3Jh6Us`
		`+ hBbTEwlxZ3nkP360OUkUV+ITY4uOtKjE9EaOEHuJqOx02UPolOO4mrrTMBzEXsna`
		`+ jop56zAdViijPjrQwu5WrcF7I3Ef930H/LmfeJtJWAlzw9iQNE3Zj4gu4Bd3+JrQ`
		`+ ZOmFMzmP1H6YIkO5FFVkCA19r0Akw8nRBsgWdF2fBFMQa3otgD8AigGDCOK95N+v`
		`+ w3YsCsMBE0/qtX5SB/etbZtk8SgK/zZuzHcAEQEAAYkCPAQYAQoAJgIbDBYhBKnq`
		`+ kIFyT/rgSEw1oagc6iK8jH4uBQJh2HCYBQkSoEPZAAoJEKgc6iK8jH4uzRAP/1Kn`
		`+ 2LHO7XDw80Q98QpioZ01/QaR8zLxYK6QlU5Bk+pIPJL7KybL9NdtExwdFGH86p73`
		`+ cxLTUK2JxHf0w9CryCVhyp0ufKEdEcYR3aAec4vjBR/ouJ3Emma4XSctJ4PvcSaW`
		`+ 9OYneGBqDHnUN1Grir+ZmPLlnf0bzVR+QDR7cqOSgtB60mZMx+WpwxOUQP8i2npJ`
		`+ sBuDi0eE2YbIYgmTwKyseC3uRgVOsTPvVL3/1o8A+vsRSJY7OVVpdDkzCTwAB/3p`
		`+ 190mAffeTJh5DtON0r3iKFY+Iy5GEQmNrvC0kDiNnu0dlEAtr+fQ8e+k/F1RRvwc`
		`+ or0T2iD2tH5ujm+KSItHRKQjj487Q5mI/4eRfy1M7US0jBoG7HmL9TWX9waWuRL4`
		`+ D9nFYuSaiHB/qPNHK3yrhHEtM4N87jNqJzyisvdBg4gkpuOHLS9ZLlSwMxmvEZ5g`
		`+ OqNwSQ+9/TPGF/7XBghBzk6MsdhVW757msNQe2wX01F1ls7M2opHg8hsRtt8O704`
		`+ Y4IcverkP6Da0iTjgIz6e3LJkkSr0R2G9vXV3f5Mwgl6+LjPw1XEtqNhBxkrfbhg`
		`+ 0rOFVVJh4XZ8xIzeqEJtLx43kiiT2/yfOqRh0ZVc5DqSzXzmQj6tg2eoIOuL2QWn`
		`+ C0rS/AazPvji6IEQ5iMcG7HDwxepEa3C7xeIOmYhiQI2BCgBCgAgFiEEqeqQgXJP`
		`+ +uBITDWhqBzqIryMfi4FAmMPwxICHQEACgkQqBzqIryMfi746g//VMoDIppDTbkQ`
		`+ RbF8N36QDHXfrWub19xJGDo9D5GMbCRisVg8HuaP5Gatat8dewl4d3dCEXz1OuHg`
		`+ wuyvpZnEA58K2JTfanWgT4NcuTuudAW5lcLX34ucBy8bMz13dYxwt4BIdUiNzWro`
		`+ 12I91wDN5e79pSo7T1RqsihD5mTCnhAKSCUzPN7Dge0xk+nPG5rT1L60BjYxfTUr`
		`+ XkAon8snSn6X4pHkdxh1FrDTtj6M9A9JuusMnpgqryrrg+IYuLAIoCoJ/qJQYyix`
		`+ nXSIoaIGv7Kyk7mVnP6JRiXi8ZZ0KHYtxdwOrJHjCL14OrliYyCvSH3a1dFwRKiE`
		`+ A1fB+FhVQ4ZqSDq0YVkZVdz8cB8EAdq6VjHfYBFbJZMBFnORfTVLGxZ9bedb7VKm`
		`+ kl70CPtZInhA2l9w1mJiHUAOe1hEW+CsKc+r9sZlKrFTYIFXLGGpP4Q8BAG6kjNQ`
		`+ hI4gbj532oqpxA7mkErcLUw+3cdI+rQbsExFVe/TgU/ENMYwYdKFRI54mg76pIFR`
		`+ 5Yg11rgFlU6mI+59sMGUVZDzNyk0QIHyYwLtLQ7TX1r4ke1o1xgXTuoyqSmYRKcn`
		`+ vWQhw4iA1XKEjl4k9AJeipA7E90nflu4cGEYtfVJ2mMQ/ER8IvmN/e2z7ElgChou`
		`+ 4MPPH7suC77kTv+LygQe2TBGLao77sS5AQ0EWJ4uTAEIAJwc5niH8Wl3m5kiY8Gx`
		`+ 9UnBByAE16A7NRbVbplk5nxkvOdZaqDAaHplj2ZXgaDEzs2uXJ7+hMzyBmEWC0nf`
		`+ hkwzgMzXZ7h8VC5vIFKhHaEPPhsHE1wkozrL7mSbyFoyd0os9yUZ07DPIa2KM7WW`
		`+ YQ0KrJqpgsq5sOSLMSJw303el63SfN+EzkvO6SU8Bc67dweFLoTDBl/CFoz7BmdG`
		`+ UQW1DIQMbdO/iVdpVvaOwANB+99zR44WeP5o5+tlqQ1RcxyJL3VWjW2+YRl6yR20`
		`+ SKkFI+LV99rmBJKXdFMuyhLaofxyPrVtZy+OwWuhBGPtyLxTvlyYsuWYaHtJLjYi`
		`+ 3m8AEQEAAYkCPAQYAQoAJgIbIBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJh2HCY`
		`+ BQkSoEPLAAoJEKgc6iK8jH4uGrIP/jr664fKpNPnXnhPCJrc/MiDPHmCgROzrkbE`
		`+ kwFY7HHxxkvV7VuThfr5yXz0KDaO2FAAWhYC4WewTR7Ifp65vUEosPOQ0WDNKrql`
		`+ m86c2N7R/ylGlWVKHNbLQCcC3DxJIXz4fOy1UpMezFq2dZVX2GnQ0MGVKHgo75x5`
		`+ TVWlFRnFnQ4DODoPS9E+G+IZFAmbLAfsOqcs+HsVh9+UAu3jZadk0iuMsZ5rbSE1`
		`+ BTlA/qQfpmzJibeqAsTgo67+ZYM4jlE1rsXVkTYz4WU2CIk4OhO6YdFdMFclo3Sg`
		`+ 8ByG70C3XWF+43AAZ+tpdnTpsYd2NIUgQfmWNXTXYeZDmyInFXfvkAdb83L2Vkj7`
		`+ 6B/7QoOe+T2qNTTfoIn/AXohxT8ioilgunYP3XP8uY8OxViKBroTSIdTER2g/yAt`
		`+ c5Uc6fw6CufgUu1oNti4oI3OmQ+iA9myK99+caeSfJoT1eir78W04wX7jHKXkKzI`
		`+ poRF2hZw3G3XNxfwmQtvP649j0ZGk9fYCTGq8H0dpzjim3HOhsrvPWeoV9wvl6GN`
		`+ YPsk0CFCIZCe/xbZPbtPNGNzWS/Te/Etxj2NyytuoyGKzpdj5JyWBCD5hGq+AZdv`
		`+ dem0MwywatzRS5zGJ3sPBfC0nr9cuKiGd/2nL06uMa3sGu0s3/A/NYA1X1BmjR6S`
		`+ PoMotfImiQI2BCgBCgAgFiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAmMPwxICHQEA`
		`+ CgkQqBzqIryMfi4iKg//aE5wAUZkRgh4IuGtOc3q6vL4uLMGc53DYIy5Q/yHhKOT`
		`+ OJ9z4nhR/jaqasn0EeDOHDtc+cEPGnWSbNOF68bo9QopLpdtWNAxV9mNgngyqeFu`
		`+ lLmW/S0Zf8QfJYfnN489SJOlg8Od34HDAV8NrHi3X2VqjHK7U66mciuoX2SVQ2sJ`
		`+ QFhADJgUGlscbxwgOt+KQjSOH14ozp9HDdo436vN66sZpUHCwH+Cp2VojuZJ3mCN`
		`+ hqBy3mz/UafAOeo+bpVvYUUPML+nmeVisbVpCR/xxF9cFpj4MEdtOWzw8K5QY3Mg`
		`+ Vkmy6ABobLNYl6oMJOFqxla9XtuTfJy5Isg0rfhVyEM6Yml2y5YAm8eHHETQ3NdB`
		`+ AhSVYHD12Wx/6WM/xK/ZWMzAOExBB/31yRQjWXuHgulpC+hP1+SGbC5bU3p8wrNG`
		`+ EYg7fYzIgMj7JQU5MR3+LZ1A0I2YuTCFhKbQnHN5qZlZ9mG0fTGpHNgwMEA0CDrT`
		`+ Fo4vvaeUz76JkFQDMBLP5tkgH24/6hsBULhZSuC9wGCa6nBi8OwwWwdMiHU3PnMg`
		`+ W0ePKaKUB0Pjs5caJm5zY1wnWz/uRp9WZRyH8jBjoXpzcx7QA35+O345uBk/LEGp`
		`+ j9htU27IOllKJQujQjFUwwuStWNfTGRzA4ixtODAv8ZUwdPdgmAb4zxY+MrRk1Q=`
		`+ =Zx2v`
		`-----END PGP PUBLIC KEY BLOCK-----`

libre/systemd/srcinfo-libnss_systemd.txt

file modified

+2

		`@@ -1,4 +1,6 @@`
		`libcap.so`
		`libm.so`
		`+ libcrypt.so`
		`+ libcrypto.so`
		`libgcc_s.so`
		`libc.so`

libre/systemd/srcinfo-libsystemd-shared.txt

file modified

-1

		`@@ -3,7 +3,6 @@`
		`libcap.so`
		`libcrypt.so`
		`libgcrypt.so`
		`- libip4tc.so`
		`libkmod.so`
		`liblz4.so`
		`libmount.so`

libre/systemd/srcinfo-libsystemd.txt

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`libcap.so`
		`libgcrypt.so`
		`+ liblz4.so`
		`liblzma.so`
		`libzstd.so`
		`- liblz4.so`
		`libgcc_s.so`
		`libc.so`

libre/systemd/systemd-hook

file modified

+48 -13

		`@@ -17,7 +17,7 @@`

		`udevd_live() {`
		`is_chrooted`
		`- if [ ! -d /run/udev ]; then`
		`+ if [ ! -S /run/udev/control ]; then`
		`echo >&2 " Skipped: Device manager is not running."`
		`exit 0`
		`fi`
		`@@ -26,21 +26,56 @@`
		`op="$1"; shift`

		`case "$op" in`
		`- catalog) /usr/bin/journalctl --update-catalog ;;`
		`- hwdb) /usr/bin/systemd-hwdb --usr update ;;`
		`- update) touch -c /usr ;;`
		`- sysusers) /usr/bin/systemd-sysusers ;;`
		`- tmpfiles) /usr/bin/systemd-tmpfiles --create ;;`
		`-`
		`- daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;`
		`- udev-reload) udevd_live; /usr/bin/udevadm control --reload; /usr/bin/udevadm trigger ;;`
		`- binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;`
		`- sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;`
		`+ binfmt)`
		`+ systemd_live`
		`+ /usr/lib/systemd/systemd-binfmt`
		`+ ;;`
		`+ catalog)`
		`+ /usr/bin/journalctl --update-catalog`
		`+ ;;`
		`+ daemon-reload-system)`
		`+ systemd_live`
		`+ /usr/bin/systemctl --system daemon-reload`
		`+ ;;`
		`+ daemon-reload-user)`
		`+ systemd_live`
		`+ /usr/bin/systemctl kill --kill-whom='main' --signal='SIGHUP' 'user@*.service'`
		`+ ;;`
		`+ hwdb)`
		`+ /usr/bin/systemd-hwdb --usr update`
		`+ ;;`
		`+ sysctl)`
		`+ systemd_live`
		`+ /usr/lib/systemd/systemd-sysctl`
		`+ ;;`
		`+ sysusers)`
		`+ /usr/bin/systemd-sysusers`
		`+ ;;`
		`+ tmpfiles)`
		`+ /usr/bin/systemd-tmpfiles --create`
		`+ ;;`
		`+ update)`
		`+ touch -c /usr`
		`+ ;;`
		`+ udev-reload)`
		`+ udevd_live`
		`+ /usr/bin/udevadm control --reload`
		`+ if [ ! -e /etc/systemd/do-not-udevadm-trigger-on-update ]; then`
		`+ /usr/bin/udevadm trigger -c change`
		`+ /usr/bin/udevadm settle`
		`+ fi`
		`+ ;;`

		`# For use by other packages`
		`- reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;;`
		`+ reload)`
		`+ systemd_live`
		`+ /usr/bin/systemctl try-reload-or-restart "$@"`
		`+ ;;`

		`- *) echo >&2 " Invalid operation '$op'"; exit 1 ;;`
		`+ *)`
		`+ echo >&2 " Invalid operation '$op'"`
		`+ exit 1`
		`+ ;;`
		`esac`

		`exit 0`

libre/systemd/systemd.install

file modified

+3 -11

		`@@ -15,15 +15,6 @@`
		`journalctl --update-catalog`
		`}`

		`- _242_0_2_changes() {`
		`- if [[ -L var/lib/systemd/timesync ]]; then`
		`- rm var/lib/systemd/timesync`
		`- if [[ -d var/lib/private/systemd/timesync ]]; then`
		`- mv var/lib/{private/,}systemd/timesync`
		`- fi`
		`- fi`
		`- }`
		`-`
		`post_install() {`
		`systemd-machine-id-setup`

		`@@ -34,7 +25,8 @@`
		`# enable some services by default, but don't track them`
		`systemctl enable \`
		`getty@tty1.service \`
		`- remote-fs.target`
		`+ remote-fs.target \`
		`+ systemd-userdbd.socket`

		`# group 'systemd-journal-remote' is created by systemd-sysusers`
		`mkdir -m2755 var/log/journal/remote`
		`@@ -46,10 +38,10 @@`

		`if sd_booted; then`
		`systemctl --system daemon-reexec`
		`+ systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'`
		`fi`

		`local v upgrades=(`
		`- 242.0-2`
		`)`

		`for v in "${upgrades[@]}"; do`

libre/your-freedom/PKGBUILD

file modified

+3 -3

		`@@ -11,8 +11,8 @@`


		`pkgname=your-freedom`
		`- pkgver=20240217`
		`- _srcver=f846569f8ca77199279e40e623695114c857331a`
		`+ pkgver=20240301`
		`+ _srcver=3461938017162601983c31d52728db57336961b6`
		`pkgrel=1`
		`pkgdesc="This meta-package conflicts with every known non-free Arch package"`
		`arch=(any)`
		`@@ -25,7 +25,7 @@`
		`_srcname=${pkgname}-blacklist-${_srcver}.txt`
		`source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver})`

		`- sha256sums=('16094bf0a4ccb6ee7f4b6f6bd2985147a2d162a683a2fe329015acc0d4e77e64')`
		`+ sha256sums=('6f6cd49a6ff1eccdf16c80d73a3887ce74808078ec75a3f7ba05e222032cbd07')`


		`package()`

nonprism/midori/PKGBUILD ~~libre/midori/PKGBUILD~~

file renamed

+18 -8

		`@@ -6,26 +6,38 @@`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`+`
		`+ # parabola changes and rationale:`
		`+ # - remove -privacy search engines`
		`+ # - add sodep on 'libjxl'`
		`+ # - use versioned source-ball rather than VCS`
		`+`
		`+`
		`pkgname=midori`
		`pkgver=9.0`
		`- pkgrel=1`
		`+ pkgrel=6`
		`pkgrel+=.parabola1`
		`pkgdesc='Lightweight web browser'`
		`pkgdesc+=', without non-privacy search engines'`
		`arch=(x86_64)`
		`arch+=(i686 armv7h)`
		`- url='https://midori-browser.org/'`
		`+ url=https://astian.org/midori-browser/`
		`license=(LGPL)`
		`depends=(aria2 gcr libarchive libpeas libxss webkit2gtk zeitgeist)`
		`- makedepends=(bzr cmake git gobject-introspection intltool ninja vala)`
		`+ depends+=(libjxl.so)`
		`+ makedepends=(cmake git gobject-introspection intltool ninja vala)`
		`+ makedepends=( ${makedepends[*]/git/} )`
		`optdepends=('gst-plugins-base: HTML5 OGG videos support'`
		`'gst-plugins-good: HTML5 H264 and WebM videos support'`
		`'gst-libav: HTML5 H264 videos support')`
		`options=(!emptydirs)`
		`- source=("$pkgname::git+https://github.com/midori-browser/core.git#tag=v$pkgver")`
		`- md5sums=('SKIP')`
		`+ source=(${pkgname}-${pkgver}.tar.gz::https://github.com/midori-browser/core/archive/refs/tags/v${pkgver}.tar.gz)`
		`+ sha256sums=('913a7cba95ddcc3dc5f6b12d861e765d6fa990fe7d4efc3768d3a3567ea460db')`

		`prepare() {`
		`+ # symlink VCS dir to source-ball dir - minimize diff`
		`+ ln -s core-${pkgver} ${pkgname}`
		`+`
		`cd $pkgname`

		`# Remove non-privacy search engines`
		`@@ -42,7 +54,7 @@`
		`build() {`
		`mkdir -p build`
		`cd build`
		`- cmake "$srcdir/$pkgname" \`
		`+ cmake ../$pkgname \`
		`-DCMAKE_INSTALL_PREFIX=/usr \`
		`-DCMAKE_INSTALL_LIBDIR=lib \`
		`-DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \`
		`@@ -55,5 +67,3 @@`
		`DESTDIR="$pkgdir" ninja -C build install`
		`}`

		`- # getver: -u 8 raw.githubusercontent.com/midori-browser/core/master/CMakeLists.txt`
		`- # vim:set ts=2 sw=2 et:`

nonprism/webkit2gtk/PKGBUILD

file modified

+8 -4

		`@@ -24,8 +24,8 @@`
		`webkit2gtk`
		`webkit2gtk-docs`
		`)`
		`- pkgver=2.42.4`
		`- pkgrel=1`
		`+ pkgver=2.42.5`
		`+ pkgrel=2`
		`pkgrel+=.nonprism1`
		`pkgdesc="Web content engine for GTK"`
		`pkgdesc+=", without geoclue2 support"`
		`@@ -104,12 +104,12 @@`
		`GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch`
		`)`
		`source_i686=(webkitgtk-2.36.3-no-sse2.arch32.patch)`
		`- sha256sums=('52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86'`
		`+ sha256sums=('b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749'`
		`'SKIP'`
		`'a921d6be1303e9f23474971f381886fd291ec5bb1a7ff1e85acede8cfb88bef2'`
		`'655f3b2c96355ac83c4fa1fc6048e3256bbfdbfb9727e1e18c5af12613536206')`
		`sha256sums_i686=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac')`
		`- b2sums=('3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401'`
		`+ b2sums=('4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516'`
		`'SKIP'`
		`'d440d82c769f1b35caf5464dc850cdf1c896224205c90c17d8b0a44aee62e4b1383e11306936aaca067fde8836770d346d5122d7b05c91a5c7c1741c89c65e2f'`
		`'daa782d4d40cc12a05c02b2494e879333f66f32820f1a1b89b7ab68f62fd53043b116ecb5ef476004095a7c7b924b12695b7e87e21dd547f66e72fa02a972f0d')`
		`@@ -166,6 +166,10 @@`
		`export CC=clang CXX=clang++`
		`LDFLAGS+=" -fuse-ld=lld"`

		`+ # JITted code crashes when CET is used`
		`+ CFLAGS+=' -fcf-protection=none'`
		`+ CXXFLAGS+=' -fcf-protection=none'`
		`+`
		`# Produce minimal debug info: 4.3 GB of debug data makes the`
		`# build too slow and is too much to package for debuginfod`
		`CFLAGS+=' -g1'`

nonsystemd/mkinitcpio/PKGBUILD

file modified

+29 -15

		`@@ -1,21 +1,37 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`- # Maintainer (Arch): Morten Linderud <foxboron@archlinux.org>`
		`- # Contributor (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Contributor (Arch): Thomas Bächler <thomas@archlinux.org>`
		`+ # Maintainer (artix): Artoo <artoo@artixlinux.org>`
		`+ # Maintainer (arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`+ # Maintainer (arch): Morten Linderud <foxboron@archlinux.org>`
		`+ # Contributor: Dave Reisner <dreisner@archlinux.org>`
		`+ # Contributor: Thomas Bächler <thomas@archlinux.org>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - replace 'systemd' dep with 'udev'`
		`+`
		`+`
		`+ # NOTE: diff this against the artix PKGBUILD primarily`
		`+`

		`pkgname=mkinitcpio`
		`- pkgver=36`
		`- pkgrel=1`
		`+ pkgver=38`
		`+ pkgrel=3`
		`pkgrel+=.nonsystemd1`
		`pkgdesc="Modular initramfs image creation utility"`
		`arch=('any')`
		`url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'`
		`- license=('GPL')`
		`+ # license=('GPL-2.0-or-later')`
		`+ license=('GPL2')`
		`depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'`
		`'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'udev')`
		`makedepends=('asciidoc')`
		`- checkdepends=('bash-bats' 'bash-bats-assert' 'lzop')`
		`+ checkdepends=('bats' 'bats-assert' 'lzop')`
		`+ conflicts=(`
		`+ 'udev<255.4-2'`
		`+ 'cryptsetup<2.7.0-3'`
		`+ 'mdadm<4.3-2'`
		`+ 'lvm2<2.03.23-3'`
		`+ )`
		`optdepends=('gzip: Use gzip compression for the initramfs image'`
		`'xz: Use lzma or xz compression for the initramfs image'`
		`'bzip2: Use bzip2 compression for the initramfs image'`
		`@@ -27,18 +43,17 @@`
		`source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}`
		`nosystemd.patch)`
		`install=mkinitcpio.install`
		`- sha512sums=('f13cfdfee62dc1a344b75413fde8f35eb594c4c372d4a2ed8bbc22f2c01d93ea59d423807d06d19a6d1789e47b35286845daffeffef0fec4bae022e0e92b7b64'`
		`+ sha512sums=('ad1a4895e5cc3a01637f71d96ddb79d7f45708ec7305ffdb874403a1eb3c1743d121f28d93273b91792298eb21bcc0c5d9ef1ab3a3773083d60da5bdaee59d6e'`
		`'SKIP'`
		`- 'f1ad7792b3b42397c2645e834d4b6c6a89122060455954d1ab56a71c673c3b8a8fdbbd6d722d30195211672b9075d09ac07ce6fb5d9723f56ce540709ebe4665')`
		`- b2sums=('b60d8e61a15167df3316a7336467740efd4888784228dd6a08b1d974c54c479c082ba142eb60d3f356b06053e5c472f747e0ca830d50bed9f31c13d52b549ca1'`
		`+ 'ac8da9f6c54ac020ad46aaf0009a769c71c01ba1285e2e0d021cbe1e6b2bca3fb7a1e85b0f141981abfdd1d23fb686d48f952ca949c81e39ac140b0b57e946b5')`
		`+ b2sums=('4bc50da7196a69dc0ab7e7de345684baebbb655f9a07def9ac36a7f1c9aec752cf41c62134d6bbf240d8f49c6492a211f152bab062ec09457791d7ab030f1bc5'`
		`'SKIP'`
		`- '92e1969572e0022bd257f44314045f57db47821d99a40ea1290749967b50ead1cb11adaa9b79f4286fbf20a94173e0ba7f2d4f88208e31d7a03a8de4ea014396')`
		`+ 'ffa3c50f18af50323302b2804cde4eb1233b662004528ed3a98c050736c6ed2624fd38a37575737390dfee5f3928daaafb189ce67133909ddfffbea649f0cb39')`
		`validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini`
		`'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud`

		`prepare() {`
		`- cd "${pkgname}-${pkgver}"`
		`- patch -Np1 -i ../nosystemd.patch`
		`+ patch -d "$pkgname-$pkgver" -Np1 -i ../nosystemd.patch`
		`}`

		`check() {`
		`@@ -47,5 +62,4 @@`

		`package() {`
		`make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install`
		`- rm -f "${pkgdir}"/usr/lib/initcpio/install/sd-*`
		`}`

nonsystemd/mkinitcpio/keys/pgp/C100346676634E80C940FB9E9C02FF419FECBE16.asc

file added

+197

		`@@ -0,0 +1,197 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQINBFQJqzUBEACpi7L3t0PHMiuAx7xlK8DokoLTc+RQQHJ+WL0cArGUPQmV5CcW`
		`+ uQWUlaTY16H9xzo69jVzI4JXLeRwXtCBlZD0FlpviZpBDYfaDG9qLmQvRZLw32t+`
		`+ 6iDRow1ypgqycSpFpdpvwOg5XBOKMjTr9FfoKAU4JEYrTogeueupW9q7AIQV8vzW`
		`+ zCB6yFmgOjThguU+Vm/CThSTtcsylSkxve2Whvjx4RGBWUL9S7rBBlg6samlTNTV`
		`+ uqPKcqh1r5H6taWjsJOJZrwZys6ECMPvCpFMN1top0hkwuclxjErSW1+w7jMWM/A`
		`+ MBdUCFeZpP9oG/Vqbrq35HJ4To3XDRMXGQQtCFi+lKCaNuPmqLi5WGB5puDdXWhd`
		`+ CD0T98RhDyZjFZ32HNlM8GrMT81qVZASrMRDGC4q0ElQPhlI2KEJVAF/H6fQQ3mZ`
		`+ hoARdw6NWMI2dPpVucwbGigULy0U/iDp07TDQc/IakaFNLIyTA5g6rwX3hT9vWHG`
		`+ B00LHM/nfNIWJz9FC6fKCC2Nsp8EuBw9kMwsQVYRKMi0IqOdFN3CJulkNg6gw4gq`
		`+ KPw1D5ZhdTbyXzsJjp3TULUiraX+/1WQJMSr2ppK7HlsfesNk1S2Kk8PWCYvpW6j`
		`+ J+0V+AeS8AmWC/5KAgd86SMmdQ274Mg0gKA4Pf4hod9at22mPaHTwxBNLQARAQAB`
		`+ tCRNb3J0ZW4gTGluZGVydWQgPG1vcnRlbkBsaW5kZXJ1ZC5wdz6JAlIEEwEKADwC`
		`+ HgECF4ACGQEGCwkIBwMCBRUKCQgLBRYDAQIAFiEEwQA0ZnZjToDJQPuenAL/QZ/s`
		`+ vhYFAmLJai4CGwMACgkQnAL/QZ/svhbhkQ//cqP1l3918/wI43Doj7VuY+ekFzqQ`
		`+ O9g9eBGN6+Tc66ok3/jtGaSd4Adyxo99fQfXuOVfjCAHajTzdNIluSt3TGUTWtaL`
		`+ xzkzYflR0/5CO7a9zXartZ4DCXU36n8wdDV5tFg8ctmbZFnF0FLhUrQ4d+0eu0YC`
		`+ RVfSMY0iauf4vfOXtQAD6SgJfSly7kRvuMdP7C/DCYIy0rXdUB9i8O6u2hst1Pt5`
		`+ ZRhQTM1nU+vCtD51h2XyOaiDG3dvfD4yuwwF3VenZxePR6dJLTYHHQHBVh93BQyN`
		`+ YQF+OfiK22R6df+2rcSM0kOKSYbpCJ8icfJdfAo5lkOJKlq1wuDcYvN2iHvJ6LYw`
		`+ NDuUixgTVSnB35yUyW+P1QiVeuOWaTI5e0nLNjEQqtAcisZPPk6mw5yHFDrEBKfV`
		`+ RRelDMwjYax/p4VzOQ8FKgWsZrSPUiF++6jgxRDtoBueHssNxTJE32Un6DEkG8+k`
		`+ tQ9Tnrr5tEaMmV4CKHj/Wx3IRyj4Ftd5l7aXL9MZf3Avrk8zuHuINVf3Kb0wUfGs`
		`+ V3boN6a2yxT+Qn7TLaMsLHk4+KLKPAX23AAlKn2Bhp4lsxAvL+1IQ2H0pBk0RUoG`
		`+ H3KIwnCFYNB3EhnEnoSn5HLIopjPc0k4RstufljTye1TYbi508rgs97021knZIaY`
		`+ hdlkhfgwylrcrHy0KE1vcnRlbiBMaW5kZXJ1ZCA8Zm94Ym9yb25AYXJjaGxpbnV4`
		`+ Lm9yZz6JAk8EEwEKADkCGwMCHgECF4AWIQTBADRmdmNOgMlA+56cAv9Bn+y+FgUC`
		`+ YslpmQYLCQgHAwIFFQoJCAsFFgMBAgAACgkQnAL/QZ/svhawAg/+L/naBoxs2KZQ`
		`+ KhE9DNscrucAXZNt6t0SyZ/RpepY9xFiw3tuJ8K11ZM7uXn933RZ+KHu7u9yEyXa`
		`+ I9rhgyi/SKsWbQPZevXOpg+Gw9TGD6YHnVvbhJBnz2DVEUh6KGI+Hqqh6sPtcaJ6`
		`+ newK2qD4Sc4iJ10wGNdYpbGygVgKIUbdlgCzJRczp8rrT+xdpmnaC0/TkUSwNsxe`
		`+ LSnSwidNdNRy6UkFqjotvVrvyVzVUI6llzSFcEgQT8I6SsgB+cT2PQtpHDrOAHJC`
		`+ qvfqcb8uqgLd9kY9SthjVFMcPVmvYLUthl4d93E3ZKo9bNaI9yf/5/24/gq9vAvm`
		`+ P1rCxLRVPJjS5KR+r/ME7iCILyTVb0PFcmGJVQzBxNnKcupOgMp/I8C8vmIlAGCZ`
		`+ Je/Z42zRROCC2nUPOSP6+wlaa8SMsE9MVUF3haStkuLXz0+F02fWmfAjFv3cMVHq`
		`+ L3qsfeewovb3G15+BDJGU+1rMX/KMI9E6mlmJgsD42YBfyrdXTs+eLu2itK2tBAL`
		`+ PMnPEvDnMXSlk7b8siQQs7q8UykPyRF3mmdyLcc9eaPTFSrO699+5I5yUKdzy1Fu`
		`+ /SmFEmWfvc1/qpR9cro4mT7sJfy2yg4mAYWGN11ZXMaGL8asOxM2/rMHuu08k6G6`
		`+ q53r5kotIoMuuPvX5TowMvyaNlujR5q0ME1vcnRlbiBMaW5kZXJ1ZCA8bW9ydGVu`
		`+ LmxpbmRlcnVkQGZyaWJ5dGUudWliLm5vPokCTwQTAQoAOQIbAwIeAQIXgBYhBMEA`
		`+ NGZ2Y06AyUD7npwC/0Gf7L4WBQJiyWmaBgsJCAcDAgUVCgkICwUWAwECAAAKCRCc`
		`+ Av9Bn+y+FmTlEACWlwwipB56heVOabKACWBdw6iY2G/qYMlN0ITV6lGv0SgOUN9J`
		`+ KSqwkhiravWG+Sifv4YpO1Z8wISTJpqs+GeVaeLBfdPHfL8G+vJeqHU0d8lJLuow`
		`+ q9iRxNCzJBqOApvkWX6uvz4NAA8VvRtjGz5HkrlOwxB6Tu08kc4IXDVGRP3YavoU`
		`+ ZU21lmMmGeaLOJG7OR6dQMn6B/wrz5ayXXzy/kfdwBHAvBL9IOOWeDm2ffW6rxzB`
		`+ wnEKsaS+SC5INqAXGFtLsrK7v3GAaZl/ncwAdwtcg+YT37cfQZYQq0pLBSOElyev`
		`+ +LRm1+mpQN6x/a5wr3CZAuottnjYb4COtKl2W5fzVpU/JyL5Ikq6dSvJwSqBnBsY`
		`+ 5p7CKt0AD45eQifC0f27efcf0yNGwYF9+VQu+9s9qJJrV2ZOjIRK95yqfL8fDTSa`
		`+ q7pQEJAwLp7ksCOy+5UCfOjKlKVvBN/D1J+GoWs8Xlfd5lCOVJxUuj17ISxE2vYP`
		`+ eHCPv9LQZV3yj6q++ONtvw+FkdZD1NXa7ifEGmHBf3Vlf5Z7wgD0rtj0+QDPS9GR`
		`+ Qa2EUOtpeku2kVzduKV2FXm0Ry2Yfp7Q0S9ZKzrZcNWu55iB9MKRlCrbTYiPBWm+`
		`+ 2WLAKGQ+awVdqf3crCHu7BNLcYzpYlGqxGuGDwaAwDBPaXCZxg8m5EKfAbQjTW9y`
		`+ dGVuIExpbmRlcnVkIDxtY2ZveGF4QGdtYWlsLmNvbT6JAk8EEwEKADkCGwMCHgEC`
		`+ F4AWIQTBADRmdmNOgMlA+56cAv9Bn+y+FgUCYslpmAYLCQgHAwIFFQoJCAsFFgMB`
		`+ AgAACgkQnAL/QZ/svhaG4Q/+MZqBkGpP/cym7PsEpjrY5rg/j6biQrmEvHbBa9DK`
		`+ XKdwZsSpL9ReWNvzB5w41uvLBmV5y1IfzeZeWmmNDcqqVL319ScqMcP2QzKVMqym`
		`+ puE0+89AzExLkmsI6H/FjgAB6SRkQGXpAmq9n0zp+Gd2QYsOX7wp0xrwLGRcX5JN`
		`+ FReu0XalFq+4HaVD8Kvkzz8uVov/30z5eupQdWTXB3PO7LnoeQAAah14SfIZwyAM`
		`+ Uk8bXX2l/ePtIQo9WMdHti+pWX6r3DBsvF5oP34vmUFQ0a36XokawO8VrWkK/zBu`
		`+ AROIMmdz3sV7gkkFrNF4poruwDTWwDM3WJCv+wScrYQ8QQuxP4ifVIRcj7lTHWAQ`
		`+ 16mSC4swf1ETVXdR71m34uc2iZMpFzKC4Cme062PoWUwvyPO7V1rmaihQUkU1LTQ`
		`+ j5W8Jqn7L/ZS9SLh8sqRbEmx/ykKDNIllGMQfYQWuIhgWIS+IdYWio//jxclQFtO`
		`+ 9yWZT6YrrSTzNRuLDtBfrZpNn9PvCbsHYtU5+z8cHoOyJfyiP6eWQyQ/oII3Y5Bc`
		`+ 06tcBlcJHsOkxNPmGVT4ye/v9n5H0euDNE2VpN84YZBKAogvIU9wBhlsGPwdQ/8x`
		`+ +a52CZDrg4wAAO5effwRTen8hTwxC9zRmy740sUUtpEcTSP1P9DvrGrL8Q4iEX3E`
		`+ ZFW0ME1vcnRlbiBMaW5kZXJ1ZCA8bW9ydGVuLmxpbmRlcnVkQHN0dWRlbnQudWli`
		`+ Lm5vPokCVAQwAQoAPhYhBMEANGZ2Y06AyUD7npwC/0Gf7L4WBQJgg/e8IB0gTm8g`
		`+ bG9uZ2VyIGEgdW5pdmVyaXN0eSBzdHVkZW50AAoJEJwC/0Gf7L4WB+0P/0UWy7qm`
		`+ KkU4FseLbQCgP/kFJm1AMa3d/HwbR4yISvk2nEaFTbbxQBw2Ebh/8wgAqDyGTbb5`
		`+ 0VsL7U9Sdfkc9rUy/JfOH2yVE6pEgknR57yMPb5n+om3VbrwfCrcSiLbco3VUrLb`
		`+ eKOvP+zR2ZcjtJiH3ZXxaR/ByejIC04hg32ayQW98E/3PNzqQjEtvLH/XQ6der5a`
		`+ 3kJQuSB6bSV2wIKohLxxcaGc3EmdNrD3WLfvNFppc1Ob1Xr/ty78gBhIIEhFWxWH`
		`+ iNHaDbbwvLDzJZ6uH327PUMe7gYbxeuS/TjZ1QY2MuL25HQHzYSJcYqPj6btdp9t`
		`+ zwhsE9/xpTrb7bhdKw+f/R5iUKTu7awJZLiMxbx3YGiWSZ9HAIUH4naqPJNikDQN`
		`+ 2u7kliz5vAXg3fy6XNV0hJv3YgQEvlTUA1PaSdbRxVWdEaxb90uaUJswYELpReXs`
		`+ RR5Bgz/OT7UV4ryVqsv2K0S4W1Byt8bcbuCSP1F/1mj+UsAfORrVGxLsYYwK3vVB`
		`+ 6tPJeqD3S4WuwpwVYMCb1LGYP5KKogyj2tVjv6VBqsmLwuCnIWO1+Qq6ZZI9CTDV`
		`+ 4aUX38NoK3gPGep0IL60wdLADb4JRZV0B4IpW3NOrjgOxpyFwAzadcLvgYJ/HC36`
		`+ wubMsGLPOTucCINZ3l24wjyzNdvljjxHBYRzuQINBFQJqzUBEAC/0H1U8KaqTqIB`
		`+ 75WyW+GCj8KnH6MOjKrVigwloiX5Za/H6K7Iinv7OIkxzzpIR4SpjRr9GLyn3EPq`
		`+ uXZ2wfnCZ0bXHYQD5lGSfKyPJpDk0FHhzBohbbWOyvmE49YnAPiLYRk1K3HQMGnA`
		`+ FRKO7TasTfWVGN88uszKC9/5r7DLX50cHXNPtEc3krmrZMeSgEbK0ZJ848xBBHF1`
		`+ XPe0d8aUjJ+kTxGxdxURQToAJsrJxHCihpAz89VSGDATaqVi3KKOnI71I1xj/GYA`
		`+ F+bj5Z89xV2Ros0rLd6oV6Eto540Biy/MMnLJ1s1CPB4/+9OFrY7aPtvxon8MI5L`
		`+ D4GWd+RSsbskFaHRSkbQut+ycJITbI5fL3JwImB9cy5IgmjmdBWvvST3IN8h1suG`
		`+ NdOuUbSUmghsaoPUUFX7sXo2+rfmbM2v2KHCVflGngyNUDELrL1O9KjdHxT2SvYK`
		`+ Klh6Wi2Pj9fnQ+4b6op+ywzPMsVM46g3rQ12Wr7cr7LSA/t+dSDb5ooON6M5kWLv`
		`+ /QUHq5MZO/nf8mSZS0MEBl8C2i1yMEbNxLpg/mVQ3JKURxfacsPgNpkXkLmVeuZ3`
		`+ vzW5Un2WiYh+6xobB2yVbkrVKPqQZiQriAyojm3Mi1ptzjqxdWcBn71yLWuGfo1h`
		`+ LcG+RX/ByWrl5aYPk4+fk8ZVfeIVGQARAQABiQI2BBgBCgAgFiEEwQA0ZnZjToDJ`
		`+ QPuenAL/QZ/svhYFAmLJamcCGwwACgkQnAL/QZ/svhYMrw//QoSJhSm9fDr1eXTE`
		`+ 5RWJcVSxn3Jo9IbbLXZo2ybCVll+wjd/seX9/Kc90XKQU/4/KgHh1hP/BRp0sfU6`
		`+ qEX9IamhcJl8/8OLpecV8OAY5heSqk7L5xUXEDSLnHR2TmgIw980FMyxpgd0rpx+`
		`+ OjC2PujAnLUsDKptOGZAe/HgJLtiYLDiEsFD+nXXpGKq7dkJbGvvkD5FsJG1IiVl`
		`+ 0RSm3Nu7HOC0mLanJ7RPMp+mhLhwDyJY4OdXLyJ/9tEBkhA8jQuFPhQVKpYvy+I4`
		`+ dWW559Nu87QeD4f/0FSzf/bzoCU13f7iNFmN/jWjbxlQOxGLAHwYSS95KMPBAM0B`
		`+ /LTTejRI3nVIxylW/NXQHH610a86CJFwtjwjEBDG3pRkJ40EEP0Ov8723Oy6arbo`
		`+ evJF8H0nvDQsnTQZReBw/vDQvcChEuMeCfjTeTZueihlWJgwWwZkThMkm/FhnjBd`
		`+ ZB/eSWgVqXdGLBWwh8fgutNVuDv3yh57uWYNwb3uxPbvpVfpg4Z3KWsWdgzMFjGh`
		`+ cZ64PVuSn2xNLk4ONqfy+HWerqerp64k64qJriDV+mUivO2iiEzHIeyp/c0IFDZD`
		`+ PAlYsQRz4TcjFZBWgtMECu6kw1yzvwO+CYGpQoU4nr0zqKBIkwgJEGqvP03YbIGt`
		`+ 1GL5xDedcgPtOtGMIxckZVKYLiW5Ag0EVW9z7gEQAObhFkW0QJmp9Kl36VsNzhWc`
		`+ iYfgflUULOf1NRnpYM74NhExfzcxXnEm4aK0x8O2qqYweJvDm4UX1A1xvuJQymuX`
		`+ Y4quXUuD/M1uABVzlUUfFF82hLC5Hx4GKhhgzs1TJzbwZbkBAtz7uU+/1RFFEWv+`
		`+ FUkYLvDVgtu4e1CNcNISFHg7vb3G392DExxHVx83+xPfyud9iWctd7IHZu1nBEVP`
		`+ Tb4YX1Bmvg9t6bbA0ahtWKLlleaAuKIjSHPD6CLJe5MQrmwXfYbx7gFezm0BvEI3`
		`+ Mb7881X1mO+CpMqUJa6E/Pw/57lS2Pw/pSk7ylsg8SZps+y1AXhlyAgmisIrEDJs`
		`+ aPao9ybRUmg50GYCB71SKB449NlWXnfzeBdTxGBwj0OnjbVdeVZcdCq5pIT6DxZd`
		`+ dyebss8doYHnpT+MQ7CxGB5rQtBcxJ0v2O63ij8/I2axdkGUcWOVE2r/goiNq6Dm`
		`+ JgtgF3cycZ4ZILDUlXhnIVHeHY16ZKP1JQNYkc4UYifuyW+xA2Y3aOWOUkJuWdz8`
		`+ CW7cSGgWEkKw5NMtaAT0uePgf0kHWmYrr/tXMhVnGyhtupNtVARw4vhWJtdaW2Gu`
		`+ R+jbxNVEUmZK79fZat2adMK1IvZkR0o4Y3u8WdTjUPgIlHdyuiYi+bM51vhkdmcS`
		`+ oc2brADMsJYNySMXRgH5ABEBAAGJAh8EGAEIAAkFAlVvc+4CGwwACgkQnAL/QZ/s`
		`+ vhaqlBAAiK40Wpclzx4tKRM/IMXL0BKthXmyUKARcK9FQ7uib+7Nd9ByyUQOk4AM`
		`+ HHlYJC4cRm5DbfSp/F4wyA7CbjM7IqIStONdnsUw8BbhiZfluMnMiG+oLp4JnTxU`
		`+ W9+atLy2NhpVg6O2SApc/SK4MQZCg5JqkZ3J7c9oeoxBJSyP7NVgWfiFCqwvh9dy`
		`+ Fj6H+GV0W2thLtKacLZe4jTPTmiGpSwnREMOjGGuSaTvfkKRYujxPsxn20LV1Ldn`
		`+ c/EYn1aeEjaXbKxlJkLx90exHrurufmpdEEkU4LUBWt97/kIi2XF1ZDYMQX3SDJs`
		`+ XnkF6IZw2TjJ8N9GM6e4iVKxYdAkTdx22ATuSpM9t3yWo1acNITSz8d0CcyVmeU9`
		`+ 5i0gS6Bz4fHdmeJjdVRCOeoD2S4yy8BIa+mk/GuTN7FoAgn5K2c+Fh/ffqanGQs1`
		`+ 6z2ZdugxTs9oyTdf9yOAowvhfkzr0AWgxZ/6KBymfy2pYpodYUES9kcrLXEGjlCn`
		`+ k9awzfHAqCcLd23YRYDX1Cbex8GEkOOHSj/9vHcoTvJYfMLaVLoWqfsyn8G2fDgZ`
		`+ QeJDNf+wB5ugaqzeBf4JRIY4xLBIYmNPfgspVc7wDVlzxS3ah9nVBHtUEKLiDbpP`
		`+ RiX1RsdRjs/cgLycFsfIrF3hpXLA3XRZHGZwy9/LCUM2lsBjbw+JAjYEKAEIACAW`
		`+ IQTBADRmdmNOgMlA+56cAv9Bn+y+FgUCWiRRXwIdAwAKCRCcAv9Bn+y+Fus0EACe`
		`+ VSP/wD31cCt/SlX5Iwvb87njbgohQ8nTLMAQuqNT2SwMiq2VXITKghkX7gHnIP1I`
		`+ AJMF5gLjDs69U5T7NPotV1/MuD0u3HnqjdXXEYdBHL1zlS6qe3+giCM+1BhPDXks`
		`+ ++ZNaklc/PH2ykOzs6Z3/5rLWD1cfQnD/eQmrGT1zZYuRZkWvlIPERDmJChl5QKz`
		`+ l+LrbnG4PvfaL1nnK5MuD7sGqrS5w71lNE9kFGIYLbN8sAlDNczTzj9RHuu8+uvY`
		`+ wUJRQbgoTFeZKzH8F9QW1KO1grNoDzix6/h/LJzy3kZ654Y+phAi85h9mfSw0jju`
		`+ 1BHqBjtSOhBJ8jEjW1FMdRzDctQgFJjMOKweT5vi3E1cPp7xbXVsiVJlJB2XFRHN`
		`+ +Wld9uIBZQRogVUd75e4AsDJlNqpaUHVdHoJ4nX1fi1r/6ZHUY4xCt057+puHGOc`
		`+ maGbEQRANpDOOqxjcRzC7l5tTfq7gk5LDRbSTW/rPmU60SPJjJ/TNUE5HeCO3rbD`
		`+ ySidJdsa7UbXhTuG67gdWDyGMS4bAxwURHWYdntvSXumnablgZZDpVOkp25wx1vh`
		`+ yqXxteHRPRh9VWrOwMqfrDRRVHxJduU0Kbs8OPqL6Le2Btw/dLLOSFc0Ise6bQXh`
		`+ o+gacH7X1iT/K/K5KMCtyjUHLJlGVmbMs72jvfrAf7kCDQRb6tStARAA2n/J9HG6`
		`+ etTsIOBKirupHIL79miEWhiVDL/aKbl2UY+wCrm2dSiz6DraJWvs/xP+yroajq/8`
		`+ RKKQmnFW5kZOnkFPKB3v1jHOZvCkzzxbytcM1m0WFFPlizxPe10wRobyErMmc7V0`
		`+ 7pcEglKktJ+/tBIGZonLfIWKDhgV4aVyACQP7IJJp+lyxSCb/WELPsh51GbsIq0R`
		`+ 63s5z0LitvovK/t32DwWp1DMHux8ml4ZJl2HGEmlm15iRMPfH/QfBYAKeTBHcnOB`
		`+ 63rxmuqb9KR62sX3W+aiQdDPU7jVa5sNej7pYr36ybjKlDrmEirmbIBzV7ltVe1F`
		`+ WOrcBGk+vY6Ybwy8koodEDPaXik9uytcEsXHhMjy8DZib9EvEJiN4f3ODJtxJ3zS`
		`+ LWWMe+D5/87B7JjaEWkmcDyqKr+VWLpgvKu8jN/I2bUhzUMP7XPRuNDQWF0A+fGw`
		`+ wG0XFPyAhq0w1VTTfYOODX5kHEv/C9zN2DEHVT/pr0cecDb7aNWsj2/FvUSMJrzM`
		`+ 3vwB8ZiqfW4GFII4Xhx6h5gQhF9COaHuLYbKP/GhmENBHP2INwie1jyKx0uucv9c`
		`+ FsDAeAMgXJxlBO8rMDO0S3FcIqsSN4HGrkrf/TMpmLakTD/lEg3J/FXeGzBxh1+J`
		`+ p2QtghPLCSjNq1RCKk8XLR65QNnOw9oSaW8AEQEAAYkEbAQYAQgAIBYhBMEANGZ2`
		`+ Y06AyUD7npwC/0Gf7L4WBQJb6tStAhsCAkAJEJwC/0Gf7L4WwXQgBBkBCAAdFiEE`
		`+ ktnGzemaICTWkKdu50JoO6CMsv8FAlvq1K0ACgkQ50JoO6CMsv+wYA//VBOFkmcm`
		`+ eRCSHz07yNAMnrDKdM79z/GW56hS6BaG7Jm/BLa0JStI+x2LjSMOzPdMAqtBk3kl`
		`+ PtoCNTAAO4D+s2OiD50RnfiO2dD+L8VW96DSC9FzeINuDPFI4p8S9jCJE67uYe9M`
		`+ s5MJNjCsvWg61VrFPE44cG8wyph9475N2VjV7iG1AxxdvmKm7zXRpQl76OymoRpw`
		`+ r98T82aDl0kpZIBnU6d+RwZD0LVojSK/8SUxNvDX8KIR+n36khU6lJGVWq5szr8j`
		`+ 8tk+Yovp3tBFDiKONxr2s7X6aXN5E2oPP5SzGq54icookxK53CC1reXe8eZSQlZ6`
		`+ nuLDtQZbJOAZOBjepsy0Gfh9pYll39yEiFUf/MW9IEibSpiJs0JXhkS8y7Nz/NCL`
		`+ M9sgr4IaV1JhyX3j3KAEQXbnKfTrcZK5Q3jwKyM8xpIsQouhJ36VUH4xiRWQJALw`
		`+ 9I+R6dOd8Q+PbXO6aetKiyu7A+z/StZL9DEVCQByAEXV+kjfHGwMgpJW3i94GegN`
		`+ CSt5GSQ0LYGA8TEVYXEm1BNd84ZwQTSVJi1laNp12PTsmE7HOnQA4ghl7BKjzeYC`
		`+ 4B2riRbfDPWxcPeAImnYQen9bV6eBXkaQPzJuqprb7h/z+uTmzm1II1Ond70agb9`
		`+ DB/KBP8/rOqeQbBXYzLMSBOqVBp6dszrlaQgmhAAhUxhAyxErqUxEQZLARyreBV1`
		`+ NxJsCPYX1jlsvQBFiEzLGMqkMS6xK50cxdcSSMa1X3JSejfJ+YrrnTDMovZopFqU`
		`+ wuHVS1yW8444Nv9bbPOzAbeW+PgS3jzJ1h855QFXFQoxyGnu7PCr24E7O0dogR0m`
		`+ a30DmGhu88aDHYTvW/4qImEr25zgQ3kQaIL4+dCqeMGoEvH0H1CU3fu9jeQ1zM1t`
		`+ 3riNd+LyLkAWYyZAzQCdtd33RWd7m7SfpRYciLnGjNKtrqRsic/TsPjsMN/ngisi`
		`+ 9A9a3Zi0lQG8LXr05s8/vhh5MBLrOTilDHRMVXhMoPmVda17hQ6VY+05OfwmASnm`
		`+ bHvuB7LAZpFuTpUN2giPKPd5Y/2P6bvwLrGIcl0F5x0V3S9/CWwyUMwy+y302a6x`
		`+ 9NamTjm8Pc9ST/d1kIsZtmxEr6d3+FDBUAvMyy6LsKLfYfemtd4mOI4b5AQDWgQl`
		`+ Z0DoODHeTYvqdVEZBfqvo+kPcG/x7qGsvbA8Wap2TcEB7C08kjgpwSpVUsujBtvT`
		`+ oVdrNAzvxrUHvVZfsnXZjwey1jy49+6ZxflvodSXiLnQIAd9BnwdM49/n0UZROZk`
		`+ mQo/Zpe4WTIcraShuYdAd43MTdfbkZ16EHxBJXl0jud834AUDfE/3t9ULeUGygBY`
		`+ 1wzc9rtO03UXJ2j1+3e5Ag0EW/vlDwEQALObHmV6RgtZJofl3UAAyaRRyz/nORjI`
		`+ XQgtwz5fnnXeURtmyHlweQg+w+WF+7FxBWWaaSnIUi8qgMZ55jmxlFr35g0+RbSX`
		`+ vr9l3Aun4faO3RlmMqQR/xDr/kp3ryiqXgfJ4AOEBdoqxUSVJUoUUQ3L11GOXgVX`
		`+ uCLaZXCMC0WWiphFMzHCQflH+jMeQesojJwQjfgFzopj642dWqcS2UGZmvW8DsiJ`
		`+ EYQBgQ6aYr6ip8gNTKhyKS0QCW7b9J0g88J+PcLjKoqjcoIIXFBafGOsUB1VX2Y5`
		`+ QL1Q7d2NyCKX+pJ1jJ5rR4s7hzP0gi+SzANv8/obl585MiYqcZXDFowGcnnpB2TG`
		`+ 50dbY7C5+lLrgSit1loWqriRGQP1XXekWoprEYlYwB9ywRWC4eD0upMleYmKq5k1`
		`+ /wFEKHSHAyJqBzcPMYvdYPGolgFpAdm3cgFa8JmGE/QrNXj9JoyqSOvZERbp1mbV`
		`+ 4pkMdVMktOm0MElkZEN0mm1mIeQBs84PHbYts43ebQpy0gMUF13FBSuYDpsal6Ng`
		`+ mm8UFJ2gNgrbZvIiTJLyPW1t9JKV26W2pbzMiy8FX7G5Av4tgzIc5Xe3jAah43ae`
		`+ E9+jVeyrJ2O/h7x7Sggc05b0x83besG9395lylJtK9QyC0LwkS94MVQe24EjeuAj`
		`+ 4tVkuO/NgOT7ABEBAAGJAjYEGAEKACAWIQTBADRmdmNOgMlA+56cAv9Bn+y+FgUC`
		`+ W/vlDwIbIAAKCRCcAv9Bn+y+FscAD/9jiBwGqRL+uG/JGx7qEdMsKotsdKOrRiiX`
		`+ 7vqY3G0FWCXfidd3I7JNkRpFzONgnT72nqC30cHM0lyHZ6+X8qx7MXxLWillfaXO`
		`+ kZQ4+mGiqvLUsY7sEqXJSDoLp+qyo4iYJLUNorvlVAkIkWpHG7qZOE7PkDuRnklj`
		`+ suxwy1nRF80IP/fYUk5Ppr3WiMsWmsgBHOIHR16cfhmoENwLwKOiWziAo5N66XL7`
		`+ GvQqrtri2YHMG5eVtIEosTuum2nNaMPUL0PDefyRYK7+tklRookbCGYXwUExST3Z`
		`+ SyiD82LLLjNiXlBLUTEjmjOxiNyoWC9D3VqQqYTPaVxMYH1LmtKx208ca24az6z7`
		`+ 5IXdfG2jSMhi2zYwqbwly84QgrAKuibTxOsL2KPddtUGJ2YyIPrQIf5ph+CJurhH`
		`+ UwRxOQHJgeiVDqA0BAUXu6PAiJssHk+hcdbJRgYp703GMvGDChh7dA6bMOQ3BDpJ`
		`+ sXcney+3yBrTh+yhiBnD3r4cW7+zkD94Y1VoHNCoqpSbTQ8n44BQjx1wkeymFikO`
		`+ 9TCLTcAOZLZXP9nWfvueS3S3MYTpT72AqS8aSl7zQrCpCjWezfNf265sW2d2EHuk`
		`+ gs1FEKR0cbPUBBgcwmJdLm/m3MCOzN4TC9RHplMnEd8R3bWPoWIBL9Boejv8kKux`
		`+ +l0GmWOW2w==`
		`+ =dbj2`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

nonsystemd/mkinitcpio/keys/pgp/ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB.asc

file added

+52

		`@@ -0,0 +1,52 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQINBFgltygBEADaYiTPWOGKx4/O2Ac15JJYzdHZDIVLQBWxG4C0Dk6t8jvXzS+b`
		`+ aqtpVkG7pJjVJc0DR6AvEEw7qlRxHuYzqp7xqliXrhgmK5QiKrGjE5OgqDbe1C4J`
		`+ ezJlMWTpjwN7i7IufoKL5XooHZ2KNh2KXNvxNvAjHHJWsULnKo9uipCdD//25ofH`
		`+ SToou0yR1OsgHh+EYDi5xCijMI9aD27gt7+j8+tekwgltzlqBkzOumk8Da2SmfhW`
		`+ JIUW7RvjovtcxdVW+iSBGTZZa4tcfAzgtXz3pah/W+OSrnIk8k0yvoeKSsIAiptW`
		`+ TCQCcILl22db211bzFPvSHuB0oHg3dsRzQ1m3OlD+2CXUxpfgndl9YdkT+ucNsKT`
		`+ 715CANt/lKxRF3iKQVuVcCm4yybsgPpH+h1p6AP2Kf3mlckFAYK7ikOcqAdymOT3`
		`+ rnA8KB5Uz8z8NQLfa3/Ee1G72LBhydoakYl0mwetCPCUlX5Tsm7Xmxetxw/gjSTG`
		`+ 3EUx0VrGS5QtXZMsWCNoimd186l9E/bvb38vsP3b5D5QSv1BaXR+ZfGO2sg0WB4w`
		`+ nIA6N3dR8ecncGmeKcca2S02LVaOBGzuGYJvMs2/skgVMoFS6y1/Fmo/rMdgpnBu`
		`+ JT19tHxSPlgm4OCQLKKvQlPFL/foMUSOt1cAypU7j3L+K/uSW4c/Cm7O/wARAQAB`
		`+ tDtHaWFuY2FybG8gUmF6em9saW5pIChncmF6em9saW5pKSA8Z3JhenpvbGluaUBh`
		`+ cmNobGludXgub3JnPokCTgQTAQgAIQUCWCW3KAIbAwULCQgHAgYVCAkKCwIEFgID`
		`+ AQIeAQIXgAAhCRDyL7HXineuqxYhBOzKyEwboIpsyOY/u/IvsdeKd66r5fsQAKHA`
		`+ WPuEXcHi7gOt37fPYQoYwXmCb0KonDRF/O2AgYfvwAXmVW0OafwFY3cR6CnlnJOB`
		`+ efaFEOTO+Y3+QKXRXRO8EK8PJvh92HYm5MyGDqid34YF+CrVs4fAw+tlvX6ifGAJ`
		`+ eThPHc6KfteDBEmekfvvU9tPPO/BkBxFBzyEtFhELSewioorbVqyLmuL1DAcUK24`
		`+ LuLtlay+AY+U5JJIWthG94dEdqx1DC/hC0cbQV/lk1K+eLigKiChMl5R3uhTgAD2`
		`+ LTp4BPdvWiDJ/EOJu+xT+mkcXzUbbRRbMwfd83wKTr7BFjwiAo+Suk5ZKmDWdS8j`
		`+ blwlQMHJv/6EN1o4Ul8kXxjiPlYpJfMP/zbmg/zVsi5A1KpMELFBPwKbDL2WBrwX`
		`+ +uioSuA0Odz7nnS+DD43Ict4ix28KUk20833Wv58zag7hSuT+IBx1z9OnDL5qGv/`
		`+ dXVlW40ag+iahLKpR6DvgmSzvOsPqNs86Rylzlw+DEVVqU0GTZDZ/OCPNl2ToOeZ`
		`+ 2X3U5c9EwH15PV8viT8WsIkDM8Utk9SbDDliIfoWguVz5sYYeJgH24q9AidwoSOt`
		`+ //KhTggoWOR6thkE5rONylwS56J9gXUeIxP2GDDkWdDh/QVkmclLSNSQ/xHIMFJa`
		`+ 6oljHyVhzBKtICrNiPQNE43oukGbyaM+2xN7u8+6uQINBFgltygBEAC9h5Ym/UpX`
		`+ GJjeWfvZ7bGsphQ5wJbD3c++jjxhjlViH6uw/v4zaTFw6JTo42ZdWoiSIk9aVsRb`
		`+ 7eig70ijVKmkNsaPyC2HhCpVDEqBbpNOrmJW5/JfbGcd0j93Xq4meVADe0FeJ3Xk`
		`+ Gl7RlFGImb8QNDwfCqgtN9ORZY3E1eMXiVPm7ufR3njmAHfZfns6ZyF/QOzv3+fo`
		`+ 4IQrtHQadw5Xn7YI+iwgbd+rw0DdowER547QHduuWAwqOKZFUa6LeGqxO8pRQeBh`
		`+ Klr9VduUhv7wGzWbGU2lnNMilDQ3TP4AyY8HwBMZXPAvCVSN378bfOwqT8TDKJ+u`
		`+ GcWgEKZxbNKjxhBTQzQWRpy+gZFbYjX/MJrX/2I15X3Zpj7uQXcj7VF7j1Xx79sP`
		`+ 1ShYkWCjzigv7FZLbmKZnaVTOV0CoB+VXFydsgiYdrmR9a+S/MLCRZavCWOlxk2c`
		`+ IRV2k5AR1yq04ag+FzBiNKqqjhyxMPdTrzLQ/cHIzMHEbLvchl/68cf+ePWqxqUT`
		`+ aqh6NoK5bVUNbbz+iUvAaU4sxEBjig0JkBVFuhWWuEzC5RVAQouNAQ8TsXWZR4Me`
		`+ VfwWPtWwnSYcIzI+Tapax0ez5lH5Uszz/X+hOkSq5zHIseuGGFJlxRoawViyDNV2`
		`+ QU89ewliV8OfaSqxPHjZXl6EjM8U3ARZxQARAQABiQI2BBgBCAAJBQJYJbcoAhsM`
		`+ ACEJEPIvsdeKd66rFiEE7MrITBugimzI5j+78i+x14p3rqty3w/9GT8JYamgICAG`
		`+ DEpC3UncO5y2eEupSU/oUff71T1a1HkjOw4AXpzU9npSBnJv7TkCoNVFQocJNT+U`
		`+ 5UH37wMQORuB69kX3KIKqqBTiVNI2cTB807IfYqu/Bt2WClevZODAzTwW4JX9sjt`
		`+ 3uaZ4jiScE1T+Q5k//vI/7C0tPFok80Jhtiev0OTKyhTALTroxD7oOSB/Zig81MP`
		`+ zPnEwannmIGCkkmSbQyVBWzp1FnU9sUB3gbh+VMAUj2piNM1Gwciimo/XHVtCBvn`
		`+ 1e1U92nSwkBwlWiimK9TlJ2uEJXT4olOLzyksMvDRLW3EQ3wX/TfhfAcoQZH2GC8`
		`+ qMgDnS+8k4R88j2JtEXuo7/aA4VOvw+xCx+UViC7pZfSzDp9c+mT66VGbQchbr1G`
		`+ Kwy7wdfclKj2OMFpoVLa3xcs6QYB+SG7SKxxXYURL7j05O+R0ljKNJluy4USeamx`
		`+ QT1x3lF+XhLz6DOZ+xVs4K1+AkMEHsJPMPP53yrcFNUbmAMsmrX6GN0NEyvLLAd1`
		`+ xOZ4y28rdn6O0G2PeQDKUys4Vm3rDskyDykCZKIDO7Bi02513hrB1n2AW1zasu0+`
		`+ agEs1rGcGhDyfnNuUu0BwHsJpM/Fr/Kr64ytBRPsw8Y3RWD92s8YwceucQXcsw2e`
		`+ vmDqGDaPjI0DtqUEcF2MVkEmwe4hlxA=`
		`+ =uhpL`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

nonsystemd/mkinitcpio/nosystemd.patch

file modified

+490 -9

		`@@ -1,12 +1,20 @@`
		`- Makefile \| 6 +-----`
		`- init_functions \| 11 -----------`
		`- 2 files changed, 1 insertion(+), 16 deletions(-)`
		`+ Makefile \| 6 +-`
		`+ hooks/udev \| 6 +-`
		`+ init_functions \| 11 ----`
		`+ install/lvm2 \| 8 +--`
		`+ install/mdadm_udev \| 3 -`
		`+ install/sd-encrypt \| 67 --------------------`
		`+ install/sd-shutdown \| 19 ------`
		`+ install/sd-vconsole \| 119 -----------------------------------`
		`+ install/systemd \| 174 ----------------------------------------------------`
		`+ install/udev \| 4 +-`
		`+ 10 files changed, 8 insertions(+), 409 deletions(-)`

		`diff --git a/Makefile b/Makefile`
		`- index 9ef0f6a..f6e322e 100644`
		`+ index 824387b..f73df17 100644`
		`--- a/Makefile`
		`+++ b/Makefile`
		`- @@ -17,7 +17,6 @@ DIRS = \`
		`+ @@ -22,7 +22,6 @@ DIRS = \`
		`/usr/share/man/man5 \`
		`/usr/share/man/man1 \`
		`/usr/share/mkinitcpio \`
		`@@ -14,7 +22,7 @@`
		`/usr/lib/tmpfiles.d \`
		`/usr/share/libalpm/hooks \`
		`/usr/share/libalpm/scripts`
		`- @@ -57,10 +56,7 @@ install: all`
		`+ @@ -63,10 +62,7 @@ install-generator: all prepare`

		`cp -at $(DESTDIR)/usr/lib/initcpio hooks install`
		`install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/*`
		`@@ -25,12 +33,33 @@`
		`+`
		`install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf`

		`- install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install`
		`+ install -m755 kernel-install/50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install`
		`+ diff --git a/hooks/udev b/hooks/udev`
		`+ index 951c95e..4b67922 100644`
		`+ --- a/hooks/udev`
		`+ +++ b/hooks/udev`
		`+ @@ -2,13 +2,13 @@`
		`+`
		`+ run_earlyhook() {`
		`+ kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf`
		`+ - systemd-tmpfiles --prefix=/dev --create --boot`
		`+ + etmpfiles --prefix=/dev --create --boot`
		`+ # assigned by parse_cmdline`
		`+ # shellcheck disable=SC2154`
		`+ if [ "${quiet}" = "y" ]; then`
		`+ - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never >/dev/null 2>&1`
		`+ + /usr/bin/udevd --daemon --resolve-names=never >/dev/null 2>&1`
		`+ else`
		`+ - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never`
		`+ + /usr/bin/udevd --daemon --resolve-names=never`
		`+ fi`
		`+ # used externally by poll_device()`
		`+ # shellcheck disable=SC2034`
		`diff --git a/init_functions b/init_functions`
		`- index 8ad10c7..5579a49 100644`
		`+ index 0abfde7..e33b2a5 100644`
		`--- a/init_functions`
		`+++ b/init_functions`
		`- @@ -298,17 +298,6 @@ fsck_root() {`
		`+ @@ -338,17 +338,6 @@ fsck_root() {`
		`elif bitfield_has_bit "$fsckret" 128; then`
		`err "fatal error invoking fsck"`
		`fi`
		`@@ -48,3 +77,455 @@`
		`fi`
		`}`

		`+ diff --git a/install/lvm2 b/install/lvm2`
		`+ index c2dc8a6..42884dc 100644`
		`+ --- a/install/lvm2`
		`+ +++ b/install/lvm2`
		`+ @@ -33,12 +33,8 @@ build() {`
		`+ '95-dm-notify.rules' \`
		`+ '/usr/lib/initcpio/udev/11-dm-initramfs.rules'`
		`+`
		`+ - # this udev rule is specific for systemd and non-systemd systems`
		`+ - if declare -F add_systemd_unit &>/dev/null; then`
		`+ - add_udev_rule '69-dm-lvm.rules'`
		`+ - else`
		`+ - add_udev_rule '/usr/lib/initcpio/udev/69-dm-lvm.rules'`
		`+ - fi`
		`+ + # this udev rule is specific for non-systemd systems`
		`+ + add_udev_rule '/usr/lib/initcpio/udev/69-dm-lvm.rules'`
		`+`
		`+ # config file`
		`+ add_file '/etc/lvm/lvm.conf'`
		`+ diff --git a/install/mdadm_udev b/install/mdadm_udev`
		`+ index f8ad731..af6adf6 100644`
		`+ --- a/install/mdadm_udev`
		`+ +++ b/install/mdadm_udev`
		`+ @@ -15,9 +15,6 @@ build() {`
		`+`
		`+ # For external metadata arrays (e.g. IMSM)`
		`+ add_binary mdmon`
		`+ - if declare -F add_systemd_unit &>/dev/null; then`
		`+ - add_systemd_unit 'mdmon@.service'`
		`+ - fi`
		`+ }`
		`+`
		`+ help() {`
		`+ diff --git a/install/sd-encrypt b/install/sd-encrypt`
		`+ deleted file mode 100644`
		`+ index e60d883..0000000`
		`+ --- a/install/sd-encrypt`
		`+ +++ /dev/null`
		`+ @@ -1,67 +0,0 @@`
		`+ -#!/bin/bash`
		`+ -`
		`+ -build() {`
		`+ - local mod`
		`+ -`
		`+ - add_module 'dm-crypt'`
		`+ - add_module 'dm-integrity'`
		`+ - if [[ -n "$CRYPTO_MODULES" ]]; then`
		`+ - for mod in $CRYPTO_MODULES; do`
		`+ - add_module "$mod"`
		`+ - done`
		`+ - else`
		`+ - add_all_modules '/crypto/'`
		`+ - fi`
		`+ - add_checked_modules '/drivers/char/tpm/'`
		`+ -`
		`+ - map add_udev_rule \`
		`+ - '10-dm.rules' \`
		`+ - '13-dm-disk.rules' \`
		`+ - '60-fido-id.rules' \`
		`+ - '95-dm-notify.rules' \`
		`+ - '/usr/lib/initcpio/udev/11-dm-initramfs.rules'`
		`+ -`
		`+ - map add_systemd_unit 'cryptsetup.target' \`
		`+ - 'systemd-ask-password-console.path' \`
		`+ - 'systemd-ask-password-console.service'`
		`+ - map add_binary \`
		`+ - '/usr/lib/systemd/system-generators/systemd-cryptsetup-generator' \`
		`+ - '/usr/lib/systemd/systemd-cryptsetup' \`
		`+ - '/usr/lib/systemd/systemd-makefs' \`
		`+ - '/usr/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so' \`
		`+ - '/usr/lib/cryptsetup/libcryptsetup-token-systemd-pkcs11.so' \`
		`+ - '/usr/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so'`
		`+ -`
		`+ - # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1`
		`+ - add_binary '/usr/lib/libgcc_s.so.1'`
		`+ -`
		`+ - # cryptsetup loads the legacy provider which is required for whirlpool`
		`+ - add_binary '/usr/lib/ossl-modules/legacy.so'`
		`+ -`
		`+ - # add libraries dlopen()ed by systemd-cryptsetup`
		`+ - LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "libfido2.so*" \| while read -r -d '' FILE; do`
		`+ - if [[ -L "${FILE}" ]]; then`
		`+ - add_symlink "${FILE}"`
		`+ - else`
		`+ - add_binary "${FILE}"`
		`+ - fi`
		`+ - done`
		`+ -`
		`+ - # add mkswap for creating swap space on the fly (see 'swap' in crypttab(5))`
		`+ - add_binary 'mkswap'`
		`+ -`
		`+ - [[ -f /etc/crypttab.initramfs ]] && add_file '/etc/crypttab.initramfs' '/etc/crypttab'`
		`+ -}`
		`+ -`
		`+ -help() {`
		`+ - cat <<HELPEOF`
		`+ -This hook allows for an encrypted root device with systemd initramfs.`
		`+ -`
		`+ -See the manpage of systemd-cryptsetup-generator(8) for available kernel`
		`+ -command line options. Alternatively, if the file /etc/crypttab.initramfs`
		`+ -exists, it will be added to the initramfs as /etc/crypttab. See the`
		`+ -crypttab(5) manpage for more information on crypttab syntax.`
		`+ -HELPEOF`
		`+ -}`
		`+ -`
		`+ -# vim: set ft=sh ts=4 sw=4 et:`
		`+ diff --git a/install/sd-shutdown b/install/sd-shutdown`
		`+ deleted file mode 100644`
		`+ index f8aad2e..0000000`
		`+ --- a/install/sd-shutdown`
		`+ +++ /dev/null`
		`+ @@ -1,19 +0,0 @@`
		`+ -#!/usr/bin/env bash`
		`+ -# SPDX-License-Identifier: GPL-2.0-only`
		`+ -`
		`+ -build() {`
		`+ - add_binary /usr/lib/systemd/systemd-shutdown /shutdown`
		`+ -`
		`+ - if type -P kexec >/dev/null; then`
		`+ - add_binary kexec`
		`+ - fi`
		`+ -}`
		`+ -`
		`+ -help() {`
		`+ - cat <<HELPEOF`
		`+ -This hook adds systemd-shutdown to the initramfs. This is only`
		`+ -if the image is extracted to /run/initramfs before shutdown.`
		`+ -HELPEOF`
		`+ -}`
		`+ -`
		`+ -# vim: set ft=sh ts=4 sw=4 et:`
		`+ diff --git a/install/sd-vconsole b/install/sd-vconsole`
		`+ deleted file mode 100644`
		`+ index 971b264..0000000`
		`+ --- a/install/sd-vconsole`
		`+ +++ /dev/null`
		`+ @@ -1,119 +0,0 @@`
		`+ -#!/usr/bin/env bash`
		`+ -# SPDX-License-Identifier: GPL-2.0-only`
		`+ -`
		`+ -build() {`
		`+ - # prevent conflicting variables from affecting vconsole.conf values`
		`+ - # shellcheck disable=SC2034`
		`+ - local KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP XKBLAYOUT XKBMODEL XKBVARIANT XKBOPTIONS`
		`+ -`
		`+ - add_systemd_unit systemd-vconsole-setup.service`
		`+ - add_binary /usr/lib/systemd/systemd-vconsole-setup`
		`+ - add_binary loadkeys`
		`+ - add_binary setfont`
		`+ - add_file /etc/vconsole.conf`
		`+ - add_udev_rule 90-vconsole.rules`
		`+ -`
		`+ - # subshell to avoid namespace pollution`
		`+ - (`
		`+ - shopt -s extglob nullglob`
		`+ -`
		`+ - get_decompressor() {`
		`+ - case "$1" in`
		`+ - *.gz)`
		`+ - cat='zcat'`
		`+ - of="${1%.gz}"`
		`+ - ;;`
		`+ - *.bz2)`
		`+ - cat='bzcat'`
		`+ - of="${1%.bz2}"`
		`+ - ;;`
		`+ - *.zst)`
		`+ - cat='zstdcat'`
		`+ - of="${1%.zst}"`
		`+ - ;;`
		`+ - *)`
		`+ - cat='cat'`
		`+ - of="$1"`
		`+ - ;;`
		`+ - esac`
		`+ - }`
		`+ -`
		`+ - add_keymap_file() {`
		`+ - local cat cmd rest f of`
		`+ -`
		`+ - while read -r f; do`
		`+ - get_decompressor "$f"`
		`+ - while read -r cmd rest; do`
		`+ - if [[ "$cmd" == 'include' ]]; then`
		`+ - eval set "$rest"`
		`+ - add_keymap_file "$1"`
		`+ - fi`
		`+ - done < <("$cat" "$f")`
		`+ - add_dir "${of%/*}"`
		`+ - "$cat" "$f" >"$BUILDROOT/$of"`
		`+ - done < <(LC_ALL=C.UTF-8 find /usr/share/kbd/keymaps/ -type f -regex ".*/$1$\.inc$?$\.gz\\|\.bz2\|\.zst$?")`
		`+ - }`
		`+ -`
		`+ - add_font_file() {`
		`+ - local cat file filename fontfile="$1"`
		`+ - get_decompressor "$fontfile"`
		`+ - add_dir "${of%/*}"`
		`+ - "$cat" "$fontfile" >"$BUILDROOT/$of"`
		`+ - if [[ "$(head -c 23 "$BUILDROOT/$of" \| tr -d '\0')" == '# combine partial fonts' ]]; then`
		`+ - while read -r filename; do`
		`+ - for file in "/usr/share/kbd/consolefonts/partialfonts/$filename"?('.gz'\|'.bz2'\|'.zst'); do`
		`+ - add_font_file "$file"`
		`+ - done`
		`+ - done < <(sed '/^#/d' "$BUILDROOT/$of")`
		`+ - fi`
		`+ - }`
		`+ -`
		`+ - # shellcheck disable=SC1091`
		`+ - [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf`
		`+ -`
		`+ - [[ "$KEYMAP" != '@kernel' ]] && add_keymap_file "${KEYMAP:-us}.map"`
		`+ - [[ -n "$KEYMAP_TOGGLE" ]] && add_keymap_file "${KEYMAP_TOGGLE}.map"`
		`+ -`
		`+ - if [[ -n "$FONT_MAP" ]]; then`
		`+ - FONT_MAP="${FONT_MAP%.trans}"`
		`+ - if [[ -f "/usr/share/kbd/consoletrans/$FONT_MAP" ]]; then`
		`+ - add_file "/usr/share/kbd/consoletrans/$FONT_MAP"`
		`+ - elif [[ -f "/usr/share/kbd/consoletrans/$FONT_MAP.trans" ]]; then`
		`+ - add_file "/usr/share/kbd/consoletrans/$FONT_MAP.trans"`
		`+ - elif [[ -f "/usr/share/kbd/consoletrans/${FONT_MAP}_to_uni.trans" ]]; then`
		`+ - add_file "/usr/share/kbd/consoletrans/${FONT_MAP}_to_uni.trans"`
		`+ - else`
		`+ - error "sd-vconsole: requested font map not found: '%s'" "$FONT_MAP"`
		`+ - return 1`
		`+ - fi`
		`+ - fi`
		`+ -`
		`+ - if [[ -n "$FONT_UNIMAP" ]]; then`
		`+ - FONT_UNIMAP="${FONT_UNIMAP%.uni}"`
		`+ - if [[ -f "/usr/share/kbd/unimaps/$FONT_UNIMAP.uni" ]]; then`
		`+ - add_file "/usr/share/kbd/unimaps/$FONT_UNIMAP.uni"`
		`+ - else`
		`+ - error "sd-vconsole: requested font unimap not found: '%s'" "$FONT_UNIMAP"`
		`+ - return 1`
		`+ - fi`
		`+ - fi`
		`+ -`
		`+ - if [[ -n "$FONT" ]]; then`
		`+ - for file in "/usr/share/kbd/consolefonts/$FONT"?('.psfu'\|'.psf'\|'.cp'\|'.fnt')?('.gz'\|'.bz2'\|'.zst'); do`
		`+ - add_font_file "$file"`
		`+ - return`
		`+ - done`
		`+ - error "sd-vconsole: requested font not found: '%s'" "$FONT"`
		`+ - return 1`
		`+ - fi`
		`+ - )`
		`+ -}`
		`+ -`
		`+ -help() {`
		`+ - cat <<HELPEOF`
		`+ -This hook adds the keymap(s) and font specified in vconsole.conf to the image and`
		`+ -loads them during early userspace.`
		`+ -HELPEOF`
		`+ -}`
		`+ -`
		`+ -# vim: set ft=sh ts=4 sw=4 et:`
		`+ diff --git a/install/systemd b/install/systemd`
		`+ deleted file mode 100644`
		`+ index 808750c..0000000`
		`+ --- a/install/systemd`
		`+ +++ /dev/null`
		`+ @@ -1,174 +0,0 @@`
		`+ -#!/bin/bash`
		`+ -`
		`+ -add_systemd_unit() {`
		`+ - # Add a systemd unit file to the initcpio image. Hard dependencies on binaries`
		`+ - # and other unit files will be discovered and added.`
		`+ - # $1: path to rules file (or name of rules file)`
		`+ -`
		`+ - local unit key dep`
		`+ -`
		`+ - unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")`
		`+ - if [[ -z $unit ]]; then`
		`+ - # complain about not found unit file`
		`+ - return 1`
		`+ - fi`
		`+ -`
		`+ - add_file "$unit"`
		`+ -`
		`+ - while IFS='=' read -r key values; do`
		`+ - read -ra values <<< "$values"`
		`+ -`
		`+ - case $key in`
		`+ - Requires\|OnFailure)`
		`+ - # only add hard dependencies (not Wants)`
		`+ - map add_systemd_unit "${values[@]}"`
		`+ - ;;`
		`+ - Exec*)`
		`+ - # do not add binaries unless they are required,`
		`+ - # strip special executable prefixes`
		`+ - case ${values[0]} in`
		`+ - -*) ;;`
		`+ - !!*) add_binary "${values[0]#!!}" ;;`
		`+ - *) add_binary "${values[0]#[@!:+]}" ;;`
		`+ - esac`
		`+ - ;;`
		`+ - esac`
		`+ -`
		`+ - done <"$unit"`
		`+ -`
		`+ - # preserve reverse soft dependency`
		`+ - for dep in {/usr,}/lib/systemd/system/.wants/"${unit##/}"; do`
		`+ - if [[ -L $dep ]]; then`
		`+ - add_symlink "$dep"`
		`+ - fi`
		`+ - done`
		`+ -`
		`+ - # add hard dependencies`
		`+ - if [[ -d $unit.requires ]]; then`
		`+ - for dep in "$unit".requires/*; do`
		`+ - add_systemd_unit "${dep##*/}"`
		`+ - done`
		`+ - fi`
		`+ -}`
		`+ -`
		`+ -add_systemd_drop_in() {`
		`+ - local unit=$1`
		`+ -`
		`+ - mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"`
		`+ - cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"`
		`+ -}`
		`+ -`
		`+ -build() {`
		`+ - local rules unit`
		`+ -`
		`+ - add_binary /usr/bin/kmod /usr/bin/modprobe`
		`+ - add_binary /usr/bin/mount`
		`+ - add_binary /usr/bin/sulogin`
		`+ - add_binary /usr/bin/umount`
		`+ - add_binary /usr/lib/systemd/systemd /init`
		`+ -`
		`+ - map add_binary \`
		`+ - /usr/bin/journalctl \`
		`+ - /usr/bin/systemd-tmpfiles \`
		`+ - /usr/lib/systemd/systemd-executor \`
		`+ - /usr/lib/systemd/systemd-hibernate-resume \`
		`+ - /usr/lib/systemd/systemd-shutdown \`
		`+ - /usr/lib/systemd/systemd-sulogin-shell \`
		`+ - /usr/lib/systemd/system-generators/systemd-fstab-generator \`
		`+ - /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \`
		`+ - /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator`
		`+ -`
		`+ - # udev rules`
		`+ - map add_udev_rule "$rules" \`
		`+ - 50-udev-default.rules \`
		`+ - 60-persistent-storage.rules \`
		`+ - 64-btrfs.rules \`
		`+ - 80-drivers.rules \`
		`+ - 99-systemd.rules`
		`+ -`
		`+ - # systemd units`
		`+ - map add_systemd_unit \`
		`+ - initrd-cleanup.service \`
		`+ - initrd-fs.target \`
		`+ - initrd-parse-etc.service \`
		`+ - initrd-root-fs.target \`
		`+ - initrd-root-device.target \`
		`+ - initrd-switch-root.service \`
		`+ - initrd-switch-root.target \`
		`+ - initrd-udevadm-cleanup-db.service \`
		`+ - initrd.target \`
		`+ - kmod-static-nodes.service \`
		`+ - local-fs.target \`
		`+ - local-fs-pre.target \`
		`+ - paths.target \`
		`+ - reboot.target \`
		`+ - slices.target \`
		`+ - sockets.target \`
		`+ - swap.target \`
		`+ - systemd-battery-check.service \`
		`+ - systemd-bsod.service \`
		`+ - systemd-fsck@.service \`
		`+ - systemd-hibernate-resume.service \`
		`+ - systemd-journald-audit.socket \`
		`+ - systemd-journald-dev-log.socket \`
		`+ - systemd-journald.service \`
		`+ - systemd-modules-load.service \`
		`+ - systemd-pcrphase-initrd.service \`
		`+ - systemd-tmpfiles-setup-dev.service \`
		`+ - systemd-udevd-control.socket \`
		`+ - systemd-udevd-kernel.socket \`
		`+ - systemd-udevd.service \`
		`+ - systemd-udev-trigger.service \`
		`+ - timers.target \`
		`+ - rescue.target \`
		`+ - emergency.target`
		`+ -`
		`+ - # add libraries dlopen()ed (hard and optional dependencies):`
		`+ - # tss2-* -> tpm2-util`
		`+ - # kmod -> systemd-shared`
		`+ - # qrencode -> bsod`
		`+ - for LIB in kmod tss2-{esys,rc,mu,tcti-'*'} qrencode; do`
		`+ - LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*" \| while read -r -d '' FILE; do`
		`+ - if [[ -L "${FILE}" ]]; then`
		`+ - add_symlink "${FILE}"`
		`+ - else`
		`+ - add_binary "${FILE}"`
		`+ - fi`
		`+ - done`
		`+ - done`
		`+ -`
		`+ - add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"`
		`+ - add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"`
		`+ -`
		`+ - printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \`
		`+ - 'passwd: files' \`
		`+ - 'group: files' \`
		`+ - 'shadow: files'`
		`+ -`
		`+ - echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd"`
		`+ - echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"`
		`+ - getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video \| awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"`
		`+ -`
		`+ - add_dir "/etc/modules-load.d"`
		`+ - (`
		`+ - # FIXME: this should be a function in mkinitcpio`
		`+ - # shellcheck disable=SC1091,SC2154 source=mkinitcpio.conf`
		`+ - . "$_f_config"`
		`+ - set -f`
		`+ - printf '%s\n' "${MODULES[@]}" >"$BUILDROOT/etc/modules-load.d/MODULES.conf"`
		`+ - )`
		`+ -`
		`+ - [[ -f /etc/fstab.initramfs ]] && add_file "/etc/fstab.initramfs" "/etc/fstab"`
		`+ -}`
		`+ -`
		`+ -help() {`
		`+ - cat <<HELPEOF`
		`+ -This will install a basic systemd setup in your initramfs, and is meant to`
		`+ -replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime`
		`+ -components will need to be ported, and will not work as intended. You also may`
		`+ -wish to still include the 'base' hook (before this hook) to ensure that a`
		`+ -rescue shell exists on your initramfs.`
		`+ -HELPEOF`
		`+ -}`
		`+ -`
		`+ -# vim: set ft=sh ts=4 sw=4 et:`
		`+ diff --git a/install/udev b/install/udev`
		`+ index 8b51f44..9aa9ca8 100644`
		`+ --- a/install/udev`
		`+ +++ b/install/udev`
		`+ @@ -2,9 +2,9 @@`
		`+`
		`+ build() {`
		`+ map add_binary \`
		`+ - '/usr/lib/systemd/systemd-udevd' \`
		`+ + '/usr/bin/udevd' \`
		`+ '/usr/bin/udevadm' \`
		`+ - '/usr/bin/systemd-tmpfiles' \`
		`+ + '/usr/bin/etmpfiles' \`
		`+ '/usr/lib/udev/ata_id' \`
		`+ '/usr/lib/udev/scsi_id'`
		`+`

nonsystemd/udev/0001-artix-standalone-install.patch

file modified

+316 -192

		`@@ -1,30 +1,37 @@`
		`- From 8f016812da78f1b1d8999d9b500d60a2e4f04f88 Mon Sep 17 00:00:00 2001`
		`+ From 691896adfc752185a8340ad6c23c953a31cbe00a Mon Sep 17 00:00:00 2001`
		`From: artoo <artoo@artixlinux.org>`
		`- Date: Tue, 29 Aug 2023 17:46:28 +0200`
		`- Subject: [PATCH 1/1] artix standalone install`
		`+ Date: Sat, 2 Dec 2023 00:02:55 +0100`
		`+ Subject: [PATCH 1/1] artix-standalone-install`

		`---`
		`- factory/templates/meson.build \| 2 ++`
		`- hwdb.d/meson.build \| 12 ++++++++++++`
		`- meson.build \| 34 +++++++++++++++++++++++++++++++---`
		`- rules.d/meson.build \| 4 +++-`
		`- src/libudev/meson.build \| 9 ++++++++-`
		`- src/udev/meson.build \| 18 +++++++++++++++++-`
		`- src/udev/udevd.c \| 2 +-`
		`- sysusers.d/meson.build \| 4 ++--`
		`- tmpfiles.d/legacy.conf.in \| 3 ---`
		`- tmpfiles.d/meson.build \| 14 +++++++++-----`
		`- 10 files changed, 85 insertions(+), 17 deletions(-)`
		`+ factory/templates/meson.build \| 2 ++`
		`+ hwdb.d/meson.build \| 4 +++-`
		`+ meson.build \| 22 ++++++++++++++++++++-`
		`+ rules.d/meson.build \| 4 +++-`
		`+ shell-completion/bash/meson.build \| 32 ++-----------------------------`
		`+ shell-completion/zsh/meson.build \| 28 ++-------------------------`
		`+ src/hwdb/meson.build \| 3 ++-`
		`+ src/libudev/meson.build \| 7 ++++++-`
		`+ src/shutdown/meson.build \| 3 ++-`
		`+ src/sysusers/meson.build \| 3 ++-`
		`+ src/tmpfiles/meson.build \| 3 ++-`
		`+ src/udev/meson.build \| 14 ++++++++++++--`
		`+ src/udev/udevd.c \| 2 +-`
		`+ sysusers.d/meson.build \| 4 ++--`
		`+ test/meson.build \| 6 +++---`
		`+ tmpfiles.d/legacy.conf.in \| 3 ---`
		`+ tmpfiles.d/meson.build \| 10 ++++------`
		`+ 17 files changed, 69 insertions(+), 81 deletions(-)`

		`diff --git a/factory/templates/meson.build b/factory/templates/meson.build`
		`- index a3ba7b166f..f165b9bdad 100644`
		`+ index a3ba7b166f..bba18d851d 100644`
		`--- a/factory/templates/meson.build`
		`+++ b/factory/templates/meson.build`
		`@@ -8,6 +8,7 @@ custom_target(`
		`output : 'locale.conf',`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : true,`
		`- + install_tag : 'tmpfiles',`
		`+ + install_tag : 'etmpfiles',`
		`install_dir : factory_etc_dir)`

		`custom_target(`
		`@@ -32,13 +39,13 @@`
		`output : 'vconsole.conf',`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : true,`
		`- + install_tag : 'tmpfiles',`
		`+ + install_tag : 'etmpfiles',`
		`install_dir : factory_etc_dir)`
		`diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build`
		`- index 4c5df6ad70..3f20f836f9 100644`
		`+ index 32e6505bc6..964039710b 100644`
		`--- a/hwdb.d/meson.build`
		`+++ b/hwdb.d/meson.build`
		`- @@ -44,10 +44,12 @@ if conf.get('ENABLE_HWDB') == 1`
		`+ @@ -44,14 +44,16 @@ if conf.get('ENABLE_HWDB') == 1`
		`command : make_autosuspend_rules_py,`
		`capture : true,`
		`install : true,`
		`@@ -51,112 +58,27 @@`
		`install_dir : udevhwdbdir)`

		`if install_sysconfdir`
		`- @@ -58,6 +60,16 @@ if conf.get('ENABLE_HWDB') == 1`
		`- 'test -n "$DESTDIR" \|\| @0@/systemd-hwdb update'.format(rootbindir))`
		`- endif`
		`+ - install_emptydir(sysconfdir / 'udev/hwdb.d')`
		`+ + install_emptydir(sysconfdir / 'udev/hwdb.d', install_tag : 'udev')`

		`- + if have_standalone_binaries`
		`- + install_emptydir(`
		`- + sysconfdir / 'udev/hwdb.d',`
		`- + install_tag : 'udev')`
		`- +`
		`- + meson.add_install_script('sh', '-c',`
		`- + 'test -n "$DESTDIR" \|\| @0@/systemd-hwdb update'.format(rootbindir))`
		`- + endif`
		`- +`
		`- +`
		`- if want_tests != 'false'`
		`- parse_hwdb_py = find_program('parse_hwdb.py')`
		`- test('parse-hwdb',`
		`+ meson.add_install_script(sh, '-c',`
		`+ 'test -n "$DESTDIR" \|\| @0@/systemd-hwdb update'.format(bindir))`
		`diff --git a/meson.build b/meson.build`
		`- index 395eca1943..f5056aed33 100644`
		`+ index 7419e2b0b0..facf0a4124 100644`
		`--- a/meson.build`
		`+++ b/meson.build`
		`- @@ -158,6 +158,7 @@ rootpkglibdir = rootlibdir / 'systemd'`
		`+ @@ -118,7 +118,7 @@ includedir = prefixdir / get_option('includedir')`
		`+ datadir = prefixdir / get_option('datadir')`
		`+ localstatedir = '/' / get_option('localstatedir')`

		`- install_sysconfdir = get_option('install-sysconfdir') != 'false'`
		`- install_sysconfdir_samples = get_option('install-sysconfdir') == 'true'`
		`- +`
		`- # Dirs of external packages`
		`- pkgconfigdatadir = get_option('pkgconfigdatadir') != '' ? get_option('pkgconfigdatadir') : datadir / 'pkgconfig'`
		`- pkgconfiglibdir = get_option('pkgconfiglibdir') != '' ? get_option('pkgconfiglibdir') : libdir / 'pkgconfig'`
		`- @@ -3152,6 +3153,14 @@ meson.add_install_script(meson_make_symlink,`
		`- rootbindir / 'udevadm',`
		`- rootlibexecdir / 'systemd-udevd')`
		`-`
		`- +if have_standalone_binaries`
		`- + install_symlink(`
		`- + 'udevd',`
		`- + install_dir : rootbindir,`
		`- + install_tag : 'udev',`
		`- + pointing_to : rootbindir / 'udevadm')`
		`- +endif`
		`- +`
		`- if conf.get('ENABLE_BACKLIGHT') == 1`
		`- executable(`
		`- 'systemd-backlight',`
		`- @@ -4075,7 +4084,7 @@ if enable_sysusers`
		`- endif`
		`-`
		`- exe = executable(`
		`- - 'systemd-sysusers.standalone',`
		`- + 'esysusers',`
		`- 'src/sysusers/sysusers.c',`
		`- include_directories : includes,`
		`- c_args : '-DSTANDALONE',`
		`- @@ -4087,6 +4096,7 @@ if enable_sysusers`
		`- versiondep],`
		`- build_by_default: have_standalone_binaries,`
		`- install : have_standalone_binaries,`
		`- + install_tag : 'sysusers',`
		`- install_dir : rootbindir)`
		`- if have_standalone_binaries`
		`- public_programs += exe`
		`- @@ -4122,7 +4132,7 @@ if conf.get('ENABLE_TMPFILES') == 1`
		`- endif`
		`+ -libexecdir = prefixdir / 'lib/systemd'`
		`+ +libexecdir = bindir`
		`+ pkglibdir = libdir / 'systemd'`

		`- exe = executable(`
		`- - 'systemd-tmpfiles.standalone',`
		`- + 'etmpfiles',`
		`- systemd_tmpfiles_sources,`
		`- include_directories : includes,`
		`- c_args : '-DSTANDALONE',`
		`- @@ -4135,6 +4145,7 @@ if conf.get('ENABLE_TMPFILES') == 1`
		`- versiondep],`
		`- build_by_default: have_standalone_binaries,`
		`- install : have_standalone_binaries,`
		`- + install_tag : 'tmpfiles',`
		`- install_dir : rootbindir)`
		`- if have_standalone_binaries`
		`- public_programs += exe`
		`- @@ -4150,7 +4161,7 @@ endif`
		`-`
		`- if conf.get('ENABLE_HWDB') == 1`
		`- systemd_hwdb = executable(`
		`- - 'systemd-hwdb',`
		`- + 'udev-hwdb',`
		`- 'src/hwdb/hwdb.c',`
		`- include_directories : includes,`
		`- link_with : udev_link_with,`
		`- @@ -4158,6 +4169,7 @@ if conf.get('ENABLE_HWDB') == 1`
		`- versiondep],`
		`- install_rpath : udev_rpath,`
		`- install : true,`
		`- + install_tag : 'udev',`
		`- install_dir : rootbindir)`
		`- public_programs += systemd_hwdb`
		`-`
		`- @@ -4208,6 +4220,7 @@ udevadm = executable(`
		`- versiondep],`
		`- install_rpath : udev_rpath,`
		`- install : true,`
		`- + install_tag : 'udev',`
		`- install_dir : rootbindir)`
		`- public_programs += udevadm`
		`+ install_sysconfdir = get_option('install-sysconfdir') != 'false'`
		`+ @@ -2499,6 +2499,26 @@ install_subdir('LICENSES',`

		`- @@ -4704,6 +4717,21 @@ install_data('LICENSE.GPL2',`
		`- 'docs/UIDS-GIDS.md',`
		`- install_dir : docdir)`
		`+ install_emptydir(systemdstatedir)`

		`+install_data('LICENSE.GPL2',`
		`+ 'LICENSE.LGPL2.1',`
		`@@ -165,19 +87,24 @@`
		`+`
		`+install_data('LICENSE.GPL2',`
		`+ 'LICENSE.LGPL2.1',`
		`- + install_tag : 'sysusers',`
		`+ + install_tag : 'etmpfiles',`
		`+ + install_dir : datadir / 'doc/etmpfiles')`
		`+ +`
		`+ +install_data('LICENSE.GPL2',`
		`+ + 'LICENSE.LGPL2.1',`
		`+ + install_tag : 'esysusers',`
		`+ install_dir : datadir / 'doc/esysusers')`
		`+`
		`+install_data('LICENSE.GPL2',`
		`+ 'LICENSE.LGPL2.1',`
		`- + install_tag : 'tmpfiles',`
		`- + install_dir : datadir / 'doc/etmpfiles')`
		`+ + install_tag : 'eshutdown',`
		`+ + install_dir : datadir / 'doc/eshutdown')`
		`+`
		`- install_subdir('LICENSES',`
		`- install_dir : docdir)`
		`+ ############################################################`

		`+ # Ensure that changes to the docs/ directory do not break the`
		`diff --git a/rules.d/meson.build b/rules.d/meson.build`
		`- index 20fca222da..afc4843f8e 100644`
		`+ index 3040fae8a4..4201744f4d 100644`
		`--- a/rules.d/meson.build`
		`+++ b/rules.d/meson.build`
		`@@ -2,6 +2,7 @@`
		`@@ -188,15 +115,15 @@`
		`install_dir : udevrulesdir)`

		`rules = [`
		`- @@ -47,6 +48,7 @@ all_rules = []`
		`+ @@ -48,6 +49,7 @@ all_rules = []`
		`foreach tuple : rules`
		`if tuple.length() == 1 or tuple[1]`
		`install_data(tuple[0],`
		`- + install_tag : 'udev',`
		`+ + install_tag : 'udev',`
		`install_dir : udevrulesdir)`
		`all_rules += tuple[0]`
		`endif`
		`- @@ -56,7 +58,6 @@ rules_in = [`
		`+ @@ -57,7 +59,6 @@ rules_in = [`
		`['50-udev-default.rules'],`
		`['60-persistent-storage.rules'],`
		`['64-btrfs.rules'],`
		`@@ -204,7 +131,7 @@`

		`['70-uaccess.rules', enable_logind and conf.get('HAVE_ACL') == 1],`
		`['71-seat.rules', enable_logind],`
		`- @@ -74,6 +75,7 @@ foreach tuple : rules_in`
		`+ @@ -75,6 +76,7 @@ foreach tuple : rules_in`
		`output: tuple[0],`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : want,`
		`@@ -212,61 +139,240 @@`
		`install_dir : udevrulesdir)`

		`if want`
		`+ diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build`
		`+ index 1588b538d8..8b059638f4 100644`
		`+ --- a/shell-completion/bash/meson.build`
		`+ +++ b/shell-completion/bash/meson.build`
		`+ @@ -18,40 +18,12 @@ custom_target(`
		`+ install : bashcompletiondir != 'no',`
		`+ install_dir : bashcompletiondir)`
		`+`
		`+ -items = [['busctl', ''],`
		`+ - ['journalctl', ''],`
		`+ - ['systemd-analyze', ''],`
		`+ - ['systemd-cat', ''],`
		`+ - ['systemd-cgls', ''],`
		`+ - ['systemd-cgtop', ''],`
		`+ - ['systemd-delta', ''],`
		`+ - ['systemd-detect-virt', ''],`
		`+ - ['systemd-id128', ''],`
		`+ - ['systemd-nspawn', ''],`
		`+ - ['systemd-path', ''],`
		`+ - ['systemd-run', ''],`
		`+ - ['udevadm', ''],`
		`+ - ['bootctl', ''],`
		`+ - ['coredumpctl', 'ENABLE_COREDUMP'],`
		`+ - ['homectl', 'ENABLE_HOMED'],`
		`+ - ['hostnamectl', 'ENABLE_HOSTNAMED'],`
		`+ - ['kernel-install', 'ENABLE_KERNEL_INSTALL'],`
		`+ - ['localectl', 'ENABLE_LOCALED'],`
		`+ - ['loginctl', 'ENABLE_LOGIND'],`
		`+ - ['machinectl', 'ENABLE_MACHINED'],`
		`+ - ['networkctl', 'ENABLE_NETWORKD'],`
		`+ - ['oomctl', 'ENABLE_OOMD'],`
		`+ - ['portablectl', 'ENABLE_PORTABLED'],`
		`+ - ['resolvectl', 'ENABLE_RESOLVE'],`
		`+ - ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'],`
		`+ - ['systemd-dissect', 'HAVE_BLKID'],`
		`+ - ['systemd-resolve', 'ENABLE_RESOLVE'],`
		`+ - ['systemd-sysext', 'ENABLE_SYSEXT'],`
		`+ - ['timedatectl', 'ENABLE_TIMEDATED']]`
		`+ +items = [['udevadm', '']]`
		`+`
		`+ foreach item : items`
		`+ if bashcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)`
		`+ install_data(item[0],`
		`+ + install_tag : 'udev',`
		`+ install_dir : bashcompletiondir)`
		`+ endif`
		`+ endforeach`
		`+ diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build`
		`+ index ebe79f3985..575a0cb41c 100644`
		`+ --- a/shell-completion/zsh/meson.build`
		`+ +++ b/shell-completion/zsh/meson.build`
		`+ @@ -13,36 +13,12 @@ custom_target(`
		`+ install : zshcompletiondir != 'no',`
		`+ install_dir : zshcompletiondir)`
		`+`
		`+ -items = [['_busctl', ''],`
		`+ - ['_journalctl', ''],`
		`+ - ['_systemd-analyze', ''],`
		`+ - ['_systemd-delta', ''],`
		`+ - ['_systemd-nspawn', ''],`
		`+ - ['_systemd', ''],`
		`+ - ['_systemd-path', ''],`
		`+ - ['_systemd-run', ''],`
		`+ - ['_udevadm', ''],`
		`+ - ['_kernel-install', 'ENABLE_KERNEL_INSTALL'],`
		`+ - ['_sd_hosts_or_user_at_host', ''],`
		`+ - ['_sd_outputmodes', ''],`
		`+ - ['_sd_unit_files', ''],`
		`+ - ['_sd_machines', ''],`
		`+ - ['_bootctl', ''],`
		`+ - ['_coredumpctl', 'ENABLE_COREDUMP'],`
		`+ - ['_hostnamectl', 'ENABLE_HOSTNAMED'],`
		`+ - ['_localectl', 'ENABLE_LOCALED'],`
		`+ - ['_loginctl', 'ENABLE_LOGIND'],`
		`+ - ['_machinectl', 'ENABLE_MACHINED'],`
		`+ - ['_networkctl', 'ENABLE_NETWORKD'],`
		`+ - ['_oomctl', 'ENABLE_OOMD'],`
		`+ - ['_systemd-inhibit', 'ENABLE_LOGIND'],`
		`+ - ['_resolvectl', 'ENABLE_RESOLVE'],`
		`+ - ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],`
		`+ - ['_timedatectl', 'ENABLE_TIMEDATED']]`
		`+ +items = [['_udevadm', '']]`
		`+`
		`+ foreach item : items`
		`+ if zshcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)`
		`+ install_data(item[0],`
		`+ + install_tag : 'udev',`
		`+ install_dir : zshcompletiondir)`
		`+ endif`
		`+ endforeach`
		`+ diff --git a/src/hwdb/meson.build b/src/hwdb/meson.build`
		`+ index 385ed854d6..b4b697b634 100644`
		`+ --- a/src/hwdb/meson.build`
		`+ +++ b/src/hwdb/meson.build`
		`+ @@ -2,11 +2,12 @@`
		`+`
		`+ executables += [`
		`+ executable_template + {`
		`+ - 'name' : 'systemd-hwdb',`
		`+ + 'name' : 'udev-hwdb',`
		`+ 'public' : true,`
		`+ 'conditions' : ['ENABLE_HWDB'],`
		`+ 'sources' : files('hwdb.c'),`
		`+ 'link_with' : udev_link_with,`
		`+ + 'install_tag' : 'udev',`
		`+ 'install_rpath' : udev_rpath,`
		`+ },`
		`+ ]`
		`diff --git a/src/libudev/meson.build b/src/libudev/meson.build`
		`- index 3787602a6b..77950cb2a6 100644`
		`+ index 7f999197af..c8cb1d482c 100644`
		`--- a/src/libudev/meson.build`
		`+++ b/src/libudev/meson.build`
		`- @@ -23,6 +23,13 @@ libudev_sym_path = libudev_dir_path / 'libudev.sym'`
		`+ @@ -23,6 +23,11 @@ libudev_sym_path = libudev_dir_path / 'libudev.sym'`
		`install_headers('libudev.h')`
		`libudev_h_path = libudev_dir_path / 'libudev.h'`

		`- +if have_standalone_binaries`
		`- + install_data(`
		`- + libudev_h_path,`
		`- + install_dir: includedir,`
		`- + install_tag: 'libudev-devel')`
		`- +endif`
		`+ +install_data(`
		`+ + libudev_h_path,`
		`+ + install_dir: includedir,`
		`+ + install_tag: 'libudev-devel')`
		`+`
		`libudev_basic = static_library(`
		`'udev-basic',`
		`libudev_sources,`
		`- @@ -40,7 +47,7 @@ libudev_pc = custom_target(`
		`+ @@ -40,5 +45,5 @@ libudev_pc = custom_target(`
		`output : 'libudev.pc',`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : pkgconfiglibdir != 'no',`
		`- install_tag : 'devel',`
		`+ install_tag : 'libudev-devel',`
		`install_dir : pkgconfiglibdir)`
		`-`
		`- ############################################################`
		`+ diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build`
		`+ index 219f9fd308..1317c10741 100644`
		`+ --- a/src/shutdown/meson.build`
		`+ +++ b/src/shutdown/meson.build`
		`+ @@ -16,7 +16,7 @@ executables += [`
		`+ 'dependencies' : libmount,`
		`+ },`
		`+ libexec_template + {`
		`+ - 'name' : 'systemd-shutdown.standalone',`
		`+ + 'name' : 'eshutdown',`
		`+ 'sources' : systemd_shutdown_sources,`
		`+ 'c_args' : '-DSTANDALONE',`
		`+ 'link_with' : [`
		`+ @@ -26,6 +26,7 @@ executables += [`
		`+ ],`
		`+ 'dependencies' : libmount,`
		`+ 'build_by_default' : have_standalone_binaries,`
		`+ + 'install_tag' : 'eshutdown',`
		`+ 'install' : have_standalone_binaries,`
		`+ },`
		`+ test_template + {`
		`+ diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build`
		`+ index fcb291d02c..ad0721b09d 100644`
		`+ --- a/src/sysusers/meson.build`
		`+ +++ b/src/sysusers/meson.build`
		`+ @@ -8,7 +8,7 @@ executables += [`
		`+ 'sources' : files('sysusers.c'),`
		`+ },`
		`+ executable_template + {`
		`+ - 'name' : 'systemd-sysusers.standalone',`
		`+ + 'name' : 'esysusers',`
		`+ 'public' : have_standalone_binaries,`
		`+ 'conditions' : ['ENABLE_SYSUSERS'],`
		`+ 'sources' : files('sysusers.c'),`
		`+ @@ -20,6 +20,7 @@ executables += [`
		`+ libsystemd_static,`
		`+ ],`
		`+ 'build_by_default' : have_standalone_binaries,`
		`+ + 'install_tag' : 'esysusers',`
		`+ 'install' : have_standalone_binaries,`
		`+ },`
		`+ ]`
		`+ diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build`
		`+ index 8a24a21a27..fad4ea730e 100644`
		`+ --- a/src/tmpfiles/meson.build`
		`+ +++ b/src/tmpfiles/meson.build`
		`+ @@ -14,7 +14,7 @@ executables += [`
		`+ 'dependencies' : libacl,`
		`+ },`
		`+ executable_template + {`
		`+ - 'name' : 'systemd-tmpfiles.standalone',`
		`+ + 'name' : 'etmpfiles',`
		`+ 'public' : have_standalone_binaries,`
		`+ 'conditions' : ['ENABLE_TMPFILES'],`
		`+ 'sources' : systemd_tmpfiles_sources,`
		`+ @@ -27,6 +27,7 @@ executables += [`
		`+ ],`
		`+ 'dependencies' : libacl,`
		`+ 'build_by_default' : have_standalone_binaries,`
		`+ + 'install_tag' : 'etmpfiles',`
		`+ 'install' : have_standalone_binaries,`
		`+ },`
		`+ test_template + {`
		`diff --git a/src/udev/meson.build b/src/udev/meson.build`
		`- index 96f7930e9e..aeb5281abc 100644`
		`+ index 824ec47803..570cf6b833 100644`
		`--- a/src/udev/meson.build`
		`+++ b/src/udev/meson.build`
		`- @@ -141,6 +141,7 @@ foreach prog : udev_progs`
		`- link_with : udev_link_with,`
		`- install_rpath : udev_rpath,`
		`- install : true,`
		`- + install_tag : 'udev',`
		`- install_dir : udevlibexecdir)`
		`-`
		`- udev_prog_paths += {name : exe}`
		`- @@ -154,13 +155,22 @@ if install_sysconfdir_samples`
		`- install_dir : sysconfdir / 'udev')`
		`+ @@ -129,6 +129,7 @@ udev_plugin_template = executable_template + {`
		`+ 'public' : true,`
		`+ 'link_with' : udev_link_with,`
		`+ 'install_rpath' : udev_rpath,`
		`+ + 'install_tag' : 'udev',`
		`+ 'install_dir' : udevlibexecdir,`
		`+ }`
		`+`
		`+ @@ -152,6 +153,7 @@ executables += [`
		`+ 'sources' : udevadm_sources,`
		`+ 'link_with' : [libudevd_core],`
		`+ 'dependencies' : udev_dependencies,`
		`+ + 'install_tag' : 'udev',`
		`+ 'install_rpath' : udev_rpath,`
		`+ },`
		`+ udev_plugin_template + {`
		`+ @@ -252,10 +254,18 @@ executables += [`
		`+ meson.add_install_script(sh, '-c', ln_s.format(bindir / 'udevadm',`
		`+ libexecdir / 'systemd-udevd'))`
		`+`
		`+ +install_symlink(`
		`+ + 'udevd',`
		`+ + install_dir : bindir,`
		`+ + install_tag : 'udev',`
		`+ + pointing_to : bindir / 'udevadm')`
		`+ +`
		`+ if install_sysconfdir_samples`
		`+ install_data('udev.conf',`
		`+ + install_tag : 'udev',`
		`+ install_dir : configfiledir / 'udev')`
		`+ install_data('iocost/iocost.conf',`
		`+ + install_tag : 'udev',`
		`+ install_dir : configfiledir / 'udev')`
		`endif`

		`- +if have_standalone_binaries`
		`- + install_data('udev.conf',`
		`- + install_tag : 'udev',`
		`- + install_dir : sysconfdir / 'udev')`
		`- + install_data('iocost/iocost.conf',`
		`- + install_tag : 'udev',`
		`- + install_dir : sysconfdir / 'udev')`
		`- +endif`
		`- +`
		`- udev_pc = custom_target(`
		`- 'udev.pc',`
		`- input : 'udev.pc.in',`
		`+ @@ -265,9 +275,9 @@ udev_pc = custom_target(`
		`output : 'udev.pc',`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : pkgconfigdatadir != 'no',`
		`@@ -275,24 +381,14 @@`
		`install_dir : pkgconfigdatadir)`

		`if install_sysconfdir`
		`- @@ -168,6 +178,12 @@ if install_sysconfdir`
		`- mkdir_p.format(sysconfdir / 'udev/rules.d'))`
		`+ - install_emptydir(sysconfdir / 'udev/rules.d')`
		`+ + install_emptydir(sysconfdir / 'udev/rules.d', install_tag : 'udev')`
		`endif`
		`-`
		`- +if have_standalone_binaries`
		`- + install_emptydir(`
		`- + sysconfdir / 'udev/rules.d',`
		`- + install_tag : 'udev')`
		`- +endif`
		`- +`
		`- simple_fuzzers += files(`
		`- 'fuzz-udev-rule-parse-value.c',`
		`- )`
		`diff --git a/src/udev/udevd.c b/src/udev/udevd.c`
		`- index fe29dd94b3..01f7b9c092 100644`
		`+ index 2ed4282253..92549255fc 100644`
		`--- a/src/udev/udevd.c`
		`+++ b/src/udev/udevd.c`
		`- @@ -2037,7 +2037,7 @@ int run_udevd(int argc, char *argv[]) {`
		`+ @@ -384,7 +384,7 @@ int run_udevd(int argc, char *argv[]) {`
		`if (arg_daemonize) {`
		`pid_t pid;`

		`@@ -302,7 +398,7 @@`
		`/* connect /dev/null to stdin, stdout, stderr */`
		`if (log_get_max_level() < LOG_DEBUG) {`
		`diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build`
		`- index 608c4b744a..37bf31b4f1 100644`
		`+ index 608c4b744a..93fdc08b2c 100644`
		`--- a/sysusers.d/meson.build`
		`+++ b/sysusers.d/meson.build`
		`@@ -8,7 +8,7 @@ foreach pair : files`
		`@@ -310,7 +406,7 @@`
		`# do nothing`
		`elif pair[1] == '' or conf.get(pair[1]) == 1`
		`- install_data(pair[0], install_dir : sysusersdir)`
		`- + install_data(pair[0], install_tag : 'sysusers', install_dir : sysusersdir)`
		`+ + install_data(pair[0], install_tag : 'esysusers', install_dir : sysusersdir)`
		`else`
		`message('Not installing sysusers.d/@0@ because @1@ is @2@'`
		`.format(pair[0], pair[1], conf.get(pair[1], 0)))`
		`@@ -326,9 +422,40 @@`
		`output: file,`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : tuple[1],`
		`- + install_tag : 'sysusers',`
		`+ + install_tag : 'esysusers',`
		`install_dir : sysusersdir)`
		`endforeach`
		`+ diff --git a/test/meson.build b/test/meson.build`
		`+ index b47fa612b1..dbb0d2e057 100644`
		`+ --- a/test/meson.build`
		`+ +++ b/test/meson.build`
		`+ @@ -76,7 +76,7 @@ if conf.get('ENABLE_SYSUSERS') == 1`
		`+ suite : 'sysusers')`
		`+`
		`+ if have_standalone_binaries`
		`+ - exe = executables_by_name.get('systemd-sysusers.standalone')`
		`+ + exe = executables_by_name.get('esysusers')`
		`+ test('test-sysusers.standalone',`
		`+ test_sysusers_sh,`
		`+ # https://github.com/mesonbuild/meson/issues/2681`
		`+ @@ -99,7 +99,7 @@ endif`
		`+`
		`+ if want_tests != 'false' and conf.get('ENABLE_HWDB') == 1`
		`+ hwdb_test_sh = find_program('hwdb-test.sh')`
		`+ - exe = executables_by_name.get('systemd-hwdb')`
		`+ + exe = executables_by_name.get('udev-hwdb')`
		`+ test('hwdb-test',`
		`+ hwdb_test_sh,`
		`+ suite : 'dist',`
		`+ @@ -158,7 +158,7 @@ if want_tests != 'false' and conf.get('ENABLE_TMPFILES') == 1`
		`+ suite : 'tmpfiles')`
		`+`
		`+ if have_standalone_binaries`
		`+ - exe = executables_by_name.get('systemd-tmpfiles.standalone')`
		`+ + exe = executables_by_name.get('etmpfiles')`
		`+ test('test-systemd-tmpfiles.standalone',`
		`+ test_systemd_tmpfiles_py,`
		`+ args : exe.full_path(),`
		`diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in`
		`index 4f2c0d7c43..62e2ae0986 100644`
		`--- a/tmpfiles.d/legacy.conf.in`
		`@@ -344,7 +471,7 @@`
		`# /run/lock/subsys is used for serializing SysV service execution, and`
		`# hence without use on SysV-less systems.`
		`diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build`
		`- index 4d94e3743f..f81a6cde96 100644`
		`+ index 4c11ad6e20..2f75801314 100644`
		`--- a/tmpfiles.d/meson.build`
		`+++ b/tmpfiles.d/meson.build`
		`@@ -4,14 +4,12 @@ enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1`
		`@@ -367,7 +494,7 @@`
		`# do nothing`
		`elif pair[1] == '' or conf.get(pair[1]) == 1`
		`- install_data(pair[0], install_dir : tmpfilesdir)`
		`- + install_data(pair[0], install_tag : 'tmpfiles', install_dir : tmpfilesdir)`
		`+ + install_data(pair[0], install_tag : 'etmpfiles', install_dir : tmpfilesdir)`
		`else`
		`message('Not installing tmpfiles.d/@0@ because @1@ is @2@'`
		`.format(pair[0], pair[1], conf.get(pair[1], 0)))`
		`@@ -386,20 +513,17 @@`
		`output: pair[0],`
		`command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],`
		`install : enable_tmpfiles,`
		`- + install_tag : 'tmpfiles',`
		`+ + install_tag : 'etmpfiles',`
		`install_dir : tmpfilesdir)`
		`else`
		`message('Not installing tmpfiles.d/@0@ because @1@ is @2@'`
		`- @@ -57,3 +55,9 @@ if enable_tmpfiles and install_sysconfdir`
		`- meson.add_install_script(`
		`- 'sh', '-c', mkdir_p.format(sysconfdir / 'tmpfiles.d'))`
		`+ @@ -54,5 +52,5 @@ foreach pair : in_files`
		`+ endforeach`
		`+`
		`+ if enable_tmpfiles and install_sysconfdir`
		`+ - install_emptydir(sysconfdir / 'tmpfiles.d')`
		`+ + install_emptydir(sysconfdir / 'tmpfiles.d', install_tag : 'etmpfiles')`
		`endif`
		`- +`
		`- +if enable_tmpfiles and have_standalone_binaries`
		`- + install_emptydir(`
		`- + sysconfdir / 'tmpfiles.d',`
		`- + install_tag : 'tmpfiles')`
		`- +endif`
		`--`
		`- 2.42.0`
		`+ 2.44.0`

nonsystemd/udev/PKGBUILD

file modified

+132 -83

		`@@ -1,28 +1,35 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Artix): Artoo <artoo@artixlinux.org>`
		`- # Contributor (Arch): Christian Hesse <mail@eworm.de>`
		`- # Contributor (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Contributor (Arch): Tom Gundersen <teg@jklm.no>`
		`+ # Maintainer (artix): Artoo <artoo@artixlinux.org>`
		`+ # Contributor (arch): Christian Hesse <mail@eworm.de>`
		`+ # Contributor (arch): Dave Reisner <dreisner@archlinux.org>`
		`+ # Contributor (arch): Tom Gundersen <teg@jklm.no>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - support multiple arches`
		`+ # - branding`
		`+`

		`_pkgbase=systemd-stable`

		`- _alpm=1.4 # git rev-parse ${_alpm} #83961019292a041e1d2c07389d639065632e3f1f`
		`+ _alpm=1.6.2 # git rev-parse ${_alpm}`

		`pkgbase=udev`
		`pkgname=('udev' 'libudev' 'esysusers' 'etmpfiles')`
		`pkgdesc='Userspace device file manager'`
		`- _tag='2c4171c3c4146fcb32253bfb6423b5a3ee42a553' # git rev-parse v${_tag_name}`
		`- _tag_name=254.1`
		`- pkgver="${_tag_name/-/}"`
		`+ _tag='4003dd6754e3446691402d3cc389fbfd4faccc90' # git rev-parse v${_tag_name}`
		`+ _tag_name=255.4`
		`+ pkgver="${_tag_name/~/}"`
		`pkgrel=2`
		`arch=('x86_64')`
		`arch+=('i686' 'armv7h')`
		`url='https://www.github.com/systemd/systemd'`
		`- license=('GPL2' 'LGPL2.1')`
		`- makedepends=('acl' 'libacl.so' 'gperf' 'hwdata' 'kbd' 'kmod' 'libkmod.so'`
		`- 'libcap' 'libcap.so' 'libxcrypt' 'libcrypt.so' 'util-linux' 'libblkid.so'`
		`- 'docbook-xsl' 'git' 'intltool' 'meson' 'python-jinja' 'rsync')`
		`- options=('strip')`
		`+ # license=('GPL-2.0-or-later' 'LGPL-2.1-or-later')`
		`+ license=('GPL' 'LGPL')`
		`+ makedepends=('acl' 'gperf' 'hwdata' 'kbd' 'kmod'`
		`+ 'libcap' 'libxcrypt' 'util-linux' 'docbook-xsl'`
		`+ 'git' 'intltool' 'meson' 'python-jinja' 'rsync'`
		`+ 'bash-completion')`
		`validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>`
		`'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com>`
		`'9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github@gmail.com>`
		`@@ -30,17 +37,14 @@`
		`source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}" #?signed`
		`"git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}" #?signed`
		`"git+https://gitea.artixlinux.org/artix/alpm-hooks.git#tag=${_alpm}"`
		`- initcpio-{hook,install}-udev`
		`0001-Use-Arch-Linux-device-access-groups.patch`
		`0001-artix-standalone-install.patch`
		`)`
		`sha512sums=('SKIP'`
		`'SKIP'`
		`'SKIP'`
		`- '5468867509f16e1955242db235aad760672545ab2d7f74d7f5316904494b9218db1dde0d008e789fbfbed8a82b3144f20f2c927f224ca5e9f3a98becd517864f'`
		`- '285ac182e5666317bef8c91c9559b71325a0bd42352289800e13a8724c883dd0bc903e731eef3f6238e5f261c75c3308886627221fda2d2e4170e5626e9adc1d'`
		`'c5845849a8c66cc1192b1f263098b379c983f779c9521771c6dddc5271e75e96672dce4db112895dcd43f129f884353ecbbab4103c704fbd046657f269a324e1'`
		`- '3d985204cda5faadc21188874127a03d1543072e16c11eca871ea000d273c226ffba3b458d06606fdef4334326bd6fed727fe1d781c763871ff4bdaa8fb42d66')`
		`+ 'c8a14c044504bd6117918a9da0b236519417d41c4ff7959d8642f949199107c767d4337b5f730ea3a7827f6757272836596b0dfbe4785ca550f8008362189193')`

		`_backports=(`
		`)`
		`@@ -64,26 +68,29 @@`
		`git revert -n "${_c}"`
		`done`

		`- patch -Np1 -i ../0001-artix-standalone-install.patch`
		`-`
		`# Replace cdrom/dialout/tape groups with optical/uucp/storage`
		`patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch`
		`+`
		`+ patch -Np1 -i ../0001-artix-standalone-install.patch`
		`}`

		`build() {`
		`local _meson_options=() _targets=()`

		`_meson_options+=(`
		`- -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-parabola"`
		`+ -Dversion-tag="${_tag_name}-${pkgrel}-parabola"`
		`-Dshared-lib-tag="${pkgver}-${pkgrel}"`
		`-Dmode=release`

		`-Dstandalone-binaries=true`
		`-Dsysusers=true`
		`-Dtmpfiles=true`
		`+`
		`-Dhwdb=true`
		`- -Dblkid=true`
		`- -Dkmod=true`
		`+`
		`+ -Dblkid=enabled`
		`+`
		`+ -Dkmod=enabled`

		`-Dgshadow=false`

		`@@ -95,12 +102,12 @@`
		`-Dtests=true`

		`-Dlink-udev-shared=false`
		`- -Dlink-boot-shared=false`

		`-Ddefault-keymap='us'`

		`- -Dman=false`
		`- -Dhtml=false`
		`+ -Dman=enabled`
		`+`
		`+ -Dhtml=disabled`

		`-Ddns-servers=''`
		`-Dntp-servers=''`
		`@@ -115,20 +122,21 @@`

		`-Dadm-group=false`
		`-Danalyze=false`
		`- -Dapparmor=false`
		`- -Daudit=false`
		`+`
		`+ -Dapparmor=disabled`
		`+ -Daudit=disabled`
		`-Dbacklight=false`
		`-Dbinfmt=false`
		`- -Dbootloader=false`
		`- -Dbzip2=false`
		`+ -Dbootloader=disabled`
		`+ -Dbzip2=disabled`
		`-Dcoredump=false`
		`- -Ddbus=false`
		`- -Delfutils=false`
		`+ -Ddbus=disabled`
		`+ -Delfutils=disabled`
		`-Denvironment-d=false`
		`- -Dfdisk=false`
		`- -Dgcrypt=false`
		`- -Dglib=false`
		`- -Dgnutls=false`
		`+ -Dfdisk=disabled`
		`+ -Dgcrypt=disabled`
		`+ -Dglib=disabled`
		`+ -Dgnutls=disabled`
		`-Dhibernate=false`
		`-Dhostnamed=false`
		`-Didn=false`
		`@@ -137,63 +145,82 @@`
		`-Dfirstboot=false`
		`-Dkernel-install=false`
		`-Dldconfig=false`
		`- -Dlibcryptsetup=false`
		`- -Dlibcurl=false`
		`- -Dlibfido2=false`
		`- -Dlibidn=false`
		`- -Dlibidn2=false`
		`- -Dlibiptc=false`
		`+ -Dlibcryptsetup=disabled`
		`+ -Dlibcurl=disabled`
		`+ -Dlibfido2=disabled`
		`+ -Dlibidn=disabled`
		`+ -Dlibidn2=disabled`
		`+ -Dlibiptc=disabled`
		`-Dlocaled=false`
		`-Dlogind=false`
		`- -Dlz4=false`
		`+ -Dlz4=disabled`
		`-Dmachined=false`
		`- -Dmicrohttpd=false`
		`+ -Dmicrohttpd=disabled`
		`-Dnetworkd=false`
		`-Dnscd=false`
		`-Dnss-myhostname=false`
		`- -Dnss-resolve=false`
		`+ -Dnss-resolve=disabled`
		`-Dnss-systemd=false`
		`-Doomd=false`
		`- -Dopenssl=false`
		`- -Dp11kit=false`
		`- -Dpam=false`
		`- -Dpcre2=false`
		`- -Dpolkit=false`
		`+ -Dopenssl=disabled`
		`+ -Dp11kit=disabled`
		`+ -Dpam=disabled`
		`+ -Dpcre2=disabled`
		`+ -Dpolkit=disabled`
		`-Dportabled=false`
		`-Dpstore=false`
		`- -Dpwquality=false`
		`+ -Dpwquality=disabled`
		`-Drandomseed=false`
		`-Dresolve=false`
		`-Drfkill=false`
		`- -Dseccomp=false`
		`+ -Dseccomp=disabled`
		`-Dsmack=false`
		`+ -Dstoragetm=false`
		`-Dsysext=false`
		`-Dtimedated=false`
		`-Dtimesyncd=false`
		`-Dtpm=false`
		`- -Dqrencode=false`
		`+ -Dqrencode=disabled`
		`-Dquotacheck=false`
		`-Duserdb=false`
		`-Dutmp=false`
		`-Dvconsole=false`
		`+ -Dvmspawn=disabled`
		`-Dwheel-group=false`
		`-Dxdg-autostart=false`
		`- -Dxkbcommon=false`
		`- -Dxz=false`
		`- -Dzlib=false`
		`- -Dzstd=false`
		`+ -Dxkbcommon=disabled`
		`+ -Dxz=disabled`
		`+ -Dzlib=disabled`
		`+ -Dzstd=disabled`
		`+`
		`+ -Dbpf-framework=disabled`
		`+ -Dpasswdqc=disabled`
		`+ -Dselinux=disabled`
		`+ -Dxenctrl=disabled`
		`+ -Dlibcryptsetup-plugins=disabled`
		`+ -Drepart=disabled`
		`+ -Dsysupdate=disabled`
		`+ -Dimportd=disabled`
		`+ -Dhomed=disabled`
		`+ -Dremote=disabled`
		`+ -Dnss-mymachines=disabled`
		`+ -Dukify=disabled`
		`+ -Dtpm2=disabled`
		`)`
		`- arch-meson "$_pkgbase" build "${_meson_options[@]}"`
		`+`
		`+ artix-meson() { arch-meson "$@" ; } # minimize diff`
		`+ artix-meson "$_pkgbase" build "${_meson_options[@]}"`

		`_targets+=(`
		`udev:shared_library`
		`src/libudev/libudev.pc`
		`+`
		`udevadm`
		`+ {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}`
		`+ rules.d/{50-udev-default,60-persistent-storage,64-btrfs}.rules`
		`udev-hwdb`
		`- src/udev/{ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}`
		`- src/udev/udev.pc`
		`- rules.d/{50-udev-default,64-btrfs}.rules`
		`hwdb.d/60-autosuspend-chromiumos.hwdb`
		`+ src/udev/udev.pc`
		`man/{libudev.3,udev.conf.5,hwdb.7,udev.7,udevadm.8,iocost.conf.5,systemd-hwdb.8}`

		`esysusers`
		`@@ -207,35 +234,59 @@`
		`systemd-detect-virt`
		`systemd-runtest.env`

		`- test-fido-id-desc`
		`- test-udev-builtin`
		`- test-udev-event`
		`- test-udev-node`
		`- test-udev-util`
		`- test-udev-device-thread`
		`test-libudev`
		`test-libudev-sym`
		`+`
		`+ test-udev-builtin`
		`+ test-udev-device-thread`
		`+ test-udev-format`
		`+ test-udev-manager`
		`+ test-udev-node`
		`+ test-udev-rules`
		`+ test-udev-spawn`
		`+ #test-udev-util`
		`+`
		`+ test-fido-id-desc`
		`+ test-link-config-tables`
		`)`
		`meson compile -C build "${_targets[@]}"`
		`}`

		`check() {`
		`- local tests=()`
		`- tests+=(`
		`- rule-syntax-check`
		`- test-fido-id-desc`
		`- test-udev-builtin`
		`- test-udev-event`
		`- test-udev-node`
		`- test-udev-util`
		`- test-udev-device-thread`
		`+ local _tests=()`
		`+ _tests+=(`
		`+ udev-rules-check`
		`+ hwdb-test`
		`+`
		`test-libudev`
		`test-libudev-sym`

		`- test-sysusers.standalone`
		`+ test-udev`
		`+ test-udev-builtin`
		`+ test-udev-device-thread`
		`+ test-udev-format`
		`+ test-udev-manager`
		`+ test-udev-node`
		`+ test-udev-rules`
		`+ test-udev-spawn`
		`+ #test-udev-util`
		`+`
		`+ test-fido-id-desc`
		`+ test-link-config-tables`
		`+`
		`+ dmidecode_HP-Z600`
		`+ dmidecode_Lenovo-ThinkPad-X280`
		`+ dmidecode_Lenovo-Thinkcentre-m720s`
		`+`
		`+`
		`test-systemd-tmpfiles.standalone`
		`+ test-sysusers.standalone`
		`+`
		`+ #test-tmpfile-util`
		`+ #test-offline-passwd`
		`)`
		`- meson test -C build --print-errorlogs "${tests[@]}"`
		`+`
		`+ meson test -C build --print-errorlogs "${_tests[@]}"`
		`}`

		`_inst_man() {`
		`@@ -254,6 +305,8 @@`
		`'kbd' 'kmod' 'libkmod.so' 'libcap' 'libcap.so'`
		`'libudev' 'util-linux' 'libblkid.so')`
		`provides=("udev=$pkgver")`
		`+ backup=(etc/udev/iocost.conf`
		`+ etc/udev/udev.conf)`

		`meson install -C build --destdir "$pkgdir" --no-rebuild --tags udev,udev-devel`

		`@@ -261,10 +314,6 @@`
		`_inst_man "$m"`
		`done`

		`- # initcpio`
		`- install -vD -m0644 initcpio-install-udev "${pkgdir}"/usr/lib/initcpio/install/udev`
		`- install -vD -m0644 initcpio-hook-udev "${pkgdir}"/usr/lib/initcpio/hooks/udev`
		`-`
		`# pacman hooks`
		`make -C alpm-hooks DESTDIR="${pkgdir}" install_udev`
		`}`
		`@@ -286,7 +335,7 @@`
		`'libcap' 'libcap.so'`
		`'libxcrypt' 'libcrypt.so')`

		`- meson install -C build --destdir "$pkgdir" --no-rebuild --tags sysusers`
		`+ meson install -C build --destdir "$pkgdir" --no-rebuild --tags esysusers`

		`_inst_man "sysusers.d.5"`
		`_inst_man "systemd-sysusers.8"`
		`@@ -301,7 +350,7 @@`
		`'gcc-libs' 'glibc'`
		`'libcap' 'libcap.so')`

		`- meson install -C build --destdir "$pkgdir" --no-rebuild --tags tmpfiles`
		`+ meson install -C build --destdir "$pkgdir" --no-rebuild --tags etmpfiles`

		`_inst_man "tmpfiles.d.5"`
		`_inst_man "systemd-tmpfiles.8"`

nonsystemd/udev/keys/pgp/5C251B5FC54EB2F80F407AAAC54CA336CFEB557E.asc

file added

+51

		`@@ -0,0 +1,51 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQINBFBHPMsBEACeInGYJCb+7TurKfb6wGyTottCDtiSJB310i37/6ZYoeIay/5s`
		`+ oJjlMyfMFQ9T2XNT/0LM6gTa0MpC1st9LnzYTMsT6tzRly1D1UbVI6xw0g0vE5y2`
		`+ Cjk3xUwAynCsSsgg5KrjdYWRqLSTZ3zEABm/gNg6OgA5l6QU+geXcQ9+P285WoUu`
		`+ j0j7HN6T217Bd+RcVxNWOMxsqx+b0rjWa8db1KiwM95wddCwzMPB2S/6IswD1P8n`
		`+ VfGnkgp7pfoTyMuDkVU6hmO5RHq9M26eNoQ4sJZuXe5YjODnjgxkKKilFLY8hUkj`
		`+ wa1VPrx4QnTwzIn16JlUO03At9tpe+9SnShDV0cBlHxo3DhnHmCPWJ0HquLGpdDV`
		`+ i8d9tn0nlit96z9Svb9ii6Uq/J8zR1Bp+hxCMN/ON1c4U+cf1jfADPO5c3KV89y5`
		`+ wvvQvzjTjuzVolR4ZZmkNSql+4vspo94JrssymEv9WWiMJyOjN50QhLbgmWiuzYj`
		`+ odZiL0CTB4MAC+hTrDZrZfyAnbAttBLfNWd/jcdK+AGVRXtqU997sZPzj8z3b7v2`
		`+ N5YJqgm2aQTiDehtHtHDJ8rKh7kcsssnhzzoZluTKl96JHgllFWUC6sedAFVxHDm`
		`+ b7cxb+Sr0krwbt22is+41gPCuoz1MRKwQYQPTYgcCzX/PzyOHj6KEYZCIQARAQAB`
		`+ tDBaYmlnbmlldyBKxJlkcnplamV3c2tpLVN6bWVrIDx6YnlzemVrQGluLndhdy5w`
		`+ bD6JAjgEEwECACIFAlBHPMsCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ`
		`+ EMVMozbP61V+T80QAIHvIeDdKKrqiN98ob+aNe4McpqXWgiLoDMWaxQ7R8K+2Uia`
		`+ HMn2J6abhKidvUr7mnixkyBZaRxi1JiT8uzX4HTQ3B/UVJgf2QiRHRvZpdSVn7O7`
		`+ OF0u4SqH6BEw5UaA30hMWtgz7m6aXSAN1aitd4efgKjBYKtfsHJ63HhFrpJyIyOG`
		`+ g0eLGObXJxjW04cUbzPoCoNuFcpphzW3WhdaJ5PXblfjNxWxKzwvAzRhevDjrrKU`
		`+ 4jARNAIkLUMi4gUoC+7th6ATGWjYV8iOvju1cLExn8ktYMZl+BhbkYiRMddMZaZ/`
		`+ nY2T2SqQ8kkEXJyY6SNtd/BWuCPyt0RlTgPSK4SK9JGArVJ/PSXJrn53JUl1MUc4`
		`+ /75JE2KEBPkN4jQpeshlPfm0mzo/+opyi6iyVnPTZT7m7r9P7Vxc18J+IlPdfl0w`
		`+ s0YPnR+0oUvo370zoNqqhJ9aNU+5d4VCPUHVIvEWEF3MHuXHKq0mnnI/4jJMvZn3`
		`+ 0+okZZfYABYXkMZVTA0XprkIxZm38X9s/uw886xvMqPh8fhqpVdTHD5/2h8ahkMM`
		`+ G1zKs6W6gCfM7gYh+BT37Ce1szo/7RHtbvYq5BTwcWXhpSKzywluRe6rYUPJ0MCZ`
		`+ 17Jk6AXStD1aRYS6rCykryRL0OvMz/4Gd8f+dcQjg5Si23mAj8VJtyrX1MaXuQIN`
		`+ BFBHPMsBEACtDR2e2G4uL/MKtDsJu3cwQFlK9kmGEX4UqePBc29xn1BTfU6o1Y4p`
		`+ AXRoLrGvXuVruOwznNdkpjF8kb1BpO/li8qNU6LKyv2n9Hyg0bxRQA24TVC4bF4m`
		`+ fdqaGGYLqxe3iXI/TRmhsmiSg7WoEWxj0NEaEjydTAieT4kz2ASCYtnzhGM8iS2T`
		`+ e+scUXYcGNyE2nPjiacJGiLeKiOj21+j6sICTrKX8TAcXSU7btPEy2IIocxBoxZe`
		`+ Ofp0rNw4293cLVu0kEasB4h43lE1Uax7JYX1q9LC4TkqLaLDa3YyDGvK2FOPNNIr`
		`+ sKcoYG6Y43DcmaSPZCJ1ApVvoxPct7UI+EYy9VBu3wwY0obRadweXSNgscZZNvEx`
		`+ ZgdjRXJypv8A9A+nvc2xBMWw/9fAlHzrpjds+3Z2RxbGC4Qav/sdP0WqQZ8xo5U2`
		`+ YPxBSHwWCjSxvQWcoDLLOgMlB05oheR2g1VDk4QA+AXDwmxurpvJLh/fyX3mi7nP`
		`+ VUynTLV/UeWaXbZneh+mT3Lc1ZVYnntSoZv7aYQqnA+a2ajm08lVMmpb5v8L7Zia`
		`+ dvW2xptVATlWI1DeBTyNwZYyx7GuUsfFTSyQJixtjuWim0acpqNUp8z6TgXj02Ht`
		`+ Rfk9SwzvBCgJT5mWoGlSu04FR/0pn5ReVCM8RSb6/HOROnrfswGeGQARAQABiQIf`
		`+ BBgBAgAJBQJQRzzLAhsMAAoJEMVMozbP61V+qg8P/1BuLn6+bVgDdye37GV4kXSV`
		`+ xB5SQZj8ElwTj+daWq8ZEIoZ0ySyRz2uC7Haeh5XulF1hj13AYfM4Ary9Whx9hCQ`
		`+ 98D4+JK5eiagBuSpIApCkQk+jj44q7VKLanyZV0kWRNBSfr0TnE6GoBSL1gTjpsq`
		`+ t/mUR2R5zgCE59Ex4HHBwvosIcXgGopbPGNtX9S4Rm7f2wWOSdXGc6pfnuFsVtkb`
		`+ k8z+uITyK3WX+jHiW5JRgyHWaFyYqwDjds8q0LkmIL80scPa3sEl9QzfT7+7xqcv`
		`+ iKfemg6XgCwYmSOhPHSK/E6MIC6Wb4QY6H3ixCuMfaic6AsB4sH4vFPoPnJWmIGm`
		`+ QlU3L1UJz4VNvzCaClaxWPa5nZZAWyFRMof4VtO2Q1LTZa6NQbGNFRRLPDBXpcOq`
		`+ CNicjZjSaHO9Zxp/V+9W9GgH6u7i/eAnxifwUFvN0BfkwbDnp4BNyvyA+fpZ4oPW`
		`+ InygfP1P/fvALssBvJjo/q6eZ4b5O11Ut/13JzO4IYNISK8uKnt5AbU9YUnSKClg`
		`+ 1MtTRlBCD3v+UYy102F7p8rJnVTHelfgmjP9UPhP7AUwZ0UQYq9QypNeoRvR4GjL`
		`+ /3Yz53yHFeYaN/lBglm4jNQOmHTQSibvz8lx8ALGbLxTaUr8j+UG4Gu2z3tFpYo0`
		`+ NHq9Ahd8L7JVIsbKtcoP`
		`+ =a25g`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

nonsystemd/udev/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc

file added

+72

		`@@ -0,0 +1,72 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQGiBDjDxTgRBADILCd6h0DKdoY0bkATA20IBHAQ8axjpzVFocYco9w90jWRYj0y`
		`+ 5JntFUdXB20qh/tr1+H3p7Wr/9MNJDX/k+EJ8LCbqouFItfyE1m5k2iaqlGn3MBG`
		`+ z+gbadL5x+01zZcuJmkhMa/xogs3OGvuw4QU0lRf/3VRgEvGQxh/DCQI7wCg91fQ`
		`+ X5nGmLfaEajvZk622f4cmXED/jCtmntvBwk9J8jkYDrINEeglEcF8naA/qr20AkD`
		`+ hvupalZDEL8CJVh+jKA9HcF584mQzV9BURxaWsU89sT7Jg7incdsOOSOJkCyaasO`
		`+ slt7vGKlUjHBqYCUCp336BVDOY5k2c6U52bsMvfywVAAFf4cDn3S9QHDyaYkur2R`
		`+ aqMrA/4giC+bF/K1sn4MHacr97QxEeeGNM6KG4z4QDmLeNdAANmJOLQaQFH+84Qj`
		`+ r8KyRV0zd0sioh3419AsZ/o41W4cIahovJKWyDcNwKI0tP2y3KZDVtmD26RQ/BO4`
		`+ aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QqTGVubmFydCBQ`
		`+ b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcuZGU+iF4EExECABYECwoEAwMV`
		`+ AwIDFgIBAheABQJGZKVoABIHZUdQRwABAQkQMn8mlRoBXMSoAACcCNTEt7jdZvVV`
		`+ eAYZQu5caidHZvUAnArwD7mJLWddEUK2XXWOeyOY+0WmtCtMZW5uYXJ0IFBvZXR0`
		`+ ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5uZXQ+iGMEExECACMCGwMGCwkIBwMC`
		`+ BBUCCAMEFgIDAQIeAQIXgAUCRmSlaQIZAQAKCRAyfyaVGgFcxNX0AKDeFj3gF+Fl`
		`+ CMgnw1JWu/fM5H8pYgCg7VRzOxtpEEiDSw37hv4eifyo7P60L0xlbm5hcnQgUG9l`
		`+ dHRlcmluZyAoTGlzYSkgPGxwb2V0dGVyaW5nQGxpc2EuZGU+iEkEMBECAAkFAk6K`
		`+ PXcCHSAACgkQMn8mlRoBXMSZNgCgjKt+QUMXVT1a2h25RkUyiiBPeAYAnRpV0f+q`
		`+ i9N55hov5qCieRGUdvVctDJMZW5uYXJ0IFBvZXR0ZXJpbmcgKFJlZCBIYXQpIDxs`
		`+ cG9ldHRlckByZWRoYXQuY29tPohgBBMRAgAgAhsDBgsJCAcDAgQVAggDBBYCAwEC`
		`+ HgECF4AFAkZkpUsACgkQMn8mlRoBXMRg5ACdGbqakvk8qTTLbuAnu5fHZ3BfDRcA`
		`+ oLUGbw6bWIXP8WDi9067ZK/zwJkWtEdMZW5uYXJ0IFBvZXR0ZXJpbmcgKFNvdXJj`
		`+ ZWZvcmdlLm5ldCkgPHBvZXR0ZXJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0Pohc`
		`+ BBMRAgAcAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAUCRmSlSwAKCRAyfyaVGgFcxAFq`
		`+ AKCSWOqL1eJ7x5eYQ64T39WOvNj92wCg78m3sIPTDrijHH0G9B4FzcwV/ry5AQ0E`
		`+ OMPFQBAEAMSnJ4cOPBHdy71LPPy5Ov8Sa33Hh3uPRbfnPMAIz3DJlOBvHpqkqTjW`
		`+ 4aKXlbpwwiIbKIq/A4vtQQdkj9VcJyqZc+NJsqVTjBb90DGHnQWWPc/oRQ0CswAR`
		`+ 7S4+U63BD/nlelidMmbsq1ykxgMvKlkkgJpFaZBg5ujuwmDoJEejAAMFA/wKnR/v`
		`+ WsIkB2LFixW+yIlyQQTXgFv+5+nIVcF/3UZ0wr9cdWiFuR2qnIoAjp4IoBDmsAQu`
		`+ y0rxvasvpiV+x2tZm7nUQ6wby2RFg+C/mAOa0M2bi6BEXhMa28dM4b3AiGy0eKXZ`
		`+ 3OFSzcW+ZkcTqstIjtHJXctYhEKPvFEReCgBzYhGBBgRAgAGBQI4w8VBAAoJEDJ/`
		`+ JpUaAVzEOj0An0okC9+lkcgkD6Ce2UY3j4GGnHcmAKCw5GzTgeomE1fieTKq6qK2`
		`+ MF2AMrkCDQROijyAARAAvKA6Jl/ygMBw26vskGrU7O72qsKn2PpzWbB9BUFE9khC`
		`+ 8YldL5QdFz3kFbD9m4Ln9YQ/xdyZf39t6OhUdXHaH9BN7wUDU0MEMmmmE+eKoE7P`
		`+ wR0fSNiRCIXjA5MyZW8cnyvlqpEY3yy2QfXuUWDDFIK7RR4nHm4Ep+5Uaz2tCMbD`
		`+ M/8wWenwEgjrF/9IBQlTPjbOgWrLqnjBddr8EmFMa88ILxhY8hhqmYBizCRP/bOw`
		`+ 54Pf6MmQkli72327/l8PGLROOm/ju2xs+UySoJWISZOSwB2GhNQH9sg2pl6wyzw+`
		`+ JXdB5Iza6YmXnvouA0r68yhTMAAG9qhE9AGtSmVf6m8M5tT5x04He5mjiukrmp3N`
		`+ ESJICO1GtrHQhg6k6aDcBnYU9Qz0Hd1qBOj6Z3PJqYjg/n1xVSQNSVAcNiJWhuJo`
		`+ k9nbWyf3DeTPobFNcQS2GcR0Du+CXMVAnY7P1DmAfuNseo/RqnLiW9jnxBUxr9x2`
		`+ eKNwh66a+j1cE2YH6yZfvdioK/wCMIypidPa2tqObXSv2FrhAw6Jhc8/Jn8FJN2l`
		`+ VJDL5rxH0u3nKFzZl0dAFf8AnNxWbn2hXRlJRfkfjgKoCatnavO81APRsOcZsh5T`
		`+ z4XfPsv1k9jQAoWcMaaSGSr3YDAAXuTUX/2eQ1MPfvhHKFdr3uzz6p/G8fOXdKUA`
		`+ EQEAAYkCaAQYEQIACQUCToo8gAIbAgIpCRAyfyaVGgFcxMFdIAQZAQIABgUCToo8`
		`+ gAAKCRC2OyGHnDSFsDkJD/49cjBQlDDNnIVbWF4lm/2KkOJ9oleKWg0/Ebvpz9Kh`
		`+ LzzE0Je3kJgKrPJc6HyWTYHuwS1WiHlN0a6XZ1uTXvQC70q+b+PUsyRsunNWa2Hl`
		`+ DmlfwKAelzgUB2ZdGL5ImDWiLaO49QPlg7qm2+q0yMu8g9FrfevOwa0Cb0IIx/qD`
		`+ rdwhUolERf4LtD7g0Se5WNyheYH5uBhqu14gl7CCSaAYTIDo4wcobFwSbWo2UEdC`
		`+ rRbD+GZDt9JN1+s4/VGVSJn4swCotuBJvBbV4XbZYvxTTjIfCc995KynPk0KMDAB`
		`+ Qx3Cebhky4jeCL1+y2fIwN3GYcCmMY5a9x8JExu9Tn59SU6NupYpq4m3/lTwYW1l`
		`+ WVx96WhbxC3hGes054WGKTN6xme594ZP63q+GZlvR6FAB/Bm9cUjnh2+G3YXCq8f`
		`+ pu0r5rjRM9W+FMOGOEfBoVb0xL3qnkrauhBJ3eIp4hn5QL1W1SZN2Qp8G8hw1tVF`
		`+ ipjfmNkZyKKI1Xu/uED5VKixY6lP04NLuBQ5UYna7AFgH8L3RymNEg/S9UVfPYnK`
		`+ 3rs6scsgxXx6wnFkZPQpZElads9+CiHhH3QhmwFnBWRP1o2eZbxsIKC5y5jfFHHF`
		`+ N3UEjkJy8CX0G99fee8HTD6TBizv3fcGvmSopbAkTdroonVJ9Y7QPgFfhkifW6TK`
		`+ I0PZAKDUJ7s2kuX912cfPRbExB3bzqTm8gCgjxaoQANSf6wZbWeD7BKnxqtFuUO5`
		`+ Ag0EToo80gEQAKFxFBRp/CqX6NeVGNqCQF3q5h5Qufy1xBpBrLgoQfbVq1Ei0swQ`
		`+ JOQBQ2K4olhKjcmXji+Z295zExWjEmJAxWuzGrkSQkbet5T+SROiNaos9P5Syp1e`
		`+ jryh4Ko5nbGF/dZXNktkW3eAyDR6YZ39I6EZb7lfagG9KmxjlE9L8lPGTaDXNieI`
		`+ FXVLrOaQUQ8Z0Mv0AniLX3tQDP6flaPjHPFX5pwnuS4VRUeUMc49tARw9qkUmmfC`
		`+ gBt6G/fhHBJ3Kzj17OTbk/UcGVhr1hOYIu10kB8GSnXmmzTJh1T/KBDvd/MPxDmD`
		`+ 4bFG0PEAXO2X7n2c7BJ54L7EaTyC+h4Alr/olnnoAbk79GxDO3o6hWwcCWPdA3Il`
		`+ E7W5tG42nxIhD2hhu3FJ1Rb7jLVzq+t539EML+1K+UGlps/D1SSkDuMtNyaDEpkt`
		`+ jXhKR9Y0EzbuUPe+nflJ0NZ2B6AqpO566mDHMlkv8kZwQLZKLYeljWUBI1AdU2sp`
		`+ GeMrBmiXEkcRIxXWe0tTMidXt7poVr7haP0nUklueNeooJ8eUfmRuFRmye2aWYjq`
		`+ gjtxiXZHH/DPqxjqsO+jJQxOjf9Io6o93jR9O5knsmtaVp8JNE3RzO40Lyszwyeu`
		`+ lxylMpd1HfOt6MZYk0we0Ed7vVEPEjE08YF6sC0Qk1b7crk/t0GLOdYtABEBAAGI`
		`+ SQQYEQIACQUCToo80gIbDAAKCRAyfyaVGgFcxNUwAKCvb0Lisf/Rll5vPLqGGIci`
		`+ sDadOQCg30tdWRaNvasUMaTQL+fqE/pFzeI=`
		`+ =mDgC`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

nonsystemd/udev/keys/pgp/9A774DB5DB996C154EBBFBFDA0099A18E29326E1.asc

file added

+52

		`@@ -0,0 +1,52 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQINBGJ+vc0BEACRcuRdhpQCw4ccAwirgpN3RYkaOX4F1lgz+mhBGvIAm5pr3GKD`
		`+ pQ+dV+68ehvflL7rkxDpXFXAKIcaZSQlMPidi+w04iM7Vlz+3tPXeCbMRSNvrbDE`
		`+ MBWuDizGXPU8+5iA+hcuuuKqJ9EkHzPXRv+JJdy1CYOptwz24L3jwLGs2y3ESe0o`
		`+ Vc+co9d71FUOGtixpSoKiSI/cYr16xLC3rPsRogvSm/Pn7SLbFQLWUH9arWJLYIn`
		`+ q3/h30npK+jsLX1Q+fu6GA5cY6e3yljrHv2QX2Guo/8uyxvHx0UI+F2WK87embz4`
		`+ lOgpITgU7gAgNwIkSpVpt06GvH74xqWfyIFuDB0E9uOnAyyXzcYQc869O7Abb46a`
		`+ +axN2a3G1//lj0pcU9mxUUSbcReNLiGjkh8alTQs+UupVozzdKPIoQjdorqQEtWG`
		`+ IyEkwgscGAL7ByWS+sEYzWdUFdHlMA9uLiBqWf06zN1Nay9LdyUfQWLBFBlHeJJL`
		`+ SIAPXCfCbRhdIYnBbdv155aclPDoS+RoIL+CDXDlBW4NSm1UgcCjgjfYV6bc4wfl`
		`+ pY/esUhXmZLUe3xxWk/rIovZyBgS+P8GS0/BrZD5BGzSnJdVouHbjiH0NU2ug57L`
		`+ fLkQB8yV2AXYEh7AfxiO1OW+NPgAQ3web4fxnH/zpV6n4j0654p7HgDcyQARAQAB`
		`+ tCpZdSBXYXRhbmFiZSA8d2F0YW5hYmUueXUrZ2l0aHViQGdtYWlsLmNvbT6JAlIE`
		`+ EwEIADwWIQSad02125lsFU67+/2gCZoY4pMm4QUCYn69zQIbAwULCQgHAgMiAgEG`
		`+ FQoJCAsCBBYCAwECHgcCF4AACgkQoAmaGOKTJuHbdw/+KvzX2M/d7A8ethhtNSZ4`
		`+ kiDTC1AGS2zqpJJQLmvtZveWZ5U5zYH1a//ju6Giyq071KCxeZ3Fa2yiXLPXtjDy`
		`+ ao3hIAPFTtWgEOlRgpzO/iRFwx6ihUbiW2LIa+LoKeivH6EV4AwCSAbrUEQ5nXih`
		`+ yvVie6uyZ+qS9END62atSXqfue1k+QNNFvtyqVTSKnrFgXcH/C1c0aA/s/ByGNVX`
		`+ XKRslmnVqqwxR2OHMRrOnNubgQYlgAjelgoiohzsgus7YzdkUXfQ9CN2B2gajxsp`
		`+ xznt7HJVRjwugkvPIDLsQfEA2typHViOxijaJgohOz5l87v9hKppc/BLj28/jC0o`
		`+ EyafbubBUmYiCV65UgL/PCfTXnHraS4xZDs+dwaq2X4Ba0XBHO2BnIT/kdIoUN7R`
		`+ gyf9qzVst4/p/O5G9U5nOG3H6yGQ0Q1Smyb9gR7n8pkZEv+96Br65FrM2SXcBc5g`
		`+ iifuW0Kfsqp0OVBNSbVBiIQ5spfQc3SzBAgj0TmG2doxyJvErAfsJPzWeVnMNAsc`
		`+ qCDXBx1y6Mib79xE9iqeDz+c3S9ZsOLDmBkVNh5jjRJj4HL1D3g2W+w6Y/qvdycv`
		`+ OH+pWMycmJVYri74LJbWMBFQysGqv9DjjZb6yajK3Na3Kv96HsE+37V2qFYVB97I`
		`+ 50uFPxH6BZlz91NepqS4nhy5Ag0EYn69zQEQAKr4PhfbF1Z5todAQEV2koIk1Yvx`
		`+ /K3eDI/JnmXc/x65Abhvt0LUC0ukWvAcuusffOk8BpSA4YNT3fOL2CdnAkP3lWKy`
		`+ YZeHtd4sjxR6zMUOPV62oTSTt8RmZ4alWXP2b0pW7/cKt/Dz/WRYbk0XFOffuCiZ`
		`+ OQ4aqc7e+YHwB/YkVs9R14ID5Tio6Pg/wz1zmSkJhmesN+hxJixa9I9V/qyfJhRr`
		`+ XCZh5NCAGMnKFSFtub6J35zlXa4DEFi78z2sHkK6cdw/rEeWvSewaBZukBKDWdhN`
		`+ zOkLcg0Z84I/Ds3sXM74NRVZTRxLMKCCjWJrOhBrFAFaOh/2SEIoURwvJuj0uC/Z`
		`+ q8+QNX87weFFaSSawwy4X3Px+zRl9wpqNlMPZuZKi68F8AMeUmIxo7WL886UBeZ+`
		`+ /wksoj/6t6bCIZwMNNsS8Jg5d7KrIeORjDMi6iNzafDXArMWIPkimg+xlppFnJLU`
		`+ 1+jMXjdixgl2va8wp2btTxCKYy8ICKC2lqB2DpFq0/CcBdSyI+ao4c5S3Kvv9rRV`
		`+ CKbGKNAtqWATztpcOv1RjQ94UKWGi0iJKPBRh+mVoIOXQWiYmpv+8kpY9/bsK+lr`
		`+ p6RrCwvlbD0PUWJM6e6X3OSV8mVPGNpjdLlK5iuVedHU+ONyVqlAl4l5slYYz6U5`
		`+ qgG+EiBk6etuqfEdABEBAAGJAjYEGAEIACAWIQSad02125lsFU67+/2gCZoY4pMm`
		`+ 4QUCYn69zQIbDAAKCRCgCZoY4pMm4e/yD/93SEVwimmAy0qBILAj6jUSkVddea60`
		`+ e4IQv1Xp5sbY+8JdGB7REakFAHOvwRhv/RYV+l0UBscW+u5j1JG4dvgpBCdDGAy9`
		`+ M35kVof9OdMQCxmUJO5D7wU7bENS+9JgjuM7NHHddzmFhTagAhAInCNSvlnZaTBZ`
		`+ KSBS880WZH28F3GJrmSJzZd2OpjcKFqzCmM6HwvxFimUhr4S4/5awduW3zMjQoyv`
		`+ +kJgKZWKUtS97UdnPK8BRANfbjeXDn70ao7TebJm0DaNnB0UddkQMbnYpZOTqEPD`
		`+ mJ39Ugc8tk3cw5EqHwD9H9yhsbVBEJmOTaMd6WjgcVN6PNs1So+7TveSh66Jj2l3`
		`+ A4zGhPP+CuRD+ZXZHdNwsvIYVN4No1UGgXUs23gRtP2hwtT1t2hCXAJYVE4sD4D6`
		`+ didtR9JVb46psxfTANexe5S/uzqMZ9bJsg54dxFhhw0wZFhptNEmSUjfDTvlD9Rk`
		`+ uil3324HFVAm7ZrefiP+NGPqj/FTc4ZKThhyoPNQRhbANFvNfD3+EYiqDXCkkkkv`
		`+ p7HR47nbhzl7RC/y7QY7OFkeNRdgZyOvaaizwuxuncoejPcivjGQ+KbRvG2c0Kr/`
		`+ D+ZeTj9fkqce3cHVkxqFEcx9e8Ps0jwd6LRqQ04zRtFTJxK5ac+e+dtDW5hrwGFA`
		`+ HcRCOxTr2xTemQ==`
		`+ =+88M`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

nonsystemd/udev/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc

file added

+241

		`@@ -0,0 +1,241 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQINBFTKss4BEAC6LdgaSpaSBbMZK8erDulfXpCszvssCvEAI5lshfNNLHqOGy4r`
		`+ g+A3xyaGe+ITjoahT56Ly+dylduRvuZaJwbKWZqOKLnZHG0/Y/4K1MSk73TtcFbS`
		`+ Vn0q1dZmr14ysTKB8E1UJ8XQZO+PO79VANjvj9oEqsYX4xJ5BenWdfqJOGa+8jn8`
		`+ ou75vYcTFkIlvSnaHT4MkCqPGnuGgqiunEScjpBRFOX6ZIdRZvXcjP4HymdQAIMA`
		`+ BDDcV/qT+3VIOwKCn2e1jtxGbgMUwyosfz7nmlNHAdLrnficbSSsjRBIKxLgKN/N`
		`+ 2fk/jk87mbs7Qz5L2bSxU68emGHZ1BEkBJ4vhiO6VBx8XHolK2RpI/3v0qzdGynZ`
		`+ YKTF2yBFqBlDI12gbfxabCQ7FgxwLBmYw/C068NVtXLM0AAMFrJmXRoexE698DJi`
		`+ wL/4qxWy2Py/wBHSFInmyUSSVi2CjRkLh2zA/EJ/268HooItcnL7kGnyWo9IJZEz`
		`+ Ma7QO1FF/513xsW2QyPr/QNvuJ4GT/SyIgz+6Ln/z8wHCJQw8CM7vFRgOCuy2U3R`
		`+ srO926muRbl97pqRmCXbb+OJQMcYaA841FPKHq52kUTeGqkiJW4RocckcEGqhxhh`
		`+ zj8KjIb2wBgkYviFQWKLIpZBVxKSAjVXTl/Bzk9m2ZPETjMZKtz09xtloQARAQAB`
		`+ tCBMdWNhIEJvY2Nhc3NpIDxibHVjYUBkZWJpYW4ub3JnPokCNwQTAQoAIQUCWab4`
		`+ pwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCoHOoivIx+Lmx3D/0f5Nxi`
		`+ LYPDpxPOJDnEGUNqLiHlnyHwlHidV1xROfh8F6WkDrEAO5YfkASJjqBYJY93ZiZU`
		`+ /ROUdpcct9sN0K1Vw4yTAHFYpYO2G9oc3ax+3ly0rON4L7t1Xj9cvR1/b2fIIltE`
		`+ Yied0XP3ukUfjECOkwQZJbmOHjsea61i5da/JEbDFkr32witorIMMIOAsZkZ+tcL`
		`+ xo2kRhk5PT7t6yo5cRLd0rLGKvKMBkMrNcPNk/T1V1YKB6yy0gAfo+dhZyI/khNC`
		`+ VuYZB59oYX5FS5FkGn/CCmuPN3YkGBqe0vZJjYLe8PK0vPS1obg9gRuYuJXdxIQn`
		`+ P8hD/y6Cu1axoy5EPt1uNc1bUSkvWUoJ2pWkeUAEKa/E8I0xKwQfHHo93rA1Xfdc`
		`+ c3rivihyj25/CkHo3zP6Xa0fqQLjpvusdf5nxuKL5cQYCAkNV9/sITTCxxYiKhp5`
		`+ lto9jhxs5j3/D4WV0+EGaQ/jfwg0i1h5eApzJQWMG+dEiT28s9+zPgFqfYq5oqVk`
		`+ cF+3tv39Mk/k06XqEwD+TmhV3Yv/wy1BDrGxvQgMP5GtIPS6p6+PBWFE+HUYYPdZ`
		`+ /vFN5DugzvVznjxLETUvj1G7mCQyHFXIkezF3mfr3uk0WiYWYoEqQ1Jdg8nsiTq3`
		`+ iRTwW3XNsNhB28OoXH461215t/LakjGMVOmUSrQkTHVjYSBCb2NjYXNzaSA8bGJv`
		`+ Y2Nhc3NAYnJvY2FkZS5jb20+iQIzBDABCgAdBQJZozczFh0gcHJldmlvdXMgam9i`
		`+ J3MgZW1haWwACgkQqBzqIryMfi67IhAAq7Gj+p4Xt5Zc5OhMt7xaz6lGVdgXljGE`
		`+ mVmKgmyHWwMnNRpLrsXUWK8iZuvpg9Ges1o0Ckf7f+631XTOle0r3MwsVI+FgWVM`
		`+ BzAg7ft9GlIMqgY6suWlV7Rwar+rmzgf4A6tDjDWq4Lr2QTbhzjKoZeVL52Z2tpd`
		`+ nq0Iq1RKuXPQ8AEkPcfhYc3Z8ZL0MQ1cL98c42qVRYmoa1JmABen7rSUmIQL3t9v`
		`+ aZXLqnTNOEtpbJ0QLuhasBTPwUW7FOwvSFr8PSoSKtOJ9VLEGDgJD6wewc/MYJsu`
		`+ fMECdfVYipOP/mlX1hrmxyucEm0a6CjFDvrP46sUJ4JoVcmr1Te898VQYKvBRFZK`
		`+ 7UxJIbp6nZdyW6jI0HdstgUNyh0IzTgOUfgdkn5m8Xw3AaJdzGIy6cu4+g0Qmief`
		`+ rbZrReVcWYPswITpnDtEAmghq7C7QJ5OB7PA2G1xWqOeLMQnE2tTGpJfWkuv6FEI`
		`+ lG+5utAKSwDz9sZ93wbYGil5/rBSLOS2XoZfS67yROQH8+f1vc2tMpdfD6Z8rtkH`
		`+ HfotVwDkx3xIKWCENdmL0ewHbzjKXglSi1VkFGdrxoXyQvpSeAgO2GE0spM3lRIR`
		`+ cfNsXrzx4J21TUDrjK9mg/+KVEGA2I7E95d/ByyjDz4w0yx6xv4nyHtptgAc72aP`
		`+ 41NMSpr0qje0J0x1Y2EgQm9jY2Fzc2kgPGx1Y2EuYm9jY2Fzc2lAZ21haWwuY29t`
		`+ PokCOgQTAQgAJAIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCVMq0wgIZAQAK`
		`+ CRCoHOoivIx+LtL+D/4+JIaILWcbIymShr7cOhlWKu7/AqAHrT+y/0s99O3Tu6TD`
		`+ 7bk5LUMUL5TBZtyVbUQh0KPjVYH+QZyDGICwn9snbkftIACvwD8LgtUv+5PbAQ1D`
		`+ of1ZtNjbl5S+VeKoD5Ev01t5QusRfThyiHzFSZOvePiLuRyRe1ixn1fzXl/NxuW2`
		`+ d7eJyxNRmyZ6N63SVDnBvOFwbNSJ4awXZa2S23edswfNcfEeYVVrEmEfBsi4U3ZY`
		`+ rjHWV+SvHoa63vEfyooynRofXgwPZLeOcsa6f2Q3jTI7WaCVnxL7K0GlxW3pd+MO`
		`+ E8HKFj/8MnK29ykQgvfOjvBtKIQmZoPHB1+FT6YIxr0fkLIK2FHGZ0azh0T7sWEh`
		`+ 0WPQeieGFdDOq0z9Jf6fiWwIeetpwdeEoAzzXQZkHfRNpwzkXx7RlfITUqko3UiW`
		`+ l/w5S7t4x2HFyFHVb5osqF+NhCxGaqZGGkkegE/9RRcvFzN8pbUHNMxnwV/KQW8V`
		`+ 1DZ9P7Kr+a/KV+dmEs/7vAj0vyFzCJbc8qecqOWVOLjY9tzOBjEWa1zvt6PVxZGJ`
		`+ I3i+lvdLcpvIWyAI68Gi7kOsTuu8A8iXDxEfzJ8kGlBnflq14sio3VKP6nVIPwbF`
		`+ 5CwturkRM0vPkKSIliBCvS2MvnC3S+0AkKjhKRl9InBh0mCx1cRylJ8ZltHj9rQr`
		`+ THVjYSBCb2NjYXNzaSA8bHVjYS5ib2NjYXNzaUBtaWNyb3NvZnQuY29tPokCTgQT`
		`+ AQoAOBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJccpvuAhsDBQsJCAcDBRUKCQgL`
		`+ BRYCAwEAAh4BAheAAAoJEKgc6iK8jH4uA7kP/RbwUH1C8RfWJWvtaDsvoJ5jnoB1`
		`+ lJDxUBEd+6j+AWTUD+fAAxLE/bcqxXzsPz4dscwpnoKmqVIpAdhTN+EvRZRLA1r/`
		`+ kbKlnDFnEm89MYYS1e8dGtXqa1zAPl+IxL46Da5/l8GsepOr9HftrPBjN56R/HIf`
		`+ tOwc9Vir1NLaC+S0CsAKwyAjpq8srjvrxFWr9a82+7GiBz2Wrc60vWIfaZuDKpVE`
		`+ 4RpvEaiYoGEJEUp4wNhaVdQrhe8m6C0uczwq2t5aSjxuuso+rsN3PK/jvNrmxfbS`
		`+ a0NMzwhZ92w+J7CFyg85c0OQ6hmZRTf6G2v8pFpWlbcb7sePlvYcEIeZik4Nx73T`
		`+ EkqwmX5WC0NPzj+wdBWG/G+fFIcUUaMZzcGjgy9MXD+RVVyGs6W2/Q7iPBzDxny6`
		`+ KJLjUK8xMGRLo3rvdAUqug3Gpe6dth/8XBp0cY1gk4n3OUluBWOXSEwW7zm3s77r`
		`+ K4s5JC/rBOgCeCNV+qXLydazn4qjQXixqb0ezyGGxO9w/+q9T7MBwQy5/Q25w4qL`
		`+ bcCxTLAhRpye2C1nCHt4GvH4SUjdh6wtHdkXjtyYMTRmMU40GN/PL5QFyyMS7nEC`
		`+ YiycLB99knGwsh1FX31Q4aU7qUWO6Ejhk9W43IZjQpaITXoyCwKnMaE+X6Uqk745`
		`+ io6PFV1+6ix1l8MhuQENBFieLi0BCAC8doYzfmC8HWjtP0Q0s6fpRwjwGTTOaxk8`
		`+ qOMW+vgVY5eAIWYOGX8kNdzUE1nnRgrGhqcOe+g0NvXNkE83KIeAZFL5k96/o+K9`
		`+ IJTSlrNzjWR3NsQPfjrQ4/pDcuwtxWBIaZNAF7GJNnjGeQ4dvVHwTzi1b3xrELxK`
		`+ YO3iiYkku5O2rrHxI2Pv8mBWZ/v6Zr81hutk6TtpsGGWRBEq2sAdS+qV+Bk+C8LJ`
		`+ sdOLeZLU9aVILtMPQkL0z3GTcb7IVknLPZ+aeraFRBLXO1k29J2JnTwECEkfOQep`
		`+ mBkGJ4FGHQ+eG7ejLd1i8BLFEeLk9ia2wLl6xiij1I2lplcuaLq7ABEBAAGJAjYE`
		`+ KAEKACAWIQSp6pCBck/64EhMNaGoHOoivIx+LgUCYw/DEQIdAQAKCRCoHOoivIx+`
		`+ LmYzD/9YWcQiNKHnOGtYUE8PznvYDTc63pWO4psdFRdQa+RTyLtxVfAkLs/+cI1R`
		`+ hy+8svPHGXHpwx1az0SiG0z5LJ/HmXUmMviTPwM3V0XX+nT7khlk3UyqnhfiZFri`
		`+ TxAO979OS4a9JbKPhsNDjxfyPIp7IU1gkjoBD3O/UVXioE63C/FYQQOhdd9rxFTD`
		`+ ZTNDw18D5bksuHAsasXAGQk1dTowPK04jfSUgmOrWuWS5MotThNQaa6Jd6luCXId`
		`+ KkrWc5nhMAcieBe+vDJB9Q6OtDK7HwOTxFYUX/KFJThFJik+ZMUm/jTExiTq23bU`
		`+ 6QYApT5LzehVEzXfcUnEj3YGb8kIze+l5H2wk87rZjSW/5cvzBQDVh437lcPEM1V`
		`+ l1FrQ7xEyMs1E+9XupIVY2o/RvjCtsGVd6yVwjabSLWmUIwVlK8C4jLdH+ZMWGwT`
		`+ xNWlbS4K55X6joxDYylOdNJJIy6j5p5d5SSnVxuHqoIN2OUvPQvd57GQl+4LZOLd`
		`+ i2rUTkajyco2k9EX/A5OiPez2DTsuc0zDmmVkvERV9S1kTUJOFgvyJmRIid9l2ib`
		`+ LEe2YOtkWWEPghaVECqJJTwdTSvAnWz9zNnLd62PClfp9VIOvyuWE1uNmorN001q`
		`+ h/LqPizcT02Wzh7R8hy+ZtkC7TVc7euR2UkzsywBJZurtdY2sIkDWwQYAQoAJgIb`
		`+ AhYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJh2HCYBQkSoEPqASnAXSAEGQEKAAYF`
		`+ AlieLi0ACgkQSylmgFB4UWLLkQgAjZhe+2Hi1GiPKZ1nehiJlHPde3E4mKISyNmQ`
		`+ /TfqTikp2a2fXPEA/N3lbmSmuTwCRaOMrIFI1LjuLeW+NEVBekqlRsYnQJ2MMITY`
		`+ JqicxvWiH+lVtDRW8yg9HKPUmPP+AUJ5csWrwBxetFiOH9pbpE0+PRCeovvS1rqo`
		`+ VJq/Gss9WSbTaYVYQqVY0u1vu7MszYp8Isj9ll2wpKRPBmFYNDJunahc7V9l0jtp`
		`+ KgthAVjqkiN0i5OdCuoitEq2T66aYEwwoFLXx7KInUVHtwinnhV6S2VVxoU4Yj4w`
		`+ cOsM7j6EZ8T7Dn2zNbmZrrRL3aR4lJaA4lAPg27+w+iv0z5mVwkQqBzqIryMfi4p`
		`+ ww/+KhikrLWUMVIGt6mFSnqF+CiL3PPtGDEouQIAVqzvM8ZDNwCWrVcRkvh8VrjP`
		`+ 1tmD2AGDP+ng3jlnnXOd5YD5g5L461VMazzi/h+16fXhsbdyWG0rtVFbaD+A4Ddp`
		`+ sgs03eZnVBmRo9I5mNJ7Ytu1BrgdMrmt0hCgnhzMp6PQ0nfBvBSeWMt1PfPnMzuG`
		`+ +HMjQ7z45Gky45Ff6nN8wbZzynsR+JvJ+ThLvKXrs9vjjHOQeJcmZknh5WEY8CZX`
		`+ oCg7jozxt/k/SanOZ22MFYaWRRXhcUsXnDiEpXTL4pS9X7pYsNuXe84/JHENiGDG`
		`+ 3WlsOwpc0H98GmupbtKqI8OFqd+7T94XaUrOo6oh+paLGXbgsxwIxghFoB0Yfa06`
		`+ /g9BPLFP6Qf24OWe9TM9XscyGIW6GKme4ff/OlgSyHSX6nlUZwM085rAMwmMZy+F`
		`+ RD7rQVazKexkAAwI0Q/wif7/CmjVB9cmROW7HbTsJSQolSIA453flFUX3sVrdaiz`
		`+ TQTEIYo6FBtqIiHDszpyyO6QiXVZZg6T4NXFzCrBaPmRa6UXTCEp7w7uBBH4v/bI`
		`+ WcmY2GNQd/7uPe/jOmKJjt7PbbYBHuRMqjMYFPhFrIY2a6VgPyeQ+INx1eHwuHRa`
		`+ 8jnaoE8SL25YiVuTtC4tD63xU82Bc6s8VwxO5amCWGC/ivu5AQ0EWJ4uPgEIANSl`
		`+ vCdaomyMvqVrwd1E4dj8t48y9aIIkArW1lfodp1bTsXEIyVA86FfqONgjzkGZgzU`
		`+ BmkQNEup2QBR/r6VJj1XLBfLobwOxBNKI74WfoNYQn3Jh6UshBbTEwlxZ3nkP360`
		`+ OUkUV+ITY4uOtKjE9EaOEHuJqOx02UPolOO4mrrTMBzEXsnajop56zAdViijPjrQ`
		`+ wu5WrcF7I3Ef930H/LmfeJtJWAlzw9iQNE3Zj4gu4Bd3+JrQZOmFMzmP1H6YIkO5`
		`+ FFVkCA19r0Akw8nRBsgWdF2fBFMQa3otgD8AigGDCOK95N+vw3YsCsMBE0/qtX5S`
		`+ B/etbZtk8SgK/zZuzHcAEQEAAYkCNgQoAQoAIBYhBKnqkIFyT/rgSEw1oagc6iK8`
		`+ jH4uBQJjD8MSAh0BAAoJEKgc6iK8jH4u+OoP/1TKAyKaQ025EEWxfDd+kAx1361r`
		`+ m9fcSRg6PQ+RjGwkYrFYPB7mj+RmrWrfHXsJeHd3QhF89Trh4MLsr6WZxAOfCtiU`
		`+ 32p1oE+DXLk7rnQFuZXC19+LnAcvGzM9d3WMcLeASHVIjc1q6NdiPdcAzeXu/aUq`
		`+ O09UarIoQ+Zkwp4QCkglMzzew4HtMZPpzxua09S+tAY2MX01K15AKJ/LJ0p+l+KR`
		`+ 5HcYdRaw07Y+jPQPSbrrDJ6YKq8q64PiGLiwCKAqCf6iUGMosZ10iKGiBr+yspO5`
		`+ lZz+iUYl4vGWdCh2LcXcDqyR4wi9eDq5YmMgr0h92tXRcESohANXwfhYVUOGakg6`
		`+ tGFZGVXc/HAfBAHaulYx32ARWyWTARZzkX01SxsWfW3nW+1SppJe9Aj7WSJ4QNpf`
		`+ cNZiYh1ADntYRFvgrCnPq/bGZSqxU2CBVyxhqT+EPAQBupIzUISOIG4+d9qKqcQO`
		`+ 5pBK3C1MPt3HSPq0G7BMRVXv04FPxDTGMGHShUSOeJoO+qSBUeWINda4BZVOpiPu`
		`+ fbDBlFWQ8zcpNECB8mMC7S0O019a+JHtaNcYF07qMqkpmESnJ71kIcOIgNVyhI5e`
		`+ JPQCXoqQOxPdJ35buHBhGLX1SdpjEPxEfCL5jf3ts+xJYAoaLuDDzx+7Lgu+5E7/`
		`+ i8oEHtkwRi2qO+7EiQI8BBgBCgAmAhsMFiEEqeqQgXJP+uBITDWhqBzqIryMfi4F`
		`+ AmHYcJgFCRKgQ9kACgkQqBzqIryMfi7NEA//UqfYsc7tcPDzRD3xCmKhnTX9BpHz`
		`+ MvFgrpCVTkGT6kg8kvsrJsv0120THB0UYfzqnvdzEtNQrYnEd/TD0KvIJWHKnS58`
		`+ oR0RxhHdoB5zi+MFH+i4ncSaZrhdJy0ng+9xJpb05id4YGoMedQ3UauKv5mY8uWd`
		`+ /RvNVH5ANHtyo5KC0HrSZkzH5anDE5RA/yLaekmwG4OLR4TZhshiCZPArKx4Le5G`
		`+ BU6xM+9Uvf/WjwD6+xFIljs5VWl0OTMJPAAH/enX3SYB995MmHkO043SveIoVj4j`
		`+ LkYRCY2u8LSQOI2e7R2UQC2v59Dx76T8XVFG/ByivRPaIPa0fm6Ob4pIi0dEpCOP`
		`+ jztDmYj/h5F/LUztRLSMGgbseYv1NZf3Bpa5EvgP2cVi5JqIcH+o80crfKuEcS0z`
		`+ g3zuM2onPKKy90GDiCSm44ctL1kuVLAzGa8RnmA6o3BJD739M8YX/tcGCEHOToyx`
		`+ 2FVbvnuaw1B7bBfTUXWWzszaikeDyGxG23w7vThjghy96uQ/oNrSJOOAjPp7csmS`
		`+ RKvRHYb29dXd/kzCCXr4uM/DVcS2o2EHGSt9uGDSs4VVUmHhdnzEjN6oQm0vHjeS`
		`+ KJPb/J86pGHRlVzkOpLNfOZCPq2DZ6gg64vZBacLStL8BrM++OLogRDmIxwbscPD`
		`+ F6kRrcLvF4g6ZiG5AQ0EWJ4uTAEIAJwc5niH8Wl3m5kiY8Gx9UnBByAE16A7NRbV`
		`+ bplk5nxkvOdZaqDAaHplj2ZXgaDEzs2uXJ7+hMzyBmEWC0nfhkwzgMzXZ7h8VC5v`
		`+ IFKhHaEPPhsHE1wkozrL7mSbyFoyd0os9yUZ07DPIa2KM7WWYQ0KrJqpgsq5sOSL`
		`+ MSJw303el63SfN+EzkvO6SU8Bc67dweFLoTDBl/CFoz7BmdGUQW1DIQMbdO/iVdp`
		`+ VvaOwANB+99zR44WeP5o5+tlqQ1RcxyJL3VWjW2+YRl6yR20SKkFI+LV99rmBJKX`
		`+ dFMuyhLaofxyPrVtZy+OwWuhBGPtyLxTvlyYsuWYaHtJLjYi3m8AEQEAAYkCNgQo`
		`+ AQoAIBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJjD8MSAh0BAAoJEKgc6iK8jH4u`
		`+ IioP/2hOcAFGZEYIeCLhrTnN6ury+LizBnOdw2CMuUP8h4Sjkzifc+J4Uf42qmrJ`
		`+ 9BHgzhw7XPnBDxp1kmzThevG6PUKKS6XbVjQMVfZjYJ4MqnhbpS5lv0tGX/EHyWH`
		`+ 5zePPUiTpYPDnd+BwwFfDax4t19laoxyu1OupnIrqF9klUNrCUBYQAyYFBpbHG8c`
		`+ IDrfikI0jh9eKM6fRw3aON+rzeurGaVBwsB/gqdlaI7mSd5gjYagct5s/1GnwDnq`
		`+ Pm6Vb2FFDzC/p5nlYrG1aQkf8cRfXBaY+DBHbTls8PCuUGNzIFZJsugAaGyzWJeq`
		`+ DCThasZWvV7bk3ycuSLINK34VchDOmJpdsuWAJvHhxxE0NzXQQIUlWBw9dlsf+lj`
		`+ P8Sv2VjMwDhMQQf99ckUI1l7h4LpaQvoT9fkhmwuW1N6fMKzRhGIO32MyIDI+yUF`
		`+ OTEd/i2dQNCNmLkwhYSm0JxzeamZWfZhtH0xqRzYMDBANAg60xaOL72nlM++iZBU`
		`+ AzASz+bZIB9uP+obAVC4WUrgvcBgmupwYvDsMFsHTIh1Nz5zIFtHjymilAdD47OX`
		`+ GiZuc2NcJ1s/7kafVmUch/IwY6F6c3Me0AN+fjt+ObgZPyxBqY/YbVNuyDpZSiUL`
		`+ o0IxVMMLkrVjX0xkcwOIsbTgwL/GVMHT3YJgG+M8WPjK0ZNUiQI8BBgBCgAmAhsg`
		`+ FiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAmHYcJgFCRKgQ8sACgkQqBzqIryMfi4a`
		`+ sg/+Ovrrh8qk0+deeE8Imtz8yIM8eYKBE7OuRsSTAVjscfHGS9XtW5OF+vnJfPQo`
		`+ No7YUABaFgLhZ7BNHsh+nrm9QSiw85DRYM0quqWbzpzY3tH/KUaVZUoc1stAJwLc`
		`+ PEkhfPh87LVSkx7MWrZ1lVfYadDQwZUoeCjvnHlNVaUVGcWdDgM4Og9L0T4b4hkU`
		`+ CZssB+w6pyz4exWH35QC7eNlp2TSK4yxnmttITUFOUD+pB+mbMmJt6oCxOCjrv5l`
		`+ gziOUTWuxdWRNjPhZTYIiTg6E7ph0V0wVyWjdKDwHIbvQLddYX7jcABn62l2dOmx`
		`+ h3Y0hSBB+ZY1dNdh5kObIicVd++QB1vzcvZWSPvoH/tCg575Pao1NN+gif8BeiHF`
		`+ PyKiKWC6dg/dc/y5jw7FWIoGuhNIh1MRHaD/IC1zlRzp/DoK5+BS7Wg22Ligjc6Z`
		`+ D6ID2bIr335xp5J8mhPV6KvvxbTjBfuMcpeQrMimhEXaFnDcbdc3F/CZC28/rj2P`
		`+ RkaT19gJMarwfR2nOOKbcc6Gyu89Z6hX3C+XoY1g+yTQIUIhkJ7/Ftk9u080Y3NZ`
		`+ L9N78S3GPY3LK26jIYrOl2PknJYEIPmEar4Bl2916bQzDLBq3NFLnMYnew8F8LSe`
		`+ v1y4qIZ3/acvTq4xrewa7Szf8D81gDVfUGaNHpI+gyi18ia5Ag0EVMqyzgEQAN1w`
		`+ RSjfQMyZRcelT38yhZUiSti6KqljizjkWzVYkhFab3IXeW4m5uUv/N8J23h2tUhc`
		`+ 4R3di1W5L3dvOMzY9cHeR4KucU3QA7TC/cUSQo+tdxj0HgXLMoTHUUeo2w7mX0NT`
		`+ eH7Evq3zEwWOJksAXgb4+8V5t/afBl1IC0gfNol/1iHkX6/49kSJ+0HoYEj7cPF8`
		`+ Il7IN55Xe/ZmsuucgjM6Wt3/ndJKmHyssDxApUnlK5Uj++039Q7SNRDtLoc8Y1Lo`
		`+ L544bSADOMrRAXEKj4ACYNUs8I1pf80w8CTnHg7SEILesOqBMfYotz2pQ2x0KqfC`
		`+ OfetSe9YcZIu/Qdjx8qBm3a69Y6wSn40uIwsW8lfEL+V2ltRsyCtmA1hNmreNc4t`
		`+ XtlXtWF6aZxT2wm97Gn8YjiQTEe7sfvNNcTHwP29KUofmIFtXCX2eMeqRWBhtqFE`
		`+ 5uaDdI5UQyfjY9Au+Mc/d2WHMS1PGK/Z8NKy7huM24/yK7GxFbbPm3pZiWlV5kbl`
		`+ 5f4bEPrBoqzdzoK0/N12UsfuWFV5m2YUIwW4BXaI26dzUM9Fc9ecbcoJXd7Fzgmd`
		`+ KUi0/Gw7NYrbsL09zrAB+AQer602LHW1Aiqr93QkkB2ViWupYiGli2sC54qrAR4i`
		`+ EUATAk2AJIyXnjaI3DftExz/c4y8NuMwFXKcLxWHABEBAAGJAjwEGAEKACYCGwwW`
		`+ IQSp6pCBck/64EhMNaGoHOoivIx+LgUCYdhwlwUJFnO/SQAKCRCoHOoivIx+LtA4`
		`+ D/wLYWQmvHpROLXO7XlB3j1pcKOJvWtCF3g2C/Q3c/YuwBuNnzPM7nQ5gMsF+ctE`
		`+ bK6Q4Td9YXA3hVc6ktwOMcfrxCkuBAr4XiRfwzQp0X+D/vAihId61C877DoEBzg7`
		`+ vMMyCYRtaq+heCnvP9eIrBdYNO+lDOq0StvH5jWREk3DDY2+AGPtscOhcZReUAXn`
		`+ WaWd16SWO/FOdkELR7esPAUG+E8XtOXYFKWDXmDlnzQdkmQn3WCHsGqRhrl3oWk9`
		`+ 95n7og45HqcllpcVSZPQS+Nd/f8BtepPNGZBRptoSBrNkgD0Qp9Xcp/xyrp0wOi6`
		`+ mvCbrGoDVGOFWp9as26my2SjqdK34L/Z8cUzkBtpcN92fwOt9sSMfeIfcwUGn0en`
		`+ kHZ729lPTz0zRdA60PFc3WrFviXrhXCYk3sHMTrAgzPsj0qpwv8d2iRgENdw+l0U`
		`+ 6gY8r6EFGjHNtZhyZ5wCpFHEb3G8C1fQb/qea/CQGIzqHetQ5iKB620RZZlixxs9`
		`+ fLBmO64W7zOJZZjYukqgrjCwlDHhWzXxiB6s28wrUw4D3iaJCg+plZdNFV8snY8j`
		`+ yQMLmD6J5ZfsiG+3EHlMt55+VTj8lf7Kmfp9QQg29J8kyq6g4Lxa4+DJ/xMm+4Vv`
		`+ jyr4gxinQD38FXQ/PK6ibrK7LwbzHxM84mGArESo1QpIMLkCDQRVFuFCARAA+tTC`
		`+ fBs+pRBg7lPr6DtI3SY4M+T5Ip2EQGuWS7t7riNP0rbtShc3x1GBokVNEOTOe6n2`
		`+ 8DTI0TA8D7Wa6WefKnBbDQPVe7AgWCC11gYXXIqcRIPlnvW7X8hZn6Fw/b+ep9Fn`
		`+ w6piihRk5fnYyspDBTRE/1DBBzHqOPfepHgIzh7qVe8MCfTdpRYsHXZEa9o0WYLo`
		`+ RXeg+yFvKmjj8+Bm4OyLQ5vN7uDqDT3ph8avM7RQvvqLZrXhycWuq4btT6Ba9oMZ`
		`+ 10UzUF/HXaLgakscDX6FzBwgv2/lVauh3ie4J+Au0lA4hYHCVhNZGgLsGG6aoMED`
		`+ A2Ab6vLqVIeOj7dbOXLq5wLMJlywAZwtnoSnzxyPPKQarCl30lYDaXFakFGZpI10`
		`+ nRrRSy2acRcpuS5662cnU8kZzVl9mbxyrEpIzkc54ND+UzHvW6FVKqJLB/y2rQ6Z`
		`+ RE6cLahwO74LZoDc48JpVkdXCkz+F2yI4ustWcv0vdUQ+mLHbjUof6zGLcTVRMpt`
		`+ eFpIozB6giF1ohayoNAgwywk69tMThNa5O4J405dDPDO4lNyl7nGLlxyL0oua16i`
		`+ bpz2WfYUsPsJmRJnB+8KZ5SzIGW7D/aprhYporYdpz6qynPtDmkD7zl5RHQCb8Pq`
		`+ grkkHPVVrdjHC7UdP/CcXjq1KIuKEG446xJITXcAEQEAAYkCPAQYAQoAJgIbIBYh`
		`+ BKnqkIFyT/rgSEw1oagc6iK8jH4uBQJh2HCYBQkWJ5DVAAoJEKgc6iK8jH4u+eoQ`
		`+ AKSEk4KWuMovyjpDFkv4bZDw3ryb1i5CmZ7dQUj4DTNFejmK1sOdrtpAk//+kC4H`
		`+ 8PA4GKj7QFCtMZl53YYCQL4y4l18AS2Zmoiv5rv9aPrYYITOuY2na8X5/yUbC3s9`
		`+ h1bzEjLZptPiubTONejqOnO9BberQsuqpOcy+aTx9nlGZmH9lefa48wIbSAqw24i`
		`+ 2aF3vxOibu/u3MHArwqjmbWFbomCvoLuFLTL5WeYplT9IZvokLYR70aypetZ/FbZ`
		`+ lrEInjGggiVTCFUfMJVYySQ76+Th0NV6jSpiscapweI6tKnWdVFSqAikhLE/aOA6`
		`+ n3nWVaB6IdL9QsRUR9YlDs6VS6tSe0bFWHzT9VrMHg//aEmoI5GnuEkz6xeimxeH`
		`+ Gf2EgfwFopqAXJsTqznuzgADgdP00jz1cIyH6NrlnB9blrnWbixFvEUBtXZn6Q9z`
		`+ 4vGGoAJuzSQadkaZ9UUT+8D3Hc2qJrdL2ppKziddxQqu+rRsi/Fy6c61U+zlgju0`
		`+ TUlEqacjNPWdYl0ibRaFELCPY1VAlFEwfRV+XpRav+dKCxDyxmh2PQ/JOJtpHwTF`
		`+ IFpy6TDr+xDaNyYt1Stv0q5l8Fa1RZKwFDpaBNhEPdGVKyQYs0wfc4Yiy81AA9lo`
		`+ B3wocBRnfed5sDF9vwPXa6+awmcnWGAzJB7ThOZZuvLuuQINBFUXAM0BEADWd0Gq`
		`+ 5bkX2WVMfwI8EQTnuJBRgJLmaLb8INg/Iykrztnx0t/D5bxZ7SMmycRpvKEEwST2`
		`+ NMzutPt4bxrbNx5FAAslzy93bd1mHH0r2xQhM/NKSNHsYOtpoeyf7vcRPaBkCqu6`
		`+ UzeWCrYcFzbrEDmMqKoeAekSWFyij/1Sm0hPYWK9qHYG7dhqS+t5rq0IGuX2LhcS`
		`+ bDubHysCZLvJxWzZspudrFgGkCX68oS94uy3ERgrUUt9QFweWueC6XJxj+FIlK/1`
		`+ j3ZgKUnJZ13iRXrz2vOr84C82MLpAw/HPmcU73qZM5V0+RFCKRP4ISKeGhrLFSMV`
		`+ OLVkyNHYYBq+0os21VIGBA/L2kWv1Gy/MnPDyI4p05zzwXUu6f3iAwPqwwRqA+/g`
		`+ j2J5YooZa1mPGUutkz3KmKWymTBlbdr1MR/ldnuUAwdgXdOEj/YPskb8VsVzyEjy`
		`+ NpaPTQW1KmsWDJPztuQ/6cAPXCeaECL/110MTFY1esS4SM7zd75Rgg1w68hFm0D1`
		`+ TotmuPVW59DN2TzjVUCamOVgMSEfUBERGo00PHuGYqDlVt+gLeyOM/WOLJizTEAJ`
		`+ EUVpR9tRspFHf9nXIOJdSaoL4opXtLog5nVB2sqT9qt9qPtBPbQiHJXimv5rBpja`
		`+ PeBZA+RxolTMpPkFsSXVkNcvhx3P/uKvD9um0QARAQABiQRbBBgBCgAmAhsCFiEE`
		`+ qeqQgXJP+uBITDWhqBzqIryMfi4FAmHYcJgFCRYncUoCKcFdIAQZAQgABgUCVRcA`
		`+ zQAKCRAoa/fvzXckHteED/9mP07v96WdQwx/oNJ2gCAmee43Xll5kLVa4TCuYLI+`
		`+ iPtLt1gKrtViw+M+oYhst5KT2jlfaj6T0GpDbbpqBGCzJ2Eas0dsnJRtN6zuvXX+`
		`+ tYWe28/PCEuB9QSOHqkVPG84aabqAsletGhWTKHWTQf7Aa1xlXgdBJ8NkZBUkwWQ`
		`+ 5MGkKS0BP7xvaK6z5nOZSPskpodhKl51d4IRgWwK+j0tKdgsDqSjeSOfw2eM7/z4`
		`+ kSzDTsdxoBWvskaSQtMnw9qibfUrI5zgi/Yckh2ModEoxdIAQWEtKR0dEHwVhOId`
		`+ 76lq19sS6I4MKTfHZ7xGnXTozbeqjcTX0edA031aFC4XGpDTDlyA/XXABu97582N`
		`+ OvXLkPMcj/N8/P0MWJgtwJHMNwDqBHCsZmSyK7ZKHLC71yh5mUCSnLiu0cz/7rLB`
		`+ +VHI+SwPXBO8iPCZAupmf+cyICkINFCwgFyuLKYYARhSr6LqbOzo/ekQvz8b9q73`
		`+ ODqvhEN0T945AJdAt2BPtzb0LYOBaAxdEZsu2BcnWE+xERVK7mSeGHmfnh6smEZS`
		`+ x6uRawMYm6Y/YLtzQp6iBTqtNwYryl+PbRJ1v28e5ispmylCrRyb0CSgNqKbQufh`
		`+ KO71+peBBytb0Nj9VUYXGYe7vHCeZxgvTUnPbHoVjUXZSu+Tiu1Gky1EOFtEW/Se`
		`+ 8QkQqBzqIryMfi5sGQ//XDmxqbq4vQ4NZiYCNlqpUqdd00TTCFEJqYLJ8O84FdLd`
		`+ ySnJTLd/q3Gj7nf36YIR3OYD843oCv6dNvAgCGJlE44f9qJ3HKcniTK4LKSwD0rq`
		`+ 9AgOgYYdK/55kAa+XebZV7Ahs7lvtWiugTsuL8dwjnBK7+qvoXovgZ1gMBbiFUmO`
		`+ ct7/yxmdVnkX61YrO52CK8rS9ZQUT1rjv/gYUHFfQmv6ZApeTRu4TnY5pEJDkrbN`
		`+ tFnQ38dt+tIBUGinYnuLkNa4FnzInXwJ3FgMUkxM5Oxofkk9SEfblGFyVEJ5e8sB`
		`+ 4U7TWvgv+FECy/Vt0upo8D2+bItatpAMDRVfxgAgORbSTPjm6GyVgfS86/lJbTO4`
		`+ nGJiGeCX5hTNYZ0KCWUFwDAfJ6OYmF4mnF7bc6NfOas3CC4frOHOUr1btN/5Avye`
		`+ xkBQ009YxJMEEArCCm2ZRBRPdK1ArYGJqyMZnAEp9h9viAfIhwrOjGj3CAmuKg2x`
		`+ olnd3xha0jl2mjZUSYVLc+16ptVvXH3yIkU48YJLiX3vWfQycyx7dAPNxaa/H4H9`
		`+ 5dud+BCh+QnJymhmaw1HnH1PixjoBfkB+qCgRSvcyNeWzo4YADtodto5RwULTBTx`
		`+ B4yF7u1nWoMl7Sx6vfQze9NwsS6sg4kIiD1QlVpEEHCn/7a67bS/R5DI4+8IvVs=`
		`+ =RoFj`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

pcr/dreamchess-git/PKGBUILD

file removed

-32

		`@@ -1,32 +0,0 @@`
		`- # Maintainer (aur): Samuel Walladge <samuel at swalladge dot id dot au>`
		`-`
		`- pkgname=dreamchess-git`
		`- _pkgname=dreamchess`
		`- pkgver=398.cb63a0a`
		`- pkgrel=1`
		`- pkgdesc="DreamChess - OpenGL Chess Game"`
		`- arch=('i686' 'x86_64')`
		`- url="https://github.com/dreamchess/dreamchess"`
		`- license=('GPL3')`
		`-`
		`- depends=(mxml sdl2_mixer sdl2_image glew hicolor-icon-theme)`
		`- makedepends=(git cmake)`
		`-`
		`- source=('git://github.com/dreamchess/dreamchess.git')`
		`- md5sums=('SKIP')`
		`-`
		`- pkgver() {`
		`- cd "${srcdir}/dreamchess"`
		`- echo "$(git rev-list --count HEAD).$(git log --pretty=format:'%h' -n 1)"`
		`- }`
		`-`
		`- build() {`
		`- cd "${srcdir}/${_pkgname}"/cmake`
		`- cmake -DCMAKE_INSTALL_PREFIX=/usr ..`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/${_pkgname}"/cmake`
		`- make DESTDIR="${pkgdir}" install`
		`- }`

pcr/dreamchess/PKGBUILD

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ # Maintainer (aur): Nikos Toutountzoglou <nikos.toutou@gmail.com>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ pkgname=dreamchess`
		`+ pkgver=0.3.0`
		`+ pkgrel=1`
		`+ pkgdesc="OpenGL Chess Game"`
		`+ arch=('i686' 'x86_64')`
		`+ arch+=('armv7h')`
		`+ url="https://github.com/dreamchess/dreamchess"`
		`+ license=('GPL3')`
		`+ depends=('sdl2' 'sdl2_image' 'sdl2_mixer' 'expat' 'glew')`
		`+ makedepends=('flex' 'bison' 'cmake')`
		`+ source=($pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz)`
		`+ sha256sums=('b070a34acf69ed92e523902683d104abb295d78b6f37663f4668e929b9e90470')`
		`+`
		`+ build() {`
		`+ cd "$pkgname-$pkgver/cmake"`
		`+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..`
		`+ make`
		`+ }`
		`+`
		`+ package() {`
		`+ cd "$pkgname-$pkgver/cmake"`
		`+ make DESTDIR="$pkgdir/" install`
		`+ }`

pcr/libotr3/PKGBUILD

file removed

-34

		`@@ -1,34 +0,0 @@`
		`- # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor: Pierre Schmitz <pierre@archlinux.de>`
		`- # Contributor: Bug <Bug2000@gmail.com>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=libotr3`
		`- pkgver=3.2.1`
		`- pkgrel=2`
		`- pkgdesc='Off-the-Record Messaging Library and Toolkit (version 3.X)'`
		`- url='http://www.cypherpunks.ca/otr/'`
		`- license=('GPL' 'LGPL')`
		`- arch=('i686' 'x86_64')`
		`- depends=('libgcrypt')`
		`- source=("http://www.cypherpunks.ca/otr/libotr-${pkgver}.tar.gz" "libotr3-soname.patch")`
		`- sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394'`
		`- '08c85f20fa1a0c5e8935d9a3f00b1d4e37f1b2d1')`
		`-`
		`- build() {`
		`- cd "${srcdir}/libotr-${pkgver}"`
		`- patch -p1 -i "${srcdir}/libotr3-soname.patch"`
		`- ./configure --prefix=/usr --mandir=/usr/share/man \`
		`- --program-transform-name='s/otr/otr3/'`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/libotr-${pkgver}"`
		`- make DESTDIR="${pkgdir}" install`
		`-`
		`- for i in parse sesskeys mackey readforge modify remac; do`
		`- rm "${pkgdir}"/usr/share/man/man1/otr_$i.1`
		`- ln -sf otr3_toolkit.1 "${pkgdir}"/usr/share/man/man1/otr3_$i.1`
		`- done`
		`- }`

pcr/libotr3/libotr3-soname.patch

file removed

-695

		`@@ -1,695 +0,0 @@`
		`- diff -Naur libotr-3.2.1.orig/configure libotr-3.2.1/configure`
		`- --- libotr-3.2.1.orig/configure 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/configure 2012-11-02 04:53:47.533538908 -0400`
		`- @@ -791,7 +791,7 @@`
		`- LDFLAGS`
		`- CFLAGS`
		`- CC`
		`- -LIBOTR_LIBTOOL_VERSION`
		`- +LIBOTR3_LIBTOOL_VERSION`
		`- am__untar`
		`- am__tar`
		`- AMTAR`
		`- @@ -2674,7 +2674,7 @@`
		`-`
		`-`
		`- # Define the identity of the package.`
		`- - PACKAGE=libotr`
		`- + PACKAGE=libotr3`
		`- VERSION=3.2.1`
		`-`
		`-`
		`- @@ -2715,7 +2715,7 @@`
		`-`
		`-`
		`-`
		`- -LIBOTR_LIBTOOL_VERSION="4:1:2"`
		`- +LIBOTR3_LIBTOOL_VERSION="4:1:2"`
		`-`
		`-`
		`-`
		`- @@ -10461,7 +10461,7 @@`
		`-`
		`-`
		`-`
		`- -ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr.pc"`
		`- +ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr3.pc"`
		`-`
		`- cat >confcache <<\_ACEOF`
		`- # This file is a shell script that caches the results of configure`
		`- @@ -11434,7 +11434,7 @@`
		`- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;`
		`- "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;`
		`- "toolkit/Makefile") CONFIG_FILES="$CONFIG_FILES toolkit/Makefile" ;;`
		`- - "libotr.pc") CONFIG_FILES="$CONFIG_FILES libotr.pc" ;;`
		`- + "libotr3.pc") CONFIG_FILES="$CONFIG_FILES libotr3.pc" ;;`
		`-`
		- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
		`- esac`
		`- diff -Naur libotr-3.2.1.orig/libotr3.m4 libotr-3.2.1/libotr3.m4`
		`- --- libotr-3.2.1.orig/libotr3.m4 1969-12-31 19:00:00.000000000 -0500`
		`- +++ libotr-3.2.1/libotr3.m4 2012-11-02 04:53:59.983891029 -0400`
		`- @@ -0,0 +1,134 @@`
		`- +dnl`
		`- +dnl Off-the-Record Messaging library`
		`- +dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov`
		`- +dnl <otr@cypherpunks.ca>`
		`- +dnl`
		`- +dnl This library is free software; you can redistribute it and/or`
		`- +dnl modify it under the terms of version 2.1 of the GNU Lesser General`
		`- +dnl Public License as published by the Free Software Foundation.`
		`- +dnl`
		`- +dnl This library is distributed in the hope that it will be useful,`
		`- +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU`
		`- +dnl Lesser General Public License for more details.`
		`- +dnl`
		`- +dnl You should have received a copy of the GNU Lesser General Public`
		`- +dnl License along with this library; if not, write to the Free Software`
		`- +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA`
		`- +dnl`
		`- +`
		`- +dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])`
		`- +dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate.`
		`- +dnl enables arguments --with-libotr3-prefix=`
		`- +dnl --with-libotr3-inc-prefix=`
		`- +dnl`
		`- +dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT`
		`- +dnl`
		`- +dnl Adapted from alsa.m4, originally by`
		`- +dnl Richard Boulton <richard-alsa@tartarus.org>`
		`- +dnl Christopher Lansdown <lansdoct@cs.alfred.edu>`
		`- +dnl Jaroslav Kysela <perex@suse.cz>`
		`- +`
		`- +AC_DEFUN([AM_PATH_LIBOTR3],`
		`- +[dnl Save the original CFLAGS, LDFLAGS, and LIBS`
		`- +libotr3_save_CFLAGS="$CFLAGS"`
		`- +libotr3_save_LDFLAGS="$LDFLAGS"`
		`- +libotr3_save_LIBS="$LIBS"`
		`- +libotr3_found=yes`
		`- +`
		`- +dnl`
		`- +dnl Get the cflags and libraries for libotr3`
		`- +dnl`
		`- +AC_ARG_WITH(libotr3-prefix,`
		`- +[ --with-libotr3-prefix=PFX Prefix where libotr3 is installed(optional)],`
		`- +[libotr3_prefix="$withval"], [libotr3_prefix=""])`
		`- +`
		`- +AC_ARG_WITH(libotr3-inc-prefix,`
		`- +[ --with-libotr3-inc-prefix=PFX Prefix where libotr3 includes are (optional)],`
		`- +[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""])`
		`- +`
		`- +dnl Add any special include directories`
		`- +AC_MSG_CHECKING(for libotr3 CFLAGS)`
		`- +if test "$libotr3_inc_prefix" != "" ; then`
		`- + LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix"`
		`- + CFLAGS="$CFLAGS $LIBOTR3_CFLAGS"`
		`- +fi`
		`- +AC_MSG_RESULT($LIBOTR3_CFLAGS)`
		`- +`
		`- +dnl add any special lib dirs`
		`- +AC_MSG_CHECKING(for libotr3 LIBS)`
		`- +if test "$libotr3_prefix" != "" ; then`
		`- + LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix"`
		`- + LDFLAGS="$LDFLAGS $LIBOTR3_LIBS"`
		`- +fi`
		`- +`
		`- +dnl add the libotr3 library`
		`- +LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3"`
		`- +LIBS="$LIBOTR3_LIBS $LIBS"`
		`- +AC_MSG_RESULT($LIBOTR3_LIBS)`
		`- +`
		`- +dnl Check for a working version of libotr3 that is of the right version.`
		`- +min_libotr3_version=ifelse([$1], ,3.0.0,$1)`
		`- +no_libotr3=""`
		- + libotr3_min_major_version=`echo $min_libotr3_version \| \
		- + sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\1/'`
		- + libotr3_min_minor_version=`echo $min_libotr3_version \| \
		- + sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\2/'`
		- + libotr3_min_sub_version=`echo $min_libotr3_version \| \
		- + sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\3/'`
		`- +AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version)`
		`- +`
		`- +AC_LANG_SAVE`
		`- +AC_LANG_C`
		`- +AC_TRY_COMPILE([`
		`- +#include <stdlib.h>`
		`- +#include <libotr3/version.h>`
		`- +], [`
		`- +# if(OTRL_VERSION_MAJOR != $libotr3_min_major_version)`
		`- +# error not present`
		`- +# else`
		`- +`
		`- +# if(OTRL_VERSION_MINOR > $libotr3_min_minor_version)`
		`- + exit(0);`
		`- +# else`
		`- +# if(OTRL_VERSION_MINOR < $libotr3_min_minor_version)`
		`- +# error not present`
		`- +# endif`
		`- +`
		`- +# if(OTRL_VERSION_SUB < $libotr3_min_sub_version)`
		`- +# error not present`
		`- +# endif`
		`- +# endif`
		`- +# endif`
		`- +exit(0);`
		`- +],`
		`- + [AC_MSG_RESULT(found.)],`
		`- + [AC_MSG_RESULT(not present.)`
		`- + ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)])`
		`- + libotr3_found=no]`
		`- +)`
		`- +AC_LANG_RESTORE`
		`- +`
		`- +dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.`
		`- +AC_CHECK_LIB([otr], [otrl_message_receiving],,`
		`- + [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)])`
		`- + libotr3_found=no],`
		`- + $LIBGCRYPT_LIBS`
		`- +)`
		`- +`
		`- +LDFLAGS="$libotr3_save_LDFLAGS"`
		`- +LIBS="$libotr3_save_LIBS"`
		`- +`
		`- +if test "x$libotr3_found" = "xyes" ; then`
		`- + ifelse([$2], , :, [$2])`
		`- +else`
		`- + LIBOTR3_CFLAGS=""`
		`- + LIBOTR3_LIBS=""`
		`- + ifelse([$3], , :, [$3])`
		`- +fi`
		`- +`
		`- +dnl That should be it. Now just export our symbols:`
		`- +AC_SUBST(LIBOTR3_CFLAGS)`
		`- +AC_SUBST(LIBOTR3_LIBS)`
		`- +])`
		`- +`
		`- diff -Naur libotr-3.2.1.orig/libotr3.pc.in libotr-3.2.1/libotr3.pc.in`
		`- --- libotr-3.2.1.orig/libotr3.pc.in 1969-12-31 19:00:00.000000000 -0500`
		`- +++ libotr-3.2.1/libotr3.pc.in 2012-11-02 04:53:59.983891029 -0400`
		`- @@ -0,0 +1,11 @@`
		`- +prefix=@prefix@`
		`- +exec_prefix=@exec_prefix@`
		`- +libdir=@libdir@`
		`- +includedir=@includedir@`
		`- +`
		`- +Name: libotr3`
		`- +Description: Off-the-Record Messaging Library`
		`- +Version: 3.1.0`
		`- +URL: http://otr.cypherpunks.ca/`
		`- +Libs: -L${libdir} -lotr3`
		`- +Cflags: -I${includedir}`
		`- diff -Naur libotr-3.2.1.orig/libotr.m4 libotr-3.2.1/libotr.m4`
		`- --- libotr-3.2.1.orig/libotr.m4 2012-11-02 04:53:36.606563083 -0400`
		`- +++ libotr-3.2.1/libotr.m4 1969-12-31 19:00:00.000000000 -0500`
		`- @@ -1,134 +0,0 @@`
		`- -dnl`
		`- -dnl Off-the-Record Messaging library`
		`- -dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov`
		`- -dnl <otr@cypherpunks.ca>`
		`- -dnl`
		`- -dnl This library is free software; you can redistribute it and/or`
		`- -dnl modify it under the terms of version 2.1 of the GNU Lesser General`
		`- -dnl Public License as published by the Free Software Foundation.`
		`- -dnl`
		`- -dnl This library is distributed in the hope that it will be useful,`
		`- -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU`
		`- -dnl Lesser General Public License for more details.`
		`- -dnl`
		`- -dnl You should have received a copy of the GNU Lesser General Public`
		`- -dnl License along with this library; if not, write to the Free Software`
		`- -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA`
		`- -dnl`
		`- -`
		`- -dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])`
		`- -dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.`
		`- -dnl enables arguments --with-libotr-prefix=`
		`- -dnl --with-libotr-inc-prefix=`
		`- -dnl`
		`- -dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT`
		`- -dnl`
		`- -dnl Adapted from alsa.m4, originally by`
		`- -dnl Richard Boulton <richard-alsa@tartarus.org>`
		`- -dnl Christopher Lansdown <lansdoct@cs.alfred.edu>`
		`- -dnl Jaroslav Kysela <perex@suse.cz>`
		`- -`
		`- -AC_DEFUN([AM_PATH_LIBOTR],`
		`- -[dnl Save the original CFLAGS, LDFLAGS, and LIBS`
		`- -libotr_save_CFLAGS="$CFLAGS"`
		`- -libotr_save_LDFLAGS="$LDFLAGS"`
		`- -libotr_save_LIBS="$LIBS"`
		`- -libotr_found=yes`
		`- -`
		`- -dnl`
		`- -dnl Get the cflags and libraries for libotr`
		`- -dnl`
		`- -AC_ARG_WITH(libotr-prefix,`
		`- -[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)],`
		`- -[libotr_prefix="$withval"], [libotr_prefix=""])`
		`- -`
		`- -AC_ARG_WITH(libotr-inc-prefix,`
		`- -[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)],`
		`- -[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])`
		`- -`
		`- -dnl Add any special include directories`
		`- -AC_MSG_CHECKING(for libotr CFLAGS)`
		`- -if test "$libotr_inc_prefix" != "" ; then`
		`- - LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"`
		`- - CFLAGS="$CFLAGS $LIBOTR_CFLAGS"`
		`- -fi`
		`- -AC_MSG_RESULT($LIBOTR_CFLAGS)`
		`- -`
		`- -dnl add any special lib dirs`
		`- -AC_MSG_CHECKING(for libotr LIBS)`
		`- -if test "$libotr_prefix" != "" ; then`
		`- - LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"`
		`- - LDFLAGS="$LDFLAGS $LIBOTR_LIBS"`
		`- -fi`
		`- -`
		`- -dnl add the libotr library`
		`- -LIBOTR_LIBS="$LIBOTR_LIBS -lotr"`
		`- -LIBS="$LIBOTR_LIBS $LIBS"`
		`- -AC_MSG_RESULT($LIBOTR_LIBS)`
		`- -`
		`- -dnl Check for a working version of libotr that is of the right version.`
		`- -min_libotr_version=ifelse([$1], ,3.0.0,$1)`
		`- -no_libotr=""`
		- - libotr_min_major_version=`echo $min_libotr_version \| \
		- - sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\1/'`
		- - libotr_min_minor_version=`echo $min_libotr_version \| \
		- - sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\2/'`
		- - libotr_min_sub_version=`echo $min_libotr_version \| \
		- - sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\3/'`
		`- -AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)`
		`- -`
		`- -AC_LANG_SAVE`
		`- -AC_LANG_C`
		`- -AC_TRY_COMPILE([`
		`- -#include <stdlib.h>`
		`- -#include <libotr/version.h>`
		`- -], [`
		`- -# if(OTRL_VERSION_MAJOR != $libotr_min_major_version)`
		`- -# error not present`
		`- -# else`
		`- -`
		`- -# if(OTRL_VERSION_MINOR > $libotr_min_minor_version)`
		`- - exit(0);`
		`- -# else`
		`- -# if(OTRL_VERSION_MINOR < $libotr_min_minor_version)`
		`- -# error not present`
		`- -# endif`
		`- -`
		`- -# if(OTRL_VERSION_SUB < $libotr_min_sub_version)`
		`- -# error not present`
		`- -# endif`
		`- -# endif`
		`- -# endif`
		`- -exit(0);`
		`- -],`
		`- - [AC_MSG_RESULT(found.)],`
		`- - [AC_MSG_RESULT(not present.)`
		`- - ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])`
		`- - libotr_found=no]`
		`- -)`
		`- -AC_LANG_RESTORE`
		`- -`
		`- -dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.`
		`- -AC_CHECK_LIB([otr], [otrl_message_receiving],,`
		`- - [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])`
		`- - libotr_found=no],`
		`- - $LIBGCRYPT_LIBS`
		`- -)`
		`- -`
		`- -LDFLAGS="$libotr_save_LDFLAGS"`
		`- -LIBS="$libotr_save_LIBS"`
		`- -`
		`- -if test "x$libotr_found" = "xyes" ; then`
		`- - ifelse([$2], , :, [$2])`
		`- -else`
		`- - LIBOTR_CFLAGS=""`
		`- - LIBOTR_LIBS=""`
		`- - ifelse([$3], , :, [$3])`
		`- -fi`
		`- -`
		`- -dnl That should be it. Now just export our symbols:`
		`- -AC_SUBST(LIBOTR_CFLAGS)`
		`- -AC_SUBST(LIBOTR_LIBS)`
		`- -])`
		`- -`
		`- diff -Naur libotr-3.2.1.orig/libotr.m4.orig libotr-3.2.1/libotr.m4.orig`
		`- --- libotr-3.2.1.orig/libotr.m4.orig 1969-12-31 19:00:00.000000000 -0500`
		`- +++ libotr-3.2.1/libotr.m4.orig 2012-08-14 08:15:56.000000000 -0400`
		`- @@ -0,0 +1,134 @@`
		`- +dnl`
		`- +dnl Off-the-Record Messaging library`
		`- +dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov`
		`- +dnl <otr@cypherpunks.ca>`
		`- +dnl`
		`- +dnl This library is free software; you can redistribute it and/or`
		`- +dnl modify it under the terms of version 2.1 of the GNU Lesser General`
		`- +dnl Public License as published by the Free Software Foundation.`
		`- +dnl`
		`- +dnl This library is distributed in the hope that it will be useful,`
		`- +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU`
		`- +dnl Lesser General Public License for more details.`
		`- +dnl`
		`- +dnl You should have received a copy of the GNU Lesser General Public`
		`- +dnl License along with this library; if not, write to the Free Software`
		`- +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA`
		`- +dnl`
		`- +`
		`- +dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])`
		`- +dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.`
		`- +dnl enables arguments --with-libotr-prefix=`
		`- +dnl --with-libotr-inc-prefix=`
		`- +dnl`
		`- +dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT`
		`- +dnl`
		`- +dnl Adapted from alsa.m4, originally by`
		`- +dnl Richard Boulton <richard-alsa@tartarus.org>`
		`- +dnl Christopher Lansdown <lansdoct@cs.alfred.edu>`
		`- +dnl Jaroslav Kysela <perex@suse.cz>`
		`- +`
		`- +AC_DEFUN([AM_PATH_LIBOTR],`
		`- +[dnl Save the original CFLAGS, LDFLAGS, and LIBS`
		`- +libotr_save_CFLAGS="$CFLAGS"`
		`- +libotr_save_LDFLAGS="$LDFLAGS"`
		`- +libotr_save_LIBS="$LIBS"`
		`- +libotr_found=yes`
		`- +`
		`- +dnl`
		`- +dnl Get the cflags and libraries for libotr`
		`- +dnl`
		`- +AC_ARG_WITH(libotr-prefix,`
		`- +[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)],`
		`- +[libotr_prefix="$withval"], [libotr_prefix=""])`
		`- +`
		`- +AC_ARG_WITH(libotr-inc-prefix,`
		`- +[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)],`
		`- +[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])`
		`- +`
		`- +dnl Add any special include directories`
		`- +AC_MSG_CHECKING(for libotr CFLAGS)`
		`- +if test "$libotr_inc_prefix" != "" ; then`
		`- + LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"`
		`- + CFLAGS="$CFLAGS $LIBOTR_CFLAGS"`
		`- +fi`
		`- +AC_MSG_RESULT($LIBOTR_CFLAGS)`
		`- +`
		`- +dnl add any special lib dirs`
		`- +AC_MSG_CHECKING(for libotr LIBS)`
		`- +if test "$libotr_prefix" != "" ; then`
		`- + LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"`
		`- + LDFLAGS="$LDFLAGS $LIBOTR_LIBS"`
		`- +fi`
		`- +`
		`- +dnl add the libotr library`
		`- +LIBOTR_LIBS="$LIBOTR_LIBS -lotr"`
		`- +LIBS="$LIBOTR_LIBS $LIBS"`
		`- +AC_MSG_RESULT($LIBOTR_LIBS)`
		`- +`
		`- +dnl Check for a working version of libotr that is of the right version.`
		`- +min_libotr_version=ifelse([$1], ,3.0.0,$1)`
		`- +no_libotr=""`
		- + libotr_min_major_version=`echo $min_libotr_version \| \
		- + sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\1/'`
		- + libotr_min_minor_version=`echo $min_libotr_version \| \
		- + sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\2/'`
		- + libotr_min_sub_version=`echo $min_libotr_version \| \
		- + sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\3/'`
		`- +AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)`
		`- +`
		`- +AC_LANG_SAVE`
		`- +AC_LANG_C`
		`- +AC_TRY_COMPILE([`
		`- +#include <stdlib.h>`
		`- +#include <libotr/version.h>`
		`- +], [`
		`- +# if(OTRL_VERSION_MAJOR != $libotr_min_major_version)`
		`- +# error not present`
		`- +# else`
		`- +`
		`- +# if(OTRL_VERSION_MINOR > $libotr_min_minor_version)`
		`- + exit(0);`
		`- +# else`
		`- +# if(OTRL_VERSION_MINOR < $libotr_min_minor_version)`
		`- +# error not present`
		`- +# endif`
		`- +`
		`- +# if(OTRL_VERSION_SUB < $libotr_min_sub_version)`
		`- +# error not present`
		`- +# endif`
		`- +# endif`
		`- +# endif`
		`- +exit(0);`
		`- +],`
		`- + [AC_MSG_RESULT(found.)],`
		`- + [AC_MSG_RESULT(not present.)`
		`- + ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])`
		`- + libotr_found=no]`
		`- +)`
		`- +AC_LANG_RESTORE`
		`- +`
		`- +dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.`
		`- +AC_CHECK_LIB([otr], [otrl_message_receiving],,`
		`- + [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])`
		`- + libotr_found=no],`
		`- + $LIBGCRYPT_LIBS`
		`- +)`
		`- +`
		`- +LDFLAGS="$libotr_save_LDFLAGS"`
		`- +LIBS="$libotr_save_LIBS"`
		`- +`
		`- +if test "x$libotr_found" = "xyes" ; then`
		`- + ifelse([$2], , :, [$2])`
		`- +else`
		`- + LIBOTR_CFLAGS=""`
		`- + LIBOTR_LIBS=""`
		`- + ifelse([$3], , :, [$3])`
		`- +fi`
		`- +`
		`- +dnl That should be it. Now just export our symbols:`
		`- +AC_SUBST(LIBOTR_CFLAGS)`
		`- +AC_SUBST(LIBOTR_LIBS)`
		`- +])`
		`- +`
		`- diff -Naur libotr-3.2.1.orig/libotr.pc.in libotr-3.2.1/libotr.pc.in`
		`- --- libotr-3.2.1.orig/libotr.pc.in 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/libotr.pc.in 1969-12-31 19:00:00.000000000 -0500`
		`- @@ -1,11 +0,0 @@`
		`- -prefix=@prefix@`
		`- -exec_prefix=@exec_prefix@`
		`- -libdir=@libdir@`
		`- -includedir=@includedir@`
		`- -`
		`- -Name: libotr`
		`- -Description: Off-the-Record Messaging Library`
		`- -Version: 3.1.0`
		`- -URL: http://otr.cypherpunks.ca/`
		`- -Libs: -L${libdir} -lotr`
		`- -Cflags: -I${includedir}`
		`- diff -Naur libotr-3.2.1.orig/Makefile.am libotr-3.2.1/Makefile.am`
		`- --- libotr-3.2.1.orig/Makefile.am 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/Makefile.am 2012-11-02 04:53:47.536872337 -0400`
		`- @@ -1,9 +1,9 @@`
		`- SUBDIRS = src toolkit`
		`-`
		`- -EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in`
		`- +EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in`
		`-`
		`- aclocaldir = $(datadir)/aclocal`
		`- -aclocal_DATA = libotr.m4`
		`- +aclocal_DATA = libotr3.m4`
		`-`
		`- pkgconfigdir = $(libdir)/pkgconfig`
		`- -pkgconfig_DATA = libotr.pc`
		`- +pkgconfig_DATA = libotr3.pc`
		`- diff -Naur libotr-3.2.1.orig/Makefile.in libotr-3.2.1/Makefile.in`
		`- --- libotr-3.2.1.orig/Makefile.in 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/Makefile.in 2012-11-02 04:53:47.536872337 -0400`
		`- @@ -37,7 +37,7 @@`
		`- subdir = .`
		`- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \`
		`- $(srcdir)/Makefile.in $(srcdir)/config.h.in \`
		`- - $(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \`
		`- + $(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \`
		`- COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \`
		`- depcomp install-sh ltmain.sh missing`
		`- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4`
		`- @@ -48,7 +48,7 @@`
		`- configure.lineno config.status.lineno`
		`- mkinstalldirs = $(install_sh) -d`
		`- CONFIG_HEADER = config.h`
		`- -CONFIG_CLEAN_FILES = libotr.pc`
		`- +CONFIG_CLEAN_FILES = libotr3.pc`
		`- CONFIG_CLEAN_VPATH_FILES =`
		`- SOURCES =`
		`- DIST_SOURCES =`
		`- @@ -162,7 +162,7 @@`
		`- LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@`
		`- LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@`
		`- LIBOBJS = @LIBOBJS@`
		`- -LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@`
		`- +LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@`
		`- LIBS = @LIBS@`
		`- LIBTOOL = @LIBTOOL@`
		`- LIPO = @LIPO@`
		`- @@ -243,11 +243,11 @@`
		`- top_builddir = @top_builddir@`
		`- top_srcdir = @top_srcdir@`
		`- SUBDIRS = src toolkit`
		`- -EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in`
		`- +EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in`
		`- aclocaldir = $(datadir)/aclocal`
		`- -aclocal_DATA = libotr.m4`
		`- +aclocal_DATA = libotr3.m4`
		`- pkgconfigdir = $(libdir)/pkgconfig`
		`- -pkgconfig_DATA = libotr.pc`
		`- +pkgconfig_DATA = libotr3.pc`
		`- all: config.h`
		`- $(MAKE) $(AM_MAKEFLAGS) all-recursive`
		`-`
		`- @@ -303,7 +303,7 @@`
		`-`
		`- distclean-hdr:`
		`- -rm -f config.h stamp-h1`
		`- -libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in`
		`- +libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in`
		`- cd $(top_builddir) && $(SHELL) ./config.status $@`
		`-`
		`- mostlyclean-libtool:`
		`- diff -Naur libotr-3.2.1.orig/src/Makefile.am libotr-3.2.1/src/Makefile.am`
		`- --- libotr-3.2.1.orig/src/Makefile.am 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/src/Makefile.am 2012-11-02 04:53:47.536872337 -0400`
		`- @@ -1,13 +1,13 @@`
		`- INCLUDES = @LIBGCRYPT_CFLAGS@`
		`-`
		`- -lib_LTLIBRARIES = libotr.la`
		`- +lib_LTLIBRARIES = libotr3.la`
		`-`
		`- -libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \`
		`- +libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \`
		`- userstate.c tlv.c auth.c sm.c`
		`-`
		`- -libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@`
		`- +libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@`
		`-`
		`- -otrincdir = $(includedir)/libotr`
		`- +otrincdir = $(includedir)/libotr3`
		`-`
		`- otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \`
		`- version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h`
		`- diff -Naur libotr-3.2.1.orig/src/Makefile.in libotr-3.2.1/src/Makefile.in`
		`- --- libotr-3.2.1.orig/src/Makefile.in 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/src/Makefile.in 2012-11-02 04:53:47.536872337 -0400`
		`- @@ -69,13 +69,13 @@`
		`- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'`
		`- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)"`
		`- LTLIBRARIES = $(lib_LTLIBRARIES)`
		`- -libotr_la_LIBADD =`
		`- -am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \`
		`- +libotr3_la_LIBADD =`
		`- +am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \`
		`- mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo`
		`- -libotr_la_OBJECTS = $(am_libotr_la_OBJECTS)`
		`- -libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \`
		`- +libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS)`
		`- +libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \`
		`- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \`
		`- - $(libotr_la_LDFLAGS) $(LDFLAGS) -o $@`
		`- + $(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@`
		`- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)`
		`- depcomp = $(SHELL) $(top_srcdir)/depcomp`
		`- am__depfiles_maybe = depfiles`
		`- @@ -89,8 +89,8 @@`
		`- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \`
		`- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \`
		`- $(LDFLAGS) -o $@`
		`- -SOURCES = $(libotr_la_SOURCES)`
		`- -DIST_SOURCES = $(libotr_la_SOURCES)`
		`- +SOURCES = $(libotr3_la_SOURCES)`
		`- +DIST_SOURCES = $(libotr3_la_SOURCES)`
		`- HEADERS = $(otrinc_HEADERS)`
		`- ETAGS = etags`
		`- CTAGS = ctags`
		`- @@ -130,7 +130,7 @@`
		`- LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@`
		`- LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@`
		`- LIBOBJS = @LIBOBJS@`
		`- -LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@`
		`- +LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@`
		`- LIBS = @LIBS@`
		`- LIBTOOL = @LIBTOOL@`
		`- LIPO = @LIPO@`
		`- @@ -211,12 +211,12 @@`
		`- top_builddir = @top_builddir@`
		`- top_srcdir = @top_srcdir@`
		`- INCLUDES = @LIBGCRYPT_CFLAGS@`
		`- -lib_LTLIBRARIES = libotr.la`
		`- -libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \`
		`- +lib_LTLIBRARIES = libotr3.la`
		`- +libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \`
		`- userstate.c tlv.c auth.c sm.c`
		`-`
		`- -libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@`
		`- -otrincdir = $(includedir)/libotr`
		`- +libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@`
		`- +otrincdir = $(includedir)/libotr3`
		`- otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \`
		`- version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h`
		`-`
		`- @@ -285,8 +285,8 @@`
		`- echo "rm -f \"$${dir}/so_locations\""; \`
		`- rm -f "$${dir}/so_locations"; \`
		`- done`
		`- -libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES)`
		`- - $(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS)`
		`- +libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES)`
		`- + $(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS)`
		`-`
		`- mostlyclean-compile:`
		`- -rm -f *.$(OBJEXT)`
		`- diff -Naur libotr-3.2.1.orig/toolkit/Makefile.am libotr-3.2.1/toolkit/Makefile.am`
		`- --- libotr-3.2.1.orig/toolkit/Makefile.am 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/toolkit/Makefile.am 2012-11-02 04:53:47.536872337 -0400`
		`- @@ -6,7 +6,7 @@`
		`- otr_modify otr_remac`
		`-`
		`- COMMON_S = parse.c sha1hmac.c`
		`- -COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@`
		`- +COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@`
		`-`
		`- otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)`
		`- otr_parse_LDADD = $(COMMON_LD)`
		`- diff -Naur libotr-3.2.1.orig/toolkit/Makefile.in libotr-3.2.1/toolkit/Makefile.in`
		`- --- libotr-3.2.1.orig/toolkit/Makefile.in 2012-11-02 04:53:36.609896510 -0400`
		`- +++ libotr-3.2.1/toolkit/Makefile.in 2012-11-02 04:53:47.536872337 -0400`
		`- @@ -55,7 +55,7 @@`
		`- am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \`
		`- $(am__objects_1)`
		`- otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS)`
		`- -am__DEPENDENCIES_1 = ../src/libotr.la`
		`- +am__DEPENDENCIES_1 = ../src/libotr3.la`
		`- otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1)`
		`- am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \`
		`- $(am__objects_1)`
		`- @@ -159,7 +159,7 @@`
		`- LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@`
		`- LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@`
		`- LIBOBJS = @LIBOBJS@`
		`- -LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@`
		`- +LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@`
		`- LIBS = @LIBS@`
		`- LIBTOOL = @LIBTOOL@`
		`- LIPO = @LIPO@`
		`- @@ -242,7 +242,7 @@`
		`- INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@`
		`- noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h`
		`- COMMON_S = parse.c sha1hmac.c`
		`- -COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@`
		`- +COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@`
		`- otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)`
		`- otr_parse_LDADD = $(COMMON_LD)`
		`- otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S)`

pcr/neo6502/PKGBUILD

file added

+102

		`@@ -0,0 +1,102 @@`
		`+ # Maintainer: bill-auger <bill-auger@programmer.net>`
		`+`
		`+`
		`+ pkgbase=neo6502`
		`+ pkgname=(neo6502-docs neo6502-emulator neo6502-firmware)`
		`+ _upstream_name=neo6502-firmware`
		`+ pkgver=0.16.3`
		`+ _pico_sdk_ver=1.5.1`
		`+ _tinyusb_ver=0.16.0`
		`+ _picodvi_rev=a248d72b8cc95a08b43ef4307cd954eb801272b2 # no stable release available`
		`+ _pico_fatfs_ver=1.0.8`
		`+ pkgrel=1`
		`+ pkgdesc="Emulator and firmware for the Neo6502 Retro-computer"`
		`+ arch=(armv7h i686 x86_64)`
		`+ license=(custom:MIT)`
		`+ url=http://www.neo6502.com/`
		`+`
		`+ depends=()`
		`+ makedepends=(64tass arm-none-eabi-gcc arm-none-eabi-newlib cmake`
		`+ python-gitpython python-pillow sdl2 zip)`
		`+ makedepends+=(pandoc texlive-latex texlive-latexextra texlive-latexrecommended)`
		`+ source=(neo6502-firmware-${pkgver}.tar.gz::https://github.com/paulscottrobson/${_upstream_name}/archive/refs/tags/v${pkgver}.tar.gz`
		`+ pico-sdk-${_pico_sdk_ver}.tar.gz::https://github.com/raspberrypi/pico-sdk/archive/refs/tags/${_pico_sdk_ver}.tar.gz`
		`+ tinyusb-${_tinyusb_ver}.tar.gz::https://github.com/hathach/tinyusb/archive/refs/tags/${_tinyusb_ver}.tar.gz`
		`+ PicoDVI-${_picodvi_rev}.tar.gz::https://github.com/Wren6991/PicoDVI/archive/${_picodvi_rev}.tar.gz`
		`+ pico_fatfs-${_pico_fatfs_ver}.tar.gz::https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico/archive/refs/tags/v${_pico_fatfs_ver}.tar.gz)`
		`+ source+=(build_offline.patch)`
		`+ sha256sums=('a935688087259743f98fb707cfcde39e9d2bf2192a77e550a71e325a43dc9c80'`
		`+ '95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c'`
		`+ '5b24ed6d7732d07bb25a2013b3ad65fdb8752da3e9faac6372ff0574b26a0447'`
		`+ 'efd85ffe21335004f8ebfe6d07c2a6482c4dd96bc6f0132fa4adb21464845a88'`
		`+ '68ffa9f157b94df969d3bc34f32acb4d4fdf2bdf5391952cf242fec20f53b0b8')`
		`+ sha256sums+=(SKIP)`
		`+`
		`+`
		`+ prepare()`
		`+ {`
		`+ cd "${srcdir}"/pico-sdk-${_pico_sdk_ver}`
		`+`
		`+ sed -i 's\|ARM_TOOLCHAIN_COMMON_FLAGS "\|& -march=armv6-m -mtune=cortex-m0plus -fcf-protection=none -fstack-check=generic -fno-stack-clash-protection \|' cmake/preload/toolchains/pico_arm_gcc.cmake`
		`+`
		`+`
		`+ cd "${srcdir}"/${_upstream_name}-${pkgver}`
		`+`
		`+ # avoid downloading sources at build-time`
		`+ patch -Np1 < "${srcdir}"/build_offline.patch`
		`+`
		`+ # avoid building the windows emulator`
		`+ sed -i 's\|emulator release\|emulator clean\n\t$(MAKE) -B -C emulator elinux\|' Makefile`
		`+ sed -i '/neo.exe/d' release/Makefile`
		`+`
		`+ sed -i 's\|STORAGE = USBKEY\|STORAGE = NO\|' firmware/Makefile`
		`+ # prevent exit failure when sourcing cvimg.py`
		`+ sed -i 's\|sys\.exit(1)\|sys.exit(0)\|' basic/images/cvimg.py`
		`+ }`
		`+`
		`+ build()`
		`+ {`
		`+ cd "${srcdir}"/${_upstream_name}-${pkgver}`
		`+`
		`+ # avoid downloading sources at build-time`
		`+ export PICO_SDK_FETCH_FROM_GIT=off`
		`+ export PICO_SDK_PATH="${srcdir}"/pico-sdk-${_pico_sdk_ver}`
		`+ export PICO_TINYUSB_PATH="${srcdir}"/tinyusb-${_tinyusb_ver}`
		`+ export PICO_DVI_PATH="${srcdir}"/PicoDVI-${_picodvi_rev}`
		`+ export PICO_FATFS_PATH="${srcdir}"/no-OS-FatFS-SD-SPI-RPi-Pico-${_pico_fatfs_ver}`
		`+`
		`+ make`
		`+ }`
		`+`
		`+ package_neo6502-docs()`
		`+ {`
		`+ cd "${srcdir}"/${_upstream_name}-${pkgver}`
		`+`
		`+ install -Dm644 documents/release/*.odt -t "${pkgdir}"/usr/share/doc/${pkgbase}/`
		`+ install -Dm644 documents/release/*.pdf -t "${pkgdir}"/usr/share/doc/${pkgbase}/`
		`+ install -Dm644 documents/*.pdf -t "${pkgdir}"/usr/share/doc/${pkgbase}/`
		`+ }`
		`+`
		`+ package_neo6502-emulator()`
		`+ {`
		`+ optdepends=("neo6502-docs: Neo6502 documentation")`
		`+`
		`+ cd "${srcdir}"/${_upstream_name}-${pkgver}`
		`+`
		`+ install -Dm755 bin/neo "${pkgdir}"/usr/bin/neo`
		`+ install -d "${pkgdir}"/usr/share/${pkgbase}/examples/`
		`+ cp -a examples/ "${pkgdir}"/usr/share/${pkgbase}/examples/`
		`+ chmod -R 644 "${pkgdir}"/usr/share/${pkgbase}/examples/`
		`+ install -Dm644 bin/*.zip -t "${pkgdir}"/usr/share/${pkgbase}/utils/`
		`+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgbase}/`
		`+ }`
		`+`
		`+ package_neo6502-firmware()`
		`+ {`
		`+ optdepends=("neo6502-docs: Neo6502 documentation")`
		`+`
		`+ cd "${srcdir}"/${_upstream_name}-${pkgver}`
		`+`
		`+ install -Dm644 bin/*.bin -t "${pkgdir}"/usr/share/${pkgbase}/firmware/`
		`+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgbase}/`
		`+ }`

pcr/neo6502/build_offline.patch

file added

+134

		`@@ -0,0 +1,134 @@`
		`+ diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt`
		`+ index a347acf4..7c4e484e 100644`
		`+ --- a/firmware/CMakeLists.txt`
		`+ +++ b/firmware/CMakeLists.txt`
		`+ @@ -3,19 +3,28 @@ cmake_minimum_required(VERSION 3.14)`
		`+ set(CMAKE_C_STANDARD 11)`
		`+ set(CMAKE_CXX_STANDARD 17)`
		`+`
		`+ -set(PICO_SDK_FETCH_FROM_GIT on)`
		`+ +`
		`+ +if(NOT DEFINED ENV{PICO_SDK_FETCH_FROM_GIT})`
		`+ + set(PICO_SDK_FETCH_FROM_GIT on)`
		`+ + message("Defaulting PICO_SDK_FETCH_FROM_GIT")`
		`+ +endif()`
		`+ include(pico_sdk_import.cmake)`
		`+`
		`+ project(firmware C CXX ASM)`
		`+`
		`+ include(FetchContent)`
		`+`
		`+ -FetchContent_Declare(`
		`+ - tinyusb`
		`+ - GIT_REPOSITORY https://github.com/hathach/tinyusb.git`
		`+ - GIT_TAG 0.16.0`
		`+ -)`
		`+ -FetchContent_MakeAvailable(tinyusb)`
		`+ +# if((NOT DEFINED ENV{PICO_TINYUSB_FETCH_FROM_GIT}) OR ENV{PICO_TINYUSB_FETCH_FROM_GIT})`
		`+ +if(DEFINED ENV{PICO_TINYUSB_PATH})`
		`+ + set(tinyusb_SOURCE_DIR $ENV{PICO_TINYUSB_PATH})`
		`+ +else()`
		`+ + FetchContent_Declare(`
		`+ + tinyusb`
		`+ + GIT_REPOSITORY https://github.com/hathach/tinyusb.git`
		`+ + GIT_TAG 0.16.0`
		`+ + )`
		`+ + FetchContent_MakeAvailable(tinyusb)`
		`+ +endif()`
		`+ set(PICO_TINYUSB_PATH ${tinyusb_SOURCE_DIR})`
		`+`
		`+ pico_sdk_init()`
		`+ @@ -34,13 +43,18 @@ include_directories(`
		`+ common/include`
		`+ )`
		`+`
		`+ -FetchContent_Declare(`
		`+ - PicoDVI`
		`+ - GIT_REPOSITORY https://github.com/Wren6991/PicoDVI`
		`+ - GIT_TAG a248d72b8cc95a08b43ef4307cd954eb801272b2 # just the latest on 11/12/2023`
		`+ -)`
		`+ -FetchContent_MakeAvailable(PicoDVI)`
		`+ -`
		`+ +# if ((NOT DEFINED ENV{PICO_DVI_FETCH_FROM_GIT}) OR ENV{PICO_DVI_FETCH_FROM_GIT})`
		`+ +if(DEFINED ENV{PICO_DVI_PATH})`
		`+ + set(picodvi_SOURCE_DIR $ENV{PICO_DVI_PATH})`
		`+ + set(picodvi_BINARY_DIR "_deps/picodvi-build")`
		`+ +else()`
		`+ + FetchContent_Declare(`
		`+ + PicoDVI`
		`+ + GIT_REPOSITORY https://github.com/Wren6991/PicoDVI`
		`+ + GIT_TAG a248d72b8cc95a08b43ef4307cd954eb801272b2 # just the latest on 11/12/2023`
		`+ + )`
		`+ + FetchContent_MakeAvailable(PicoDVI)`
		`+ +endif()`
		`+ add_subdirectory(${picodvi_SOURCE_DIR}/software/libdvi ${picodvi_BINARY_DIR})`
		`+`
		`+ add_library(fatfs INTERFACE)`
		`+ @@ -54,4 +68,4 @@ target_include_directories(fatfs INTERFACE ${tinyusb_SOURCE_DIR}/lib/fatfs/sourc`
		`+ add_subdirectory(sources)`
		`+`
		`+ pico_enable_stdio_usb(firmware 0)`
		`+ -pico_enable_stdio_uart(firmware 0)`
		`+ \ No newline at end of file`
		`+ +pico_enable_stdio_uart(firmware 0)`
		`+ diff --git a/firmware/sources/CMakeLists.txt b/firmware/sources/CMakeLists.txt`
		`+ index a767fc49..1dd8f093 100644`
		`+ --- a/firmware/sources/CMakeLists.txt`
		`+ +++ b/firmware/sources/CMakeLists.txt`
		`+ @@ -1,11 +1,16 @@`
		`+ add_executable(firmware)`
		`+`
		`+ -FetchContent_Declare(`
		`+ - no-OS-FatFS-SD-SPI-RPi-Pico`
		`+ - GIT_REPOSITORY https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico.git`
		`+ - GIT_TAG bbccc5d2deea09e128e2576ef35f72b473c5ba5f # just the latest on 30/01/2024`
		`+ -)`
		`+ -FetchContent_MakeAvailable(no-OS-FatFS-SD-SPI-RPi-Pico)`
		`+ +if (DEFINED ENV{PICO_FATFS_PATH})`
		`+ + set(no-os-fatfs-sd-spi-rpi-pico_SOURCE_DIR $ENV{PICO_FATFS_PATH})`
		`+ + set(no-os-fatfs-sd-spi-rpi-pico_BINARY_DIR "_deps/no-os-fatfs-sd-spi-rpi-pico-build")`
		`+ +else()`
		`+ + FetchContent_Declare(`
		`+ + no-OS-FatFS-SD-SPI-RPi-Pico`
		`+ + GIT_REPOSITORY https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico.git`
		`+ + GIT_TAG bbccc5d2deea09e128e2576ef35f72b473c5ba5f # just the latest on 30/01/2024`
		`+ + )`
		`+ + FetchContent_MakeAvailable(no-OS-FatFS-SD-SPI-RPi-Pico)`
		`+ +endif()`
		`+`
		`+ pico_generate_pio_header(firmware ${CMAKE_CURRENT_LIST_DIR}/system/sm0_memory_emulation_with_clock.pio)`
		`+`
		`+ @@ -13,26 +18,26 @@ add_definitions(-Wno-error=unused-variable)`
		`+`
		`+ set(COMMONSRC "../common/sources/interface")`
		`+`
		`+ -target_sources(firmware PRIVATE main.cpp`
		`+ +target_sources(firmware PRIVATE main.cpp`
		`+ #`
		`+ # Common ${COMMONSRC} routines`
		`+ #`
		`+ - ${COMMONSRC}/graphics.cpp ${COMMONSRC}/console.cpp ${COMMONSRC}/keyboard.cpp ${COMMONSRC}/memory.cpp`
		`+ - ${COMMONSRC}/dispatch.cpp ${COMMONSRC}/maths.cpp ${COMMONSRC}/config.cpp ${COMMONSRC}/efla.cpp`
		`+ - ${COMMONSRC}/gfxcommands.cpp ${COMMONSRC}/ellipse.cpp ${COMMONSRC}/fileinterface.cpp`
		`+ + ${COMMONSRC}/graphics.cpp ${COMMONSRC}/console.cpp ${COMMONSRC}/keyboard.cpp ${COMMONSRC}/memory.cpp`
		`+ + ${COMMONSRC}/dispatch.cpp ${COMMONSRC}/maths.cpp ${COMMONSRC}/config.cpp ${COMMONSRC}/efla.cpp`
		`+ + ${COMMONSRC}/gfxcommands.cpp ${COMMONSRC}/ellipse.cpp ${COMMONSRC}/fileinterface.cpp`
		`+ ${COMMONSRC}/sprites.cpp ${COMMONSRC}/logo.cpp ${COMMONSRC}/sprites_xor.cpp ${COMMONSRC}/tilemap.cpp`
		`+ ${COMMONSRC}/sndmanager.cpp ${COMMONSRC}/sfxmanager.cpp ${COMMONSRC}/tick.cpp ${COMMONSRC}/serialmanager.cpp`
		`+ ${COMMONSRC}/turtle.cpp ${COMMONSRC}/locale.cpp ${COMMONSRC}/pininterface.cpp`
		`+ #`
		`+ # Hardware sources`
		`+ #`
		`+ - hardware/dvi_320x240x256.cpp hardware/usbdriver.cpp hardware/timer.cpp hardware/sound.cpp`
		`+ + hardware/dvi_320x240x256.cpp hardware/usbdriver.cpp hardware/timer.cpp hardware/sound.cpp`
		`+ hardware/fileimplementation.cpp hardware/tick.cpp hardware/serial.cpp hardware/ports.cpp`
		`+ #`
		`+ # CPU type (pretty much permanently PIO now)`
		`+ #`
		`+ - system/processor_pio.cpp`
		`+ - #system/processor_bitbang.cpp`
		`+ + system/processor_pio.cpp`
		`+ + #system/processor_bitbang.cpp`
		`+ )`
		`+`
		`+ #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")`

pcr/parabolaiso-git/PKGBUILD

file removed

-47

		`@@ -1,47 +0,0 @@`
		`- # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor: Pierre Schmitz <pierre@archlinux.de>`
		`- # Contributor: Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`- # Maintainer: David P. <megver83@parabola.nu>`
		`- # Contributor: André Silva <emulatorman@hyperbola.info>`
		`-`
		`- pkgbase=parabolaiso-git`
		`- _pkgbase=parabolaiso`
		`- pkgname=(parabolaiso-git mkinitcpio-parabolaiso-git)`
		`- pkgver=v51.r1.c43fdf45`
		`- pkgrel=1`
		`- pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'`
		`- arch=('any')`
		`- license=('GPL3')`
		`- url='https://git.parabola.nu/parabolaiso.git/'`
		`- makedepends=('git')`
		`- _commit=c43fdf4`
		`- source=("git+https://git.parabola.nu/packages/parabolaiso.git#commit=${_commit}?signed")`
		`- sha256sums=('SKIP')`
		`- validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P.`
		`-`
		`- pkgver() {`
		`- cd "${_pkgbase}"`
		`- printf "%s" "$(git describe --long \| sed 's/$[^-]*-$g/r\1/;s/-/./g')"`
		`- }`
		`-`
		`- package_parabolaiso-git() {`
		`- depends=('arch-install-scripts' 'bash' 'dosfstools' 'e2fsprogs' 'libisoburn'`
		`- 'mtools' 'squashfs-tools')`
		`- optdepends=('edk2-ovmf: for emulating UEFI with run_parabolaiso'`
		`- 'qemu: for run_parabolaiso')`
		`- provides=("archiso-git=$pkgver" 'parabolaiso')`
		`- conflicts=('archiso-git' 'parabolaiso')`
		`- replaces=('archiso-git')`
		`- cd "${_pkgbase}"`
		`- make DESTDIR="${pkgdir}" install`
		`- }`
		`-`
		`- package_mkinitcpio-parabolaiso-git() {`
		`- pkgdesc='Mkinitcpio hooks and scripts for parabolaiso'`
		`- depends=('mkinitcpio')`
		`- provides=("mkinitcpio-archiso-git=$pkgver" 'mkinitcpio-parabolaiso')`
		`- conflicts=('mkinitcpio-archiso-git' 'mkinitcpio-parabolaiso')`
		`- replaces=('mkinitcpio-archiso-git')`
		`- cd "${_pkgbase}"`
		`- make DESTDIR="${pkgdir}" install-initcpio`
		`- }`

abslibre

#96 libre\iceweasel: 123.0.parabola1, sync with upstreams

Opened 2 months ago by grizzlyuser. Modified 2 months ago

iceweasel into pull-requests

Metadata

Changes Summary 64

abslibre

Source Code

#96 libre\iceweasel: 123.0.parabola1, sync with upstreams Opened 2 months ago by grizzlyuser. Modified 2 months ago iceweasel into pull-requests

Metadata

Changes Summary 64

#96 libre\iceweasel: 123.0.parabola1, sync with upstreams

Opened 2 months ago by grizzlyuser. Modified 2 months ago

iceweasel into pull-requests