From e578f3d1c2fb293b33d94371715dfa08ca782fae Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Feb 20 2015 15:35:01 +0000 Subject: New upstream release. - allow multiple LDAP URIs in the setting again - winbind modules are now in samba-winbind package - add support for keeping myhostname in nsswitch.conf hosts entry - do not misinterpret comment for realm in krb5.conf - warn about unsupported locale, do not bail out with exception - python 3 compatibility hack for authconfig command line --- diff --git a/.gitignore b/.gitignore index 9bc6bfe..2f2b7a8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ authconfig-6.1.8.tar.bz2 /authconfig-6.2.7.tar.bz2 /authconfig-6.2.8.tar.bz2 /authconfig-6.2.9.tar.bz2 +/authconfig-6.2.10.tar.bz2 diff --git a/authconfig-6.2.10-python23.patch b/authconfig-6.2.10-python23.patch new file mode 100644 index 0000000..835f6da --- /dev/null +++ b/authconfig-6.2.10-python23.patch @@ -0,0 +1,18 @@ +diff -up authconfig-6.2.10/authconfig-gtk.py.python23 authconfig-6.2.10/authconfig-gtk.py +--- authconfig-6.2.10/authconfig-gtk.py.python23 2015-02-20 14:53:08.000000000 +0100 ++++ authconfig-6.2.10/authconfig-gtk.py 2015-02-20 16:24:39.622211432 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # -*- coding: UTF-8 -*- + # + # Authconfig - client authentication configuration program +diff -up authconfig-6.2.10/authconfig.py.python23 authconfig-6.2.10/authconfig.py +--- authconfig-6.2.10/authconfig.py.python23 2015-02-20 14:53:08.000000000 +0100 ++++ authconfig-6.2.10/authconfig.py 2015-02-20 16:24:43.425297444 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # -*- coding: UTF-8 -*- + # + # Authconfig - client authentication configuration program diff --git a/authconfig-6.2.9-ldapuri-traceback.patch b/authconfig-6.2.9-ldapuri-traceback.patch deleted file mode 100644 index 577d271..0000000 --- a/authconfig-6.2.9-ldapuri-traceback.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Tomas Mraz -# Date 1408636566 -7200 -# Thu Aug 21 17:56:06 2014 +0200 -# Node ID a3da1d6a0d306ece4a9be7ac9de70a151e7f5987 -# Parent cc798f4d1bac5c50d92566e5bae50ddde5ddb437 -Add missing parameter. - -diff -r cc798f4d1bac -r a3da1d6a0d30 authinfo.py ---- a/authinfo.py Fri Jul 25 18:13:58 2014 +0200 -+++ b/authinfo.py Thu Aug 21 17:56:06 2014 +0200 -@@ -1664,7 +1664,7 @@ - # We'll pull MD5/DES crypt ("pam_password") from the config - # file, or from the pam_unix PAM config lines. - -- self.ldapServer = self.ldapHostsToURIs(cleanList(self.ldapServer)) -+ self.ldapServer = self.ldapHostsToURIs(cleanList(self.ldapServer), False) - f.close() - return True - diff --git a/authconfig-6.2.9-myhostname.patch b/authconfig-6.2.9-myhostname.patch deleted file mode 100644 index 7f95b03..0000000 --- a/authconfig-6.2.9-myhostname.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -r 182f8c072fdc authinfo.py ---- a/authinfo.py Mon Sep 29 15:36:09 2014 +0200 -+++ b/authinfo.py Tue Nov 04 10:14:03 2014 +0100 -@@ -1330,6 +1330,7 @@ - self.enableWinbind = None - self.enableWINS = None - self.enableMDNS = None -+ self.enableMyhostname = None - self.preferDNSinHosts = None - self.enableSSSD = None - self.enableIPAv2 = None -@@ -1437,7 +1438,7 @@ - ("enableOdbcbind", "b"), ("enableNIS3", "b"), ("enableNIS", "b"), - ("enableLDAPbind", "b"), ("enableLDAP", "b"), ("enableHesiodbind", "b"), - ("enableHesiod", "b"), ("enableDBIbind", "b"), ("enableDBbind", "b"), -- ("enableCompat", "b"), ("enableWINS", "b"), ("enableMDNS", "b"), -+ ("enableCompat", "b"), ("enableWINS", "b"), ("enableMDNS", "b"), ("enableMyhostname", "b"), - ("enableNIS3", "b"), ("enableNIS", "b"), ("enableIPAv2", "b"), - ("enableSSSD", "b"), ("preferDNSinHosts", "b"), ("implicitSSSD", "b")]), - SaveGroup(self.writePAM, None, [("pwqualityArgs", "c"), ("passwdqcArgs", "c"), -@@ -2037,6 +2038,8 @@ - self.setParam("enableWINS", True, ref) - if checkNSS(value, "mdns4_minimal [NOTFOUND=return]"): - self.setParam("enableMDNS", True, ref) -+ if checkNSS(value, "myhostname"): -+ self.setParam("enableMyhostname", True, ref) - - nispos = checkNSS(value, "nis") - if nispos == None: -@@ -3650,6 +3653,8 @@ - hosts += " nis" - if not self.preferDNSinHosts: - hosts += " dns" -+ if self.enableMyhostname: -+ hosts += " myhostname" - - # Read in the old file. - for line in f.file: -@@ -4192,6 +4197,7 @@ - print "nss_sss is %s by default" % formatBool(self.enableSSSD) - print "nss_wins is %s" % formatBool(self.enableWINS) - print "nss_mdns4_minimal is %s" % formatBool(self.enableMDNS) -+ print "myhostname is %s" % formatBool(self.enableMyhostname) - print "DNS preference over NSS or WINS is %s" % formatBool(self.preferDNSinHosts) - print "pam_unix is always enabled" - print " shadow passwords are %s" % formatBool(self.enableShadow) diff --git a/authconfig.spec b/authconfig.spec index a4be9f0..79cfeed 100644 --- a/authconfig.spec +++ b/authconfig.spec @@ -1,22 +1,24 @@ Summary: Command line tool for setting up authentication from network services Name: authconfig -Version: 6.2.9 -Release: 4%{?dist} +Version: 6.2.10 +Release: 1%{?dist} License: GPLv2+ ExclusiveOS: Linux Group: System Environment/Base URL: https://fedorahosted.org/authconfig Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2 Patch1: authconfig-6.2.6-gdm-nolastlog.patch -Patch2: authconfig-6.2.9-ldapuri-traceback.patch -Patch3: authconfig-6.2.9-myhostname.patch -Requires: newt-python, pam >= 0.99.10.0, python, libpwquality > 0.9 +Patch2: authconfig-6.2.10-python23.patch +Requires: newt-python3, pam >= 0.99.10.0, libpwquality > 0.9 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0 Conflicts: nss_ldap < 254, sssd < 0.99.1 Conflicts: freeipa-client < 2.2.0, ipa-client < 2.2.0 -BuildRequires: glib2-devel, python >= 2.6, python-devel +BuildRequires: glib2-devel +BuildRequires: python2-devel +BuildRequires: python3-devel BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser Requires: /usr/bin/openssl +Requires: policycoreutils %description Authconfig is a command line utility which can configure a workstation @@ -39,17 +41,27 @@ authentication schemes. %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .nolastlog -%patch2 -p1 -b .ldapuri -%patch3 -p1 -b .myhostname +%patch2 -p1 -b .python23 + +rm -rf %{py3dir} +cp -a . %{py3dir} %build -%configure +%configure --with-python-rev=2 +make +pushd %{py3dir} +%configure --with-python-rev=3 make +popd %install make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/acutilmodule.a -rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/acutilmodule.la +pushd %{py3dir} +make install DESTDIR=$RPM_BUILD_ROOT +popd + +rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/acutil.a +rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/acutil.la rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/authconfig-tui.py ln -s authconfig.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/authconfig-tui.py @@ -84,7 +96,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_mandir}/man8/authconfig-gtk.* %{_mandir}/man8/* %{_mandir}/man5/* -%{_libdir}/python*/site-packages/acutilmodule.so +%{_libdir}/python3*/site-packages/acutil.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/authconfig.py* %{_datadir}/%{name}/authconfig-tui.py* @@ -106,6 +118,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man8/authconfig-gtk.* %{_datadir}/%{name}/authconfig.glade %{_datadir}/%{name}/authconfig-gtk.py* +%{_libdir}/python2*/site-packages/acutil.so %config(noreplace) %{_sysconfdir}/pam.d/authconfig-gtk %config(noreplace) %{_sysconfdir}/pam.d/system-config-authentication %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-gtk @@ -123,14 +136,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.* %changelog -* Tue Nov 4 2014 Tomáš Mráz - 6.2.9-4 -- add support for myhostname in nsswitch.conf hosts entry (#1151562) - -* Thu Aug 21 2014 Tomáš Mráz - 6.2.9-3 -- fix traceback when backing up LDAP (#1131168) - -* Fri Aug 15 2014 Fedora Release Engineering - 6.2.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +* Fri Feb 20 2015 Tomáš Mráz - 6.2.10-1 +- allow multiple LDAP URIs in the setting again +- winbind modules are now in samba-winbind package +- add support for keeping myhostname in nsswitch.conf hosts entry +- do not misinterpret comment for realm in krb5.conf +- warn about unsupported locale, do not bail out with exception +- python 3 compatibility for authconfig command line * Fri Jul 25 2014 Tomáš Mráz - 6.2.9-1 - support screensaver lock handling by GDM diff --git a/sources b/sources index 069f47a..e62cc86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -448bedde19f9886312ec90dd35091bf7 authconfig-6.2.9.tar.bz2 +d87bc626069b69e2231912407f857c94 authconfig-6.2.10.tar.bz2