2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChecksumLabelException.java | 40 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 83 +++++++++-
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 7
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 46 +++++
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
7 files changed, 178 insertions(+), 10 deletions(-)
New commits:
commit 2259add6f3816ddc92be6ea64571fdfb94864316
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 24 21:30:12 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 54ba0bf..9785321 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.28
+Version: 1.6.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -547,6 +547,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Aug 24 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.29-1
+- 662200 - allow modification of selected channel attributes via API
+ (tlestach(a)redhat.com)
+
* Tue Aug 23 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.28-1
- make the taskomatic cleanup delete faster for Postgresql (jonathan.hoser
@helmholtz-muenchen.de)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 04d46cf..e810e0e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.28-1 java/
+1.6.29-1 java/
commit 964c3529a9975e5989e1a61290bc1e4afab9ebbf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 24 18:01:13 2011 +0200
662200 - allow modification of selected channel attributes via API
introducing channel.software.setDetails API
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 223da37..ac54956 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -326,7 +326,7 @@ public class EditChannelAction extends RhnAction implements Listable {
// times where python would make this SOOOO much easier.
UpdateChannelCommand ucc = new UpdateChannelCommand();
ucc.setArchLabel((String)form.get("arch"));
- ucc.setChecksum((String)form.get("checksum"));
+ ucc.setChecksumLabel((String)form.get("checksum"));
ucc.setLabel((String)form.get("label"));
ucc.setName((String)form.get("name"));
ucc.setSummary((String)form.get("summary"));
@@ -396,7 +396,7 @@ public class EditChannelAction extends RhnAction implements Listable {
// times where python would make this SOOOO much easier.
CreateChannelCommand ccc = new CreateChannelCommand();
ccc.setArchLabel((String)form.get("arch"));
- ccc.setChecksum((String)form.get("checksum"));
+ ccc.setChecksumLabel((String)form.get("checksum"));
ccc.setLabel((String)form.get("label"));
ccc.setName((String)form.get("name"));
ccc.setSummary((String)form.get("summary"));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChecksumLabelException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChecksumLabelException.java
new file mode 100644
index 0000000..6e2914d
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChecksumLabelException.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2011 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.xmlrpc;
+
+import com.redhat.rhn.FaultException;
+
+
+/**
+ * InvalidChecksumLabelException
+ * @version $Rev$
+ */
+public class InvalidChecksumLabelException extends FaultException {
+
+ /**
+ * Constructor
+ */
+ public InvalidChecksumLabelException() {
+ super(1210, "invalidChecksumLabelLabel", "Invalid checksum label");
+ }
+
+ /**
+ * Constructor
+ * @param label the profile label
+ */
+ public InvalidChecksumLabelException(String label) {
+ super(1210, "invalidChecksumLabelLabel", "Invalid checksum label: " + label);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index b81298c..a20b5c2 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -57,6 +57,7 @@ import com.redhat.rhn.frontend.xmlrpc.user.XmlRpcUserHelper;
import com.redhat.rhn.manager.channel.ChannelEditor;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.channel.CreateChannelCommand;
+import com.redhat.rhn.manager.channel.UpdateChannelCommand;
import com.redhat.rhn.manager.channel.repo.BaseRepoCommand;
import com.redhat.rhn.manager.channel.repo.CreateRepoCommand;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -496,6 +497,86 @@ public class ChannelSoftwareHandler extends BaseHandler {
return lookupChannelById(user, id);
}
+ /**
+ * Allows to modify channel attributes
+ * @param sessionKey WebSession containing User information.
+ * @param channelId id of channel to be modified
+ * @param details map of channel attributes to be changed
+ * @return 1 if edit was successful, exception thrown otherwise
+ *
+ * @xmlrpc.doc Allows to modify channel attributes
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("int", "channelDd", "channel id")
+ * @xmlrpc.param
+ * #struct("channel_map")
+ * #prop_desc("string", "checksum_label", "new channel repository checksum label
+ * (optional)")
+ * #prop_desc("string", "name", "new channel name (optional)")
+ * #prop_desc("string", "summary", "new channel summary (optional)")
+ * #prop_desc("string", "description", "new channel description (optional)")
+ * #prop_desc("string", "maintainer_name", "new channel maintainer name
+ * (optional)")
+ * #prop_desc("string", "maintainer_email", "new channel email address
+ * (optional)")
+ * #prop_desc("string", "maintainer_phone", "new channel phone number (optional)")
+ * #prop_desc("string", "gpg_key_url", "new channel gpg key url (optional)")
+ * #prop_desc("string", "gpg_key_id", "new channel gpg key id (optional)")
+ * #prop_desc("string", "gpg_key_fp", "new channel gpg key fingerprint
+ * (optional)")
+ * #struct_end()
+
+ *(a)xmlrpc.returntype #return_int_success()
+ */
+ public int setDetails(String sessionKey, Integer channelId, Map details) {
+ User user = getLoggedInUser(sessionKey);
+ Channel channel = lookupChannelById(user, channelId);
+
+ UpdateChannelCommand ucc = new UpdateChannelCommand(user, channel);
+
+ if (details.containsKey("checksum_label")) {
+ ucc.setChecksumLabel((String) details.get("checksum_label"));
+ }
+
+ if (details.containsKey("name")) {
+ ucc.setName((String) details.get("name"));
+ }
+
+ if (details.containsKey("summary")) {
+ ucc.setSummary((String)details.get("summary"));
+ }
+
+ if (details.containsKey("description")) {
+ ucc.setDescription((String)details.get("description"));
+ }
+
+ if (details.containsKey("maintainer_name")) {
+ ucc.setMaintainerName((String)details.get("maintainer_name"));
+ }
+
+ if (details.containsKey("maintainer_email")) {
+ ucc.setMaintainerEmail((String)details.get("maintainer_email"));
+ }
+
+ if (details.containsKey("maintainer_phone")) {
+ ucc.setMaintainerPhone((String)details.get("maintainer_phone"));
+ }
+
+ if (details.containsKey("gpg_key_url")) {
+ ucc.setGpgKeyUrl((String)details.get("gpg_key_url"));
+ }
+
+ if (details.containsKey("gpg_key_id")) {
+ ucc.setGpgKeyId((String)details.get("gpg_key_id"));
+ }
+
+ if (details.containsKey("gpg_key_fp")) {
+ ucc.setGpgKeyFp((String)details.get("gpg_key_fp"));
+ }
+
+ ucc.update(channelId.longValue());
+ return 1;
+ }
+
/**
* Returns the number of available subscriptions for the given channel
@@ -605,7 +686,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
ccc.setSummary(summary);
ccc.setParentLabel(parentLabel);
ccc.setUser(user);
- ccc.setChecksum(checksumType);
+ ccc.setChecksumLabel(checksumType);
ccc.setGpgKeyUrl((String)gpgKey.get("url"));
ccc.setGpgKeyId((String)gpgKey.get("id"));
ccc.setGpgKeyFp((String)gpgKey.get("fingerprint"));
diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
index 5007634..dea5fa9 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
@@ -108,10 +108,10 @@ public class CreateChannelCommand {
}
/**
- * @param checksumIn The name to set.
+ * @param checksumLabelIn The name to set.
*/
- public void setChecksum(String checksumIn) {
- this.checksum = checksumIn;
+ public void setChecksumLabel(String checksumLabelIn) {
+ this.checksum = checksumLabelIn;
}
/**
@@ -437,5 +437,4 @@ public class CreateChannelCommand {
throw new InvalidGPGUrlException();
}
}
-
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
index 0e7a7a7..2b8c3dd 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
@@ -18,8 +18,10 @@ package com.redhat.rhn.manager.channel;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.common.ChecksumType;
+import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelNameException;
+import com.redhat.rhn.frontend.xmlrpc.InvalidChecksumLabelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidParentChannelException;
/**
@@ -36,6 +38,46 @@ public class UpdateChannelCommand extends CreateChannelCommand {
}
/**
+ * prefill all channel atrributes
+ * @param userIn user, that tries to update the channel
+ * @param channelIn to be updated
+ */
+ public UpdateChannelCommand(User userIn, Channel channelIn) {
+ user = userIn;
+ label = channelIn.getLabel();
+ name = channelIn.getName();
+ summary = channelIn.getSummary();
+ description = channelIn.getDescription();
+ if (channelIn.getChannelArch() == null) {
+ archLabel = null;
+ }
+ else {
+ archLabel = channelIn.getChannelArch().getLabel();
+ }
+ if (channelIn.getParentChannel() == null) {
+ parentLabel = null;
+ }
+ else {
+ parentLabel = channelIn.getParentChannel().getLabel();
+ }
+ if (channelIn.getParentChannel() == null) {
+ parentId = null;
+ }
+ else {
+ parentId = channelIn.getParentChannel().getId();
+ }
+ gpgKeyUrl = channelIn.getGPGKeyUrl();
+ gpgKeyId = channelIn.getGPGKeyId();
+ gpgKeyFp = channelIn.getGPGKeyFp();
+ checksum = channelIn.getChecksumTypeLabel();
+ maintainerName = channelIn.getMaintainerName();
+ maintainerEmail = channelIn.getMaintainerEmail();
+ maintainerPhone = channelIn.getMaintainerPhone();
+ supportPolicy = channelIn.getSupportPolicy();
+ access = channelIn.getAccess();
+ }
+
+ /**
* Updates the Channel based on the parameters that were set.
* @param cid id of Channel to be updated.
* @return the updated Channel
@@ -66,6 +108,9 @@ public class UpdateChannelCommand extends CreateChannelCommand {
}
ChecksumType ct = ChannelFactory.findChecksumTypeByLabel(checksum);
+ if (ct == null) {
+ throw new InvalidChecksumLabelException(checksum);
+ }
if (checksumChanged(c.getChecksumTypeLabel(), ct) && c.getPackageCount() > 0) {
// schedule repo re generation if the checksum type changed
// and the channel has packages
@@ -76,7 +121,6 @@ public class UpdateChannelCommand extends CreateChannelCommand {
c.setName(name);
c.setSummary(summary);
c.setDescription(description);
- c.setOrg(user.getOrg());
c.setBaseDir("/dev/null");
c.setGPGKeyId(gpgKeyId);
c.setGPGKeyUrl(gpgKeyUrl);
12 years, 7 months
Changes to 'refs/tags/spacewalk-certs-tools-1.6.4-1'
by Miroslav Suchý
Tag 'spacewalk-certs-tools-1.6.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-08-24 15:17 +0000
Tagging package [spacewalk-certs-tools] version [1.6.4-1] in directory [spacewalk/certs-tools/].
Changes since rhn-client-tools-1.6.15-1:
Miroslav Suchý (2):
if subjectAltName is used, hostname must be present in dNSName
Automatic commit of package [spacewalk-certs-tools] release [1.6.4-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolConfig.py | 14 +++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
---
12 years, 7 months
2 commits - rel-eng/packages spacewalk/certs-tools
by Miroslav Suchý
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolConfig.py | 14 +++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 9d085cd94d08fdb7909fe4db31deb812787f7fe3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Aug 24 17:17:48 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.6.4-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 819692d..7b5a192 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.6.3-1 spacewalk/certs-tools/
+1.6.4-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index b152c2e..cb8e9c2 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Aug 24 2011 Miroslav Suchý 1.6.4-1
+- if subjectAltName is used, hostname must be present in dNSName
+
* Tue Aug 23 2011 Miroslav Suchý 1.6.3-1
- do not fail if --set-cname is not specified
commit e10afa85d8b7baa231daf3a8ce421abdbd1e1adb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Aug 24 17:15:02 2011 +0200
if subjectAltName is used, hostname must be present in dNSName
see:
ftp://ftp.rfc-editor.org/in-notes/rfc2459.txt
chapter 4.2.1.7 paragraph 5
and
ftp://ftp.rfc-editor.org/in-notes/rfc2818.txt
chapter 3.1 paragraph 3
addressing:
Traceback (most recent call last):
File "/usr/bin/yum", line 29, in ?
yummain.user_main(sys.argv[1:], exit_code=True)
File "/usr/share/yum-cli/yummain.py", line 309, in user_main
errcode = main(args)
File "/usr/share/yum-cli/yummain.py", line 178, in main
result, resultmsgs = base.doCommands()
File "/usr/share/yum-cli/cli.py", line 349, in doCommands
return self.yum_cli_commands[self.basecmd].doCommand(self, self.basecmd, self.extcmds)
File "/usr/share/yum-cli/yumcommands.py", line 788, in doCommand
base.repos.populateSack()
File "/usr/lib/python2.4/site-packages/yum/repos.py", line 260, in populateSack
sack.populate(repo, mdtype, callback, cacheonly)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 168, in populate
if self._check_db_version(repo, mydbtype):
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 226, in _check_db_version
return repo._check_db_version(mdtype)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1226, in _check_db_version
repoXML = self.repoXML
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1399, in <lambda>
repoXML = property(fget=lambda self: self._getRepoXML(),
File "/usr/share/yum-plugins/rhnplugin.py", line 520, in _getRepoXML
return YumRepository._getRepoXML(self)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1391, in _getRepoXML
self._loadRepoXML(text=self)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1381, in _loadRepoXML
return self._groupLoadRepoXML(text, ["primary"])
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1365, in _groupLoadRepoXML
if self._commonLoadRepoXML(text):
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1201, in _commonLoadRepoXML
result = self._getFileRepoXML(local, text)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 974, in _getFileRepoXML
cache=self.http_caching == 'all')
File "/usr/share/yum-plugins/rhnplugin.py", line 334, in _getFile
start, end, copy_local, checkfunc, text, reget, cache, size)
File "/usr/share/yum-plugins/rhnplugin.py", line 436, in _noExceptionWrappingGet
size = size
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 936, in urlgrab
return self._retry(opts, retryfunc, url, filename)
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 854, in _retry
r = apply(func, (opts,) + args, {})
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 922, in retryfunc
fo = URLGrabberFileObject(url, filename, opts)
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 1010, in __init__
self._do_open()
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 1093, in _do_open
fo, hdr = self._make_request(req, opener)
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 1202, in _make_request
fo = opener.open(req)
File "/usr/lib/python2.4/urllib2.py", line 358, in open
response = self._open(req, data)
File "/usr/lib/python2.4/urllib2.py", line 376, in _open
'_open', req)
File "/usr/lib/python2.4/urllib2.py", line 337, in _call_chain
result = func(*args)
File "/usr/lib/python2.4/site-packages/M2Crypto/m2urllib2.py", line 82, in https_open
h.request(req.get_method(), req.get_selector(), req.data, headers)
File "/usr/lib/python2.4/httplib.py", line 810, in request
self._send_request(method, url, body, headers)
File "/usr/lib/python2.4/httplib.py", line 833, in _send_request
self.endheaders()
File "/usr/lib/python2.4/httplib.py", line 804, in endheaders
self._send_output()
File "/usr/lib/python2.4/httplib.py", line 685, in _send_output
self.send(msg)
File "/usr/lib/python2.4/httplib.py", line 652, in send
self.connect()
File "/usr/lib/python2.4/site-packages/M2Crypto/httpslib.py", line 47, in connect
self.sock.connect((self.host, self.port))
File "/usr/lib/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 177, in connect
if not check(self.get_peer_cert(), self.addr[0]):
File "/usr/lib/python2.4/site-packages/M2Crypto/SSL/Checker.py", line 88, in __call__
fieldName='subjectAltName')
M2Crypto.SSL.Checker.WrongHost: Peer certificate subjectAltName does not match host, expected penguin-a1300-01.rhts.eng.bos.redhat.com, got DNS:
diff --git a/spacewalk/certs-tools/sslToolConfig.py b/spacewalk/certs-tools/sslToolConfig.py
index 187e594..bae5b19 100644
--- a/spacewalk/certs-tools/sslToolConfig.py
+++ b/spacewalk/certs-tools/sslToolConfig.py
@@ -446,16 +446,16 @@ subjectAltName = @alt_names
"""
-def gen_req_alt_names(d):
+def gen_req_alt_names(d, hostname):
""" generates the alt_names section of the *-openssl.cnf file """
i = 0
result = ''
+ dnsname = [ hostname ]
if '--set-cname' in d and d['--set-cname']:
- for name in d['--set-cname']:
- i += 1
- result += "DNS.%d = %s\n" % (i, name)
- if not result:
- result = "DNS.1 =\n"
+ dnsname.extend(d['--set-cname'])
+ for name in dnsname:
+ i += 1
+ result += "DNS.%d = %s\n" % (i, name)
return result
def gen_req_distinguished_name(d):
@@ -731,7 +731,7 @@ serial = $dir/serial
)
else:
openssl_cnf = CONF_TEMPLATE_SERVER \
- % (gen_req_distinguished_name(rdn), gen_req_alt_names(d))
+ % (gen_req_distinguished_name(rdn), gen_req_alt_names(d, rdn['CN']))
try:
rotated = rotateFile(filepath=self.filename,verbosity=verbosity)
12 years, 7 months
Changes to 'refs/tags/rhn-client-tools-1.6.15-1'
by Martin Minar
Tag 'rhn-client-tools-1.6.15-1' created by Martin Minar <mminar(a)redhat.com> at 2011-08-24 07:53 +0000
Tagging package [rhn-client-tools] version [1.6.15-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-web-1.6.17-1:
Martin Minar (1):
Automatic commit of package [rhn-client-tools] release [1.6.15-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 7 months
client/rhel rel-eng/packages
by Martin Minar
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b4c93a70245553e54c048fa7a45e86847200bc6e
Author: Martin Minar <mminar(a)redhat.com>
Date: Wed Aug 24 09:53:36 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.15-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 34f074b..02ccdc5 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.14
+Version: 1.6.15
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Aug 24 2011 Martin Minar <mminar(a)redhat.com> 1.6.15-1
+- Revert "727908 - registration: send correct hostname during kickstart"
+ (mzazrivec(a)redhat.com)
+
* Wed Aug 17 2011 Martin Minar <mminar(a)redhat.com> 1.6.14-1
- 729468 - TUI: polish registration messages (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 7d153a7..7b0211e 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.14-1 client/rhel/rhn-client-tools/
+1.6.15-1 client/rhel/rhn-client-tools/
12 years, 7 months
Changes to 'refs/tags/spacewalk-web-1.6.17-1'
by Michael Mraka
Tag 'spacewalk-web-1.6.17-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-08-24 07:38 +0000
Tagging package [spacewalk-web] version [1.6.17-1] in directory [web/].
Changes since spacewalk-web-1.6.16-1:
Michael Mraka (2):
fixed typo in sql query
Automatic commit of package [spacewalk-web] release [1.6.17-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/User.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 7 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/User.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 21518415ee3a0ccc5d5c5bbac676827367f9c29f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 24 09:38:24 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.17-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3bff901..16ba4f6 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.16-1 web/
+1.6.17-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 838184f..3d08423 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.16
+Version: 1.6.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -258,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Aug 24 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.17-1
+- fixed typo in sql query
+
* Tue Aug 23 2011 Miroslav Suchý 1.6.16-1
- 705363 - reformat description text for spacewalk-base-minimal not to exceed
80 columns
commit cde1c64c0a0fc62615347109699c4a798d9d8a9f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 24 09:27:43 2011 +0200
fixed typo in sql query
(introduced in 35b7a37c4093b09ac6310c1b1876906ccf347e7d)
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 4d804df..4c731cd 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -1696,7 +1696,7 @@ sub revoke_servergroup_permission {
where wc.id = usgp.user_id
and sg.id = usgp.server_group_id
and sg.org_id = wc.org_id
- );
+ )
EOS
$dbh->call_procedure('rhn_user.remove_servergroup_perm', $uid, $sgid);
}
12 years, 7 months
Changes to 'refs/tags/spacewalk-web-1.6.16-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.6.16-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-08-23 13:46 +0000
Tagging package [spacewalk-web] version [1.6.16-1] in directory [web/].
Changes since spacewalk-certs-tools-1.6.3-1:
Miroslav Suchý (3):
705363 - do not provide perl(PXT::Config) by two packages
705363 - reformat description text for spacewalk-base-minimal not to exceed 80 columns
Automatic commit of package [spacewalk-web] release [1.6.16-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
---
12 years, 7 months
3 commits - rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 6811d1e1cb602890b14c6623d136bfd384263f8f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 23 15:46:43 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.16-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index be145e7..3bff901 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.15-1 web/
+1.6.16-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 0c2d4a1..838184f 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.15
+Version: 1.6.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -258,6 +258,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Aug 23 2011 Miroslav Suchý 1.6.16-1
+- 705363 - reformat description text for spacewalk-base-minimal not to exceed
+ 80 columns
+- 705363 - do not provide perl(PXT::Config) by two packages
+
* Mon Aug 22 2011 Martin Minar <mminar(a)redhat.com> 1.6.15-1
- 585010 - mark the Update List button with it so that we can disable it later.
(jpazdziora(a)redhat.com)
commit f8845d56868ec21074c057da454eeb0307c3a25d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 23 15:45:53 2011 +0200
705363 - reformat description text for spacewalk-base-minimal not to exceed 80 columns
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5830fc9..0c2d4a1 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -61,8 +61,8 @@ Provides: rhn-base-minimal = 5.3.0
%description -n spacewalk-base-minimal
Independent Perl modules in the RHN:: name-space.
-This are very basic modules need to handle configuration files, database, sessions
-and exceptions.
+This are very basic modules need to handle configuration files, database,
+sessions and exceptions.
%package -n spacewalk-dobby
Summary: Perl modules and scripts to administer an Oracle database
commit d6b31f9f9f2769dde7ff55b5e6be4133489e6abc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 23 14:52:15 2011 +0200
705363 - do not provide perl(PXT::Config) by two packages
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index b8dafd2..5830fc9 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -245,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/PXT.pm
%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
%{perl_vendorlib}/PXT/
+%exclude %{perl_vendorlib}/PXT/Config.pm
%{_mandir}/man3/PXT::ApacheHandler.3pm.gz
%files -n spacewalk-sniglets
12 years, 7 months
Changes to 'refs/tags/spacewalk-certs-tools-1.6.3-1'
by Miroslav Suchý
Tag 'spacewalk-certs-tools-1.6.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-08-23 11:31 +0000
Tagging package [spacewalk-certs-tools] version [1.6.3-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-java-1.6.28-1:
Miroslav Suchý (2):
do not fail if --set-cname is not specified
Automatic commit of package [spacewalk-certs-tools] release [1.6.3-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolConfig.py | 9 ++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
---
12 years, 7 months