spacewalk-commits October 2010

spacewalk-commits@lists.fedorahosted.org

13 participants
568 discussions

rel-eng/packages selinux/spacewalk-monitoring-selinux
by Jan Pazdziora 04 Oct '10

04 Oct '10

rel-eng/packages/spacewalk-monitoring-selinux | 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 2f9979e0fc61c6ac864304c5edd8eb701d9d113f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Oct 4 17:55:13 2010 +0200 Automatic commit of package [spacewalk-monitoring-selinux] release [1.2.1-1]. diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packages/spacewalk-monitoring-selinux index d49aa94..6cb6a41 100644 --- a/rel-eng/packages/spacewalk-monitoring-selinux +++ b/rel-eng/packages/spacewalk-monitoring-selinux @@ -1 +1 @@ -1.1.1-1 selinux/spacewalk-monitoring-selinux/ +1.2.1-1 selinux/spacewalk-monitoring-selinux/ diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec index 8a02ba7..bc64fd4 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-monitoring Name: spacewalk-monitoring-selinux -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk monitoring @@ -144,6 +144,10 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable %changelog +* Mon Oct 04 2010 Jan Pazdziora 1.2.1-1 +- 619014 - allow monitoring to read usr files as that's where some perl module + now live. + * Mon Apr 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.1-1 - bumping spec files to future 1.1 packages

1 0

selinux/spacewalk-monitoring-selinux
by Jan Pazdziora 04 Oct '10

04 Oct '10

selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 257376e6b9a18ac17ac25f2249e95e4c3fa786f0 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Oct 4 17:53:32 2010 +0200 619014 - allow monitoring to read usr files as that's where some perl module now live. Addressing type=AVC msg=audit(1286183040.884:35472): avc: denied { open } for pid=1251 comm="MonitoringScout" name="Object.pm" dev=dm-0 ino=2383281 scontext=unconfined_u:system_r:spacewalk_monitoring_t:s0 tcontext=system_u:object_r:usr_t:s0 tclass=file diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te index 2a92320..febb6c5 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te @@ -167,3 +167,6 @@ allow spacewalk_monitoring_t self:process setpgid; optional_policy(` samba_stream_connect_winbind(spacewalk_monitoring_t) ') +optional_policy(` + files_read_usr_files(spacewalk_monitoring_t) +')

1 0

3 commits - java/code web/html
by Colin Coe 04 Oct '10

04 Oct '10

java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 12 java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java | 5 java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java | 150 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 2 java/code/webapp/WEB-INF/nav/activation_key.xml | 2 java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp | 73 ++++ java/code/webapp/WEB-INF/struts-config.xml | 20 + web/html/nav/activation_key.xml | 2 9 files changed, 272 insertions(+), 8 deletions(-) New commits: commit b7cdf573fe80002d7575958fa42cafebf9e0587f Author: Colin Coe <coec(a)war.coesta.com> Date: Mon Oct 4 22:02:51 2010 +0800 Fix checkstyle errors diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java index f55b2c1..2dd7a6c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java @@ -51,10 +51,10 @@ public class ActivationKeyChildChannelsAction extends RhnAction { private static final String POSSIBLE_CHANNELS = "possibleChannels"; private static final String SELECTED_CHANNEL = "selectedChannel"; - - - /** { inheritDoc} */ - @Override + /** + * + * {@inheritDoc} + */ public ActionForward execute(ActionMapping mapping, ActionForm formIn, HttpServletRequest request, commit 35d9a4b6ea2e8d50685260cda0394f25e779ca28 Author: Colin Coe <coec(a)war.coesta.com> Date: Mon Oct 4 21:58:30 2010 +0800 Remove commented code in SSMUpdateHardwareProfileConfirm.java diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java index 3985d6d..376ac15 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java @@ -67,14 +67,9 @@ public class SSMUpdateHardwareProfileConfirm extends RhnAction implements Listab if (isSubmitted(daForm)) { Iterator it = set.iterator(); Set<Long> serverIds = new HashSet<Long>(); -// Long serverIds[] = new Long[set.size()]; -// Integer i = 0; while (it.hasNext()) { Long sid = ((RhnSetElement)it.next()).getElement(); serverIds.add(sid); -// Server server = SystemManager.lookupByIdAndUser(sid, user); -// serverIds[i] = sid; -// i++; } Date now = new Date(); commit 531cc97fec1b13ae20d6cbac2b62f694ea6abbcb Author: Colin Coe <coec(a)war.coesta.com> Date: Mon Oct 4 21:56:25 2010 +0800 Port /network/account/activation_keys/child_channels.pxt 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 0255e9f..cdda7a3 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 @@ -1251,6 +1251,18 @@ END; </query> </callable-mode> +<mode name="activation_key_child_channels"> + <query params="token_id, user_id"> + SELECT DISTINCT c1.id as id, + (select name from rhnChannel C2 where c1.parent_channel = c2.id) parent, + c1.name as name, + NVL2((SELECT 1 FROM rhnRegTokenChannels WHERE token_id = :token_id AND channel_id = c1.id), 'selected', '') s + FROM rhnChannel c1 inner join rhnUserChannel UC on UC.channel_id = C1.id + AND c1.parent_channel IS NOT NULL + AND UC.user_id = :user_id + ORDER BY parent, name + </query> +</mode> <callable-mode name="can_convert_to_flex"> <query params="result, sid, cfid"> {:result = call rhn_channel.convert_to_fve(:sid, :cfid)} diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java new file mode 100644 index 0000000..f55b2c1 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java @@ -0,0 +1,150 @@ +/** + * Copyright (c) 2009--2010 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.token; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.SelectMode; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.ChannelFactory; +import com.redhat.rhn.domain.token.ActivationKey; +import com.redhat.rhn.domain.token.ActivationKeyFactory; +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.manager.token.ActivationKeyManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * ActivationKeyDetailsAction + * @version $Rev$ + */ +public class ActivationKeyChildChannelsAction extends RhnAction { + private static final String CHANNELS = "channels"; + private static final Long DEFAULT_CHANNEL_ID = -1L; + private static final String POSSIBLE_CHANNELS = "possibleChannels"; + private static final String SELECTED_CHANNEL = "selectedChannel"; + + + + /** { inheritDoc} */ + @Override + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + RequestContext context = new RequestContext(request); + DynaActionForm form = (DynaActionForm) formIn; + + ActivationKey key = context.lookupAndBindActivationKey(); + Map params = new HashMap(); + String fwd = "default"; + + request.setAttribute("description", key.getNote()); + + if (context.isSubmitted()) { + params.put(RequestContext.TOKEN_ID, key.getId().toString()); + update(form, context); + fwd = "success"; + } + else { + populateForm(form, key, context); + } + + return getStrutsDelegate().forwardParams( + mapping.findForward(fwd), params); + + } + + private ActivationKey update(DynaActionForm form, RequestContext context) { + User user = context.getLoggedInUser(); + ActivationKeyManager manager = ActivationKeyManager.getInstance(); + ActivationKey key = context.lookupAndBindActivationKey(); + + Channel base = key.getBaseChannel(); + key.clearChannels(); + if (base != null) { + key.addChannel(base); + } + + for (String id : (String[])form.get("childChannels")) { + key.addChannel(ChannelFactory.lookupById(Long.parseLong(id.trim()))); + } + + ActivationKeyFactory.save(key); + ActionMessages msg = new ActionMessages(); + addToMessage(msg, "activation-key.java.modified", key.getNote()); + + getStrutsDelegate().saveMessages(context.getRequest(), msg); + return key; + } + + private void populateForm(DynaActionForm form, ActivationKey key, + RequestContext context) { + context.getRequest().setAttribute(CHANNELS, key.getChannels()); + + User user = context.getLoggedInUser(); + DataResult<HashMap> channelList = getPossibleChannels(user, key.getId()); + ArrayList finalList = new ArrayList(); + + if (key.getBaseChannel() != null) { + for (HashMap c : channelList) { + Long id = (Long)c.get("id"); + if (ChannelFactory.lookupById(id).getParentChannel().getId() == + key.getBaseChannel().getId()) { + finalList.add(c); + } + } + context.getRequest().setAttribute("baseChannel", + key.getBaseChannel().getName()); + } + else { + finalList = (ArrayList)channelList; + } + context.getRequest().setAttribute(CHANNELS, finalList); + form.set(CHANNELS, finalList); + } + + private void addToMessage(ActionMessages msgs, String key, Object... args) { + ActionMessage temp = new ActionMessage(key, args); + msgs.add(ActionMessages.GLOBAL_MESSAGE, temp); + } + + private static DataResult getPossibleChannels(User user, Long tokenId) { + SelectMode m = ModeFactory.getMode("Channel_queries", + "activation_key_child_channels"); + Map params = new HashMap(); + params.put("user_id", user.getId()); + params.put("token_id", tokenId); + DataResult list = m.execute(params); + list.elaborate(); + return list; + } + +} 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 175754f..6daaf24 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 @@ -12939,6 +12939,20 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <group> <context-group name="ctx"> + <context context-type="sourcefile">/rhn/activationkeys/childchannels/* pages</context> + </context-group> + + <trans-unit id="activation-key.childchannels.jsp.summary"> + <source>Any system registered using this activation key will be subscribed to the selected child channels.</source> + </trans-unit> + + <trans-unit id="activation-key.childchannels.jsp.blurb"> + <source>The following child channels of <strong>{0}</strong> can be associated with this activation key.</source> + </trans-unit> + </group> + + <group> + <context-group name="ctx"> <context context-type="sourcefile">/rhn/activationkeys/configuration/* pages</context> </context-group> 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 3f4c6c3..47d1002 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -508,7 +508,7 @@ public class ChannelManager extends BaseManager { /** * Returns a list of ChannelTreeNodes that have orgId null - * or has a prarent with org_id null + * or has a parent with org_id null * @param user who we are requesting Red Hat channels for * @param lc ListControl to use * @return list of ChannelTreeNode's diff --git a/java/code/webapp/WEB-INF/nav/activation_key.xml b/java/code/webapp/WEB-INF/nav/activation_key.xml index c2b48c5..4343276 100644 --- a/java/code/webapp/WEB-INF/nav/activation_key.xml +++ b/java/code/webapp/WEB-INF/nav/activation_key.xml @@ -2,7 +2,7 @@ <rhn-navi-tree label="activation_key" invisible="1" title-depth="1" formvar="tid" acl_mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler"> <rhn-tab name="Details" url="/rhn/activationkeys/Edit.do" /> - <rhn-tab name="Child Channels" url="/network/account/activation_keys/child_channels.pxt" /> + <rhn-tab name="Child Channels" url="/rhn/activationkeys/channels/ChildChannels.do"/> <rhn-tab name="Packages" url="/rhn/activationkeys/packages/Packages.do"/> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp new file mode 100644 index 0000000..4b1d99f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp @@ -0,0 +1,73 @@ +<%@ 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" %> + +<html> + +<head> + <meta name="name" value="activationkeys.jsp.header" /> +</head> + +<body> +<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> + +<html:form action="/activationkeys/channels/ChildChannels"> + + <div class="page-summary"> + <p> + <bean:message key="activation-key.childchannels.jsp.summary"/> + </p> + <c:if test='${not empty baseChannel}'> + <bean:message key="activation-key.childchannels.jsp.blurb" arg0="${baseChannel}"/> + </c:if> + + <table class="details"> + <tr> + <td> + <select multiple="multiple" name="childChannels" size="6"> + <c:set var="first" scope="session" value="yes"/> + <c:forEach items="${channels}" var="channel" varStatus="loop"> + <c:choose> + <c:when test="${first == 'yes'}"> + <c:set var="first" scope="session" value="no"/> + <c:set var="last_parent" scope="session" value="${channel.parent}"/> + <c:if test="${empty baseChannel}"> + <optgroup label="${channel.parent}"> + </c:if> + </c:when> + <c:otherwise> + <c:if test="${(channel.parent != last_parent) && empty baseChannel}"> + </optgroup> + <optgroup label="${channel.parent}"> + </c:if> + </c:otherwise> + </c:choose> + <option value="${channel.id}" ${channel.s}>${channel.name}</option> + <c:set var="last_parent" scope="session" value="${channel.parent}"/> + </c:forEach> + <c:if test="${empty baseChannel}"> + </optgroup> + </c:if> + </select> + </td> + </tr> + </table> + + <div align="right"> + <rhn:submitted/> + <hr/> + <input type="submit" name ="dispatch" value='<bean:message key="keyedit.jsp.submit"/>'/> + </div> + + <html:hidden property="submitted" value="true" /> + <c:if test='${not empty param.tid}'> + <html:hidden property="tid" value="${param.tid}" /> + </c:if> + + </div> +</html:form> + +</body> +</html> + diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index f872e86..d4c7c16 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -27,6 +27,12 @@ <form-property name="packages" type="java.lang.String"/> <form-property name="submitted" type="java.lang.Boolean"/> </form-bean> + <form-bean name="activationKeyChildChannelForm" + type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm"> + <form-property name="channels" type="java.util.ArrayList"/> + <form-property name="childChannels" type="java.lang.String[]"/> + <form-property name="submitted" type="java.lang.Boolean"/> + </form-bean> <form-bean name="storedProfileForm" type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm"> <form-property name="name" type="java.lang.String"/> @@ -4912,6 +4918,20 @@ path="/activationkeys/List.do"/> </action> + <action path="/activationkeys/channels/ChildChannels" + name="activationKeyChildChannelForm" + scope="request" + input="/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp" + type="com.redhat.rhn.frontend.action.token.ActivationKeyChildChannelsAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping" + parameter="dispatch"> + <set-property property="acls" value="user_role(activation_key_admin)"/> + <forward name="default" + path="/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp"/> + <forward name="success" redirect="true" + path="/activationkeys/channels/ChildChannels.do"/> + </action> + <action path="/activationkeys/packages/Packages" name="activationKeyPackagesForm" scope="request" diff --git a/web/html/nav/activation_key.xml b/web/html/nav/activation_key.xml index a0a1202..69a3ca7 100644 --- a/web/html/nav/activation_key.xml +++ b/web/html/nav/activation_key.xml @@ -3,7 +3,7 @@ <rhn-formvar name="tid" /> <rhn-tab name="Details" url="/rhn/activationkeys/Edit.do" /> - <rhn-tab name="Child Channels" url="/network/account/activation_keys/child_channels.pxt" /> + <rhn-tab name="Child Channels" url="/rhn/activationkeys/channels/ChildChannels.do"/> <rhn-tab name="Packages" url="/rhn/activationkeys/packages/Packages.do"/>

1 0

10 commits - schema/spacewalk
by Lukas Zapletal 04 Oct '10

04 Oct '10

schema/spacewalk/oracle/procs/delete_server.sql | 10 - schema/spacewalk/oracle/procs/lookup_config_info.sql | 21 +-- schema/spacewalk/oracle/triggers/rhnConfigRevision.sql | 15 -- schema/spacewalk/postgres/procs/delete_server.sql | 4 schema/spacewalk/postgres/procs/lookup_config_info.sql | 22 ++- schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 6 schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql | 39 ++++-- schema/spacewalk/postgres/triggers/rhnPackage.sql | 64 +++++++--- schema/spacewalk/postgres/triggers/web_user_personal_info.sql | 17 -- 9 files changed, 110 insertions(+), 88 deletions(-) New commits: commit 3681604b735fc05cf55307cba00c33e5a098ea0b Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 15:02:25 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/triggers/web_user_personal_info.sql b/schema/spacewalk/postgres/triggers/web_user_personal_info.sql index 36f0331..4b07e07 100644 --- a/schema/spacewalk/postgres/triggers/web_user_personal_info.sql +++ b/schema/spacewalk/postgres/triggers/web_user_personal_info.sql @@ -1,4 +1,4 @@ --- -- oracle equivalent source sha1 50d71d29fcb58e20fdeb000046ab5d5a60ac5082 +-- oracle equivalent source sha1 57b352ea9792142fc34a3240b4d4a8ea57e740c1 -- retrieved from ./1239053651/49a123cbe214299834e6ce97b10046d8d9c7642a/schema/spacewalk/oracle/triggers/web_user_personal_info.sql -- -- Copyright (c) 2008--2010 Red Hat, Inc. @@ -19,16 +19,14 @@ -- -- triggers for web_user_personal_info -create or replace function web_user_pi_timestamp_fun() returns trigger -as +create or replace function web_user_pi_timestamp_fun() returns trigger as $$ - -BEGIN +begin new.modified := current_timestamp; - RETURN new; -END; -$$ LANGUAGE PLPGSQL; + return new; +end; +$$ language plpgsql; create trigger @@ -36,6 +34,3 @@ web_user_pi_timestamp BEFORE INSERT OR UPDATE ON web_user_personal_info FOR EACH ROW execute procedure web_user_pi_timestamp_fun(); - - - commit 9dff1f7c8455b4c5fca3b7b8712cc30c2dd50aa9 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 14:56:20 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/triggers/rhnPackage.sql b/schema/spacewalk/postgres/triggers/rhnPackage.sql index 40706c0..f04b720 100644 --- a/schema/spacewalk/postgres/triggers/rhnPackage.sql +++ b/schema/spacewalk/postgres/triggers/rhnPackage.sql @@ -1,22 +1,60 @@ --- -- oracle equivalent source sha1 12b86774d397b362eff24f4d99490b8b6d77e9ad +-- oracle equivalent source sha1 dd67fdd68ffa211b0ce8f216f83cac4764c3a187 -- retrieved from ./1241132947/9984c41fb98d15becf3c29432c19cd7a266dece4/schema/spacewalk/oracle/triggers/rhnPackage.sql +-- +-- Copyright (c) 2008-2010 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. +-- + create or replace function rhn_package_mod_trig_fun() returns trigger as $$ begin - new.modified := current_timestamp; + -- when we do a sat sync, we use last_modified to keep track + -- of the upstream modification date. So if we're setting + -- it explicitly, don't override with sysdate. But if we're + -- not changing it, then this is a genuine update that needs + -- tracking. + -- + -- we're not using is_satellite() here instead, because we + -- might want to use this to keep webdev in sync. + if tg_op='UPDATE' then + if new.last_modified = old.last_modified or + new.last_modified is null then + new.last_modified := current_timestamp; + end if; + else + if new.last_modified is null then + new.last_modified := current_timestamp; + end if; + end if; + new.modified := current_timestamp; - if tg_op='UPDATE' then - if new.last_modified = old.last_modified or - new.last_modified is null then - new.last_modified := current_timestamp; - end if; - else - if new.last_modified is null then - new.last_modified := current_timestamp; - end if; - end if; + -- bz 619337 if we are updating the checksum, we need to + -- update the last modified time on all the channels the package is in + if tg_op='UPDATE' and new.checksum_id != old.checksum_id then + update rhnChannel + set last_modified = current_timestamp + where id in (select channel_id + from rhnChannelPackage + where package_id = new.id); + insert into rhnRepoRegenQueue (id, CHANNEL_LABEL, REASON) + (select nextval('rhn_repo_regen_queue_id_seq'), C.label, 'checksum modification' + from rhnChannel C inner join + rhnChannelPackage CP on CP.channel_id = C.id + where CP.package_id = new.id); + delete from rhnPackageRepodata where package_id = new.id; + end if; - return new; + return new; end; $$ language plpgsql; commit ca1a0458b6957920d65191d491aacb8630e8048f Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 13:56:48 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql index fa08d4b..dbeca40 100644 --- a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql +++ b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql @@ -1,21 +1,36 @@ --- -- oracle equivalent source sha1 dad3fd270a0d44713bb4d0f05b748171f225ba64 +-- oracle equivalent source sha1 c45cd255b9c4c2b269de03d887589658321e4144 -- retrieved from ./1241132947/9984c41fb98d15becf3c29432c19cd7a266dece4/schema/spacewalk/oracle/triggers/rhnKickstartableTree.sql +-- +-- Copyright (c) 2008-2010 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. +-- + create or replace function rhn_kstree_mod_trig_fun() returns trigger as $$ begin - new.modified := current_timestamp; - - if tg_op='UPDATE' then - if new.last_modified = old.last_modified or - new.last_modified is null then - new.last_modified := current_timestamp; - end if; - else - if new.last_modified is null then - new.last_modified := current_timestamp; - end if; + if tg_op='UPDATE' and ( + new.cobbler_id = old.cobbler_id and + new.cobbler_xen_id = old.cobbler_xen_id and + new.last_modified = old.last_modified or + new.last_modified is null + ) then + new.last_modified := current_timestamp; + elseif tg_op='INSERT' and new.last_modified is null then + new.last_modified := current_timestamp; end if; + new.modified := current_timestamp; + return new; end; $$ language plpgsql; commit 6fe740b5cbac82a508a70dff43986bf595ef8195 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 12:13:30 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql index 101b91f..500ec4a 100644 --- a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql +++ b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql @@ -1,4 +1,4 @@ --- -- oracle equivalent source sha1 d5186095aa52f20774e7d1d34a674600d0eef083 +-- oracle equivalent source sha1 8640dd69620977b6e347b937853647990cb1080c -- retrieved from ./1241132947/9984c41fb98d15becf3c29432c19cd7a266dece4/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql -- -- Copyright (c) 2008--2010 Red Hat, Inc. @@ -58,6 +58,7 @@ begin where cf.id = new.config_file_id and cf.config_channel_id = cc.org_id and cc.org_id = oq.org_id + and new.config_file_type_id = (select id from rhnConfigFileType where label='file') and new.config_content_id = content.id; if added > available then @@ -107,6 +108,3 @@ rhn_confrevision_del_trig before delete on rhnConfigRevision for each row execute procedure rhn_confrevision_del_trig_fun(); - - - commit 4e814905efd5c4858bf2dc7e5cff7ea7d179bb25 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 12:13:11 2010 +0200 old changelogs from Oracle sql script(s) removed diff --git a/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql b/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql index 939f3bf..1bd3bc8 100644 --- a/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql +++ b/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql @@ -85,18 +85,3 @@ begin end; / show errors - --- --- --- Revision 1.4 2004/01/07 20:49:12 pjones --- bugzilla: none -- this needs to be done in application code --- --- Revision 1.3 2004/01/05 20:35:41 pjones --- bugzilla: 112553 -- fix the insert case for quota --- --- Revision 1.2 2003/12/19 22:07:30 pjones --- bugzilla: 112392 -- quota support for config files --- --- Revision 1.1 2003/11/14 21:00:44 pjones --- bugzilla: none -- snapshot invalid on config rev removal --- commit 6f46ae7ded3a1f50d3fe7ac81da002af034c1cdd Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 12:00:17 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql index 6ba0be3..5a9ca46 100644 --- a/schema/spacewalk/postgres/procs/lookup_config_info.sql +++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql @@ -1,4 +1,4 @@ --- -- oracle equivalent source sha1 0c237c905234e929d8cca49d6d44b62cd2bede5c +-- oracle equivalent source sha1 a16dfd9a7caabf77b2070468ed52c815d9e466a9 -- retrieved from ./1249507968/a04b2169abc1974cee1a27cc15be4c4f9ba60dc1/schema/spacewalk/oracle/procs/lookup_config_info.sql -- -- Copyright (c) 2008--2010 Red Hat, Inc. commit 54a18964cb2a0671d2a1db6aaf2d4c4314d650d7 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 11:58:11 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql index 1cb276e..6ba0be3 100644 --- a/schema/spacewalk/postgres/procs/lookup_config_info.sql +++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql @@ -21,7 +21,8 @@ lookup_config_info username_in in varchar, groupname_in in varchar, filemode_in in numeric, - selinux_ctx_in in varchar + selinux_ctx_in in varchar, + symlink_target_id in numeric ) returns numeric as @@ -32,10 +33,15 @@ declare lookup_cursor cursor for select id from rhnConfigInfo - where username = username_in - and groupname = groupname_in - and filemode = filemode_in - and nvl(selinux_ctx, ' ') = nvl(selinux_ctx_in, ' '); + where 1=1 + and (username = username_in or (username is null and username_in is null)) + and (groupname = groupname_in or (groupname is null and groupname_in is null)) + and (filemode = filemode_in or (filemode is null and filemode_in is null)) + and (selinux_ctx = selinux_ctx_in or + (selinux_ctx is null and selinux_ctx_in is null)) + and (symlink_target_filename_id = symlink_target_id or + (symlink_target_filename_id is null and symlink_target_id is null)) + ; begin for r in lookup_cursor loop return r.id; @@ -43,8 +49,8 @@ begin -- If we got here, we don't have the id select nextval('rhn_confinfo_id_seq') into v_id; insert into rhnConfigInfo - (id, username, groupname, filemode, selinux_ctx) - values (v_id, username_in, groupname_in, filemode_in, selinux_ctx_in); + (id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id) + values (v_id, username_in, groupname_in, filemode_in, selinux_ctx_in, symlink_target_id); return v_id; end; $$ language plpgsql; commit f550334a6c1a2bd6bfe79ddd4c41eedd01d9462c Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 11:58:02 2010 +0200 old changelogs from Oracle sql script(s) removed plus reformating where clause diff --git a/schema/spacewalk/oracle/procs/lookup_config_info.sql b/schema/spacewalk/oracle/procs/lookup_config_info.sql index 5121f04..bfbe3b2 100644 --- a/schema/spacewalk/oracle/procs/lookup_config_info.sql +++ b/schema/spacewalk/oracle/procs/lookup_config_info.sql @@ -32,11 +32,13 @@ is select id from rhnConfigInfo where 1=1 - and nvl(username, ' ') = nvl(username_in, ' ') - and nvl(groupname,' ') = nvl(groupname_in, ' ') - and nvl(filemode, -1) = nvl(filemode_in, -1) - and nvl(selinux_ctx, ' ') = nvl(selinux_ctx_in, ' ') - and nvl(symlink_target_filename_id, -1) = nvl(symlink_target_id, -1) + and (username = username_in or (username is null and username_in is null)) + and (groupname = groupname_in or (groupname is null and groupname_in is null)) + and (filemode = filemode_in or (filemode is null and filemode_in is null)) + and (selinux_ctx = selinux_ctx_in or + (selinux_ctx is null and selinux_ctx_in is null)) + and (symlink_target_filename_id = symlink_target_id or + (symlink_target_filename_id is null and symlink_target_id is null)) ; begin for r in lookup_cursor loop @@ -53,12 +55,3 @@ begin end lookup_config_info; / show errors - --- --- Revision 1.1 2003/11/10 15:36:27 pjones --- bugzilla: 109083 -- lookup for rhnConfigInfo --- --- Revision 1.1 2003/10/15 18:30:34 misa --- bugzilla: 106911 Added a lookup function for rhnConfigFileInfo --- --- commit 54f80709cda1c6b2952130b162b5b7eb072a4cf9 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 10:38:18 2010 +0200 Oracle-Postgres schema synchronization diff --git a/schema/spacewalk/postgres/procs/delete_server.sql b/schema/spacewalk/postgres/procs/delete_server.sql index df0bdd8..bbec049 100644 --- a/schema/spacewalk/postgres/procs/delete_server.sql +++ b/schema/spacewalk/postgres/procs/delete_server.sql @@ -1,5 +1,6 @@ -- -- oracle equivalent source sha1 e16a211073e298ca515b54eb9c5eb51896463108 -- retrieved from ./1241139299/9d12c670ec75dda96634543d6082c6162eee0e97/schema/spacewalk/oracle/procs/delete_server.sql +-- one difference from Oracle (see TODO) -- -- Copyright (c) 2008--2010 Red Hat, Inc. -- @@ -150,7 +151,6 @@ begin delete from rhnActionConfigChannel where server_id = server_id_in; delete from rhnActionConfigRevision where server_id = server_id_in; delete from rhnActionPackageRemovalFailure where server_id = server_id_in; - delete from rhnChannelFamilyLicenseConsent where server_id = server_id_in; delete from rhnClientCapability where server_id = server_id_in; delete from rhnCpu where server_id = server_id_in; -- there's still a cascade here, because the constraint keeps the @@ -232,6 +232,8 @@ begin WHERE SN.server_id = server_id_in) ); + -- delete from time_series TODO + delete from rhn_check_probe where host_id = server_id_in; delete from rhn_host_probe where host_id = server_id_in; commit 51515994a16673de06a8e2a074a2d218b60c0a27 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Mon Oct 4 10:37:49 2010 +0200 old changelogs from Oracle sql script(s) removed diff --git a/schema/spacewalk/oracle/procs/delete_server.sql b/schema/spacewalk/oracle/procs/delete_server.sql index 76ad858..2bcd74c 100644 --- a/schema/spacewalk/oracle/procs/delete_server.sql +++ b/schema/spacewalk/oracle/procs/delete_server.sql @@ -258,13 +258,3 @@ begin end delete_server; / show errors; - --- --- Revision 1.25 2004/11/01 17:53:03 pjones --- bugzilla: 136124 -- Fix the "no data found" when deleting rhn_sat_cluster --- --- --- --- --- This deletes a list of server. ---

1 0

Changes to 'refs/tags/spacewalk-utils-1.2.2-1'
by Michael Mraka 04 Oct '10

04 Oct '10

Tag 'spacewalk-utils-1.2.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-10-04 09:29 +0000 Tagging package [spacewalk-utils] version [1.2.2-1] in directory [utils/]. Changes since spacewalk-proxy-1.2.3-1: Michael Mraka (1): Automatic commit of package [spacewalk-utils] release [1.2.2-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka 04 Oct '10

04 Oct '10

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 0a03fa84943a5e11aa0bfd8f3e939dbe6ddae2fe Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 4 11:29:10 2010 +0200 Automatic commit of package [spacewalk-utils] release [1.2.2-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 314f49b..e81606e 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.2.1-1 utils/ +1.2.2-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index bdeb65d..331249c 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.2-1 +- replaced local copy of compile.py with standard compileall module + * Thu Sep 09 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.1-1 - 599030 - check whether SSL certificate generation was successful (tlestach(a)redhat.com)

1 0

Changes to 'refs/tags/spacewalk-proxy-1.2.3-1'
by Michael Mraka 04 Oct '10

04 Oct '10

Tag 'spacewalk-proxy-1.2.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-10-04 09:28 +0000 Tagging package [spacewalk-proxy] version [1.2.3-1] in directory [proxy/proxy/]. Changes since spacewalk-koan-0.2.9-1: Michael Mraka (1): Automatic commit of package [spacewalk-proxy] release [1.2.3-1]. --- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

proxy/proxy rel-eng/packages
by Michael Mraka 04 Oct '10

04 Oct '10

proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b2f2a0b6be0f514c7384688ec214ebd8e820168c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 4 11:28:48 2010 +0200 Automatic commit of package [spacewalk-proxy] release [1.2.3-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index d347f25..653536b 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.2.2 +Version: 1.2.3 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -320,6 +320,9 @@ fi %changelog +* Mon Oct 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.3-1 +- replaced local copy of compile.py with standard compileall module + * Wed Sep 01 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.2-1 - 629330 - do not remove /var/cache/rhn/* during upgrade - 629330 - do not remove /var/spool/rhn-proxy/list itself, only its content diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index 275c504..3781612 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.2.2-1 proxy/proxy/ +1.2.3-1 proxy/proxy/

1 0

Changes to 'refs/tags/spacewalk-koan-0.2.9-1'
by Michael Mraka 04 Oct '10

04 Oct '10

Tag 'spacewalk-koan-0.2.9-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-10-04 09:28 +0000 Tagging package [spacewalk-koan] version [0.2.9-1] in directory [client/tools/spacewalk-koan/]. Changes since spacewalk-certs-tools-1.2.1-1: Michael Mraka (1): Automatic commit of package [spacewalk-koan] release [0.2.9-1]. --- client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 04 Oct '10

04 Oct '10

client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit a75bb656cba9d911d4b0bcd25025229f94787973 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 4 11:28:08 2010 +0200 Automatic commit of package [spacewalk-koan] release [0.2.9-1]. diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index f1c8567..b7d6d46 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 0.2.8 +Version: 0.2.9 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/ %changelog +* Mon Oct 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.2.9-1 +- replaced local copy of compile.py with standard compileall module + * Fri Sep 24 2010 Justin Sherrill <jsherril(a)redhat.com> 0.2.8-1 - 637273 - fixing error with reprovisiong (unexpected keyword argument cache_only) (jsherril(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index acc835b..9e707bc 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -0.2.8-1 client/tools/spacewalk-koan/ +0.2.9-1 client/tools/spacewalk-koan/

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2010