Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22992951 Update puppetlabs-ntp to 4.1.2
authorPatrick Einheber <patrick.einheber@oracle.com>
Fri, 01 Apr 2016 10:05:32 -0700
changeset 5700 17ffcc22cc1b
parent 5699 8ec3c661dd58
child 5701 1409c5c63ef9
22992951 Update puppetlabs-ntp to 4.1.2
components/ruby/puppet-modules/puppetlabs-ntp/Makefile file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-ntp/patches/01-metadata.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-ntp/patches/02-params.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m file | annotate | diff | comparison | revisions 
--- a/components/ruby/puppet-modules/puppetlabs-ntp/Makefile	Fri Apr 01 09:37:44 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-ntp/Makefile	Fri Apr 01 10:05:32 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		puppetlabs-ntp
-COMPONENT_VERSION=	3.3.0
+COMPONENT_VERSION=	4.1.2
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:d6b677cf6a3701aa95bee2b688dd975dbc93d20435ef2642de38cec7c930f8e3
+    sha256:9f1073328fb4cb9c0d76a54cc14bc5bc3e729031a6721a85e2d88c331745f357
 COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
 COMPONENT_BUGDB=	utility/puppet
 
-TPNO=			24143
+TPNO=			27492
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/puppetlabs-ntp/patches/01-metadata.patch	Fri Apr 01 09:37:44 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-ntp/patches/01-metadata.patch	Fri Apr 01 10:05:32 2016 -0700
@@ -1,24 +1,13 @@
-Patch to add Solaris 12 to the list of supported OSes.  This patch has
-been submitted upstream.
+Patch to add Solaris 12 to the list of supported OSes.  This patch is a
+remnant of one that has been submitted upstream.  Part of the submission 
+seems to have made it upstream but not this remaining part.
 
---- puppetlabs-ntp-3.3.0/metadata.json.orig	2015-05-13 13:43:49.611523104 -0600
-+++ puppetlabs-ntp-3.3.0/metadata.json	2015-05-13 13:44:30.682302981 -0600
-@@ -66,7 +66,8 @@
-     {
-       "operatingsystem": "Solaris",
-       "operatingsystemrelease": [
--        "11"
-+        "11",
-+        "12"
-       ]
-     },
-     {
-@@ -88,7 +89,7 @@
-       "version_requirement": "3.x"
+--- puppetlabs-ntp-4.1.2/metadata.json.orig     2016-04-01 08:28:52.379882695 -0700
++++ puppetlabs-ntp-4.1.2/metadata.json  2016-04-01 08:30:33.122129237 -0700
+@@ -101,5 +101,5 @@
+       "version_requirement": ">= 3.0.0 < 5.0.0"
      }
    ],
--  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo.",
-+  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Gentoo, and Solaris.",
-   "dependencies": [
-     {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"}
-   ]
+-  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo."
++  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Gentoo, and Solaris."
+ }
--- a/components/ruby/puppet-modules/puppetlabs-ntp/patches/02-params.patch	Fri Apr 01 09:37:44 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Patch to add Solaris 12 to the list of supported OSes.  This patch has
-been submitted upstream.
-
---- puppetlabs-ntp-3.3.0/manifests/params.pp.orig	2015-05-13 13:45:40.455925343 -0600
-+++ puppetlabs-ntp-3.3.0/manifests/params.pp	2015-05-13 13:45:30.253178880 -0600
-@@ -157,7 +157,8 @@ class ntp::params {
-       $keys_file     = '/etc/inet/ntp.keys'
-       $package_name  = $::operatingsystemrelease ? {
-         /^(5\.10|10|10_u\d+)$/ => [ 'SUNWntpr', 'SUNWntpu' ],
--        /^(5\.11|11|11\.\d+)$/ => [ 'service/network/ntp' ]
-+        /^(5\.11|11|11\.\d+)$/ => [ 'service/network/ntp' ],
-+        /^(5\.12|12|12\.\d+)$/ => [ 'service/network/ntp' ]
-       }
-       $restrict      = [
-         'default kod nomodify notrap nopeer noquery',
--- a/components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m	Fri Apr 01 09:37:44 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m	Fri Apr 01 10:05:32 2016 -0700
@@ -63,6 +63,7 @@
 file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
 file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
 file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/fedora-21-x64.yml
 file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
 file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/sles-12-64.yml
 file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
upstream/oracle/userland-gate