diff options
29 files changed, 0 insertions, 784 deletions
diff --git a/pcr/filesystem-nosystemd/PKGBUILD b/pcr/filesystem-nosystemd/PKGBUILD deleted file mode 100644 index 4b288ccd5..000000000 --- a/pcr/filesystem-nosystemd/PKGBUILD +++ /dev/null @@ -1,167 +0,0 @@ -# $Id$ -# Maintainer (Arch): Sébastien Luttringer -# Contributor (Arch): Tom Gundersen <teg@jklm.no> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> - -pkgname=filesystem-nosystemd -pkgver=2017.10 -pkgrel=2.parabola3 -pkgdesc='Base Parabola GNU/Linux-libre files' -arch=('i686' 'x86_64' 'armv7h') -license=('GPL') -url='https://www.parabola.nu' -groups=('base-openrc') -install='filesystem.install' -makedepends=('asciidoc') -depends=('iana-etc') -provides=("filesystem=$pkgver") -replaces=(filesystem-parabola) -conflicts=(filesystem-parabola filesystem) -backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' - 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' - 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') -source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' - 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' - 'shells' 'gshadow' 'profile' 'parabola.7.txt' 'locale.sh') -sha256sums=('faed5839ed5e6797d7fc67f7fc0b003554d32250f3ae2d3241603c70cdc646b0' - '3ad448c78cab733759ae3365620504b1444e854effd066f1c7174652f046ebe1' - 'e9fd66742e96d16f4a244a3037522467c12e301f8e1337cda61eb67b78198534' - 'f7b38167196943d8fb9d2e75358c7262d5fe1082b257c4c8caffe3b6de429cb5' - 'f21f35e7d3083aeee19beb48478130d119b2572922a4889df98326d551540eda' - '00d5d103837480d26cd350753382c3211df6bc304ee59ffaab130fad108f6a86' - 'a55259d43b287c35ee94c736f79eea68c72318e67e5f7b8c0a6dfbcf0d4fee13' - '34b820ca01b9ad7e4792e92122b39e891e647c016b7ecccb220d6f4e72eee5c7' - '86dff00854a7f2280bb799484ccc39ad449a171448926880742ae64f41666a43' - '05c90d4208ae9a59156fa6449b00d92cd3dc1aba8ae746bd78e813a74e309ede' - '13d1f59c1d0860bf43da996e2b9a6ab2744791614241ed9a1376b7e7e30de3a8' - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - 'b4b5823ea612d18b8aaa59e3c662fb756001f1ce2fcc936a4d741b11002ed19d' - '74d2be3dd69600bcf0da751a1804a386bf4ad143b76d79c336acaa5c600e7991' - '6cff886fe9e23096d5f67b7857a747ebaf10431be5a2afc40236de5ad13a654f' - '33d4bec57c59f378e79ed8f3e4387e65fdd5cfd3d551d7cb015f7cf5cfad72f5' - '93d7d21f7e5a644ba533847beff35167efc4624571c9b68bea6cf2b6a13ab5ff' - '887e2fe6128172ab737d45b6703728ceef80d066ef64ee16eb9db22bef676734' - '331805ff85b80ae2444be58740f1cf41be56fb6e254e930677f1e36e8f95bee1') - - -lint() { - # ensure that passwd is sync'd to shadow and group is sync'd to gshadow. - local r=0 - - local passwd shadow group gshadow - - for f in passwd shadow group gshadow; do - mapfile -t "$f" < <(cut -d: -f1 "$f" | sort) - done - - # we can cheat and do simple string comparison only because we can make some - # assumptions about the data in these files - if [[ ${passwd[*]} != "${shadow[*]}" ]]; then - error 'passwd is not in sync with shadow!' - r=1 - fi - - if [[ ${group[*]} != "${gshadow[*]}" ]]; then - error 'group is not in sync with gshadow!' - r=1 - fi - - return $r -} - -build() { - cd "$srcdir" - - lint - - a2x -d manpage -f manpage parabola.7.txt -} - -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 - install -d -m555 -g ftp 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 motd nsswitch.conf passwd resolv.conf securetty shells profile; 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/parabola-release - ln -sv parabola-release etc/arch-release - install -m755 "$srcdir"/locale.sh etc/profile.d/locale.sh - install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release - #ln -s ../usr/lib/os-release etc/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 to write scores - install -d -m775 -g games 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 src; do - install -d -m755 usr/$d - done - for d in $(seq 8); do - install -d -m755 usr/share/man/man$d - done - - # - # add lib symlinks - # - ln -s usr/lib "$pkgdir"/lib - [[ $CARCH = 'x86_64' ]] && ( - ln -s usr/lib "$pkgdir"/lib64 - ln -s lib "$pkgdir"/usr/lib64 - ) - - # - # add bin symlinks - # - ln -s usr/bin "$pkgdir"/bin - ln -s usr/bin "$pkgdir"/sbin - ln -s bin "$pkgdir"/usr/sbin - - # - # install parabola(7) manpage - # - install -D -m644 "$srcdir"/parabola.7 usr/share/man/man7/parabola.7 - - # - # 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 - - # remove conflict with systemd - rm usr/share/factory/etc/nsswitch.conf -} diff --git a/pcr/filesystem-nosystemd/crypttab b/pcr/filesystem-nosystemd/crypttab deleted file mode 100644 index 96065a060..000000000 --- a/pcr/filesystem-nosystemd/crypttab +++ /dev/null @@ -1,17 +0,0 @@ -# crypttab: mappings for encrypted partitions -# -# Each mapped device will be created in /dev/mapper, so your /etc/fstab -# should use the /dev/mapper/<name> paths for encrypted devices. -# -# The Arch/Parabola specific syntax has been deprecated, see crypttab(5) for the -# new supported syntax. -# -# NOTE: Do not list your root (/) partition here, it must be set up -# beforehand by the initramfs (/etc/mkinitcpio.conf). - -# <name> <device> <password> <options> -# home UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37 /etc/mypassword1 -# data1 /dev/sda3 /etc/mypassword2 -# data2 /dev/sda5 /etc/cryptfs.key -# swap /dev/sdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 -# vol /dev/sdb7 none diff --git a/pcr/filesystem-nosystemd/filesystem.install b/pcr/filesystem-nosystemd/filesystem.install deleted file mode 100644 index 6e78d4583..000000000 --- a/pcr/filesystem-nosystemd/filesystem.install +++ /dev/null @@ -1,54 +0,0 @@ -# args: <group> [options] -_addgroup() { - if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then - need_group_update=1 - fi -} - -# args: <group> [options] -_adduser() { - if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then - need_passwd_update=1 - fi -} - -post_upgrade() { - _addgroup optical -g 93 - _addgroup audio -g 92 - _addgroup video -g 91 - _addgroup floppy -g 94 - _addgroup storage -g 95 - _addgroup log -g 19 - _addgroup utmp -g 20 - _addgroup power -g 98 - _addgroup network -g 90 - _addgroup games -g 50 - _addgroup uucp -g 14 - _addgroup proc -g 26 - _addgroup http -g 33 - _adduser http -u 33 -d /srv/http -g http -s /usr/bin/nologin - _addgroup scanner -g 96 - _addgroup rfkill -g 24 - _addgroup lock -g 54 - _addgroup input -g 97 - - # update shadow files if needed - if (( need_group_update )); then - grpconv >/dev/null - fi - - if (( need_passwd_update )); then - pwconv >/dev/null - fi - - if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then - echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf - fi - - # set "Last password change" > 0; otherwise su $user wont work - for user in bin daemon mail ftp http nobody; do - if LANG=C chage -l ${user} | grep -q 'password must be changed'; then - chage -d 14871 ${user} - fi - done -} diff --git a/pcr/filesystem-nosystemd/fstab b/pcr/filesystem-nosystemd/fstab deleted file mode 100644 index b6716c14a..000000000 --- a/pcr/filesystem-nosystemd/fstab +++ /dev/null @@ -1,4 +0,0 @@ -# -# /etc/fstab: static file system information -# -# <file system> <dir> <type> <options> <dump> <pass> diff --git a/pcr/filesystem-nosystemd/group b/pcr/filesystem-nosystemd/group deleted file mode 100644 index 002b8e075..000000000 --- a/pcr/filesystem-nosystemd/group +++ /dev/null @@ -1,34 +0,0 @@ -root:x:0:root -bin:x:1:root,bin,daemon -daemon:x:2:root,bin,daemon -sys:x:3:root,bin -adm:x:4:root,daemon -tty:x:5: -disk:x:6:root -lp:x:7:daemon -mem:x:8: -kmem:x:9: -wheel:x:10:root -ftp:x:11: -mail:x:12: -uucp:x:14: -log:x:19:root -utmp:x:20: -locate:x:21: -rfkill:x:24: -smmsp:x:25: -proc:x:26: -http:x:33: -games:x:50: -lock:x:54: -network:x:90: -video:x:91: -audio:x:92: -optical:x:93: -floppy:x:94: -storage:x:95: -scanner:x:96: -input:x:97: -power:x:98: -nobody:x:99: -users:x:100: diff --git a/pcr/filesystem-nosystemd/gshadow b/pcr/filesystem-nosystemd/gshadow deleted file mode 100644 index 8d8a4e899..000000000 --- a/pcr/filesystem-nosystemd/gshadow +++ /dev/null @@ -1,34 +0,0 @@ -root:::root -bin:::root,bin,daemon -daemon:::root,bin,daemon -sys:::root,bin -adm:::root,daemon -tty::: -disk:::root -lp:::daemon -mem::: -kmem::: -wheel:::root -ftp::: -mail::: -uucp::: -log:::root -utmp:x:: -locate::: -rfkill:x:: -smmsp::: -proc::: -http::: -games::: -lock::: -network:x:: -video:x:: -audio::: -optical::: -floppy:x:: -storage:x:: -scanner:x:: -input:x:: -power:x:: -nobody::: -users::: diff --git a/pcr/filesystem-nosystemd/host.conf b/pcr/filesystem-nosystemd/host.conf deleted file mode 100644 index cf52fe561..000000000 --- a/pcr/filesystem-nosystemd/host.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/host.conf -# - -order hosts,bind -multi on - -# End of file diff --git a/pcr/filesystem-nosystemd/hosts b/pcr/filesystem-nosystemd/hosts deleted file mode 100644 index 1747f9196..000000000 --- a/pcr/filesystem-nosystemd/hosts +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -#<ip-address> <hostname.domain.org> <hostname> -127.0.0.1 localhost.localdomain localhost -::1 localhost.localdomain localhost - -# End of file diff --git a/pcr/filesystem-nosystemd/issue b/pcr/filesystem-nosystemd/issue deleted file mode 100644 index b001c55dd..000000000 --- a/pcr/filesystem-nosystemd/issue +++ /dev/null @@ -1,2 +0,0 @@ -Parabola GNU/Linux-libre \r (\n) (\l) - diff --git a/pcr/filesystem-nosystemd/ld.so.conf b/pcr/filesystem-nosystemd/ld.so.conf deleted file mode 100644 index dfac45683..000000000 --- a/pcr/filesystem-nosystemd/ld.so.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/ld.so.conf -# - -include /etc/ld.so.conf.d/*.conf - -# End of file diff --git a/pcr/filesystem-nosystemd/locale.sh b/pcr/filesystem-nosystemd/locale.sh deleted file mode 100644 index 11b7dc9ec..000000000 --- a/pcr/filesystem-nosystemd/locale.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -if [ -z "$LANG" ]; then - if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" - elif [ -n "$HOME" ] && [ -r "$HOME/.config/locale.conf" ]; then - . "$HOME/.config/locale.conf" - elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf - fi -fi - -LANG=${LANG:-C} -export LANG -[ -n "$LC_CTYPE" ] && export LC_CTYPE -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC -[ -n "$LC_TIME" ] && export LC_TIME -[ -n "$LC_COLLATE" ] && export LC_COLLATE -[ -n "$LC_MONETARY" ] && export LC_MONETARY -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES -[ -n "$LC_PAPER" ] && export LC_PAPER -[ -n "$LC_NAME" ] && export LC_NAME -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/pcr/filesystem-nosystemd/motd b/pcr/filesystem-nosystemd/motd deleted file mode 100644 index e69de29bb..000000000 --- a/pcr/filesystem-nosystemd/motd +++ /dev/null diff --git a/pcr/filesystem-nosystemd/nsswitch.conf b/pcr/filesystem-nosystemd/nsswitch.conf deleted file mode 100644 index 25125e13e..000000000 --- a/pcr/filesystem-nosystemd/nsswitch.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Begin /etc/nsswitch.conf - -passwd: compat mymachines -group: compat mymachines -shadow: compat - -publickey: files - -hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname -networks: files - -protocols: files -services: files -ethers: files -rpc: files - -netgroup: files - -# End /etc/nsswitch.conf diff --git a/pcr/filesystem-nosystemd/os-release b/pcr/filesystem-nosystemd/os-release deleted file mode 100644 index 768bfbc92..000000000 --- a/pcr/filesystem-nosystemd/os-release +++ /dev/null @@ -1,9 +0,0 @@ -NAME="Parabola" -PRETTY_NAME="Parabola GNU/Linux-libre" -ID=parabola -ID_LIKE="arch archlinux" -ANSI_COLOR="1;35" -HOME_URL="https://www.parabola.nu/" -SUPPORT_URL="irc://chat.freenode.net#parabola" -BUG_REPORT_URL="https://labs.parabola.nu/" - diff --git a/pcr/filesystem-nosystemd/parabola.7.txt b/pcr/filesystem-nosystemd/parabola.7.txt deleted file mode 100644 index 48b5d7f02..000000000 --- a/pcr/filesystem-nosystemd/parabola.7.txt +++ /dev/null @@ -1,89 +0,0 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet: -///// - -parabola(7) -============ - -NAME ----- -parabola - basic configuration - -SYNOPSIS --------- -Overview of the basic configuration of Parabola GNU/Linux-libre. - -DESCRIPTION ------------ -Parabola exposes the user to the system without hiding any details. -This man page gives a brief overview of the configuration files that should be set up on a fresh install. - -SYSTEM SERVICES[[S]] --------------------- -System services to be started at boot can be enabled using 'rc-update add <name> <runlevel>'. -To view available services, use 'rc-status --all'. - -HOSTNAME[[H]] -------------- -The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'. -It will then be written to /etc/hostname. - -LOCALIZATION[[L]] ------------------ -Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'. -The system-wide locale to be used can be configured in /etc/locale.conf. -These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf. -The user-specific file will take precedence if it exists. - -VIRTUAL CONSOLE[[V]] --------------------- -The virtual console is configured in /etc/conf.d/keymaps. -It allows you to set a font and a keyboard layout, among other things. -Note that these settings only apply to the console and do not apply if you use X. - -TIME[[T]] ---------- -A relative *symlink* needs to be created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. - - 'ln -s /etc/localtime /usr/share/zoneinfo/Europe/Paris' - -The real-time clock, which keeps track of time when the computer is off, can be configured to either -be in UTC or in local time in /etc/conf.d/hwclock. -The default is UTC. - -FILE SYSTEMS[[F]] ------------------ -File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab. - -INITRAMFS[[R]] --------------- -The initramfs is generated by 'mkinitcpio -p <preset>'. -The default preset is "linux-libre". -The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes. - -PACKAGE MANAGER[[P]] --------------------- -The package manager, pacman, is configured in /etc/pacman.conf. - -BOOT LOADER[[B]] ----------------- -GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'. -Syslinux is configured in /boot/syslinux/syslinux.cfg. - -MODULES[[M]] ------------- -Most modules should be loaded on-demand. -Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, -and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/. - -SEE ALSO --------- - -*hostname*(5), *locale.conf*(5), *timezone*(3), *hwclock*(8), -*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5), -*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5) - -AUTHORS -------- -Written by Tom Gundersen. -Rebranded for Parabola by Nicolás Reynolds and André Silva. diff --git a/pcr/filesystem-nosystemd/passwd b/pcr/filesystem-nosystemd/passwd deleted file mode 100644 index 59704dbef..000000000 --- a/pcr/filesystem-nosystemd/passwd +++ /dev/null @@ -1,7 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/usr/bin/nologin -daemon:x:2:2:daemon:/:/usr/bin/nologin -mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin -ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin -http:x:33:33:http:/srv/http:/usr/bin/nologin -nobody:x:99:99:nobody:/:/usr/bin/nologin diff --git a/pcr/filesystem-nosystemd/profile b/pcr/filesystem-nosystemd/profile deleted file mode 100644 index 60c1821dd..000000000 --- a/pcr/filesystem-nosystemd/profile +++ /dev/null @@ -1,27 +0,0 @@ -# /etc/profile - -#Set our umask -umask 022 - -# Set our default path -PATH="/usr/local/sbin:/usr/local/bin:/usr/bin" -export PATH - -# Load profiles from /etc/profile.d -if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -r "$profile" && . "$profile" - done - unset profile -fi - -# Source global bash config -if test "$PS1" && test "$BASH" && test -z ${POSIXLY_CORRECT+x} && test -r /etc/bash.bashrc; then - . /etc/bash.bashrc -fi - -# Termcap is outdated, old, and crusty, kill it. -unset TERMCAP - -# Man is much better than us at figuring this out -unset MANPATH diff --git a/pcr/filesystem-nosystemd/resolv.conf b/pcr/filesystem-nosystemd/resolv.conf deleted file mode 100644 index cecafba03..000000000 --- a/pcr/filesystem-nosystemd/resolv.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/resolv.conf -# - -#search <yourdomain.tld> -#nameserver <ip> - -# End of file diff --git a/pcr/filesystem-nosystemd/securetty b/pcr/filesystem-nosystemd/securetty deleted file mode 100644 index 5a2235ce7..000000000 --- a/pcr/filesystem-nosystemd/securetty +++ /dev/null @@ -1,15 +0,0 @@ -# -# /etc/securetty -# - -console -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyS0 -hvc0 - -# End of file diff --git a/pcr/filesystem-nosystemd/shadow b/pcr/filesystem-nosystemd/shadow deleted file mode 100644 index ccab68d33..000000000 --- a/pcr/filesystem-nosystemd/shadow +++ /dev/null @@ -1,7 +0,0 @@ -root::14871:::::: -bin:x:14871:::::: -daemon:x:14871:::::: -mail:x:14871:::::: -ftp:x:14871:::::: -http:x:14871:::::: -nobody:x:14871:::::: diff --git a/pcr/filesystem-nosystemd/shells b/pcr/filesystem-nosystemd/shells deleted file mode 100644 index 18c1aeffa..000000000 --- a/pcr/filesystem-nosystemd/shells +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/shells -# - -/bin/sh -/bin/bash - -# End of file diff --git a/pcr/util-linux-nosystemd/0001-fstrim-cleanup-uncludes.patch b/pcr/util-linux-nosystemd/0001-fstrim-cleanup-uncludes.patch deleted file mode 100644 index 74078555f..000000000 --- a/pcr/util-linux-nosystemd/0001-fstrim-cleanup-uncludes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Thu, 22 Mar 2018 13:17:10 +0100 -Subject: fstrim: cleanup includes - -* HAVE_SYS_FS_H is incorrect (should be HAVE_LINUX_FS_H) - -* linux/fs.h cannot be included together with sys/mount.h as the both - files define MS_* constants. The libmount.h includes sys/mount.h now. - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/fstrim.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c -index ca8cf256d..53ac594c0 100644 ---- a/sys-utils/fstrim.c -+++ b/sys-utils/fstrim.c -@@ -36,10 +36,6 @@ - #include <sys/ioctl.h> - #include <sys/stat.h> - --#ifdef HAVE_SYS_FS_H --# include <linux/fs.h> --#endif -- - #include "nls.h" - #include "strutils.h" - #include "c.h" -@@ -49,6 +45,10 @@ - - #include <libmount.h> - -+ -+/* We cannot include linux/fs.h due to MS_* constants collision with -+ * sys/mount.h (and libmount.h) -+ */ - #ifndef FITRIM - struct fstrim_range { - uint64_t start; diff --git a/pcr/util-linux-nosystemd/0002-libmount_include_sys_mount_h_only_if_necessary.patch b/pcr/util-linux-nosystemd/0002-libmount_include_sys_mount_h_only_if_necessary.patch deleted file mode 100644 index 0c478f622..000000000 --- a/pcr/util-linux-nosystemd/0002-libmount_include_sys_mount_h_only_if_necessary.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Thu, 22 Mar 2018 14:05:17 +0100 -Subject: libmount: include sys/mount.h only if necessary - -Addresses: https://github.com/systemd/systemd/issues/8507 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/libmount.h.in | 9 ++++++++- - sys-utils/fstrim.c | 4 +--- - 2 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in -index 8f323fcbf..11fd759fa 100644 ---- a/libmount/src/libmount.h.in -+++ b/libmount/src/libmount.h.in -@@ -28,7 +28,14 @@ extern "C" { - #include <stdio.h> - #include <mntent.h> - #include <sys/types.h> --#include <sys/mount.h> -+ -+/* Make sure libc MS_* definitions are used by default. Note that MS_* flags -+ * may be already defined by linux/fs.h or another file -- in this case we -+ * don't want to include sys/mount.h at all to avoid collisions. -+ */ -+#ifndef MS_RDONLY -+# include <sys/mount.h> -+#endif - - #define LIBMOUNT_VERSION "@LIBMOUNT_VERSION@" - #define LIBMOUNT_MAJOR_VERSION @LIBMOUNT_MAJOR_VERSION@ -diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c -index 53ac594c0..ce52063e1 100644 ---- a/sys-utils/fstrim.c -+++ b/sys-utils/fstrim.c -@@ -35,6 +35,7 @@ - - #include <sys/ioctl.h> - #include <sys/stat.h> -+#include <linux/fs.h> - - #include "nls.h" - #include "strutils.h" -@@ -46,9 +47,6 @@ - #include <libmount.h> - - --/* We cannot include linux/fs.h due to MS_* constants collision with -- * sys/mount.h (and libmount.h) -- */ - #ifndef FITRIM - struct fstrim_range { - uint64_t start; diff --git a/pcr/util-linux-nosystemd/60-rfkill.rules b/pcr/util-linux-nosystemd/60-rfkill.rules deleted file mode 100644 index bc98a3bef..000000000 --- a/pcr/util-linux-nosystemd/60-rfkill.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/pcr/util-linux-nosystemd/PKGBUILD b/pcr/util-linux-nosystemd/PKGBUILD deleted file mode 100644 index 117d1634a..000000000 --- a/pcr/util-linux-nosystemd/PKGBUILD +++ /dev/null @@ -1,114 +0,0 @@ -# $Id$ -# Maintainer (Arch): Tom Gundersen <teg@jklm.no> -# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> -# Contributor (Arch): judd <jvinet@zeroflux.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -# Maintainer: David P. <megver83@parabola.nu> - -pkgbase=util-linux-nosystemd -pkgname=(util-linux-nosystemd libutil-linux-nosystemd) -_pkgmajor=2.32 -pkgver=${_pkgmajor} -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url="https://www.kernel.org/pub/linux/utils/util-linux/" -arch=('i686' 'x86_64' 'armv7h') -makedepends=('eudev' 'python' 'libcap-ng') -license=('GPL2') -options=('strip' 'debug') -validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak -source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${pkgbase%-nosystemd}-$pkgver.tar."{xz,sign} - '0001-fstrim-cleanup-uncludes.patch' - '0002-libmount_include_sys_mount_h_only_if_necessary.patch' - pam-{login,common,su} - 'util-linux.sysusers' - '60-rfkill.rules') -sha256sums=('6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734' - 'SKIP' - 'b1c0db069f60c086351f7a6fb7ff1add1c41e9ed7c1b65bd67e6604943fc4c75' - 'c65d8354fc2773035be8ac071541f4709763366d22a8a8f1bc2cb3401dcfdf69' - '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' - 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' - '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0' - 'a3980e33ef3a8d356379b4964c9730fd525d46e5b28cded5d0b50d6dc8a5563c' - '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37') - -prepare() { - cd "${pkgbase%-nosystemd}-$pkgver" - - patch -Np1 -i ../0001-fstrim-cleanup-uncludes.patch - patch -Np1 -i ../0002-libmount_include_sys_mount_h_only_if_necessary.patch -} - -build() { - cd "${pkgbase%-nosystemd}-$pkgver" - - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --bindir=/usr/bin \ - --localstatedir=/run \ - --enable-fs-paths-extra=/usr/bin \ - --enable-raw \ - --enable-vipw \ - --enable-newgrp \ - --enable-chfn-chsh \ - --enable-write \ - --enable-mesg \ - --with-python=3 \ - --with-systemd=no \ - --with-systemdsystemunitdir=no \ - --with-python=3 - make -} - -package_util-linux-nosystemd() { - conflicts=('util-linux' 'eject' 'zramctl' 'rfkill') - provides=("util-linux=$pkgver" 'eject' 'zramctl' 'rfkill') - replaces=('zramctl' 'rfkill') - depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libutil-linux-nosystemd') - optdepends=('python: python bindings to libmount') - #groups=('base' 'base-devel') - backup=(etc/pam.d/chfn - etc/pam.d/chsh - etc/pam.d/login - etc/pam.d/su - etc/pam.d/su-l) - - cd "${pkgbase%-nosystemd}-$pkgver" - - make DESTDIR="$pkgdir" install - - # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} - - # install PAM files for login-utils - install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" - install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" - install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" - install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" - install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" - - # adjust for usrmove - # TODO(dreisner): fix configure.ac upstream so that this isn't needed - cd "$pkgdir" - mv {,usr/}sbin/* usr/bin - rmdir sbin usr/sbin - - ### runtime libs are shipped as part of libutil-linux - rm "$pkgdir"/usr/lib/lib*.{a,so}* - - ### install sysusers - install -Dm644 "$srcdir/util-linux.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/util-linux.conf" - - install -Dm644 "$srcdir/60-rfkill.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules" -} - -package_libutil-linux-nosystemd() { - pkgdesc="util-linux runtime libraries" - provides=("libutil-linux=$pkgver" 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') - conflicts=('libutil-linux') - - make -C "${pkgbase%-nosystemd}-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES -} diff --git a/pcr/util-linux-nosystemd/pam-common b/pcr/util-linux-nosystemd/pam-common deleted file mode 100644 index a7bf8a4a5..000000000 --- a/pcr/util-linux-nosystemd/pam-common +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/pcr/util-linux-nosystemd/pam-login b/pcr/util-linux-nosystemd/pam-login deleted file mode 100644 index 1960d9497..000000000 --- a/pcr/util-linux-nosystemd/pam-login +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth requisite pam_nologin.so -auth include system-local-login -account include system-local-login -session include system-local-login diff --git a/pcr/util-linux-nosystemd/pam-su b/pcr/util-linux-nosystemd/pam-su deleted file mode 100644 index cf15f40f1..000000000 --- a/pcr/util-linux-nosystemd/pam-su +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/pcr/util-linux-nosystemd/util-linux.sysusers b/pcr/util-linux-nosystemd/util-linux.sysusers deleted file mode 100644 index d7425ae9e..000000000 --- a/pcr/util-linux-nosystemd/util-linux.sysusers +++ /dev/null @@ -1 +0,0 @@ -u uuidd 68 |