3 commits - backend/apache-conf backend/httpd-conf backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/apache-conf/zz-spacewalk-server-python.conf | 2
backend/httpd-conf/rhn/app.conf | 24 --------
backend/httpd-conf/rhn/applet.conf | 25 --------
backend/httpd-conf/rhn/config-management-tool.conf | 25 --------
backend/httpd-conf/rhn/config-management.conf | 25 --------
backend/httpd-conf/rhn/package-push.conf | 23 -------
backend/httpd-conf/rhn/pkg-upload.conf | 23 -------
backend/httpd-conf/rhn/sat-export-internal.conf | 16 -----
backend/httpd-conf/rhn/sat.conf | 24 --------
backend/httpd-conf/rhn/spacewalk-backend-app.conf | 24 ++++++++
backend/httpd-conf/rhn/spacewalk-backend-applet.conf | 25 ++++++++
backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf | 25 ++++++++
backend/httpd-conf/rhn/spacewalk-backend-config-management.conf | 25 ++++++++
backend/httpd-conf/rhn/spacewalk-backend-package-push.conf | 23 +++++++
backend/httpd-conf/rhn/spacewalk-backend-pkg-upload.conf | 23 +++++++
backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf | 16 +++++
backend/httpd-conf/rhn/spacewalk-backend-sat.conf | 24 ++++++++
backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf | 25 ++++++++
backend/httpd-conf/rhn/spacewalk-backend-xp.conf | 25 ++++++++
backend/httpd-conf/rhn/xmlrpc.conf | 25 --------
backend/httpd-conf/rhn/xp.conf | 25 --------
backend/spacewalk-backend.spec | 30 +++++-----
rel-eng/packages/spacewalk-backend | 2
23 files changed, 252 insertions(+), 252 deletions(-)
New commits:
commit 6427429247f780de029b504191e495e94813d131
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 14:00:34 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.35-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index cb7c103..d9e487c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.34
+Version: 0.8.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -609,7 +609,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
-* Thu Jan 21 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.34-1
+* Thu Jan 21 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.35-1
- fixed bug from popen2 -> subprocess migration
- check parent_channel label only if exists
- 526696 - checking whether server already uses a token
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0644eab..07b880e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.34-1 backend/
+0.8.35-1 backend/
commit 37e9bcb63b578c4b4a64cee80fa071aa9d1327ed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 13:57:58 2010 +0100
use mod_wsgi on non-RHEL (e.g. Fedora)
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index bc13941..cb7c103 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -53,7 +53,7 @@ Requires: PyPAM
Obsoletes: rhns-server < 5.3.0
Provides: rhns-server = %{version}-%{release}
-%if 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} < 6
Requires: mod_python
%else
Requires: mod_wsgi
@@ -258,7 +258,7 @@ export PYTHON_MODULE_NAME=%{name}
export PYTHON_MODULE_VERSION=%{version}
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix=%{_prefix}
-%if 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} < 6
rm $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-wsgi.conf
%else
rm $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
@@ -400,7 +400,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# main httpd config
%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server.conf
-%if 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} < 6
%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-python.conf
%else
%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-wsgi.conf
commit 42f227a49a105c972bbd3f304dc6117a070cc12e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 13:38:00 2010 +0100
rhn_monitoring.conf was included twice
(by zz-spacewalk-server.conf and zz-spacewalk-server-python.conf)
fixed
Starting httpd: [Thu Jan 21 13:37:54 2010] [warn] The Alias directive in
/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf at line 12 will
probably never match because it overlaps an earlier Alias.
diff --git a/backend/apache-conf/zz-spacewalk-server-python.conf b/backend/apache-conf/zz-spacewalk-server-python.conf
index fd5f751..c379c32 100644
--- a/backend/apache-conf/zz-spacewalk-server-python.conf
+++ b/backend/apache-conf/zz-spacewalk-server-python.conf
@@ -15,6 +15,6 @@ PythonOption RootDir /usr/share/rhn
# We have to use wildcard here becuse some config files are optional
-Include /etc/rhn/satellite-httpd/conf/rhn/*.conf
+Include /etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-*.conf
diff --git a/backend/httpd-conf/rhn/app.conf b/backend/httpd-conf/rhn/app.conf
deleted file mode 100644
index 78b3221..0000000
--- a/backend/httpd-conf/rhn/app.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /APP handler
-#
-# $Id$
-
-<IfModule mod_python.c>
-
-<Location /APP>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER app
- PythonOption RHNComponentType server.app
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
diff --git a/backend/httpd-conf/rhn/applet.conf b/backend/httpd-conf/rhn/applet.conf
deleted file mode 100644
index 4a6cf7d..0000000
--- a/backend/httpd-conf/rhn/applet.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /XMLRPC receiver
-#
-# $Id$
-
-<IfModule mod_python.c>
-
-<Location /APPLET>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER applet
- PythonOption RHNComponentType server.applet
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/config-management-tool.conf b/backend/httpd-conf/rhn/config-management-tool.conf
deleted file mode 100644
index f3107a3..0000000
--- a/backend/httpd-conf/rhn/config-management-tool.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /APP handler
-#
-# $Id$
-
-<IfModule mod_python.c>
-
-<Location /CONFIG-MANAGEMENT-TOOL>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER config_mgmt
- PythonOption RHNComponentType server.config-management-tool
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/config-management.conf b/backend/httpd-conf/rhn/config-management.conf
deleted file mode 100644
index 349673d..0000000
--- a/backend/httpd-conf/rhn/config-management.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /APP handler
-#
-# $Id$
-
-<IfModule mod_python.c>
-
-<Location /CONFIG-MANAGEMENT>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER config
- PythonOption RHNComponentType server.config-management
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/package-push.conf b/backend/httpd-conf/rhn/package-push.conf
deleted file mode 100644
index ce9b602..0000000
--- a/backend/httpd-conf/rhn/package-push.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# ** DO NOT EDIT **
-<IfModule mod_python.c>
-
-<Location /PACKAGE-PUSH>
- SetHandler python-program
- PythonHeaderParserHandler server.apacheUploadServer::HeaderParserHandler
- PythonHandler server.apacheUploadServer::Handler
- PythonLogHandler server.apacheUploadServer::LogHandler
- PythonCleanupHandler server.apacheUploadServer::CleanupHandler
- PythonOption RHNComponentType server.upload.package-push
- PythonOption SERVER package_push
- # We need a new interpreter than the main one, since we don't want to have
- # the requests mishandled
- PythonInterpreter rhn.server.upload
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/pkg-upload.conf b/backend/httpd-conf/rhn/pkg-upload.conf
deleted file mode 100644
index a2b9b2e..0000000
--- a/backend/httpd-conf/rhn/pkg-upload.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# ** DO NOT EDIT **
-<IfModule mod_python.c>
-
-<Location /PKG-UPLOAD>
- SetHandler python-program
- PythonHeaderParserHandler server.apacheUploadServer::HeaderParserHandler
- PythonHandler server.apacheUploadServer::Handler
- PythonLogHandler server.apacheUploadServer::LogHandler
- PythonCleanupHandler server.apacheUploadServer::CleanupHandler
- PythonOption RHNComponentType server.upload.package
- PythonOption SERVER package
- # We need a new interpreter than the main one, since we don't want to have
- # the requests mishandled
- PythonInterpreter rhn.server.upload
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/sat-export-internal.conf b/backend/httpd-conf/rhn/sat-export-internal.conf
deleted file mode 100644
index bfc7256..0000000
--- a/backend/httpd-conf/rhn/sat-export-internal.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# ** DO NOT EDIT **
-<IfModule mod_python.c>
-
-<Location /SAT-DUMP-INTERNAL>
- SetHandler python-program
- PythonHeaderParserHandler satellite_exporter.satexport::headerParserHandler
- PythonHandler satellite_exporter.satexport::handler
- PythonCleanupHandler satellite_exporter.satexport::cleanupHandler
- PythonOption SERVER non_auth_dumper
- PythonOption RHNComponentType server.satexport.internal
- DefaultType text/xml
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/sat.conf b/backend/httpd-conf/rhn/sat.conf
deleted file mode 100644
index cbad6c7..0000000
--- a/backend/httpd-conf/rhn/sat.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /SAT handler
-#
-
-<IfModule mod_python.c>
-
-<Location /SAT>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER sat
- PythonOption RHNComponentType server.iss
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-app.conf b/backend/httpd-conf/rhn/spacewalk-backend-app.conf
new file mode 100644
index 0000000..78b3221
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-app.conf
@@ -0,0 +1,24 @@
+# ** DO NOT EDIT **
+# Configuration for the /APP handler
+#
+# $Id$
+
+<IfModule mod_python.c>
+
+<Location /APP>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER app
+ PythonOption RHNComponentType server.app
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-applet.conf b/backend/httpd-conf/rhn/spacewalk-backend-applet.conf
new file mode 100644
index 0000000..4a6cf7d
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-applet.conf
@@ -0,0 +1,25 @@
+# ** DO NOT EDIT **
+# Configuration for the /XMLRPC receiver
+#
+# $Id$
+
+<IfModule mod_python.c>
+
+<Location /APPLET>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER applet
+ PythonOption RHNComponentType server.applet
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf b/backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf
new file mode 100644
index 0000000..f3107a3
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf
@@ -0,0 +1,25 @@
+# ** DO NOT EDIT **
+# Configuration for the /APP handler
+#
+# $Id$
+
+<IfModule mod_python.c>
+
+<Location /CONFIG-MANAGEMENT-TOOL>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER config_mgmt
+ PythonOption RHNComponentType server.config-management-tool
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-config-management.conf b/backend/httpd-conf/rhn/spacewalk-backend-config-management.conf
new file mode 100644
index 0000000..349673d
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-config-management.conf
@@ -0,0 +1,25 @@
+# ** DO NOT EDIT **
+# Configuration for the /APP handler
+#
+# $Id$
+
+<IfModule mod_python.c>
+
+<Location /CONFIG-MANAGEMENT>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER config
+ PythonOption RHNComponentType server.config-management
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-package-push.conf b/backend/httpd-conf/rhn/spacewalk-backend-package-push.conf
new file mode 100644
index 0000000..ce9b602
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-package-push.conf
@@ -0,0 +1,23 @@
+# ** DO NOT EDIT **
+<IfModule mod_python.c>
+
+<Location /PACKAGE-PUSH>
+ SetHandler python-program
+ PythonHeaderParserHandler server.apacheUploadServer::HeaderParserHandler
+ PythonHandler server.apacheUploadServer::Handler
+ PythonLogHandler server.apacheUploadServer::LogHandler
+ PythonCleanupHandler server.apacheUploadServer::CleanupHandler
+ PythonOption RHNComponentType server.upload.package-push
+ PythonOption SERVER package_push
+ # We need a new interpreter than the main one, since we don't want to have
+ # the requests mishandled
+ PythonInterpreter rhn.server.upload
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-pkg-upload.conf b/backend/httpd-conf/rhn/spacewalk-backend-pkg-upload.conf
new file mode 100644
index 0000000..a2b9b2e
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-pkg-upload.conf
@@ -0,0 +1,23 @@
+# ** DO NOT EDIT **
+<IfModule mod_python.c>
+
+<Location /PKG-UPLOAD>
+ SetHandler python-program
+ PythonHeaderParserHandler server.apacheUploadServer::HeaderParserHandler
+ PythonHandler server.apacheUploadServer::Handler
+ PythonLogHandler server.apacheUploadServer::LogHandler
+ PythonCleanupHandler server.apacheUploadServer::CleanupHandler
+ PythonOption RHNComponentType server.upload.package
+ PythonOption SERVER package
+ # We need a new interpreter than the main one, since we don't want to have
+ # the requests mishandled
+ PythonInterpreter rhn.server.upload
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf b/backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf
new file mode 100644
index 0000000..bfc7256
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf
@@ -0,0 +1,16 @@
+# ** DO NOT EDIT **
+<IfModule mod_python.c>
+
+<Location /SAT-DUMP-INTERNAL>
+ SetHandler python-program
+ PythonHeaderParserHandler satellite_exporter.satexport::headerParserHandler
+ PythonHandler satellite_exporter.satexport::handler
+ PythonCleanupHandler satellite_exporter.satexport::cleanupHandler
+ PythonOption SERVER non_auth_dumper
+ PythonOption RHNComponentType server.satexport.internal
+ DefaultType text/xml
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat.conf b/backend/httpd-conf/rhn/spacewalk-backend-sat.conf
new file mode 100644
index 0000000..cbad6c7
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-sat.conf
@@ -0,0 +1,24 @@
+# ** DO NOT EDIT **
+# Configuration for the /SAT handler
+#
+
+<IfModule mod_python.c>
+
+<Location /SAT>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER sat
+ PythonOption RHNComponentType server.iss
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf b/backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf
new file mode 100644
index 0000000..9e5b12b
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf
@@ -0,0 +1,25 @@
+# ** DO NOT EDIT **
+# Configuration for the /XMLRPC receiver
+#
+# $Id$
+
+<IfModule mod_python.c>
+
+<Location /XMLRPC>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER xmlrpc
+ PythonOption RHNComponentType server.xmlrpc
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-xp.conf b/backend/httpd-conf/rhn/spacewalk-backend-xp.conf
new file mode 100644
index 0000000..3fe0ab8
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-xp.conf
@@ -0,0 +1,25 @@
+# ** DO NOT EDIT **
+# Configuration for /XP receiver
+#
+# $Id$
+
+<IfModule mod_python.c>
+
+<Location /XP>
+ SetHandler python-program
+ # all of these handlers are defined in apacheServer
+ PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
+ PythonHandler server.apacheServer::Handler
+ PythonLogHandler server.apacheServer::LogHandler
+ PythonCleanupHandler server.apacheServer::CleanupHandler
+ PythonOption SERVER xp
+ PythonOption RHNComponentType server.xp
+ DefaultType text/xml
+ ErrorDocument 403 "Error 403"
+ ErrorDocument 404 "Error 404"
+ ErrorDocument 500 "Error 500"
+</Location>
+
+</IfModule>
+
+
diff --git a/backend/httpd-conf/rhn/xmlrpc.conf b/backend/httpd-conf/rhn/xmlrpc.conf
deleted file mode 100644
index 9e5b12b..0000000
--- a/backend/httpd-conf/rhn/xmlrpc.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /XMLRPC receiver
-#
-# $Id$
-
-<IfModule mod_python.c>
-
-<Location /XMLRPC>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER xmlrpc
- PythonOption RHNComponentType server.xmlrpc
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/xp.conf b/backend/httpd-conf/rhn/xp.conf
deleted file mode 100644
index 3fe0ab8..0000000
--- a/backend/httpd-conf/rhn/xp.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for /XP receiver
-#
-# $Id$
-
-<IfModule mod_python.c>
-
-<Location /XP>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler server.apacheServer::HeaderParserHandler
- PythonHandler server.apacheServer::Handler
- PythonLogHandler server.apacheServer::LogHandler
- PythonCleanupHandler server.apacheServer::CleanupHandler
- PythonOption SERVER xp
- PythonOption RHNComponentType server.xp
- DefaultType text/xml
- ErrorDocument 403 "Error 403"
- ErrorDocument 404 "Error 404"
- ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9e95d9a..bc13941 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -421,7 +421,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/action_extra_data/*
# config files
%attr(640,root,apache) %{rhnconf}/default/rhn_server_xmlrpc.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/xmlrpc.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_xmlrpc
%files applet
@@ -430,7 +430,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/applet/*
# config files
%attr(640,root,apache) %{rhnconf}/default/rhn_server_applet.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/applet.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_applet
%files app
@@ -439,7 +439,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/app/*
# config files
%attr(640,root,apache) %{rhnconf}/default/rhn_server_app.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/app.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_app
%files xp
@@ -448,7 +448,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/xp/*
# config files
%attr(640,root,apache) %{rhnconf}/default/rhn_server_xp.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/xp.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xp.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_xp
%files iss
@@ -456,7 +456,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/sat
%{rhnroot}/server/handlers/sat/*
%config %{_sysconfdir}/logrotate.d/rhn_server_sat
-%attr(640,root,apache) %config %{httpdconf}/rhn/sat.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat.conf
%files iss-export
%defattr(-,root,root)
@@ -469,7 +469,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_exporter/handlers/__init__.py*
%{rhnroot}/satellite_exporter/handlers/non_auth_dumper.py*
# config files
-%attr(640,root,apache) %config %{httpdconf}/rhn/sat-export-internal.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
%config %{_sysconfdir}/logrotate.d/rhn_sat_export_internal
%attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport.conf
%attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
@@ -490,7 +490,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/config
%{rhnroot}/server/handlers/config/*
%attr(640,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/config-management.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
%config %{_sysconfdir}/logrotate.d/rhn_config_management
%files config-files-tool
@@ -498,7 +498,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/config_mgmt
%{rhnroot}/server/handlers/config_mgmt/*
%attr(640,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/config-management-tool.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
%config %{_sysconfdir}/logrotate.d/rhn_config_management_tool
%files upload-server
@@ -512,7 +512,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload.conf
%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload_package.conf
%config %{_sysconfdir}/logrotate.d/rhn_package_upload
-%attr(640,root,apache) %config %{httpdconf}/rhn/pkg-upload.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-pkg-upload.conf
%files package-push-server
%defattr(-,root,root)
@@ -525,7 +525,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload.conf
%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
%config %{_sysconfdir}/logrotate.d/rhn_package_push
-%attr(640,root,apache) %config %{httpdconf}/rhn/package-push.conf
+%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
%files tools
%defattr(-,root,root)
14 years, 3 months
Changes to 'refs/tags/spacewalk-backend-0.8.34-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.34-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-21 12:11 +0000
Tagging package [spacewalk-backend] version [0.8.34-1] in directory [backend/].
Changes since rhn-client-tools-0.8.5-1:
Michael Mraka (4):
check parent_channel label only if exists
checksum_type may not exist (for rhel < 5 channels)
fixed bug from popen2 -> subprocess migration
Automatic commit of package [spacewalk-backend] release [0.8.34-1].
---
backend/server/importlib/channelImport.py | 11 ++++++++---
backend/spacewalk-backend.spec | 8 +++++++-
backend/spacewalk/common/fileutils.py | 3 ++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 18 insertions(+), 6 deletions(-)
---
14 years, 3 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit c8b2ceac38fc1323fa62cba1fc046bd3de3b6b07
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 13:11:16 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.34-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 37b09be..9e95d9a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.33
+Version: 0.8.34
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -609,6 +609,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jan 21 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.34-1
+- fixed bug from popen2 -> subprocess migration
+- check parent_channel label only if exists
+- 526696 - checking whether server already uses a token
+- 528214 - Encode DBstrings as utf-8 bytes before truncating
+
* Wed Jan 20 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.33-1
- fixed payload_size always = 0 error
- removed dead code in rhn_rpm.py
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 20c7c28..0644eab 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.33-1 backend/
+0.8.34-1 backend/
14 years, 3 months
3 commits - backend/server backend/spacewalk
by Michael Mraka
backend/server/importlib/channelImport.py | 11 ++++++++---
backend/spacewalk/common/fileutils.py | 3 ++-
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 4e0730d2e480746140dc5461ce7dc74027b4f3aa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 13:07:00 2010 +0100
fixed bug from popen2 -> subprocess migration
subprocess.poll() doesn't return status but set subprocess.returnvalue
diff --git a/backend/spacewalk/common/fileutils.py b/backend/spacewalk/common/fileutils.py
index dc7e8e9..a4896c8 100644
--- a/backend/spacewalk/common/fileutils.py
+++ b/backend/spacewalk/common/fileutils.py
@@ -226,7 +226,8 @@ def rhn_popen(cmd, progressCallback=None, bufferSize=16384, outputLog=None):
while 1:
# Is the child process done?
- status = c.poll()
+ c.poll()
+ status = c.returncode
if status != -1:
if os.WIFEXITED(status):
# Save the exit code, we still have to read from the pipes
commit 941003bd8909e53bfeb6d0a3c2dd6a0ef8bd401c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 12:27:26 2010 +0100
checksum_type may not exist (for rhel < 5 channels)
diff --git a/backend/server/importlib/channelImport.py b/backend/server/importlib/channelImport.py
index 009a2d6..4802b6b 100644
--- a/backend/server/importlib/channelImport.py
+++ b/backend/server/importlib/channelImport.py
@@ -63,7 +63,8 @@ class ChannelImport(Import):
or (channel['parent_channel']
and RHEL5_REGEXP.match(channel['parent_channel'])))):
channel['checksum_type'] = 'sha1'
- if channel['checksum_type'] not in self.checksum_types:
+ if (channel['checksum_type']
+ and channel['checksum_type'] not in self.checksum_types):
self.checksum_types[channel['checksum_type']] = None
# bug #528227
@@ -95,7 +96,10 @@ class ChannelImport(Import):
channel.ignored = 1
raise InvalidArchError(arch, "Unsupported channel arch %s" % arch)
channel['channel_arch_id'] = self.arches[arch]
- channel['checksum_type_id'] = self.checksum_types[channel['checksum_type']]
+ if channel['checksum_type']:
+ channel['checksum_type_id'] = self.checksum_types[channel['checksum_type']]
+ else:
+ channel['checksum_type_id'] = None
if channel.has_key('product_name'):
channel['product_name_id'] = self.backend.lookupProductNames(
commit af4597fb48d313facd16ae08621236974f3980e9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 12:23:16 2010 +0100
check parent_channel label only if exists
fixed
...
File "/usr/share/rhn/server/importlib/channelImport.py", line 61, in __processChannel
if (not channel['checksum_type']
TypeError: expected string or buffer
diff --git a/backend/server/importlib/channelImport.py b/backend/server/importlib/channelImport.py
index 37b6882..009a2d6 100644
--- a/backend/server/importlib/channelImport.py
+++ b/backend/server/importlib/channelImport.py
@@ -60,7 +60,8 @@ class ChannelImport(Import):
# Yum repo checksum type
if (not channel['checksum_type']
and (RHEL5_REGEXP.match(channel['label'])
- or RHEL5_REGEXP.match(channel['parent_channel']))):
+ or (channel['parent_channel']
+ and RHEL5_REGEXP.match(channel['parent_channel'])))):
channel['checksum_type'] = 'sha1'
if channel['checksum_type'] not in self.checksum_types:
self.checksum_types[channel['checksum_type']] = None
14 years, 3 months
Changes to 'refs/tags/rhn-client-tools-0.8.5-1'
by Miroslav Suchý
Tag 'rhn-client-tools-0.8.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-01-21 11:56 +0000
Tagging package [rhn-client-tools] version [0.8.5-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-0.8.4-1:
Michael Mraka (2):
removed unused imports
since RHEL4 it's always python 2.3+
Miroslav Suchý (2):
557059 - convert dbus.string to unicode
Automatic commit of package [rhn-client-tools] release [0.8.5-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 +++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2 -
rel-eng/packages/rhn-client-tools | 2 -
spacewalk/certs-tools/sslToolLib.py | 15 ------------
4 files changed, 7 insertions(+), 17 deletions(-)
---
14 years, 3 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit dc87bdc24d7885815d13bfdf474cfb177634aafe
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jan 21 12:56:35 2010 +0100
Automatic commit of package [rhn-client-tools] release [0.8.5-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index c21f874..eaf47f6 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?suse_version: %{suse_version} > 1000}
@@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Thu Jan 21 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.8.5-1
+- 557059 - convert dbus.string to unicode
+
* Thu Jan 21 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 0.8.4-1
- 557370 - put dmidecode import warnings into log
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 726231a..bfdc3d3 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.8.4-1 client/rhel/rhn-client-tools/
+0.8.5-1 client/rhel/rhn-client-tools/
14 years, 3 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 99de3f38a6ad333f5bdc9051df493ba7ae925010
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jan 21 12:54:34 2010 +0100
557059 - convert dbus.string to unicode
addressing:
Traceback (most recent call last):
File "/usr/sbin/rhn_register", line 83, in <module>
app.run()
File "/usr/share/rhn/up2date_client/rhncli.py", line 66, in run
sys.exit(self.main() or 0)
File "/usr/sbin/rhn_register", line 65, in main
ui.main()
File "/usr/share/rhn/up2date_client/tui.py", line 1722, in main
tui.run()
File "/usr/share/rhn/up2date_client/tui.py", line 1609, in run
if self._show_subscription_window() == False:
File "/usr/share/rhn/up2date_client/tui.py", line 1544, in _show_subscription_window
self._activate_hardware()
File "/usr/share/rhn/up2date_client/tui.py", line 1523, in _activate_hardware
hardwareInfo, self.other[org_id])
File "/usr/share/rhn/up2date_client/rhnreg.py", line 799, in activateHardwareInfo
hardwareInfo, other)
File "/usr/share/rhn/up2date_client/rhnserver.py", line 50, in __call__
return rpcServer.doCall(method, *args, **kwargs)
File "/usr/share/rhn/up2date_client/rpcServer.py", line 200, in doCall
ret = method(*args, **kwargs)
File "/usr/lib64/python2.6/xmlrpclib.py", line 1199, in __call__
return self.__send(self.__name, args)
File "/usr/share/rhn/up2date_client/rpcServer.py", line 39, in _request1
ret = self._request(methodname, params)
File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 318, in _request
request = self._req_body(params, methodname)
File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 222, in _req_body
return xmlrpclib.dumps(params, methodname, encoding=self._encoding)
File "/usr/lib64/python2.6/xmlrpclib.py", line 1132, in dumps
data = m.dumps(params)
File "/usr/lib64/python2.6/xmlrpclib.py", line 677, in dumps
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 778, in dump_struct
raise TypeError, "dictionary key must be string"
<type exceptions.TypeError>: dictionary key must be string
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index f11b075..579d80e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -931,7 +931,7 @@ def get_hal_system_and_smbios():
for key in props:
if key.startswith('system') or key.startswith('smbios'):
- system_and_smbios[key] = props[key]
+ system_and_smbios[unicode(key)] = unicode(props[key])
return system_and_smbios
14 years, 3 months
2 commits - spacewalk/certs-tools
by Michael Mraka
spacewalk/certs-tools/sslToolLib.py | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
New commits:
commit ceb7628dd3a0e4f4eae5a8fe7626ecf841c517dc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 10:14:44 2010 +0100
since RHEL4 it's always python 2.3+
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index 845f593..fe2f657 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -208,15 +208,7 @@ class TempDir:
""" fetch the temporary directory path using the most "correct"
mk*temp function for this python version
"""
-
- mktemp = None
- if hasattr(tempfile, 'mkdtemp'):
- # python 2.3+
- mktemp = tempfile.mkdtemp
- else:
- # pre-python 2.3
- mktemp = tempfile.mktemp
- return mktemp(suffix=suffix)
+ return tempfile.mkdtemp(suffix=suffix)
def getdir(self):
return self.path
commit 19e850d9c65f81c4bb282f622a3f832cbecc76ef
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 21 10:10:17 2010 +0100
removed unused imports
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index bcc27a2..845f593 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -21,13 +21,8 @@
import os
import re
import sys
-import md5
-import time
-import types
import string
import shutil
-import popen2
-import select
import tempfile
from timeLib import DAY, now, secs2days, secs2years, secs2str, \
str2secs
14 years, 3 months
Changes to 'refs/tags/rhn-client-tools-0.8.4-1'
by Milan Zazrivec
Tag 'rhn-client-tools-0.8.4-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2010-01-21 10:49 +0000
Tagging package [rhn-client-tools] version [0.8.4-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-backend-0.8.33-1:
Andy Speagle (1):
adding errata cloning scripts
Joshua Roys (1):
528214 - Encode DBstrings as utf-8 bytes before truncating
Justin Sherrill (3):
fixing newlines on scripts
543879 - adding support for downloading kickstart profiles through the /cblr handler through a proxy
543879 - adding support to the proxy side to redirect to a url that will rewrite kickstarts with the proxy name for /cblr urls
Milan Zazrivec (2):
557370 - put dmidecode import warnings into log
Automatic commit of package [rhn-client-tools] release [0.8.4-1].
Tomas Lestach (1):
526696 - checking whether server already uses a token
---
backend/server/importlib/backendLib.py | 2
backend/server/rhnServer/server_token.py | 14
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 6
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 40
java/code/src/com/redhat/rhn/manager/download/DownloadManager.java | 1
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 28
proxy/installer/configure-proxy.sh | 1
rel-eng/packages/rhn-client-tools | 2
scripts/clone-errata/README | 25
scripts/clone-errata/rhn-clone-errata.py | 587 ++++++++++
scripts/clone-errata/spw-clone-errata.py | 582 +++++++++
web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf | 2
13 files changed, 1276 insertions(+), 19 deletions(-)
---
14 years, 3 months
client/rhel rel-eng/packages
by Milan Zazrivec
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ca9edc9211875c126f44e9e9da224652968a5964
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 21 11:49:16 2010 +0100
Automatic commit of package [rhn-client-tools] release [0.8.4-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 2fd8015..c21f874 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.8.3
+Version: 0.8.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?suse_version: %{suse_version} > 1000}
@@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Thu Jan 21 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 0.8.4-1
+- 557370 - put dmidecode import warnings into log
+
* Fri Jan 15 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.3-1
- 554317 - fix for gui registration traceback
- removed dead code
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 86b3c69..726231a 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.8.3-1 client/rhel/rhn-client-tools/
+0.8.4-1 client/rhel/rhn-client-tools/
14 years, 3 months