diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-01-31 16:56:06 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-31 19:04:58 +0100 |
| commit | 4e18df5d03138cc1b721fac73c607252369f37b9 (patch) | |
| tree | 97eff7b0ea14f5a3176f10710c7ad158c9ed6559 | |
| parent | f539858521fee896974c1941c0b6d56c97729e8a (diff) | |
| download | aports-4e18df5d03138cc1b721fac73c607252369f37b9.tar.bz2 aports-4e18df5d03138cc1b721fac73c607252369f37b9.tar.xz | |
community/elogind: upgrade to 243.4
| -rw-r--r-- | community/elogind/APKBUILD | 12 | ||||
| -rw-r--r-- | community/elogind/reverse_CLOSE_ON_EXEC_removal.patch | 14 | ||||
| -rw-r--r-- | community/elogind/reverse_DISABLE_BUFFER_in_cg_attach.patch | 13 |
3 files changed, 4 insertions, 35 deletions
diff --git a/community/elogind/APKBUILD b/community/elogind/APKBUILD index bdd285b0ed..144546d5fe 100644 --- a/community/elogind/APKBUILD +++ b/community/elogind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Leo <thinkabit.ukim@gmail.com> pkgname=elogind -pkgver=241.4 +pkgver=243.4 pkgrel=0 pkgdesc="Standalone fork of systemd's elogind" url="https://github.com/elogind/elogind" @@ -11,6 +11,7 @@ depends="dbus shadow" options="!check" # Tests fail on builders makedepends=" meson + coreutils docbook-xsl gettext-dev git @@ -34,10 +35,7 @@ subpackages=" lib$pkgname:libs $pkgname-zsh-completion:zshcomp:noarch $pkgname-bash-completion:bashcomp:noarch" -source=" - $pkgname-$pkgver.tar.gz::https://github.com/elogind/elogind/archive/v$pkgver.tar.gz - reverse_DISABLE_BUFFER_in_cg_attach.patch - reverse_CLOSE_ON_EXEC_removal.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/elogind/elogind/archive/v$pkgver.tar.gz" build() { [ "$CARCH" == "s390x" ] && export CFLAGS="$CFLAGS -D__IGNORE_pkey_mprotect -DSO_PEERSEC=31" @@ -90,6 +88,4 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share } -sha512sums="e1685ac81028eab4a4cf63c7b962ae85f07bc0e39b2562934f863bfdf39417445c432fab5454e7c64b337ab62d95fb69abbe1139464a059a86fb485ed0534ad8 elogind-241.4.tar.gz -52db50ddd1002736fbbbacb1f8142c624cd78d0177bdc6b5669a54b2e59250903bc1b2639333b0563e382b86cf10cd06f159e9391f7e9224932bebfff3056f60 reverse_DISABLE_BUFFER_in_cg_attach.patch -46799574b42eb0974f1648f703e86215571e040463c2957b9aca01b14924677d33d17d68680dafcde6d269062e23be001231d39f0c92e078a8b89c4e531447bb reverse_CLOSE_ON_EXEC_removal.patch" +sha512sums="9751a3d0ed65dd73d9363097ee1752d437d5636db2a4137395596e0c81e04d4715f314568d1d7c6f367f1ecbda011086cb165bd4dc207302626b16e693cd0a02 elogind-243.4.tar.gz" diff --git a/community/elogind/reverse_CLOSE_ON_EXEC_removal.patch b/community/elogind/reverse_CLOSE_ON_EXEC_removal.patch deleted file mode 100644 index 98f1fdbcf7..0000000000 --- a/community/elogind/reverse_CLOSE_ON_EXEC_removal.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/basic/fileio.c b/src/basic/fileio.c -index e981cd024..ffcbf7309 100644 ---- a/src/basic/fileio.c -+++ b/src/basic/fileio.c -@@ -156,7 +156,7 @@ int write_string_file_ts( - goto fail; - } - -- f = fdopen(fd, "w"); -+ f = fdopen(fd, "we"); - if (!f) { - r = -errno; - safe_close(fd); - diff --git a/community/elogind/reverse_DISABLE_BUFFER_in_cg_attach.patch b/community/elogind/reverse_DISABLE_BUFFER_in_cg_attach.patch deleted file mode 100644 index b9017dcc01..0000000000 --- a/community/elogind/reverse_DISABLE_BUFFER_in_cg_attach.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 9235361b6..11102790e 100644 ---- a/src/basic/cgroup-util.c -+++ b/src/basic/cgroup-util.c -@@ -824,7 +824,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { - - xsprintf(c, PID_FMT "\n", pid); - -- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, c, 0); - if (r < 0) - return r; - |