2 commits - rel-eng/packages selinux/oracle-xe-selinux
by Jan Pazdziora
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++-
selinux/oracle-xe-selinux/oracle-xe.te | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 2ce630e007ae9838f2f9dde5c670d890d3b3c61a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Oct 4 14:17:12 2012 +0200
Automatic commit of package [oracle-xe-selinux] release [10.2.0.26-1].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index 0ab32a9..f988e93 100644
--- a/rel-eng/packages/oracle-xe-selinux
+++ b/rel-eng/packages/oracle-xe-selinux
@@ -1 +1 @@
-10.2.0.25-1 selinux/oracle-xe-selinux/
+10.2.0.26-1 selinux/oracle-xe-selinux/
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 7a9c4b2..2f7be4a 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-xe
Name: oracle-xe-selinux
-Version: 10.2.0.25
+Version: 10.2.0.26
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle XE
Group: System Environment/Base
@@ -143,6 +143,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Thu Oct 04 2012 Jan Pazdziora 10.2.0.26-1
+- Allowing Oracle XE 11 to read sysfs.
+
* Mon Oct 01 2012 Jan Pazdziora 10.2.0.25-1
- Adding file contexts and stuff for oracle-xe-11.2.0-1.0.x86_64.
- %%defattr is not needed since rpm 4.4
commit 4b5a4411926a7d309115d4cf5ea379f08ff7aba8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Oct 4 14:11:13 2012 +0200
Allowing Oracle XE 11 to read sysfs.
Addressing
avc: denied { search } for pid=10794 comm="oracle" name="/" dev=sysfs ino=1 scontext=unconfined_u:system_r:oracle_db_t:s0 tcontext=system_u:object_r:sysfs_t:s0 tclass=dir
avc: denied { read } for pid=15367 comm="oracle" name="cpu" dev=sysfs ino=22 scontext=unconfined_u:system_r:oracle_db_t:s0 tcontext=system_u:object_r:sysfs_t:s0 tclass=dir
diff --git a/selinux/oracle-xe-selinux/oracle-xe.te b/selinux/oracle-xe-selinux/oracle-xe.te
index 9768e25..83225e9 100644
--- a/selinux/oracle-xe-selinux/oracle-xe.te
+++ b/selinux/oracle-xe-selinux/oracle-xe.te
@@ -57,3 +57,6 @@ fs_manage_tmpfs_dirs(oracle_db_t)
fs_manage_tmpfs_files(oracle_db_t)
allow oracle_db_t self:process { execstack execmem };
+
+dev_search_sysfs(oracle_db_t)
+dev_list_sysfs(oracle_db_t)
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a243fbfee3466ae3ec14796488ba75975d48da3b
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Thu Oct 4 02:13:34 2012 -0300
Fixed typo on ErrataMailer.java
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
index 06622ac..20b427d 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
@@ -134,7 +134,7 @@ public class ErrataMailer extends RhnJavaJob {
String email = (String) userInfo.get("email");
String login = (String) userInfo.get("login");
List servers = userMap.get(userId);
- log.info("Nofification for user " + login + "(" + userId + ") about " +
+ log.info("Notification for user " + login + "(" + userId + ") about " +
servers.size() + " relevant server(s).");
String emailBody = formatEmail(login, email, errata, servers);
Mail mail = new SmtpMail();
11 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.8.70-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.70-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-03 11:39 +0000
Tagging package [spacewalk-backend] version [1.8.70-1] in directory [backend/].
Changes since spacewalk-java-1.8.153-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.8.70-1].
Michael Mraka (1):
Revert "diffing packages speedup on postgresql"
---
backend/satellite_tools/satsync.py | 17 +++++------------
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 14 deletions(-)
---
11 years, 7 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 28f6c81a14319417c71fc4478e799bce3aea75e2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 3 13:39:24 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.70-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 24d59ff..5c3d12a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.69
+Version: 1.8.70
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Oct 03 2012 Jan Pazdziora 1.8.70-1
+- Revert "diffing packages speedup on postgresql"
+
* Mon Sep 17 2012 Jan Pazdziora 1.8.69-1
- exporter: honor sync-date / rhn-date when exporting erratas
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e906d79..1e327f4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.69-1 backend/
+1.8.70-1 backend/
11 years, 7 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/satsync.py | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 9ee5aab9da269a34ac65d5062d12d319c618a034
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 22 09:38:52 2012 +0100
Revert "diffing packages speedup on postgresql"
We're sticking with the older query since:
1. The old and the new query were not equivalent.
2. With the deterministic lookup_* functions in PostgreSQL in place,
the old query has better costs (same for Oracle).
This reverts commit b32b6da20c4bb7499deb377a6f36783fabc7ed1c.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index cb42ec0..d1116bf 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -887,20 +887,13 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
_query_compare_packages = """
select p.id, c.checksum_type, c.checksum, p.path, p.package_size,
TO_CHAR(p.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from rhnPackage p
- join rhnChecksumView c
- on p.checksum_id = c.id
- join rhnPackageName pn
- on pn.id = p.name_id
- join rhnPackageEvr pe
- on p.evr_id = pe.id
- join rhnPackageArch pa
- on pa.id = p.package_arch_id
- where pn.name = :name
- and pe.epoch = :epoch and pe.version = :version and pe.release = :release
- and pa.name = :arch
+ from rhnPackage p, rhnChecksumView c
+ where p.name_id = lookup_package_name(:name)
+ and p.evr_id = lookup_evr(:epoch, :version, :release)
+ and p.package_arch_id = lookup_package_arch(:arch)
and (p.org_id = :org_id or
(p.org_id is null and :org_id is null))
+ and p.checksum_id = c.id
"""
def _diff_packages_process(self, chunk, channel_label):
11 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.8.153-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.153-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-10-02 14:52 +0000
Tagging package [spacewalk-java] version [1.8.153-1] in directory [java/].
Changes since oracle-xe-selinux-10.2.0.25-1:
Stephen Herr (1):
changes required to make 'ant create-webapp-dir' work properly
Tomas Lestach (3):
860831 - fix system column value on the rhn/schedule/FailedSystems.do page
860002 - prevent Page Request Error when at pagination
Automatic commit of package [spacewalk-java] release [1.8.153-1].
---
java/buildconf/build-taskdefs.xml | 4 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java | 16 +---------
java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 2 -
java/ivy.xml | 1
java/spacewalk-java.spec | 7 +++-
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 14 insertions(+), 18 deletions(-)
---
11 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 2663b505f03a274a97ae0623331c9e74fea86294
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 2 16:52:52 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.153-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a234f96..e6ca1e2 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.152
+Version: 1.8.153
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 02 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.153-1
+- 860002 - prevent Page Request Error when at pagination
+- 860831 - fix system column value on the rhn/schedule/FailedSystems.do page
+- changes required to make 'ant create-webapp-dir' work properly
+
* Sat Sep 29 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.152-1
- add API calls to manage repo filters
- add methods to add/remove ContentSourceFilter objects
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a666cc8..1f135c7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.152-1 java/
+1.8.153-1 java/
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java | 16 +---------
1 file changed, 3 insertions(+), 13 deletions(-)
New commits:
commit 759e9f31a5ac6c5c8147d00b18edc35b7188684e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 2 11:52:58 2012 +0200
860002 - prevent Page Request Error when at pagination
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
index 23e8a0e..852a45b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
@@ -20,7 +20,6 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.manager.system.SystemManager;
@@ -28,9 +27,6 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import java.util.HashMap;
-import java.util.Map;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -52,20 +48,14 @@ public class CreateCustomDataAction extends RhnAction {
Long sid = requestContext.getRequiredParam(RequestContext.SID);
Server server = SystemManager.lookupByIdAndUser(sid, user);
- Map params = new HashMap();
- StrutsDelegate strutsDelegate = getStrutsDelegate();
-
- params.put(RequestContext.SID, request.getParameter(RequestContext.SID));
-
DataResult result = SystemManager.lookupKeysSansValueForServer(
server.getOrg().getId(), sid);
- requestContext.getRequiredParam(RequestContext.SID);
- request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
+ request.setAttribute(ListTagHelper.PARENT_URL,
+ request.getRequestURI() + "?sid=" + server.getId());
request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute("system", server);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
11 years, 7 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8be5a34a871f167dff51649000782448a278fb5d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 2 11:31:03 2012 +0200
860831 - fix system column value on the rhn/schedule/FailedSystems.do page
diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
index 82394cf..3ef5efa 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
@@ -25,7 +25,7 @@
buttonsAttr="canEdit:true">
<rhn:column header="actions.jsp.system"
url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}">
- <c:out value="${current.name}" escapeXml="true" />
+ <c:out value="${current.serverName}" escapeXml="true" />
</rhn:column>
<rhn:column header="failedsystems.jsp.failed">
11 years, 7 months
java/buildconf java/ivy.xml
by StephenHerr
java/buildconf/build-taskdefs.xml | 4 ++--
java/ivy.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6545d9371ed6debcb6a5ff6db53311ec6cd2a727
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Oct 1 15:58:29 2012 -0400
changes required to make 'ant create-webapp-dir' work properly
diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml
index a4d16b5..121905f 100644
--- a/java/buildconf/build-taskdefs.xml
+++ b/java/buildconf/build-taskdefs.xml
@@ -34,8 +34,8 @@
<!-- =================== Ant Contrib Tasks ======================= -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="buildjars"/>
-
- <taskdef name="for" classname="net.sf.antcontrib.logic.For" onerror="report"/>
+
+ <taskdef name="for" classpathref="buildjars" classname="net.sf.antcontrib.logic.For" onerror="report"/>
<property name="init-taskdefs.notrequired" value="true" />
diff --git a/java/ivy.xml b/java/ivy.xml
index 159f947..60b5fde 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -63,6 +63,7 @@
<dependency org="redhat" name="stringtree-json" rev="2.0.9" />
<dependency org="redhat" name="struts" rev="1.2.9" />
<dependency org="redhat" name="strutstest" rev="2.1.3" />
+ <dependency org="redhat" name="susestudio-java-client" rev="0.1.2" />
<dependency org="redhat" name="taglibs-core" rev="1.1.0" />
<dependency org="redhat" name="taglibs-standard" rev="1.1.0" />
<dependency org="redhat" name="tanukiwrapper" rev="3.1.2" />
11 years, 7 months