From 050ee779f48c070d2ccc4fe09fa55f8c8e84b177 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 8 May 2022 08:41:35 -0400 Subject: [filesystem]: upgrade to v2021.12.07 * revised nsswitch.conf rules for systemd * arch dropped the empty motd; so i added a pretty one for parabola instead * added VARIANT_ID to the os-release file as a reliable way to determine the init-system the rest of the changes were only to minimize the diff against the arch PKGBUILD --- libre/filesystem/PKGBUILD | 63 +++++--- libre/filesystem/motd | 8 + libre/filesystem/nsswitch.conf | 5 +- libre/filesystem/os-release | 2 + libre/filesystem/parabola-logo-text-dark.svg | 73 +++++++++ libre/filesystem/parabola-logo-text.svg | 73 +++++++++ libre/filesystem/parabola-logo.png | Bin 19091 -> 7725 bytes libre/filesystem/parabola-logo.svg | 227 +++----------------------- libre/filesystem/parabola.png | Bin 19091 -> 0 bytes libre/filesystem/parabola.svg | 231 --------------------------- libre/filesystem/tmpfiles | 1 - 11 files changed, 216 insertions(+), 467 deletions(-) create mode 100644 libre/filesystem/parabola-logo-text-dark.svg create mode 100644 libre/filesystem/parabola-logo-text.svg delete mode 100644 libre/filesystem/parabola.png delete mode 100644 libre/filesystem/parabola.svg (limited to 'libre') diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 952e5551e..21e947a5e 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,10 +1,16 @@ -# Maintainer (Arch): Sébastien Luttringer -# Contributor (Arch): Tom Gundersen +# Maintainer (arch): Sébastien Luttringer +# Contributor: Tom Gundersen # Maintainer: Omar Vega Ramos # Contributor: Nicolás Reynolds +# Contributor: bill-auger + + +# parabola changes and rationale: +# - parabola branding (os-release,motd,icon,logo) + pkgname=filesystem -pkgver=2021.01.19 +pkgver=2021.12.07 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Base Parabola GNU/Linux-libre files' @@ -14,14 +20,17 @@ license=('GPL') url='https://www.parabola.nu' depends=('iana-etc') backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf' - 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf' 'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty' 'etc/shadow' 'etc/shells') +backup+=('etc/motd') source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' - 'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release' + 'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' - 'sysusers' 'tmpfiles' 'parabola.svg' 'parabola.png' - 'parabola-logo.svg' 'parabola-logo.png') + 'sysusers' 'tmpfiles' 'archlinux-logo.svg' 'archlinux-logo.png' + 'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg') +source=( ${source[*]//archlinux-logo/parabola-logo} ) +source+=('motd') sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' 'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da' 'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696' @@ -29,12 +38,11 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273' '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733' 'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9' - '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385' + '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385' # issue 'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5' '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10' - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - '39d2f719f095028fa655c246bc8608cf3b00971cb7d8c3dbae5a6d89b93a6ca7' - '1fb18c22836c5b679d183a504e594f14d2fdbeb7ce97dd3de5a0c88299f3d597' + 'c8ee7a9faf798caab178ec51afae4146f1efd8a716b7acedf28345b6c75f9697' + 'af2eee47719566740b750f0806e897a8439656df4a7476bb6e71465fd075b45d' # os-release '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a' '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0' '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c' @@ -42,12 +50,21 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c' 'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61' '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4' - '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818' - '618ac097441c1f2daffc9967e5c3cd18ea8866f776db62d04bf401c53907b1c9' - 'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927' - '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b' - 'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927' - '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b') + '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818' # sysusers + 'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742' + 'd5f0a4f75761afd5ebbc6970ac9aba5be3c28bb660adf7118353a0e018911e68' # parabola-logo.svg + 'c6486f4c9456fa62a75727adfcc8f2403a1a9fac29386f942c0678c109cc72e8' # parabola-logo.png + '09838fea00c5ceff6e7ed28bb1b6d62feb1e2471df9fe5a4328071ecb9e837f3' # parabola-logo-text.svg + 'bc9be3442fab17ac6990814db4c0cc76c2ac6112c70a6c103530f607aa54c11e') # parabola-logo-text-dark.svg +sha256sums+=('0018e0387155ee65472f71f0003fcbcb863355d12442150922e7156da12cabad') # motd + + +prepare() { + # inject OS variant information into os-release + local init='SystemD' + sed -i "s|@VARIANT@|${CARCH} ${init} Edition|" "${srcdir}"/os-release + sed -i "s|@VARIANT_ID@|${CARCH}-${init,,}|" "${srcdir}"/os-release +} package() { cd "$pkgdir" @@ -66,7 +83,7 @@ package() { # setup /etc and /usr/share/factory/etc install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf \ + for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \ passwd resolv.conf securetty shells profile; do install -m644 "$srcdir"/$f etc/ install -m644 "$srcdir"/$f usr/share/factory/etc/ @@ -76,8 +93,9 @@ package() { install -m600 "$srcdir"/$f etc/ install -m600 "$srcdir"/$f usr/share/factory/etc/ done + touch etc/arch-release touch etc/parabola-release - ln -sv parabola-release etc/arch-release + install -m644 "$srcdir"/motd etc/ install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh install -Dm644 "$srcdir"/os-release usr/lib/os-release @@ -103,14 +121,11 @@ package() { # add lib symlinks ln -s usr/lib lib + [[ $CARCH = 'ppc64le' ]] || \ [[ $CARCH = 'x86_64' ]] && { ln -s usr/lib lib64 ln -s lib usr/lib64 } - [[ $CARCH = 'powerpc64le' ]] && { - ln -s usr/lib lib64 - ln -s lib usr/lib64 - } # add bin symlinks ln -s usr/bin bin @@ -136,5 +151,5 @@ package() { install -D -m755 "$srcdir"/env-generator usr/lib/systemd/system-environment-generators/10-arch # add logo - install -D -m644 "$srcdir"/parabola{,-logo}.{svg,png} usr/share/pixmaps + install -D -m644 "$srcdir"/parabola-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps } diff --git a/libre/filesystem/motd b/libre/filesystem/motd index e69de29bb..70274a6d2 100644 --- a/libre/filesystem/motd +++ b/libre/filesystem/motd @@ -0,0 +1,8 @@ + , ,  ____ + ,,#',^ ,#; / _ \ _ _ + _,#'-^ ^ ,###' | |_) |__ _ _ __ ___ _| |_ ___ | | __ _ +' `### | __// _` | '__/ _ ` | '_ \ / _ \| |/ _` |  GNU  + ;## | | | (_| | | | (_| | |_) | (_) | | (_| | Linux + ## |_| \__,_|_| \___,_|_,__/ \___/|_|\__,_| libre + #' + / Free as in Freedom diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf index 062aeea01..1ca05d57b 100644 --- a/libre/filesystem/nsswitch.conf +++ b/libre/filesystem/nsswitch.conf @@ -3,11 +3,12 @@ passwd: files systemd group: files [SUCCESS=merge] systemd -shadow: files +shadow: files systemd +gshadow: files systemd publickey: files -hosts: files mymachines myhostname resolve [!UNAVAIL=return] dns +hosts: mymachines resolve [!UNAVAIL=return] files myhostname dns networks: files protocols: files diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release index 901694f99..60b0adc05 100644 --- a/libre/filesystem/os-release +++ b/libre/filesystem/os-release @@ -3,6 +3,8 @@ PRETTY_NAME="Parabola GNU/Linux-libre" ID=parabola ID_LIKE=arch BUILD_ID=rolling +VARIANT="@VARIANT@" +VARIANT_ID="@VARIANT_ID@" ANSI_COLOR="1;35" HOME_URL="https://www.parabola.nu/" DOCUMENTATION_URL="https://wiki.parabola.nu/" diff --git a/libre/filesystem/parabola-logo-text-dark.svg b/libre/filesystem/parabola-logo-text-dark.svg new file mode 100644 index 000000000..a480a4e0c --- /dev/null +++ b/libre/filesystem/parabola-logo-text-dark.svg @@ -0,0 +1,73 @@ + + + + + + + + Parabola + + GNU + Linux-libre + + diff --git a/libre/filesystem/parabola-logo-text.svg b/libre/filesystem/parabola-logo-text.svg new file mode 100644 index 000000000..3b9a7761d --- /dev/null +++ b/libre/filesystem/parabola-logo-text.svg @@ -0,0 +1,73 @@ + + + + + + + + Parabola + + GNU + Linux-libre + + diff --git a/libre/filesystem/parabola-logo.png b/libre/filesystem/parabola-logo.png index b17070d0b..0335f35fc 100644 Binary files a/libre/filesystem/parabola-logo.png and b/libre/filesystem/parabola-logo.png differ diff --git a/libre/filesystem/parabola-logo.svg b/libre/filesystem/parabola-logo.svg index da4aeed3d..119266d29 100644 --- a/libre/filesystem/parabola-logo.svg +++ b/libre/filesystem/parabola-logo.svg @@ -1,231 +1,40 @@ - - - - Parabola GNU/Linux-libre logo - - + width="128" + height="128" + version="1.1"> + Parabola Official Icon (Default Color) + image/svg+xml - Parabola GNU/Linux-libre logo - 18-04-2013 + Parabola Official Icon (Default Color) + + 2013/04/18 Jorge Araya Navarro <elcorreo@deshackra.com> - English - Parabola GNU/Linux-libre logo. - - - - Parabola GNU/Linux-libre - - - https://repo.parabolagnulinux.org/other/artwork/parabola_gnu+linux-libre_logo.svg - - - Márcio Alexandre Silva Delgado <coadde@parabola.nu> - - + + + Parabola + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/libre/filesystem/parabola.png b/libre/filesystem/parabola.png deleted file mode 100644 index b17070d0b..000000000 Binary files a/libre/filesystem/parabola.png and /dev/null differ diff --git a/libre/filesystem/parabola.svg b/libre/filesystem/parabola.svg deleted file mode 100644 index da4aeed3d..000000000 --- a/libre/filesystem/parabola.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - Parabola GNU/Linux-libre logo - - - - - image/svg+xml - - Parabola GNU/Linux-libre logo - 18-04-2013 - - - Jorge Araya Navarro <elcorreo@deshackra.com> - - - English - Parabola GNU/Linux-libre logo. - - - - Parabola GNU/Linux-libre - - - https://repo.parabolagnulinux.org/other/artwork/parabola_gnu+linux-libre_logo.svg - - - Márcio Alexandre Silva Delgado <coadde@parabola.nu> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libre/filesystem/tmpfiles b/libre/filesystem/tmpfiles index 8fc77b57f..4b5368f81 100644 --- a/libre/filesystem/tmpfiles +++ b/libre/filesystem/tmpfiles @@ -8,7 +8,6 @@ C /etc/host.conf C /etc/hosts C /etc/issue C /etc/ld.so.conf -C /etc/motd C /etc/nsswitch.conf C /etc/passwd C /etc/profile -- cgit v1.2.3