java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java | 17 +++++-----
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 64667a91e02e48802a9b5bff64141644c5dafcf9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 30 14:36:37 2011 +0200
602179 - limit fake generated password to maximal password length
for PAM enabled logins
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
index 57e9b87..80c87e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.multiorg;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.conf.UserDefaults;
import com.redhat.rhn.common.util.MD5Crypt;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.frontend.action.user.UserActionHelper;
@@ -24,6 +25,7 @@ import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.org.CreateOrgCommand;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -73,14 +75,15 @@ public class OrgCreateAction extends RhnAction {
*/
if (dynaForm.get("usepam") != null &&
((Boolean) dynaForm.get("usepam")).booleanValue()) {
- String hash = MD5Crypt.crypt("" + System.currentTimeMillis());
- if (dynaForm.get(UserActionHelper.DESIRED_PASS) == null ||
- dynaForm.get(UserActionHelper.DESIRED_PASS).equals("")) {
- dynaForm.set(UserActionHelper.DESIRED_PASS, hash);
+ String fakePassword = MD5Crypt.crypt("" + System.currentTimeMillis()).
+ substring(0, UserDefaults.get().getMaxPasswordLength());
+ if (StringUtils.isEmpty(
+ (String) dynaForm.get(UserActionHelper.DESIRED_PASS))) {
+ dynaForm.set(UserActionHelper.DESIRED_PASS, fakePassword);
}
- if (dynaForm.get(UserActionHelper.DESIRED_PASS_CONFIRM) == null ||
- dynaForm.get(UserActionHelper.DESIRED_PASS_CONFIRM).equals("")) {
- dynaForm.set(UserActionHelper.DESIRED_PASS_CONFIRM, hash);
+ if (StringUtils.isEmpty(
+ (String) dynaForm.get(UserActionHelper.DESIRED_PASS_CONFIRM))) {
+ dynaForm.set(UserActionHelper.DESIRED_PASS_CONFIRM, fakePassword);
}
}
12 years, 6 months
Changes to 'refs/tags/spacewalk-certs-tools-1.6.5-1'
by Jan Pazdziora
Tag 'spacewalk-certs-tools-1.6.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-30 12:27 +0000
Tagging package [spacewalk-certs-tools] version [1.6.5-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-search-1.6.3-1:
Jan Pazdziora (3):
689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
689939 - match star in common name.
Automatic commit of package [spacewalk-certs-tools] release [1.6.5-1].
---
client/tools/osad/src/jabber_lib.py | 3 ++-
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolLib.py | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
---
12 years, 6 months
Changes to 'refs/tags/osad-5.10.23-1'
by Jan Pazdziora
Tag 'osad-5.10.23-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-30 12:28 +0000
Tagging package [osad] version [5.10.23-1] in directory [client/tools/osad/].
Changes since spacewalk-search-1.6.3-1:
Jan Pazdziora (4):
689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
689939 - match star in common name.
Automatic commit of package [spacewalk-certs-tools] release [1.6.5-1].
Automatic commit of package [osad] release [5.10.23-1].
---
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/jabber_lib.py | 3 ++-
rel-eng/packages/osad | 2 +-
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolLib.py | 3 ++-
6 files changed, 14 insertions(+), 6 deletions(-)
---
12 years, 6 months
4 commits - client/tools rel-eng/packages spacewalk/certs-tools
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/jabber_lib.py | 3 ++-
rel-eng/packages/osad | 2 +-
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolLib.py | 3 ++-
6 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 69a78ae0134c2deb8025320d8e566ac4c9fde9df
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:27:58 2011 +0200
Automatic commit of package [osad] release [5.10.23-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 08f4699..66bb930 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.22
+Version: 5.10.23
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 5.10.23-1
+- 689939 - match star in common name.
+
* Fri Sep 30 2011 Jan Pazdziora 5.10.22-1
- 621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (osa-
dispatcher).
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index c742f95..f781633 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.22-1 client/tools/osad/
+5.10.23-1 client/tools/osad/
commit a18a99590e2d50b4122470ec1196fda1307d94e6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:27:48 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.6.5-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 7b5a192..1282b4d 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.6.4-1 spacewalk/certs-tools/
+1.6.5-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index cb8e9c2..73ba3fc 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.4
+Version: 1.6.5
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
+* Fri Sep 30 2011 Jan Pazdziora 1.6.5-1
+- 689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
+
* Wed Aug 24 2011 Miroslav Suchý 1.6.4-1
- if subjectAltName is used, hostname must be present in dNSName
commit 3801ed7115cc0a5c8573d643173389b4790bb419
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:25:22 2011 +0200
689939 - match star in common name.
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index 63514ef..5ee3473 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -22,6 +22,7 @@ import socket
import jabber
import random
import string
+import fnmatch
from optparse import OptionParser, Option
import traceback
from cStringIO import StringIO
@@ -679,7 +680,7 @@ class JabberClient(jabber.Client):
if hdot[-1] != '.':
hdot = hdot + '.'
- if common_name != hdot:
+ if common_name != hdot and not fnmatch.fnmatchcase(hdot, common_name):
raise SSLVerifyError("Mismatch: peer name: %s; common name: %s" %
(self._host, common_name))
commit 097d996912dbf488e4d6e0d836c510fadf0ab057
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:24:30 2011 +0200
689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index 9cd4fb0..262d988 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -80,8 +80,9 @@ def getMachineName(hostname):
yyy.zzz.com --> yyy
zzz.com --> zzz.com
xxx --> xxx
+ *.yyy.zzz.com --> _star_.yyy
"""
- hn = string.split(hostname, '.')
+ hn = string.split(hostname.replace('*', '_star_'), '.')
if len(hn) < 3:
return hostname
return string.join(hn[:-2], '.')
12 years, 6 months
Changes to 'refs/tags/spacewalk-search-1.6.3-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.6.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-30 09:49 +0000
Tagging package [spacewalk-search] version [1.6.3-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-search-1.6.2-1:
Jan Pazdziora (4):
621531 - move /etc/rhn/search to /usr/share/rhn/config-defaults (search).
621531 - update search Configuration to use the new /usr/share/rhn/config-defaults location.
621531 - update startup scripts to use the new /usr/share/rhn/config-defaults location.
Automatic commit of package [spacewalk-search] release [1.6.3-1].
---
rel-eng/packages/spacewalk-search | 2 -
search-server/spacewalk-search/run.sh | 4 +-
search-server/spacewalk-search/spacewalk-search.spec | 20 ++++++----
search-server/spacewalk-search/src/config/rhn-search | 4 +-
search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java | 13 ++++--
5 files changed, 27 insertions(+), 16 deletions(-)
---
12 years, 6 months
4 commits - rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora
rel-eng/packages/spacewalk-search | 2 -
search-server/spacewalk-search/run.sh | 4 +-
search-server/spacewalk-search/spacewalk-search.spec | 20 ++++++----
search-server/spacewalk-search/src/config/rhn-search | 4 +-
search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java | 13 ++++--
5 files changed, 27 insertions(+), 16 deletions(-)
New commits:
commit f5311102a08746339eff9eab0d012c2c3bab4c69
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:49:24 2011 +0200
Automatic commit of package [spacewalk-search] release [1.6.3-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 71d5bf1..2766fe0 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.6.2-1 search-server/spacewalk-search/
+1.6.3-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index c37984e..aa58a35 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -116,6 +116,13 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 1.6.3-1
+- 621531 - update startup scripts to use the new /usr/share/rhn/config-defaults
+ location.
+- 621531 - update search Configuration to use the new /usr/share/rhn/config-
+ defaults location.
+- 621531 - move /etc/rhn/search to /usr/share/rhn/config-defaults (search).
+
* Fri Sep 30 2011 Jan Pazdziora 1.6.2-1
- 621531 - fixing comment - the search server uses /etc/rhn/search, not
/etc/rhn/default.
commit de094fb3b04cbffeb3133a6e68ea036a6acf573d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:41:05 2011 +0200
621531 - update startup scripts to use the new /usr/share/rhn/config-defaults location.
diff --git a/search-server/spacewalk-search/run.sh b/search-server/spacewalk-search/run.sh
index 0bbf58a..8c6e7d7 100755
--- a/search-server/spacewalk-search/run.sh
+++ b/search-server/spacewalk-search/run.sh
@@ -6,8 +6,8 @@ if [ ! "$RETURN_VAL" -eq "0" ]; then
exit 1;
fi
-if [ ! -r "/etc/rhn/search/rhn_search.conf" ]; then
- echo "you need to symlink rhn_search.conf as /etc/rhn/search/rhn_search.conf"
+if [ ! -r "/usr/share/rhn/config-defaults/rhn_search.conf" ]; then
+ echo "you need to symlink rhn_search.conf as /usr/share/rhn/config-defaults/rhn_search.conf"
exit 2;
fi
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search
index 1429d17..2103c86 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -34,7 +34,7 @@ APP_LONG_NAME="rhn-search"
# Wrapper
WRAPPER_CMD="/usr/bin/rhnsearchd"
-WRAPPER_CONF="/etc/rhn/search/rhn_search_daemon.conf"
+WRAPPER_CONF="/usr/share/rhn/config-defaults/rhn_search_daemon.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified.
@@ -64,7 +64,7 @@ unlock() {
IDXDIR=`grep search.index_work_dir /etc/rhn/rhn.conf`
if [ -z $IDXDIR ]
then
- IDXDIR=`grep search.index_work_dir /etc/rhn/search/rhn_search.conf`
+ IDXDIR=`grep search.index_work_dir /usr/share/rhn/config-defaults/rhn_search.conf`
fi
if [ ! -z $IDXDIR ]
commit aa562368fb63b7ccf7662792a3f40d18ab0fdd30
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:24:05 2011 +0200
621531 - update search Configuration to use the new /usr/share/rhn/config-defaults location.
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
index 504218c..67eb2e2 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
@@ -41,8 +41,8 @@ import java.util.TreeSet;
* global config, but you can instantiate one of your own if you want. This
* layer insulates us from changing the underlying implementation.
* <p>
- * Config files are properties, with /etc/rhn/search/rhn.conf setting defaults
- * that can be overridden /etc/rhn/rhn.conf.
+ * Config files are properties, with /usr/share/rhn/config-defaults/*.conf
+ * setting defaults that can be overridden by /etc/rhn/rhn.conf.
*
* @version $Rev$
*/
@@ -60,6 +60,11 @@ public class Configuration {
public static final String DEFAULT_CONF_DIR = "/etc/rhn";
/**
+ * The directory in which to look for default config values
+ */
+ public static final String DEFAULT_DEFAULT_CONF_DIR = "/usr/share/rhn/config-defaults";
+
+ /**
* The system property containing the RHN configuration directory.
* If the property is not set, config files are read
* from {@link #DEFAULT_CONF_DIR}
@@ -69,7 +74,7 @@ public class Configuration {
/**
* The system property containing the SearchServer configuration directory.
* If the property is not set, config files are read
- * from {@link #DEFAULT_CONF_DIR}/search
+ * from /usr/share/rhn/config-defaults
*/
private static final String SEARCH_CONF_DIR_PROPERTY = "search.config.dir";
@@ -181,7 +186,7 @@ public class Configuration {
String confDir = System.getProperty(SEARCH_CONF_DIR_PROPERTY);
if (StringUtils.isBlank(confDir)) {
- confDir = getRHNConfigDir() + "/search";
+ confDir = DEFAULT_DEFAULT_CONF_DIR;
}
return confDir;
}
commit 71b5845d7ebe6807b08fefbb63f21ad29861a419
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:23:33 2011 +0200
621531 - move /etc/rhn/search to /usr/share/rhn/config-defaults (search).
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 0773781..c37984e 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -72,7 +72,7 @@ Spacewalk Server.
%install
rm -fr ${RPM_BUILD_ROOT}
ant -Djar.version=%{version} install
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search
+install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/indexes
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib
@@ -87,8 +87,8 @@ cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib
install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search
install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir}
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd
-install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search.conf
-install -p -m 644 src/config/search/rhn_search_daemon.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search_daemon.conf
+install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search.conf
+install -p -m 644 src/config/search/rhn_search_daemon.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
ln -s -f %{_prefix}/share/rhn/search/lib/spacewalk-search-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/spacewalk-search.jar
%clean
@@ -111,9 +111,8 @@ fi
%attr(755, root, root) %{_prefix}/share/rhn/search/indexes
%attr(755, root, root) %{_initrddir}/rhn-search
%attr(755, root, root) %{_bindir}/rhnsearchd
-%dir %{_sysconfdir}/rhn/search/
-%config(noreplace) %{_sysconfdir}/rhn/search/rhn_search.conf
-%config(noreplace) %{_sysconfdir}/rhn/search/rhn_search_daemon.conf
+%{_prefix}/share/rhn/config-defaults/rhn_search.conf
+%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
12 years, 6 months
Changes to 'refs/tags/spacewalk-search-1.6.2-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.6.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-30 09:00 +0000
Tagging package [spacewalk-search] version [1.6.2-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-proxy-1.6.3-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-search] release [1.6.2-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 6 months
rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 40cda18722854401aa8683ec4587a29d233fdfc5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:00:23 2011 +0200
Automatic commit of package [spacewalk-search] release [1.6.2-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index b03c170..71d5bf1 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.6.1-1 search-server/spacewalk-search/
+1.6.2-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index f5374ee..0773781 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.6.1
+Version: 1.6.2
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -117,6 +117,10 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 1.6.2-1
+- 621531 - fixing comment - the search server uses /etc/rhn/search, not
+ /etc/rhn/default.
+
* Fri Jul 22 2011 Jan Pazdziora 1.6.1-1
- We only support version 14 and newer of Fedora, removing conditions for old
versions.
12 years, 6 months
Changes to 'refs/tags/spacewalk-proxy-1.6.3-1'
by Jan Pazdziora
Tag 'spacewalk-proxy-1.6.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-30 08:59 +0000
Tagging package [spacewalk-proxy] version [1.6.3-1] in directory [proxy/proxy/].
Changes since osad-5.10.22-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-proxy] release [1.6.3-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 6 months
proxy/proxy rel-eng/packages
by Jan Pazdziora
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 199676674a0e3deddd68f5189dadaf93e3656625
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 10:59:30 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.6.3-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 9762988..2e73e0d 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.6.2
+Version: 1.6.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -320,6 +320,9 @@ fi
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 1.6.3-1
+- 621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (proxy).
+
* Thu Aug 11 2011 Miroslav Suchý 1.6.2-1
- do not mask original error by raise in execption
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 013a9c6..bad2def 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.6.2-1 proxy/proxy/
+1.6.3-1 proxy/proxy/
12 years, 6 months