diff options
author | André Fabian Silva Delgado | 2016-09-24 08:29:45 -0300 |
---|---|---|
committer | André Fabian Silva Delgado | 2016-09-24 08:29:45 -0300 |
commit | 1626da3617c9d1cbc79ac3c8646594acf3d4d91d (patch) | |
tree | 6203ecf6afae2608606d201bfa492697ec7405d7 | |
parent | 9f547831b6adc27f58d07ba8998952385a7052ed (diff) | |
download | aur-1626da3617c9d1cbc79ac3c8646594acf3d4d91d.tar.gz |
Update to 231-1
-rw-r--r-- | .SRCINFO | 44 | ||||
-rw-r--r-- | PKGBUILD | 32 | ||||
-rw-r--r-- | initcpio-install-systemd | 27 | ||||
-rw-r--r-- | systemd.install | 143 |
4 files changed, 57 insertions, 189 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jun 24 17:32:53 UTC 2016 +# Sat Sep 24 11:29:13 UTC 2016 pkgbase = systemd-knock - pkgver = 230 - pkgrel = 4.2 + pkgver = 231 + pkgrel = 1 url = http://www.freedesktop.org/wiki/Software/systemd arch = i686 arch = x86_64 @@ -31,9 +31,9 @@ pkgbase = systemd-knock makedepends = git options = strip options = debug - source = git://github.com/systemd/systemd.git#tag=v230 - source = https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-230.patch - source = https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-230.patch.sig + source = git://github.com/systemd/systemd.git#tag=v231 + source = https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-231.patch + source = https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-231.patch.sig source = https://repo.parabola.nu/other/systemd/splash-parabola.bmp source = https://repo.parabola.nu/other/systemd/splash-parabola.bmp.sig source = initcpio-hook-udev @@ -51,12 +51,12 @@ pkgbase = systemd-knock source = https://repo.parabola.nu/other/systemd/splash-parabola.bmp source = https://repo.parabola.nu/other/systemd/splash-parabola.bmp.sig md5sums = SKIP - md5sums = 32e8e7c8802dac3078a2c4b0e05abd30 + md5sums = 62b46565502f4e6e696fa0a8708fea34 md5sums = SKIP md5sums = f8253cd3c0f249591338fbb4c223d249 md5sums = SKIP md5sums = 90ea67a7bb237502094914622a39e281 - md5sums = 976c5511b6493715e381f43f16cdb151 + md5sums = bee7fd6ccda39582259708e3f262ea6d md5sums = 1b3aa3a0551b08af9305d33f85b5c2fc md5sums = 36ee74767ac8734dede1cbd0f4f275d7 md5sums = 9b9f4a58e4c4009bf5290c5b297600c3 @@ -99,22 +99,14 @@ pkgname = systemd-knock optdepends = quota-tools: kernel-level quota management optdepends = systemd-knock-sysvcompat: symlink package to provide sysvinit binaries optdepends = polkit: allow administration as unprivileged user - provides = systemd-tools=230 - provides = udev=230 - provides = systemd=230 + provides = systemd-tools=231 + provides = udev=231 + provides = systemd=231 conflicts = systemd-tools conflicts = udev conflicts = systemd replaces = systemd-tools replaces = udev - backup = etc/dbus-1/system.d/org.freedesktop.systemd1.conf - backup = etc/dbus-1/system.d/org.freedesktop.hostname1.conf - backup = etc/dbus-1/system.d/org.freedesktop.login1.conf - backup = etc/dbus-1/system.d/org.freedesktop.locale1.conf - backup = etc/dbus-1/system.d/org.freedesktop.machine1.conf - backup = etc/dbus-1/system.d/org.freedesktop.timedate1.conf - backup = etc/dbus-1/system.d/org.freedesktop.import1.conf - backup = etc/dbus-1/system.d/org.freedesktop.network1.conf backup = etc/pam.d/systemd-user backup = etc/systemd/coredump.conf backup = etc/systemd/journald.conf @@ -135,14 +127,14 @@ pkgname = libsystemd-knock depends = nss-knock-myhostname depends = nss-knock-mymachines depends = nss-knock-resolve - provides = libsystemd=230 + provides = libsystemd=231 conflicts = libsystemd pkgname = systemd-knock-sysvcompat pkgdesc = sysvinit compat for systemd-knock license = GPL2 depends = systemd-knock - provides = systemd-sysvcompat=230 + provides = systemd-sysvcompat=231 conflicts = sysvinit conflicts = systemd-sysvcompat @@ -155,7 +147,7 @@ pkgname = libsystemd-knock-standalone depends = lz4 depends = xz provides = libsystemd.so - provides = libsystemd-standalone=230 + provides = libsystemd-standalone=231 conflicts = libsystemd-standalone pkgname = libudev-knock @@ -164,7 +156,7 @@ pkgname = libudev-knock depends = glibc depends = libcap provides = libudev.so - provides = libudev=230 + provides = libudev=231 conflicts = libudev pkgname = nss-knock-myhostname @@ -172,7 +164,7 @@ pkgname = nss-knock-myhostname license = GPL2 depends = glibc depends = libcap - provides = nss-myhostname=230 + provides = nss-myhostname=231 conflicts = nss-myhostname pkgname = nss-knock-mymachines @@ -180,7 +172,7 @@ pkgname = nss-knock-mymachines license = GPL2 depends = glibc depends = libcap - provides = nss-mymachines=230 + provides = nss-mymachines=231 conflicts = nss-mymachines pkgname = nss-knock-resolve @@ -188,6 +180,6 @@ pkgname = nss-knock-resolve license = GPL2 depends = glibc depends = libcap - provides = nss-resolve=230 + provides = nss-resolve=231 conflicts = nss-resolve @@ -8,8 +8,8 @@ _pkgbase=systemd pkgbase=systemd-knock pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat' 'libsystemd-knock-standalone' 'libudev-knock' 'nss-knock-myhostname' 'nss-knock-mymachines' 'nss-knock-resolve') -pkgver=230 -pkgrel=4.2 +pkgver=231 +pkgrel=1 arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -21,7 +21,7 @@ makedepends_x86_64=('gnu-efi-libs') options=('strip' 'debug') source=("git://github.com/systemd/systemd.git#tag=v$pkgver" #'0001-adds-TCP-Stealth-support-to-systemd.patch::https://gnunet.org/sites/default/files/systemd-knock-patch.diff' - "https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-230.patch"{,.sig} + "https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-231.patch"{,.sig} "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig} 'initcpio-hook-udev' 'initcpio-install-systemd' @@ -37,12 +37,12 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver" '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig}) md5sums=('SKIP' - '32e8e7c8802dac3078a2c4b0e05abd30' + '62b46565502f4e6e696fa0a8708fea34' 'SKIP' 'f8253cd3c0f249591338fbb4c223d249' 'SKIP' '90ea67a7bb237502094914622a39e281' - '976c5511b6493715e381f43f16cdb151' + 'bee7fd6ccda39582259708e3f262ea6d' '1b3aa3a0551b08af9305d33f85b5c2fc' '36ee74767ac8734dede1cbd0f4f275d7' '9b9f4a58e4c4009bf5290c5b297600c3' @@ -61,17 +61,6 @@ validpgpkeys=( ) _backports=( - # Revert "rules: allow users to access frame buffer devices" (#3333) - e77813ca9f4e0735fd0e3e2caae4d7d1ee436011 - - # {machine,system}ctl: always pass &changes and &n_changes (#3350) - acc0269cad31d1aaef2034a055b34c07c88a353d - - # systemctl: fix return values on success - 5f056378b0ceffb6e6fba3513f7eae72e2d09dc8 - - # automount: handle expire_tokens when the mount unit changes its state (#3434) - 0a62f81045dd810c8f1223cccbac4d706ea2cb45 ) prepare() { @@ -124,6 +113,7 @@ build() { --with-sysvrcnd-path= --with-ntp-servers="${timeservers[*]}" --with-default-dnssec=no + --with-dbuspolicydir=/usr/share/dbus-1/system.d --without-kill-user-processes ) @@ -178,15 +168,7 @@ package_systemd-knock() { 'quota-tools: kernel-level quota management' 'systemd-knock-sysvcompat: symlink package to provide sysvinit binaries' 'polkit: allow administration as unprivileged user') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.machine1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/dbus-1/system.d/org.freedesktop.import1.conf - etc/dbus-1/system.d/org.freedesktop.network1.conf - etc/pam.d/systemd-user + backup=(etc/pam.d/systemd-user etc/systemd/coredump.conf etc/systemd/journald.conf etc/systemd/journal-remote.conf diff --git a/initcpio-install-systemd b/initcpio-install-systemd index 96df98ada271..b57661b3ea92 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -93,6 +93,13 @@ add_systemd_unit() { 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 @@ -100,6 +107,7 @@ build() { add_binary /bin/mount add_binary /usr/bin/kmod /usr/bin/modprobe add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/sulogin map add_binary \ /usr/bin/systemd-tmpfiles \ @@ -108,8 +116,6 @@ build() { /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator - add_module "kdbus?" - # udev rules and systemd units map add_udev_rule "$rules" \ 50-udev-default.rules \ @@ -123,6 +129,7 @@ build() { 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 \ @@ -145,7 +152,9 @@ build() { systemd-udevd-control.socket \ systemd-udevd-kernel.socket \ systemd-udevd.service \ - timers.target + 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" @@ -153,8 +162,16 @@ build() { # udev wants /etc/group since it doesn't launch with --resolve-names=never add_file "/etc/nsswitch.conf" add_binary "$(readlink -f /usr/lib/libnss_files.so)" - add_file "/etc/passwd" - add_file "/etc/group" + + echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd" + echo "root:x:0:root" >"$BUILDROOT/etc/group" + echo "root::::::::" >"$BUILDROOT/etc/shadow" + + add_systemd_drop_in systemd-udevd.service resolve-names <<EOF +[Service] +ExecStart= +ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never +EOF } help() { diff --git a/systemd.install b/systemd.install index b0a3e1fa4e4f..f2978d9738f4 100644 --- a/systemd.install +++ b/systemd.install @@ -4,13 +4,6 @@ sd_booted() { [[ -d run/systemd/system && ! -L run/systemd/system ]] } -add_privs() { - if ! setcap "$2" "$1" 2>/dev/null; then - echo "==> Warning: setcap failed, falling back to setuid root on /$1" - chmod u+s "$1" - fi -} - add_journal_acls() { # ignore errors, since the filesystem might not support ACLs setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null @@ -18,129 +11,16 @@ add_journal_acls() { } maybe_reexec() { - # don't reexec on 209-1 upgrade due to large infrastructural changes. - if [[ $(vercmp 209-1 "$2") -eq 1 ]]; then - echo ':: systemd has not been reexecuted. It is recommended that you' - echo ' reboot at your earliest convenience.' - return - fi - if sd_booted; then systemctl --system daemon-reexec fi } -_dir_empty() { - set -- "$1"/* - [[ ! -e $1 && ! -L $1 ]] -} - post_common() { systemd-sysusers - udevadm hwdb --update journalctl --update-catalog } -_204_1_changes() { - printf '==> The /bin/systemd symlink has been removed. Any references in your\n' - printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' -} - -_205_1_changes() { - printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n' - printf ' protocols. You should reboot at your earliest convenience.\n' -} - -_206_1_changes() { - printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n' - printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n' - printf ' hook has been added which provides this functionality, and more.\n' -} - -_208_1_changes() { - if [[ -e var/lib/backlight && ! -e var/lib/systemd/backlight ]]; then - mv -T var/lib/backlight var/lib/systemd/backlight - fi - - if [[ -e var/lib/random-seed && ! -e var/lib/systemd/random-seed ]]; then - mv -T var/lib/random-seed var/lib/systemd/random-seed - fi -} - -_208_8_changes() { - add_journal_acls -} - -_209_1_changes() { - # attempt to preserve existing behavior - - local old_rule=etc/udev/rules.d/80-net-name-slot.rules - local new_rule=etc/udev/rules.d/80-net-setup-link.rules - - echo ":: Network device naming is now controlled by udev's net_setup_link" - echo " builtin. Refer to the systemd.link manpage for a full description." - - # not clear what action we can take here, so don't do anything - [[ -e $new_rule ]] && return 0 - - # rename the old rule to the new one so that we preserve the user's - # existing option. - if [[ -e $old_rule ]]; then - printf ':: Renaming %s to %s in order\n' "${old_rule##*/}" "${new_rule##*/}" - printf ' to preserve existing network naming behavior.\n' - mv -v "$old_rule" "$new_rule" - else - echo ':: No changes have been made to your network naming configuration.' - echo ' Interfaces should continue to maintain the same names.' - fi -} - -_210_1_changes() { - if sd_booted; then - # If /etc/systemd/network is non-empty, then this is a 209 user who used - # networkd. Re-enable it for them. - if ! _dir_empty etc/systemd/network; then - systemctl enable systemd-networkd - fi - fi -} - -_213_4_changes() { - if sd_booted; then - # if /etc/resolv.conf is a symlink, just assume that it was being managed - # by systemd-networkd, and re-enable systemd-resolved. - if [[ -L etc/resolv.conf ]]; then - systemctl enable systemd-resolved - fi - fi -} - -_214_2_changes() { - # /run/systemd/network/resolv.conf -> /run/systemd/resolve/resolv.conf - if [[ etc/resolv.conf -ef run/systemd/network/resolv.conf ]]; then - ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf - - if sd_booted; then - if [[ ! -d run/systemd/resolve ]]; then - mkdir run/systemd/resolve - fi - - if [[ -f run/systemd/network/resolv.conf ]]; then - mv run/systemd/{network,resolve}/resolv.conf - fi - fi - fi - - echo ':: coredumps are no longer sent to the journal by default. To re-enable:' - echo ' echo >/etc/sysctl.d/50-coredump.conf \' - echo ' "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"' -} - -_215_2_changes() { - # create at least the symlink from /etc/os-release to /usr/lib/os-release - systemd-tmpfiles --create etc.conf -} - _216_2_changes() { echo ':: Coredumps are handled by systemd by default. Collection behavior can be' echo ' tuned in /etc/systemd/coredump.conf.' @@ -158,6 +38,10 @@ _219_4_changes() { fi } +_230_1_changes() { + echo ':: systemd-bootchart is no longer included with systemd' +} + post_install() { systemd-machine-id-setup @@ -181,19 +65,12 @@ post_upgrade() { maybe_reexec "$@" - local v upgrades=(204-1 - 205-1 - 206-1 - 208-1 - 208-8 - 209-1 - 210-1 - 213-4 - 214-2 - 215-2 - 216-2 - 219-2 - 219-4) + local v upgrades=( + 216-2 + 219-2 + 219-4 + 230-1 + ) for v in "${upgrades[@]}"; do if [[ $(vercmp "$v" "$2") -eq 1 ]]; then |