diff options
| author |   Gunnar Wrobel <wrobel@gentoo.org> | 2008-04-09 09:27:36 +0000 |
|---|---|---|
| committer | Gunnar Wrobel <wrobel@gentoo.org> | 2008-04-09 09:27:36 +0000 |
| commit | 035c1dcd1681f6eb2a5c2c1a36849a292f1abb94 (patch) | |
| tree | 47d523108e1a3eee861568286b039f0868f300ce | |
| parent | Fixed path for the stack_ldap patch. (diff) | |
| download | overlay-035c1dcd1681f6eb2a5c2c1a36849a292f1abb94.tar.gz overlay-035c1dcd1681f6eb2a5c2c1a36849a292f1abb94.tar.bz2 overlay-035c1dcd1681f6eb2a5c2c1a36849a292f1abb94.zip | |
Add the default value for stacked attributes in the patch.
svn path=/stable/; revision=829
| -rw-r--r-- | app-admin/puppet/ChangeLog | 3 | ||||
| -rw-r--r-- | app-admin/puppet/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/puppet/files/puppet-0.24.4-stack_ldap.patch | 13 |
3 files changed, 18 insertions, 2 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index 9b126dc..9bab688 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -3,6 +3,9 @@ # $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.13 2008/04/03 16:30:02 matsuu Exp $ 09 Apr 2008; wrobel@gentoo.org files/puppet-0.24.4-stack_ldap.patch: + Add the default value for stacked attributes in the patch. + + 09 Apr 2008; wrobel@gentoo.org files/puppet-0.24.4-stack_ldap.patch: Fixed path for the stack_ldap patch. 09 Apr 2008; wrobel@gentoo.org ChangeLog: diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index a193eb2..a5169ca 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -3,9 +3,9 @@ AUX puppet-0.23.2-gentoo.patch 7957 RMD160 cecf241522ad4400a942762e327496f0f8834 AUX puppet-0.24.1-gentoo.patch 5898 RMD160 ad378ccb4e99f488b1a0b0a2e5f240b85fe577f3 SHA1 32abbc5b3fa07ba10a217623f12f13b3531ecff5 SHA256 0dd2837574e9007c3cf8900f94d8f3a8550dab94d13209077c2fe9729c9d3c67 AUX puppet-0.24.1-service.patch 528 RMD160 8b3dc4ef4db1d3880ba5cb225f4dde87156ce6d3 SHA1 e0ac3359b297ac6fb780e5280bc7249062564c80 SHA256 87255fd26a5f21f4121a76ba46c5f666d17c49145ef67fbbc1183b7d5af8152d AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886 -AUX puppet-0.24.4-stack_ldap.patch 1911 RMD160 d24a16712c5282a21115a18a4acb164b33a814d1 SHA1 230934de67ecab139c7a3633d396406034bb72b6 SHA256 be443c197575a5206ce58feb55ba7e49ee5adcc9133155cf52f1045d630d4fff +AUX puppet-0.24.4-stack_ldap.patch 2658 RMD160 c4d13f87f82b5b43b68074b651ca0c520269c65d SHA1 da1ece1a014f9b5f209825e0f515167739ace78c SHA256 d2e5ab1e76b8adff8f82d701bba38206712a7a722781bdd5a9bc7bcbd66ed672 AUX puppetmaster.init 1373 RMD160 b93140bf89a0bd179719c393087325db7fa3f822 SHA1 42627b01ae8e847f2b34b89c973a26220c722bd8 SHA256 f7ec6b2d66f5ac82ad867817f658e53b349d139876222c6f8c306ba2ae65fcaa DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9 EBUILD puppet-0.24.4-r1.ebuild 3343 RMD160 f345099e3391a7d0bd08e39294223c122862e144 SHA1 7a8cd8cc9f4aca15a48e22f4e0893b449dd491a9 SHA256 c241384f84d29a0544e39eac58d4bc26068db7fdb26ca0ed8795411ec64c37a7 -MISC ChangeLog 2983 RMD160 c7a2c780c07e6b3eb4422fdfb4b1a813d1cc94d6 SHA1 0b501a8c8c0326a6a87c970e402c80d3ab835209 SHA256 b6e0caf019e2b409c35c3892da092de7c5dd1a1d457e3f06f99bf6517fbf8536 +MISC ChangeLog 3116 RMD160 0c17136f3b80b3ac0fe8c4dac4066db74c5d5236 SHA1 96ae50d844e11b3e64d3023093fb768d4f42ac80 SHA256 c0e61e96ddd3d65b7f2929d1dab2dce30697df7674ffd46a2be235274b3ccc7f MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337 diff --git a/app-admin/puppet/files/puppet-0.24.4-stack_ldap.patch b/app-admin/puppet/files/puppet-0.24.4-stack_ldap.patch index b8dd005..cca2583 100644 --- a/app-admin/puppet/files/puppet-0.24.4-stack_ldap.patch +++ b/app-admin/puppet/files/puppet-0.24.4-stack_ldap.patch @@ -1,3 +1,16 @@ +--- lib/puppet/defaults.rb.orig 2008-03-16 15:43:05.000000000 +0100 ++++ lib/puppet/defaults.rb 2008-04-07 16:49:25.772991000 +0200 +@@ -617,6 +617,10 @@ + :ldapclassattrs => ["puppetclass", + "The LDAP attributes to use to define Puppet classes. Values + should be comma-separated."], ++ :ldapstackedattrs => ["puppetvar", ++ "The LDAP attributes that should be stacked to arrays by adding ++ the values in all hierarchy elements of the tree. Values ++ should be comma-separated."], + :ldapattrs => ["all", + "The LDAP attributes to include when querying LDAP for nodes. All + returned attributes are set as variables in the top-level scope. --- lib/puppet/indirector/node/ldap.rb.orig 2008-04-07 16:34:43.314125000 +0200 +++ lib/puppet/indirector/node/ldap.rb 2008-04-07 17:34:18.645503750 +0200 @@ -15,6 +15,11 @@ |