diff --git a/polkit-0.104.tar.gz b/polkit-0.104.tar.gz new file mode 100644 index 0000000..b42da34 --- /dev/null +++ b/polkit-0.104.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9 +size 1416583 diff --git a/polkit-0.107.tar.gz b/polkit-0.107.tar.gz deleted file mode 100644 index e9f11f2..0000000 --- a/polkit-0.107.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c826973db2b226dc8f807af5143f7b8be5d0270f46c0c1241a83b067db9d8311 -size 1383089 diff --git a/polkit-no-wheel-group.patch b/polkit-no-wheel-group.patch index 826bcd0..af7a817 100644 --- a/polkit-no-wheel-group.patch +++ b/polkit-no-wheel-group.patch @@ -1,11 +1,10 @@ -Index: polkit-0.107/src/polkitbackend/50-default.rules +Index: polkit-0.104/src/polkitbackend/50-localauthority.conf =================================================================== ---- polkit-0.107.orig/src/polkitbackend/50-default.rules -+++ polkit-0.107/src/polkitbackend/50-default.rules -@@ -8,5 +8,5 @@ - // about configuring polkit. +--- polkit-0.104.orig/src/polkitbackend/50-localauthority.conf ++++ polkit-0.104/src/polkitbackend/50-localauthority.conf +@@ -7,4 +7,4 @@ + # - polkit.addAdminRule(function(action, subject) { -- return ["unix-group:wheel"]; -+ return ["unix-user:0"]; - }); + [Configuration] +-AdminIdentities=unix-group:wheel ++AdminIdentities=unix-user:0 diff --git a/polkit-suid_flags.patch b/polkit-suid_flags.patch index d9b0bc5..5c7e741 100644 --- a/polkit-suid_flags.patch +++ b/polkit-suid_flags.patch @@ -44,8 +44,8 @@ index e8c9fb1..f0f8419 100644 + $(NULL) + if HAVE_INTROSPECTION - girdir = $(INTROSPECTION_GIRDIR) + gir_DATA = PolkitAgent-1.0.gir diff --git a/src/programs/Makefile.am b/src/programs/Makefile.am index c260dee..6aac06b 100644 --- a/src/programs/Makefile.am diff --git a/polkit.changes b/polkit.changes index 9dd81e7..36aeff4 100644 --- a/polkit.changes +++ b/polkit.changes @@ -1,45 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 25 09:05:02 UTC 2012 - vuntz@opensuse.org - -- Use %{_localstatedir}/lib/polkit for $HOME of polkit user, - instead of %{_libexecdir}/polkit-1. The directory is manually - created in %install. - -------------------------------------------------------------------- -Fri Sep 14 18:20:06 UTC 2012 - vuntz@opensuse.org - -- Update to version 0.107: - + Try harder to look up the right localization - + Introduce a polkit.Result enumeration for authorization rules - + pkexec: add support for argv1 annotation and mention - shebang-wrappers - + doc: update guidance on situations where there is no polkit - authority -- Changes from version 0.106: - + Major change: switch from .pkla files (keyfile-format) to - .rules files (JavaScript) - + Nuke polkitbackend library, localauthority backend and - extension system - + Run polkitd as an unprivileged user - + Add a systemd .service file - + Several other code changes. - + Updated documentation. -- Changes from version 0.105: - + Add pkttyagent(1) helper - + Make it possible to influence agent registration with an a{sv} - parameter - + Several other code changes. -- Add pkgconfig(mozjs185) BuildRequires: new dependency for the - authority backend. -- Rebase polkit-no-wheel-group.patch: the admin configuration is - now in a .rules file. -- Rebase polkit-suid_flags.patch. -- Explicitly pass --enable-libsystemd-login or - --disable-libsystemd-login, depending on whether we build systemd - support. -- Add a %pre script to create the polkitd group and user, as - polkitd now run as an unprivileged user. - ------------------------------------------------------------------- Wed Aug 22 15:52:30 UTC 2012 - meissner@suse.com diff --git a/polkit.spec b/polkit.spec index ca8bd4b..157c987 100644 --- a/polkit.spec +++ b/polkit.spec @@ -22,11 +22,11 @@ Name: polkit Summary: PolicyKit Authorization Framework License: LGPL-2.1+ Group: System/Libraries -Version: 0.107 +Version: 0.104 Release: 0 Url: http://www.freedesktop.org/wiki/Software/PolicyKit BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz +Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-OPENSUSE polkit-no-wheel-group.patch vuntz@opensuse.org -- In openSUSE, there's no special meaning for the wheel group, so we shouldn't allow it to be admin Patch0: polkit-no-wheel-group.patch @@ -36,7 +36,7 @@ Patch1: polkit-suid_flags.patch BuildRequires: autoconf # needed for patch1 BuildRequires: automake -BuildRequires: glib2-devel >= 2.30.0 +BuildRequires: glib2-devel >= 2.25.12 BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: gtk-doc # gtk-doc drags indirectyly ruby in for one of the helpers. This in turn causes a build cycle. @@ -49,7 +49,6 @@ BuildRequires: pam-devel %if 0%{?with_systemd} BuildRequires: systemd-devel %endif -BuildRequires: pkgconfig(mozjs185) PreReq: permissions Requires: ConsoleKit Requires: dbus-1 @@ -127,29 +126,22 @@ export SUID_LDFLAGS="-z now -pie" --disable-static \ --enable-introspection \ --enable-examples \ -%if 0%{?with_systemd} - --enable-libsystemd-login \ -%else - --disable-libsystemd-login \ -%endif - --libexecdir=%{_libexecdir}/polkit-1 + --libexecdir=%{_prefix}/lib/polkit-1 make %{?_smp_mflags} %install -%make_install -rm $RPM_BUILD_ROOT%{_libdir}/*.la -# create $HOME for polkit user -install -d %{buildroot}%{_localstatedir}/lib/polkit +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la +# For some reason, "smart" parts of the build are _sometimes_ +# not smart enough to handle a 0700 directory. We set that back to +# the proper original value in the %file list +chmod 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/polkit-1 %find_lang polkit-1 %clean rm -rf $RPM_BUILD_ROOT -%pre -getent group polkitd > /dev/null || groupadd -r polkitd -getent passwd polkitd > /dev/null || useradd -r -g polkitd -d %{_localstatedir}/lib/polkit -s /sbin/nologin -c "User for polkitd" polkitd -exit 0 - %post %set_permissions %{_bindir}/pkexec %set_permissions %{_prefix}/lib/polkit-1/polkit-agent-helper-1 @@ -164,8 +156,7 @@ exit 0 %files -n libpolkit0 %defattr(-,root,root,-) -%{_libdir}/libpolkit-agent-1.so.* -%{_libdir}/libpolkit-gobject-1.so.* +%{_libdir}/lib*.so.* %files -n typelib-1_0-Polkit-1_0 %defattr(-,root,root,-) @@ -175,43 +166,48 @@ exit 0 %files -f polkit-1.lang %defattr(-,root,root,-) %doc COPYING -%{_mandir}/man1/pkexec.1%{?ext_man} -%{_mandir}/man1/pkaction.1%{?ext_man} -%{_mandir}/man1/pkcheck.1%{?ext_man} -%{_mandir}/man1/pkttyagent.1%{?ext_man} -%{_mandir}/man8/polkitd.8%{?ext_man} -%{_mandir}/man8/polkit.8%{?ext_man} +%dir %{_libdir}/polkit-1 +%dir %{_libdir}/polkit-1/extensions +%{_libdir}/polkit-1/extensions/*.so +%{_datadir}/man/man1/pkexec.1.gz +%{_datadir}/man/man1/pkaction.1.gz +%{_datadir}/man/man1/pkcheck.1.gz +%{_datadir}/man/man8/polkitd.8.gz +%{_datadir}/man/man8/polkit.8.gz +%{_datadir}/man/man8/pklocalauthority.8.gz %dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/system-services -%{_datadir}/dbus-1/system-services/org.freedesktop.PolicyKit1.service +%{_datadir}/dbus-1/system-services %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/org.freedesktop.policykit.policy -%dir %{_datadir}/polkit-1/rules.d %dir %{_sysconfdir}/dbus-1 %dir %{_sysconfdir}/dbus-1/system.d %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %config(noreplace) %{_sysconfdir}/pam.d/polkit-1 %dir %{_sysconfdir}/polkit-1 -%dir %{_sysconfdir}/polkit-1/rules.d -%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/50-default.rules +%dir %{_sysconfdir}/polkit-1/nullbackend.conf.d +%config(noreplace) %{_sysconfdir}/polkit-1/nullbackend.conf.d/50-nullbackend.conf +%attr(0700,root,root) %dir %{_sysconfdir}/polkit-1/localauthority +%dir %{_sysconfdir}/polkit-1/localauthority/10-vendor.d +%dir %{_sysconfdir}/polkit-1/localauthority/20-org.d +%dir %{_sysconfdir}/polkit-1/localauthority/30-site.d +%dir %{_sysconfdir}/polkit-1/localauthority/50-local.d +%dir %{_sysconfdir}/polkit-1/localauthority/90-mandatory.d +%dir %{_sysconfdir}/polkit-1/localauthority.conf.d +%config(noreplace) %{_sysconfdir}/polkit-1/localauthority.conf.d/50-localauthority.conf %{_bindir}/pkaction %{_bindir}/pkcheck %verify(not mode) %attr(4755,root,root) %{_bindir}/pkexec -%{_bindir}/pkttyagent -%dir %{_libexecdir}/polkit-1 -%{_libexecdir}/polkit-1/polkitd +%dir %{_prefix}/lib/polkit-1 +%{_prefix}/lib/polkit-1/polkitd %verify(not mode) %attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1 -# $HOME for polkit user -%dir %{_localstatedir}/lib/polkit +%attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1 %files devel %defattr(-,root,root,-) -%{_libdir}/libpolkit-agent-1.so -%{_libdir}/libpolkit-gobject-1.so -%{_libdir}/pkgconfig/polkit-agent-1.pc -%{_libdir}/pkgconfig/polkit-gobject-1.pc -%{_includedir}/polkit-1/ +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc +%{_includedir}/* %{_bindir}/pk-example-frobnicate %{_datadir}/gir-1.0/*.gir %{_datadir}/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy @@ -219,6 +215,6 @@ exit 0 %files doc %defattr(-,root,root,-) %doc NEWS -%doc %{_datadir}/gtk-doc/html/polkit-1/ +%{_datadir}/gtk-doc/html/* %changelog