spacewalk/setup
by Jan Pazdziora
spacewalk/setup/share/tomcatX.conf.3 | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit cf399e84fa3b23aad6cdb5c5dc81b1fb3ff9eb23
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 16:16:44 2011 +0200
On RHEL 6, tomcat6 no longer sources the setenv.sh so we need to source it ourselves.
Unfortunatelly, the .conf file is processed twice in
/etc/rc.d/init.d/tomcat6 -- once it is sourced and then it is processed
via awk which creates a series of "export $the_original_line" commands.
Luckily, the semicolon hack seems to work and allows us to put
the sourcing there.
diff --git a/spacewalk/setup/share/tomcatX.conf.3 b/spacewalk/setup/share/tomcatX.conf.3
new file mode 100644
index 0000000..6269ee7
--- /dev/null
+++ b/spacewalk/setup/share/tomcatX.conf.3
@@ -0,0 +1,2 @@
+^_HACK_AROUND_PARSEOPTIONS=1.+setenv\.sh\n
+_HACK_AROUND_PARSEOPTIONS=1 ; . $CATALINA_HOME/bin/setenv.sh
12 years, 11 months
Changes to 'refs/tags/oracle-lib-compat-11.2.0.4-1'
by Jan Pazdziora
Tag 'oracle-lib-compat-11.2.0.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-04 14:27 +0000
Tagging package [oracle-lib-compat] version [11.2.0.4-1] in directory [projects/oracle-lib-compat/].
Changes since spacewalk-java-1.5.19-1:
Jan Pazdziora (2):
We unset LD_PRELOAD to force ldd to show the libldap line with => even if LD_PRELOAD was already set.
Automatic commit of package [oracle-lib-compat] release [11.2.0.4-1].
---
projects/oracle-lib-compat/oracle-lib-compat.spec | 6 +++++-
projects/oracle-lib-compat/tomcat-setenv.sh | 2 ++
rel-eng/packages/oracle-lib-compat | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
12 years, 11 months
projects/oracle-lib-compat rel-eng/packages
by Jan Pazdziora
projects/oracle-lib-compat/oracle-lib-compat.spec | 6 +++++-
rel-eng/packages/oracle-lib-compat | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3c1f2cd4b94aaa538d8938f746818fadfb18f752
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 16:27:27 2011 +0200
Automatic commit of package [oracle-lib-compat] release [11.2.0.4-1].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 94ef544..82dc01b 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -1,5 +1,5 @@
Name: oracle-lib-compat
-Version: 11.2.0.3
+Version: 11.2.0.4
Release: 1%{?dist}
Summary: Compatibility package so that perl-DBD-Oracle will install
Group: Applications/Multimedia
@@ -115,6 +115,10 @@ find %{_prefix}/lib/oracle/%{icdir} \
| xargs execstack -c
%changelog
+* Wed May 04 2011 Jan Pazdziora 11.2.0.4-1
+- We unset LD_PRELOAD to force ldd to show the libldap line with => even if
+ LD_PRELOAD was already set.
+
* Mon Jan 17 2011 Jan Pazdziora 11.2.0.3-1
- Set diag_adr_enabled to off.
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat
index 827c77e..bb21bea 100644
--- a/rel-eng/packages/oracle-lib-compat
+++ b/rel-eng/packages/oracle-lib-compat
@@ -1 +1 @@
-11.2.0.3-1 projects/oracle-lib-compat/
+11.2.0.4-1 projects/oracle-lib-compat/
12 years, 11 months
projects/oracle-lib-compat
by Jan Pazdziora
projects/oracle-lib-compat/tomcat-setenv.sh | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 42eba5234a9c2ce5f724c78819507493f6a87c9d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 15:58:48 2011 +0200
We unset LD_PRELOAD to force ldd to show the libldap line with => even if LD_PRELOAD was already set.
diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh
index bb181a3..ee14820 100644
--- a/projects/oracle-lib-compat/tomcat-setenv.sh
+++ b/projects/oracle-lib-compat/tomcat-setenv.sh
@@ -3,6 +3,8 @@
# in libclntsh.so* upon tomcat5 startup with those from standard library.
for i in /lib64/security/pam_ldap.so /lib/security/pam_ldap.so ; do
if [ -f $i ] ; then
+ # to force ldd to show the libldap line with => even if LD_PRELOAD was already set
+ unset LD_PRELOAD
export LD_PRELOAD=`ldd $i | perl -lne '/^\s+libldap\S+\s+=>\s+(\S+)/ and print $1 and exit'`
break
fi
12 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.5.19-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.19-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-04 12:53 +0000
Tagging package [spacewalk-java] version [1.5.19-1] in directory [java/].
Changes since spacewalk-backend-1.5.15-1:
Miroslav Suchý (3):
683200 - encode hostname to IDN in MonitoringConfig.do page
sort inputs on the page
Automatic commit of package [spacewalk-java] release [1.5.19-1].
---
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 26 ++++++++--
java/code/webapp/WEB-INF/struts-config.xml | 1
java/spacewalk-java.spec | 6 +-
rel-eng/packages/spacewalk-java | 2
4 files changed, 30 insertions(+), 5 deletions(-)
---
12 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5b36d1dc664a222ee85641ff40feddd0599efd69
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 14:53:44 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.19-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2378fa3..113c5a0 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.5.18
+Version: 1.5.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 04 2011 Miroslav Suchý 1.5.19-1
+- sort inputs on the page
+- 683200 - encode hostname to IDN in MonitoringConfig.do page
+
* Tue May 03 2011 Miroslav Suchý 1.5.18-1
- 682112 - correct displayed systems consuming channel entitlements
- 683200 - encode hostname to IDN in GeneralConfig.do page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3121fdc..d6eebd7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.18-1 java/
+1.5.19-1 java/
12 years, 11 months
2 commits - java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 26 ++++++++--
java/code/webapp/WEB-INF/struts-config.xml | 1
2 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit cccc19a838585784dbd030a0c6c776ffa9d4492d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 10:43:00 2011 +0200
sort inputs on the page
they are sometimes displayed in different order, which is confusing
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index f087a48..61da710 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -34,6 +34,8 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import java.net.IDN;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -102,6 +104,15 @@ public class MonitoringConfigAction extends BaseConfigAction {
value));
}
+ // sort inputs in form using Description
+ Collections.sort(nameDescVals, new Comparator() {
+ public int compare(Object x, Object y) {
+ String xName = ((NameDescriptionValue)x).getName();
+ String yName = ((NameDescriptionValue)y).getName();
+ return xName.compareTo(yName);
+ }
+ }
+ );
if (isSubmitted(form)) {
ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand) getCommand(user);
commit 3e738c0ce75fe4e4e21cf8959d775cfef4648603
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 10:37:48 2011 +0200
683200 - encode hostname to IDN in MonitoringConfig.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index fe596e7..f087a48 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -33,6 +33,7 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
+import java.net.IDN;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -53,6 +54,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
private static Logger logger = Logger.getLogger(MonitoringConfigAction.class);
public static final String IS_MONITORING_SCOUT = "is_monitoring_scout";
+ public static final String MDOM = "MDOM";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping, ActionForm formIn,
@@ -90,9 +92,14 @@ public class MonitoringConfigAction extends BaseConfigAction {
logger.debug("execute() - Name: " + ci.getName() +
" value: " + ci.getDefinition());
}
- nameDescVals.add(new NameDescriptionValue(ci.getName(),
- LocalizationService.getInstance().getMessage(ci.getName()),
- ci.getDefinition()));
+ String value = ci.getDefinition();
+ String name = ci.getName();
+ if (MDOM.equals(name)) {
+ value = IDN.toUnicode(value);
+ }
+ nameDescVals.add(new NameDescriptionValue(name,
+ LocalizationService.getInstance().getMessage(name),
+ value));
}
@@ -100,6 +107,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand) getCommand(user);
csc.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT,
(Boolean) form.get(IS_MONITORING_SCOUT));
+ csc.updateString(MDOM, IDN.toASCII(form.getString(MDOM)));
if (csc.getKeysToBeUpdated().size() > 0) {
valuesChanged = true;
ValidatorError[] verrors = csc.storeConfiguration();
@@ -124,6 +132,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
form.set(IS_MONITORING_SCOUT,
new Boolean(Config.get().getBoolean(
ConfigDefaults.WEB_IS_MONITORING_SCOUT)));
+ // form.set(MDOM, IDN.toUnicode((String) form.get(MDOM)));
}
req.setAttribute("configList", nameDescVals);
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 7a841a7..3d43fe0 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -396,6 +396,7 @@
<form-property name="squelch" type="java.lang.String"/>
<form-property name="is_monitoring_scout" type="java.lang.Boolean"/>
<form-property name="submitted" type="java.lang.Boolean"/>
+ <form-property name="MDOM" type="java.lang.String"/>
</form-bean>
<form-bean name="scheduleRemoteCmdForm"
12 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1ba7286fc8aff9a045903d83b7489e3f229eec74
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 4 13:50:11 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.15-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 01a5bb7..b9a11b3 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.14
+Version: 1.5.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.15-1
+- some wierd packages have files in iso8859-1 not utf-8
+
* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
- 701297 - don't try to read rpm header from mpm package
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 60cc880..3c16d99 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.14-1 backend/
+1.5.15-1 backend/
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.15-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-04 11:50 +0000
Tagging package [spacewalk-backend] version [1.5.15-1] in directory [backend/].
Changes since oracle-rhnsat-selinux-10.2.0.20-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.5.15-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
Changes to 'refs/tags/oracle-rhnsat-selinux-10.2.0.20-1'
by Michael Mraka
Tag 'oracle-rhnsat-selinux-10.2.0.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-04 11:49 +0000
Tagging package [oracle-rhnsat-selinux] version [10.2.0.20-1] in directory [selinux/oracle-rhnsat-selinux/].
Changes since spacewalk-java-1.5.18-1:
Michael Mraka (3):
some wierd packages have files in iso8859-1 not utf-8
fixed typo
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.20-1].
---
backend/server/importlib/packageImport.py | 6 +++++-
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
---
12 years, 11 months