2.11.0-alt1

.gear/privacyidea-pam.spec

@@ -2,13 +2,13 @@
 
 Name: python-module-%oname
 Version: 2.11.0
-Release: alt1
+Release: alt2
 
 License: AGPLv3
 Group: Development/Python
 Url: https://github.com/privacyidea/pam_python
 
-Summary: This module is to be used with http://pam-python.sourceforge.net/. It can be used to authenticate with OTP against privacyIDEA. It will also cache future OTP values to enable offline authentication.
+Summary: This module is to be used with http://pam-python.sourceforge.net/. It can be used to authenticate with OTP against privacyIDEA. It will also cache future OTP values to enable offline authentication. 
 
 Packager: Eugene Omelyanovich <regatio@etersoft.ru>
 
@@ -22,12 +22,17 @@ BuildRequires(pre): rpm-build-intro
 BuildRequires: python >= 2.7
 BuildRequires: python-module-responses >= 0.10.9
 BuildRequires: python-module-passlib
+BuildRequires: python-module-requests
+Requires: pam_python
+Patch1: fix-python2.7.patch
 
 %description
 This module is to be used with http://pam-python.sourceforge.net/. It can be used to authenticate with OTP against privacyIDEA. It will also cache future OTP values to enable offline authentication.
 
 %prep
 %setup
+mkdir -p %buildroot/etc/privacyidea
+%patch1 -p1
 
 %build
 %python_build
@@ -42,11 +47,5 @@ This module is to be used with http://pam-python.sourceforge.net/. It can be use
 %python_sitelibdir/*
 
 %changelog
-<<<<<<< HEAD
-* Sun Feb 16 2020 Eugene Omelyanovich <regatio@etersoft.ru> 2.11.0-alt1
-- new version
-
-=======
->>>>>>> 2350a79... Edited spec file
-* Sat Feb 15 2020 Eugene Omelyanovich <regatio@etersoft.ru> 2.11-alt1
-- initial build for ALT Sisyphus
+* Fri Mar 27 2020 Eugene Omelyanovich <regatio@etersoft.ru> 2.11.0-alt2
+- added fix-python2.7.patch to resolve path issues

.gear/rules

 tar: .
-spec: .gear/pam_python.spec
\ No newline at end of file
+spec: .gear/privacyidea-pam.spec
+copy?: *.patch

fix-python2.7.patch

+diff --git a/privacyidea_pam.py b/privacyidea_pam.py
+index 1d1ab98..48412b4 100644
+--- a/privacyidea_pam.py
++++ b/privacyidea_pam.py
+@@ -39,9 +39,14 @@ privacyIDEA authentication system.
+ The code is tested in test_pam_module.py
+ """
+ 
++import sys
++sys.path.append('/usr/lib/python2.7/site-packages/')
++import urllib3
+ import json
+ import requests
+ import syslog
++urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+ import sqlite3
+ import passlib.hash
+ import time
+@@ -486,4 +491,3 @@ def _create_table(c):
+         c.execute("CREATE TABLE refilltokens (serial text, refilltoken text)")
+     except sqlite3.OperationalError:
+         pass
+-