diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 6134652..0ebed27 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -6,20 +6,20 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=filesystem -pkgver=2023.04.09 +pkgver=2023.05.09 pkgrel=01 -pkgdesc='Base Joborun Linux file system' +pkgdesc='Base joborun Linux filesystem' groups=( jobbot base ) url='https://pozol.eu' depends=('iana-etc') backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf' 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf' - 'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/resolv.conf.pacnew' 'etc/securetty' + 'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty' 'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid') source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' 'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release' - 'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' - 'subuid' 'subgid' 'sysusers' 'tmpfiles' 'modprobe.d.usb-load-ehci-first' + 'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' + 'subuid' 'subgid' 'sysusers' 'sysctl' 'tmpfiles' 'modprobe.d.usb-load-ehci-first' 'jobo-release') # 'env-generator' 'joborun-linux-logo.svg' 'joborun-linux-logo.png' # 'joborun-linux-logo-text.svg' 'joborun-linux-logo-text-dark.svg') @@ -33,9 +33,12 @@ package() { done install -d -m555 proc install -d -m555 sys +# we don't see a good reason for single user/admin systems for root +# prohibiting read rights to the home directory, on enterprise systems +# it is recommended to have 0750 for /root install -d -m0755 root install -d -m1777 tmp - install -d -m777 src + install -d -m0777 src # vsftpd won't run with write perms on /srv/ftp # ftp (uid 14/gid 11) install -d -m555 -g 11 srv/ftp @@ -47,19 +50,19 @@ package() { install -m644 "$srcdir"/$f etc/ install -m644 "$srcdir"/$f usr/share/factory/etc/ done - install -m644 "$srcdir"/resolv.conf etc/resolv.conf.pacnew + install -m644 "$srcdir"/resolv.conf $pkgdir/etc/resolv.conf ln -s ../proc/self/mounts etc/mtab for f in gshadow shadow crypttab; do install -m600 "$srcdir"/$f etc/ install -m600 "$srcdir"/$f usr/share/factory/etc/ done - install -D -m644 "$srcdir"/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf + install -Dm644 "$srcdir"/modprobe.d.usb-load-ehci-first $pkgdir/usr/lib/modprobe.d/usb-load-ehci-first.conf - install -Dm644 "$srcdir"/jobo-release etc/jobo-release + install -Dm644 "$srcdir"/jobo-release $pkgdir/etc/jobo-release touch etc/arch-release - install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh - install -Dm644 "$srcdir"/os-release usr/lib/os-release - ln --symbolic --relative "$pkgdir"/usr/lib/os-release "$pkgdir"/etc/os-release + install -m644 "$srcdir"/locale.sh $pkgdir/etc/profile.d/locale.sh + install -Dm644 "$srcdir"/os-release %pkgdir/usr/lib/os-release + ln --symbolic --relative $pkgdir/usr/lib/os-release $pkgdir/etc/os-release # setup /var for d in cache local opt log/old lib/misc lib/pacman empty; do @@ -83,8 +86,10 @@ package() { # add lib symlinks ln -s usr/lib lib + [[ $CARCH = 'x86_64' ]] && { ln -s usr/lib lib64 ln -s lib usr/lib64 + } # add bin symlinks ln -s usr/bin bin @@ -97,11 +102,14 @@ package() { done ln -s ../man usr/local/share/man + # setup systemd-sysctl + install -D -m644 "$srcdir"/sysctl $pkgdir/usr/lib/sysctl.d/10-arch.conf + # setup systemd-sysusers wrapper - install -D -m644 "$srcdir"/sysusers usr/lib/sysusers.d/joborun.conf + install -D -m644 "$srcdir"/sysusers $pkgdir/usr/lib/sysusers.d/joborun.conf # setup systemd-tmpfiles wrapper - install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/joborun.conf + install -D -m644 "$srcdir"/tmpfiles $pkgdir/usr/lib/tmpfiles.d/joborun.conf ## # add logo ## install -D -m644 "$srcdir"/joborun-linux-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps @@ -123,20 +131,20 @@ sha256sums=(e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82 # dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5 # ld.so.conf 6c17fa911c82c27a30414624cdb32b44a76e60304cb875dc794bb9ee7aac21d4 # locale.sh c307b0cfb3814649c2f45a149322c5ab83466517887c16af3a6504d2a7427320 # motd - 581a292aeae5e125f8527fef41a839c6c3d6f81f853c49c476b6ab25e20917ef # nsswitch.conf - 07c6b95de509a2c33f94b97b59cbf7f86f642cf1aaec12b011732ef8d8e27429 # os-release + b3f9aca43fd990384741213c747f856ae166b254475bb42c4dac676bd7fdde5a # nsswitch.conf + fd10f9659e690070a921223d380a109962a411926fdf2d9860e1eed92d53447c # os-release eac657125eb0e80c6cc79bac04f4c9b317dcea2d2d5436c03f26d73310bca6e6 # passwd 5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0 # profile - de4974ab07e775a7c88ae930108afc705b3ab956e99a1e5def863bb3aa26ecbf # resolv.conf + 66d732ad4cbdc7b3180f4750a5e74163d5c9a6797916a91311697cde95c2762b # resolv.conf d88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b # securetty b302b2e8b06d27d078c5ad68655d441e2a07357b925a867dcf6a33f3a5464b3a # shadow - 362cb89caffb71c0d5fb9ef5e2b00089723849bb6a2b720fe4016d7768e2cef2 # shells + 5d7a7cb211560d47f2e14182d83ffcd558ab7cc0a70ad8f2d5214899a04cb38a # shells e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # subgid e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # subuid - ec207f224fdd6f29d2a333b2e9be211ef44f21a2bff0c0c6d7ea6d1b72b70eee # sysusers - 618ac097441c1f2daffc9967e5c3cd18ea8866f776db62d04bf401c53907b1c9 # tmpfiles + e7c1a8ca1216879597348a553a7d5ebf0fa0de66179e3bae697935dc86aa3958 # sysusers + 89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4 # sysctl + d883a15209635206b044e8ac943f44e0ec7ec0a0ef61915163707642da0ac989 # tmpfiles 90fb123aa8c0176bc144322b585bb889181c437542ddbe546af43e11b95be6ab # modprobe.d.usb-load-ehci-first 673953e0ad7fc53247f4feadc2c2d4506396840d1f8796526f48d47333ac7652) # jobo-release -## 955d23de2599828bb90458692afc36a0b33677c85a0047a4104d1e7c52a17b7e filesystem-2023.04.09-01-x86_64.pkg.tar.lz - +## 528ef7dd4d0a594072a12660749d51b7a139cd7217843dafe9c459172f994571 filesystem-2023.05.09-01-x86_64.pkg.tar.lz diff --git a/filesystem/env-generator b/filesystem/env-generator new file mode 100755 index 0000000..5f63914 --- /dev/null +++ b/filesystem/env-generator @@ -0,0 +1,3 @@ +#!/bin/sh + +echo 'PATH=/usr/local/sbin:/usr/local/bin:/usr/bin' diff --git a/filesystem/filesystem-arch/PKGBUILD b/filesystem/filesystem-arch/PKGBUILD new file mode 100644 index 0000000..b375bd0 --- /dev/null +++ b/filesystem/filesystem-arch/PKGBUILD @@ -0,0 +1,134 @@ +# Maintainer: Sébastien Luttringer +# Contributor: Tom Gundersen + +pkgname=filesystem +pkgver=2023.01.31 +pkgrel=1 +pkgdesc='Base Arch Linux files' +arch=('x86_64') +license=('GPL') +url='https://archlinux.org' +depends=('iana-etc') +backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.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' 'etc/subuid' 'etc/subgid') +source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' + 'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'profile' + 'passwd' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' 'sysusers' + 'tmpfiles' 'subuid' 'subgid' 'archlinux-logo.svg' 'archlinux-logo.png' + 'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg') +sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' + 'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da' + 'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696' + '244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a' + '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273' + '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733' + 'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9' + 'c774dbbcaea38ee1c1141d0daf82aa8177bfb26aca896d6f0c4ccdc902f6ac42' + 'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5' + '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10' + 'c8ee7a9faf798caab178ec51afae4146f1efd8a716b7acedf28345b6c75f9697' + '46108f7e84f5d5994678133d412d5ec6222c53f28e6bf7ac66cc07788a7ee66d' + '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0' + '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a' + '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c' + 'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b' + '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c' + '0d9ad0a063e74e6b88db52b2f0a93e7b8f6faf1395981edebac493a13d0b59b3' + '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4' + '30b97e8f5965744138f7a394e04454db6d509fb89e0a9b615bcd9037df3d6f2a' + '5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07' + 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' + 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' + '3ffe8ea4e98db43a3ec4dcca55fd4009cd8b8d220f0996aef7a5b427fdf65234' + '3f48779141b68a81e07fee710a42025d4f67b16240295aa4cf148a7ba99cab3c' + '601069e6e8920309178c397fd8cebe43410827d01899d31777d13212f0dfacf8' + '96e3cc81623c0537a19799f9eefa966fe46ff5f28a9dc7af1187990973baa127') + +package() { + cd "$pkgdir" + + # setup root filesystem + for d in boot dev etc home mnt usr var opt srv/http run; do + install -d -m755 $d + done + install -d -m555 proc + install -d -m555 sys + install -d -m0750 root + install -d -m1777 tmp + # vsftpd won't run with write perms on /srv/ftp + # ftp (uid 14/gid 11) + install -d -m555 -g 11 srv/ftp + + # 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 nsswitch.conf \ + passwd resolv.conf securetty shells profile subuid subgid; do + install -m644 "$srcdir"/$f etc/ + install -m644 "$srcdir"/$f usr/share/factory/etc/ + done + ln -s ../proc/self/mounts etc/mtab + for f in gshadow shadow crypttab; do + install -m600 "$srcdir"/$f etc/ + install -m600 "$srcdir"/$f usr/share/factory/etc/ + done + touch etc/arch-release + install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh + install -Dm644 "$srcdir"/os-release usr/lib/os-release + + # setup /var + for d in cache local opt log/old lib/misc empty; do + install -d -m755 var/$d + done + install -d -m1777 var/{tmp,spool/mail} + + # allow setgid games (gid 50) to write scores + install -d -m775 -g 50 var/games + ln -s spool/mail var/mail + ln -s ../run var/run + ln -s ../run/lock var/lock + + # setup /usr hierarchy + for d in bin include lib share/{misc,pixmaps} src; do + install -d -m755 usr/$d + done + for d in {1..8}; do + install -d -m755 usr/share/man/man$d + done + + # add lib symlinks + ln -s usr/lib lib + [[ $CARCH = 'x86_64' ]] && { + ln -s usr/lib lib64 + ln -s lib usr/lib64 + } + + # add bin symlinks + ln -s usr/bin bin + ln -s usr/bin sbin + ln -s bin usr/sbin + + # setup /usr/local hierarchy + for d in bin etc games include lib man sbin share src; do + install -d -m755 usr/local/$d + done + ln -s ../man usr/local/share/man + + # setup systemd-sysctl + install -D -m644 "$srcdir"/sysctl usr/lib/sysctl.d/10-arch.conf + + # setup systemd-sysusers + install -D -m644 "$srcdir"/sysusers usr/lib/sysusers.d/arch.conf + + # setup systemd-tmpfiles + install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/arch.conf + + # setup systemd.environment-generator + install -D -m755 "$srcdir"/env-generator usr/lib/systemd/system-environment-generators/10-arch + + # add logo + install -D -m644 "$srcdir"/archlinux-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps +} + +# vim:set ts=2 sw=2 et: diff --git a/filesystem/filesystem-arch/issue b/filesystem/filesystem-arch/issue index b0325ce..dd702dc 100644 --- a/filesystem/filesystem-arch/issue +++ b/filesystem/filesystem-arch/issue @@ -1,2 +1,2 @@ -Joborun \r (\l) +Arch Linux \r (\l) diff --git a/filesystem/filesystem-arch/os-release b/filesystem/filesystem-arch/os-release index 8d17aec..8662a54 100644 --- a/filesystem/filesystem-arch/os-release +++ b/filesystem/filesystem-arch/os-release @@ -1,10 +1,11 @@ -NAME="joborun" -PRETTY_NAME="joborun on obarun" -ID=joborun -ID_LIKE=arch +NAME="Arch Linux" +PRETTY_NAME="Arch Linux" +ID=arch +BUILD_ID=rolling ANSI_COLOR="38;2;23;147;209" -HOME_URL="https://joborun.eu/" -DOCUMENTATION_URL="https://wiki.joborun.eu/" -SUPPORT_URL="https://gitea.disroot.org/joborun/" -BUG_REPORT_URL="https://gitea.disroot.org/joborun/" -LOGO=joborun-logo +HOME_URL="https://archlinux.org/" +DOCUMENTATION_URL="https://wiki.archlinux.org/" +SUPPORT_URL="https://bbs.archlinux.org/" +BUG_REPORT_URL="https://bugs.archlinux.org/" +PRIVACY_POLICY_URL="https://terms.archlinux.org/docs/privacy-policy/" +LOGO=archlinux-logo diff --git a/filesystem/filesystem-arch/resolv.conf b/filesystem/filesystem-arch/resolv.conf index d66f4da..7a7d429 100644 --- a/filesystem/filesystem-arch/resolv.conf +++ b/filesystem/filesystem-arch/resolv.conf @@ -1,15 +1,2 @@ -# This file was generated by OpenNIC 2019-Apr-26 06:46 UTC -# and shows the most reliable servers near you. -# You may retrieve updates automatically by using: -# wget --inet4-only "https://api.opennicproject.org/geoip?resolv" -domain opennic.glue -search opennic.gluenameserver 192.71.245.208 -nameserver 94.247.43.254 -nameserver 167.86.112.174 -nameserver 51.91.152.156 -nameserver 51.178.92.105 -nameserver 194.36.144.87 -nameserver 91.217.137.37 -nameserver 192.3.165.37 -nameserver 159.89.120.99 -rotate +# Resolver configuration file. +# See resolv.conf(5) for details. diff --git a/filesystem/filesystem-arch/shells b/filesystem/filesystem-arch/shells index 1ba9e3c..e7d0fb8 100644 --- a/filesystem/filesystem-arch/shells +++ b/filesystem/filesystem-arch/shells @@ -3,4 +3,4 @@ /bin/sh /bin/bash -/bin/zsh +/bin/rbash diff --git a/filesystem/filesystem-arch/subgid b/filesystem/filesystem-arch/subgid new file mode 100644 index 0000000..e69de29 diff --git a/filesystem/filesystem-arch/subuid b/filesystem/filesystem-arch/subuid new file mode 100644 index 0000000..e69de29 diff --git a/filesystem/filesystem-arch/sysusers b/filesystem/filesystem-arch/sysusers index 0009171..17ab5a8 100644 --- a/filesystem/filesystem-arch/sysusers +++ b/filesystem/filesystem-arch/sysusers @@ -1,5 +1,6 @@ # default arch groups # groups first, because we have user/group id mismatch on ftp and mail +g root 0 - - g sys 3 - - g mem 8 - - g ftp 11 - - @@ -22,6 +23,7 @@ u ftp 14 - /srv/ftp u http 33 - /srv/http # default membership +m root root m bin daemon m bin sys m daemon adm diff --git a/filesystem/filesystem-arch/tmpfiles b/filesystem/filesystem-arch/tmpfiles index 4b5368f..04f8d12 100644 --- a/filesystem/filesystem-arch/tmpfiles +++ b/filesystem/filesystem-arch/tmpfiles @@ -14,3 +14,5 @@ C /etc/profile C /etc/securetty C /etc/shadow C /etc/shells +C /etc/subuid +C /etc/subgid diff --git a/filesystem/nsswitch.conf b/filesystem/nsswitch.conf index 572b30e..3aab949 100644 --- a/filesystem/nsswitch.conf +++ b/filesystem/nsswitch.conf @@ -17,4 +17,3 @@ ethers: files rpc: files netgroup: files - diff --git a/filesystem/os-release b/filesystem/os-release index db3faa3..c9dba7d 100644 --- a/filesystem/os-release +++ b/filesystem/os-release @@ -1,9 +1,10 @@ -NAME="joborun" +NAME="joborun linux" PRETTY_NAME="joborun linux" ID=joborun +BUILD_ID=rolling ID_LIKE=arch -ANSI_COLOR="38;2;23;147;219" -HOME_URL="http://pozol.eu/" +ANSI_COLOR="38;2;23;147;229" +HOME_URL="http://pozol.eu/joborun.html" DOCUMENTATION_URL="https://git.disroot.org/joborun/web/src/branch/main/index.md" SUPPORT_URL="https://www.reddit.com/r/joborun/" BUG_REPORT_URL="https://gitea.disroot.org/joborun-pkg/" diff --git a/filesystem/resolv.conf b/filesystem/resolv.conf index 9c4f6c7..5df00ff 100644 --- a/filesystem/resolv.conf +++ b/filesystem/resolv.conf @@ -1,26 +1,13 @@ +#opennic-up #Selecting DNS among 185.121.177.177 169.239.202.202 172.98.193.42... #Waiting for 185.121.177.177... #Using 116.203.98.109 as API host #https://api.opennicproject.org/geoip/?list&ipv=4&res=200&adm=0&bl&wl -#Pinging 42 hosts to determine the top ones...resulting in 32 responsive hosts -nameserver 37.252.191.197 -nameserver 103.1.206.179 -nameserver 168.138.8.38 -nameserver 168.138.12.137 -nameserver 137.220.55.93 -nameserver 45.61.49.203 -nameserver 138.197.140.189 -nameserver 192.71.166.92 -nameserver 94.247.43.254 -nameserver 94.247.43.254 -nameserver 51.77.149.139 -nameserver 51.178.92.105 -nameserver 54.36.111.116 -nameserver 178.254.22.166 -nameserver 94.247.43.254 -nameserver 94.247.43.254 -nameserver 185.84.81.194 -nameserver 195.10.195.195 -nameserver 195.10.195.195 -nameserver 128.76.152.2 +#Pinging 42 hosts to determine the top ones...resulting in 33 responsive hosts +nameserver 88.198.92.222 +nameserver 94.247.43.254 +nameserver 185.84.81.194 +nameserver 94.247.43.254 +nameserver 195.10.195.195 +nameserver 54.36.111.116 rotate diff --git a/filesystem/shells b/filesystem/shells index c04d7e0..df1de2b 100644 --- a/filesystem/shells +++ b/filesystem/shells @@ -1,10 +1,7 @@ # Pathnames of valid login shells. # See shells(5) for details. -/bin/sh /usr/bin/sh -/bin/bash /usr/bin/bash -/bin/zsh /usr/bin/zsh -/bin/rbash +/usr/bin/rbash diff --git a/filesystem/sysctl b/filesystem/sysctl new file mode 100644 index 0000000..b585ea2 --- /dev/null +++ b/filesystem/sysctl @@ -0,0 +1,3 @@ +# Raise inotify resource limits +fs.inotify.max_user_instances = 1024 +fs.inotify.max_user_watches = 524288 diff --git a/filesystem/sysusers b/filesystem/sysusers index a4941aa..8028390 100644 --- a/filesystem/sysusers +++ b/filesystem/sysusers @@ -1,5 +1,6 @@ # default jobo groups # groups first, because we have user/group id mismatch on ftp and mail +g root 0 - - g sys 3 - - g adm 4 - - g tty 5 - - @@ -7,10 +8,10 @@ g disk 6 - - g lp 7 - - g mem 8 - - g kmem 9 - - -g wheel 10 - - g ftp 11 - - g mail 12 - - g uucp 14 - - +g wheel 10 - - g log 19 - - g utmp 20 - - g locate 21 - - @@ -39,6 +40,7 @@ u ftp 14 - /srv/ftp u http 33 - /srv/http # default membership +m root root m bin daemon m bin sys m daemon adm diff --git a/filesystem/tmpfiles b/filesystem/tmpfiles index 8fc77b5..441c930 100644 --- a/filesystem/tmpfiles +++ b/filesystem/tmpfiles @@ -15,3 +15,5 @@ C /etc/profile C /etc/securetty C /etc/shadow C /etc/shells +C /etc/subuid +C /etc/subgid diff --git a/mpfr/PKGBUILD b/mpfr/PKGBUILD index a14bb7f..aac4f6e 100644 --- a/mpfr/PKGBUILD +++ b/mpfr/PKGBUILD @@ -8,7 +8,7 @@ pkgname=mpfr _pkgver=4.2.0 _patchver=7 -pkgrel=01 +pkgrel=02 pkgver=${_pkgver}.p${_patchver} #pkgver=$_pkgver pkgdesc='Multiple-precision floating-point library' @@ -61,15 +61,4 @@ sha256sums=(06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993 # c05587045fb064853bfd5d2953f95bbc9f3630787a9c45e77e6509f3ebabbcd3 # tsprintf.patch c4570f9ed20cee8280c59fedddce6e16ee5b8ededa7004af13c6cacbc487bb93) # patches.diff -sha512sums=('58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c' - 'SKIP' - '6d68ee5d286997c9a0bb66bf8da71a8af39e375091b743f1858dea9054b0f4f725ea0bcc37d39ac87b8a95ae508204c61413f4b2cb741807558952ee1a5d81e9' - '12cb553946b372da762b919a523a0dbb5c7b9f7931fd018013fb8e2a51b43d6ef421dda9c5ff6d89d7f75376d67f33205e7bcc3c69ef1aeaad5b3539218ec349') - -b2sums=('dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c49c637c124bf4d9bc79fb621d0d1d69e07d0642b9b678f6d355a5830d083dfd189e1e91d0e04c970c10bd64' - 'SKIP' - '16222c0f409d757b6cad515d13a1673be26302f48bc206f8526cb46a2d357404b181811da6180326be136a265d63b8e47b81107b01f4c8abc4637fd9d5fca4ea' - 'bbe00cff15d382663db623e1ef834e44192df1ad22c436d5b870fcf8bf438bd618d8ae332fe7ac4c0fd1d638e0764ab84a81954b91d54e0337ccad3568a3a83b') - - -## 1f36791ae944c6136f007895a468304f873026e72ae37da73b3dd97690a088ac mpfr-4.2.0.p7-01-x86_64.pkg.tar.lz +## 483ee990e73ef7386d2cef66a18de0399b39f980a416901219025b14eb87fa09 mpfr-4.2.0.p7-02-x86_64.pkg.tar.lz diff --git a/mpfr/PKGBUILD-arch b/mpfr/PKGBUILD-arch index a692e88..f113edf 100644 --- a/mpfr/PKGBUILD-arch +++ b/mpfr/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgname=mpfr _pkgver=4.2.0 _patchver=7 -pkgrel=1 +pkgrel=2 pkgver=${_pkgver}.p${_patchver} #pkgver=$_pkgver pkgdesc='Multiple-precision floating-point library' @@ -15,15 +15,12 @@ url='https://www.mpfr.org/' license=(GPL3 LGPL3) depends=(glibc gmp) source=(https://ftp.gnu.org/gnu/mpfr/mpfr-${_pkgver}.tar.xz{,.sig} - tsprintf.patch::https://gitlab.inria.fr/mpfr/mpfr/-/commit/5172494c09718ffcb7ef1f19b3b211e3bce8781a.patch patches.diff) # wget https://www.mpfr.org/mpfr-${_pkgver}/allpatches -O patches.diff sha512sums=('58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c' 'SKIP' - '6d68ee5d286997c9a0bb66bf8da71a8af39e375091b743f1858dea9054b0f4f725ea0bcc37d39ac87b8a95ae508204c61413f4b2cb741807558952ee1a5d81e9' '12cb553946b372da762b919a523a0dbb5c7b9f7931fd018013fb8e2a51b43d6ef421dda9c5ff6d89d7f75376d67f33205e7bcc3c69ef1aeaad5b3539218ec349') b2sums=('dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c49c637c124bf4d9bc79fb621d0d1d69e07d0642b9b678f6d355a5830d083dfd189e1e91d0e04c970c10bd64' 'SKIP' - '16222c0f409d757b6cad515d13a1673be26302f48bc206f8526cb46a2d357404b181811da6180326be136a265d63b8e47b81107b01f4c8abc4637fd9d5fca4ea' 'bbe00cff15d382663db623e1ef834e44192df1ad22c436d5b870fcf8bf438bd618d8ae332fe7ac4c0fd1d638e0764ab84a81954b91d54e0337ccad3568a3a83b') validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D' 'A534BE3F83E241D918280AEB5831D11A0D4DB02A') # Vincent Lefevre @@ -31,8 +28,7 @@ validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D' prepare() { cd $pkgname-${_pkgver} - patch -Np1 < ../tsprintf.patch - # sed -i '/check_vsprintf ("+1,234,567/d' tests/tsprintf.c + patch -p1 -i ../patches.diff autoreconf -fiv }