SF.net SVN: gar:[25551] csw/mgar/pkg/ansible/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Feb 5 20:30:51 CET 2016


Revision: 25551
          http://sourceforge.net/p/gar/code/25551
Author:   dmichelsen
Date:     2016-02-05 19:30:50 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
ansible/trunk: Make the patches apply again

Modified Paths:
--------------
    csw/mgar/pkg/ansible/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
    csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch

Removed Paths:
-------------
    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-Extended-sbin_paths-by-opt-csw-sbin.patch

Modified: csw/mgar/pkg/ansible/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ansible/trunk/Makefile	2016-02-05 17:04:31 UTC (rev 25550)
+++ csw/mgar/pkg/ansible/trunk/Makefile	2016-02-05 19:30:50 UTC (rev 25551)
@@ -4,19 +4,14 @@
 CATEGORIES = python
 
 DESCRIPTION = Deploy, manage, and orchestrate computer systems
-define BLURB
-endef
 
 MASTER_SITES += http://releases.ansible.com/ansible/
 DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += hosts.CSW
 
-# The .git makes the build system think we have a checkout out repo and not a tarball
-NOGITPATCH = 1
+PATCHFILES += 0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
+PATCHFILES += 0002-Extended-sbin_paths-by-opt-csw-sbin.patch
 
-# PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch
-# PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
-
 PACKAGES += CSWansible
 # Stick with upstream naming
 CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy-
@@ -33,11 +28,12 @@
 RUNTIME_DEP_PKGS_CSWansible += CSWpy-ecdsa
 RUNTIME_DEP_PKGS_CSWansible += CSWsshpass
 # checkpkg cannot detect these
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2
 CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe
 CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml
-CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-paramiko
 CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client
-CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-ecdsa
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWsshpass
 
 # 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.7/site-packages/ansible/module_utils/basic.py
@@ -65,24 +61,22 @@
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/facts.py  
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/utils/display.py  
 
-#REINPLACEMENTS += etc
-#REINPLACE_MATCH_etc = /etc/ansible
-#REINPLACE_WITH_etc  = $(sysconfdir)/ansible
+REINPLACEMENTS += etc
+REINPLACE_MATCH_etc = /etc/ansible
+REINPLACE_WITH_etc  = $(sysconfdir)/ansible
 
-#REINPLACE_FILES_etc += bin/ansible-galaxy
-#REINPLACE_FILES_etc += lib/ansible/constants.py
-#REINPLACE_FILES_etc += lib/ansible/module_utils/urls.py
-#REINPLACE_FILES_etc += lib/ansible/modules/core/system/setup.py
-#REINPLACE_FILES_etc += lib/ansible/playbook/__init__.py
-#REINPLACE_FILES_etc += plugins/inventory/nova.py
-#REINPLACE_FILES_etc += plugins/inventory/openstack.py
-#REINPLACE_FILES_etc += docs/man/man1/ansible.1.asciidoc.in
-#REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1
-#REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1.asciidoc.in
-#REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1
-#REINPLACE_FILES_etc += docs/man/man1/ansible.1
-#REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1.asciidoc.in
-#REINPLACE_FILES_etc += examples/ansible.cfg
+REINPLACE_FILES_etc += lib/ansible/constants.py
+REINPLACE_FILES_etc += lib/ansible/modules/core/files/replace.py
+REINPLACE_FILES_etc += lib/ansible/modules/core/files/lineinfile.py
+REINPLACE_FILES_etc += lib/ansible/plugins/callback/log_plays.py
+REINPLACE_FILES_etc += contrib/inventory/collins.py
+REINPLACE_FILES_etc += contrib/inventory/spacewalk.py
+REINPLACE_FILES_etc += contrib/inventory/linode.py
+REINPLACE_FILES_etc += contrib/inventory/cobbler.py
+REINPLACE_FILES_etc += docs/man/man1/ansible.1.asciidoc.in
+REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1.asciidoc.in
+REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1.asciidoc.in
+REINPLACE_FILES_etc += examples/ansible.cfg
 
 REINPLACE_USRSHARE += lib/ansible/constants.py
 REINPLACE_USRSHARE += lib/ansible/modules/extras/packaging/elasticsearch_plugin.py
@@ -98,11 +92,6 @@
 PRESERVECONF += $(sysconfdir)/ansible/hosts
 PRESERVECONF += $(sysconfdir)/ansible/ansible.cfg
 
-#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/utils/display.py
-#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/facts.py
-#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py
-#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/system/osx_defaults.py
-
 include gar/category.mk
 
 post-install:

Copied: csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch (from rev 25550, 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/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch	                        (rev 0)
+++ csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch	2016-02-05 19:30:50 UTC (rev 25551)
@@ -0,0 +1,25 @@
+From 41e1ab8efa20dcf7fd7d4ed7f9b41faa726ea58c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 5 Feb 2016 20:08:46 +0100
+Subject: [PATCH] Add /etc/opt/csw/ssl/certs to the path searched for
+ .crt./.pem files.
+
+---
+ lib/ansible/module_utils/urls.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py
+index 41613f6..a6786cc 100644
+--- a/lib/ansible/module_utils/urls.py
++++ b/lib/ansible/module_utils/urls.py
+@@ -463,6 +463,7 @@ class SSLValidationHandler(urllib2.BaseHandler):
+         elif system == 'NetBSD':
+             ca_certs.append('/etc/openssl/certs')
+         elif system == 'SunOS':
++            paths_checked.append('/etc/opt/csw/ssl/certs')
+             paths_checked.append('/opt/local/etc/openssl/certs')
+ 
+         # fall back to a user-deployed cert in a standard
+-- 
+2.4.0
+

Copied: csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch (from rev 25302, csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch)
===================================================================
--- csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch	                        (rev 0)
+++ csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch	2016-02-05 19:30:50 UTC (rev 25551)
@@ -0,0 +1,25 @@
+From 5665941f9f67a754f5201b1fa4d7a7d45305f65a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 5 Feb 2016 20:12:20 +0100
+Subject: [PATCH] Extended sbin_paths by '/opt/csw/sbin'.
+
+---
+ lib/ansible/module_utils/basic.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py
+index e21930b..f653980 100644
+--- a/lib/ansible/module_utils/basic.py
++++ b/lib/ansible/module_utils/basic.py
+@@ -1466,7 +1466,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', '/opt/csw/sbin', '/usr/local/sbin']
+         paths = []
+         for d in opt_dirs:
+             if d is not None and os.path.exists(d):
+-- 
+2.4.0
+

Deleted: 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	2016-02-05 17:04:31 UTC (rev 25550)
+++ csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch	2016-02-05 19:30:50 UTC (rev 25551)
@@ -1,28 +0,0 @@
-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
-

Deleted: 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	2016-02-05 17:04:31 UTC (rev 25550)
+++ csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch	2016-02-05 19:30:50 UTC (rev 25551)
@@ -1,25 +0,0 @@
-From a5f642e373bf88ed834feb7cc8f2d9f91ab8a247 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Sun, 16 Mar 2014 09:34:08 +0100
-Subject: [PATCH] Extended sbin_paths by '/opt/csw/sbin'.
-
----
- lib/ansible/module_utils/basic.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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', '/opt/csw/sbin', '/usr/local/sbin']
-         paths = []
-         for d in opt_dirs:
-             if d is not None and os.path.exists(d):
--- 
-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