diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b4f059 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/python-slip-0.4.0.tar.bz2 diff --git a/.python-slip.metadata b/.python-slip.metadata new file mode 100644 index 0000000..6bfb777 --- /dev/null +++ b/.python-slip.metadata @@ -0,0 +1 @@ +92a2ff3a08b180dd7b8b1e569ebbd510841c07f8 SOURCES/python-slip-0.4.0.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/fix-firwalld-logging.patch b/SOURCES/fix-firwalld-logging.patch new file mode 100644 index 0000000..d42d357 --- /dev/null +++ b/SOURCES/fix-firwalld-logging.patch @@ -0,0 +1,38 @@ +diff --git a/slip/dbus/polkit.py b/slip/dbus/polkit.py +index 08aaa51..83b6519 100644 +--- a/slip/dbus/polkit.py ++++ b/slip/dbus/polkit.py +@@ -186,17 +186,17 @@ class PolKit(object): + @property + def _interface(self): + if not PolKit.__interface: +- PolKit.__interface = dbus.Interface(self._bus.get_object( +- self._dbus_name, self._dbus_path), +- self._dbus_interface) ++ try: ++ PolKit.__interface = dbus.Interface(self._bus.get_object( ++ self._dbus_name, self._dbus_path), ++ self._dbus_interface) ++ except dbus.DBusException: ++ pass + return PolKit.__interface + + @property + def _polkit_present(self): +- try: +- return bool(self._interface) +- except dbus.DBusException: +- return False ++ return bool(self._interface) + + def __dbus_system_bus_name_uid(self, system_bus_name): + bus_object = self._bus.get_object('org.freedesktop.DBus', +@@ -237,7 +237,7 @@ class PolKit(object): + challenge=True, details={}): + + if not self._polkit_present: +- reply_handler(action_id is None or ++ return reply_handler(action_id is None or + self.__dbus_system_bus_name_uid(system_bus_name) == 0) + + flags = 0 diff --git a/SPECS/python-slip.spec b/SPECS/python-slip.spec new file mode 100644 index 0000000..3d9bbd2 --- /dev/null +++ b/SPECS/python-slip.spec @@ -0,0 +1,271 @@ +# sitelib for noarch packages, sitearch for others (remove the unneeded one) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} +%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")} + +Name: python-slip +Version: 0.4.0 +Release: 4%{?dist} +Summary: Miscellaneous convenience, extension and workaround code for Python + +Group: System Environment/Libraries +License: GPLv2+ +URL: https://github.com/nphilipp/python-slip +Source0: https://github.com/nphilipp/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +# Make firewalld to not log errors when running commands as root, +# when polkitd is not present +# Fixed upstream: https://github.com/nphilipp/python-slip/commit/39787d6773f628119876dd88bb0106e77a65201e +# Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1393488 +Patch0: fix-firwalld-logging.patch + +BuildRequires: python +BuildRequires: python-devel + +Requires: libselinux-python + +%description +The Simple Library for Python packages contain miscellaneous code for +convenience, extension and workaround purposes. + +This package provides the "slip" and the "slip.util" modules. + +%package dbus +Summary: Convenience functions for dbus services +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: dbus-python >= 0.80 +# Don't require any of pygobject2/3 because slip.dbus works with either one. In +# theory users of slip.dbus should require one or the other anyway to use the +# main loop. +# +# No hard requirement on polkit to allow minimal installs without polkit and +# its dependencies. +Conflicts: PolicyKit < 0.8-3 +Requires: python-decorator + +%description dbus +The Simple Library for Python packages contain miscellaneous code for +convenience, extension and workaround purposes. + +This package provides slip.dbus.service.Object, which is a dbus.service.Object +derivative that ends itself after a certain time without being used and/or if +there are no clients anymore on the message bus, as well as convenience +functions and decorators for integrating a dbus service with PolicyKit. + +%package gtk +Summary: Code to make auto-wrapping gtk labels +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pygtk2 + +%description gtk +The Simple Library for Python packages contain miscellaneous code for +convenience, extension and workaround purposes. + +This package provides slip.gtk.set_autowrap(), a convenience function which +lets gtk labels be automatically re-wrapped upon resizing. + +%prep +%setup -q +%patch0 -p1 + +%build +make %{?_smp_mflags} + +%install +rm -rf %buildroot +make install DESTDIR=%buildroot + +%clean +rm -rf %buildroot + +%files +%defattr(-,root,root,-) +%doc COPYING doc/dbus +%dir %{python_sitelib}/slip/ +%{python_sitelib}/slip/__init__.py* +%{python_sitelib}/slip/util +%{python_sitelib}/slip/_wrappers +%{python_sitelib}/slip-%{version}-py%{python_version}.egg-info + +%files dbus +%defattr(-,root,root,-) +%doc doc/dbus/* +%{python_sitelib}/slip/dbus +%{python_sitelib}/slip.dbus-%{version}-py%{python_version}.egg-info + +%files gtk +%defattr(-,root,root,-) +%{python_sitelib}/slip/gtk +%{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info + +%changelog +* Mon Oct 16 2017 Charalampos Stratakis - 0.4.0-4 +- Fix upstream and source URL's +Resolves: rhbz#1502397 + +* Wed Sep 13 2017 Charalampos Stratakis - 0.4.0-3 +- Make firewalld to not log errors when running commands as root +in the absence of polkitd. +Resolves: rhbz#1393488 + +* Fri Dec 27 2013 Daniel Mach - 0.4.0-2 +- Mass rebuild 2013-12-27 + +* Fri Mar 08 2013 Nils Philippsen - 0.4.0-1 +- version 0.4.0: + - get rid of (ancient) PolicyKit-0.x support + - add basic (experimental, unstable) dbus introspection support + - learn to cope with polkitd being restarted + +* Mon Nov 12 2012 Nils Philippsen - 0.2.24-1 +- dbus.polkit: fall back to unix uids if polkit is not available + +* Fri Nov 09 2012 Nils Philippsen - 0.2.23-1 +- default to classic gobject if available +- actually distribute gobject wrapper code + +* Fri Nov 09 2012 Nils Philippsen - 0.2.22-1 +- dbus: work with either gobject or gi.repository.GObject (pygobject2/3) + +* Mon Oct 22 2012 Nils Philippsen - 0.2.21-1 +- add slip.util.files.symlink_atomically() + +* Fri Nov 28 2011 Nils Philippsen - 0.2.20-1 +- revert "preserve signature, docstrings, etc. of decorated methods" (#757517) + +* Thu Nov 03 2011 Nils Philippsen - 0.2.19-1 +- allow service object methods to be called locally +- preserve signature, docstrings, etc. of decorated methods + +* Wed Oct 19 2011 Nils Philippsen - 0.2.18-1 +- actually use persistent value in Object constructor + +* Mon Jun 27 2011 Nils Philippsen - 0.2.17-1 +- fix default timeouts of None in bus objects (#716620) +- reduce proxy method calling overhead a bit more + +* Tue Jun 21 2011 Nils Philippsen - 0.2.16-1 +- actually distribute slip.dbus.constants module (#714980) + +* Mon Jun 20 2011 Nils Philippsen - 0.2.15-1 +- reduce proxy method call overhead +- fix magic value for infinite timeouts (#708761) + +* Mon Oct 11 2010 Nils Philippsen - 0.2.14-1 +- use plain "raise" in some places to ease debugging + +* Tue Aug 31 2010 Nils Philippsen - 0.2.13-1 +- revert "use tempfile.mkstemp" + +* Tue Aug 24 2010 Nils Philippsen - 0.2.12-1 +- use os.path.abspath instead of .realpath (#615819) +- use tempfile.mkstemp +- don't use hardcoded file ext separator + +* Wed Jun 30 2010 Nils Philippsen - 0.2.11-1 +- fix re-raising exceptions +- add slip.util.files.overwrite_safely() + +* Fri Jun 11 2010 Nils Philippsen - 0.2.10-1 +- add pygobject2 requirement to dbus subpackage + +* Mon Mar 22 2010 Nils Philippsen - 0.2.9-1 +- fix throwing auth fail exceptions + +* Thu Mar 11 2010 Nils Philippsen - 0.2.8-1 +- improve polkit.enable_proxy decorator + +* Thu Feb 11 2010 Nils Philippsen +- deprecate IsSystemBusNameAuthorized() + +* Tue Sep 29 2009 Nils Philippsen - 0.2.7-1 +- fix persistent service objects + +* Mon Sep 28 2009 Nils Philippsen - 0.2.6-1 +- ship all slip.dbus modules (#525790) + +* Thu Sep 24 2009 Nils Philippsen - 0.2.5-1 +- make polkit checks in dbus services non-blocking + +* Mon Sep 14 2009 Nils Philippsen +- improve example documentation + +* Tue Sep 08 2009 Nils Philippsen - 0.2.4-1 +- fix dbus example + +* Tue Sep 01 2009 Nils Philippsen - 0.2.3-1 +- add issamefile(), linkfile(), linkorcopyfile() to slip.util.files + +* Tue Sep 01 2009 Nils Philippsen - 0.2.2-1 +- add slip.util.files + +* Tue Aug 25 2009 Nils Philippsen - 0.2.1-1 +- ship slip.gtk.tools + +* Mon Aug 24 2009 Nils Philippsen - 0.2.0-1 +- use PolicyKit version 1.0 if possible (#518996) +- update and ship dbus README + +* Fri Aug 21 2009 Nils Philippsen +- require polkit >= 0.94 from F-12 on + +* Thu Nov 27 2008 Nils Philippsen - 0.1.15 +- add slip.dbus.polkit.AreAuthorizationsObtainable() + +* Mon Sep 15 2008 Nils Philippsen - 0.1.14 +- clarify examples a bit + +* Tue Sep 09 2008 Nils Philippsen - 0.1.13 +- add working examples + +* Fri Aug 29 2008 Nils Philippsen - 0.1.12 +- make slip.dbus.service.Object persistence overridable per object + +* Tue Aug 05 2008 Nils Philippsen - 0.1.11 +- implement freezing/thawing hooks + +* Tue Aug 05 2008 Nils Philippsen - 0.1.10 +- implement disabling/enabling hooks + +* Tue Aug 05 2008 Nils Philippsen - 0.1.9 +- make slip.util.hookable more flexible, easier extendable + +* Mon Aug 04 2008 Nils Philippsen - 0.1.8 +- add slip.util.hookable + +* Thu Jul 24 2008 Nils Philippsen - 0.1.7 +- fix import error (#456511) + +* Wed Jul 23 2008 Nils Philippsen - 0.1.6 +- move proxy.polkit_enable to polkit.enable_proxy +- rename polkit.NotAuthorized to NotAuthorizedException, polkit.auth_required + to require_auth + +* Tue Jul 22 2008 Nils Philippsen - 0.1.5 +- don't reset timeout on failed polkit authorizations + +* Mon Jul 21 2008 Nils Philippsen - 0.1.4 +- implement PolicyKit convenience functions and decorators +- rename slip.dbus.service.TimeoutObject -> slip.dbus.service.Object + +* Fri Jul 11 2008 Nils Philippsen - 0.1.3 +- BR: python-devel + +* Fri Jul 11 2008 Nils Philippsen - 0.1.2 +- fix more inconsistent tabs/spaces + +* Fri Jul 11 2008 Nils Philippsen - 0.1.1 +- fix inconsistent tabs/spaces + +* Tue May 27 2008 Nils Philippsen - 0.1 +- move gtk.py -> gtk/__init__.py +- rename gtk.set_autowrap () -> gtk.label_autowrap () + +* Mon May 26 2008 Nils Philippsen +- initial build