From e3dc5b200976b6c60997c3603af162a02028a0ea Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Feb 07 2011 11:46:18 +0000 Subject: Rebase to spacewalk-backend-1.3.56-1 in rawhide. --- diff --git a/.gitignore b/.gitignore index 61331fb..3132b35 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /spacewalk-backend-1.2.74.tar.gz +/spacewalk-backend-1.3.56.tar.gz diff --git a/sources b/sources index 26c7f12..92b7645 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70075cf73274c2618ff7d082e63bd5da spacewalk-backend-1.2.74.tar.gz +5b65472e5375602459faed1c0b0489e6 spacewalk-backend-1.3.56.tar.gz diff --git a/spacewalk-backend.spec b/spacewalk-backend.spec index 54b6b7c..e179216 100644 --- a/spacewalk-backend.spec +++ b/spacewalk-backend.spec @@ -11,8 +11,8 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.2.74 -Release: 2%{?dist} +Version: 1.3.56 +Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,15 +55,15 @@ Requires: %{name}-sql-virtual = %{version}-%{release} This package contains the basic code that provides SQL connectivity for the Spacewalk backend modules. -#%package sql-oracle -#Summary: Oracle backend for Spacewalk -#Group: Applications/Internet -#Requires: python(:DBAPI:oracle) -#Provides: %{name}-sql-virtual = %{version}-%{release} -# -#%description sql-oracle -#This package contains provides Oracle connectivity for the Spacewalk backend -#modules. +%package sql-oracle +Summary: Oracle backend for Spacewalk +Group: Applications/Internet +Requires: python(:DBAPI:oracle) +Provides: %{name}-sql-virtual = %{version}-%{release} + +%description sql-oracle +This package contains provides Oracle connectivity for the Spacewalk backend +modules. %package sql-postgresql Summary: Postgresql backend for Spacewalk @@ -182,7 +182,13 @@ This package contains listener for the Server XML dumper. Summary: Spacewalk server and client tools libraries Group: Applications/Internet BuildRequires: python2-devel +%if 0%{?rhel} && 0%{?rhel} < 5 +Requires: python-crypto +BuildRequires: python-crypto +%else Requires: python-hashlib +BuildRequires: python-hashlib +%endif %description libs Libraries required by both Spacewalk server and Spacewalk client tools. @@ -294,6 +300,9 @@ rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf %clean rm -rf $RPM_BUILD_ROOT +%check +make -f Makefile.backend PYTHONPATH=$RPM_BUILD_ROOT/%{python_sitelib} test || : + %pre server OLD_SECRET_FILE=%{_var}/www/rhns/server/secret/rhnSecret.py if [ -f $OLD_SECRET_FILE ]; then @@ -326,6 +335,9 @@ rm -f %{rhnconf}/rhnSecret.py* %files %defattr(-,root,root) %doc PYTHON-LICENSES.txt LICENSE +%if ! (0%{?rhel} && 0%{?rhel} < 6) +%{python_sitelib}/spacewalk_backend-%{version}-*.egg-info +%endif %dir %{pythonrhnroot} %dir %{pythonrhnroot}/common %{pythonrhnroot}/common/__init__.py* @@ -372,10 +384,10 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/server/rhnSQL/__init__.py* %{pythonrhnroot}/server/rhnSQL/sql_*.py* -#%files sql-oracle -#%defattr(-,root,root,-) -#%doc PYTHON-LICENSES.txt LICENSE -#%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py* +%files sql-oracle +%defattr(-,root,root,-) +%doc PYTHON-LICENSES.txt LICENSE +%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py* %files sql-postgresql %defattr(-,root,root,-) @@ -396,7 +408,6 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/server/rhnCapability.py* %{pythonrhnroot}/server/rhnChannel.py* %{pythonrhnroot}/server/rhnKickstart.py* -%{pythonrhnroot}/server/rhnDatabaseCache.py* %{pythonrhnroot}/server/rhnDependency.py* %{pythonrhnroot}/server/rhnPackage.py* %{pythonrhnroot}/server/rhnPackageUpload.py* @@ -458,7 +469,6 @@ rm -f %{rhnconf}/rhnSecret.py* %{rhnroot}/wsgi/config.py* %{rhnroot}/wsgi/config_tool.py* %{rhnroot}/wsgi/package_push.py* -%{rhnroot}/wsgi/package_upload.py* %{rhnroot}/wsgi/sat.py* %{rhnroot}/wsgi/sat_dump.py* %{rhnroot}/wsgi/xmlrpc.py* @@ -542,7 +552,13 @@ rm -f %{rhnconf}/rhnSecret.py* %files libs %defattr(-,root,root) %doc PYTHON-LICENSES.txt LICENSE -%{python_sitelib}/spacewalk* +%{python_sitelib}/spacewalk/__init__.py* +%dir %{python_sitelib}/spacewalk/common +%{python_sitelib}/spacewalk/common/checksum.py* +%{python_sitelib}/spacewalk/common/fileutils.py* +%{python_sitelib}/spacewalk/common/rhn_deb.py* +%{python_sitelib}/spacewalk/common/rhn_mpm.py* +%{python_sitelib}/spacewalk/common/rhn_rpm.py* %files config-files-common %defattr(-,root,root) @@ -603,6 +619,7 @@ rm -f %{rhnconf}/rhnSecret.py* %attr(755,root,root) %{_bindir}/spacewalk-remove-channel* %attr(755,root,root) %{_bindir}/rhn-entitlement-report %attr(755,root,root) %{_bindir}/spacewalk-update-signatures +%attr(755,root,root) %{_bindir}/spacewalk-data-fsck %{pythonrhnroot}/satellite_tools/SequenceServer.py* %{pythonrhnroot}/satellite_tools/messages.py* %{pythonrhnroot}/satellite_tools/progress_bar.py* @@ -654,8 +671,6 @@ rm -f %{rhnconf}/rhnSecret.py* %dir %{pythonrhnroot}/satellite_tools %{pythonrhnroot}/satellite_tools/__init__.py* %{pythonrhnroot}/satellite_tools/geniso.py* -%{pythonrhnroot}/satellite_tools/gentree.py* -%{pythonrhnroot}/satellite_tools/xmlDiskDumper.py* # A bunch of modules shared with satellite-tools %{pythonrhnroot}/satellite_tools/connection.py* %{pythonrhnroot}/satellite_tools/diskImportLib.py* @@ -664,22 +679,262 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/xmlSource.py* %dir %{pythonrhnroot}/satellite_tools/exporter %{pythonrhnroot}/satellite_tools/exporter/__init__.py* -%{pythonrhnroot}/satellite_tools/exporter/exporter.py* %{pythonrhnroot}/satellite_tools/exporter/exportLib.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* # $Id$ %changelog -* Thu Nov 18 2010 Miroslav Suchy 1.2.74-2 -- disabling oracle sub-package +* Fri Feb 04 2011 Milan Zazrivec 1.3.56-1 +- 590608 - nullify jabber_ids from previous registrations + +* Fri Feb 04 2011 Michael Mraka 1.3.55-1 +- fixed postgresql failure on RHEL6 + +* Thu Feb 03 2011 Michael Mraka 1.3.54-1 +- shortened and narrowed package sync logic +- moved checksum logic into ContentPackage +- yum repo metadata says epoch="0" even if it's NULL +- reformated sql query +- fixed indentation +- spacewalk-repo-sync should not download package which is already on disk +- fixed duplicated code (cherry picked from commit + +* Wed Feb 02 2011 Tomas Lestach 1.3.53-1 +- 671464 - prevent unsigned rpms not to be recognized as rpms + (tlestach@redhat.com) + +* Fri Jan 28 2011 Michael Mraka 1.3.52-1 +- 671465 - fixed signature import + +* Thu Jan 27 2011 Michael Mraka 1.3.51-1 +- 671464 - get right keyid for new Fedora keys +- 671464 - get right keyid for new RHEL6 rpms +- 671464 - although RHEL6 signature is SHA256 gpg it's marked as pgp in rpm +- 671462 - fixed path in debug output + +* Wed Jan 26 2011 Michael Mraka 1.3.50-1 +- fixed error message +- 672277 - made --use-rhn-date and --use-sync-date mutually exclusive +- Report errors even when not -v was specified. + +* Wed Jan 26 2011 Michael Mraka 1.3.49-1 +- fixed AttributeError: ContentSource instance has no attribute 'proxy' +- make osa ping work properly again + +* Mon Jan 24 2011 Jan Pazdziora 1.3.48-1 +- do not print TB if we get unknown type (msuchy@redhat.com) +- Make rhn-schema-version work on PostgreSQL. + +* Fri Jan 21 2011 Miroslav Suchý 1.3.47-1 +- 657091 - honor http proxy setting for spacewalk-repo-sync + +* Fri Jan 21 2011 Miroslav Suchý 1.3.46-1 +- 671466 - use ansi syntax in left join + +* Thu Jan 20 2011 Tomas Lestach 1.3.45-1 +- updating Copyright years for year 2011 (tlestach@redhat.com) +- update .po and .pot files for spacewalk-backend (tlestach@redhat.com) + +* Thu Jan 20 2011 Michael Mraka 1.3.44-1 +- added spacewalk-data-fsck into rpm +- 670746 - fix malformed query _query_action_verify_packages + +* Tue Jan 18 2011 Jan Pazdziora 1.3.43-1 +- Split to just two parts. +- 670458 - check password policy only if we are really going to reserve user + (msuchy@redhat.com) -* Thu Nov 18 2010 Jan Pazdziora 1.2.74-1 -- Fixing error in backend spec (unpackaged file) (lzap+git@redhat.com) +* Tue Jan 18 2011 Michael Mraka 1.3.42-1 +- 650165 - fixed kickstart incremental export + +* Mon Jan 17 2011 Michael Mraka 1.3.41-1 +- rpmbuid failure + +* Mon Jan 17 2011 Michael Mraka 1.3.40-1 +- 650165 - _ChannelDumper should also understand use_rhn_date +- converted comments to docstrings +- do not check throttle within each request +- fixed whitespace + +* Tue Jan 11 2011 Jan Pazdziora 1.3.39-1 +- Use spacewalk-sql in satwho and satpasswd, thus making it work on PostgreSQL. +- code cleanup: there is no proxy < 4.1 in real word (msuchy@redhat.com) +- I wish python had a simple ternary operator (michael.mraka@redhat.com) + +* Wed Jan 05 2011 Miroslav Suchý 1.3.38-1 +- 666939 - Insert current_timestamp instead of sysdate +- 666574 - autonomous_transaction not supported by PostgreSQL + +* Mon Jan 03 2011 Jan Pazdziora 1.3.37-1 +- With fix_url gone, exception InvalidUrlError gets unused, removing. +- 655207 - exit after unsuccessful rpm header read (mzazrivec@redhat.com) +- send with config file, its modified time (msuchy@redhat.com) +- 655207 - print the exception details into stdout (mzazrivec@redhat.com) +- hide cleartext password from traceback (michael.mraka@redhat.com) +- added overall usage summary and flex guest entitlement details to rhn- + entitlement-report (michael.mraka@redhat.com) + +* Thu Dec 30 2010 Michael Mraka 1.3.36-1 +- fixed a lot of pylint woarnings and errors +- removed dead rhnDatabaseCache +- Allow clients to retrieve debian packages + +* Sun Dec 26 2010 Jan Pazdziora 1.3.35-1 +- 619083 - we will try not to stringify the types.IntType and types.FloatType. + +* Thu Dec 23 2010 Jan Pazdziora 1.3.34-1 +- Need to stringify the epoch. +- fix error from 3fcd9f7cf736e8e85994e45d8cd96943ab5a2832 (msuchy@redhat.com) +- move function f_date from rhn_config_management.py to fileutils.py + (msuchy@redhat.com) + +* Wed Dec 22 2010 Jan Pazdziora 1.3.33-1 +- Allow clients to retrieve metadata of debian channels (slukasik@redhat.com) + +* Tue Dec 21 2010 Jan Pazdziora 1.3.32-1 +- Need to alias column with AS for PostgreSQL. +- use difflib instead of external "diff -u" (msuchy@redhat.com) +- move function ostr_to_sym from config_common/file_utils to spacewalk-backend- + libs (msuchy@redhat.com) +- 634963 - print diffs for "rhncfg-manager diff-revisions" if we differ in + selinux context, ownership or attributes (msuchy@redhat.com) + +* Tue Dec 21 2010 Jan Pazdziora 1.3.31-1 +- Need to remove gentree from Makefile as well. + +* Mon Dec 20 2010 Michael Mraka 1.3.30-1 +- removed obsoleted ISO generator code +- 653163 - sort child channels + +* Fri Dec 17 2010 Michael Mraka 1.3.29-1 +- fixed egg-info packaging +- 658422 - rebuild errata cache after reposync finishes -* Thu Nov 18 2010 Jan Pazdziora 1.2.73-1 -- fixed iss (michael.mraka@redhat.com) -- fixed mod_wsgi configuration (michael.mraka@redhat.com) -- 652625 - fixed file path (michael.mraka@redhat.com) +* Thu Dec 16 2010 Michael Mraka 1.3.28-1 +- fixed %%files for spacewalk-backend-libs + +* Thu Dec 16 2010 Jan Pazdziora 1.3.27-1 +- Dropping satellite_tools/exporter/exporter.py from the Makefile and %files. + +* Wed Dec 15 2010 Miroslav Suchý 1.3.26-1 +- 624092 - update package if pushing using --force and package with same NVREA + already exist +- no need to lookup dictionary, when we have this information in local variable +- make Table class more debugable + +* Wed Dec 15 2010 Michael Mraka 1.3.25-1 +- removed dead code +- fixed number of pylint reported errors +- fixed Module sat doesn't support our API +- remove block of code from for-loop + +* Mon Dec 13 2010 Michael Mraka 1.3.24-1 +- fixed number of errors reported by pylint +- 652852 - delete related RepoData when updating a package + +* Fri Dec 10 2010 Michael Mraka 1.3.23-1 +- removed read code +- fixed imports +- 655207 - log corrupted package header read +- 653814 - set X-RHN-Satellite-XML-Dump-Version header +- update-packages: update package file list functionality + +* Fri Dec 03 2010 Michael Mraka 1.3.22-1 +- 659348 - import checksum-type correctly +- 659348 - attribute is checksum-type not checksum_type + +* Fri Dec 03 2010 Michael Mraka 1.3.21-1 +- Fault, ResponseError and ProtocolError import has been removed from rpclib +- File import has been removed from rpclib +- fixed column aliases (PG) + +* Wed Dec 01 2010 Jan Pazdziora 1.3.20-1 +- Ignore the %check results for now. + +* Wed Dec 01 2010 Lukas Zapletal 1.3.19-1 +- 644985 - SELinux context cleared from RHEL4 rhncfg-client +- Correcting indentation for configFilesHandler.py +- 656294 - sync channels only from rhn_parent + +* Wed Dec 01 2010 Miroslav Suchý 1.3.18-1 +- add BuildRequires: python-hashlib (msuchy@redhat.com) + +* Wed Dec 01 2010 Miroslav Suchý 1.3.17-1 +- fix import of xmlrpclib (msuchy@redhat.com) + +* Tue Nov 30 2010 Michael Mraka 1.3.16-1 +- moved db backend selection into a single place +- removed dead RegistrationNumber() +- removed dead code together with its invalid comment +- python 2.4+ (RHEL5+) has hasattr(gettext, 'GNUTranslations') == True + +* Mon Nov 29 2010 Michael Mraka 1.3.15-1 +- fixed unit tests +- run backend unit test in rpm build time + +* Thu Nov 25 2010 Lukas Zapletal 1.3.14-1 +- Fixing missing method parameter in rhn_config_management +- fixed typo +- don't require server unsubscribe when --skip-channels is used +- added --skip-channels to spacewalk-remove-channel + +* Wed Nov 24 2010 Michael Mraka 1.3.13-1 +- removed unused imports + +* Wed Nov 24 2010 Miroslav Suchý 1.3.12-1 +- 653163 - fix typo (msuchy@redhat.com) + +* Tue Nov 23 2010 Michael Mraka 1.3.11-1 +- removed unused imports +- remove unused variable +- remove unreachable code +- fixed pylint warnings +- Handle both the empty string (convert it to NULL) and numbers (convert them + to strings) in epochs. +- added spacewalk-data-fsck + +* Mon Nov 22 2010 Lukas Zapletal 1.3.10-1 +- Reverting two commits on packages.py +- Revert "Changing time to timestamp in SQL select (PG)" + +* Mon Nov 22 2010 Lukas Zapletal 1.3.9-1 +- Solving nonexisting Numeric->Varchar case in packages.py (PG) +- Package data are being deleted from view rather than from table (PG) +- Changing time to timestamp in SQL select (PG) + +* Fri Nov 19 2010 Michael Mraka 1.3.8-1 +- 650165 - propagate use_rhn_date down to Dumper +- fixed sgml documentation + +* Fri Nov 19 2010 Michael Mraka 1.3.7-1 +- 650165 - let user specify which date for incremental export use + +* Fri Nov 19 2010 Michael Mraka 1.3.6-1 +- removed redundant code +- merged duplicate code +- 652852 - dirs and links have no checksum +- l10n: Updates to German (de) translation + +* Thu Nov 18 2010 Lukas Zapletal 1.3.5-1 +- 653163 - sort channels in output of satellite-sync + +* Thu Nov 18 2010 Lukas Zapletal 1.3.4-1 +- Fixing error in backend spec (unpackaged file) + +* Tue Nov 16 2010 Lukas Zapletal 1.3.3-1 +- Adding round brackets to evr (multiple commits) + +* Tue Nov 16 2010 Michael Mraka 1.3.2-1 +- fixed iss +- fixed mod_wsgi configuration +- removed /PKG_UPLOAD leftovers +- l10n: Updates to German (de) translation +- 652613 - set ownership to apache:apache by default +- 652625 - fixed file path + +* Mon Nov 15 2010 Michael Mraka 1.3.1-1 +- 652815 - satellite-sync speed up +- 652815 - don't resync packages with wrong path when called with --no-rpms * Sun Nov 14 2010 Michael Mraka 1.2.72-1 - speed up satellite-sync - skip packages we already processed