[spacewalk-web] Rebase to spacewalk-web-1.6.37-1.fc16 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Mon Jan 2 15:08:25 UTC 2012


commit d6b1350054204d474e7f8559ff2ff1448174da0b
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jan 2 16:08:19 2012 +0100

    Rebase to spacewalk-web-1.6.37-1.fc16 in rawhide.

 .gitignore         |    1 +
 sources            |    2 +-
 spacewalk-web.spec |  114 +++++++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 107 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b00d96a..ab60e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /spacewalk-web-1.6.18.tar.gz
+/spacewalk-web-1.6.37.tar.gz
diff --git a/sources b/sources
index 263d4cc..f28b12a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9e3fa82412f5dd8f0ed665adc6e93d7  spacewalk-web-1.6.18.tar.gz
+c5bd0f538e994fbb7e4605ffa7391599  spacewalk-web-1.6.37.tar.gz
diff --git a/spacewalk-web.spec b/spacewalk-web.spec
index 2161eda..a06a9a3 100644
--- a/spacewalk-web.spec
+++ b/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
 Summary: Spacewalk Web site - Perl modules
 Group: Applications/Internet
 License: GPLv2
-Version: 1.6.18
+Version: 1.6.37
 Release: 1%{?dist}
 URL:          https://fedorahosted.org/spacewalk/
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -130,13 +130,13 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \;
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 
 mkdir -p $RPM_BUILD_ROOT/%{_var}/www/html/pub
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 
-install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default
-install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default
+install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
+install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
 install -m 755 modules/dobby/scripts/check-oracle-space-usage.sh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/check-oracle-space-usage.sh
 
 
@@ -150,7 +150,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/RHN/Access.pm
 %{perl_vendorlib}/RHN/Access/
 %{perl_vendorlib}/RHN/Action.pm
-%{perl_vendorlib}/RHN/AppInstall/
 %{perl_vendorlib}/RHN/Cache/
 %{perl_vendorlib}/RHN/Cert.pm
 %{perl_vendorlib}/RHN/Channel.pm
@@ -184,7 +183,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/RHN/Package/
 %{perl_vendorlib}/RHN/Postal.pm
 %{perl_vendorlib}/RHN/Profile.pm
-%{perl_vendorlib}/RHN/ProxyInstall.pm
 %{perl_vendorlib}/RHN/SCDB.pm
 %{perl_vendorlib}/RHN/SatCluster.pm
 %{perl_vendorlib}/RHN/SatInstall.pm
@@ -225,14 +223,14 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/RHN/Exception.pm
 %{perl_vendorlib}/RHN/DB.pm
 %{perl_vendorlib}/PXT/Config.pm
