summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRanieri Althoff2020-01-21 17:25:51 -0300
committerRanieri Althoff2020-01-21 17:40:18 -0300
commit4c9f1dc00f957409aac21f08636ac682f507b8fb (patch)
tree9b293b8977786d1dd123d77d0d28b518a3e5575f
parentd6c01111272132bc0d7f221f17dca403815e6daa (diff)
downloadaur-4c9f1dc00f957409aac21f08636ac682f507b8fb.tar.gz
systemd-light 244.1-1
- Add clearlinux compile flags
-rw-r--r--.SRCINFO32
-rw-r--r--20-systemd-sysusers.hook2
-rw-r--r--30-systemd-binfmt.hook2
-rw-r--r--30-systemd-catalog.hook2
-rw-r--r--30-systemd-daemon-reload.hook2
-rw-r--r--30-systemd-hwdb.hook2
-rw-r--r--30-systemd-sysctl.hook2
-rw-r--r--30-systemd-tmpfiles.hook2
-rw-r--r--30-systemd-udev-reload.hook2
-rw-r--r--30-systemd-update.hook2
-rw-r--r--PKGBUILD31
11 files changed, 44 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d143600d9d..10ac5603e5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-light
- pkgver = 244
+ pkgver = 244.1
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -34,7 +34,7 @@ pkgbase = systemd-light
makedepends = cryptsetup
makedepends = libseccomp
options = strip
- source = git+https://github.com/systemd/systemd-stable#tag=ec298e702b87e2859f7f7864f51eef3360daf163?signed
+ source = git+https://github.com/systemd/systemd-stable#tag=50a79652baa8650dc2bf7fe5979e67eb673a218e?signed
source = git+https://github.com/systemd/systemd#tag=v244?signed
source = 0001-Use-Arch-Linux-device-access-groups.patch
source = initcpio-hook-udev
@@ -67,15 +67,15 @@ pkgbase = systemd-light
sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
sha512sums = 869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323
- sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763
- sha512sums = 5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8
- sha512sums = 4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb
- sha512sums = 872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2
- sha512sums = 471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d
- sha512sums = da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a
- sha512sums = 577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447
- sha512sums = e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2
- sha512sums = 209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67
+ sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5
+ sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7
+ sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc
+ sha512sums = 63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254
+ sha512sums = a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154
+ sha512sums = 9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de
+ sha512sums = da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc
+ sha512sums = a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3
+ sha512sums = 825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97
pkgname = systemd-light
pkgdesc = system and service manager
@@ -91,7 +91,7 @@ pkgname = systemd-light
depends = hwids
depends = libcap
depends = libgcrypt
- depends = systemd-light-libs=244
+ depends = systemd-light-libs=244.1
depends = libidn2
depends = libidn2.so
depends = lz4
@@ -112,10 +112,10 @@ pkgname = systemd-light
optdepends = systemd: replacement for systemd-networkd
optdepends = systemd: replacement for systemd-resolved
optdepends = systemd: replacement for systemd-timesyncd
- provides = systemd=244
+ provides = systemd=244.1
provides = nss-myhostname
- provides = systemd-tools=244
- provides = udev=244
+ provides = systemd-tools=244.1
+ provides = udev=244.1
conflicts = systemd
conflicts = nss-myhostname
conflicts = systemd-tools
@@ -146,7 +146,7 @@ pkgname = systemd-light-libs
depends = libgcrypt
depends = lz4
depends = xz
- provides = systemd-libs=244
+ provides = systemd-libs=244.1
provides = libsystemd
provides = libsystemd.so
provides = libudev.so
diff --git a/20-systemd-sysusers.hook b/20-systemd-sysusers.hook
index 9873dd40201..edc71957b78 100644
--- a/20-systemd-sysusers.hook
+++ b/20-systemd-sysusers.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Target = usr/lib/sysusers.d/*.conf
diff --git a/30-systemd-binfmt.hook b/30-systemd-binfmt.hook
index 9c31a4b162c..19f3bcc154a 100644
--- a/30-systemd-binfmt.hook
+++ b/30-systemd-binfmt.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Target = usr/lib/binfmt.d/*.conf
diff --git a/30-systemd-catalog.hook b/30-systemd-catalog.hook
index d28bddc4bbc..6e717b9a465 100644
--- a/30-systemd-catalog.hook
+++ b/30-systemd-catalog.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
diff --git a/30-systemd-daemon-reload.hook b/30-systemd-daemon-reload.hook
index 87923e86266..dff95e49747 100644
--- a/30-systemd-daemon-reload.hook
+++ b/30-systemd-daemon-reload.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
diff --git a/30-systemd-hwdb.hook b/30-systemd-hwdb.hook
index f0440b0a645..1d85e29e84c 100644
--- a/30-systemd-hwdb.hook
+++ b/30-systemd-hwdb.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
diff --git a/30-systemd-sysctl.hook b/30-systemd-sysctl.hook
index aec5ac1b0e8..e2354c0b156 100644
--- a/30-systemd-sysctl.hook
+++ b/30-systemd-sysctl.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Target = usr/lib/sysctl.d/*.conf
diff --git a/30-systemd-tmpfiles.hook b/30-systemd-tmpfiles.hook
index df60d82752e..b07db6a8432 100644
--- a/30-systemd-tmpfiles.hook
+++ b/30-systemd-tmpfiles.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Target = usr/lib/tmpfiles.d/*.conf
diff --git a/30-systemd-udev-reload.hook b/30-systemd-udev-reload.hook
index 04238bd58d3..7676cca8cda 100644
--- a/30-systemd-udev-reload.hook
+++ b/30-systemd-udev-reload.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
diff --git a/30-systemd-update.hook b/30-systemd-update.hook
index 7084a0c161c..f95d9dcc3b9 100644
--- a/30-systemd-update.hook
+++ b/30-systemd-update.hook
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
diff --git a/PKGBUILD b/PKGBUILD
index d47fd450a9c..c87ed95edba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,8 +33,8 @@ pkgbase=systemd-light
_pkgbase=${pkgbase%-light}
pkgname=('systemd-light' 'systemd-light-libs')
# Can be from either systemd or systemd-stable
-_tag='ec298e702b87e2859f7f7864f51eef3360daf163' # git rev-parse v${pkgver}
-pkgver=244
+_tag='50a79652baa8650dc2bf7fe5979e67eb673a218e' # git rev-parse v${pkgver}
+pkgver=244.1
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -78,15 +78,15 @@ sha512sums=('SKIP'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
'869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
- '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
- '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
- '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
- '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
- '471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
- 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
- '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
- 'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
- '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
+ '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
+ '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
+ '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
+ '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
+ 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'
+ '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
+ 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
+ 'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3'
+ '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
_backports=(
)
@@ -102,7 +102,7 @@ fi
[ -n "$_cryptsetup" ] && makedepends+=('cryptsetup')
if [ -n "$_clear" ]; then
- local _clrrel=268
+ local _clrrel=270
source+=("clearlinux::git+https://github.com/clearlinux-pkgs/${_pkgbase}#tag=${pkgver%.*}-${_clrrel}")
sha512sums+=('SKIP')
fi
@@ -239,6 +239,13 @@ build() {
_meson_options+=("-D${opt}=$(bool_opt "$opt" "${_security[@]}")")
done
+ if [ -n "$_clear" ]; then
+ local CFLAGS_PREFIX='-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=32 -Wl,-z,max-page-size=0x1000'
+ local CFLAGS_SUFFIX='-fno-lto -fstack-protector-strong'
+ export CFLAGS="$CFLAGS_PREFIX $CFLAGS $CFLAGS_SUFFIX"
+ export CXXFLAGS="$CFLAGS_PREFIX $CXXFLAGS $CFLAGS_SUFFIX"
+ fi
+
arch-meson "$_pkgbase-stable" build "${_meson_options[@]}"
ninja -C build