Commit 6fbcc6cd authored by David Zeuthen's avatar David Zeuthen

Store private binaries in /usr/lib/polkit-1 instead of /usr/libexec

Signed-off-by: default avatarDavid Zeuthen <davidz@redhat.com>
parent 56293fa4
......@@ -515,15 +515,7 @@ echo "
"
echo "NOTE: The directory ${sysconfdir}/polkit-1/localauthority must be owned"
echo " by root and have mode 700"
echo
echo "NOTE: The directory ${localstatedir}/lib/polkit-1 must be owned"
echo " by root and have mode 700"
echo
echo "NOTE: The file ${libexecdir}/polkit-agent-helper-1 must be owned"
echo "NOTE: The file ${prefix}/lib/polkit-1/polkit-agent-helper-1 must be owned"
echo " by root and have mode 4755 (setuid root binary)"
echo
......
......@@ -2,12 +2,14 @@
NULL =
libprivdir = $(prefix)/lib/polkit-1
servicedir = $(datadir)/dbus-1/system-services
service_in_files = org.freedesktop.PolicyKit1.service.in
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@sed -e "s|\@libprivdir\@|$(libprivdir)|" $< > $@
dbusconfdir = $(sysconfdir)/dbus-1/system.d
dbusconf_DATA = org.freedesktop.PolicyKit1.conf
......@@ -27,7 +29,7 @@ if HAVE_SYSTEMD
systemdservicedir = $(systemdsystemunitdir)
systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
$(systemdservice_DATA): $(systemdservice_in_files) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@sed -e "s|\@libprivdir\@|$(libprivdir)|" $< > $@
endif
CLEANFILES = $(BUILT_SOURCES)
......
[D-BUS Service]
Name=org.freedesktop.PolicyKit1
Exec=@libexecdir@/polkitd --no-debug
Exec=@libprivdir@/polkitd --no-debug
User=root
SystemdService=polkit.service
......@@ -5,4 +5,4 @@ Documentation=man:polkit(8)
[Service]
Type=dbus
BusName=org.freedesktop.PolicyKit1
ExecStart=@libexecdir@/polkitd --no-debug
ExecStart=@libprivdir@/polkitd --no-debug
......@@ -5,6 +5,7 @@ INCLUDES = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src/polkit \
-I$(top_srcdir)/src/polkit \
-DPACKAGE_PREFIX=\""$(prefix)"\" \
-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
......@@ -77,7 +78,8 @@ libpolkit_agent_1_la_LIBADD = \
libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
libexec_PROGRAMS = polkit-agent-helper-1
libprivdir = $(prefix)/lib/polkit-1
libpriv_PROGRAMS = polkit-agent-helper-1
polkit_agent_helper_1_SOURCES = \
polkitagenthelperprivate.c polkitagenthelperprivate.h \
......@@ -132,9 +134,9 @@ endif # HAVE_INTROSPECTION
# authenticate not only the invoking user, but possibly also root
# and/or other users.
#
install-exec-hook:
-chown root $(DESTDIR)$(libexecdir)/polkit-agent-helper-1
-chmod 4755 $(DESTDIR)$(libexecdir)/polkit-agent-helper-1
install-data-hook:
-chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1
-chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1
EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template
......
......@@ -620,7 +620,7 @@ polkit_agent_session_initiate (PolkitAgentSession *session)
goto error;
}
helper_argv[0] = PACKAGE_LIBEXEC_DIR "/polkit-agent-helper-1";
helper_argv[0] = PACKAGE_PREFIX "/lib/polkit-1/polkit-agent-helper-1";
helper_argv[1] = passwd->pw_name;
helper_argv[2] = session->cookie;
helper_argv[3] = NULL;
......
......@@ -14,7 +14,8 @@ INCLUDES = \
-D_REENTRANT \
$(NULL)
libexec_PROGRAMS = polkitd
libprivdir = $(prefix)/lib/polkit-1
libpriv_PROGRAMS = polkitd
polkitd_SOURCES = \
main.c \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment