summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEttore Di Giacinto <mudler@gentoo.org>2017-06-26 23:07:51 +0200
committerEttore Di Giacinto <mudler@gentoo.org>2017-06-26 23:17:40 +0200
commitaa0210884756d6af2bffb67b3770caf5b707db6c (patch)
treedd5aa3ccc84a6cc9f7e549e46c0227850269d8bb /app-admin/packagekit-base
parentapp-text/libmwaw: Fix CVE-2017-9433 (diff)
downloadgentoo-aa0210884756d6af2bffb67b3770caf5b707db6c.tar.gz
gentoo-aa0210884756d6af2bffb67b3770caf5b707db6c.tar.bz2
gentoo-aa0210884756d6af2bffb67b3770caf5b707db6c.zip
app-admin/packagekit-base: Revision bump (bug #622104)
Temporary workaround to fix elogind support patch. Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=622104 Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'app-admin/packagekit-base')
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-elogind-support.patch6
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild (renamed from app-admin/packagekit-base/packagekit-base-1.1.5-r1.ebuild)0
2 files changed, 4 insertions, 2 deletions
diff --git a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
index bed2a0de4494..df7675761d49 100644
--- a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
@@ -21,7 +21,7 @@
AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
fi
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
-@@ -267,6 +266,22 @@
+@@ -267,6 +266,24 @@
AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
dnl ---------------------------------------------------------------------------
@@ -31,12 +31,14 @@
+ enable_elogind=$enableval,enable_elogind=no)
+if test x$enable_elogind = xyes; then
+ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no])
++else
++ have_elogind=no
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl --- Is systemd/sd-login.h, either from systemd or elogind, available?
+dnl ---------------------------------------------------------------------------
-+if test "x$have_systemd" != "xno" -o "x$have_elogind" != "xno" ; then
++if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then
+ AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
+fi
+
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.5-r1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild
index 9d6f36571e9d..9d6f36571e9d 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.5-r1.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild