Changes to 'refs/tags/spacewalk-search-2.1.10-1'
by Tomas Lestach
Tag 'spacewalk-search-2.1.10-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-06 16:28 +0000
Tagging package [spacewalk-search] version [2.1.10-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-config-2.1.5-1:
Tomas Lestach (2):
fix rhn-search on fedoras
Automatic commit of package [spacewalk-search] release [2.1.10-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
search-server/spacewalk-search/src/config/rhn-search | 2 +-
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 3 +++
4 files changed, 10 insertions(+), 3 deletions(-)
---
10 years, 3 months
2 commits - rel-eng/packages search-server/spacewalk-search
by Tomas Lestach
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
search-server/spacewalk-search/src/config/rhn-search | 2 +-
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 3 +++
4 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 9e7c2ee2a63866feead7375f83df95f7e4481a7e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 17:28:40 2014 +0100
Automatic commit of package [spacewalk-search] release [2.1.10-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index c6d3eef..287e4a5 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-2.1.9-1 search-server/spacewalk-search/
+2.1.10-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 2cd89b0..8ab6c69 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: 2.1.9
+Version: 2.1.10
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -191,6 +191,9 @@ fi
%attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog
+* Mon Jan 06 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.10-1
+- fix rhn-search on fedoras
+
* Thu Dec 12 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.9-1
- do not let cleanindex log into the console
- there're no objectweb-asm on rhel5
commit 1decc125e82456a2e60d4c8f9310dcd739a2a915
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 17:12:12 2014 +0100
fix rhn-search on fedoras
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 15e0963..2cd89b0 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -38,6 +38,7 @@ Requires: oro
%endif
#Requires: lucene
%if 0%{?fedora}
+Requires: mchange-commons
Requires: objectweb-asm
%else
Requires: asm
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search
index dbaf4d9..6cc84ff 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -76,7 +76,7 @@ unlock() {
removeindex() {
JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc'
- SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar`
+ SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar /usr/share/java/cglib.jar /usr/share/java/mchange-commons.jar /usr/share/java/mchange-commons-java.jar`
CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes > /dev/null
}
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
index 5ca090d..18b8799 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
@@ -46,6 +46,9 @@ wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar
wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar
wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar
wrapper.java.classpath.26=/usr/share/java/c3p0.jar
+wrapper.java.classpath.27=/usr/share/java/cglib.jar
+wrapper.java.classpath.28=/usr/share/java/mchange-commons.jar
+wrapper.java.classpath.29=/usr/share/java/mchange-commons-java.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=/usr/lib
10 years, 3 months
Changes to 'refs/tags/spacewalk-config-2.1.5-1'
by Tomas Lestach
Tag 'spacewalk-config-2.1.5-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-06 15:53 +0000
Tagging package [spacewalk-config] version [2.1.5-1] in directory [spacewalk/config/].
Changes since spacewalk-java-2.1.109-1:
Tomas Lestach (2):
rewrite Login2.do to Login.do page
Automatic commit of package [spacewalk-config] release [2.1.5-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 1 +
spacewalk/config/spacewalk-config.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 3 months
2 commits - rel-eng/packages spacewalk/config
by Tomas Lestach
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 1 +
spacewalk/config/spacewalk-config.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit fd88e0f82366afc92f10f5fe58b4947bc58860ab
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 16:53:15 2014 +0100
Automatic commit of package [spacewalk-config] release [2.1.5-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 84e86ed..1579692 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-2.1.4-1 spacewalk/config/
+2.1.5-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index b258fd5..8aa32eb 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 2.1.4
+Version: 2.1.5
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -104,6 +104,9 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Mon Jan 06 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.5-1
+- rewrite Login2.do to Login.do page
+
* Thu Dec 19 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1
- updated links to system group delete page
commit 1e6fdb067910d38effd0b7b738731fd1c3bd3f51
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 16:52:28 2014 +0100
rewrite Login2.do to Login.do page
need for IPA integration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 9eb6dbb..56f26ff 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -85,6 +85,7 @@ ProxyTimeout 210
<Proxy ajp://localhost:8009>
ProxySet min=1
</Proxy>
+RewriteRule ^/rhn/Login2\.do ajp://localhost:8009/rhn/Login.do [P]
RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P]
</IfModule>
10 years, 3 months
Changes to 'refs/tags/spacewalk-java-2.1.109-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.109-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-06 10:40 +0000
Tagging package [spacewalk-java] version [2.1.109-1] in directory [java/].
Changes since spacecmd-2.1.22-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [2.1.109-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b37ffb16013c5e13169c01895aa026825728c0a9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 11:40:39 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.109-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d506b84..cf1e082 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.108
+Version: 2.1.109
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jan 06 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.109-1
+- 1048090 - Revert "add package ID to array returned by system.listPackages API
+ call"
+
* Fri Jan 03 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.108-1
- store url_bounce and request_method to session and re-use common login parts
- support logins using Kerberos ticket
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9cb7a72..b7c1eff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.108-1 java/
+2.1.109-1 java/
10 years, 3 months
Changes to 'refs/tags/spacecmd-2.1.22-1'
by Tomas Lestach
Tag 'spacecmd-2.1.22-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-06 10:22 +0000
Tagging package [spacecmd] version [2.1.22-1] in directory [spacecmd/].
Changes since spacewalk-backend-2.1.39-1:
Tomas Lestach (3):
1048090 - Revert "add package ID to array returned by system.listPackages API call"
1048090 - fix spacecmd, so it does not expect package id within the system.listPackages API call
Automatic commit of package [spacecmd] release [2.1.22-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 1
rel-eng/packages/spacecmd | 2 -
spacecmd/spacecmd.spec | 6 ++-
spacecmd/src/lib/system.py | 17 ++++------
5 files changed, 14 insertions(+), 15 deletions(-)
---
10 years, 3 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Tomas Lestach
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/system.py | 17 +++++++----------
3 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 3e598399825db78013dae304ea359ce7f3345db5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 11:22:05 2014 +0100
Automatic commit of package [spacecmd] release [2.1.22-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 6db40aa..ca384e9 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.21-1 spacecmd/
+2.1.22-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 8cfc658..53bc597 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.21
+Version: 2.1.22
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,10 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Mon Jan 06 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.22-1
+- 1048090 - fix spacecmd, so it does not expect package id within the
+ system.listPackages API call
+
* Fri Dec 20 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.21-1
- 1014765 - fix binary file detection
- added function package_listdependencies
commit a0a358c330158b7a55a26dc31c0ad926737c742e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 11:09:35 2014 +0100
1048090 - fix spacecmd, so it does not expect package id within the system.listPackages API call
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index fd04f27..d221705 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -2821,19 +2821,16 @@ def do_system_syncpackages(self, args):
# get package IDs
packages = self.client.system.listPackages(self.session, source_id)
- if self.check_api_version('10.16'):
- package_ids = [p.get('id') for p in packages]
- else:
- package_names = build_package_names(packages)
+ package_names = build_package_names(packages)
- package_ids = []
+ package_ids = []
- for name in package_names:
- pkg_id = self.get_package_id(name)
+ for name in package_names:
+ pkg_id = self.get_package_id(name)
- # filter out invalid package IDs
- if pkg_id:
- package_ids.append(pkg_id)
+ # filter out invalid package IDs
+ if pkg_id:
+ package_ids.append(pkg_id)
self.client.system.scheduleSyncPackagesWithSystem(self.session,
target_id,
10 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 7a5f7b839644bb3a933623b2ba1077eea983f031
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 6 10:06:56 2014 +0100
1048090 - Revert "add package ID to array returned by system.listPackages API call"
* the patch returned package name id, not package id
* we actually cannot return package id, since a server may have packages installed that are not available on the Spacewalk server
This reverts commit ceccae97e862eed4bd2ea9470a5974fe59f09bb3.
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 c374448..3d78fb8 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
@@ -1446,8 +1446,7 @@ SELECT PN.name,
PE.release,
coalesce(PE.epoch, ' ') as epoch,
PA.name as arch,
- SP.installtime,
- PN.id
+ SP.installtime
FROM rhnServerPackage SP inner join
rhnPackageName PN on PN.id = SP.name_id inner join
rhnPackageEVR PE on PE.id = SP.evr_id left join
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index d72e898..9159fe0 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1371,7 +1371,6 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype
* #array()
* #struct("package")
- * #prop("int", "id")
* #prop("string", "name")
* #prop("string", "version")
* #prop("string", "release")
10 years, 3 months
Changes to 'refs/tags/spacewalk-backend-2.1.39-1'
by Tomas Lestach
Tag 'spacewalk-backend-2.1.39-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-03 16:08 +0000
Tagging package [spacewalk-backend] version [2.1.39-1] in directory [backend/].
Changes since spacewalk-remote-utils-2.1.3-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-backend] release [2.1.39-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 3 months