spacewalk/admin
by Jan Pazdziora
spacewalk/admin/rhn-config-satellite.pl | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 92f8d65a57d9cb336ead4880705d72157828feeb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 10:49:29 2011 +0200
For config files created in /etc/rhn, do chgrp apache.
diff --git a/spacewalk/admin/rhn-config-satellite.pl b/spacewalk/admin/rhn-config-satellite.pl
index 312c284..d1b9896 100755
--- a/spacewalk/admin/rhn-config-satellite.pl
+++ b/spacewalk/admin/rhn-config-satellite.pl
@@ -47,6 +47,9 @@ open(TARGET, "< $target") or die "Could not open $target: $OS_ERROR";
unlink $tmpfile if -e $tmpfile;
umask 0027;
open(TMP, "> $tmpfile") or die "Could not open $tmpfile for writing: $OS_ERROR";
+if ($tmpfile =~ m!^/etc/rhn/!) {
+ chown 0, scalar(getgrnam("apache")), $tmpfile;
+}
while (my $line = <TARGET>) {
if ($line =~ /\[prompt\]/ or $line =~ /^#/) {
13 years
client/debian
by Šimon Lukašík
client/debian/apt-spacewalk/test/Makefile | 11 +
client/debian/apt-spacewalk/test/PURPOSE | 21 ++
client/debian/apt-spacewalk/test/equivs-template | 7
client/debian/apt-spacewalk/test/library.sh | 26 +++
client/debian/apt-spacewalk/test/runtest.sh | 163 +++++++++++++++++++++++
client/debian/apt-spacewalk/test/settings.sh | 7
client/debian/apt-spacewalk/test/sw_deb.py | 101 ++++++++++++++
7 files changed, 336 insertions(+)
New commits:
commit 231e5865d93255a7db2ec89b2ad3bb32345cb056
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 23:28:11 2011 +0200
The Apt-Spacewalk sanity test
diff --git a/client/debian/apt-spacewalk/test/Makefile b/client/debian/apt-spacewalk/test/Makefile
new file mode 100644
index 0000000..fb773e2
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/Makefile
@@ -0,0 +1,11 @@
+
+.PHONY: run build
+
+SCRIPTS=runtest.sh library.sh settings.sh sw_deb.py
+FILES=$(SCRIPTS) equivs-template
+
+run: $(FILES) build
+ ./runtest.sh
+
+build:
+ chmod a+x $(SCRIPTS)
diff --git a/client/debian/apt-spacewalk/test/PURPOSE b/client/debian/apt-spacewalk/test/PURPOSE
new file mode 100644
index 0000000..5a72dd0
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/PURPOSE
@@ -0,0 +1,21 @@
+Name: apt-spacewalk/sanity
+Summary: Spacewalk Debian Client -- Sanity Test
+Author: Simon Lukasik
+License: GNU GPLv2
+Description:
+
+The test automates basic package management scenario for Debian clients.
+
+ * Creation of debian channels
+ * Creation of an activation key
+ * Registration with the activation key
+ * rhnpush of Debian packages
+ * rhn-profile-sync
+ * Download of the repository metadata from Spacewalk
+ * Installation of packages from Spacewalk
+ * Scheduling of remote action to install/update packages
+ * rhn_check
+ * Update against Spacewalk
+ * System deletion
+ * Child and base channels are used
+ * No-arch and arch-dependent packages are used
diff --git a/client/debian/apt-spacewalk/test/equivs-template b/client/debian/apt-spacewalk/test/equivs-template
new file mode 100644
index 0000000..637feb5
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/equivs-template
@@ -0,0 +1,7 @@
+Section: misc
+Priority: optional
+Standards-Version: 3.6.2
+Package: %name%
+Version: %version%
+Description: Dummy testing package
+Architecture: %arch%
diff --git a/client/debian/apt-spacewalk/test/library.sh b/client/debian/apt-spacewalk/test/library.sh
new file mode 100755
index 0000000..8ae36df
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/library.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Workaround the bug 700525
+touch /etc/redhat-release
+
+. /usr/share/beakerlib/beakerlib.sh
+
+function rlAssertDpkg(){
+ local package=$1;
+ dpkg -l $package > /dev/null
+ __INTERNAL_ConditionalAssert "Checking for the presence of $package deb" $?;
+}
+
+function rlGetArch(){
+ local arch=`uname -i`
+ # Overrife architecture name to be compliant with debian packages
+ case ${arch} in
+ i486|i566|i686)
+ arch=i386
+ ;;
+ x86_64)
+ arch=amd64
+ ;;
+ esac
+ echo $arch
+}
diff --git a/client/debian/apt-spacewalk/test/runtest.sh b/client/debian/apt-spacewalk/test/runtest.sh
new file mode 100755
index 0000000..d93502c
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/runtest.sh
@@ -0,0 +1,163 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+. library.sh
+. settings.sh
+
+
+rlJournalStart
+ rlPhaseStartSetup
+ for pkg in ${required_packages}; do
+ rlAssertDpkg ${pkg} || rlDie "Install ${pkg} first"
+ done
+
+ seed=$(date +%N | tr [:print:] a-z | fold -w5 | head -n1)
+ rlFileBackup /etc/sysconfig/rhn/
+ rlPhaseEnd
+
+
+
+ rlPhaseStartSetup 'Build packages'
+ old_pwd=`pwd`
+ build_dir="${old_pwd}/build/"
+ template="${old_pwd}/equivs-template"
+ rlRun "rm -rf ${build_dir}"
+
+ for arch in all `rlGetArch`; do
+ rlRun "mkdir -p ${build_dir}/${arch}"
+ cd ${build_dir}/${arch}
+ for i in `seq ${package_count}`; do
+ name="dum-${arch}-${i}-${seed}"
+ cp ${template} ${name}
+ sed -i s/%name%/${name}/g ${name}
+ sed -i s/%arch%/${arch}/g ${name}
+ sed -i s/%version%/1.1/g ${name}
+ rlRun "equivs-build ${name} &> /dev/null"
+ sed -i s/1.1/2.2/g ${name}
+ rlRun "equivs-build ${name} &> /dev/null"
+ rm -rf ${name}
+ package_list="${package_list} $name"
+ done
+ done
+ cd ${old_pwd}
+ rlPhaseEnd
+
+
+
+ rlPhaseStartSetup 'Create channels'
+ channel_name="debian_${seed}"
+ child_channel_name="child_${seed}"
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} \
+ create_channel ${channel_name} `rlGetArch`"
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} \
+ create_channel ${child_channel_name} `rlGetArch` ${channel_name}"
+ rlRun "rhnpush --server ${SW_SERVER} -u ${SW_USER} -p ${SW_PASS} \
+ -vvv -c ${channel_name} -d ${build_dir}/all"
+ rlRun "rhnpush --server ${SW_SERVER} -u ${SW_USER} -p ${SW_PASS} \
+ -vvv -c ${child_channel_name} -d ${build_dir}/`rlGetArch`"
+ ak=`./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} \
+ create_activationkey ${channel_name} ${child_channel_name}| head -n1`
+ rlPhaseEnd
+
+
+
+ rlPhaseStartSetup 'Register'
+ rlRun "wget -q -O /etc/sysconfig/rhn/RHN-ORG-TRUSTED-SSL-CERT \
+ https://${SW_SERVER}/pub/RHN-ORG-TRUSTED-SSL-CERT --no-check-certificate"
+ rlRun "rhnreg_ks --sslCACert=/etc/sysconfig/rhn/RHN-ORG-TRUSTED-SSL-CERT -v \
+ --serverUrl=https://${SW_SERVER}/XMLRPC --activationkey=${ak} --force"
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest 'rhn-profile-sync'
+ rlRun 'rhn-profile-sync -v'
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest 'Taskomatic'
+ rlRun "apt-get clean"
+ rlRun "apt-get update" 0,100
+ # Workaround for those who don't have Apt patched
+ rlRun "apt-get update" 0,100
+
+ rlRun "sleep 1m" 0 "Waiting for taskomatic to regenerate metadata"
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest "apt-get update"
+ rlRun "apt-get update"
+ sources_list=/etc/apt/sources.list.d/spacewalk.list
+ rlAssertExists ${sources_list}
+ rlAssertGrep "deb spacewalk://${SW_SERVER} channels: main ${child_channel_name}" ${sources_list}
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest "Install packages"
+ for pkg in ${package_list}; do
+ rlRun "apt-get install ${pkg}=1.1 -y --force-yes"
+ done
+
+ tmp=`mktemp`
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} system_package_list \
+ ${channel_name} ${child_channel_name} > ${tmp}"
+ for pkg in ${package_list}; do
+ rlAssertGrep ${pkg}-1.1 ${tmp}
+ done
+ rm -rf $tmp
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest "Schedule actions"
+ pkg1_id=`./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} channel_package_list ${channel_name} | head -n1`
+ pkg2_id=`./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} channel_package_list ${child_channel_name} | head -n1`
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} package_install ${pkg1_id} ${pkg2_id}"
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest "Pick-up actions"
+ rlRun "rhn_check -vvv"
+
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} system_package_list \
+ ${channel_name} ${child_channel_name} | grep dum | grep ${seed} | grep 2.2"
+ rlPhaseEnd
+
+
+
+ rlPhaseStartTest "Update"
+ rlRun "apt-get install ${package_list} -y --force-yes"
+
+ tmp=`mktemp`
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} system_package_list \
+ ${channel_name} ${child_channel_name} > ${tmp}"
+ for pkg in ${package_list}; do
+ rlAssertGrep ${pkg}-2.2 ${tmp}
+ done
+ rm -rf $tmp
+ rlPhaseEnd
+
+
+
+ rlPhaseStartCleanup
+ for pkg in ${package_list}; do
+ dpkg -l ${pkg} &> /dev/null \
+ && rlRun "apt-get remove ${pkg} -y --force-yes &>/dev/null"
+ done
+
+ rlRun "rm -rf ${build_dir}"
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} remove_activationkey ${ak}"
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} remove_channel ${child_channel_name}"
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} remove_channel ${channel_name}"
+ rlRun "./sw_deb.py ${SW_SERVER} ${SW_USER} ${SW_PASS} unregister"
+ rlFileRestore
+ rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/client/debian/apt-spacewalk/test/settings.sh b/client/debian/apt-spacewalk/test/settings.sh
new file mode 100755
index 0000000..0deed98
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/settings.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export required_packages="python-rhn-client-tools python-rhnlib apt-spacewalk rhnpush equivs"
+export package_count="3"
+export SW_SERVER=spacewalk.example.com
+export SW_USER=admin
+export SW_PASS=admin
diff --git a/client/debian/apt-spacewalk/test/sw_deb.py b/client/debian/apt-spacewalk/test/sw_deb.py
new file mode 100755
index 0000000..321644a
--- /dev/null
+++ b/client/debian/apt-spacewalk/test/sw_deb.py
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+#
+# Summary: Support function for Debian Spacewalk Clients Tests
+# License: GNU GPLv2
+#
+
+import sys
+import re
+import xmlrpclib
+import xml.dom.minidom
+
+sys.path.append("/usr/share/rhn/")
+import up2date_client.config as up2dateConfig
+
+class sw_deb:
+ def __init__(self, fqdn, user, passwd):
+ self.uri = 'https://' + fqdn + '/rpc/api'
+ self.client = xmlrpclib.Server(self.uri, verbose=0)
+ self.key = self.client.auth.login(user, passwd)
+
+ def create_channel(self, params):
+ name = params[0]
+ arch = 'channel-' + params[1] + '-deb'
+ try:
+ parent = params[2]
+ except IndexError:
+ parent = ''
+ return self.client.channel.software.create(self.key, name, name, name, arch, parent)
+
+ def remove_channel(self, params):
+ return self.client.channel.software.delete(self.key, params[0]) == 1
+
+ def create_activationkey(self, params):
+ channel = params[0]
+ ak = self.client.activationkey.create(self.key, channel, '', channel, [], False)
+ print ak
+ if params[1:]:
+ return self.client.activationkey.addChildChannels(self.key, ak, params[1:])
+ return ak.endswith(channel)
+
+ def remove_activationkey(self, params):
+ ak = params[0]
+ return self.client.activationkey.delete(self.key, ak) == 1
+
+ def channel_package_list(self, params):
+ channel = params[0]
+ for pkg in self.client.channel.software.listAllPackages(self.key, channel):
+ print pkg['id']
+ return True
+
+ def system_package_list(self, params=None):
+ systemid = self.__get_systemid()
+ for pkg in self.client.system.listPackages(self.key, systemid):
+ print '%s-%s' % (pkg['name'], pkg['version'])
+ return True
+
+ def package_install(self, params):
+ systemid = self.__get_systemid()
+ for i in range(len(params)):
+ params[i] = int(params[i])
+ time = self.client.system.searchByName(self.key,'\w')[0]['last_checkin']
+ return self.client.system.schedulePackageInstall(self.key, systemid, params, time) == 1
+
+ def unregister(self, params=None):
+ systemid = self.__get_systemid()
+ return self.client.system.deleteSystems(self.key, (systemid,)) == 1
+
+ def dispatch(self, func, param):
+ method = getattr(self, func)
+ result = method(param)
+ print "Running %s ..." % func,
+ if result:
+ print 'Pass'
+ else:
+ print 'Fail'
+ return not result
+
+ def __get_systemid(self):
+ cfg = up2dateConfig.initUp2dateConfig()
+ doc = xml.dom.minidom.parse(cfg['systemIdPath'])
+ for membernode in doc.getElementsByTagName("member"):
+ found = False
+ for node in membernode.childNodes:
+ if node.nodeName == "name":
+ data = node.firstChild.data
+ if data == "system_id": found = True
+ if node.nodeName == "value" and found:
+ system_id_raw = (node.firstChild.firstChild).data
+ system_id = re.match('ID-([0-9]*).*', system_id_raw).group(1)
+ return int(system_id)
+
+
+if __name__ == '__main__':
+ fqdn = sys.argv[1]
+ user = sys.argv[2]
+ passwd = sys.argv[3]
+ func = sys.argv[4]
+ params = sys.argv[5:]
+
+ s = sw_deb(fqdn, user, passwd)
+ sys.exit(s.dispatch(func, params))
13 years
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 13 ++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 45 ++++------
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 14 +++
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 16 ++-
4 files changed, 62 insertions(+), 26 deletions(-)
New commits:
commit 11e533362887710a2ab410e7b0a7393ac73fbe4c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Apr 28 17:18:58 2011 +0200
683539 - system overview: display flex entitlement usage
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 88972e3..3ab72a2 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1816,6 +1816,19 @@ SELECT 1
</query>
</mode>
+<mode name="system_channel_subscriptions">
+ <query params="sid">
+ select c.id,
+ c.name,
+ sc.is_fve
+ from rhnChannel c,
+ rhnServerChannel sc
+ where sc.server_id = :sid and
+ sc.channel_id = c.id
+ order by c.name
+ </query>
+</mode>
+
<write-mode name="delete_note">
<query params="id,server_id">
delete from rhnServerNotes where id = :id and server_id = :server_id
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
index 9478e0a..4fa9595 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
@@ -39,10 +39,11 @@ import org.apache.struts.action.ActionMapping;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -76,11 +77,24 @@ public class SystemOverviewAction extends RhnAction {
description = new String(s.getDescription()).replaceAll("\\n", "<br/>");
}
- // Secondary Channels
- List secondaryChannelList = secondaryChannelList(s.getChannels(),
- s.getBaseChannel());
- Collections.sort(secondaryChannelList,
- new DynamicComparator("name", RequestContext.SORT_ASC));
+ // System Channels
+ Map baseChannel = new HashMap();
+ List childChannels = new ArrayList();
+ DataResult channelList = SystemManager.systemChannelSubscriptions(sid);
+
+ for (Iterator i = channelList.iterator(); i.hasNext();) {
+ Map ch = (HashMap) i.next();
+
+ if (s.getBaseChannel() != null &&
+ ch.get("id").equals(s.getBaseChannel().getId())) {
+ baseChannel.put("id", ch.get("id"));
+ baseChannel.put("name", ch.get("name"));
+ baseChannel.put("is_fve", ch.get("is_fve"));
+ }
+ else {
+ childChannels.add(ch);
+ }
+ }
// Errata Counts
int criticalErrataCount = SystemManager.countCriticalErrataForSystem(user, sid);
@@ -112,7 +126,8 @@ public class SystemOverviewAction extends RhnAction {
request.setAttribute("nonCriticalErrataCount", nonCriticalErrataCount);
request.setAttribute("upgradablePackagesCount", upgradablePackagesCount);
request.setAttribute("hasUpdates", hasUpdates);
- request.setAttribute("secondaryChannels", secondaryChannelList);
+ request.setAttribute("baseChannel", baseChannel);
+ request.setAttribute("childChannels", childChannels);
request.setAttribute("description", description);
request.setAttribute("prefs", findUserServerPreferences(user, s));
request.setAttribute("system", s);
@@ -121,22 +136,6 @@ public class SystemOverviewAction extends RhnAction {
return mapping.findForward("default");
}
- protected List secondaryChannelList(Set channels, Channel baseChannel) {
- List list = new ArrayList();
-
- Iterator i = channels.iterator();
-
- while (i.hasNext()) {
- Channel c = (Channel) i.next();
-
- if (!c.equals(baseChannel)) {
- list.add(c);
- }
- }
-
- return list;
- }
-
protected List findUserServerPreferences(User user, Server s) {
List serverPreferenceList = new ArrayList();
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 247004d..0513f61 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -192,6 +192,20 @@ public class SystemManager extends BaseManager {
}
/**
+ * Gets the list of channels that this server is subscribed to
+ * @param sid The id of the server in question
+ * @return Returns a list of subscribed channels for this server.
+ */
+ public static DataResult systemChannelSubscriptions(Long sid) {
+ SelectMode m = ModeFactory.getMode("System_queries",
+ "system_channel_subscriptions");
+ Map params = new HashMap();
+ params.put("sid", sid);
+ return m.execute(params);
+ }
+
+
+ /**
* Gets the latest upgradable packages for a system
* @param sid The id for the system we want packages for
* @return Returns a list of the latest upgradable packages for a system
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index 1bf2471..a5e2293 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -323,10 +323,20 @@
<c:if test="${system.baseChannel != null}">
<ul class="channel-list">
- <li><a href="/rhn/channels/ChannelDetail.do?cid=${system.baseChannel.id}">${system.baseChannel.name}</a></li>
+ <li>
+ <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a>
+ <c:if test="${baseChannel['is_fve'] == 'Y'}">
+ (Flex)
+ </c:if>
+ </li>
- <c:forEach items="${secondaryChannels}" var="secondaryChannel">
- <li class="child-channel"><a href="/rhn/channels/ChannelDetail.do?cid=${secondaryChannel.id}">${secondaryChannel.name}</a></li>
+ <c:forEach items="${childChannels}" var="childChannel">
+ <li class="child-channel">
+ <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a>
+ <c:if test="${childChannel['is_fve'] == 'Y'}">
+ (Flex)
+ </c:if>
+ </li>
</c:forEach>
</ul>
13 years
Changes to 'refs/tags/spacewalk-admin-1.5.1-1'
by Jan Pazdziora
Tag 'spacewalk-admin-1.5.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-04-28 12:31 +0000
Tagging package [spacewalk-admin] version [1.5.1-1] in directory [spacewalk/admin/].
Changes since apt-spacewalk-1.0.4-1:
Jan Pazdziora (2):
Disable access of other to the satellite-local-rules.conf file, as it contains the database password.
Automatic commit of package [spacewalk-admin] release [1.5.1-1].
Simon Lukasik (2):
Debian package apt-spacewalk-1.0.4-1
Debian package python-rhn-client-tools-1.5.7-1
---
client/debian/apt-spacewalk/debian/changelog | 8 +++-----
client/debian/rhn-client-tools/debian/changelog | 10 +++-------
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/rhn-config-satellite.pl | 2 ++
spacewalk/admin/spacewalk-admin.spec | 6 +++++-
5 files changed, 14 insertions(+), 14 deletions(-)
---
13 years
rel-eng/packages spacewalk/admin
by Jan Pazdziora
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 100c7dfa82919eb3b4ae08cd079daed1c9a9b11c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 28 14:31:39 2011 +0200
Automatic commit of package [spacewalk-admin] release [1.5.1-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index 0ef22d4..4c6bb59 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-1.4.2-1 spacewalk/admin/
+1.5.1-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index ef094e2..f9c9551 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-service.8*
%changelog
+* Thu Apr 28 2011 Jan Pazdziora 1.5.1-1
+- Disable access of other to the satellite-local-rules.conf file, as it
+ contains the database password.
+
* Wed Mar 30 2011 Jan Pazdziora 1.4.2-1
- Fixing spacewalk-service start hang at waiting for tomcat.
(dale(a)fedoraproject.org)
13 years
spacewalk/admin
by Jan Pazdziora
spacewalk/admin/rhn-config-satellite.pl | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 615bc53af664b6883c19a63c18508e46bce6ef16
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 28 14:07:11 2011 +0200
Disable access of other to the satellite-local-rules.conf file, as it contains the database password.
diff --git a/spacewalk/admin/rhn-config-satellite.pl b/spacewalk/admin/rhn-config-satellite.pl
index 7e89842..312c284 100755
--- a/spacewalk/admin/rhn-config-satellite.pl
+++ b/spacewalk/admin/rhn-config-satellite.pl
@@ -44,6 +44,8 @@ my %options = map { split(/=/,$_, 2) } @options;
my $tmpfile = $target . ".bak.${PID}";
open(TARGET, "< $target") or die "Could not open $target: $OS_ERROR";
+unlink $tmpfile if -e $tmpfile;
+umask 0027;
open(TMP, "> $tmpfile") or die "Could not open $tmpfile for writing: $OS_ERROR";
while (my $line = <TARGET>) {
13 years
2 commits - client/debian
by Šimon Lukašík
client/debian/apt-spacewalk/debian/changelog | 8 +++-----
client/debian/rhn-client-tools/debian/changelog | 10 +++-------
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 92f38290a695fb6554964d0056275ed75d578c23
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 13:07:25 2011 +0200
Debian package python-rhn-client-tools-1.5.7-1
diff --git a/client/debian/rhn-client-tools/debian/changelog b/client/debian/rhn-client-tools/debian/changelog
index 3134d21..f6b38ef 100644
--- a/client/debian/rhn-client-tools/debian/changelog
+++ b/client/debian/rhn-client-tools/debian/changelog
@@ -1,10 +1,6 @@
-python-rhn-client-tools (1.5.6-1) unstable; urgency=low
+python-rhn-client-tools (1.5.7-1) unstable; urgency=low
* Update to upstream version
- * Refactor: Switch the if & else parts of condition
- * On Debian we need to return platform with -debian-linux suffix
- * On Debian do not distinguish between i386 and i686
- * Codename might not be always present within lsb_release on Debian
-
- -- Šimon Lukašík <xlukas08(a)stud.fit.vutbr.cz> Sun, 17 Apr 2011 18:20:39 +0200
+ * The Debian client on x86_64 should send amd64-debian-linux
+ -- Šimon Lukašík <xlukas08(a)stud.fit.vutbr.cz> Thu, 28 Apr 2011 12:53:49 +0200
commit 51965665a2e32f09dfa642909ded00c06bf0a605
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 12:57:35 2011 +0200
Debian package apt-spacewalk-1.0.4-1
diff --git a/client/debian/apt-spacewalk/debian/changelog b/client/debian/apt-spacewalk/debian/changelog
index b51f05b..448f311 100644
--- a/client/debian/apt-spacewalk/debian/changelog
+++ b/client/debian/apt-spacewalk/debian/changelog
@@ -1,9 +1,7 @@
-apt-spacewalk (1.0.3-1) unstable; urgency=low
+apt-spacewalk (1.0.4-1) unstable; urgency=low
* Updated to the upstream version
- * Acquire method now consumes extra lines from Apt
- * Fixed rpmUtils import
- * Added actions.packages dispatcher
+ * The method can be killed by the keyboard interrupt
- -- Simon Lukasik <xlukas08(a)stud.fit.vutbr.cz> Sun, 17 Apr 2011 18:03:07 +0200
+ -- Simon Lukasik <xlukas08(a)stud.fit.vutbr.cz> Thu, 28 Apr 2011 12:53:49 +0200
13 years
Changes to 'refs/tags/apt-spacewalk-1.0.4-1'
by Šimon Lukašík
Tag 'apt-spacewalk-1.0.4-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-04-28 10:05 +0000
Tagging package [apt-spacewalk] version [1.0.4-1] in directory [client/debian/apt-spacewalk/src/].
Changes since rhn-client-tools-1.5.7-1:
Simon Lukasik (1):
Automatic commit of package [apt-spacewalk] release [1.0.4-1].
---
client/debian/apt-spacewalk/src/apt-spacewalk.spec | 5 ++++-
rel-eng/packages/apt-spacewalk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
client/debian rel-eng/packages
by Šimon Lukašík
client/debian/apt-spacewalk/src/apt-spacewalk.spec | 5 ++++-
rel-eng/packages/apt-spacewalk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a1f9713030b3698bb2f2fab1038afd1257e756e1
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 12:05:00 2011 +0200
Automatic commit of package [apt-spacewalk] release [1.0.4-1].
diff --git a/client/debian/apt-spacewalk/src/apt-spacewalk.spec b/client/debian/apt-spacewalk/src/apt-spacewalk.spec
index d25c5fa..1d61318 100644
--- a/client/debian/apt-spacewalk/src/apt-spacewalk.spec
+++ b/client/debian/apt-spacewalk/src/apt-spacewalk.spec
@@ -3,7 +3,7 @@
Name: apt-spacewalk
Summary: Spacewalk plugin for Advanced Packaging tool.
-Version: 1.0.3
+Version: 1.0.4
Release: 1%{?dist}
License: GPLv2
Source0: https://example.com/%{name}-%{version}.tar.gz
@@ -20,6 +20,9 @@ to acquire content from Spacewalk server
%defattr(-,root,root,-)
%changelog
+* Thu Apr 28 2011 Simon Lukasik <slukasik(a)redhat.com> 1.0.4-1
+- The method can be killed by the keyboard interrupt (slukasik(a)redhat.com)
+
* Sun Apr 17 2011 Simon Lukasik <slukasik(a)redhat.com> 1.0.3-1
- Introducing actions.packages dispatcher (slukasik(a)redhat.com)
- Do not use rpmUtils on Debian (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/apt-spacewalk b/rel-eng/packages/apt-spacewalk
index 755674f..bce38c3 100644
--- a/rel-eng/packages/apt-spacewalk
+++ b/rel-eng/packages/apt-spacewalk
@@ -1 +1 @@
-1.0.3-1 client/debian/apt-spacewalk/src/
+1.0.4-1 client/debian/apt-spacewalk/src/
13 years
Changes to 'refs/tags/rhn-client-tools-1.5.7-1'
by Šimon Lukašík
Tag 'rhn-client-tools-1.5.7-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-04-28 10:04 +0000
Tagging package [rhn-client-tools] version [1.5.7-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-proxy-installer-1.5.2-1:
Simon Lukasik (3):
The method can be killed by the keyboard interrupt
The Debian client on x86_64 should send amd64-debian-linux
Automatic commit of package [rhn-client-tools] release [1.5.7-1].
---
client/debian/apt-spacewalk/src/spacewalk | 9 ++++++---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 2 ++
rel-eng/packages/rhn-client-tools | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
---
13 years