java/code web/html web/modules
by jdob
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 19 ++
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java | 55 +++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 19 ++
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 16 ++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2
java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp | 71 ++++++++++
java/code/webapp/WEB-INF/struts-config.xml | 9 +
web/html/nav/sitenav-authenticated.xml | 2
web/html/network/software/channels/manage/delete_confirm.pxt | 2
web/html/network/software/channels/manage/errata/clone_confirm.pxt | 3
web/html/network/software/channels/manage/index.pxt | 45 ------
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 2
12 files changed, 194 insertions(+), 51 deletions(-)
New commits:
commit 11a4fa108adaa30a743c8ff6c1e3a304e2f7fdc0
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Wed Apr 29 10:40:48 2009 -0400
481578 - Ported manage software channels page from perl to java
The bug was to add a filter box to this page. Porting to ListTag 3.0 to use the built in filter functionality.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 4cd84c8..4d860a8 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -720,6 +720,25 @@ ORDER BY rhn_channel.channel_priority(UACh.parent_or_self_id), UACh.parent_or_s
<elaborator name="visible_server_count"/>
</mode>
+<mode name="owned_channels_tree">
+ <query params="user_id">
+SELECT CTV.name, CTV.id, CTV.depth, CTV.channel_arch_id, C.org_id,
+ (SELECT COUNT (cp.package_id)
+ FROM rhnchannelpackage cp
+ WHERE cp.channel_id = CTV.id) AS package_count,
+ CTV.parent_or_self_label, CTV.label AS channel_label
+ FROM rhnchannel C, rhnChannelTreeView CTV
+ WHERE CTV.id = C.ID
+ AND (rhn_channel.user_role_check(C.id, :user_id, 'manage') = 1
+ OR EXISTS (
+ SELECT 1
+ FROM rhnChannel C2
+ WHERE C2.parent_channel = C.ID
+ AND rhn_channel.user_role_check(C2.id, :user_id, 'manage') = 1))
+ORDER BY rhn_channel.channel_priority(CTV.parent_or_self_id), CTV.parent_or_self_id, CTV.depth, UPPER(CTV.name)
+ </query>
+</mode>
+
<query name="visible_server_count" params="user_id, org_id">
SELECT SC.channel_id AS ID, count(SC.server_id) as system_count
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java
new file mode 100644
index 0000000..1c1fa4c
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.channel.manage;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionForm;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.manager.channel.ChannelManager;
+import com.redhat.rhn.common.db.datasource.DataResult;
+
+/**
+ * Action responsible for displaying the list of user created software channels.
+ */
+public class ManageChannelsAction extends RhnAction implements Listable {
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping actionMapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
+
+ return actionMapping.findForward("default");
+ }
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+ User user = context.getLoggedInUser();
+ DataResult result = ChannelManager.ownedChannelsTree(user);
+ return result;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 7ca186d..bb2f580 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -11537,6 +11537,25 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>retired channels</strong> that your organization <a href="/rhn/channels/software/Entitlements.do"> is entitled to </a>but are no longer supported by Red Hat because they have reached their 'end-of-life' date.</source>
</trans-unit>
+ <trans-unit id="channels.manage.jsp.toolbar">
+ <source>Software Channel Management</source>
+ </trans-unit>
+
+ <trans-unit id="channels.manage.jsp.header1">
+ <source>The following software channels are owned by your organization.</source>
+ </trans-unit>
+
+ <trans-unit id="channels.manage.jsp.header2">
+ <source>Modify an existing software channel by selecting it from the list below, or create a new software channel. </source>
+ </trans-unit>
+
+ <trans-unit id="toolbar.create.channel">
+ <source>create new channel</source>
+ </trans-unit>
+
+ <trans-unit id="toolbar.clone.channel">
+ <source>clone channel</source>
+ </trans-unit>
<trans-unit id="kickstart.troubleshooting.jsp.header1">
<source>Troubleshooting</source>
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 4de9af4..efd45fd 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -496,6 +496,22 @@ public class ChannelManager extends BaseManager {
DataResult dr = makeDataResult(params, params, lc, m);
return dr;
}
+
+ /**
+ * Returns a list of channels owned by the user.
+ *
+ * @param user cannot be <code>null</code>
+ * @return list of maps containing the channel data
+ */
+ public static DataResult ownedChannelsTree(User user) {
+ SelectMode m = ModeFactory.getMode("Channel_queries", "owned_channels_tree");
+
+ Map params = new HashMap();
+ params.put("user_id", user.getId());
+
+ DataResult dr = makeDataResult(params, params, null, m);
+ return dr;
+ }
/**
* Returns a list of ChannelTreeNodes containing shared channels
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 906845a..99ec11d 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -122,7 +122,7 @@
<rhn-tab name="Manage Software Channels" acl="user_can_manage_channels()">
<rhn-tab-directory>/network/software/channels/manage</rhn-tab-directory>
<rhn-tab-directory>/rhn/channels/manage</rhn-tab-directory>
- <rhn-tab-url>/network/software/channels/manage/index.pxt</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/Manage.do</rhn-tab-url>
<rhn-tab-url>/rhn/channels/manage/errata/Add.do</rhn-tab-url>
<rhn-tab-url>/rhn/channels/manage/errata/AddRedHatErrata.do</rhn-tab-url>
<rhn-tab-url>/rhn/channels/manage/errata/AddCustomErrata.do</rhn-tab-url>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
new file mode 100644
index 0000000..7c84f8f
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
@@ -0,0 +1,71 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+
+<html>
+<body>
+
+<html:errors/>
+<html:messages id="message" message="true">
+ <rhn:messages><c:out escapeXml="false" value="${message}"/></rhn:messages>
+</html:messages>
+
+<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+ imgAlt="channels.overview.toolbar.imgAlt"
+ creationUrl="/rhn/channels/manage/Edit.do"
+ creationType="channel"
+ creationAcl="user_role(channel_admin)"
+ cloneUrl="/network/software/channels/manage/clone.pxt?pxt:trap=rhn:empty_set&set_label=errata_clone_actions"
+ cloneType="channel"
+ cloneAcl="user_role(channel_admin)"
+ helpUrl="channel-mgmt-Custom_Channel_and_Package_Management.jsp"
+ >
+ <bean:message key="channels.manage.jsp.toolbar"/>
+</rhn:toolbar>
+
+<p><bean:message key="channels.manage.jsp.header1"/></p>
+<p><bean:message key="channels.manage.jsp.header2"/></p>
+
+<rl:listset name="groupSet">
+
+ <rl:list emptykey="foo">
+
+ <rl:decorator name="PageSizeDecorator"/>
+
+ <rl:column styleclass="first-column"
+ headerkey="channel.edit.jsp.name"
+ filterattr="name">
+ <c:choose>
+ <c:when test="${current.depth > 1}">
+ <img style="margin-left: 4px;"
+ src="/img/channel_child_node.gif"
+ alt="<bean:message
+ key='channels.childchannel.alt' />"/>
+ <html:link href="/rhn/channels/manage/Edit.do?cid=${current.id}">
+ ${current.name}
+ </html:link>
+ </c:when>
+ <c:otherwise>
+ <html:link href="/rhn/channels/manage/Edit.do?cid=${current.id}">
+ ${current.name}
+ </html:link>
+ </c:otherwise>
+ </c:choose>
+ </rl:column>
+
+ <rl:column styleclass="last-column"
+ headerkey="channels.overview.packages">
+ <html:link href="/rhn/channels/manage/ChannelPackages.do?cid=${current.id}">
+ ${current.package_count}
+ </html:link>
+ </rl:column>
+
+
+ </rl:list>
+</rl:listset>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 277defb..aa68d39 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6207,7 +6207,7 @@
<forward name="success" path="/channels/ChannelDetail.do" redirect="true" />
</action>
- <action path="/channels/manage/ChannelPackages"
+ <action path="/channels/manage/ChannelPackages"
scope="request"
type="com.redhat.rhn.frontend.action.channel.manage.ChannelPackagesAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
@@ -6215,6 +6215,13 @@
<forward name="default" path="/WEB-INF/pages/channel/manage/listremovepackages.jsp" />
</action>
+ <action path="/channels/manage/Manage"
+ scope="request"
+ type="com.redhat.rhn.frontend.action.channel.manage.ManageChannelsAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <forward name="default" path="/WEB-INF/pages/channel/manage/manage.jsp"/>
+ </action>
+
<action path="/channels/manage/Edit"
scope="request"
name="channelEditForm"
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index 79a12f6..b1fa89f 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -105,7 +105,7 @@
</rhn-tab>
<rhn-tab name="Manage Software Channels" acl="user_can_manage_channels()">
<rhn-tab-directory>/network/software/channels/manage</rhn-tab-directory>
- <rhn-tab-url>/network/software/channels/manage/index.pxt</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/Manage.do</rhn-tab-url>
<rhn-tab name="Manage Software Packages" acl="user_role(channel_admin)" node-id="manage_packages">
<rhn-tab-directory>/rhn/software/manage/packages</rhn-tab-directory>
<rhn-tab-url>/rhn/software/manage/packages/PackageList.do</rhn-tab-url>
diff --git a/web/html/network/software/channels/manage/delete_confirm.pxt b/web/html/network/software/channels/manage/delete_confirm.pxt
index 68d6045..1bd485f 100644
--- a/web/html/network/software/channels/manage/delete_confirm.pxt
+++ b/web/html/network/software/channels/manage/delete_confirm.pxt
@@ -94,7 +94,7 @@
<input type="hidden" name="cid" value="{channel_id}" />
<input type="hidden" name="pxt:trap" value="rhn:channel_delete_cb" />
<input type="hidden" name="servers_link" value="/rhn/channels/ChannelSubscribers.do" />
- <input type="hidden" name="redirect_to" value="/network/software/channels/manage/index.pxt" />
+ <input type="hidden" name="redirect_to" value="/rhn/channels/manage/Manage.do" />
<input type="hidden" name="orphaned_packages_redirect" value="/rhn/software/manage/packages/PackageList.do" />
</div>
</pxt-form>
diff --git a/web/html/network/software/channels/manage/errata/clone_confirm.pxt b/web/html/network/software/channels/manage/errata/clone_confirm.pxt
index d2bf9c4..5279d97 100644
--- a/web/html/network/software/channels/manage/errata/clone_confirm.pxt
+++ b/web/html/network/software/channels/manage/errata/clone_confirm.pxt
@@ -36,7 +36,8 @@
<empty_list_message>No Errata.</empty_list_message>
- <action name="Update Errata" label="confirm_errata_application" url="/network/software/channels/manage/index.pxt" />
+ <action name="Update Errata" label="confirm_errata_application" url="/rhn/channels/manage/Manage.do" />
+
</rhn-listview>
</grail-canvas-template>
diff --git a/web/html/network/software/channels/manage/index.pxt b/web/html/network/software/channels/manage/index.pxt
deleted file mode 100644
index 9c74218..0000000
--- a/web/html/network/software/channels/manage/index.pxt
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::ChannelEditor" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Users" />
-
- <rhn-verify-channel-family />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <rhn-toolbar base="h1" img="/img/rhn-icon-channels.gif" creation-type="channel" creation-url="/rhn/channels/manage/Edit.do" help-guide="channel-mgmt" help-url="channel-mgmt-Custom_Channel_and_Package_Management.jsp" creation-acl="user_role(channel_admin)" misc-url="clone.pxt?pxt:trap=rhn:empty_set&set_label=errata_clone_actions" misc-img="/img/action-clone.gif" misc-alt="clone channel" misc-text="clone channel" misc-acl="user_role(channel_admin)">
- Software Channel Management
- </rhn-toolbar>
-
-
- <div class="page-summary">
- <p>
- The following software channels are owned by your organization.
- </p>
- <p>
- Modify an existing software channel by selecting it from the list below<rhn-require acl="user_role(channel_admin)">, or create a new software channel</rhn-require>.
- </p>
- </div>
-
-<rhn-listview class="Sniglets::ListView::ChannelList" mode="owned_channels_tree" template="/network/software/channel_tree.xml">
- <column name="Channel Name" label="name">
- <url>/rhn/channels/manage/Edit.do?cid={column:id}</url>
- </column>
-
- <column name="Actions" label="package_list_modified" align="center" width="5%">
- <url>/network/software/channels/manage/index.pxt?pxt:trap=rhn:update_channel_cache&cid={column:id}</url>
- </column>
-
- <column name="Packages" label="package_count" align="center" width="10%">
- <url>/rhn/channels/manage/ChannelPackages.do?cid={column:id}</url>
- </column>
- <empty_list_message>You do not own any channels.</empty_list_message>
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
index a249d9b..9810b8a 100644
--- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
@@ -328,7 +328,7 @@ sub clonable_errata_list_provider {
foreach my $row (@{$data}) {
$row->{RELATED_CHANNELS} =
join "<br />\n",
- map { PXT::HTML->link('/network/software/channels/manage/index.pxt?cid=' . $_->{CHANNEL_ID},
+ map { PXT::HTML->link('/rhn/channels/manage/Manage.do?cid=' . $_->{CHANNEL_ID},
$_->{CHANNEL_NAME}) } @{$row->{__data__} };
$row->{CLONED} = $row->{ALREADY_CLONED} ? 'Yes' : 'No';
}
14 years, 11 months
Branch 'VADER' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 00751fded2c26268e3dce859ca653f1f897542a4
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Apr 29 09:33:47 2009 -0400
498208 - cobbler webui string correction
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index d94e1c2..1c1bfef 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8182,7 +8182,7 @@ Follow this url to see the full list of inactive systems:
<source>Para-Virtualization is unsupported with the selected kickstart tree or distribution.</source>
</trans-unit>
<trans-unit id="kickstart.cobbler.profile.invalidtreeforvirt">
- <source>You have selected a distribution or kickstart tree that is incompatible with the currently selected virtualization type. Please either select a differnt distribution, or change the selected Virtualization Type of this profile before trying to set the distribution.</source>
+ <source>You have selected a distribution or kickstart tree that is incompatible with the currently selected virtualization type. Please either select a different distribution, or change the selected Virtualization Type of this profile before trying to set the distribution.</source>
</trans-unit>
<trans-unit id="snapshots.childchannel">
<source>Child Channels Updated</source>
14 years, 11 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9fe7f8b9ed99d0e3c279f6f44c0f4bcff21df47
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Apr 29 09:33:47 2009 -0400
498208 - cobbler webui string correction
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index d94e1c2..1c1bfef 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8182,7 +8182,7 @@ Follow this url to see the full list of inactive systems:
<source>Para-Virtualization is unsupported with the selected kickstart tree or distribution.</source>
</trans-unit>
<trans-unit id="kickstart.cobbler.profile.invalidtreeforvirt">
- <source>You have selected a distribution or kickstart tree that is incompatible with the currently selected virtualization type. Please either select a differnt distribution, or change the selected Virtualization Type of this profile before trying to set the distribution.</source>
+ <source>You have selected a distribution or kickstart tree that is incompatible with the currently selected virtualization type. Please either select a different distribution, or change the selected Virtualization Type of this profile before trying to set the distribution.</source>
</trans-unit>
<trans-unit id="snapshots.childchannel">
<source>Child Channels Updated</source>
14 years, 11 months
Branch 'VADER' - selinux/oracle-instantclient-selinux
by Jan Pazdziora
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit d10ebc92bf4cc925f71d9b1a276c01b5059e08e6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 14:28:21 2009 +0200
oracle-instantclient-selinux: Require oracle-instantclient-sqlplus.
If we do not require oracle-instantclient-sqlplus, we will get error like
/usr/bin/execstack: cannot open "/usr/lib/oracle/10.2.*/client*/lib/libsqlplus.so":
No such file or directory
upon rpm installation and
avc: denied { execmod } for pid=6661 comm="ld-linux.so.2" path="/usr/lib/oracle/10.2.0.4/client/lib/libsqlplus.so" dev=dm-0 ino=1341384 scontext=system_u:system_r:prelink_t:s0-s0:c0.c1023 tcontext=system_u:object_r:lib_t:s0 tclass=file
in audit.log, should the *-sqlplus package be installed after
the *-selinux one.
(cherry picked from commit 04aaae7f4a8c2dd3883a36426ee4524287655c00)
diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
index 0a77c42..f1722c8 100644
--- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
+++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
@@ -17,6 +17,7 @@ BuildArch: noarch
Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack, /usr/sbin/selinuxenabled
Requires(postun): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack
Requires: oracle-instantclient-basic
+Requires: oracle-instantclient-sqlplus
Requires: oracle-nofcontext-selinux
%description
14 years, 11 months
Changes to 'refs/tags/oracle-instantclient-selinux-10.2-10'
by Jan Pazdziora
Tag 'oracle-instantclient-selinux-10.2-10' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-04-29 12:32 +0000
Tagging package [oracle-instantclient-selinux] version [10.2-10] in directory [selinux/oracle-instantclient-selinux/].
Changes since spacewalk-config-0.6.4-1-1:
---
0 files changed
---
14 years, 11 months
2 commits - rel-eng/packages selinux/oracle-instantclient-selinux
by Jan Pazdziora
rel-eng/packages/oracle-instantclient-selinux | 2 +-
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2842e0607d9b5a5873ab8c1fb1b37f756b1b670e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 14:32:50 2009 +0200
Automatic commit of package [oracle-instantclient-selinux] minor release [10.2-10].
diff --git a/rel-eng/packages/oracle-instantclient-selinux b/rel-eng/packages/oracle-instantclient-selinux
index d67b934..1d68126 100644
--- a/rel-eng/packages/oracle-instantclient-selinux
+++ b/rel-eng/packages/oracle-instantclient-selinux
@@ -1 +1 @@
-10.2-9 selinux/oracle-instantclient-selinux/
+10.2-10 selinux/oracle-instantclient-selinux/
diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
index dfaebbb..28de76d 100644
--- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
+++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
@@ -1,7 +1,7 @@
Name: oracle-instantclient-selinux
Version: 10.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: SELinux support for Oracle Instant Client
Group: System Environment/Base
License: GPLv2+
@@ -68,6 +68,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Wed Apr 29 2009 Jan Pazdziora 10.2-10
+- Require oracle-instantclient-sqlplus
+
* Wed Apr 29 2009 Jan Pazdziora 10.2-9
- move the %post SELinux activation to
/usr/sbin/oracle-instantclient-selinux-enable
commit 04aaae7f4a8c2dd3883a36426ee4524287655c00
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 14:28:21 2009 +0200
oracle-instantclient-selinux: Require oracle-instantclient-sqlplus.
If we do not require oracle-instantclient-sqlplus, we will get error like
/usr/bin/execstack: cannot open "/usr/lib/oracle/10.2.*/client*/lib/libsqlplus.so":
No such file or directory
upon rpm installation and
avc: denied { execmod } for pid=6661 comm="ld-linux.so.2" path="/usr/lib/oracle/10.2.0.4/client/lib/libsqlplus.so" dev=dm-0 ino=1341384 scontext=system_u:system_r:prelink_t:s0-s0:c0.c1023 tcontext=system_u:object_r:lib_t:s0 tclass=file
in audit.log, should the *-sqlplus package be installed after
the *-selinux one.
diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
index 0cedc6d..dfaebbb 100644
--- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
+++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
@@ -17,6 +17,7 @@ BuildArch: noarch
Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack, /usr/sbin/selinuxenabled
Requires(postun): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack
Requires: oracle-instantclient-basic
+Requires: oracle-instantclient-sqlplus
Requires: oracle-nofcontext-selinux
%description
14 years, 11 months
Branch 'VADER' - spacewalk/config
by Jan Pazdziora
spacewalk/config/spacewalk-config.spec | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit caad38d03aff941c102c31714e41c340acf55895
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 14:03:11 2009 +0200
spacewalk-config: Require httpd, we need the apache group for %files.
(cherry picked from commit c1af7581b62d20e307779cdd4ccd570b9bb08a41)
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index ae479a6..d8f136f 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -20,6 +20,8 @@ Requires(preun): chkconfig
Requires(preun): initscripts
# this is so we can set the password consistently across all jabberd configs
Requires(pre): jabberd
+# We need package httpd to be able to assign group apache in files section
+Requires: httpd
%define prepdir %{_sysconfdir}/sysconfig/rhn-satellite-prep
14 years, 11 months
Changes to 'refs/tags/spacewalk-config-0.6.4-1'
by Jan Pazdziora
Tag 'spacewalk-config-0.6.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-04-29 12:05 +0000
Tagging package [spacewalk-config] version [0.6.4-1] in directory [spacewalk/config/].
Changes since osad-5.9.11-1-1:
---
0 files changed
---
14 years, 11 months
2 commits - rel-eng/packages spacewalk/config
by Jan Pazdziora
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit fba26559cdf266ce5592d5484c9fc6aec03f9ba9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 14:05:26 2009 +0200
Automatic commit of package [spacewalk-config] release [0.6.4-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 88df551..598cc26 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-0.6.3-1 spacewalk/config/
+0.6.4-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index c391f41..248da8c 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -2,7 +2,7 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 0.6.3
+Version: 0.6.4
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -113,6 +113,9 @@ fi
%changelog
+* Wed Apr 29 2009 Jan Pazdziora 0.6.4-1
+- Require httpd, we need the apache group for %files
+
* Thu Apr 16 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.3-1
- 485355 - change perms of /etc/rhn/rhn.conf & /etc/rhn dir
commit c1af7581b62d20e307779cdd4ccd570b9bb08a41
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 14:03:11 2009 +0200
spacewalk-config: Require httpd, we need the apache group for %files.
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 9a19e5d..c391f41 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -20,6 +20,8 @@ Requires(preun): chkconfig
Requires(preun): initscripts
# this is so we can set the password consistently across all jabberd configs
Requires(pre): jabberd
+# We need package httpd to be able to assign group apache in files section
+Requires: httpd
%define prepdir %{_sysconfdir}/sysconfig/rhn-satellite-prep
14 years, 11 months
Branch 'VADER' - client/tools
by Jan Pazdziora
client/tools/osad/osa-dispatcher-selinux/osa-dispatcher-selinux-enable | 15 ++++++
client/tools/osad/osad.spec | 22 ++++------
2 files changed, 24 insertions(+), 13 deletions(-)
New commits:
commit 38a88ebc3820ff19e8e922faad4396015d662f6d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 29 11:27:25 2009 +0200
osa-dispatcher-selinux: move the %post SELinux activation to /usr/sbin/osa-dispatcher-selinux-enable.
This way it won't be called during rpm installation if SELinux
is disabled, and can be called later, once SELinux is enabled.
(cherry picked from commit 8d48a975081bd87d48a6cafa7e43311459664b1f)
diff --git a/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher-selinux-enable b/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher-selinux-enable
new file mode 100644
index 0000000..87a91c2
--- /dev/null
+++ b/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher-selinux-enable
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Install SELinux policy modules
+for selinuxvariant in mls strict targeted
+ do
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -i \
+ /usr/share/selinux/${selinuxvariant}/osa-dispatcher.pp || :
+ done
+
+/usr/sbin/semanage port -a -t osa_dispatcher_upstream_notif_server_port_t -p tcp 1290 > /dev/null 2>&1 || :
+
+rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
+/sbin/restorecon -vvi /var/log/rhn/osa-dispatcher.log
+
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index f8e6ee9..bce75cc 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -77,7 +77,7 @@ Requires: spacewalk-selinux
%if "%{selinux_policyver}" != ""
Requires: selinux-policy >= %{selinux_policyver}
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
Requires(postun): /usr/sbin/semodule, /sbin/restorecon
Requires: osa-dispatcher
@@ -124,6 +124,10 @@ install -p -m 644 osa-dispatcher-selinux/%{modulename}.if \
# Hardlink identical policy module packages together
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+
+# Install osa-dispatcher-selinux-enable which will be called in %post
+install -d %{buildroot}%{_sbindir}
+install -p -m 755 osa-dispatcher-selinux/osa-dispatcher-selinux-enable %{buildroot}%{_sbindir}/osa-dispatcher-selinux-enable
%endif
%clean
@@ -153,18 +157,9 @@ fi
%if %{include_selinux_package}
%post -n osa-dispatcher-selinux
-# Install SELinux policy modules
-for selinuxvariant in %{selinux_variants}
- do
- /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
- && /usr/sbin/semodule -s ${selinuxvariant} -i \
- %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp || :
- done
-
-/usr/sbin/semanage port -a -t osa_dispatcher_upstream_notif_server_port_t -p tcp 1290 > /dev/null 2>&1 || :
-
-rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
-/sbin/restorecon -vvi /var/log/rhn/osa-dispatcher.log
+if /usr/sbin/selinuxenabled ; then
+ %{_sbindir}/osa-dispatcher-selinux-enable
+fi
%postun -n osa-dispatcher-selinux
# Clean up after package removal
@@ -226,6 +221,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
%doc LICENSE
%doc PYTHON-LICENSES.txt
+%attr(0755,root,root) %{_sbindir}/osa-dispatcher-selinux-enable
%endif
# $Id$
14 years, 11 months