redivy

diff -urN lib/ohai/plugins/linux/platform.rb lib/ohai/plugins/linux/platform.rb
--- lib/ohai/plugins/linux/platform.rb	2010-01-13 12:38:48.000000000 +0300
+++ lib/ohai/plugins/linux/platform.rb	2010-01-13 12:22:04.000000000 +0300
@@ -40,4 +40,14 @@
 elsif File.exists?('/etc/gentoo-release')
   platform "gentoo"
   platform_version IO.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
+elsif File.exists?("/etc/SuSE-release")
+  platform "suse"
+  File.open("/etc/SuSE-release").each do |line|

redivy

diff -urN lib/chef/platform.rb lib/chef/platform.rb
--- lib/chef/platform.rb	2010-01-19 18:28:41.000000000 +0300
+++ lib/chef/platform.rb	2010-01-19 18:24:31.000000000 +0300
@@ -75,6 +75,13 @@
           :cron => Chef::Provider::Cron,
         }
       },
+      :suse   => {
+        :default => {
+          :service => Chef::Provider::Service::Redhat,

redivy

--- search.rb	2010-03-02 17:44:14.000000000 +0300
+++ /usr/lib64/ruby/gems/1.8/gems/chef-server-slice-0.7.16/app/controllers/search.rb	2010-03-03 12:51:27.000000000 +0300
@@ -35,6 +35,17 @@
     @s = Chef::Search.new
     
     query = params[:q].nil? ? "*" : (params[:q].empty? ? "*" : params[:q])
+    if session[:node_name] and session[:level] != :admin
+      node = Chef::Node.load(session[:node_name])
+      shared_key = '""'
+      begin

redivy

--- ohai.0.5.platform.rb	2010-03-16 13:31:56.000000000 +0300
+++ /usr/lib64/ruby/gems/1.8/gems/ohai-0.5.0/lib/ohai/plugins/linux/platform.rb	2010-03-16 13:38:21.000000000 +0300
@@ -42,7 +42,7 @@
   platform_version IO.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
 elsif File.exists?('/etc/SuSE-release')
   platform "suse"
-  platform_version IO.read('/etc/SuSE-release').scan(/\d+\.\d+/)[0]
+  platform_version IO.read('/etc/SuSE-release').scan(/version\D+([\d\.]+)\s+patchlevel\D+([\d\.]+)/i).join('.')
 elsif File.exists?('/etc/arch-release')
   platform "arch"

redivy

--- lib/chef/provider/package/zypper.rb	2010-03-16 14:52:15.000000000 +0300
+++ lib/chef/provider/package/zypper.rb	2010-03-16 14:54:30.000000000 +0300
@@ -79,6 +79,9 @@
             raise Chef::Exceptions::Package, "zypper failed - #{status.inspect}!"
           end
 
+          if @candidate_version == ''
+            raise Chef::Exceptions::Package, "zypper does not have a version of package #{@new_resource.package_name}"
+          end
           

redivy

--- lib/chef/provider/package/zypper.rb	2010-03-16 14:52:15.000000000 +0300
+++ lib/chef/provider/package/zypper.rb	2010-03-17 18:18:37.000000000 +0300
@@ -35,7 +35,8 @@
           version=''
           is_out_of_date=false
           Chef::Log.debug("Checking zypper for #{@new_resource.package_name}")
-          status = popen4("zypper info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+          status = popen4("zypper info #{@new_resource.package_name}",
+            :environment => {'ZYPP_READONLY_HACK' => '1'} ) do |pid, stdin, stdout, stderr|
             stdout.each do |line|

redivy

--- /usr/lib64/ruby/gems/1.8/gems/chef-server-api-0.8.6/app/controllers/search.rb	2010-03-17 18:49:07.000000000 +0300
+++ chef-0.8.7.search.rb	2010-03-17 18:51:24.000000000 +0300
@@ -45,7 +45,20 @@
     params[:sort]  ||= nil
     params[:start] ||= 0
     params[:rows]  ||= 20
-    objects, start, total = query.search(params[:id], params[:q], params[:sort], params[:start], params[:rows])
+    text_query = params[:q]
+    if @auth_user.name != 'chef-webui' and not @auth_user.admin
+      node = Chef::Node.cdb_load(@auth_user.name)

redivy

--- /srv/www/htdocs/oid/ldap.php	2010-05-14 18:07:21.052379981 +0400
+++ /srv/www/htdocs/oid/ldap.php	2010-05-14 18:07:08.364395397 +0400
@@ -28,7 +28,7 @@
 	'password'		=> 'a897755cdbd28f93eccd3023325ac55b',
 	# User account
 	#'testdn'		=> 'cn=%s,cn=users,dc=domain,dc=local',
-	'testdn'		=> 'uid=%s,ou=admins,ou=adusers,ou=users,o=scalaxy',
+	'testdn'		=> array('uid=%s,ou=admins,ou=adusers,ou=users,o=scalaxy', 'uid=%s,ou=sysarch,ou=adusers,ou=users,o=scalaxy'),
 	# Searching data
 	#'searchdn'		=> 'cn=users,dc=domain,dc=local',

redivy

--- lib/chef/rest.rb	2010-05-19 14:25:18.000000000 +0400
+++ lib/chef/rest.rb	2010-05-19 14:26:57.000000000 +0400
@@ -178,23 +178,20 @@
       end
 
       http.read_timeout = Chef::Config[:rest_timeout]
+      json_body = data ? data.to_json : nil
       
       headers = @default_headers.merge(headers)
-      

redivy

#
# Author:: Adam Jacob (<[email protected]>)
# Author:: Thom May (<[email protected]>)
# Author:: Nuo Yan (<[email protected]>)
# Author:: Christopher Brown (<[email protected]>)
# Author:: Christopher Walters (<[email protected]>)
# Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");