-%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
+%attr(640,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_web.conf
 %doc LICENSE
 
 %files -n spacewalk-dobby
 %attr(755,root,root) %{_bindir}/db-control
 %{_mandir}/man1/db-control.1.gz
 %{perl_vendorlib}/Dobby.pm
-%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_dobby.conf
+%attr(640,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_dobby.conf
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/check-oracle-space-usage.sh
 %{perl_vendorlib}/Dobby/
 
@@ -242,7 +240,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n spacewalk-pxt 
 %{perl_vendorlib}/PXT.pm
-%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
 %{perl_vendorlib}/PXT/
 %exclude %{perl_vendorlib}/PXT/Config.pm
 %{_mandir}/man3/PXT::ApacheHandler.3pm.gz
@@ -257,6 +254,105 @@ rm -rf $RPM_BUILD_ROOT
 
 # $Id$
 %changelog
+* Thu Dec 22 2011 Milan Zazrivec <mzazrivec at redhat.com> 1.6.37-1
+- update web version to 1.6
+
+* Wed Dec 21 2011 Milan Zazrivec <mzazrivec at redhat.com> 1.6.36-1
+- update copyright info
+
+* Mon Dec 12 2011 Tomas Lestach <tlestach at redhat.com> 1.6.35-1
+- add missing requires (tlestach at redhat.com)
+- fix 500 Error - ISE on network/systems/ssm/provisioning/remote_command.pxt
+  (tlestach at redhat.com)
+
+* Mon Dec 12 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.34-1
+- fix Package queries
+- fix ORDER BY expression in DISTINCT select
+- use real table name rhn_check_probe
+- replace (+) with ANSI left join (PG)
+- set selinux_ctx to undef if it is empty
+- No need to convert numeric values to upper.
+- convert decode to case
+
+* Wed Dec 07 2011 Miroslav Suchý 1.6.33-1
+- code cleanup
+- do not allow to configure or activate proxy from WebUI
+
+* Tue Dec 06 2011 Jan Pazdziora 1.6.32-1
+- IPv6: reprovisioning with static network interface (mzazrivec at redhat.com)
+- code cleanup - function base_entitlement is not used anymore
+  (msuchy at redhat.com)
+- code cleanup - function addon_entitlements is not used anymore
+  (msuchy at redhat.com)
+- code cleanup - function ks_session_redir is not used anymore
+  (msuchy at redhat.com)
+- code cleanup - callback rhn:delete_servers_cb is not used anymore
+  (msuchy at redhat.com)
+- code cleanup - callback server_hardware_list_refresh_cb is not used anymore
+  (msuchy at redhat.com)
+- code cleanup - tag rhn-server-network-details is not used anymore
+  (msuchy at redhat.com)
+- code cleanup - tag rhn-server-device is not used anymore (msuchy at redhat.com)
+- code cleanup - tag rhn-dmi-info is not used anymore (msuchy at redhat.com)
+- code cleanup - tag rhn-server-hardware-profile is not used anywhere
+  (msuchy at redhat.com)
+
+* Tue Nov 29 2011 Miroslav Suchý 1.6.31-1
+- IPv6: code cleanup - package RHN::DB::Server::NetInterface is not used
+  anymore
+- IPv6: code cleanup - function get_net_interfaces is not used anymore
+- IPv6: code cleanup - function server_network_interfaces is not used anymore
+- IPv6: code cleanup - tag rhn-server-network-interfaces is not used anywhere
+
+* Fri Nov 25 2011 Jan Pazdziora 1.6.30-1
+- Replace nvl with coalesce.
+- Matching the to_char prototype.
+- Matching the varchar column to varchar literal.
+- Replace decode with case when.
+- Replace sysdate with current_timestamp.
+
+* Wed Nov 23 2011 Jan Pazdziora 1.6.29-1
+- Fixing cancel a scheduled action on a server.
+
+* Wed Nov 16 2011 Tomas Lestach <tlestach at redhat.com> 1.6.28-1
+- 754379 - fix deletion-url in pxt pages (tlestach at redhat.com)
+
+* Fri Nov 04 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.27-1
+- removed aliases from SET part of UPDATE
+
+* Wed Nov 02 2011 Jan Pazdziora 1.6.26-1
+- Workaround for DBD::Pg bug https://rt.cpan.org/Ticket/Display.html?id=70953.
+
+* Fri Sep 30 2011 Jan Pazdziora 1.6.25-1
+- 678118 - if system already is proxy, losen the ACL and show the tab.
+- Recent commit makes version_string_to_evr_array unused, dropping.
+- Removing proxy_evr_at_least, org_proxy_evr_at_least, aclOrgProxyEvrAtLeast as
+  they are no longer used.
+- Remove proxy_evr_at_least ACLs -- all supported proxy versions are 3+.
+- Make the pxt Connection acl match the java version -- new acl
+  org_has_proxies.
+
+* Fri Sep 30 2011 Jan Pazdziora 1.6.24-1
+- 621531 - update web Config to use the new /usr/share/rhn/config-defaults
+  location.
+- 621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (web).
+
+* Fri Sep 23 2011 Jan Pazdziora 1.6.23-1
+- The /etc/rhn/default/rhn_web.conf does not need to be provided by -pxt since
+  it is provided by -base-minimal.
+
+* Mon Sep 19 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.22-1
+- 723461 - let emails be sent to localhost by default
+
+* Fri Sep 16 2011 Jan Pazdziora 1.6.21-1
+- CVE-2011-3344, 731647 - HTML-encode the self-referencing link.
+
+* Thu Sep 15 2011 Jan Pazdziora 1.6.20-1
+- Revert "529483 - adding referer check to perl stack"
+
+* Fri Sep 09 2011 Jan Pazdziora 1.6.19-1
+- 616175 - observe the port specified in the URL even for https.
+
 * Thu Aug 25 2011 Miroslav Suchý 1.6.18-1
 - 705363 - spacewalk-base and spacewalk-base-minimal are now disjunctive
   remove the provide from spacewalk-base


More information about the scm-commits mailing list