diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-08-17 14:55:35 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-08-17 14:59:45 +0300 |
| commit | 6a5e2fc312f1763ce4a2ab832031662110be5929 (patch) | |
| tree | b04d22d3fd8d2061f70f7a1b3c89c62d024d60f4 | |
| parent | 73b49d5c6083c9c71cf0ec9195cf2793e556c22c (diff) | |
| download | aports-6a5e2fc312f1763ce4a2ab832031662110be5929.tar.bz2 aports-6a5e2fc312f1763ce4a2ab832031662110be5929.tar.xz | |
main/polkit: fix consolekit db stat
fixes #3594
| -rw-r--r-- | main/polkit/APKBUILD | 12 | ||||
| -rw-r--r-- | main/polkit/fix-consolekit-db-stat.patch | 30 |
2 files changed, 38 insertions, 4 deletions
diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD index 4de8ddca9b..5c1eadb8eb 100644 --- a/main/polkit/APKBUILD +++ b/main/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=polkit pkgver=0.105 -pkgrel=4 +pkgrel=5 pkgdesc="Application development toolkit for controlling system-wide privileges" url="http://www.freedesktop.org/wiki/Software/polkit/" arch="all" @@ -22,6 +22,7 @@ source="http://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.g CVE-2015-4625.patch automake.patch fix-parallel-make.patch + fix-consolekit-db-stat.patch " _builddir="$srcdir"/polkit-$pkgver @@ -75,7 +76,8 @@ a3d38d5b0bd35c066806b61cedc175d6 CVE-2015-3218.patch ff484f4397db117a6924fe6a65eb552e CVE-2015-3255.patch d18b03f6a0efe134e3c201a2c2410d33 CVE-2015-4625.patch 38dfb2ffefa4f84d64e4cd93fda145f2 automake.patch -cca56781a0ac23c0c56b5390fc8f8238 fix-parallel-make.patch" +cca56781a0ac23c0c56b5390fc8f8238 fix-parallel-make.patch +3d049fef3f78c78b9bd0a6d9e7731692 fix-consolekit-db-stat.patch" sha256sums="8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df polkit-0.105.tar.gz 80bf119937c5b75887bf6405e69e364a31e6e2edcac7957816ed7d8ea6b2a5a3 0001-Bug-50145-make-netgroup-support-optional.patch 394be8089e90ed662af0b2043fa6abdda0c062d89970ce5f5a25df8633123d5e CVE-2013-4288.patch @@ -83,7 +85,8 @@ b15b54e86195a5c87efe058cc970db69f1dddbfebd97399689fccc77794f678a CVE-2015-3218. 90b2a03cabe3a6ea5a5bab13cfb4236b8b7c6820f7a6d27786c601b0331a70e0 CVE-2015-3255.patch f34f46d445391234f75b0f92b63af70a5b9597555981dcc34bec78fd46229a98 CVE-2015-4625.patch de9e99ec691e45fc204eba576e301299952c0eb13ecedcb7399ba1b6aab94200 automake.patch -fb0352d687b4b23acace3d211d9f48635d2eae43f5a478cbdda0f1e42784f735 fix-parallel-make.patch" +fb0352d687b4b23acace3d211d9f48635d2eae43f5a478cbdda0f1e42784f735 fix-parallel-make.patch +f0de45566d1ac79c0d9256e5c36244dfc74936dbc45f2af63ce9c6893dedea52 fix-consolekit-db-stat.patch" sha512sums="7c0f84b9639814b4690e42b570285ff2018a5ea4cfd7216d9abf44c84ece6592c530f2d6211511c1346963daf4f135e9fa79d1b2f592b454115950991b5e4bc3 polkit-0.105.tar.gz 09ca9c14044c0a281e9069919efbb6d14918f23f58a282b5ce25c8a6640966396904373822869fe994c711f40c33d5c34cf3b77f85a59e239ba3d0c22a31ca8e 0001-Bug-50145-make-netgroup-support-optional.patch d6de3beb063243c11906f525ef2eb65aeca823c25b1f44dde4a16f4fc2c5ce587b129e0bfb25a4a4b88ac2bf5713c47e57700c139323d961c9f9b6ba4c03fffb CVE-2013-4288.patch @@ -91,4 +94,5 @@ d6de3beb063243c11906f525ef2eb65aeca823c25b1f44dde4a16f4fc2c5ce587b129e0bfb25a4a4 0b26b819da0b34f10ff8a768850560b3207a6e10a7141bd1aa4769c1cb2829eb110164974b99d993d4e3a62145ace0fc5375489f84d2b56fe08e3430e3232aa8 CVE-2015-3255.patch 32ecc38db938fc1e3d14ffd9c492d12a42a91750e0eb1f66f8346d0cefd6e18fd0dffac8bffc65578cfb56c9598d3b336721477e8496de2619d6d69f1a6b309e CVE-2015-4625.patch 25465a23332247d0873e24cb5f011a267413615526755a8295a6367d64fc5eb8c2aa3c9c1fdcfa183b39e3ece14f33b25f15a339d966a31f3feb861b3f17adbf automake.patch -6b0d9262ba8b3c000acdcc8c86bd6fc043e5750a0155730638d4e3a92e63f43cb476d63b11856c041d60d8f38f7eb5ada0eb0eced9100bdac3bc2c7dd5108ddd fix-parallel-make.patch" +6b0d9262ba8b3c000acdcc8c86bd6fc043e5750a0155730638d4e3a92e63f43cb476d63b11856c041d60d8f38f7eb5ada0eb0eced9100bdac3bc2c7dd5108ddd fix-parallel-make.patch +95493ef842b46ce9e724933a5d86083589075fb452435057b8f629643cac7c7eff67a24fd188087987e98057f0130757fad546d0c090767da3d71ebaf8485a24 fix-consolekit-db-stat.patch" diff --git a/main/polkit/fix-consolekit-db-stat.patch b/main/polkit/fix-consolekit-db-stat.patch new file mode 100644 index 0000000000..3deceb6396 --- /dev/null +++ b/main/polkit/fix-consolekit-db-stat.patch @@ -0,0 +1,30 @@ +--- polkit-0.105.orig/src/polkitbackend/polkitbackendsessionmonitor.c 2012-04-24 19:05:34.000000000 +0300 ++++ polkit-0.105/src/polkitbackend/polkitbackendsessionmonitor.c 2015-08-17 14:50:51.428580856 +0300 +@@ -47,7 +47,7 @@ struct _PolkitBackendSessionMonitor + + GKeyFile *database; + GFileMonitor *database_monitor; +- time_t database_mtime; ++ struct timespec database_mtim; + }; + + struct _PolkitBackendSessionMonitorClass +@@ -95,7 +95,7 @@ reload_database (PolkitBackendSessionMon + goto out; + } + +- monitor->database_mtime = statbuf.st_mtime; ++ monitor->database_mtim = statbuf.st_mtim; + + monitor->database = g_key_file_new (); + if (!g_key_file_load_from_file (monitor->database, +@@ -131,7 +131,8 @@ ensure_database (PolkitBackendSessionMon + strerror (errno)); + goto out; + } +- if (statbuf.st_mtime == monitor->database_mtime) ++ if (statbuf.st_mtim.tv_sec == monitor->database_mtim.tv_sec && ++ statbuf.st_mtim.tv_nsec == monitor->database_mtim.tv_nsec) + { + ret = TRUE; + goto out; |