3 commits - java/code web/conf
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 23 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java | 5 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 3 +
java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java | 18 +++++++
web/conf/rhn_web.conf | 2
5 files changed, 49 insertions(+), 2 deletions(-)
New commits:
commit f38392ceb6f2c206185acdf59851e16bd073ea6f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Dec 16 14:28:13 2009 -0500
adding channel.software.regenerateYumCache() api call
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 318cca3..5cab24d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1869,4 +1869,27 @@ public class ChannelSoftwareHandler extends BaseHandler {
return 1;
}
+ /**
+ * Regenerate the yum cache for a specific channel.
+ * @param sessionKey the session key
+ * @param channelLabel the channel label
+ * @return int - 1 on success!
+ *
+ * @xmlrpc.doc Regenerate yum cache for the specified channel.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "channelLabel", "the label of the
+ * channel")
+ * @xmlrpc.returntype #return_int_success()
+ *
+ */
+ public int regenerateYumCache(String sessionKey, String channelLabel) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ channelAdminPermCheck(loggedInUser);
+ Channel chan = lookupChannelByLabel(loggedInUser, channelLabel);
+ ChannelManager.queueChannelChange(channelLabel,
+ "api: regenerateYumCache", "api called");
+ return 1;
+
+ }
+
}
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 1f05c90..221edb1 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -236,7 +236,7 @@ web.config_delim_end = |}
web.version = 0.7
# the version of API
-web.apiversion = 10.10
+web.apiversion = 10.11
# maximum size for a config file
web.maximum_config_file_size = 131072
commit e2c7058aa973e117b8fa90328d638e5b30099f2b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Dec 16 14:25:03 2009 -0500
making selinux not required for server.config.createOrUpdate() api call, also adding selinux_ctx to the documentation
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
index df3d61c..cadd96b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
@@ -139,7 +139,10 @@ public class XmlRpcConfigChannelHelper {
form.setOwner((String)data.get(ConfigRevisionSerializer.OWNER));
form.setGroup((String)data.get(ConfigRevisionSerializer.GROUP));
form.setPermissions((String)data.get(ConfigRevisionSerializer.PERMISSIONS));
- form.setSelinuxCtx((String)data.get(ConfigRevisionSerializer.SELINUX_CTX));
+ String selinux = (String)data.get(ConfigRevisionSerializer.SELINUX_CTX);
+ form.setSelinuxCtx(selinux == null ? "" : selinux);
+
+
ConfigFileBuilder helper = ConfigFileBuilder.getInstance();
try {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index b5dcab0..f79db3d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -141,6 +141,9 @@ public class ServerConfigHandler extends BaseHandler {
* #prop_desc("string","macro-end-delimiter",
* "Config file macro end delimiter. Use null or empty string
* to accept the default. (ignored if working with a directory)")
+ * #prop_desc("string","selinux_ctx",
+ * "SeLinux context (optional)")
+ *
* #struct_end()
* @xmlrpc.param #param("int","commitToLocal")
* #options()
commit 80741820ddb85725981982e990d3e2cb437cc8b4
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Dec 15 17:43:04 2009 -0500
changing mock request to default to a POST request
diff --git a/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java b/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
index 7e5f619..98ec475 100644
--- a/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
+++ b/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
@@ -43,6 +43,7 @@ public class RhnMockHttpServletRequest extends MockHttpServletRequest {
private boolean secure;
private List cookies;
private String encoding;
+ private String method;
private Enumeration headerNames;
/**
@@ -59,6 +60,7 @@ public class RhnMockHttpServletRequest extends MockHttpServletRequest {
setupGetRequestURI("/rhn/network/somepage.do");
setLocale(Locale.getDefault());
setSession(new RhnMockHttpSession());
+ setMethod("POST");
}
/**
@@ -220,4 +222,20 @@ public class RhnMockHttpServletRequest extends MockHttpServletRequest {
public void setCharacterEncoding(String encodingIn) {
this.encoding = encodingIn;
}
+
+
+ /**
+ * @return Returns the method.
+ */
+ public String getMethod() {
+ return method;
+ }
+
+
+ /**
+ * @param methodIn The method to set.
+ */
+ public void setMethod(String methodIn) {
+ this.method = methodIn;
+ }
}
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.8.3-1'
by Tomas Lestach
Tag 'spacewalk-java-0.8.3-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-12-16 13:38 +0000
Tagging package [spacewalk-java] version [0.8.3-1] in directory [java/].
Changes since rhnmd-5.3.5-1:
Tomas Lestach (2):
modifying spacewalk-java build propetries to enable f12 builds
Automatic commit of package [spacewalk-java] release [0.8.3-1].
---
java/buildconf/build-props.xml | 8 ++++++--
java/spacewalk-java.spec | 15 ++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 21 insertions(+), 4 deletions(-)
---
14 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 15 ++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 10b56c462d8c81062842c62ce49a4a12946c5eed
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 16 14:38:28 2009 +0100
Automatic commit of package [spacewalk-java] release [0.8.3-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3cd8567..2026ea9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.2
+Version: 0.8.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -283,6 +283,19 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Dec 16 2009 Tomas Lestach <tlestach(a)redhat.com> 0.8.3-1
+- modifying spacewalk-java build propetries to enable f12 builds
+ (tlestach(a)redhat.com)
+- Remove the spacewalk-moon (sub)package as it is not used anywhere.
+ (jpazdziora(a)redhat.com)
+- correcting the action that the POST check was done for errata add package
+ (jsherril(a)redhat.com)
+- adding post checking to a couple of pages (jsherril(a)redhat.com)
+- 545995 - adding package signing key to the package details page
+ (jsherril(a)redhat.com)
+- The email.verify.body trans-unit is not used anywhere, removing as dead text.
+ (jpazdziora(a)redhat.com)
+
* Thu Dec 10 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.2-1
- fixed support for SHA256 rpms
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 448a4e9..bcf8e3c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.8.2-1 java/
+0.8.3-1 java/
14 years, 5 months
java/buildconf
by Tomas Lestach
java/buildconf/build-props.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 28e67b179b552a6cd7bfdb62fc9ce7d497cf2cc6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 16 13:06:37 2009 +0100
modifying spacewalk-java build propetries to enable f12 builds
problem is caused by the ant-contrib-1.0-0.10.b2.fc12.noarch, that changes the location of ant-contrib.jar
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 8d6576c..0b89284 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -65,8 +65,12 @@
regexp tyrex jmock jmock-cglib strutstest gsbase jfreechart jmap
postgresql-jdbc" />
+ <condition property="ant-contrib.path" value="ant/ant-contrib" else="ant-contrib">
+ <available file="/usr/share/java/ant/ant-contrib.jar"/>
+ </condition>
+
<property name="build.jar.dependencies"
- value="ant ant-junit ant-contrib antlr
+ value="ant ant-junit ${ant-contrib.path} antlr
${common.jar.dependencies} tanukiwrapper jasper5-compiler jasper5-runtime
concurrent" />
@@ -82,7 +86,7 @@
regexp tyrex jmock jmock-cglib strutstest gsbase" / -->
<property name="install.build.jar.dependencies"
- value="ant ant/ant-junit ant-contrib antlr
+ value="ant ant/ant-junit ${ant-contrib.path} antlr
${install.common.jar.dependencies} tanukiwrapper" />
<property name="install.run.jar.dependencies"
14 years, 5 months
Changes to 'refs/tags/rhnmd-5.3.5-1'
by Miroslav Suchý
Tag 'rhnmd-5.3.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-16 13:04 +0000
Tagging package [rhnmd] version [5.3.5-1] in directory [monitoring/rhnmd/].
Changes since rhnmd-5.3.4-1:
Miroslav Suchý (2):
538057 - in /etc/nocpulse is rhnmd_config, not rhnmd
Automatic commit of package [rhnmd] release [5.3.5-1].
---
monitoring/rhnmd/rhnmd.spec | 6 +++---
rel-eng/packages/rhnmd | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
14 years, 5 months
2 commits - monitoring/rhnmd rel-eng/packages
by Miroslav Suchý
monitoring/rhnmd/rhnmd.spec | 6 +++---
rel-eng/packages/rhnmd | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 17c95f383c536b95232c2a760c3a84ace2e50951
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 14:04:42 2009 +0100
Automatic commit of package [rhnmd] release [5.3.5-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 5fb7932..957dc58 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.4
+Version: 5.3.5
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
-* Wed Dec 16 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.4-1
+* Wed Dec 16 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.5-1
- 538057 - fix typo
- 538057 - use proper text indention. The content of tags like Name, Version, ... usually starts at 17 characters
- 538057 - move %%preun before %%clean and %%files
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index 324ffa0..44f5aaf 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.4-1 monitoring/rhnmd/
+5.3.5-1 monitoring/rhnmd/
commit 01072d0ee5ff73c6b450801872138cfd20a4df4d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 14:04:21 2009 +0100
538057 - in /etc/nocpulse is rhnmd_config, not rhnmd
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index c16a370..5fb7932 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(700, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh
%config(noreplace) %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh/authorized_keys
%{_usr}/sbin/rhnmd
-%config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd
+%config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd_config
%{_initddir}/rhnmd
%doc LICENSE
14 years, 5 months
Changes to 'refs/tags/rhnmd-5.3.4-1'
by Miroslav Suchý
Tag 'rhnmd-5.3.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-16 12:59 +0000
Tagging package [rhnmd] version [5.3.4-1] in directory [monitoring/rhnmd/].
Changes since spacewalk-backend-0.8.12-1:
Miroslav Suchý (10):
dead code - this commented code is for long time on bottom of this file
change comment to docstring
Use %global instead of %define, see
538057 - %{_initrddir} is considered deprecated on Fedora, but still needed on RHEL
538057 - preserve timestamp of the source files
538057 - do not use wildcards
538057 - move %preun before %clean and %files
538057 - use proper text indention. The content of tags like Name, Version, ... usually starts at 17 characters
538057 - fix typo
Automatic commit of package [rhnmd] release [5.3.4-1].
---
client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py | 2
client/rhel/yum-rhn-plugin/actions/packages.py | 10 -
monitoring/rhnmd/rhnmd.spec | 72 +++++-----
rel-eng/packages/rhnmd | 2
4 files changed, 48 insertions(+), 38 deletions(-)
---
14 years, 5 months
monitoring/rhnmd rel-eng/packages
by Miroslav Suchý
monitoring/rhnmd/rhnmd.spec | 11 ++++++++++-
rel-eng/packages/rhnmd | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e819253943d8e1887b029c0ea56b1f6dd6f4fa39
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 13:59:22 2009 +0100
Automatic commit of package [rhnmd] release [5.3.4-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index e0e3e59..c16a370 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.3
+Version: 5.3.4
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -87,6 +87,15 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Dec 16 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.4-1
+- 538057 - fix typo
+- 538057 - use proper text indention. The content of tags like Name, Version, ... usually starts at 17 characters
+- 538057 - move %%preun before %%clean and %%files
+- 538057 - do not use wildcards
+- 538057 - preserve timestamp of the source files
+- 538057 - %%{_initrddir} is considered deprecated on Fedora, but still needed on RHEL
+- 538057 - Use %%global instead of %%define
+
* Mon Nov 2 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.3-1
- make rhnmd package noarch
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index c623cf1..324ffa0 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.3-1 monitoring/rhnmd/
+5.3.4-1 monitoring/rhnmd/
14 years, 5 months
9 commits - client/rhel monitoring/rhnmd
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py | 2
client/rhel/yum-rhn-plugin/actions/packages.py | 10 -
monitoring/rhnmd/rhnmd.spec | 63 +++++-----
3 files changed, 38 insertions(+), 37 deletions(-)
New commits:
commit 3b8ae70e51830107790b28ce8d443c01174df250
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 13:44:58 2009 +0100
538057 - fix typo
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 70ee705..e0e3e59 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
- make rhnmd package noarch
* Fri Apr 10 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.2-1
-- 494538 - remove the dependecy of rhnmd on nocpulse-common
+- 494538 - remove the dependency of rhnmd on nocpulse-common
* Tue Apr 7 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.1-1
- authorized_keys should be owned by nocpulse
commit 47bd3f0f7cd2f4bf3c360e5736f855e59addbd7c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:19:42 2009 +0100
538057 - use proper text indention. The content of tags like Name, Version, ... usually starts at 17 characters
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index a340254..70ee705 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -4,18 +4,18 @@
%global _initddir %{_sysconfdir}/rc.d/init.d
%endif
-Summary: Red Hat Network Monitoring Daemon
-Name: rhnmd
-URL: https://fedorahosted.org/spacewalk
-Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.3
-Release: 1%{?dist}
-License: GPLv2
-BuildArch: noarch
-Group: System Environment/Daemons
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssh-server openssh
-BuildRequires: pam-devel
+Summary: Red Hat Network Monitoring Daemon
+Name: rhnmd
+URL: https://fedorahosted.org/spacewalk
+Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
+Version: 5.3.3
+Release: 1%{?dist}
+License: GPLv2
+BuildArch: noarch
+Group: System Environment/Daemons
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: openssh-server openssh
+BuildRequires: pam-devel
%description
rhnmd enables secure ssh-based communication between the monitoring
commit e161aa4625f34c03a202166b37c42aa6fde8eba0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:17:30 2009 +0100
538057 - move %preun before %clean and %files
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 39787aa..a340254 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -66,6 +66,12 @@ then
fi
/sbin/chkconfig --add rhnmd
+%preun
+if [ $1 = 0 ]; then
+ /sbin/service rhnmd stop > /dev/null 2>&1
+ /sbin/chkconfig --del rhnmd
+fi
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,12 +86,6 @@ rm -rf $RPM_BUILD_ROOT
%{_initddir}/rhnmd
%doc LICENSE
-%preun
-if [ $1 = 0 ]; then
- /sbin/service rhnmd stop > /dev/null 2>&1
- /sbin/chkconfig --del rhnmd
-fi
-
%changelog
* Mon Nov 2 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.3-1
- make rhnmd package noarch
commit 49c6f9428b6e06e1a607d9c11b8f392da4cbac08
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:14:56 2009 +0100
538057 - do not use wildcards
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index bfc3a87..39787aa 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -75,8 +75,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}
%dir %attr(700, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh
%config(noreplace) %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh/authorized_keys
-%{_usr}/sbin/*
-%config(noreplace) %{_sysconfdir}/%{np_name}/*
+%{_usr}/sbin/rhnmd
+%config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd
%{_initddir}/rhnmd
%doc LICENSE
commit 3ea22caea637e31bdb6fcf6cd097116d5526a0bd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:13:05 2009 +0100
538057 - preserve timestamp of the source files
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 269bb2c..bfc3a87 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -38,10 +38,10 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}
ln -sf sshd $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd
-install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
-install -m 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
-install -m 0600 authorized_keys $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
-install -m 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
+install -pm 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
+install -pm 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
+install -pm 0600 authorized_keys $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
+install -pm 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
%pre
if [ $1 -eq 1 ] ; then
commit 2d9c46a1cf6bc58e5be8745e579e7f6b37838ccb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:09:06 2009 +0100
538057 - %{_initrddir} is considered deprecated on Fedora, but still needed on RHEL
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index c760555..269bb2c 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -1,5 +1,8 @@
%global np_name nocpulse
%global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%if 0%{!?_initddir:1}
+%global _initddir %{_sysconfdir}/rc.d/init.d
+%endif
Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
@@ -29,13 +32,13 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_usr}/sbin
mkdir -p $RPM_BUILD_ROOT%{_usr}/lib
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}
ln -sf sshd $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd
-install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initrddir}/rhnmd
+install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
install -m 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
install -m 0600 authorized_keys $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
install -m 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
@@ -74,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh/authorized_keys
%{_usr}/sbin/*
%config(noreplace) %{_sysconfdir}/%{np_name}/*
-%{_initrddir}/rhnmd
+%{_initddir}/rhnmd
%doc LICENSE
%preun
commit 478e8ecfdab11a27a7dce47daa48ffda599f5f3b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 11:56:02 2009 +0100
Use %global instead of %define, see
https://fedoraproject.org/wiki/PackagingDrafts/global_preferred_over_define
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index c436c16..c760555 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -1,5 +1,5 @@
-%define np_name nocpulse
-%define identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%global np_name nocpulse
+%global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
commit 5dc27309565e26d9dca40563128de933c58c7054
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 10:55:51 2009 +0100
change comment to docstring
diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py b/client/rhel/yum-rhn-plugin/actions/packages.py
index 03bf139..3aeffe2 100644
--- a/client/rhel/yum-rhn-plugin/actions/packages.py
+++ b/client/rhel/yum-rhn-plugin/actions/packages.py
@@ -384,11 +384,11 @@ def _run_yum_action(command):
# The following functions are the same as the old up2date ones.
-# Check if the locally installed package list changed, if
-# needed the list is updated on the server
-# In case of error avoid pushing data to stay safe
-#
def checkNeedUpdate(rhnsd=None):
+ """ Check if the locally installed package list changed, if
+ needed the list is updated on the server
+ In case of error avoid pushing data to stay safe
+ """
data = {}
dbpath = "/var/lib/rpm"
cfg = config.initUp2dateConfig()
@@ -421,8 +421,8 @@ def checkNeedUpdate(rhnsd=None):
# from rhnsd
return refresh_list(rhnsd=1)
-# push again the list of rpm packages to the server
def refresh_list(rhnsd=None):
+ """ push again the list of rpm packages to the server """
log.log_debug("Called refresh_rpmlist")
ret = None
commit 1ee7a36c0f2dc84c83b490facc5778dde54dfa58
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 09:57:41 2009 +0100
dead code - this commented code is for long time on bottom of this file
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
index a4749a6..16f082b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
@@ -18,8 +18,6 @@ class ClientCapabilities(UserDict.UserDict):
# FIXME: at some point, this will be
# intelligently populated...
localcaps = {
-# "packages.runTransaction":{'version':1, 'value':1},
-# "blippyfoo":{'version':5, 'value':0},
"caneatCheese":{'version':1, 'value': 1}
}
if capsToPopulate:
14 years, 5 months
Changes to 'refs/tags/spacewalk-backend-0.8.12-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-12-16 09:18 +0000
Tagging package [spacewalk-backend] version [0.8.12-1] in directory [backend/].
Changes since spacewalk-web-0.8.2-1:
Jan Pazdziora (1):
Remove the spacewalk-moon (sub)package as it is not used anywhere.
Justin Sherrill (2):
adding post checking to a couple of pages
correcting the action that the POST check was done for errata add package
Michael Mraka (4):
added comment; otherwise it isn't easy to figure out what this piece of code actually does
fixed ORA-01400: cannot insert NULL into ("RHNSAT"."RHNERRATAPACKAGE"."PACKAGE_ID")
fixed import of pre-sha256 exports
Automatic commit of package [spacewalk-backend] release [0.8.12-1].
Milan Zazrivec (1):
513660 - save / update up2date config during firstboot
---
backend/satellite_tools/satsync.py | 1
backend/server/importlib/errataImport.py | 18
backend/spacewalk-backend.spec | 5
client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py | 3
java/buildconf/build-webapp.xml | 2
java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java | 12
rel-eng/packages/spacewalk-backend | 2
satellite/fedora/setup-symlinks.sh | 1
satellite/setup-symlinks.sh | 1
spacewalk/package/spacewalk.spec | 1
web/modules/Makefile | 2
web/modules/moon/Changes | 6
web/modules/moon/MANIFEST | 13
web/modules/moon/Makefile | 8
web/modules/moon/Makefile.PL | 24
web/modules/moon/Moon/Chart.pm | 401 -------
web/modules/moon/Moon/Chart/TimeAxes.pm | 195 ---
web/modules/moon/Moon/Dataset.pm | 61 -
web/modules/moon/Moon/Dataset/Coordinate.pm | 531 ----------
web/modules/moon/Moon/Dataset/Function.pm | 241 ----
web/modules/moon/Moon/Image.pm | 197 ---
web/modules/moon/README | 35
web/modules/moon/t/chart-init.t | 33
web/modules/moon/t/dataset-init.t | 101 -
web/modules/moon/t/image-init.t | 46
web/spacewalk-web.spec | 14
29 files changed, 42 insertions(+), 1921 deletions(-)
---
14 years, 5 months