1 |
matsuu 08/11/21 17:13:40 |
2 |
|
3 |
Modified: puppetmaster.init puppet.init |
4 |
Added: puppet-0.24.6-eix.patch |
5 |
Log: |
6 |
Version bumped. Fixed eix-patch for new eix syntax. |
7 |
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.7 app-admin/puppet/files/puppetmaster.init |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.7&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.7&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?r1=1.6&r2=1.7 |
15 |
|
16 |
Index: puppetmaster.init |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init,v |
19 |
retrieving revision 1.6 |
20 |
retrieving revision 1.7 |
21 |
diff -u -r1.6 -r1.7 |
22 |
--- puppetmaster.init 6 Oct 2008 16:30:22 -0000 1.6 |
23 |
+++ puppetmaster.init 21 Nov 2008 17:13:40 -0000 1.7 |
24 |
@@ -4,9 +4,7 @@ |
25 |
|
26 |
depend() { |
27 |
need net |
28 |
- after slapd |
29 |
- before puppet |
30 |
- use dns logger |
31 |
+ use dns logger slapd |
32 |
} |
33 |
|
34 |
checkconfig() { |
35 |
|
36 |
|
37 |
|
38 |
1.4 app-admin/puppet/files/puppet.init |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.4&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.4&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?r1=1.3&r2=1.4 |
43 |
|
44 |
Index: puppet.init |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v |
47 |
retrieving revision 1.3 |
48 |
retrieving revision 1.4 |
49 |
diff -u -r1.3 -r1.4 |
50 |
--- puppet.init 29 Sep 2008 12:48:32 -0000 1.3 |
51 |
+++ puppet.init 21 Nov 2008 17:13:40 -0000 1.4 |
52 |
@@ -4,7 +4,7 @@ |
53 |
|
54 |
depend() { |
55 |
need net |
56 |
- use dns logger |
57 |
+ use dns logger puppetmaster |
58 |
} |
59 |
|
60 |
checkconfig() { |
61 |
|
62 |
|
63 |
|
64 |
1.1 app-admin/puppet/files/puppet-0.24.6-eix.patch |
65 |
|
66 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?rev=1.1&view=markup |
67 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?rev=1.1&content-type=text/plain |
68 |
|
69 |
Index: puppet-0.24.6-eix.patch |
70 |
=================================================================== |
71 |
diff -Naur puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb puppet-0.24.6/lib/puppet/provider/package/portage.rb |
72 |
--- puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb 2008-10-09 22:51:05.000000000 +0900 |
73 |
+++ puppet-0.24.6/lib/puppet/provider/package/portage.rb 2008-11-22 00:47:35.000000000 +0900 |
74 |
@@ -12,7 +12,7 @@ |
75 |
defaultfor :operatingsystem => :gentoo |
76 |
|
77 |
def self.instances |
78 |
- result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/ |
79 |
+ result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*-]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/ |
80 |
result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description] |
81 |
|
82 |
search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}" |