[pacman]: better alignmemt of pacman.conf(s) comments with arch

4 files changed, 247 insertions, 53 deletions

diff --git a/libre-testing/pacman/makepkg.conf.in b/libre-testing/pacman/makepkg.conf.in
index 3fc6ed099..6e7358cab 100644
--- a/libre-testing/pacman/makepkg.conf.in
+++ b/libre-testing/pacman/makepkg.conf.in
@@ -130,17 +130,17 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
+COMPRESSZST=(zstd -c -z -q -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
+COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
 
 #########################################################################
 # EXTENSION DEFAULTS
 #########################################################################
 #
-# WARNING: Do NOT modify these variables unless you know what you are
-#          doing.
-#
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
 
diff --git a/libre-testing/pacman/pacman.conf.armv7h b/libre-testing/pacman/pacman.conf.armv7h
index 0235294ef..92367feb6 100644
--- a/libre-testing/pacman/pacman.conf.armv7h
+++ b/libre-testing/pacman/pacman.conf.armv7h
@@ -19,7 +19,6 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-#UseDelta    = 0.7
 Architecture = armv7h
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -43,7 +42,7 @@ LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official packagers with:
+# keyring can then be populated with the keys of all trusted packagers with:
 #   `pacman-key --populate archlinux archlinux32 archlinuxarm parabola`.
 
 #
@@ -62,16 +61,56 @@ LocalFileSigLevel = Optional
 #       Include = IncludePath
 #
 # The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
+# un-commented to enable the repo.
 #
+# Some repositories are disabled by default. To enable them, un-comment the
+# repo name header (e.g. '[nonprism]') and the following 'Include' line.
+# You can add preferred servers for each repo between the header and "Include" line,
+# according to the format in /etc/pacman.d/mirrorlist,
+# and those will be preferred over the standard mirrors for that repo.
+#
+# The order in which these entries appear in this file is critical.
+# Much of the Parabola magic that supports advanced features such as
+# multiple init-systems and multiple layers of freedom and privacy,
+# depends on the order in which these repos are defined.
+# Moving or adding repos out of the expected order can make your system insane.
+
+# Notes on special repositories:
+#
+# Non-prism is a repository for enhanced privacy, beyond the FSDG requirements.
+# It contains specially patched versions of certain software from the standard repos,
+# that are known to include privacy-sensative features that some people may want to use,
+# but that others may consider to be undesirable anti-features.
+# For more info see: https://wiki.parabola.nu/Nonprism
+#
+# The non-systemd repository contains packages that are important and relevant only to
+# Parabola systems using an init-system other than systemd.
+# Parabola systems using systemd SHOULD NOT have this enabled;.
+# while Parabola systems using any other init-system SHOULD have this enabled.
+#
+# The kernels repository contains additional special kernels for particular use-cases,
+# such as maximal security hardening and real-time systems.
+#
+# The PCR (Parabola Community Repository) contains additional packages,
+# most often requested by Parabola users, that are not considered to be
+# part of the standard Parabola/Arch system, but are nonetheless useful or fun.
+#
+# Multi-lib repositories allow 32-bit applications to run on x86_64 systems.
+#
+# The Parabola system also supports custom, user-defined, repositories;
+# but be aware that the Parabola team can not recommend nor support their use.
+# The Parabola team can only support the use of software that is published by Parabola.
+# The use of third-party software is discouraged with a "use at your own risk" warning.
+# These may be community-maintained or maintained privately by the local user or sysadmin.
+# They may be hosted on the internet, on the local network, or only on the local computer.
+# An example of a custom package repository is given below
+# in the "User-defined repos" section
+# See the pacman manpage for details on creating your own repositories.
 
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
 
-# NOTE: Nonprism is a particular repository that aims to provide software built
-# and patched without services under global data surveillance programs like PRISM,
-# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+###########################
+# Parabola standard repos #
+###########################
 
 #[nonprism-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -79,12 +118,29 @@ LocalFileSigLevel = Optional
 #[nonprism]
 #Include = /etc/pacman.d/mirrorlist
 
+#[nonsystemd-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonsystemd]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
 Include = /etc/pacman.d/mirrorlist
 
+#[kernels-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[kernels]
+#Include = /etc/pacman.d/mirrorlist
+
+
+#######################
+# Arch standard repos #
+#######################
+
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -100,9 +156,10 @@ Include = /etc/pacman.d/mirrorlist
 [community]
 Include = /etc/pacman.d/mirrorlist
 
-# The PCR (Parabola Community Repository) contains packages maintained by trusted
-# members of the Parabola community. It also contains packages maintained by
-# Parabola developers, but that the developer decided didn't belong in core/libre.
+
+######################
+# Supplemental repos #
+######################
 
 #[pcr-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -110,13 +167,18 @@ Include = /etc/pacman.d/mirrorlist
 [pcr]
 Include = /etc/pacman.d/mirrorlist
 
-# Parabola also supports another community projects and personal repositories, to
-# find them check out this wiki page: https://wiki.parabola.nu/Repositories
 
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
+######################
+# User-defined repos #
+######################
+
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
+
+##############
+# Over-rides #
+##############
+
 Include = /etc/pacman.d/*.conf
diff --git a/libre-testing/pacman/pacman.conf.i686 b/libre-testing/pacman/pacman.conf.i686
index b75d2cd54..1f8ddec57 100644
--- a/libre-testing/pacman/pacman.conf.i686
+++ b/libre-testing/pacman/pacman.conf.i686
@@ -19,7 +19,6 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -43,7 +42,7 @@ LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official packagers with:
+# keyring can then be populated with the keys of all trusted packagers with:
 #   `pacman-key --populate archlinux archlinux32 archlinuxarm parabola`.
 
 #
@@ -62,16 +61,56 @@ LocalFileSigLevel = Optional
 #       Include = IncludePath
 #
 # The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
+# un-commented to enable the repo.
 #
+# Some repositories are disabled by default. To enable them, un-comment the
+# repo name header (e.g. '[nonprism]') and the following 'Include' line.
+# You can add preferred servers for each repo between the header and "Include" line,
+# according to the format in /etc/pacman.d/mirrorlist,
+# and those will be preferred over the standard mirrors for that repo.
+#
+# The order in which these entries appear in this file is critical.
+# Much of the Parabola magic that supports advanced features such as
+# multiple init-systems and multiple layers of freedom and privacy,
+# depends on the order in which these repos are defined.
+# Moving or adding repos out of the expected order can make your system insane.
+
+# Notes on special repositories:
+#
+# Non-prism is a repository for enhanced privacy, beyond the FSDG requirements.
+# It contains specially patched versions of certain software from the standard repos,
+# that are known to include privacy-sensative features that some people may want to use,
+# but that others may consider to be undesirable anti-features.
+# For more info see: https://wiki.parabola.nu/Nonprism
+#
+# The non-systemd repository contains packages that are important and relevant only to
+# Parabola systems using an init-system other than systemd.
+# Parabola systems using systemd SHOULD NOT have this enabled;.
+# while Parabola systems using any other init-system SHOULD have this enabled.
+#
+# The kernels repository contains additional special kernels for particular use-cases,
+# such as maximal security hardening and real-time systems.
+#
+# The PCR (Parabola Community Repository) contains additional packages,
+# most often requested by Parabola users, that are not considered to be
+# part of the standard Parabola/Arch system, but are nonetheless useful or fun.
+#
+# Multi-lib repositories allow 32-bit applications to run on x86_64 systems.
+#
+# The Parabola system also supports custom, user-defined, repositories;
+# but be aware that the Parabola team can not recommend nor support their use.
+# The Parabola team can only support the use of software that is published by Parabola.
+# The use of third-party software is discouraged with a "use at your own risk" warning.
+# These may be community-maintained or maintained privately by the local user or sysadmin.
+# They may be hosted on the internet, on the local network, or only on the local computer.
+# An example of a custom package repository is given below
+# in the "User-defined repos" section
+# See the pacman manpage for details on creating your own repositories.
 
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
 
-# NOTE: Nonprism is a particular repository that aims to provide software built
-# and patched without services under global data surveillance programs like PRISM,
-# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+###########################
+# Parabola standard repos #
+###########################
 
 #[nonprism-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -79,12 +118,29 @@ LocalFileSigLevel = Optional
 #[nonprism]
 #Include = /etc/pacman.d/mirrorlist
 
+#[nonsystemd-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonsystemd]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
 Include = /etc/pacman.d/mirrorlist
 
+#[kernels-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[kernels]
+#Include = /etc/pacman.d/mirrorlist
+
+
+#######################
+# Arch standard repos #
+#######################
+
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -100,9 +156,10 @@ Include = /etc/pacman.d/mirrorlist
 [community]
 Include = /etc/pacman.d/mirrorlist
 
-# The PCR (Parabola Community Repository) contains packages maintained by trusted
-# members of the Parabola community. It also contains packages maintained by
-# Parabola developers, but that the developer decided didn't belong in core/libre.
+
+######################
+# Supplemental repos #
+######################
 
 #[pcr-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -110,13 +167,18 @@ Include = /etc/pacman.d/mirrorlist
 [pcr]
 Include = /etc/pacman.d/mirrorlist
 
-# Parabola also supports another community projects and personal repositories, to
-# find them check out this wiki page: https://wiki.parabola.nu/Repositories
 
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
+######################
+# User-defined repos #
+######################
+
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
+
+##############
+# Over-rides #
+##############
+
 Include = /etc/pacman.d/*.conf
diff --git a/libre-testing/pacman/pacman.conf.x86_64 b/libre-testing/pacman/pacman.conf.x86_64
index e6b7cc545..881a3d6ed 100644
--- a/libre-testing/pacman/pacman.conf.x86_64
+++ b/libre-testing/pacman/pacman.conf.x86_64
@@ -19,7 +19,6 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -43,7 +42,7 @@ LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official packagers with:
+# keyring can then be populated with the keys of all trusted packagers with:
 #   `pacman-key --populate archlinux archlinux32 archlinuxarm parabola`.
 
 #
@@ -62,16 +61,56 @@ LocalFileSigLevel = Optional
 #       Include = IncludePath
 #
 # The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
+# un-commented to enable the repo.
 #
+# Some repositories are disabled by default. To enable them, un-comment the
+# repo name header (e.g. '[nonprism]') and the following 'Include' line.
+# You can add preferred servers for each repo between the header and "Include" line,
+# according to the format in /etc/pacman.d/mirrorlist,
+# and those will be preferred over the standard mirrors for that repo.
+#
+# The order in which these entries appear in this file is critical.
+# Much of the Parabola magic that supports advanced features such as
+# multiple init-systems and multiple layers of freedom and privacy,
+# depends on the order in which these repos are defined.
+# Moving or adding repos out of the expected order can make your system insane.
+
+# Notes on special repositories:
+#
+# Non-prism is a repository for enhanced privacy, beyond the FSDG requirements.
+# It contains specially patched versions of certain software from the standard repos,
+# that are known to include privacy-sensative features that some people may want to use,
+# but that others may consider to be undesirable anti-features.
+# For more info see: https://wiki.parabola.nu/Nonprism
+#
+# The non-systemd repository contains packages that are important and relevant only to
+# Parabola systems using an init-system other than systemd.
+# Parabola systems using systemd SHOULD NOT have this enabled;.
+# while Parabola systems using any other init-system SHOULD have this enabled.
+#
+# The kernels repository contains additional special kernels for particular use-cases,
+# such as maximal security hardening and real-time systems.
+#
+# The PCR (Parabola Community Repository) contains additional packages,
+# most often requested by Parabola users, that are not considered to be
+# part of the standard Parabola/Arch system, but are nonetheless useful or fun.
+#
+# Multi-lib repositories allow 32-bit applications to run on x86_64 systems.
+#
+# The Parabola system also supports custom, user-defined, repositories;
+# but be aware that the Parabola team can not recommend nor support their use.
+# The Parabola team can only support the use of software that is published by Parabola.
+# The use of third-party software is discouraged with a "use at your own risk" warning.
+# These may be community-maintained or maintained privately by the local user or sysadmin.
+# They may be hosted on the internet, on the local network, or only on the local computer.
+# An example of a custom package repository is given below
+# in the "User-defined repos" section
+# See the pacman manpage for details on creating your own repositories.
 
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
 
-# NOTE: Nonprism is a particular repository that aims to provide software built
-# and patched without services under global data surveillance programs like PRISM,
-# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+###########################
+# Parabola standard repos #
+###########################
 
 #[nonprism-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -79,12 +118,29 @@ LocalFileSigLevel = Optional
 #[nonprism]
 #Include = /etc/pacman.d/mirrorlist
 
+#[nonsystemd-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonsystemd]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
 Include = /etc/pacman.d/mirrorlist
 
+#[kernels-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[kernels]
+#Include = /etc/pacman.d/mirrorlist
+
+
+#######################
+# Arch standard repos #
+#######################
+
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -100,9 +156,10 @@ Include = /etc/pacman.d/mirrorlist
 [community]
 Include = /etc/pacman.d/mirrorlist
 
-# The PCR (Parabola Community Repository) contains packages maintained by trusted
-# members of the Parabola community. It also contains packages maintained by
-# Parabola developers, but that the developer decided didn't belong in core/libre.
+
+######################
+# Supplemental repos #
+######################
 
 #[pcr-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -110,8 +167,10 @@ Include = /etc/pacman.d/mirrorlist
 [pcr]
 Include = /etc/pacman.d/mirrorlist
 
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the libre-multilib, multilib and pcr-multilib repositories as required here.
+
+############################
+# Cross-architecture repos #
+############################
 
 #[nonprism-multilib-testing]
 #Include = /etc/pacman.d/mirrorlist
@@ -119,6 +178,12 @@ Include = /etc/pacman.d/mirrorlist
 #[nonprism-multilib]
 #Include = /etc/pacman.d/mirrorlist
 
+#[nonsystemd-multilib-testting]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonsystemd-multilib]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-multilib-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -137,13 +202,18 @@ Include = /etc/pacman.d/mirrorlist
 #[pcr-multilib]
 #Include = /etc/pacman.d/mirrorlist
 
-# Parabola also supports another community projects and personal repositories, to
-# find them check out this wiki page: https://wiki.parabola.nu/Repositories
 
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
+######################
+# User-defined repos #
+######################
+
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
+
+##############
+# Over-rides #
+##############
+
 Include = /etc/pacman.d/*.conf