4 commits - backend/spacewalk-backend.spec java/spacewalk-java.spec rel-eng/packages search-server/spacewalk-doc-indexes spacewalk/config
by Miroslav Suchý
backend/spacewalk-backend.spec | 7 +++++
java/spacewalk-java.spec | 12 +++++++++-
rel-eng/packages/spacewalk-backend | 2 -
rel-eng/packages/spacewalk-config | 2 -
rel-eng/packages/spacewalk-doc-indexes | 2 -
rel-eng/packages/spacewalk-java | 2 -
search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec | 6 ++++-
spacewalk/config/spacewalk-config.spec | 5 +++-
8 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit 70a34f1bd7e167d3498f077736febce7679a507c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:59:26 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.19-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 695a41c..081c085 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.18
+Version: 0.7.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.19-1
+- improving the system channels page by increasing the base channel selector box size and having the custom channels sorted by name (jsherril(a)redhat.com)
+- another small display issue fix for list (jsherril(a)redhat.com)
+- fixing sort on channel manage page to sort by name and not id (jsherril(a)redhat.com)
+- fixing a bunch of list display issues that have bugged me for a while (jsherril(a)redhat.com)
+- 519788 - fixing set selection on two config management lists (jsherril(a)redhat.com)
+- checkstyle fix (jsherril(a)redhat.com)
+- unit test fixes (jsherril(a)redhat.com)
+- unit test fix - reloading the "Action" hibernate object seemed to cause issues with the user object that it was associated with, so instead lets try refreshing (jsherril(a)redhat.com)
+
* Fri Nov 20 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.18-1
- some columns not filled on webui for non-cve errata (tlestach(a)redhat.com)
- checkstyle fix (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f1305e7..1351249 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.18-1 java/
+0.7.19-1 java/
commit 6aa0ff55b3c6c22325f306a8d8b38754e99a550d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:58:12 2009 +0100
Automatic commit of package [spacewalk-doc-indexes] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk-doc-indexes b/rel-eng/packages/spacewalk-doc-indexes
index e909cd6..d0a84aa 100644
--- a/rel-eng/packages/spacewalk-doc-indexes
+++ b/rel-eng/packages/spacewalk-doc-indexes
@@ -1 +1 @@
-0.6.1-1 search-server/spacewalk-doc-indexes/
+0.7.1-1 search-server/spacewalk-doc-indexes/
diff --git a/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec b/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
index ed77cb5..ea1668c 100644
--- a/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
+++ b/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
@@ -1,5 +1,5 @@
Name: spacewalk-doc-indexes
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
Summary: Lucene indexes of help documentation for spacewalk
@@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.1-1
+- Update doc indexes to reside in "en-US" (jmatthew(a)redhat.com)
+- bumping versions to 0.7.0 (jmatthew(a)redhat.com)
+
* Fri Aug 07 2009 John Matthews <jmatthews(a)redhat.com> 0.7.0
- update indexes to reside in "en-US"
commit 5f77e4e3b73dea77e3c402a374a28246d7597af3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:55:56 2009 +0100
Automatic commit of package [spacewalk-config] release [0.7.2-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 5dba092..2420d1f 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-0.7.1-1 spacewalk/config/
+0.7.2-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index f5af2ad..ed2eda7 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -2,7 +2,7 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -102,6 +102,9 @@ EOF
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.2-1
+- Create the symlinks in .spec, based on .symlink "templates". (jpazdziora(a)redhat.com)
+
* Fri Aug 28 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.1-1
- No need to pre-require jabberd (mzazrivec(a)redhat.com)
- removed all jabberd prep config files (mzazrivec(a)redhat.com)
commit 7c6e511041581ff6fcad53ca1dc02ca7e2bcb59f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:54:05 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5a1e1a6..e52cc00 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.15
+Version: 0.7.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.16-1
+- 540544 - raise error if channel do not exist or you are not allowed to add or remove it
+- 540544 - fix usage of check_user_password
+- made conditions more readable (michael.mraka(a)redhat.com)
+
* Thu Nov 19 2009 Jan Pazdziora 0.7.15-1
- 537063 - drop the report-specific options
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index dd4fddd..03e0bce 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.15-1 backend/
+0.7.16-1 backend/
14 years, 4 months
2 commits - client/rhel rel-eng/packages spacewalk/package
by Miroslav Suchý
client/rhel/rhnlib/rhnlib.spec | 7 ++++++-
rel-eng/packages/rhnlib | 2 +-
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 5 ++++-
4 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit b3786937dbaf22aafc34d08c1a9f075babacb554
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:51:32 2009 +0100
Automatic commit of package [spacewalk] release [0.7.3-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk
index 7d22077..e80cb1b 100644
--- a/rel-eng/packages/spacewalk
+++ b/rel-eng/packages/spacewalk
@@ -1 +1 @@
-0.7.2-1 spacewalk/package/
+0.7.3-1 spacewalk/package/
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index cf0604c..e175793 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,7 +1,7 @@
%define release_name Gemini
Name: spacewalk
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
Summary: Spacewalk Systems Management Application
URL: https://fedorahosted.org/spacewalk
@@ -164,6 +164,9 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.3-1
+- Make spacewalk require the editarea RPM (colin.coe(a)gmail.com)
+
* Wed Sep 02 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.2-1
- added database backend to defaults
commit 877fad7cfbbd771e6d9e4510d63b84fc6fb5a8db
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:48:38 2009 +0100
Automatic commit of package [rhnlib] release [2.5.15-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 8d5830f..a1792a7 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.14
+Version: 2.5.15
Release: 1%{?dist}
Group: Development/Libraries
@@ -54,6 +54,11 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 2.5.15-1
+- aamt is not Null in most cases, move it more to right
+- replace len() with ==
+- count length of buffer only once in loop
+
* Thu Nov 5 2009 Miroslav Suchy <msuchy(a)redhat.com> 2.5.14-1
- fix build under opensuse
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index ca1bbb0..66bfa13 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.14-1 client/rhel/rhnlib/
+2.5.15-1 client/rhel/rhnlib/
14 years, 4 months
2 commits - client/solaris rel-eng/git-untagged-commits.pl rel-eng/packages
by Miroslav Suchý
client/solaris/rhnclient/rhnclient.spec | 6 +++++-
rel-eng/git-untagged-commits.pl | 4 ++--
rel-eng/packages/rhnclient | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 10ebcac04ae756602d624640aa13c0ab13f5c2bf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:46:48 2009 +0100
Automatic commit of package [rhnclient] release [0.7-1].
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index 3b3afa0..5e59c31 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -5,7 +5,7 @@
Summary: Red Hat Network Client Utilities and Libraries
Name: rhnclient
Source0: %{name}-%{version}.tar.gz
-Version: 0.4
+Version: 0.7
Release: 1
License: GPLv2
Group: Development/Libraries
@@ -65,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
#%doc ChangeLog COPYING README TODO
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7-1
+- Reverting the client/solaris/rhnclient/rhnclient.spec part of the patch. (jpazdziora(a)redhat.com)
+- Log files should be ghosted rather than belonging to a package (m.d.chappell(a)bath.ac.uk)
+
* Thu Apr 23 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.4-1
- update copyright and licenses (jesusr(a)redhat.com)
diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient
index 4e6f3c2..599133a 100644
--- a/rel-eng/packages/rhnclient
+++ b/rel-eng/packages/rhnclient
@@ -1 +1 @@
-0.4-1 client/solaris/rhnclient/
+0.7-1 client/solaris/rhnclient/
commit 54cb35ab0f8b15cdec3c22a90471d4d886cd37ca
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:41:32 2009 +0100
change format of output
use abbreviated commit hash and write author email as well
diff --git a/rel-eng/git-untagged-commits.pl b/rel-eng/git-untagged-commits.pl
index 047ace9..92ef1e0 100755
--- a/rel-eng/git-untagged-commits.pl
+++ b/rel-eng/git-untagged-commits.pl
@@ -34,10 +34,10 @@ for my $file (@files) {
close FILE;
my $name = File::Basename::basename($file);
my ($version, $dir) = split /\s/, $line;
- my @changes = `git log --pretty=oneline $name-$version..HEAD -- $cdup$dir`;
+ my @changes = `git log --pretty=format:'%h %s (%ae)' $name-$version..HEAD -- $cdup$dir`;
if (@changes) {
print "$name-$version..HEAD:\n";
- print @changes;
+ print @changes, "\n";
print "------------------------------------------\n";
}
}
14 years, 4 months
3 commits - client/rhel client/tools rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 9 ++++++++-
client/rhel/rhnsd/rhnsd.spec | 5 ++++-
client/tools/rhn-virtualization/rhn-virtualization.spec | 9 ++++++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/rhn-virtualization | 2 +-
rel-eng/packages/rhnsd | 2 +-
6 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 67e3b1409907b46e5a196651519bd507aa962b91
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:28:30 2009 +0100
Automatic commit of package [rhn-virtualization] release [5.4.7-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 46ef726..110430b 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.6
+Version: 5.4.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -165,6 +165,13 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.4.7-1
+- 529688 - correctly detect Xen host
+- 530583 - detect an installing config also with ks= parameter
+- return back pieces still used by rhn-kickstart
+- 529688 - correctly update virtualization profile for KVM guest
+- missing commits from sat.git
+
* Sat Oct 03 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 5.4.6-1
- fixing typo for server initialization for non ssl case in rhev code.
(pkilambi(a)redhat.com)
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 397b2b9..3f4b2a5 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.6-1 client/tools/rhn-virtualization/
+5.4.7-1 client/tools/rhn-virtualization/
commit 1463147dd5a51dd6e55e6bc56fefb129628323f4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:26:16 2009 +0100
Automatic commit of package [rhn-client-tools] release [0.7.10-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d1bf438..b3c465a 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: 0.7.9
+Version: 0.7.10
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?suse_version: %{suse_version} > 1000}
@@ -225,6 +225,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.10-1
+- 216808 - add man page to package
+- 216808 - create new script spacewalk-channel
+- 527412 - compute delta and write it to logs only if writeChangesToLog is set to 1
+- 536789 - remove forgotten lines
+- 536789 - set only necessary network info
+
* Thu Nov 5 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.9-1
- suse has its own macro for updating icons
- enable build for suse 10.00 too
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 1e5d27f..81851b6 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.7.9-1 client/rhel/rhn-client-tools/
+0.7.10-1 client/rhel/rhn-client-tools/
commit 23edab9e9432525e4c6cb3beaca236ed45be4eae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:23:28 2009 +0100
Automatic commit of package [rhnsd] release [4.5.15-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index 0b08ba2..c4b4b65 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.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: rhnsd
-Version: 4.5.14
+Version: 4.5.15
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,9 @@ rm -fr $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 4.5.15-1
+- hardcode MANPATH
+
* Fri Sep 25 2009 Tomas Lestach <tlestach(a)redhat.com> 4.5.14-1
- removed hardcoded systemid path (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd
index 36cb2bf..edbe653 100644
--- a/rel-eng/packages/rhnsd
+++ b/rel-eng/packages/rhnsd
@@ -1 +1 @@
-4.5.14-1 client/rhel/rhnsd/
+4.5.15-1 client/rhel/rhnsd/
14 years, 4 months
projects/perl-Satcon rel-eng/packages
by Miroslav Suchý
projects/perl-Satcon/perl-Satcon.spec | 5 ++++-
rel-eng/packages/perl-Satcon | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 20f9a7814337a6b48958336893b3f97ef62ed36d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 13:21:12 2009 +0100
Automatic commit of package [perl-Satcon] release [1.11-1].
diff --git a/projects/perl-Satcon/perl-Satcon.spec b/projects/perl-Satcon/perl-Satcon.spec
index 5211653..f0a235b 100644
--- a/projects/perl-Satcon/perl-Satcon.spec
+++ b/projects/perl-Satcon/perl-Satcon.spec
@@ -1,6 +1,6 @@
Name: perl-Satcon
Summary: Framework for configuration files
-Version: 1.10
+Version: 1.11
Release: 1%{?dist}
License: GPLv2
Group: Applications/System
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
+* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 1.11-1
+- 520441 - don't apply ExtUtils::MY->fixin(shift) to perl executables
+
* Tue Dec 16 2008 Miroslav Suchý <msuchy(a)redhat.com> 1.10-1
- remove satcon-make-rpm.pl
diff --git a/rel-eng/packages/perl-Satcon b/rel-eng/packages/perl-Satcon
index 64e1c10..65377f1 100644
--- a/rel-eng/packages/perl-Satcon
+++ b/rel-eng/packages/perl-Satcon
@@ -1 +1 @@
-1.10-1 projects/perl-Satcon/
+1.11-1 projects/perl-Satcon/
14 years, 4 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 3162fb6fc3c6d65ea6eb151c2cc89f26faded78e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 24 17:16:06 2009 +0100
216808 - add man page to package
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 176f234..d1bf438 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -182,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_mandir}/man8/rhnreg_ks.8*
%{_mandir}/man8/rhn_register.8*
+%{_mandir}/man8/spacewalk-channel.8*
%config(noreplace) %{_sysconfdir}/security/console.apps/rhn_register
%config(noreplace) %{_sysconfdir}/pam.d/rhn_register
14 years, 5 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 | 106 ++++++++++++++
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2
client/rhel/rhn-client-tools/src/bin/Makefile | 2
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 97 ++++++++++++
4 files changed, 207 insertions(+)
New commits:
commit b10e27cf76498584190a2291779bf779fa8e61ba
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 24 17:05:59 2009 +0100
216808 - create new script spacewalk-channel
This script allows you to subscribe to and unsubscribe from channel from command line
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
new file mode 100644
index 0000000..668c3d6
--- /dev/null
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -0,0 +1,106 @@
+.\" Copyright 2009 Red Hat, Inc.
+.\"
+.\" This man page is free documentation; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this man page; if not, write to the Free Software
+.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\"
+.TH SPACEWALK-CHANNEL 8 "2009 November 24" "Linux" "Red Hat, Inc."
+
+.SH NAME
+spacewalk-channel \- Subscribe to or unsubscribe system from channel.
+
+.SH SYNOPSIS
+
+spacewalk-channel [\fIoptions\fP]
+
+.SH DESCRIPTION
+.PP
+\fVspacewalk-channel\fR enable you to subscribe to and unsubscribe from
+specified channels via the command line so a visit to the Red Hat Network
+(or Spacewalk) website isn't required.
+
+.SH OPTIONS
+
+.IP "\fB-l, --list\fP"
+Print list of channel you are currently subscribed to.
+.br
+.IP "\fB-a, --add\fP"
+You are subscribing system to given channel. You have to specify --user and --password.
+.br
+.IP "\fB-r, --remove\fP"
+You are unsubscribing system to given channel. You have to specify --user and --password.
+.br
+.IP "\fB-u, --username\fP"
+The username to register the system with under Red Hat Network, RHN Satellite or Spacewalk.
+.br
+.IP "\fB-p, --password\fP"
+The password associated with the username specified with the \fB--username\fR
+option. This is an unencrypted password.
+.br
+.IP "\fB-c, --channel\fP"
+Label of channel you want to subscribe to or unsubscribe from. Can be specified multiple
+times.
+.br
+.IP "\fB-v, --verbose\fP"
+Print out successfull action.
+.br
+.IP "\fB-h, --help\fP"
+Show a help message and exit.
+
+.SH "EXAMPLES"
+
+Subscribe to two channels:
+
+.RS
+.nf
+spacewalk-channel --add -c rhn-tools-rhel-i386-server-5 -c rhel-i386-server-vt-5 --user user --password foobar
+.fi
+.RE
+
+Unsubscribe from channel:
+
+.RS
+.nf
+spacewalk-channel --remove -c rhn-tools-rhel-i386-server-5 -c rhel-i386-server-vt-5 --user user --password foobar
+.fi
+.RE
+
+List subscribed channels:
+
+.RS
+.nf
+spacewalk-channel --list
+.fi
+.RE
+
+.SH "SEE ALSO"
+
+.PP
+\fBrhnplugin\fP(8), \fBrhn_register\fP(8), \fBup2date\fP(5).
+
+.SH AUTHORS
+.PP
+Miroslav Suchý <msuchy(a)redhat.com>
+
+.SH "BUGS"
+.PP
+Report bugs to <http://bugzilla.redhat.com>.
+
+.SH COPYRIGHT
+
+.PP
+Copyright \(co 2009 Red Hat, Inc.
+
+.PP
+This is free software; see the source for copying conditions. There is
+NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 1f5a71c..176f234 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -189,6 +189,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/rhn_register
%{_sbindir}/rhn_register
%{_sbindir}/rhnreg_ks
+%{_sbindir}/spacewalk-channel
+%{_sbindir}/rhn-channel
%{_datadir}/rhn/up2date_client/rhnreg.*
%{_datadir}/rhn/up2date_client/tui.*
diff --git a/client/rhel/rhn-client-tools/src/bin/Makefile b/client/rhel/rhn-client-tools/src/bin/Makefile
index 15b8888..7a1e73e 100644
--- a/client/rhel/rhn-client-tools/src/bin/Makefile
+++ b/client/rhel/rhn-client-tools/src/bin/Makefile
@@ -28,8 +28,10 @@ install:: all $(DIRS)
$(INSTALL_BIN) rhn_register.py $(SBIN_DIR)/rhn_register
$(INSTALL_BIN) rhn-profile-sync.py $(SBIN_DIR)/rhn-profile-sync
$(INSTALL_BIN) rhn_check.py $(SBIN_DIR)/rhn_check
+ $(INSTALL_BIN) spacewalk-channel.py $(SBIN_DIR)/spacewalk-channel
ln -sf consolehelper $(BIN_DIR)/rhn_register
+ ln -s spacewalk-channel $(SBIN_DIR)/rhn-channel
# OTHER targets for internal use
pychecker::
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
new file mode 100644
index 0000000..da1d082
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -0,0 +1,97 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2009 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.
+#
+import os
+import socket
+import sys
+from optparse import Option, OptionParser
+
+def systemExit(code, msgs=None):
+ "Exit with a code and optional message(s). Saved a few lines of code."
+ if msgs:
+ if type(msgs) not in [type([]), type(())]:
+ msgs = (msgs, )
+ for msg in msgs:
+ sys.stderr.write(str(msg)+'\n')
+ sys.exit(code)
+
+# quick check to see if you are a super-user.
+if os.getuid() != 0:
+ systemExit(8, 'ERROR: must be root to execute\n')
+
+_LIBPATH = "/usr/share/rhn"
+# add to the path if need be
+if _LIBPATH not in sys.path:
+ sys.path.append(_LIBPATH)
+
+from up2date_client.rhnChannel import subscribeChannels, unsubscribeChannels, getChannels
+from up2date_client import up2dateAuth, config, up2dateErrors
+
+def processCommandline():
+ "process the commandline, setting the OPTIONS object"
+ optionsTable = [
+ Option('-c', '--channel', action='append',
+ help='name of channel you want to (un)subscribe'),
+ Option('-a', '--add', action='store_true',
+ help='subscribe to channel'),
+ Option('-r', '--remove', action='store_true',
+ help='unsubscribe from channel'),
+ Option('-l', '--list', action='store_true',
+ help='list channels'),
+ Option('-v', '--verbose', action='store_true',
+ help='verbose output'),
+ Option('-u', '--user', action='store',
+ help='your user name'),
+ Option('-p', '--password', action='store',
+ help='your password'),
+ ]
+ optionParser = OptionParser(option_list=optionsTable)
+ global OPTIONS
+ OPTIONS, args = optionParser.parse_args()
+
+ # we take no extra commandline arguments that are not linked to an option
+ if args:
+ systemExit(1, "ERROR: these arguments make no sense in this context (try --help)")
+ if not OPTIONS.user and not OPTIONS.list:
+ systemExit(2, "ERROR: username is required")
+ if not OPTIONS.password and not OPTIONS.list:
+ systemExit(3, "ERROR: password is required")
+
+def main():
+ if OPTIONS.add:
+ subscribeChannels(OPTIONS.channel, OPTIONS.user, OPTIONS.password)
+ if OPTIONS.verbose:
+ print "Channel(s): %s successfully added" % ', '.join(OPTIONS.channel)
+ elif OPTIONS.remove:
+ unsubscribeChannels(OPTIONS.channel, OPTIONS.user, OPTIONS.password)
+ if OPTIONS.verbose:
+ print "Channel(s): %s successfully removed" % ', '.join(OPTIONS.channel)
+ elif OPTIONS.list:
+ channels = map(lambda x: x['label'], getChannels().channels())
+ channels.sort()
+ print '\n'.join(channels)
+ else:
+ s = rhnserver.RhnServer()
+ print s.up2date.listall(up2dateAuth.getSystemId())
+ systemExit(3, "ERROR: you may want to specify --add, --remove or --list")
+
+try:
+ processCommandline()
+ main()
+except KeyboardInterrupt:
+ systemExit(0, "\nUser interrupted process.")
+except up2dateErrors.RhnServerException, e:
+ # do not print traceback, it will scare people
+ systemExit(1, e)
14 years, 5 months
2 commits - backend/common backend/server
by Miroslav Suchý
backend/common/rhnException.py | 1 +
backend/server/rhnChannel.py | 40 +++++++++++-----------------------------
2 files changed, 12 insertions(+), 29 deletions(-)
New commits:
commit ee4f1d0d44bbf90a1396532c83b9b4a0da646c74
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 24 12:16:36 2009 +0100
540544 - raise error if channel do not exist or you are not allowed to add or remove it
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index a6a54fc..24b326d 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -191,6 +191,7 @@ on this system."),
Please refer to your organization's channel or organization
administrators for further details.
"""),
+ 72: _("""You can not unsubscribe from base channel."""),
# 80-90: server group errors
80: _("There was an error while trying to join the system to its groups"),
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 8322303..96db6a6 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -1935,7 +1935,7 @@ def subscribe_channel(server_id, channel, username, password):
ret = h.fetchone_dict()
if not ret:
log_error("Channel %s does not exist?" % channel)
- raise rhnFault(39, "Channel %s does not exist?" % channel)
+ raise rhnFault(40, "Channel %s does not exist?" % channel)
channel_id = ret['id']
@@ -2190,14 +2190,13 @@ def unsubscribe_channel(server_id, channel, username, password):
h.execute(channel = channel)
ret = h.fetchone_dict()
if not ret:
- log_error("Asked to unsubscribe server %s "\
- "from non-existent channel %s" % (
- server_id, channel))
- return 0
+ log_error("Asked to unsubscribe server %s "\ "from non-existent channel %s" % ( server_id, channel))
+ raise rhnFault(40, "The specified channel '%s' does not exist." % channel)
if not ret["parent_channel"]:
log_error("Cannot unsubscribe %s from base channel %s" % (
server_id, channel))
- return 0
+ raise rhnFault(72, "You can not unsubscribe %s from base channel %s." % (
+ server_id, channel))
# we're fine
return unsubscribe_sql(server_id, ret["id"])
commit 22bddd07e3ba11ee5b70f8e205ab04e729634f05
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 24 11:38:20 2009 +0100
540544 - fix usage of check_user_password
rhnUser.check_user_password check if password is correct
but we want rather call auth_username_password, which return object rhnUser. There is no need for additional checks.
And they even did not worked, becouse we usually have in db crypted
password, but password given as param is not crypted!
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 926402c..8322303 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -1798,37 +1798,20 @@ def list_obsoletes(channel):
rhnCache.set(cache_entry, result, c_info["last_modified"])
return result
-
-# this surely needs to be more complicated, since it needs to check
-# for admins in a org, and not just users with a matching org_id
-# XXX: there is a lot of duplication code with stuff in rhns_user -
-# need to simplify...
def __auth_user(server_id, username, password):
+ """ Auth if user can add/remove channel from given server """
log_debug(3, server_id, username)
# check the username and password for compliance
- username, password = rhnUser.check_user_password(username, password)
- # verify the password
- h = rhnSQL.prepare("""
- select w.id, w.password from web_contact w
- where w.login_uc = upper(:username)
- """)
- h.execute(username = username)
- res = h.fetchone_dict()
- if not res: # Login name and password for this server do not match
- raise rhnFault(1)
- # now check the password
- if string.lower(res["password"]) != string.lower(password):
- raise rhnFault(2)
- userid = res['id']
+ user = rhnUser.auth_username_password(username, password)
# The user's password checks, verify that they have perms on that
# server.
h = rhnSQL.prepare("""
- select *
+ select count(*)
from rhnUserServerPerms usp
where usp.user_id = :user_id
and usp.server_id = :server_id
""")
- h.execute(user_id = str(userid), server_id = str(server_id))
+ h.execute(user_id = str(user.getid()), server_id = str(server_id))
res = h.fetchone_dict()
if not res:
# Not allowed to perform administrative tasks on this server
@@ -2202,7 +2185,7 @@ def unsubscribe_channel(server_id, channel, username, password):
# now get the id of the channel
h = rhnSQL.prepare("""
- select c.id, c.parent_channel from rhnChannel where label = :channel
+ select id, parent_channel from rhnChannel where label = :channel
""")
h.execute(channel = channel)
ret = h.fetchone_dict()
@@ -2212,7 +2195,7 @@ def unsubscribe_channel(server_id, channel, username, password):
server_id, channel))
return 0
if not ret["parent_channel"]:
- log_error("Cannot unsubscribe %s from parent channel %s" % (
+ log_error("Cannot unsubscribe %s from base channel %s" % (
server_id, channel))
return 0
# we're fine
14 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +-
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c94186f09440c7702696957200d6a5db80d71fb5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 23 17:42:38 2009 -0500
improving the system channels page by increasing the base channel selector box size and having the custom channels sorted by name
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index eec9381..80e28cf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -778,7 +778,7 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
(SELECT S.id, S.org_id
FROM rhnSharedChannelView S
WHERE S.ORG_TRUST_ID = :org_id
- AND S.parent_channel IS NULL)
+ AND S.parent_channel IS NULL) order by UPPER(C.name)
</query>
</mode>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index e9ceb87..37a71aa 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -94,7 +94,7 @@
</p>
</div-->
<p/>
- <select name="new_base_channel_id" size="5">
+ <select name="new_base_channel_id" size="10">
<option value="-1"
<c:if test="${current_base_channel_id == -1}">
selected="selected"
14 years, 5 months
java/code
by Justin Sherrill
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1bfa52fb58273b0ff86bb62b8ae60ca22feff682
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 23 17:09:01 2009 -0500
another small display issue fix for list
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index c9c986f..0c44841 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -133,7 +133,7 @@
<rl:column headerkey="erratalist.jsp.updated" bound="false"
sortattr="updateDateObj"
sortable="true"
- defaultsort="desc">
+ defaultsort="desc" styleclass="last-column">
${current.updateDate}
</rl:column>
14 years, 5 months