SF.net SVN: gar:[23227] csw/mgar/pkg/ansible/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sun Mar 16 10:05:09 CET 2014
Revision: 23227
http://sourceforge.net/p/gar/code/23227
Author: guengel
Date: 2014-03-16 09:05:01 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Updated to release 1.5.3.
Modified Paths:
--------------
csw/mgar/pkg/ansible/trunk/Makefile
csw/mgar/pkg/ansible/trunk/checksums
csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch
Added Paths:
-----------
csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
Modified: csw/mgar/pkg/ansible/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ansible/trunk/Makefile 2014-03-16 08:53:56 UTC (rev 23226)
+++ csw/mgar/pkg/ansible/trunk/Makefile 2014-03-16 09:05:01 UTC (rev 23227)
@@ -1,5 +1,5 @@
NAME = ansible
-VERSION = 1.3.2
+VERSION = 1.5.3
GARTYPE = v2
CATEGORIES = python
@@ -8,25 +8,29 @@
endef
GITHUB_USER = ansible
-GITHUB_REFERENCE= release1.3.2
+GITHUB_REFERENCE= release$(VERSION)
MASTER_SITES = $(GITHUB_MIRROR)
-DISTNAME = $(GITHUB_USER)-$(NAME)-9d5d88b
+DISTNAME = $(GITHUB_USER)-$(NAME)-157b783
DISTFILES = $(GITHUB_REFERENCE)$(GITHUB_BALL_EXT)
DISTFILES += README.CSW
DISTFILES += hosts.CSW
-PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch
-
PACKAGES = CSWansible
CATALOGNAME = ansible
CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy-
CHECKPKG_OVERRIDES_CSWansible += catalogname-does-not-start-with-py_
+PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch
+PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
+
# There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files.
CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_common.py
CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/callbacks.py
CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/playbook/__init__.py
CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/runner/__init__.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/basic.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py
CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml
CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client
Modified: csw/mgar/pkg/ansible/trunk/checksums
===================================================================
--- csw/mgar/pkg/ansible/trunk/checksums 2014-03-16 08:53:56 UTC (rev 23226)
+++ csw/mgar/pkg/ansible/trunk/checksums 2014-03-16 09:05:01 UTC (rev 23227)
@@ -1 +1 @@
-0191890918e43fd4771b6f51c4c94663 release1.3.2.tar.gz
+c658137ed06e7abee23abbc0a999f2af release1.5.3.tar.gz
Added: csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
===================================================================
--- csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch (rev 0)
+++ csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch 2014-03-16 09:05:01 UTC (rev 23227)
@@ -0,0 +1,28 @@
+From ccdf5dd16bf0ba322e33db0bd23ea885aebd023d Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 16 Mar 2014 09:44:48 +0100
+Subject: [PATCH] Add /etc/opt/csw/ssl/certs to the path searched for
+ .crt./.pem files.
+
+---
+ lib/ansible/module_utils/urls.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py
+index 053dfc0..049e14a 100644
+--- a/lib/ansible/module_utils/urls.py
++++ b/lib/ansible/module_utils/urls.py
+@@ -95,7 +95,9 @@ class SSLValidationHandler(urllib2.BaseHandler):
+ # build a list of paths to check for .crt/.pem files
+ # based on the platform type
+ paths_checked.append('/etc/ssl/certs')
+- if platform == 'Linux':
++ if platform == 'SunOS':
++ paths_checked.append('/etc/opt/csw/ssl/certs')
++ elif platform == 'Linux':
+ paths_checked.append('/etc/pki/ca-trust/extracted/pem')
+ paths_checked.append('/etc/pki/tls/certs')
+ paths_checked.append('/usr/share/ca-certificates/cacert.org')
+--
+1.8.4.1
+
Modified: csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch
===================================================================
--- csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch 2014-03-16 08:53:56 UTC (rev 23226)
+++ csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch 2014-03-16 09:05:01 UTC (rev 23227)
@@ -1,25 +1,25 @@
-From cd7a83573c952d9f8fc63cab2c7f5623663ecff6 Mon Sep 17 00:00:00 2001
+From a5f642e373bf88ed834feb7cc8f2d9f91ab8a247 Mon Sep 17 00:00:00 2001
From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 1 Oct 2013 16:52:39 +0200
+Date: Sun, 16 Mar 2014 09:34:08 +0100
Subject: [PATCH] Extended sbin_paths by '/opt/csw/sbin'.
---
- lib/ansible/module_common.py | 2 +-
+ lib/ansible/module_utils/basic.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/ansible/module_common.py b/lib/ansible/module_common.py
-index 55f184f..02aaf56 100644
---- a/lib/ansible/module_common.py
-+++ b/lib/ansible/module_common.py
-@@ -740,7 +740,7 @@ class AnsibleModule(object):
+diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py
+index be59185..abf0370 100644
+--- a/lib/ansible/module_utils/basic.py
++++ b/lib/ansible/module_utils/basic.py
+@@ -831,7 +831,7 @@ class AnsibleModule(object):
- opt_dirs: optional list of directories to search in addition to PATH
if found return full path; otherwise return None
'''
- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
-+ sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin', '/opt/csw/sbin']
++ sbin_paths = ['/sbin', '/usr/sbin', '/opt/csw/sbin', '/usr/local/sbin']
paths = []
for d in opt_dirs:
if d is not None and os.path.exists(d):
--
-1.8.3.4
+1.8.4.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list