java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 90f137650dbb08a68e2857e78f908d376be9e731
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 26 17:38:40 2012 +0100
864037 - fixing typo.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 9962211..b8e5125 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -366,7 +366,7 @@ public class DownloadFile extends DownloadAction {
}
// Send data
- URL url = new URL(ConfigDefaults.get().getCobblerServerUrl() + '/cobbler_api';
+ URL url = new URL(ConfigDefaults.get().getCobblerServerUrl() + "/cobbler_api");
URLConnection conn = url.openConnection();
conn.setDoOutput(true);
OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
11 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.9.20-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.20-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-26 16:22 +0000
Tagging package [spacewalk-java] version [1.9.20-1] in directory [java/].
Changes since spacewalk-java-1.9.19-1:
Tomas Lestach (2):
879332 - checkstyle issue
Automatic commit of package [spacewalk-java] release [1.9.20-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
11 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit f3c4b9dfe9581d18f427a20acc07b7f13a2cca8d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 26 17:22:23 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.20-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b5e6bd5..46a574d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.19
+Version: 1.9.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.20-1
+- 879332 - checkstyle issue
+
* Mon Nov 26 2012 Jan Pazdziora 1.9.19-1
- 864037 - we need to POST to /cobbler_api.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d14e668..0294a32 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.19-1 java/
+1.9.20-1 java/
commit 01962170d5d34c5f5487005555dd11dbd8c9fbf0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 26 17:21:45 2012 +0100
879332 - checkstyle issue
addressing:
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java:576: Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 8907ec8..7b52448 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -573,7 +573,8 @@ public class ProfileHandler extends BaseHandler {
"selinux", "reboot", "firewall", "xconfig", "skipx", "key",
"ignoredisk", "autopart", "cmdline", "firstboot", "graphical", "iscsi",
"iscsiname", "logging", "monitor", "multipath", "poweroff", "halt",
- "services", "shutdown", "user", "vnc", "zfcp", "driverdisk", "md5_crypt_rootpw"};
+ "services", "shutdown", "user", "vnc", "zfcp", "driverdisk",
+ "md5_crypt_rootpw"};
List<String> validOptions = Arrays.asList(validOptionNames);
11 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.9.19-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-26 16:19 +0000
Tagging package [spacewalk-java] version [1.9.19-1] in directory [java/].
Changes since spacewalk-java-1.9.18-1:
Jan Pazdziora (2):
864037 - we need to POST to /cobbler_api.
Automatic commit of package [spacewalk-java] release [1.9.19-1].
---
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 37735409c84a32f3cde4f11abcbca7c62dd10832
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 26 17:19:26 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.19-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 698bdb4..b5e6bd5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.18
+Version: 1.9.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 26 2012 Jan Pazdziora 1.9.19-1
+- 864037 - we need to POST to /cobbler_api.
+
* Mon Nov 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.18-1
- 879332 - introduce 'md5_crypt_rootpw' option for
kickstart.profile.setAdvancedOptions API
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d9aa5ff..d14e668 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.18-1 java/
+1.9.19-1 java/
11 years, 5 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fb34221c8f5406bc3e260b73f56a4da1ec7b22d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 26 17:19:11 2012 +0100
864037 - we need to POST to /cobbler_api.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 8a8d97c..9962211 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -366,7 +366,7 @@ public class DownloadFile extends DownloadAction {
}
// Send data
- URL url = new URL(ConfigDefaults.get().getCobblerServerUrl());
+ URL url = new URL(ConfigDefaults.get().getCobblerServerUrl() + '/cobbler_api';
URLConnection conn = url.openConnection();
conn.setDoOutput(true);
OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
11 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.9.18-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.18-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-26 15:58 +0000
Tagging package [spacewalk-java] version [1.9.18-1] in directory [java/].
Changes since smartpm-5.5.0-1:
Tomas Lestach (2):
879332 - introduce 'md5_crypt_rootpw' option for kickstart.profile.setAdvancedOptions API
Automatic commit of package [spacewalk-java] release [1.9.18-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 19 ++++++++--
java/spacewalk-java.spec | 6 ++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 22 insertions(+), 5 deletions(-)
---
11 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 19 ++++++++--
java/spacewalk-java.spec | 6 ++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit cc8a7e08bb3dec0fa9caad82d71f90f5a2047386
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 26 16:58:56 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.18-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0b1b141..698bdb4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.17
+Version: 1.9.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.18-1
+- 879332 - introduce 'md5_crypt_rootpw' option for
+ kickstart.profile.setAdvancedOptions API
+
* Fri Nov 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.17-1
- 879443 - preserve product name when cloning channels using API
- Implement new API call system.listAllInstallablePackages
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index ff26caa..d9aa5ff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.17-1 java/
+1.9.18-1 java/
commit c5224642e03c7df9c1db27e3ef25e2f1700cd185
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 26 11:33:06 2012 +0100
879332 - introduce 'md5_crypt_rootpw' option for kickstart.profile.setAdvancedOptions API
to support other password hash algorithms except of MD5
- similar to the 8853d280 change for WebUI
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 2ea7a34..8907ec8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -53,6 +53,7 @@ import com.redhat.rhn.manager.kickstart.KickstartIpCommand;
import com.redhat.rhn.manager.kickstart.KickstartManager;
import com.redhat.rhn.manager.kickstart.KickstartOptionsCommand;
+import org.apache.commons.lang.BooleanUtils;
import org.cobbler.Profile;
import java.util.ArrayList;
@@ -533,6 +534,9 @@ public class ProfileHandler extends BaseHandler {
* or invalid advanced option is provided
*
* @xmlrpc.doc Set advanced options for a kickstart profile.
+ * If 'md5_crypt_rootpw' is set to 'True', 'root_pw' is taken as plaintext and
+ * will md5 encrypted on server side, otherwise a hash encoded password
+ * (according to the auth option) is expected
* @xmlrpc.param #session_key()
* @xmlrpc.param #param("string","ksLabel")
* @xmlrpc.param
@@ -545,7 +549,7 @@ public class ProfileHandler extends BaseHandler {
* timezone, auth, rootpw, selinux, reboot, firewall, xconfig, skipx,
* key, ignoredisk, autopart, cmdline, firstboot, graphical, iscsi,
* iscsiname, logging, monitor, multipath, poweroff, halt, services,
- * shutdown, user, vnc, zfcp, driverdisk")
+ * shutdown, user, vnc, zfcp, driverdisk, md5_crypt_rootpw")
* #prop_desc("string", "arguments", "Arguments of the option")
* #struct_end()
* #array_end()
@@ -569,7 +573,7 @@ public class ProfileHandler extends BaseHandler {
"selinux", "reboot", "firewall", "xconfig", "skipx", "key",
"ignoredisk", "autopart", "cmdline", "firstboot", "graphical", "iscsi",
"iscsiname", "logging", "monitor", "multipath", "poweroff", "halt",
- "services", "shutdown", "user", "vnc", "zfcp", "driverdisk"};
+ "services", "shutdown", "user", "vnc", "zfcp", "driverdisk", "md5_crypt_rootpw"};
List<String> validOptions = Arrays.asList(validOptionNames);
@@ -626,7 +630,7 @@ public class ProfileHandler extends BaseHandler {
if (cn.getName().equals("rootpw")) {
String pwarg = (String) option.get("arguments");
// password already encrypted
- if (pwarg.startsWith("$1$")) {
+ if (!md5cryptRootPw(options)) {
kc.setArguments(pwarg);
}
// password changed, encrypt it
@@ -647,6 +651,15 @@ public class ProfileHandler extends BaseHandler {
return 1;
}
+ private boolean md5cryptRootPw(List<Map> options) {
+ for (Map m : options) {
+ if ("md5_crypt_rootpw".equals(m.get("name"))) {
+ return BooleanUtils.toBoolean((String)m.get("arguments"));
+ }
+ }
+ return false;
+ }
+
/**
* Get custom options for a kickstart profile.
* @param sessionKey the session key
11 years, 5 months
Changes to 'refs/tags/smartpm-5.5.0-1'
by Michael Mraka
Tag 'smartpm-5.5.0-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-11-26 12:17 +0000
Tagging package [smartpm] version [5.5.0-1] in directory [client/solaris/smartpm/].
Changes since rhnclient-5.5.1-1:
Michael Mraka (2):
let's reset version above satellite version
Automatic commit of package [smartpm] minor release [5.5.0-1].
---
client/solaris/smartpm/smartpm.spec | 10 ++++++++--
rel-eng/packages/smartpm | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
---
11 years, 5 months
2 commits - client/solaris rel-eng/packages
by Michael Mraka
client/solaris/smartpm/smartpm.spec | 10 ++++++++--
rel-eng/packages/smartpm | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit b7ed781f8c18c989a23bd5affa66627c5f2ef2ce
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 26 13:17:53 2012 +0100
Automatic commit of package [smartpm] minor release [5.5.0-1].
diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec
index 563f214..54d22d7 100644
--- a/client/solaris/smartpm/smartpm.spec
+++ b/client/solaris/smartpm/smartpm.spec
@@ -11,7 +11,7 @@ Name: smartpm
Source0: smartpm-%{version}.tar.gz
Epoch: 1
Version: 5.5.0
-Release: 0
+Release: 1
License: GPLv2
Group: Applications/System
URL: http://www.smartpm.org/
@@ -56,6 +56,12 @@ env %{__python} setup.py build
%{python_sitearch}/rhn/actions/solarispkgs.py*
%changelog
+* Mon Nov 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.0-1
+- let's reset version above satellite version
+- 838033 - Remove use of ZipFile object to avoid ZipFile 64 extension missing
+ in python 2.4
+- %%defattr is not needed since rpm 4.4
+
* Wed Dec 21 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 0.2-5
- update copyright info
diff --git a/rel-eng/packages/smartpm b/rel-eng/packages/smartpm
index 8491dce..9858731 100644
--- a/rel-eng/packages/smartpm
+++ b/rel-eng/packages/smartpm
@@ -1 +1 @@
-0.2-5 client/solaris/smartpm/
+5.5.0-1 client/solaris/smartpm/
commit e74685830f26d478a4d88b89eaf5793f1d013e06
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 26 12:03:30 2012 +0100
let's reset version above satellite version
diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec
index b4a8737..563f214 100644
--- a/client/solaris/smartpm/smartpm.spec
+++ b/client/solaris/smartpm/smartpm.spec
@@ -10,8 +10,8 @@ Summary: Next generation package handling tool
Name: smartpm
Source0: smartpm-%{version}.tar.gz
Epoch: 1
-Version: 0.2
-Release: 5
+Version: 5.5.0
+Release: 0
License: GPLv2
Group: Applications/System
URL: http://www.smartpm.org/
11 years, 5 months