3 commits - proxy/installer proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/installer/rhn-proxy-activate.sgml | 1 -
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
proxy/proxy/pm/rhn_package_manager.sgml | 1 -
proxy/proxy/rhn-proxy.sgml | 1 -
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
7 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 72dac51c8bb9141e34fcfca89f528fdb7bbc7e2e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 26 17:19:26 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.6.5-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 990795f..ed155f5 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.6.4
+Version: 1.6.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -320,6 +320,9 @@ fi
%changelog
+* Wed Oct 26 2011 Miroslav Suchý 1.6.5-1
+- there is no rhn-proxy-debug for some time
+
* Mon Oct 17 2011 Miroslav Suchý 1.6.4-1
- 719659 - correctly handle getpeername() on IPv6
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 58fbc09..aafbeb1 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.6.4-1 proxy/proxy/
+1.6.5-1 proxy/proxy/
commit 25b92434dd42c2311b9970fd6abd9256d21b8cb9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 26 17:19:13 2011 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.6.7-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index a56a807..c81b408 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.6.6
+Version: 1.6.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Wed Oct 26 2011 Miroslav Suchý 1.6.7-1
+- there is no rhn-proxy-debug for some time
+
* Mon Oct 24 2011 Miroslav Suchý 1.6.6-1
- increase maximum_object_size_in_memory
- comment some squid directives
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index e6adfab..34cfc7e 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.6.6-1 proxy/installer/
+1.6.7-1 proxy/installer/
commit a2eadd8cefe399452a4ad41884806b67bf7a7abc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 26 17:18:42 2011 +0200
there is no rhn-proxy-debug for some time
diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-proxy-activate.sgml
index d01e04c..2ab1b0d 100644
--- a/proxy/installer/rhn-proxy-activate.sgml
+++ b/proxy/installer/rhn-proxy-activate.sgml
@@ -166,7 +166,6 @@
<simplelist>
<member>rhn_package_manager(8)</member>
<member>rhn-proxy(8)</member>
- <member>rhn-proxy-debug(8)</member>
<member>configure-proxy.sh(8)</member>
</simplelist>
</RefSect1>
diff --git a/proxy/proxy/pm/rhn_package_manager.sgml b/proxy/proxy/pm/rhn_package_manager.sgml
index 4c010d7..2ba0711 100644
--- a/proxy/proxy/pm/rhn_package_manager.sgml
+++ b/proxy/proxy/pm/rhn_package_manager.sgml
@@ -193,7 +193,6 @@ Manages RPM packages for the RHN proxy
<simplelist>
<member>rhn-proxy(8)</member>
<member>rhn-proxy-activate(8)</member>
- <member>rhn-proxy-debug(8)</member>
</simplelist>
</RefSect1>
diff --git a/proxy/proxy/rhn-proxy.sgml b/proxy/proxy/rhn-proxy.sgml
index b63bf2b..1c3177a 100644
--- a/proxy/proxy/rhn-proxy.sgml
+++ b/proxy/proxy/rhn-proxy.sgml
@@ -41,7 +41,6 @@
<simplelist>
<member>rhn_package_manager(8)</member>
<member>rhn-proxy-activate(8)</member>
- <member>rhn-proxy-debug(8)</member>
</simplelist>
</RefSect1>
12 years, 6 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7192bfb40384503cba9818d05827438cfc354270
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 26 13:23:10 2011 +0200
When there are not ks-pre.log files, do not return error.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 6725be1..8f170f0 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -134,7 +134,7 @@ public class KickstartFormatter {
"cp -fa /tmp/ks-tree-shadow/* /mnt/sysimage/tmp/ks-tree-copy" + NEWLINE +
"fi" + NEWLINE +
"cp /etc/resolv.conf /mnt/sysimage/etc/resolv.conf" + NEWLINE +
- "cp -f /tmp/ks-pre.log* /mnt/sysimage/root/" + NEWLINE;
+ "cp -f /tmp/ks-pre.log* /mnt/sysimage/root/ || :" + NEWLINE;
private static final String RHN_TRACE = "set -x" + NEWLINE;
private static final String XMLRPC_HOST =
Config.get().getString(ConfigDefaults.KICKSTART_HOST, "xmlrpc.rhn.redhat.com");
12 years, 6 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 502ccf36baae45950825ed75141837a25570d7b3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 26 13:18:52 2011 +0200
Doing replacement on all files is not nice.
Addressing
Can't do inplace edit: /etc/sysconfig/rhn/allowed-actions is not a regular file.
Can't do inplace edit: /etc/sysconfig/rhn/clientCaps.d is not a regular file.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 8dbd68e..6725be1 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -924,7 +924,7 @@ public class KickstartFormatter {
retval.append("cat /tmp/ssl-key-* > /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT" +
NEWLINE);
retval.append("perl -pe 's/RHNS-CA-CERT/RHN-ORG-TRUSTED-SSL-CERT/g' " +
- "-i /etc/sysconfig/rhn/*" + NEWLINE);
+ "-i /etc/sysconfig/rhn/up2date" + NEWLINE);
return retval.toString();
}
12 years, 6 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53ce9f6790b14578235b43a7a28bb9f6ba7a7925
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 26 13:16:45 2011 +0200
The -n and -p are exclusive in perl, let us just settle on -p.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 4dcc559..8dbd68e 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -923,7 +923,7 @@ public class KickstartFormatter {
retval.append("cat /tmp/ssl-key-* > /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT" +
NEWLINE);
- retval.append("perl -npe 's/RHNS-CA-CERT/RHN-ORG-TRUSTED-SSL-CERT/g' " +
+ retval.append("perl -pe 's/RHNS-CA-CERT/RHN-ORG-TRUSTED-SSL-CERT/g' " +
"-i /etc/sysconfig/rhn/*" + NEWLINE);
return retval.toString();
12 years, 6 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2df5137ea5be18beb58f75d30864bb5f215cffb5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 26 11:04:48 2011 +0200
748903 - extend search_string maxlenght
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index 8faf9e5..6fa59d2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -26,7 +26,7 @@
<tr><th><label for="searchfor"><bean:message key="erratasearch.jsp.searchfor"/></label></th>
<td>
<html:text property="search_string" name="search_string" styleId="searchfor"
- value="${search_string}" maxlength="36" accesskey="4"/>
+ value="${search_string}" maxlength="100" accesskey="4"/>
<html:submit>
<bean:message key="button.search" />
</html:submit>
12 years, 6 months
Changes to 'refs/tags/spacewalk-setup-jabberd-1.6.4-1'
by Milan Zazrivec
Tag 'spacewalk-setup-jabberd-1.6.4-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-10-26 09:23 +0000
Tagging package [spacewalk-setup-jabberd] version [1.6.4-1] in directory [spacewalk/spacewalk-setup-jabberd/].
Changes since spacewalk-java-1.6.66-1:
Milan Zazrivec (2):
s2s.xml: no need to setup /s2s/local/resolver
Automatic commit of package [spacewalk-setup-jabberd] release [1.6.4-1].
---
rel-eng/packages/spacewalk-setup-jabberd | 2 -
spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl | 19 ----------
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++
3 files changed, 5 insertions(+), 21 deletions(-)
---
12 years, 6 months
rel-eng/packages spacewalk/spacewalk-setup-jabberd
by Milan Zazrivec
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 967768b088f56f323f4d80c9ce29202264b85e28
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Oct 26 11:23:20 2011 +0200
Automatic commit of package [spacewalk-setup-jabberd] release [1.6.4-1].
diff --git a/rel-eng/packages/spacewalk-setup-jabberd b/rel-eng/packages/spacewalk-setup-jabberd
index 097446d..9b50ab1 100644
--- a/rel-eng/packages/spacewalk-setup-jabberd
+++ b/rel-eng/packages/spacewalk-setup-jabberd
@@ -1 +1 @@
-1.6.3-1 spacewalk/spacewalk-setup-jabberd/
+1.6.4-1 spacewalk/spacewalk-setup-jabberd/
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
index 3fee8a8..683099d 100644
--- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-jabberd
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
Summary: Tools to setup jabberd for Spacewalk
Group: Applications/System
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Wed Oct 26 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.4-1
+- s2s.xml: no need to setup /s2s/local/resolver
+
* Wed Oct 19 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.3-1
- spacewalk-setup-jabberd: update router.xml configuration
12 years, 6 months
spacewalk/spacewalk-setup-jabberd
by Milan Zazrivec
spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl | 19 ----------------
1 file changed, 19 deletions(-)
New commits:
commit 337e28fa8abb225c4cdba01a818fce56a6634dce
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Oct 26 11:18:32 2011 +0200
s2s.xml: no need to setup /s2s/local/resolver
resolver component is not used in jabberd infrastructure anymore.
diff --git a/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl b/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl
index 5195fa6..ef9f4bc 100644
--- a/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl
+++ b/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl
@@ -20,25 +20,6 @@
</xsl:copy>
</xsl:template>
-<xsl:template match="/s2s/local">
- <xsl:copy>
- <xsl:if test="not(resolver)">
- <xsl:text>
- </xsl:text>
- <xsl:comment>
- Helper DNS resolver component - if this component is not
- connected, dialback connections will fail
- (default: resolver) </xsl:comment>
- <xsl:text>
- </xsl:text>
- <resolver>resolver</resolver>
- <xsl:text>
- </xsl:text>
- </xsl:if>
- <xsl:apply-templates select="@*|node()" />
- </xsl:copy>
-</xsl:template>
-
<xsl:template match="/s2s/check/interval">
<xsl:copy>3</xsl:copy>
</xsl:template>
12 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.6.66-1'
by Martin Minar
Tag 'spacewalk-java-1.6.66-1' created by Martin Minar <mminar(a)redhat.com> at 2011-10-26 08:25 +0000
Tagging package [spacewalk-java] version [1.6.66-1] in directory [java/].
Changes since spacewalk-java-1.6.65-1:
Jan Pazdziora (2):
Adding releasers.conf for the upcoming tito version.
DISTINCT is equivalent to UNIQUE.
Martin Minar (1):
Automatic commit of package [spacewalk-java] release [1.6.66-1].
Tomas Lestach (3):
726114 - allow macro delimiters in configchannel.createOrUpdatePath for directories
692357 - clone also kernel and kernel post options when cloning a ks profile
737838 - allow org admins to unschedule repo sync (org tasks)
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 6 +----
java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java | 2 +
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java | 9 +++++++-
java/spacewalk-java.spec | 11 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
rel-eng/releasers.conf | 3 ++
7 files changed, 27 insertions(+), 8 deletions(-)
---
12 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Martin Minar
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 61b9fc4ea2d1b7c901d63810603e691d1e64398b
Author: Martin Minar <mminar(a)redhat.com>
Date: Wed Oct 26 10:25:53 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.66-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b7cce5f..cc8f5dc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.65
+Version: 1.6.66
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Oct 26 2011 Martin Minar <mminar(a)redhat.com> 1.6.66-1
+- 737838 - allow org admins to unschedule repo sync (org tasks)
+ (tlestach(a)redhat.com)
+- 692357 - clone also kernel and kernel post options when cloning a ks profile
+ (tlestach(a)redhat.com)
+- DISTINCT is equivalent to UNIQUE. (jpazdziora(a)redhat.com)
+- 726114 - allow macro delimiters in configchannel.createOrUpdatePath for
+ directories (tlestach(a)redhat.com)
+
* Tue Oct 25 2011 Jan Pazdziora 1.6.65-1
- 682845 - get rid of ChannelFactory.lookupContentSource(id) method without org
param (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 094d9a6..df7ac70 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.65-1 java/
+1.6.66-1 java/
12 years, 6 months