From 3c6f63dbc040d0bbb3c966341db687a6cc397339 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 6 Dec 2015 20:49:53 -0300 Subject: systemd-knock-228-3: updating version * enable ELFUTILS support * backport important-sounding commit regarding IPv6 Router Advertisements * fix bug where networkd was removing loopback addresses (FS#47160 -> https://bugs.archlinux.org/task/47160) * add armv7h support --- pcr/systemd-knock/PKGBUILD | 37 ++++++++++++---- pcr/systemd-knock/gnu+linux.patch | 89 ++++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 53 deletions(-) (limited to 'pcr/systemd-knock') diff --git a/pcr/systemd-knock/PKGBUILD b/pcr/systemd-knock/PKGBUILD index 136393df6..5e48c96fb 100644 --- a/pcr/systemd-knock/PKGBUILD +++ b/pcr/systemd-knock/PKGBUILD @@ -6,14 +6,15 @@ _pkgbase=systemd pkgbase=systemd-knock pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat') -pkgver=227 -pkgrel=1 -arch=('i686' 'x86_64') +pkgver=228 +pkgrel=3 +arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" -makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-libre-api-headers' - 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git') + 'python-lxml' 'quota-tools' 'shadow' 'git') +[ "$CARCH" != "armv7h" ] && makedepends+=('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' @@ -33,11 +34,21 @@ md5sums=('SKIP' '1b3aa3a0551b08af9305d33f85b5c2fc' '36ee74767ac8734dede1cbd0f4f275d7' '9b9f4a58e4c4009bf5290c5b297600c3' - '489e79ba87d2ebdd3cb4ef460a21bd00') + 'd37895215ef74e172c594aebe1ba23cb') prepare() { cd "$_pkgbase" + # sd-ndisc: drop RA packets from non-link-local addresses + # https://github.com/systemd/systemd/commit/3ccd31635353 + # https://github.com/systemd/systemd/issues/1866 + git cherry-pick -n 3ccd31635353 + + # networkd: link - do not drop config for loopback device + # https://github.com/systemd/systemd/commit/e5d44b34cca3 + # https://github.com/systemd/systemd/issues/2023 + git cherry-pick -n e5d44b34cca3 + # Rename "Linux" -> "GNU/Linux" patch -Np1 -i "$srcdir/gnu+linux.patch" sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c @@ -57,19 +68,27 @@ build() { local timeservers=({0..3}.arch.pool.ntp.org) + if [ "$CARCH" = "armv7h" ]; then + LDFLAGS+=" -Wl,-fuse-ld=bfd" + CFLAGS+=" -fno-lto" + CXXFLAGS+=" -fno-lto" + else + extra=--enable-gnuefi + fi + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ --enable-lz4 \ --enable-compat-libs \ - --enable-gnuefi \ --enable-tcp-stealth \ --disable-audit \ --disable-ima \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ - --with-ntp-servers="${timeservers[*]}" + --with-ntp-servers="${timeservers[*]}" \ + $extra make } @@ -78,7 +97,7 @@ package_systemd-knock() { pkgdesc="system and service manager with support for stealth TCP sockets (Parabola rebranded)" license=('GPL2' 'LGPL2.1') depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' - 'libgcrypt' "libsystemd=$pkgver" 'libidn' 'lz4' 'pam' 'libseccomp' + 'libgcrypt' "libsystemd=$pkgver" 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver") replaces=('nss-myhostname' 'systemd-tools' 'udev') diff --git a/pcr/systemd-knock/gnu+linux.patch b/pcr/systemd-knock/gnu+linux.patch index 3101bc4a9..f6a5e81d5 100644 --- a/pcr/systemd-knock/gnu+linux.patch +++ b/pcr/systemd-knock/gnu+linux.patch @@ -11,9 +11,9 @@ diff -Nur a/man/bootup.xml b/man/bootup.xml image (initrd), such as generated by dracut8, diff -Nur a/man/custom-html.xsl b/man/custom-html.xsl ---- a/man/custom-html.xsl 2015-09-11 14:55:47.363340869 -0300 -+++ b/man/custom-html.xsl 2015-09-11 15:00:26.850353104 -0300 -@@ -82,10 +82,10 @@ +--- a/man/custom-html.xsl 2015-11-28 05:22:36.372154698 -0300 ++++ b/man/custom-html.xsl 2015-11-28 05:23:08.917203964 -0300 +@@ -83,10 +83,10 @@ @@ -26,7 +26,7 @@ diff -Nur a/man/custom-html.xsl b/man/custom-html.xsl / -@@ -95,19 +95,6 @@ +@@ -96,19 +96,6 @@ @@ -47,8 +47,8 @@ diff -Nur a/man/custom-html.xsl b/man/custom-html.xsl diff -Nur a/man/daemon.xml b/man/daemon.xml ---- a/man/daemon.xml 2015-09-11 14:55:47.364340876 -0300 -+++ b/man/daemon.xml 2015-09-11 15:01:31.162860171 -0300 +--- a/man/daemon.xml 2015-11-28 05:22:36.372154698 -0300 ++++ b/man/daemon.xml 2015-11-28 05:26:43.416694259 -0300 @@ -74,7 +74,7 @@ Close all open file descriptors except standard input, output, and error (i.e. the first three file @@ -88,12 +88,12 @@ diff -Nur a/man/daemon.xml b/man/daemon.xml @@ -491,7 +491,7 @@ for service activation is low system load. However, here too, a more convincing approach might be to make proper use of features - of the operating system, in particular, the CPU or IO scheduler + of the operating system, in particular, the CPU or I/O scheduler - of Linux. Instead of scheduling jobs from userspace based on + of GNU/Linux. Instead of scheduling jobs from userspace based on monitoring the OS scheduler, it is advisable to leave the scheduling of processes to the OS scheduler itself. systemd - provides fine-grained access to the CPU and IO schedulers. If a + provides fine-grained access to the CPU and I/O schedulers. If a diff -Nur a/man/kernel-install.xml b/man/kernel-install.xml --- a/man/kernel-install.xml 2015-09-11 14:55:47.366340890 -0300 +++ b/man/kernel-install.xml 2015-09-11 15:04:24.500215627 -0300 @@ -233,11 +233,11 @@ diff -Nur a/man/os-release.xml b/man/os-release.xml diff -Nur a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml ---- a/man/sd-bus-errors.xml 2015-09-11 14:55:47.368340904 -0300 -+++ b/man/sd-bus-errors.xml 2015-09-11 15:31:32.009608698 -0300 +--- a/man/sd-bus-errors.xml 2015-11-28 05:22:36.375487866 -0300 ++++ b/man/sd-bus-errors.xml 2015-11-28 05:23:08.920537132 -0300 @@ -126,7 +126,7 @@ - In addition to this list, in sd-bus the special error + In addition to this list, in sd-bus, the special error namespace System.Error. is used to map - arbitrary Linux system errors (as defined by diff -Nur a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml ---- a/man/systemd-detect-virt.xml 2015-09-20 20:12:13.803372347 -0300 -+++ b/man/systemd-detect-virt.xml 2015-09-20 20:12:54.388005823 -0300 +--- a/man/systemd-detect-virt.xml 2015-11-28 05:22:36.382154201 -0300 ++++ b/man/systemd-detect-virt.xml 2015-11-28 05:29:15.395921466 -0300 @@ -104,16 +104,6 @@ -- vmware -- VMware Workstation or Server, and related products +- vmware +- VMware Workstation or Server, and related products - - - -- microsoft -- Hyper-V, also known as Viridian or Windows Server Virtualization +- microsoft +- Hyper-V, also known as Viridian or Windows Server Virtualization - - - - oracle - Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems) + oracle + Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems) @@ -146,12 +136,12 @@ - lxc -- Linux container implementation by LXC -+ GNU/Linux container implementation by (G)LXC + lxc +- Linux container implementation by LXC ++ GNU/Linux container implementation by LXC - lxc-libvirt -- Linux container implementation by libvirt -+ GNU/Linux container implementation by libvirt + lxc-libvirt +- Linux container implementation by libvirt ++ GNU/Linux container implementation by libvirt @@ -342,20 +342,20 @@ diff -Nur a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml See the -- Similar, if run inside a Linux container -+ Similar, if run inside a GNU/Linux container - environment and a UUID is configured for the container this is - used to initialize the machine ID. For details see the +- Similarly, if run inside a Linux container ++ Similarly, if run inside a GNU/Linux container + environment and a UUID is configured for the container, this is + used to initialize the machine ID. For details, see the documentation of the In contrast to @@ -373,7 +373,7 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml to set up an OS directory tree suitable as file system hierarchy for systemd-nspawn containers. -@@ -837,46 +837,35 @@ +@@ -852,46 +852,35 @@ Examples @@ -391,8 +391,8 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml - - Build and boot a minimal Fedora distribution in a container - -- # dnf -y --releasever=21 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd dnf fedora-release vim-minimal -+ # dnf -y --releasever=210k --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag install systemd passwd dnf blag-release vim-minimal +- # dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal ++ # dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal # systemd-nspawn -bD /srv/mycontainer - This installs a minimal Fedora distribution into the @@ -405,8 +405,9 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml - Spawn a shell in a container of a minimal Debian unstable distribution + Spawn a shell in a container of a minimal gNewSense unstable distribution - # debootstrap --arch=amd64 unstable ~/debian-tree/ +- # debootstrap --arch=amd64 unstable ~/debian-tree/ -# systemd-nspawn -D ~/debian-tree/ ++ # debootstrap --arch=amd64 unstable ~/gnewsense-tree/ +# systemd-nspawn -D ~/gnewsense-tree/ - This installs a minimal Debian unstable distribution into @@ -432,7 +433,7 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml in a namespace container in it. -@@ -914,7 +903,7 @@ +@@ -929,7 +918,7 @@ chroot1, dnf8, debootstrap8, @@ -454,9 +455,9 @@ diff -Nur a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml [Sleep] SuspendState=freeze diff -Nur a/man/systemd.socket.xml b/man/systemd.socket.xml ---- a/man/systemd.socket.xml 2015-09-11 14:55:47.385341023 -0300 -+++ b/man/systemd.socket.xml 2015-09-11 16:09:44.235652283 -0300 -@@ -255,7 +255,7 @@ +--- a/man/systemd.socket.xml 2015-11-28 05:22:36.392153706 -0300 ++++ b/man/systemd.socket.xml 2015-11-28 05:23:08.920537132 -0300 +@@ -289,7 +289,7 @@ Specifies a POSIX message queue name to listen on. This expects a valid message queue name (i.e. beginning with /). Behavior otherwise is very similar to the @@ -466,8 +467,8 @@ diff -Nur a/man/systemd.socket.xml b/man/systemd.socket.xml can be inherited between processes. diff -Nur a/man/systemd.xml b/man/systemd.xml ---- a/man/systemd.xml 2015-10-17 07:04:47.756947238 -0300 -+++ b/man/systemd.xml 2015-10-17 07:05:10.849133263 -0300 +--- a/man/systemd.xml 2015-11-28 05:22:36.392153706 -0300 ++++ b/man/systemd.xml 2015-11-28 05:23:08.923870299 -0300 @@ -61,7 +61,7 @@ Description @@ -477,7 +478,7 @@ diff -Nur a/man/systemd.xml b/man/systemd.xml systems. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services. -@@ -858,10 +858,10 @@ +@@ -852,10 +852,10 @@ Kernel Command Line When run as system instance systemd parses a number of -- cgit v1.2.3