Changes to 'refs/tags/spacewalk-java-2.1.125-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.125-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-22 16:02 +0000
Tagging package [spacewalk-java] version [2.1.125-1] in directory [java/].
Changes since spacewalk-java-2.1.124-1:
Michael Mraka (2):
checkstyle fix
Automatic commit of package [spacewalk-java] release [2.1.125-1].
---
java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cff38ac5c38fd957e3dd935ebca808a8e3eedb50
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 17:02:32 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.125-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 55f1947..633db9f 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.124
+Version: 2.1.125
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.125-1
+- checkstyle fix
+
* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.124-1
- 1053591 - fix deadlock when cloning using spacewalk-clone-by-date
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 776cd27..22a59cc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.124-1 java/
+2.1.125-1 java/
10 years, 3 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7f0e0bde0b7bd5f3fa2a904c3156168fadee129d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 16:51:03 2014 +0100
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
index c341eeb..829f848 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
@@ -53,7 +53,8 @@ public class CobblerAction extends RhnAction {
ValidatorError ve;
try {
ve = new CobblerSyncCommand(ctx.getLoggedInUser()).store();
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
this.getStrutsDelegate().addError(errors,
"cobbler.jsp.xmlrpc.fail",
ex.getLocalizedMessage());
10 years, 3 months
Branch 'master-bootstrap-css-fixes' - 114 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec backend/test branding/fonts branding/spacewalk-branding.spec client/solaris java/code java/conf java/spacewalk-java.spec projects/oracle-lib-compat rel-eng/comps rel-eng/git-untagged-commits.pl rel-eng/packages schema/spacewalk search-server/spacewalk-search selinux/oracle-instantclient-selinux spacewalk/package spacewalk/setup spec-tree/bootstrap spec-tree/c-ares19 spec-tree/cobbler20 s
by Silvio Moioli
backend/satellite_tools/spacewalk-debug | 6
backend/server/importlib/backendOracle.py | 2
backend/server/rhnSQL/__init__.py | 4
backend/server/rhnSQL/driver_cx_Oracle.py | 13
backend/server/test/attic/rhnServerGroup.py | 11
backend/server/test/cx_create_table.py | 68
backend/server/test/test_capabilities.py | 94
backend/server/test/unit-test/cx_create_table.py | 68
backend/server/test/unit-test/misc_functions.py | 192 -
backend/server/test/unit-test/rhnSQL/db_settings.ini | 4
backend/server/test/unit-test/rhnSQL/misc_functions.py | 543 +++
backend/server/test/unit-test/rhnSQL/rhnsql-tests.py | 69
backend/server/test/unit-test/rhnSQL/test_1.py | 65
backend/server/test/unit-test/rhnSQL/test_2.py | 15
backend/server/test/unit-test/rhnSQL/test_exceptions.py | 49
backend/server/test/unit-test/rhnSQL/test_executemany.py | 69
backend/server/test/unit-test/rhnSQL/test_lob.py | 11
backend/server/test/unit-test/rhnSQL/test_misc_functions.py | 129
backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py | 111
backend/server/test/unit-test/rhnSQL/test_rhnChannel.py | 212 +
backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py | 81
backend/server/test/unit-test/rhnSQL/test_server_registration.py | 289 ++
backend/server/test/unit-test/test_capabilities.py | 94
backend/server/test/unit-test/test_misc_functions.py | 125
backend/server/test/unit-test/test_rhnActivationKey.py | 98
backend/server/test/unit-test/test_rhnChannel.py | 190 -
backend/server/test/unit-test/test_rhnServerGroup.py | 69
backend/server/test/unit-test/test_server_registration.py | 245 -
backend/spacewalk-backend.spec | 9
backend/test/unit/spacewalk/test/server/rhnsql-tests.py | 73
backend/test/unit/spacewalk/test/setpath.py | 30
branding/fonts/Roboto/LICENSE.txt | 202 -
branding/fonts/font-awesome/css/font-awesome.css | 1361 ----------
branding/fonts/font-awesome/css/font-awesome.min.css | 395 --
branding/fonts/font-awesome/fonts/fontawesome-webfont.svg | 414 ---
branding/spacewalk-branding.spec | 13
client/solaris/smartpm/build.py.props | 3
client/solaris/smartpm/tito.props | 2
dev/null |binary
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 13
java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml | 24
java/code/src/com/redhat/rhn/common/util/StringUtil.java | 37
java/code/src/com/redhat/rhn/domain/common/SatConfigFactory.java | 111
java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml | 2
java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 27
java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthenticationAction.java | 99
java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 22
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java | 88
java/code/src/com/redhat/rhn/frontend/action/user/UserCredentialsEditAction.java | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 20
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java | 1
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 5
java/code/webapp/WEB-INF/includes/header.jsp | 2
java/code/webapp/WEB-INF/nav/admin_user.xml | 9
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 3
java/code/webapp/WEB-INF/nav/system_detail.xml | 2
java/code/webapp/WEB-INF/pages/admin/multiorg/extauth.jsp | 57
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp | 52
java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp | 3
java/code/webapp/WEB-INF/struts-config.xml | 32
java/conf/default/rhn_taskomatic_daemon.conf | 1
java/conf/eclipse/checkstyle_eclipse.xml | 4
java/spacewalk-java.spec | 47
projects/oracle-lib-compat/oracle-lib-compat.spec | 19
projects/oracle-lib-compat/tomcat-setenv.sh | 12
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 4
rel-eng/comps/comps-spacewalk-server-fedora18.xml | 4
rel-eng/comps/comps-spacewalk-server-fedora19.xml | 4
rel-eng/comps/comps-spacewalk-server-fedora20.xml | 4
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 4
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 4
rel-eng/git-untagged-commits.pl | 2
rel-eng/packages/bootstrap | 2
rel-eng/packages/font-awesome | 1
rel-eng/packages/oracle-lib-compat | 2
rel-eng/packages/roboto | 1
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-jpp-workaround | 2
rel-eng/packages/spacewalk-repo | 2
rel-eng/packages/spacewalk-schema | 2
rel-eng/packages/spacewalk-search | 2
rel-eng/packages/spacewalk-setup | 2
rel-eng/packages/spacewalk-utils | 2
rel-eng/packages/spacewalk-web | 2
schema/spacewalk/common/data/rhnConfiguration.sql | 1
schema/spacewalk/common/data/rhnPackageKey.sql | 4
schema/spacewalk/common/tables/rhnCVE.sql | 2
schema/spacewalk/common/tables/rhnConfiguration.sql | 29
schema/spacewalk/common/tables/rhnUserExtGroup.sql | 35
schema/spacewalk/common/tables/rhnUserExtGroupMapping.sql | 42
schema/spacewalk/common/tables/tables.deps | 1
schema/spacewalk/oracle/packages/rhn_channel.pkb | 8
schema/spacewalk/oracle/triggers/rhnConfiguration.sql | 24
schema/spacewalk/oracle/triggers/rhnUserExtGroup.sql | 24
schema/spacewalk/oracle/triggers/rhnUserExtGroupMapping.sql | 24
schema/spacewalk/postgres/packages/rhn_channel.pkb | 10
schema/spacewalk/postgres/triggers/rhnConfiguration.sql | 29
schema/spacewalk/postgres/triggers/rhnUserExtGroup.sql | 29
schema/spacewalk/postgres/triggers/rhnUserExtGroupMapping.sql | 29
schema/spacewalk/spacewalk-schema.spec | 24
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle | 1247 ---------
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql | 1270 ---------
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.postgresql | 4
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-rhnConfiguration.sql | 29
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.oracle | 24
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.postgresql | 29
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnConfiguration-data.sql | 1
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup.sql | 35
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.oracle | 24
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.postgresql | 29
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping.sql | 42
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.oracle | 24
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.postgresql | 29
search-server/spacewalk-search/spacewalk-search.spec | 16
selinux/oracle-instantclient-selinux/build.py.props | 3
selinux/oracle-instantclient-selinux/tito.props | 2
spacewalk/package/build.py.props | 2
spacewalk/package/tito.props | 2
spacewalk/setup/Makefile.PL | 2
spacewalk/setup/bin/spacewalk-setup | 85
spacewalk/setup/bin/spacewalk-setup-tomcat | 186 +
spacewalk/setup/share/tomcat.1 | 2
spacewalk/setup/share/tomcat.2 | 1
spacewalk/setup/share/tomcat.3 | 1
spacewalk/setup/share/tomcat.4 | 2
spacewalk/setup/share/tomcat.5 | 2
spacewalk/setup/share/tomcat.java_opts | 1
spacewalk/setup/spacewalk-setup.spec | 10
spec-tree/bootstrap/bootstrap.spec | 5
spec-tree/c-ares19/build.py.props | 3
spec-tree/c-ares19/tito.props | 3
spec-tree/cobbler-loaders/build.py.props | 2
spec-tree/cobbler-loaders/tito.props | 2
spec-tree/cobbler20/build.py.props | 4
spec-tree/cobbler20/tito.props | 3
spec-tree/cx_Oracle/build.py.props | 3
spec-tree/cx_Oracle/tito.props | 3
spec-tree/dwr/build.py.props | 3
spec-tree/dwr/tito.props | 3
spec-tree/font-awesome/font-awesome.spec | 67
spec-tree/font-awesome/tito.props | 3
spec-tree/gyp/build.py.props | 3
spec-tree/gyp/tito.props | 3
spec-tree/heirloom-pkgtools/build.py.props | 4
spec-tree/heirloom-pkgtools/tito.props | 3
spec-tree/http-parser/build.py.props | 3
spec-tree/http-parser/tito.props | 3
spec-tree/jpam/build.py.props | 3
spec-tree/jpam/tito.props | 3
spec-tree/libuv/build.py.props | 3
spec-tree/libuv/tito.props | 3
spec-tree/mod_perl/build.py.props | 3
spec-tree/mod_perl/tito.props | 3
spec-tree/nodejs-less/build.py.props | 3
spec-tree/nodejs-less/tito.props | 3
spec-tree/nodejs-packaging/build.py.props | 3
spec-tree/nodejs-packaging/tito.props | 3
spec-tree/nodejs/build.py.props | 3
spec-tree/nodejs/tito.props | 3
spec-tree/nutch/build.py.props | 4
spec-tree/nutch/tito.props | 3
spec-tree/perl-DBD-Oracle/build.py.props | 3
spec-tree/perl-DBD-Oracle/tito.props | 3
spec-tree/perl-Net-INET6Glue/build.py.props | 3
spec-tree/perl-Net-INET6Glue/tito.props | 3
spec-tree/quartz/build.py.props | 3
spec-tree/quartz/tito.props | 3
spec-tree/redstone-xmlrpc/build.py.props | 4
spec-tree/redstone-xmlrpc/tito.props | 3
spec-tree/roboto/roboto.spec | 70
spec-tree/roboto/tito.props | 3
spec-tree/scons/build.py.props | 3
spec-tree/scons/tito.props | 3
spec-tree/simple-core/build.py.props | 4
spec-tree/simple-core/tito.props | 3
spec-tree/spacewalk-jpp-workaround/build.py.props | 2
spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec | 12
spec-tree/spacewalk-jpp-workaround/tito.props | 2
spec-tree/spacewalk-oro-compat/build.py.props | 4
spec-tree/spacewalk-oro-compat/tito.props | 3
spec-tree/spacewalk-repo/build.py.props | 4
spec-tree/spacewalk-repo/spacewalk-repo.spec | 10
spec-tree/spacewalk-repo/tito.props | 2
spec-tree/stringtree-json/build.py.props | 4
spec-tree/stringtree-json/tito.props | 3
spec-tree/susestudio-java-client/build.py.props | 4
spec-tree/susestudio-java-client/tito.props | 3
spec-tree/tanukiwrapper/build.py.props | 4
spec-tree/tanukiwrapper/tito.props | 3
spec-tree/v8/build.py.props | 3
spec-tree/v8/tito.props | 3
utils/spacewalk-common-channels.ini | 260 +
utils/spacewalk-utils.spec | 9
web/html/network/systems/details/reboot_confirm.pxt | 39
web/include/nav/system_detail.xml | 2
web/modules/rhn/RHN/DB/Scheduler.pm | 22
web/modules/sniglets/Sniglets/Servers.pm | 38
web/spacewalk-web.spec | 6
205 files changed, 3680 insertions(+), 6678 deletions(-)
New commits:
commit d56c3489a1bea97063f81f00101f33d330de8999
Merge: dd80454 1eb0b43
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:50:28 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit 1eb0b43fe7b46ed0287684ed823a034ef389f25a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 16:27:15 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.123-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8c02550..7bdae62 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.122
+Version: 2.1.123
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.123-1
+- Bugfix: ISE when cobbler components are missing (not installed)
+- port reboot_confirm.pxt from perl to java
+- SUSE Studio API will stop working via unencrypted HTTP
+- Inconsistency in build vs. eclipse checkstyle.
+
* Wed Jan 22 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.122-1
- let taskomatic link commons-io
- fix CVE URL in updateinfo references
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3d45759..e538d17 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.122-1 java/
+2.1.123-1 java/
commit 2d7add225d3d4b447cff70c31393ffde7a4b5173
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Jan 17 19:21:06 2014 +0100
Bugfix: ISE when cobbler components are missing (not installed)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
index cadc1b4..c341eeb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
@@ -35,22 +35,36 @@ import javax.servlet.http.HttpServletResponse;
* @version $Rev$
*/
public class CobblerAction extends RhnAction {
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @param mapping
+ * @param formIn
+ * @param request
+ * @param response
+ * @return */
@Override
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
RequestContext ctx = new RequestContext(request);
+ ActionErrors errors = new ActionErrors();
if (ctx.isSubmitted()) {
- CobblerSyncCommand cmd = new CobblerSyncCommand(ctx.getLoggedInUser());
- ValidatorError ve = cmd.store();
+ ValidatorError ve;
+ try {
+ ve = new CobblerSyncCommand(ctx.getLoggedInUser()).store();
+ } catch (Exception ex) {
+ this.getStrutsDelegate().addError(errors,
+ "cobbler.jsp.xmlrpc.fail",
+ ex.getLocalizedMessage());
+ this.getStrutsDelegate().saveMessages(request, errors);
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
if (ve == null) {
addMessage(request, "cobbler.jsp.synced");
}
else {
- ActionErrors errors = new ActionErrors();
getStrutsDelegate().addError(errors, ve.getKey(), ve.getValues());
getStrutsDelegate().saveMessages(request, errors);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 62ec065..e46805b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -8237,6 +8237,9 @@ Please note that some manual configuration of these scripts may still be require
<trans-unit id="cobbler.jsp.sync">
<source>Run Cobbler Sync</source>
</trans-unit>
+ <trans-unit id="cobbler.jsp.xmlrpc.fail">
+ <source>Cobbler command failed: {0}</source>
+ </trans-unit>
<trans-unit id="cobbler.jsp.synced">
<source>Cobbler Sync action was successfully executed. Look at /var/log/cobbler/*.log for more information</source>
</trans-unit>
commit 8793925a10d2e482669c0e6104197737fad0cad8
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 22 14:35:52 2014 +0100
Add extra log folder /var/log/rhn/tasko/sat/ in spacewalk-debug.
diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug
index 90efd48..d918973 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -92,6 +92,7 @@ mkdir -p $DIR/rhn-logs
mkdir -p $DIR/kickstarts
mkdir -p $DIR/database
mkdir -p $DIR/cobbler-lib
+mkdir -p $DIR/tasko
echo " * copying configuration information"
cp -fapRd /etc/httpd/conf* $DIR/conf/httpd
@@ -241,6 +242,11 @@ if [ -f /var/log/audit/audit.log ] ; then
cp -fa /var/log/audit/audit.log $DIR/audit-log
fi
+if [ -d /var/log/rhn/tasko/sat ] ; then
+ echo " * copying tasko/sat"
+ cp -fa /var/log/rhn/tasko/sat $DIR/tasko
+fi
+
echo " * timestamping"
echo "Spacewalk debug created on $(date)" > $DIR/timestamp
commit c3a9c09e83c0c970acb6640182d191ac86f7a4e8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 14:20:51 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.10-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index c99c35a..54e5ebb 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.9-1 spacewalk/setup/
+2.1.10-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6ed0d73..5f84472 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.9
+Version: 2.1.10
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1
+- 1039877 - disable ehcache check for updates
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.9-1
- modified tomcat setup to work also on Fedora 20
commit be044846edc598178de2f436e1059da226b7f588
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 14:16:32 2014 +0100
1039877 - disable ehcache check for updates
diff --git a/spacewalk/setup/share/tomcat.java_opts b/spacewalk/setup/share/tomcat.java_opts
index 1fffafb..54ae1dd 100644
--- a/spacewalk/setup/share/tomcat.java_opts
+++ b/spacewalk/setup/share/tomcat.java_opts
@@ -1 +1 @@
--ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC
+-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC -Dnet.sf.ehcache.skipUpdateCheck=true
commit 50d572629b9ff4ab0a4ad49148ea89c994171be7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 13:54:35 2014 +0100
Automatic commit of package [oracle-lib-compat] release [11.2.0.9-1].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 70f55a5..e9eda10 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -1,5 +1,5 @@
Name: oracle-lib-compat
-Version: 11.2.0.8
+Version: 11.2.0.9
Release: 1%{?dist}
Summary: Compatibility package so that perl-DBD-Oracle will install
Group: Applications/Multimedia
@@ -105,6 +105,10 @@ find %{_prefix}/lib/oracle/%{icdir} \
| xargs execstack -c
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 11.2.0.9-1
+- LD_PRELOAD setup has been moved to spacewalk-setup-tomcat
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Tue Dec 04 2012 Jan Pazdziora 11.2.0.8-1
- On Fedoras, start to use tomcat >= 7.
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat
index 4866be4..fd7110a 100644
--- a/rel-eng/packages/oracle-lib-compat
+++ b/rel-eng/packages/oracle-lib-compat
@@ -1 +1 @@
-11.2.0.8-1 projects/oracle-lib-compat/
+11.2.0.9-1 projects/oracle-lib-compat/
commit 28fe717933ea4dddb20802cea0502c10e3e7da7c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 13:53:40 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.9-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 5727fa0..c99c35a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.8-1 spacewalk/setup/
+2.1.9-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index cce5cbe..6ed0d73 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.8
+Version: 2.1.9
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.9-1
+- modified tomcat setup to work also on Fedora 20
+
* Tue Jan 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.8-1
- Updating the copyright years info
commit 0d173c13bb996b81ee65e697a420d7a351532cda
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 11:38:51 2014 +0100
LD_PRELOAD setup has been moved to spacewalk-setup-tomcat
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 8083f98..70f55a5 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -81,18 +81,6 @@ echo 'diag_adr_enabled = off' > $RPM_BUILD_ROOT/usr/lib/oracle/11.2/client/lib/n
mkdir -p $RPM_BUILD_ROOT/%{_javadir}
ln -s ../../%{_lib}/oracle/%{icdir}/client/lib/ojdbc6.jar $RPM_BUILD_ROOT/%{_javadir}/ojdbc14.jar
-%if 0%{?rhel} && 0%{?rhel} < 6
-%define tomcatname tomcat5
-%else
-%if 0%{?fedora}
-%define tomcatname tomcat
-%else
-%define tomcatname tomcat6
-%endif
-%endif
-install -d $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin
-install tomcat-setenv.sh $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin/setenv.sh
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -107,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/oracle-instantclient-%{icdir}.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/oracle-xe.conf
%{_javadir}/ojdbc14.jar
-%{_datadir}/%{tomcatname}/bin/setenv.sh
%post
ldconfig
diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh
deleted file mode 100644
index c0b01b3..0000000
--- a/projects/oracle-lib-compat/tomcat-setenv.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# To address bug 623115/627859, we need to override the ldap_* symbols
-# in libclntsh.so* upon tomcat* startup with those from standard library.
-for i in /lib64/security/pam_ldap.so /lib/security/pam_ldap.so ; do
- if [ -f $i ] ; then
- # to force ldd to show the libldap line with => even if LD_PRELOAD was already set
- unset LD_PRELOAD
- export LD_PRELOAD=`ldd $i 2> /dev/null | perl -lne '/^\s+libldap\S+\s+=>\s+(\S+)/ and print $1 and exit'`
- break
- fi
-done
-
commit 4db51cfa8b507bc6fad77bd2648b392f61bd8df2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 11:01:40 2014 +0100
spacewalk-setup-tomcat packaging
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index 7bb7f09..86df547 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -9,7 +9,7 @@ WriteMakefile(
ABSTRACT_FROM => 'lib/Spacewalk/Setup.pm',
PL_FILES => {},
EXE_FILES => ['bin/spacewalk-setup', 'bin/cobbler20-setup', 'bin/spacewalk-make-mount-points',
- 'bin/spacewalk-setup-cobbler'],
+ 'bin/spacewalk-setup-cobbler', 'bin/spacewalk-setup-tomcat'],
PREREQ_PM => {
'Test::More' => 0,
},
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 012bc8a..cce5cbe 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -80,6 +80,7 @@ install -d -m 755 %{buildroot}/%{_var}/spacewalk
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
/usr/bin/pod2man --section=8 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-make-mount-points | gzip > $RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-make-mount-points.8.gz
/usr/bin/pod2man --section=1 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-setup-cobbler | gzip > $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-cobbler.1.gz
+/usr/bin/pod2man --section=1 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-setup-tomcat | gzip > $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-tomcat.1.gz
%check
make test
@@ -95,6 +96,7 @@ rm -rf %{buildroot}
%{_bindir}/spacewalk-setup
%{_bindir}/spacewalk-make-mount-points
%{_bindir}/spacewalk-setup-cobbler
+%{_bindir}/spacewalk-setup-tomcat
%{_bindir}/cobbler20-setup
%{_mandir}/man[13]/*.[13]*
%{_datadir}/spacewalk/*
commit b016950ccf72a3f3d34d01c36fb48e11490f5508
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 08:37:28 2014 +0100
modified tomcat setup to work also on Fedora 20
put tomcat_setup() into a separate tool so it can be run multiple times
(e.g. reconfigure tomcat after db backend changes)
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 8c826bb..38a001b 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# Copyright (c) 2008--2012 Red Hat, Inc.
+# Copyright (c) 2008--2014 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
@@ -553,87 +553,8 @@ sub setup_tomcat {
my $opts = shift;
my $answers = shift;
- my ($tomcatvol, $tomcatdir, $tomcatname);
-
- for my $conf_glob ("/etc/sysconfig/tomcat{5,6,}", "/etc/tomcat*/tomcat*.conf") {
- my ($conf_vol, $conf_dir, $conf_file) = File::Spec->splitpath($conf_glob);
- my ($tomcatconf_content_orig, $tomcatconf_content);
- my @tomcat_confs = grep { -f $_ } glob($conf_glob);
- if (@tomcat_confs < 1) {
- die "Couldn't find tomcat config file ($conf_glob).\n";
- } elsif (@tomcat_confs > 1) {
- die "Multiple tomcat config files found:\n @tomcat_confs\nNot sure which tomcat to use.\n";
- }
-
- my $tomcatfile = $tomcat_confs[0];
- ($tomcatvol, $tomcatdir, $tomcatname) = File::Spec->splitpath($tomcatfile);
-
- {
- open FILE, '<', $tomcatfile
- or die "Error opening [$tomcatfile]: $!\n";
- local $/ = undef;
- $tomcatconf_content = <FILE>;
- $tomcatconf_content_orig = $tomcatconf_content;
- close FILE;
- }
-
- for my $file (glob Spacewalk::Setup::SHARED_DIR . "/$conf_file.[0-9]") {
- open FILE, '<', $file or die "Error reading [$file]: $!\n";
- my $regexp = <FILE>;
- chomp $regexp;
-
- my $content;
- {
- local $/ = undef;
- $content = <FILE>;
- }
- close FILE;
- defined($content) or $content = '';
- $tomcatconf_content =~ s!$regexp!$content!gm or $tomcatconf_content .= $content;
- }
-
- if ($tomcatconf_content ne $tomcatconf_content_orig) {
- Spacewalk::Setup::backup_file($tomcatdir, $tomcatname);
-
- open FILE, '>', $tomcatfile
- or die "Error opening [$tomcatfile]: $!\n";
- chmod 0644, $tomcatfile;
- print FILE $tomcatconf_content;
- close FILE;
- }
-}
-
- my $serverxmlfile = "$tomcatdir/server.xml";
- {
- local $/ = undef;
- local *FILE;
- open FILE, '<', $serverxmlfile
- or die "Error opening [$serverxmlfile]: $!\n";
- my $serverxml_content_orig = <FILE>;
- close FILE;
-
- my $template = Spacewalk::Setup::SHARED_DIR . '/server.xml.xsl';
- my $serverxml_content = qx{/usr/bin/xsltproc $template $serverxmlfile};
- die "There was an error running xsltproc\n" if $?;
- if ($serverxml_content ne $serverxml_content_orig) {
- Spacewalk::Setup::backup_file($serverxmlfile =~ m!^(.+)/(.+)$!);
-
- open FILE, '>', $serverxmlfile
- or die "Error opening [$serverxmlfile]: $!\n";
- chmod 0644, $serverxmlfile;
- print FILE $serverxml_content;
- close FILE;
- }
- }
-
- my $web_patch = Spacewalk::Setup::SHARED_DIR."/web.xml.patch";
- my $command = "patch --silent --directory=$tomcatdir --forward -p1 --input=$web_patch";
- system($command." --dry-run");
- if (not $?){
- Spacewalk::Setup::backup_file($tomcatdir, 'web.xml');
-
- system($command);
- }
+ Spacewalk::Setup::system_or_exit(['/usr/bin/spacewalk-setup-tomcat', ''], 43,
+ 'Could not setup tomcat.');
return;
}
diff --git a/spacewalk/setup/bin/spacewalk-setup-tomcat b/spacewalk/setup/bin/spacewalk-setup-tomcat
new file mode 100755
index 0000000..47fbafd
--- /dev/null
+++ b/spacewalk/setup/bin/spacewalk-setup-tomcat
@@ -0,0 +1,186 @@
+#!/usr/bin/perl
+#
+# Copyright (c) 2014 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.
+
+use strict;
+use Spacewalk::Setup;
+use File::Spec;
+
+use constant ORACLE_LDCONF => "/etc/ld.so.conf.d/oracle-instantclient-11.2.conf";
+use constant TOMCAT_PAM_LDAP => "/lib{64,}/security/pam_ldap.so";
+use constant TOMCAT_JAVA_OPTS =>
+ File::Spec->catfile(Spacewalk::Setup::SHARED_DIR, "tomcat.java_opts");
+
+sub java_opts {
+ my $ret = '';
+ if (-r TOMCAT_JAVA_OPTS) {
+ open F, '<', TOMCAT_JAVA_OPTS
+ or die "Error reading [" + TOMCAT_JAVA_OPTS + "]: $!\n";
+ $ret = <F>;
+ close(F);
+ chomp($ret);
+ $ret = qq{JAVA_OPTS="$ret"\n};
+ }
+ return $ret;
+}
+
+sub ld_preload {
+ # To address bug 623115/627859, we need to override the ldap_* symbols
+ # in libclntsh.so* upon tomcat* startup with those from standard library.
+ my $ret = '';
+ if (-r ORACLE_LDCONF) {
+ for my $lib (glob TOMCAT_PAM_LDAP) {
+ if (-f $lib) {
+ my $out = qx{ldd $lib 2> /dev/null};
+ $ret = "LD_PRELOAD=$1\n" if $out =~ /^\s+libldap\S+\s+=>\s+(\S+)/m;
+ last;
+ }
+ }
+ }
+ return $ret;
+}
+
+sub ld_library_path {
+ my $ret = '';
+ if (-r ORACLE_LDCONF) {
+ open F, '<', ORACLE_LDCONF
+ or die "Error reading [" + ORACLE_LDCONF + "]: $!\n";
+ $ret = "LD_LIBRARY_PATH=" . <F>;
+ close(F);
+ }
+ return $ret;
+}
+
+sub setup_tomcat {
+ my %macros = (JAVA_OPTS => java_opts(),
+ LD_PRELOAD => ld_preload(),
+ LD_LIBRARY_PATH => ld_library_path(),
+ );
+
+ my ($tomcatvol, $tomcatdir, $tomcatname);
+
+ for my $conf_glob ("/etc/sysconfig/tomcat{5,6,}", "/etc/tomcat*/tomcat*.conf") {
+ my ($conf_vol, $conf_dir, $conf_file) = File::Spec->splitpath($conf_glob);
+ my ($tomcatconf_content_orig, $tomcatconf_content);
+ my @tomcat_confs = grep { -f $_ } glob($conf_glob);
+ if (@tomcat_confs < 1) {
+ die "Couldn't find tomcat config file ($conf_glob).\n";
+ } elsif (@tomcat_confs > 1) {
+ die "Multiple tomcat config files found:\n @tomcat_confs\nNot sure which tomcat to use.\n";
+ }
+
+ my $tomcatfile = $tomcat_confs[0];
+ ($tomcatvol, $tomcatdir, $tomcatname) = File::Spec->splitpath($tomcatfile);
+
+ {
+ open FILE, '<', $tomcatfile
+ or die "Error opening [$tomcatfile]: $!\n";
+ local $/ = undef;
+ $tomcatconf_content = <FILE>;
+ $tomcatconf_content_orig = $tomcatconf_content;
+ close FILE;
+ }
+
+ for my $file (glob Spacewalk::Setup::SHARED_DIR . "/$conf_file.[0-9]") {
+ open FILE, '<', $file or die "Error reading [$file]: $!\n";
+ my $regexp = <FILE>;
+ chomp $regexp;
+
+ my $content;
+ {
+ local $/ = undef;
+ $content = <FILE>;
+ }
+ close FILE;
+ if (defined($content)) {
+ for my $key (keys %macros) {
+ $content =~ s/\@$key\@(\n)?/$macros{$key}/;
+ }
+ } else {
+ $content = '';
+ }
+ $tomcatconf_content =~ s!$regexp!$content!gm or $tomcatconf_content .= $content;
+ }
+
+ if ($tomcatconf_content ne $tomcatconf_content_orig) {
+ Spacewalk::Setup::backup_file($tomcatdir, $tomcatname);
+
+ open FILE, '>', $tomcatfile
+ or die "Error opening [$tomcatfile]: $!\n";
+ chmod 0644, $tomcatfile;
+ print FILE $tomcatconf_content;
+ close FILE;
+ }
+ }
+
+ my $serverxmlfile = "$tomcatdir/server.xml";
+ {
+ local $/ = undef;
+ local *FILE;
+ open FILE, '<', $serverxmlfile
+ or die "Error opening [$serverxmlfile]: $!\n";
+ my $serverxml_content_orig = <FILE>;
+ close FILE;
+
+ my $template = Spacewalk::Setup::SHARED_DIR . '/server.xml.xsl';
+ my $serverxml_content = qx{/usr/bin/xsltproc $template $serverxmlfile};
+ die "There was an error running xsltproc\n" if $?;
+ if ($serverxml_content ne $serverxml_content_orig) {
+ Spacewalk::Setup::backup_file($serverxmlfile =~ m!^(.+)/(.+)$!);
+
+ open FILE, '>', $serverxmlfile
+ or die "Error opening [$serverxmlfile]: $!\n";
+ chmod 0644, $serverxmlfile;
+ print FILE $serverxml_content;
+ close FILE;
+ }
+ }
+
+ my $web_patch = Spacewalk::Setup::SHARED_DIR."/web.xml.patch";
+ my $command = "patch --silent --directory=$tomcatdir --forward -p1 --input=$web_patch";
+ system($command." --dry-run");
+ if (not $?){
+ Spacewalk::Setup::backup_file($tomcatdir, 'web.xml');
+
+ system($command);
+ }
+ return;
+}
+
+setup_tomcat();
+
+=head1 NAME
+
+spacewalk-setup-tomcat - utility for configuring tomcat service to work with
+Spacewalk / Satellite
+
+=head1 SYNOPSIS
+
+B<spacewalk-setup-tomcat>
+
+=head1 DESCRIPTION
+
+B<spacewalk-setup-tomcat> is a utility for configuring tomcat to work
+with Spacewalk / Satellite. The script modifies existing tomcat configuration,
+especially LD_LIBRARY_PATH, LD_PRELOAD and JAVA_OPTS variables, to work with
+specified database backend.
+
+Ordinarily, spacewalk-setup-tomcat is called by spacewalk-setup(1) during
+initial Spacewalk / Satellite configuration or upgrade.
+
+=head1 SEE ALSO
+
+B<spacewalk-setup>(1) - Spacewalk setup program
+
+=cut
diff --git a/spacewalk/setup/share/tomcat.1 b/spacewalk/setup/share/tomcat.1
index 47c01a5..65b994e 100644
--- a/spacewalk/setup/share/tomcat.1
+++ b/spacewalk/setup/share/tomcat.1
@@ -1,2 +1,2 @@
^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"\n
-JAVA_OPTS="$JAVA_OPTS -ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"
+@JAVA_OPTS@
diff --git a/spacewalk/setup/share/tomcat.2 b/spacewalk/setup/share/tomcat.2
index 39a50a0..a564ca4 100644
--- a/spacewalk/setup/share/tomcat.2
+++ b/spacewalk/setup/share/tomcat.2
@@ -1,2 +1 @@
^_HACK_AROUND_PARSEOPTIONS=1; test -f /etc/ld.so.conf.d/oracle-instantclient-11.2.conf.+LD_LIBRARY_PATH=.+\n
-_HACK_AROUND_PARSEOPTIONS=1; test -f /etc/ld.so.conf.d/oracle-instantclient-11.2.conf && export LD_LIBRARY_PATH=$(cat /etc/ld.so.conf.d/oracle-instantclient-11.2.conf)
diff --git a/spacewalk/setup/share/tomcat.3 b/spacewalk/setup/share/tomcat.3
index c416b8e..0d3cb6a 100644
--- a/spacewalk/setup/share/tomcat.3
+++ b/spacewalk/setup/share/tomcat.3
@@ -1,2 +1 @@
^_HACK_AROUND_PARSEOPTIONS=1; test.+setenv\.sh\n
-_HACK_AROUND_PARSEOPTIONS=1; test -f $CATALINA_HOME/bin/setenv.sh && . $CATALINA_HOME/bin/setenv.sh
diff --git a/spacewalk/setup/share/tomcat.4 b/spacewalk/setup/share/tomcat.4
new file mode 100644
index 0000000..6266385
--- /dev/null
+++ b/spacewalk/setup/share/tomcat.4
@@ -0,0 +1,2 @@
+^LD_LIBRARY_PATH=.+\n
+@LD_LIBRARY_PATH@
diff --git a/spacewalk/setup/share/tomcat.5 b/spacewalk/setup/share/tomcat.5
new file mode 100644
index 0000000..8db871d
--- /dev/null
+++ b/spacewalk/setup/share/tomcat.5
@@ -0,0 +1,2 @@
+^LD_PRELOAD=.+\n
+@LD_PRELOAD@
diff --git a/spacewalk/setup/share/tomcat.java_opts b/spacewalk/setup/share/tomcat.java_opts
new file mode 100644
index 0000000..1fffafb
--- /dev/null
+++ b/spacewalk/setup/share/tomcat.java_opts
@@ -0,0 +1 @@
+-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC
commit 9f46e97d0e33ed9ae0037191de9e079eaef92dd2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 13:39:38 2014 +0100
Automatic commit of package [spacewalk-repo] release [2.1.1-1].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 9165e95..eb3ac0e 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-2.1.0-2 spec-tree/spacewalk-repo/
+2.1.1-1 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 58a19eb..e53092d 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
+- reverted tagger to VersionTagger
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.0-2
- make spacewalk*.repo on Fedora more generic
commit b0add725c8252f41d45166631057115afc6c1c00
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 13:38:01 2014 +0100
reverted tagger to VersionTagger
fixing
Tag [spacewalk-repo-2.1.0-2] does not end with [-1]
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 2cfcd3e..58a19eb 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
Version: 2.1.0
-Release: 2%{?dist}
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
# This src.rpm is cannonical upstream
diff --git a/spec-tree/spacewalk-repo/tito.props b/spec-tree/spacewalk-repo/tito.props
index 2a8b6d9..355908e 100644
--- a/spec-tree/spacewalk-repo/tito.props
+++ b/spec-tree/spacewalk-repo/tito.props
@@ -1,3 +1,2 @@
[buildconfig]
builder = spacewalkx.builderx.NoTgzBuilder
-tagger = tito.tagger.ReleaseTagger
commit 32e619b29e20184e175bd6b96cd22c68bcda8550
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 13:26:20 2014 +0100
Automatic commit of package [spacewalk-repo] minor release [2.1.0-2].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 15638f6..9165e95 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-2.1.0-1 spec-tree/spacewalk-repo/
+2.1.0-2 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index b9568e6..2cfcd3e 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Base
# This src.rpm is cannonical upstream
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.0-2
+- make spacewalk*.repo on Fedora more generic
+
* Thu Jul 18 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.0-1
- Bumping package versions for 2.1.
commit 5163fc82a68f5160aac8ae806ef830449940f2ce
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 13:17:22 2014 +0100
make spacewalk*.repo on Fedora more generic
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index df51f3e..b9568e6 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -34,7 +34,7 @@ rm -rf $RPM_BUILD_ROOT
# some sane default value
%define reposubdir RHEL/%{rhel}
# redefine on fedora
-%{?fedora: %define reposubdir Fedora/%{fedora}}
+%{?fedora: %define reposubdir Fedora/\$releasever}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk.repo <<REPO
commit 6a11236104d95e085c676f522f73ec2858b52e12
Author: Michael Calmer <mc(a)suse.de>
Date: Thu Jan 16 17:20:53 2014 +0100
remove unused perl code after porting reboot_confirm.pxt to java
diff --git a/web/html/network/systems/details/reboot_confirm.pxt b/web/html/network/systems/details/reboot_confirm.pxt
deleted file mode 100644
index 898ff1f..0000000
--- a/web/html/network/systems/details/reboot_confirm.pxt
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::Servers" />
-<pxt-use class="Sniglets::Sets" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::ServerActions" />
-
-
-<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-<pxt-formvar>
- <pxt-include-late file="/network/components/systems/system_details_toolbar.pxi" />
-</pxt-formvar>
-
- <rhn-navi-nav prefix="system_details" file="/nav/system_detail.xml" style="contentnav" />
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<rhn-up2date-at-least version="2.9.3" release="2.2.1AS">
-
-<h2>System Reboot Confirmation</h2>
-
-<p>This will schedule a reboot of this system.</p>
-
-
-<pxt-form method="post">
-<p>If you are <strong>certain</strong> you wish to do this, you may schedule the reboot to take place as soon as possible, or no earlier than a specified time:</p>
-
-<rhn-schedule-action-interface action="schedule_errata_updates" callback="rhn:reboot_server_cb" label="Schedule Reboot" />
-
-<pxt-hidden name="sid" />
-
-</pxt-form>
-
-</rhn-up2date-at-least>
-
-</grail-canvas-template>
-</pxt-passthrough>
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index a23043f..cf190db 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -175,28 +175,6 @@ EOQ
}
}
-
-sub schedule_reboot {
- my $class = shift;
- my %params = @_;
-
- my ($org_id, $user_id, $server_set, $server_id, $earliest, $prerequisite, $transaction) =
- map { $params{"-" . $_} } qw/org_id user_id server_set server_id earliest prerequisite transaction/;
-
- my ($action_id, $stat_id) = $class->make_base_action(-org_id => $org_id,
- -user_id => $user_id,
- -type_label => 'reboot.reboot',
- -earliest => $earliest,
- -prerequisite => $prerequisite,
- -transaction => $transaction);
-
- $class->add_servers_to_action($action_id, $stat_id, $user_id, $server_set, $server_id);
-
- osa_wakeup_tickle();
-
- return $action_id;
-}
-
sub sscd_schedule_reboot {
my $class = shift;
my %params = @_;
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 792dd3d..13a03e3 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -71,8 +71,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:reboot_server_cb' => \&reboot_server_cb);
-
$pxt->register_callback('rhn:server_prefs_form_cb' => \&server_prefs_form_cb);
$pxt->register_callback('rhn:ssm_change_system_prefs_cb' => \&ssm_change_system_prefs_cb);
@@ -313,30 +311,6 @@ sub server_history_event_details {
return $params{__block__};
}
-sub reboot_server_cb {
- my $pxt = shift;
- my $sid = $pxt->param('sid');
- die "no server id" unless $sid;
-
- my $server = RHN::Server->lookup(-id => $sid);
- die "no server obj" unless $server;
-
- my $earliest_date = Sniglets::ServerActions->parse_date_pickbox($pxt);
- my $action_id = RHN::Scheduler->schedule_reboot(-org_id => $pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -server_id => $sid);
-
-
- my $pretty_earliest_date = $pxt->user->convert_time($earliest_date);
-# my $message = sprintf(<<EOM, $server->name, $server->name, $action_id);
-#Reboot scheduled for system <strong>%s</strong> for $pretty_earliest_date. To cancel the reboot, remove <strong>%s</strong> from <a href="/rhn/schedule/InProgressSystems.do?aid=%d"><strong>the list of systems to be rebooted</strong></a>.
-#EOM
-#
-# $pxt->push_message(site_info => $message);
- $pxt->redirect("/rhn/systems/details/Overview.do?sid=$sid&message=system.reboot.scheduled&messagep1=" . $server->name . "&messagep2=" . $pretty_earliest_date . "&messagep3=" . $action_id);
-}
-
my @user_server_prefs = ( { name => 'receive_notifications',
label => 'Receive Notifications of Updates/Errata' },
{ name => 'include_in_daily_summary',
commit c98ed65274570d849a93c732b9082a353c4c861f
Author: Michael Calmer <mc(a)suse.de>
Date: Thu Jan 16 14:08:11 2014 +0100
port reboot_confirm.pxt from perl to java
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java
new file mode 100644
index 0000000..5e4c998
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2014 SUSE
+ *
+ * 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.
+ */
+package com.redhat.rhn.frontend.action.systems.sdc;
+
+import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.domain.action.Action;
+import com.redhat.rhn.domain.action.ActionFactory;
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.manager.action.ActionManager;
+import com.redhat.rhn.manager.system.SystemManager;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
+import java.util.Date;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * SystemRebootAction handles the interaction of the system reboot.
+ */
+public class SystemRebootAction extends RhnAction {
+ /** Success forward name. */
+ private static final String CONFIRM_FORWARD = "confirm";
+
+ /** {@inheritDoc} */
+ @Override
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm formIn,
+ HttpServletRequest request, HttpServletResponse response) {
+
+ DynaActionForm form = (DynaActionForm) formIn;
+ RequestContext context = new RequestContext(request);
+ User user = context.getLoggedInUser();
+ Map<String, Object> params = (Map<String, Object>) makeParamMap(request);
+ String forward = RhnHelper.DEFAULT_FORWARD;
+
+ Long sid = context.getRequiredParam(RequestContext.SID);
+ Server server = SystemManager.lookupByIdAndUser(sid, user);
+
+ if (isSubmitted(form)) {
+ Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn,
+ "date", DatePicker.YEAR_RANGE_POSITIVE);
+ Action action = ActionManager.scheduleRebootAction(user, server, earliest);
+ ActionFactory.save(action);
+
+ String[] messageParams = new String[3];
+ messageParams[0] = server.getName();
+ messageParams[1] = earliest.toString();
+ messageParams[2] = action.getId().toString();
+ createMessage(request, "system.reboot.scheduled", messageParams);
+
+ // goes to sdc/overview.jsp
+ params.put(RequestContext.SID, sid);
+ forward = CONFIRM_FORWARD;
+ }
+
+ DatePicker picker = getStrutsDelegate().prepopulateDatePicker(request, form,
+ "date", DatePicker.YEAR_RANGE_POSITIVE);
+ request.setAttribute("date", picker);
+ request.setAttribute(RequestContext.SID, sid);
+ request.setAttribute("system", server);
+
+ SdcHelper.ssmCheck(request, server.getId(), user);
+
+ return getStrutsDelegate().forwardParams(mapping.findForward(forward), params);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index c4cdf75..62ec065 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -5130,6 +5130,30 @@ value for this entitlement, excluding the default organization's consumption.</s
<context context-type="sourcefile">/rhn/systems/SystemGroupList</context>
</context-group>
</trans-unit>
+ <trans-unit id="reboot.jsp.header">
+ <source>System Reboot Confirmation</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/RebootSystem</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="reboot.jsp.summary">
+ <source>This will schedule a reboot of this system.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/RebootSystem</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="reboot.jsp.widgetsummary">
+ <source>If you are <strong>certain</strong> you wish to do this, you may schedule the reboot to take place after a specified time:</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/RebootSystem</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="reboot.jsp.confirm">
+ <source>Reboot system</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/RebootSystem</context>
+ </context-group>
+ </trans-unit>
<!--- System Duplicates pages -->
<group>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/nav/system_detail.xml b/java/code/webapp/WEB-INF/nav/system_detail.xml
index 6c20453..5261dec 100644
--- a/java/code/webapp/WEB-INF/nav/system_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/system_detail.xml
@@ -4,7 +4,7 @@
<rhn-tab name="Details" url="/rhn/systems/details/Overview.do">
<rhn-tab name="Overview">
<rhn-tab-url>/rhn/systems/details/Overview.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/reboot_confirm.pxt</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/RebootSystem.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Properties" url="/rhn/systems/details/Edit.do" />
<rhn-tab name="Remote Command" acl="system_feature(ftr_remote_command)">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index ce473c4..0dc87b4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -54,7 +54,7 @@
<div class="systeminfo">
<div class="systeminfo-full">
<rhn:icon type="system-reboot" /><bean:message key="sdc.details.overview.requires_reboot"/>
- <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
+ <bean:message key="sdc.details.overview.schedulereboot" arg0="/rhn/systems/details/RebootSystem.do?sid=${system.id}"/>
</div>
</div>
</c:if>
@@ -255,7 +255,7 @@
<td><fmt:formatDate value="${system.lastBootAsDate}" type="both" dateStyle="short" timeStyle="long"/><br/>
<rhn:require acl="system_feature(ftr_reboot)"
mixins="com.redhat.rhn.common.security.acl.SystemAclHandler">
- <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
+ <bean:message key="sdc.details.overview.schedulereboot" arg0="/rhn/systems/details/RebootSystem.do?sid=${system.id}"/>
</rhn:require>
</td>
</tr>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp
new file mode 100644
index 0000000..6e03b4a
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp
@@ -0,0 +1,52 @@
+<%--
+ Document : rebootsystem
+ Created on : Jan 15, 2014, 2:35:54 PM
+ Author : Michael Calmer <mc(a)suse.de>
+--%>
+
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+
+<%@taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+
+<html>
+ <body>
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="reboot.jsp.header" /></h4>
+ </div>
+ <div class="panel-body">
+ <bean:message key="reboot.jsp.summary" />
+ <br>
+ <bean:message key="reboot.jsp.widgetsummary"/>
+
+ <form action="/rhn/systems/details/RebootSystem.do?sid=${sid}" method="post" class="form-horizontal">
+ <rhn:csrf />
+ <rhn:submitted />
+
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-danger">
+ <bean:message key="reboot.jsp.confirm"/>
+ </html:submit>
+ </div>
+ </div>
+
+ <input type="hidden" name="use_date" value="true" />
+ </form>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 1e96b02..c96c141 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -3063,6 +3063,19 @@
path="/systems/ssm/ListSystems.do" redirect="true" />
</action>
+ <action path="/systems/details/RebootSystem"
+ scope="request"
+ name="datePickerForm"
+ input="/WEB-INF/pages/systems/sdc/rebootsystem.jsp"
+ type="com.redhat.rhn.frontend.action.systems.sdc.SystemRebootAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true"/>
+ <forward name="confirm"
+ path="/WEB-INF/pages/systems/sdc/overview.jsp" />
+ <forward name="default"
+ path="/WEB-INF/pages/systems/sdc/rebootsystem.jsp" />
+ </action>
+
<action path="/systems/details/audit/ListScap"
scope="request"
input="/WEB-INF/pages/systems/details/audit/listscap.jsp"
diff --git a/web/include/nav/system_detail.xml b/web/include/nav/system_detail.xml
index 3332573..b45ba4d 100644
--- a/web/include/nav/system_detail.xml
+++ b/web/include/nav/system_detail.xml
@@ -4,7 +4,7 @@
<rhn-tab name="Details" url="/rhn/systems/details/Overview.do">
<rhn-tab name="Overview">
<rhn-tab-url>/rhn/systems/details/Overview.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/reboot_confirm.pxt</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/RebootSystem.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Properties" url="/rhn/systems/details/Edit.do" />
<rhn-tab name="Remote Command" acl="system_feature(ftr_remote_command)">
commit 8373210db3c22057ac8d5f42eff886996734e122
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Jan 22 10:41:08 2014 +0100
SUSE Studio API will stop working via unencrypted HTTP
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserCredentialsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserCredentialsEditAction.java
index 66efc89..72395f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserCredentialsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserCredentialsEditAction.java
@@ -40,7 +40,7 @@ public class UserCredentialsEditAction extends RhnAction {
private static final String PARAM_USER = "studio_user";
private static final String PARAM_KEY = "studio_key";
private static final String PARAM_URL = "studio_url";
- private static final String DEFAULT_URL = "http://susestudio.com";
+ private static final String DEFAULT_URL = "https://susestudio.com";
/** {@inheritDoc} */
@Override
commit 7e9a0937939d38f0075f886c6549a3f5d5eff69b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 11:40:44 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.37-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index aa4bcc8..1720fa6 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.36-1 schema/spacewalk/
+2.1.37-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 023335c..5c55530 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.36
+Version: 2.1.37
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.37-1
+- Revert "1053591 - refresh_newest_package: lock rhnChannel at the beginning"
+- Revert "'is' followed by 'declare' is rarely needed"
+
* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.36-1
- increase length of rhnCVE name column
commit aabceb78217f6402558bde106d886511ebacb027
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 11:37:23 2014 +0100
Revert "1053591 - refresh_newest_package: lock rhnChannel at the beginning"
This reverts commit d0815058c8892c8f5a0642cc592ff97fcaa49374.
Locking rhnChannel table at the beginning of refresh_newest_package
won't suffice, since the resources over which both sessions compete
were locked before the procedure.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index b393579..325c18a 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -1102,15 +1102,7 @@ IS
is
-- procedure refreshes rows for name_id = package_name_id_in or
-- all rows if package_name_id_in is null
- declare
- channel_lm timestamp with local time zone;
begin
- select last_modified
- into channel_lm
- from rhnChannel
- where id = channel_id_in
- for update;
-
delete from rhnChannelNewestPackage
where channel_id = channel_id_in
and (package_name_id_in is null
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 3471f21..5931562 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 b89b116bf39a095c05c4ae0f9813fd43f0437132
+-- oracle equivalent source sha1 e6fa92f40cfb0ac1645f53ecad5f2a8f99a616f7
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
@@ -1124,15 +1124,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
as $$
-- procedure refreshes rows for name_id = package_name_id_in or
-- all rows if package_name_id_in is null
- declare
- channel_lm timestamptz;
begin
- select last_modified
- into channel_lm
- from rhnChannel
- where id = channel_id_in
- for update;
-
delete from rhnChannelNewestPackage
where channel_id = channel_id_in
and (package_name_id_in is null
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
deleted file mode 100644
index b393579..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
+++ /dev/null
@@ -1,1247 +0,0 @@
---
--- Copyright (c) 2008--2013 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.
---
-
-CREATE OR REPLACE
-PACKAGE BODY rhn_channel
-IS
- body_version varchar2(100) := '';
-
- -- Cursor that fetches all the possible base channels for a
- -- (server_arch_id, release, org_id) combination
- cursor base_channel_cursor(
- release_in in varchar2,
- server_arch_id_in in number,
- org_id_in in number
- ) return rhnChannel%ROWTYPE is
- select distinct c.*
- from rhnOrgDistChannelMap odcm,
- rhnServerChannelArchCompat scac,
- rhnChannel c
- where c.parent_channel is null
- and c.id = odcm.channel_id
- and c.channel_arch_id = odcm.channel_arch_id
- and odcm.release = release_in
- and odcm.for_org_id = org_id_in
- and scac.server_arch_id = server_arch_id_in
- and scac.channel_arch_id = c.channel_arch_id;
-
- procedure obtain_read_lock(channel_family_id_in in number, org_id_in in number)
- is
- read_lock timestamp with local time zone;
-
- begin
- select created into read_lock
- from rhnPrivateChannelFamily
- where channel_family_id = channel_family_id_in and org_id = org_id_in
- for update;
- end obtain_read_lock;
-
- PROCEDURE subscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, user_id_in in number := null, recalcfamily_in number := 1)
- IS
- channel_parent_val rhnChannel.parent_channel%TYPE;
- parent_subscribed BOOLEAN;
- server_has_base_chan BOOLEAN;
- server_already_in_chan BOOLEAN;
- channel_family_id_val NUMBER;
- server_org_id_val NUMBER;
- available_subscriptions NUMBER;
- available_fve_subs NUMBER;
- consenting_user NUMBER;
- allowed number := 0;
- is_fve CHAR(1) := 'N';
- BEGIN
- if user_id_in is not null then
- allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
- else
- allowed := 1;
- end if;
-
- if allowed = 0 then
- rhn_exception.raise_exception('no_subscribe_permissions');
- end if;
-
-
- SELECT parent_channel INTO channel_parent_val FROM rhnChannel WHERE id = channel_id_in;
-
- IF channel_parent_val IS NOT NULL
- THEN
- -- child channel; if attempting to cross-subscribe a child to the wrong base, silently ignore
- parent_subscribed := FALSE;
-
- FOR check_subscription IN check_server_subscription(server_id_in, channel_parent_val)
- LOOP
- parent_subscribed := TRUE;
- END LOOP check_subscription;
-
- IF NOT parent_subscribed
- THEN
- RETURN;
- END IF;
- ELSE
- -- base channel
- server_has_base_chan := FALSE;
- FOR base IN server_base_subscriptions(server_id_in)
- LOOP
- server_has_base_chan := TRUE;
- END LOOP base;
-
- IF server_has_base_chan
- THEN
- rhn_exception.raise_exception('channel_server_one_base');
- END IF;
- END IF;
-
- FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in)
- LOOP
- server_already_in_chan := TRUE;
- END LOOP check_subscription;
-
- IF server_already_in_chan
- THEN
- RETURN;
- END IF;
-
- channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
- IF channel_family_id_val IS NULL
- THEN
- rhn_exception.raise_exception('channel_subscribe_no_family');
- END IF;
-
- --
- -- Use the org_id of the server only if the org_id of the channel = NULL.
- -- This is required for subscribing to shared channels.
- --
- SELECT NVL(org_id, (SELECT org_id FROM rhnServer WHERE id = server_id_in))
- INTO server_org_id_val
- FROM rhnChannel
- WHERE id = channel_id_in;
-
- begin
- obtain_read_lock(channel_family_id_val, server_org_id_val);
- exception
- when no_data_found then
- rhn_exception.raise_exception('channel_family_no_subscriptions');
- end;
-
- available_subscriptions := rhn_channel.available_family_subscriptions(channel_family_id_val, server_org_id_val);
- available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
-
- IF available_subscriptions IS NULL OR
- available_subscriptions > 0 or
- can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 1 OR
- (available_fve_subs > 0 AND can_server_consume_fve(server_id_in) = 1)
- THEN
- if can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 0 AND available_fve_subs > 0 AND can_server_consume_fve(server_id_in) = 1 THEN
- is_fve := 'Y';
- END IF;
- insert into rhnServerHistory (id,server_id,summary,details) (
- select rhn_event_id_seq.nextval,
- server_id_in,
- 'subscribed to channel ' || SUBSTR(c.label, 0, 106),
- c.label
- from rhnChannel c
- where c.id = channel_id_in
- );
- UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
- INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve);
- IF recalcfamily_in > 0
- THEN
- rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
- END IF;
- queue_server(server_id_in, immediate_in);
- ELSE
- rhn_exception.raise_exception('channel_family_no_subscriptions');
- END IF;
-
- END subscribe_server;
-
-
-
- FUNCTION can_convert_to_fve(server_id_in IN NUMBER, channel_family_id_val IN NUMBER)
- RETURN NUMBER
- IS
- CURSOR fve_convertible_entries IS
- select 1 from
- rhnServerFveCapable cap
- where cap.server_id = server_id_in
- AND cap.channel_family_id = channel_family_id_val;
- BEGIN
- FOR entry IN fve_convertible_entries LOOP
- return 1;
- END LOOP;
- RETURN 0;
- END can_convert_to_fve;
-
-
-
- -- Converts server channel_family to use a flex entitlement
- PROCEDURE convert_to_fve(server_id_in IN NUMBER, channel_family_id_val IN NUMBER)
- IS
- available_fve_subs NUMBER;
- server_org_id_val NUMBER;
- BEGIN
-
- --
- -- Use the org_id of the server only if the org_id of the channel = NULL.
- -- This is required for subscribing to shared channels.
- --
- SELECT org_id
- INTO server_org_id_val
- FROM rhnServer
- WHERE id = server_id_in;
-
- begin
- obtain_read_lock(channel_family_id_val, server_org_id_val);
- exception
- when no_data_found then
- rhn_exception.raise_exception('channel_family_no_subscriptions');
- end;
- IF (can_convert_to_fve(server_id_in, channel_family_id_val ) = 0)
- THEN
- rhn_exception.raise_exception('server_cannot_convert_to_flex');
- END IF;
-
- available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
-
- IF (available_fve_subs > 0)
- THEN
-
- insert into rhnServerHistory (id,server_id,summary,details) (
- select rhn_event_id_seq.nextval,
- server_id_in,
- 'converted to flex entitlement' || SUBSTR(cf.label, 0, 99),
- cf.label
- from rhnChannelFamily cf
- where cf.id = channel_family_id_val
- );
-
- UPDATE rhnServerChannel sc set sc.is_fve = 'Y'
- where sc.server_id = server_id_in and
- sc.channel_id in
- (select cfm.channel_id from rhnChannelFamilyMembers cfm
- where cfm.CHANNEL_FAMILY_ID = channel_family_id_val);
-
- rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
- ELSE
- rhn_exception.raise_exception('not_enough_flex_entitlements');
- END IF;
-
- END convert_to_fve;
-
- function can_server_consume_virt_channl(
- server_id_in in number,
- family_id_in in number )
- return number
- is
-
- cursor server_virt_families is
- select vi.virtual_system_id, cfvsl.channel_family_id
- from
- rhnChannelFamilyVirtSubLevel cfvsl,
- rhnSGTypeVirtSubLevel sgtvsl,
- rhnVirtualInstance vi
- where
- vi.virtual_system_id = server_id_in
- and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
- and cfvsl.channel_family_id = family_id_in
- and exists (
- select 1
- from rhnServerEntitlementView sev
- where vi.host_system_id = sev.server_id
- and sev.server_group_type_id = sgtvsl.server_group_type_id );
- begin
-
- for server_virt_family in server_virt_families loop
- return 1;
- end loop;
-
- return 0;
-
- end;
-
- FUNCTION can_server_consume_fve(server_id_in IN NUMBER)
- RETURN NUMBER
- IS
- CURSOR vi_entries IS
- SELECT 1
- FROM rhnVirtualInstance vi
- WHERE vi.virtual_system_id = server_id_in;
- vi_count NUMBER;
-
- BEGIN
- FOR vi_entry IN VI_ENTRIES LOOP
- return 1;
- END LOOP;
- RETURN 0;
- END;
-
- function guess_server_base(
- server_id_in in number
- ) RETURN number is
- cursor server_cursor is
- select s.server_arch_id, s.release, s.org_id
- from rhnServer s
- where s.id = server_id_in;
- begin
- for s in server_cursor loop
- for channel in base_channel_cursor(s.release,
- s.server_arch_id, s.org_id)
- loop
- return channel.id;
- end loop base_channel_cursor;
- end loop server_cursor;
- -- Server not found, or no base channel applies to it
- return null;
- end;
-
- -- Private function
- function normalize_server_arch(server_arch_in in varchar2)
- return varchar2
- deterministic
- is
- suffix VARCHAR2(128) := '-redhat-linux';
- suffix_len NUMBER := length(suffix);
- begin
- if server_arch_in is NULL then
- return NULL;
- end if;
- if instr(server_arch_in, '-') > 0
- then
- -- Suffix already present
- return server_arch_in;
- end if;
- return server_arch_in || suffix;
- end normalize_server_arch;
-
- --
- --
- -- Raises:
- -- server_arch_not_found
- -- no_subscribe_permissions
- function base_channel_for_release_arch(
- release_in in varchar2,
- server_arch_in in varchar2,
- org_id_in in number := -1,
- user_id_in in number := null
- ) return number is
- server_arch varchar2(256) := normalize_server_arch(server_arch_in);
- server_arch_id number;
- begin
- -- Look up the server arch
- begin
- select id
- into server_arch_id
- from rhnServerArch
- where label = server_arch;
- exception
- when no_data_found then
- rhn_exception.raise_exception('server_arch_not_found');
- end;
- return base_channel_rel_archid(release_in, server_arch_id,
- org_id_in, user_id_in);
- end base_channel_for_release_arch;
-
- function base_channel_rel_archid(
- release_in in varchar2,
- server_arch_id_in in number,
- org_id_in in number := -1,
- user_id_in in number := null
- ) return number is
- denied_channel_id number := null;
- valid_org_id number := org_id_in;
- valid_user_id number := user_id_in;
- channel_subscribable number;
- begin
- if org_id_in = -1 and user_id_in is not null then
- -- Get the org id from the user id
- begin
- select org_id
- into valid_org_id
- from web_contact
- where id = user_id_in;
- exception
- when no_data_found then
- -- User doesn't exist
- -- XXX Only list public stuff for now
- valid_user_id := null;
- valid_org_id := -1;
- end;
- end if;
-
- for c in base_channel_cursor(release_in, server_arch_id_in, valid_org_id)
- loop
- -- This row is a possible match
- if valid_user_id is null then
- -- User ID not specified, so no user to channel permissions to
- -- check
- return c.id;
- end if;
-
- -- Check user to channel permissions
- select loose_user_role_check(c.id, user_id_in, 'subscribe')
- into channel_subscribable
- from dual;
-
- if channel_subscribable = 1 then
- return c.id;
- end if;
-
- -- Base channel exists, but is not subscribable; keep trying
- denied_channel_id := c.id;
- end loop base_channel_fetch;
-
- if denied_channel_id is not null then
- rhn_exception.raise_exception('no_subscribe_permissions');
- end if;
- -- No base channel applies
- return NULL;
- end base_channel_rel_archid;
-
- PROCEDURE clear_subscriptions(server_id_in IN NUMBER, deleting_server IN NUMBER := 0,
- update_family_countsYN IN NUMBER := 1)
- IS
- cursor server_channels(server_id_in in number) is
- select s.org_id, sc.channel_id, cfm.channel_family_id
- from rhnServer s,
- rhnServerChannel sc,
- rhnChannelFamilyMembers cfm
- where s.id = server_id_in
- and s.id = sc.server_id
- and sc.channel_id = cfm.channel_id
- order by cfm.channel_family_id;
- last_channel_family_id rhnChannelFamilyMembers.channel_family_id%type := -1;
- last_channel_org_id rhnServer.org_id%type := -1;
- BEGIN
- for channel in server_channels(server_id_in)
- loop
- unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server, 0);
- if update_family_countsYN > 0
- and channel.channel_family_id != last_channel_family_id then
- -- update family counts only once
- -- after all channels with same family has been fetched
- if last_channel_family_id != -1 then
- update_family_counts(last_channel_family_id, last_channel_org_id);
- end if;
- last_channel_family_id := channel.channel_family_id;
- last_channel_org_id := channel.org_id;
- end if;
- end loop channel;
- if update_family_countsYN > 0 and last_channel_family_id != -1 then
- -- update the last family fetched
- update_family_counts(last_channel_family_id, last_channel_org_id);
- end if;
- END clear_subscriptions;
-
- PROCEDURE unsubscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, unsubscribe_children_in number := 0,
- deleting_server IN NUMBER := 0,
- update_family_countsYN IN NUMBER := 1)
- IS
- channel_family_id_val NUMBER;
- server_org_id_val NUMBER;
- available_subscriptions NUMBER;
- server_already_in_chan BOOLEAN;
- cursor channel_family_is_proxy(channel_family_id_in in number) is
- select 1
- from rhnChannelFamily
- where id = channel_family_id_in
- and label = 'rhn-proxy';
- cursor channel_family_is_satellite(channel_family_id_in in number) is
- select 1
- from rhnChannelFamily
- where id = channel_family_id_in
- and label = 'rhn-satellite';
- -- this is *EXACTLY* like check_server_parent_membership, but if we recurse
- -- with the package-level one, we get a "cursor already open", so we need a
- -- copy on our call stack instead. GROAN.
- cursor local_chk_server_parent_memb (
- server_id_in number,
- channel_id_in number ) is
- select c.id
- from rhnChannel c,
- rhnServerChannel sc
- where 1=1
- and c.parent_channel = channel_id_in
- and c.id = sc.channel_id
- and sc.server_id = server_id_in;
- BEGIN
- FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in)
- LOOP
- if unsubscribe_children_in = 1 then
- unsubscribe_server(server_id_in => server_id_in,
- channel_id_in => child.id,
- immediate_in => immediate_in,
- unsubscribe_children_in => unsubscribe_children_in,
- deleting_server => deleting_server,
- update_family_countsYN => update_family_countsYN);
- else
- rhn_exception.raise_exception('channel_unsubscribe_child_exists');
- end if;
- END LOOP child;
-
- server_already_in_chan := FALSE;
-
- FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in)
- LOOP
- server_already_in_chan := TRUE;
- END LOOP check_subscription;
-
- IF NOT server_already_in_chan
- THEN
- RETURN;
- END IF;
-
- if deleting_server = 0 then
-
- insert into rhnServerHistory (id,server_id,summary,details) (
- select rhn_event_id_seq.nextval,
- server_id_in,
- 'unsubscribed from channel ' || SUBSTR(c.label, 0, 106),
- c.label
- from rhnChannel c
- where c.id = channel_id_in
- );
-
- UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
- end if;
-
- DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in;
-
- if deleting_server = 0 then
- queue_server(server_id_in, immediate_in);
- end if;
-
- channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
- IF channel_family_id_val IS NULL
- THEN
- rhn_exception.raise_exception('channel_unsubscribe_no_family');
- END IF;
-
- for ignore in channel_family_is_satellite(channel_family_id_val) loop
- delete from rhnSatelliteInfo where server_id = server_id_in;
- end loop;
-
- for ignore in channel_family_is_proxy(channel_family_id_val) loop
- delete from rhnProxyInfo where server_id = server_id_in;
- end loop;
- SELECT org_id INTO server_org_id_val
- FROM rhnServer
- WHERE id = server_id_in;
-
- if update_family_countsYN = 1 then
- rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
- end if;
- END unsubscribe_server;
-
-
- FUNCTION family_for_channel(channel_id_in IN NUMBER)
- RETURN NUMBER
- IS
- channel_family_id_val NUMBER;
- BEGIN
- SELECT channel_family_id INTO channel_family_id_val
- FROM rhnChannelFamilyMembers
- WHERE channel_id = channel_id_in;
-
- RETURN channel_family_id_val;
- EXCEPTION
- WHEN NO_DATA_FOUND
- THEN
- RETURN NULL;
- END family_for_channel;
-
- FUNCTION available_family_subscriptions(channel_family_id_in IN NUMBER, org_id_in IN NUMBER)
- RETURN NUMBER
- IS
- cfp channel_family_perm_cursor%ROWTYPE;
- current_members_val NUMBER;
- max_members_val NUMBER;
- found NUMBER;
- BEGIN
- IF NOT channel_family_perm_cursor%ISOPEN
- THEN
- OPEN channel_family_perm_cursor(channel_family_id_in, org_id_in);
- END IF;
-
- FETCH channel_family_perm_cursor INTO cfp;
-
- WHILE channel_family_perm_cursor%FOUND
- LOOP
- found := 1;
-
- current_members_val := cfp.current_members;
- max_members_val := cfp.max_members;
-
- FETCH channel_family_perm_cursor INTO cfp;
- END LOOP;
-
- IF channel_family_perm_cursor%ISOPEN
- THEN
- CLOSE channel_family_perm_cursor;
- END IF;
-
- -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it.
- -- either way, there are no available subscriptions
-
- IF found IS NULL
- THEN
- RETURN 0;
- END IF;
-
- -- null max members? in that case, pass it on; NULL means infinite
- IF max_members_val IS NULL
- THEN
- RETURN NULL;
- END IF;
-
- -- otherwise, return the delta
- RETURN max_members_val - current_members_val;
- END available_family_subscriptions;
-
- FUNCTION available_fve_family_subs(channel_family_id_in IN NUMBER, org_id_in IN NUMBER)
- RETURN NUMBER
- IS
- cfp channel_family_perm_cursor%ROWTYPE;
- fve_current_members_val NUMBER;
- fve_max_members_val NUMBER;
- found NUMBER;
-
- BEGIN
- IF NOT channel_family_perm_cursor%ISOPEN THEN
- OPEN channel_family_perm_cursor(channel_family_id_in, org_id_in);
- END IF;
-
- FETCH channel_family_perm_cursor INTO cfp;
-
- WHILE channel_family_perm_cursor%FOUND LOOP
- found := 1;
- fve_current_members_val := cfp.fve_current_members;
- fve_max_members_val := cfp.fve_max_members;
- FETCH channel_family_perm_cursor INTO cfp;
- END LOOP;
-
- IF channel_family_perm_cursor%ISOPEN THEN
- CLOSE channel_family_perm_cursor;
- END IF;
-
- IF found IS NULL THEN
- RETURN 0;
- END IF;
-
- IF fve_max_members_val IS NULL THEN
- RETURN NULL;
- END IF;
-
- RETURN fve_max_members_val - fve_current_members_val;
-
- END available_fve_family_subs;
-
-
- -- *******************************************************************
- -- FUNCTION: channel_family_current_members
- -- Calculates and returns the actual count of systems consuming
- -- physical channel subscriptions.
- -- Called by: update_family_counts
- -- rhn_entitlements.repoll_virt_guest_entitlements
- -- *******************************************************************
- function channel_family_current_members(channel_family_id_in IN NUMBER,
- org_id_in IN NUMBER)
- return number
- is
- current_members_count number := 0;
- begin
- select count(distinct server_id)
- into current_members_count
- from rhnChannelFamilyServerPhysical cfsp
- where cfsp.channel_family_id = channel_family_id_in
- and cfsp.customer_id = org_id_in;
- return current_members_count;
- end;
-
-
- function cfam_curr_fve_members(
- channel_family_id_in IN NUMBER,
- org_id_in IN NUMBER)
- return number
- is
- current_members_count number := 0;
-
- begin
- select count(sc.server_id)
- into current_members_count
- from rhnServerChannel sc,
- rhnChannelFamilyMembers cfm,
- rhnServer s
- where s.org_id = org_id_in
- and s.id = sc.server_id
- and cfm.channel_family_id = channel_family_id_in
- and cfm.channel_id = sc.channel_id
- and exists (
- select 1
- from rhnChannelFamilyServerFve cfsp
- where cfsp.CHANNEL_FAMILY_ID = channel_family_id_in
- and cfsp.server_id = s.id
- );
-
- return current_members_count;
- end;
- PROCEDURE update_family_counts(channel_family_id_in IN NUMBER,
- org_id_in IN NUMBER)
- IS
- BEGIN
- update rhnPrivateChannelFamily
- set current_members = ( channel_family_current_members(channel_family_id_in, org_id_in)),
- fve_current_members = ( cfam_curr_fve_members(channel_family_id_in, org_id_in))
- where org_id = org_id_in
- and channel_family_id = channel_family_id_in;
- END update_family_counts;
-
- PROCEDURE update_group_family_counts(group_label_in IN VARCHAR2,
- org_id_in IN NUMBER)
- IS
- BEGIN
- FOR i IN (
- SELECT DISTINCT CFM.channel_family_id, SG.org_id
- FROM rhnChannelFamilyMembers CFM
- JOIN rhnServerChannel SC
- ON SC.channel_id = CFM.channel_id
- JOIN rhnServerGroupMembers SGM
- ON SC.server_id = SGM.server_id
- JOIN rhnServerGroup SG
- ON SGM.server_group_id = SG.id
- JOIN rhnServerGroupType SGT
- ON SG.group_type = SGT.id
- WHERE SGT.label = group_label_in
- AND SG.org_id = org_id_in
- AND SGT.is_base = 'Y'
- ) LOOP
- rhn_channel.update_family_counts(i.channel_family_id, i.org_id);
- END LOOP;
- END update_group_family_counts;
-
- FUNCTION available_chan_subscriptions(channel_id_in IN NUMBER,
- org_id_in IN NUMBER)
- RETURN NUMBER
- IS
- channel_family_id_val NUMBER;
- BEGIN
- SELECT channel_family_id INTO channel_family_id_val
- FROM rhnChannelFamilyMembers
- WHERE channel_id = channel_id_in;
-
- RETURN rhn_channel.available_family_subscriptions(
- channel_family_id_val, org_id_in);
- END available_chan_subscriptions;
-
- FUNCTION available_fve_chan_subs(channel_id_in IN NUMBER,
- org_id_in IN NUMBER)
- RETURN NUMBER
- IS
- channel_family_id_val NUMBER;
-
- BEGIN
- SELECT channel_family_id INTO channel_family_id_val
- FROM rhnChannelFamilyMembers
- WHERE channel_id = channel_id_in;
-
- RETURN rhn_channel.available_fve_family_subs( channel_family_id_val, org_id_in);
- END available_fve_chan_subs;
-
- procedure unsubscribe_server_from_family(server_id_in in number,
- channel_family_id_in in number)
- is
- begin
- delete
- from rhnServerChannel rsc
- where rsc.server_id = server_id_in
- and channel_id in (
- select rcfm.channel_id
- from rhnChannelFamilyMembers rcfm
- where rcfm.channel_family_id = channel_family_id_in);
- end;
-
- function get_org_id(channel_id_in in number)
- return number
- is
- org_id_out number;
- begin
- select org_id into org_id_out
- from rhnChannel
- where id = channel_id_in;
-
- return org_id_out;
- end get_org_id;
-
- function get_cfam_org_access(cfam_id_in in number, org_id_in in number)
- return number
- is
- cursor families is
- select 1
- from rhnOrgChannelFamilyPermissions cfp
- where cfp.org_id = org_id_in;
- begin
- -- the idea: if we get past this query,
- -- the user has the role, else catch the exception and return 0
- for family in families loop
- return 1;
- end loop;
- return 0;
- end;
-
- function get_org_access(channel_id_in in number, org_id_in in number)
- return number
- is
- throwaway number;
- begin
- -- the idea: if we get past this query,
- -- the org has access to the channel, else catch the exception and return 0
- select distinct 1 into throwaway
- from rhnChannelFamilyMembers CFM,
- rhnOrgChannelFamilyPermissions CFP
- where cfp.org_id = org_id_in
- and CFM.channel_family_id = CFP.channel_family_id
- and CFM.channel_id = channel_id_in
- and (CFP.max_members > 0 or CFP.max_members is null or CFP.fve_max_members > 0 or CFP.fve_max_members is null or CFP.org_id = 1);
-
- return 1;
- exception
- when no_data_found
- then
- return 0;
- end;
-
- -- check if a user has a given role, or if such a role is inferrable
- -- returns NULL if OK, error message otherwise
- function user_role_check_debug(channel_id_in in number,
- user_id_in in number,
- role_in in varchar2)
- return varchar2
- is
- org_id number;
- begin
- org_id := rhn_user.get_org_id(user_id_in);
-
- -- channel might be shared
- if role_in = 'subscribe' and
- rhn_channel.shared_user_role_check(channel_id_in, user_id_in, role_in) = 1 then
- return NULL;
- end if;
-
- if role_in = 'manage' and
- NVL(rhn_channel.get_org_id(channel_id_in), -1) <> org_id then
- return 'channel_not_owned';
- end if;
-
- if role_in = 'subscribe' and
- rhn_channel.get_org_access(channel_id_in, org_id) = 0 then
- return 'channel_not_available';
- end if;
-
- -- channel admins have all roles
- if rhn_user.check_role_implied(user_id_in, 'channel_admin') = 1 then
- return NULL;
- end if;
-
- -- the subscribe permission is inferred
- -- UNLESS the not_globally_subscribable flag is set
- if role_in = 'subscribe'
- then
- if rhn_channel.org_channel_setting(channel_id_in,
- org_id,
- 'not_globally_subscribable') = 0 then
- return NULL;
- end if;
- end if;
-
- -- all other roles (manage right now) are explicitly granted
- if rhn_channel.direct_user_role_check(channel_id_in,
- user_id_in, role_in) = 1 then
- return NULL;
- end if;
- return 'direct_permission';
- end;
-
- -- same as above, but with 1/0 output; useful in views, etc
- function user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2)
- return number
- is
- begin
- if rhn_channel.user_role_check_debug(channel_id_in,
- user_id_in, role_in) is NULL then
- return 1;
- else
- return 0;
- end if;
- end;
-
- --
- -- For multiorg phase II, this function simply checks to see if the user's
- -- has a trust relationship that includes this channel by id.
- --
- function shared_user_role_check(channel_id in number, user_id in number, role in varchar2)
- return number
- is
- n number;
- oid number;
- begin
- oid := rhn_user.get_org_id(user_id);
- select 1 into n
- from rhnSharedChannelView s
- where s.id = channel_id and s.org_trust_id = oid;
- return 1;
- exception
- when no_data_found then
- return 0;
- end;
-
- -- same as above, but returns 1 if user_id_in is null
- -- This is useful in queries where user_id is not specified
- function loose_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2)
- return number
- is
- begin
- if user_id_in is null then
- return 1;
- end if;
- return user_role_check(channel_id_in, user_id_in, role_in);
- end loose_user_role_check;
-
- -- directly checks the table, no inferred permissions
- function direct_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2)
- return number
- is
- throwaway number;
- begin
- -- the idea: if we get past this query, the user has the role, else catch the exception and return 0
- select 1 into throwaway
- from rhnChannelPermissionRole CPR,
- rhnChannelPermission CP
- where CP.user_id = user_id_in
- and CP.channel_id = channel_id_in
- and CPR.label = role_in
- and CP.role_id = CPR.id;
-
- return 1;
- exception
- when no_data_found
- then
- return 0;
- end;
-
- -- check if an org has a certain setting
- function org_channel_setting(channel_id_in in number, org_id_in in number, setting_in in varchar2)
- return number
- is
- throwaway number;
- begin
- -- the idea: if we get past this query, the org has the setting, else catch the exception and return 0
- select 1 into throwaway
- from rhnOrgChannelSettingsType OCST,
- rhnOrgChannelSettings OCS
- where OCS.org_id = org_id_in
- and OCS.channel_id = channel_id_in
- and OCST.label = setting_in
- and OCS.setting_id = OCST.id;
-
- return 1;
- exception
- when no_data_found
- then
- return 0;
- end;
-
- FUNCTION channel_priority(channel_id_in IN number)
- RETURN number
- IS
- channel_name varchar2(256);
- priority number;
- end_of_life_val timestamp with local time zone;
- org_id_val number;
- BEGIN
-
- select name, end_of_life, org_id
- into channel_name, end_of_life_val, org_id_val
- from rhnChannel
- where id = channel_id_in;
-
- if end_of_life_val is not null then
- return -400;
- end if;
-
- if channel_name like 'Red Hat Enterprise Linux%' or channel_name like 'RHEL%' then
- priority := 1000;
- if channel_name not like '%Beta%' then
- priority := priority + 1000;
- end if;
-
- priority := priority +
- case
- when channel_name like '%v. 5%' then 600
- when channel_name like '%v. 4%' then 500
- when channel_name like '%v. 3%' then 400
- when channel_name like '%v. 2%' then 300
- when channel_name like '%v. 1%' then 200
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like 'Red Hat Enterprise Linux (v. 5%' then 60
- when (channel_name like '%AS%' and channel_name not like '%Extras%') then 50
- when (channel_name like '%ES%' and channel_name not like '%Extras%') then 40
- when (channel_name like '%WS%' and channel_name not like '%Extras%') then 30
- when (channel_name like '%Desktop%' and channel_name not like '%Extras%') then 20
- when channel_name like '%Extras%' then 10
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like '%)' then 5
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like '%32-bit x86%' then 4
- when channel_name like '%64-bit Intel Itanium%' then 3
- when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
- else 0
- end;
- elsif channel_name like 'Red Hat Desktop%' then
- priority := 900;
-
- if channel_name not like '%Beta%' then
- priority := priority + 50;
- end if;
-
- priority := priority +
- case
- when channel_name like '%v. 4%' then 40
- when channel_name like '%v. 3%' then 30
- when channel_name like '%v. 2%' then 20
- when channel_name like '%v. 1%' then 10
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like '%32-bit x86%' then 4
- when channel_name like '%64-bit Intel Itanium%' then 3
- when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
- else 0
- end;
-
- elsif org_id_val is not null then
- priority := 600;
- else
- priority := 500;
- end if;
-
- return -priority;
-
- end channel_priority;
-
- -- right now this only does the accounting changes; the cascade
- -- actually does the rhnServerChannel delete.
- procedure delete_server_channels(server_id_in in number)
- is
- begin
- update rhnPrivateChannelFamily
- set current_members = current_members -1
- where org_id in (
- select org_id
- from rhnServer
- where id = server_id_in
- )
- and channel_family_id in (
- select rcfm.channel_family_id
- from rhnChannelFamilyMembers rcfm,
- rhnServerChannel rsc
- where rsc.server_id = server_id_in
- and rsc.channel_id = rcfm.channel_id
- and not exists (
- select 1
- from
- rhnChannelFamilyVirtSubLevel cfvsl,
- rhnSGTypeVirtSubLevel sgtvsl,
- rhnServerEntitlementView sev,
- rhnVirtualInstance vi
- where
- -- system is a virtual instance
- vi.virtual_system_id = server_id_in
- and vi.host_system_id = sev.server_id
- -- system's host has a virt ent
- and sev.label in ('virtualization_host',
- 'virtualization_host_platform')
- and sev.server_group_type_id =
- sgtvsl.server_group_type_id
- -- the host's virt ent grants a cf virt sub level
- and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
- -- the cf is in that virt sub level
- and cfvsl.channel_family_id = rcfm.channel_family_id
- )
- );
- end;
-
- -- this could certainly be optimized to do updates if needs be
- procedure refresh_newest_package(channel_id_in in number,
- caller_in in varchar2 := '(unknown)',
- package_name_id_in in number := null)
- is
- -- procedure refreshes rows for name_id = package_name_id_in or
- -- all rows if package_name_id_in is null
- declare
- channel_lm timestamp with local time zone;
- begin
- select last_modified
- into channel_lm
- from rhnChannel
- where id = channel_id_in
- for update;
-
- delete from rhnChannelNewestPackage
- where channel_id = channel_id_in
- and (package_name_id_in is null
- or name_id = package_name_id_in);
- insert into rhnChannelNewestPackage
- (channel_id, name_id, evr_id, package_id, package_arch_id)
- (select channel_id,
- name_id, evr_id,
- package_id, package_arch_id
- from rhnChannelNewestPackageView
- where channel_id = channel_id_in
- and (package_name_id_in is null
- or name_id = package_name_id_in)
- );
- insert into rhnChannelNewestPackageAudit (channel_id, caller)
- values (channel_id_in, caller_in);
- update rhnChannel
- set last_modified = greatest(current_timestamp, last_modified + interval '1' second)
- where id = channel_id_in;
- end;
-
- procedure update_channel ( channel_id_in in number, invalidate_ss in number := 0,
- date_to_use in timestamp with local time zone := current_timestamp )
- is
-
- channel_last_modified timestamp with local time zone;
- last_modified_value timestamp with local time zone;
-
- cursor snapshots is
- select snapshot_id id
- from rhnSnapshotChannel
- where channel_id = channel_id_in;
-
- begin
-
- select last_modified
- into channel_last_modified
- from rhnChannel
- where id = channel_id_in;
-
- last_modified_value := date_to_use;
-
- if last_modified_value <= channel_last_modified then
- last_modified_value := last_modified_value + 1/86400;
- end if;
-
- update rhnChannel set last_modified = last_modified_value
- where id = channel_id_in;
-
- if invalidate_ss = 1 then
- for snapshot in snapshots loop
- update rhnSnapshot
- set invalid = lookup_snapshot_invalid_reason('channel_modified')
- where id = snapshot.id;
- end loop;
- end if;
-
- end update_channel;
-
- procedure update_channels_by_package ( package_id_in in number, date_to_use in timestamp with local time zone := current_timestamp )
- is
-
- cursor channels is
- select channel_id
- from rhnChannelPackage
- where package_id = package_id_in
- order by channel_id;
-
- begin
- for channel in channels loop
- -- we want to invalidate the snapshot assocated with the channel when we
- -- do this b/c we know we've added or removed or packages
- rhn_channel.update_channel ( channel.channel_id, 1, date_to_use );
- end loop;
- end update_channels_by_package;
-
-
- procedure update_channels_by_errata ( errata_id_in number, date_to_use in timestamp with local time zone := current_timestamp )
- is
-
- cursor channels is
- select channel_id
- from rhnChannelErrata
- where errata_id = errata_id_in
- order by channel_id;
-
- begin
- for channel in channels loop
- -- we won't invalidate snapshots, b/c just changing the errata associated with
- -- a channel shouldn't invalidate snapshots
- rhn_channel.update_channel ( channel.channel_id, 0, date_to_use );
- end loop;
- end update_channels_by_errata;
-
- procedure update_needed_cache(channel_id_in in number)
- is
- -- update of needed cache ican be commited on a per server basis
- -- b/c failure of update for a server means nothing for the other servers
- begin
- -- we intentionaly do a loop here instead of one huge select
- -- b/c we want to break update into smaller transaction to unblock other sessions
- -- querying rhnServerNeededCache
- for server in (
- select sc.server_id as id
- from rhnServerChannel sc
- where sc.channel_id = channel_id_in
- ) loop
- rhn_server.update_needed_cache(server.id);
- commit;
- end loop;
- end update_needed_cache;
-
- procedure set_comps(channel_id_in in number, path_in in varchar2, timestamp_in in varchar2)
- is
- begin
- for row in (
- select relative_filename, last_modified
- from rhnChannelComps
- where channel_id = channel_id_in
- ) loop
- if row.relative_filename = path_in
- and row.last_modified = to_date(timestamp_in, 'YYYYMMDDHH24MISS') then
- return;
- end if;
- end loop;
- delete from rhnChannelComps
- where channel_id = channel_id_in;
- insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
- values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_date(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
- end set_comps;
-
-END rhn_channel;
-/
-SHOW ERRORS
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
deleted file mode 100644
index 3471f21..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
+++ /dev/null
@@ -1,1270 +0,0 @@
--- oracle equivalent source sha1 b89b116bf39a095c05c4ae0f9813fd43f0437132
---
--- Copyright (c) 2008--2013 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.
---
---
---
---
-
--- create schema rhn_channel;
-
---update pg_setting
-update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_path';
-
- create or replace function obtain_read_lock(channel_family_id_in in numeric, org_id_in in numeric)
- returns void as $$
- declare
- read_lock timestamptz;
- begin
- select created into read_lock
- from rhnPrivateChannelFamily
- where channel_family_id = channel_family_id_in and org_id = org_id_in
- for update;
- end$$ language plpgsql;
-
- -- this "emulates" cursor server_base_subscriptions defined in oracle/rhn_channel.pks
- create or replace function server_base_subscriptions(server_id_in NUMERIC)
- returns boolean as $$
- begin
- return exists(SELECT C.id FROM rhnChannel C, rhnServerChannel SC
- WHERE C.id = SC.channel_id
- AND SC.server_id = server_id_in
- AND C.parent_channel IS NULL);
- end$$ language plpgsql;
-
- -- this "emulates" cursor server_base_subscriptions defined in oracle/rhn_channel.pks
- create or replace function check_server_subscription(server_id_in NUMERIC, channel_id_in NUMERIC)
- returns boolean as $$
- begin
- return exists(SELECT channel_id FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in);
- end$$ language plpgsql;
-
-
- CREATE OR REPLACE FUNCTION subscribe_server(server_id_in IN NUMERIC, channel_id_in NUMERIC, immediate_in NUMERIC default 1, user_id_in in numeric default null, recalcfamily_in NUMERIC default 1) returns void
- AS $$
- declare
- channel_parent_val rhnChannel.parent_channel%TYPE;
- parent_subscribed BOOLEAN;
- server_has_base_chan BOOLEAN;
- server_already_in_chan BOOLEAN;
- channel_family_id_val NUMERIC;
- server_org_id_val NUMERIC;
- available_subscriptions NUMERIC;
- available_fve_subs numeric;
- consenting_user NUMERIC;
- allowed numeric;
- is_fve_char char(1) := 'N';
- BEGIN
- if user_id_in is not null then
- allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
- else
- allowed := 1;
- end if;
-
- if allowed = 0 then
- perform rhn_exception.raise_exception('no_subscribe_permissions');
- end if;
-
-
- SELECT parent_channel INTO channel_parent_val FROM rhnChannel WHERE id = channel_id_in;
-
- IF channel_parent_val IS NOT NULL
- THEN
- -- child channel; if attempting to cross-subscribe a child to the wrong base, silently ignore
- parent_subscribed := rhn_channel.check_server_subscription(server_id_in, channel_parent_val);
-
- IF NOT parent_subscribed
- THEN
- RETURN;
- END IF;
- ELSE
- -- base channel
- server_has_base_chan := rhn_channel.server_base_subscriptions(server_id_in);
-
- IF server_has_base_chan
- THEN
- perform rhn_exception.raise_exception('channel_server_one_base');
- END IF;
- END IF;
-
- server_already_in_chan := rhn_channel.check_server_subscription(server_id_in, channel_id_in);
-
- IF server_already_in_chan
- THEN
- RETURN;
- END IF;
-
- channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
- IF channel_family_id_val IS NULL
- THEN
- perform rhn_exception.raise_exception('channel_subscribe_no_family');
- END IF;
-
- --
- -- Use the org_id of the server only if the org_id of the channel = NULL.
- -- This is required for subscribing to shared channels.
- --
- SELECT COALESCE(org_id, (SELECT org_id FROM rhnServer WHERE id = server_id_in))
- INTO server_org_id_val
- FROM rhnChannel
- WHERE id = channel_id_in;
-
- begin
- perform rhn_channel.obtain_read_lock(channel_family_id_val, server_org_id_val);
- exception
- when no_data_found then
- perform rhn_exception.raise_exception('channel_family_no_subscriptions');
- end;
-
- available_subscriptions := rhn_channel.available_family_subscriptions(channel_family_id_val, server_org_id_val);
- available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
-
- IF available_subscriptions IS NULL OR
- available_subscriptions > 0 or
- rhn_channel.can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 1 OR
- (available_fve_subs > 0 AND rhn_channel.can_server_consume_fve(server_id_in) = 1)
- THEN
- if rhn_channel.can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 0 AND available_fve_subs > 0 AND rhn_channel.can_server_consume_fve(server_id_in) = 1 THEN
- is_fve_char := 'Y';
- end if;
-
- insert into rhnServerHistory (id,server_id,summary,details) (
- select nextval('rhn_event_id_seq'),
- server_id_in,
- 'subscribed to channel ' || SUBSTR(c.label, 0, 106),
- c.label
- from rhnChannel c
- where c.id = channel_id_in
- );
- UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
- INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char);
- IF recalcfamily_in > 0
- THEN
- perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
- END IF;
- perform queue_server(server_id_in, immediate_in);
- ELSE
- perform rhn_exception.raise_exception('channel_family_no_subscriptions');
- END IF;
-
- END$$ language plpgsql;
-
-
-
- create or replace function can_convert_to_fve(server_id_in IN NUMERIC, channel_family_id_val IN NUMERIC)
- RETURNS NUMERIC
- as $$
- declare
- fve_convertible_entries cursor for
- select 1 from
- rhnServerFveCapable cap
- where cap.server_id = server_id_in
- AND cap.channel_family_id = channel_family_id_val;
- BEGIN
- FOR entry IN fve_convertible_entries LOOP
- return 1;
- END LOOP;
- RETURN 0;
- END$$ language plpgsql;
-
-
-
- -- Converts server channel_family to use a flex entitlement
- create or replace function convert_to_fve(server_id_in IN NUMERIC, channel_family_id_val IN NUMERIC)
- returns void
- as $$
- declare
- available_fve_subs NUMERIC;
- server_org_id_val NUMERIC;
- BEGIN
-
- --
- -- Use the org_id of the server only if the org_id of the channel = NULL.
- -- This is required for subscribing to shared channels.
- --
- SELECT org_id
- INTO server_org_id_val
- FROM rhnServer
- WHERE id = server_id_in;
-
-
- perform rhn_channel.obtain_read_lock(channel_family_id_val, server_org_id_val);
- if not found then
- perform rhn_exception.raise_exception('channel_family_no_subscriptions');
- end if;
- IF (rhn_channel.can_convert_to_fve(server_id_in, channel_family_id_val ) = 0)
- THEN
- perform rhn_exception.raise_exception('server_cannot_convert_to_flex');
- END IF;
-
- available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
-
- IF (available_fve_subs > 0)
- THEN
-
- insert into rhnServerHistory (id,server_id,summary,details) (
- select nextval('rhn_event_id_seq'),
- server_id_in,
- 'converted to flex entitlement' || SUBSTR(cf.label, 0, 99),
- cf.label
- from rhnChannelFamily cf
- where cf.id = channel_family_id_val
- );
-
- UPDATE rhnServerChannel sc set is_fve = 'Y'
- where sc.server_id = server_id_in and
- sc.channel_id in
- (select cfm.channel_id from rhnChannelFamilyMembers cfm
- where cfm.CHANNEL_FAMILY_ID = channel_family_id_val);
-
- perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
- ELSE
- perform rhn_exception.raise_exception('not_enough_flex_entitlements');
- END IF;
-
- END$$ language plpgsql;
-
- create or replace function can_server_consume_virt_channl(
- server_id_in in numeric,
- family_id_in in numeric )
- returns numeric
- as $$
- begin
- if exists(
- select 1
- from
- rhnChannelFamilyVirtSubLevel cfvsl,
- rhnSGTypeVirtSubLevel sgtvsl,
- rhnVirtualInstance vi
- where
- vi.virtual_system_id = server_id_in
- and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
- and cfvsl.channel_family_id = family_id_in
- and exists (
- select 1
- from rhnServerEntitlementView sev
- where vi.host_system_id = sev.server_id
- and sev.server_group_type_id = sgtvsl.server_group_type_id ))
- then
- return 1;
- else
- return 0;
- end if;
- end$$ language plpgsql;
-
- create or replace function can_server_consume_fve(server_id_in in numeric) returns numeric
- as $$
- declare
- vi_entries cursor for
- SELECT 1
- FROM rhnVirtualInstance vi
- WHERE vi.virtual_system_id = server_id_in;
- vi_count numeric;
-
- begin
- FOR vi_entry IN VI_ENTRIES LOOP
- return 1;
- END LOOP;
- RETURN 0;
- end$$ language plpgsql;
-
- create or replace function guess_server_base(
- server_id_in in numeric
- ) RETURNS numeric as $$
- declare
- server_cursor cursor for
- select s.server_arch_id, s.release, s.org_id
- from rhnServer s
- where s.id = server_id_in;
- -- Cursor that fetches all the possible base channels for a
- -- (server_arch_id, release, org_id) combination
- base_channel_cursor cursor(
- release_in varchar,
- server_arch_id_in numeric,
- org_id_in numeric
- ) for
- select distinct c.*
- from rhnOrgDistChannelMap odcm,
- rhnServerChannelArchCompat scac,
- rhnChannel c
- where c.parent_channel is null
- and c.id = odcm.channel_id
- and c.channel_arch_id = odcm.channel_arch_id
- and odcm.release = release_in
- and odcm.for_org_id = org_id_in
- and scac.server_arch_id = server_arch_id_in
- and scac.channel_arch_id = c.channel_arch_id;
-
- begin
- for s in server_cursor loop
- for channel in base_channel_cursor(s.release,
- s.server_arch_id, s.org_id)
- loop
- return channel.id;
- end loop;
- end loop;
- -- Server not found, or no base channel applies to it
- return null;
- end$$ language plpgsql;
-
- -- Private function
- create or replace function normalize_server_arch(server_arch_in in varchar)
- returns varchar
- as $$
- declare
- suffix VARCHAR(128) := '-redhat-linux';
- begin
- if server_arch_in is NULL then
- return NULL;
- end if;
- if position('-' IN server_arch_in) > 0
- then
- -- Suffix already present
- return server_arch_in;
- end if;
- return server_arch_in || suffix;
- end$$ language plpgsql;
-
- --
- -- Raises:
- -- server_arch_not_found
- -- no_subscribe_permissions
- create or replace function base_channel_for_release_arch(
- release_in in varchar,
- server_arch_in in varchar,
- org_id_in in numeric default -1,
- user_id_in in numeric default null
- ) returns numeric as $$
- declare
- server_arch varchar(256) := rhn_channel.normalize_server_arch(server_arch_in);
- server_arch_id numeric;
- begin
- -- Look up the server arch
- select id
- into server_arch_id
- from rhnServerArch
- where label = server_arch;
- if not found then
- perform rhn_exception.raise_exception('server_arch_not_found');
- end if;
-
- return rhn_channel.base_channel_rel_archid(release_in, server_arch_id,
- org_id_in, user_id_in);
- end$$ language plpgsql;
-
- create or replace function base_channel_rel_archid(
- release_in in varchar,
- server_arch_id_in in numeric,
- org_id_in in numeric default -1,
- user_id_in in numeric default null
- ) returns numeric as $$
- declare
- denied_channel_id numeric := null;
- valid_org_id numeric := org_id_in;
- valid_user_id numeric := user_id_in;
- channel_subscribable numeric;
- -- Cursor that fetches all the possible base channels for a
- -- (server_arch_id, release, org_id) combination
- base_channel_cursor cursor(
- release_in varchar,
- server_arch_id_in numeric,
- org_id_in numeric
- ) for
- select distinct c.*
- from rhnOrgDistChannelMap odcm,
- rhnServerChannelArchCompat scac,
- rhnChannel c
- where c.parent_channel is null
- and c.id = odcm.channel_id
- and c.channel_arch_id = odcm.channel_arch_id
- and odcm.release = release_in
- and odcm.for_org_id = org_id_in
- and scac.server_arch_id = server_arch_id_in
- and scac.channel_arch_id = c.channel_arch_id;
-
- begin
- if org_id_in = -1 and user_id_in is not null then
- -- Get the org id from the user id
-
- select org_id
- into valid_org_id
- from web_contact
- where id = user_id_in;
-
- if not found then
- -- User doesn't exist
- -- XXX Only list public stuff for now
- valid_user_id := null;
- valid_org_id := -1;
- end if;
- end if;
-
- for c in base_channel_cursor(release_in, server_arch_id_in, valid_org_id)
- loop
- -- This row is a possible match
- if valid_user_id is null then
- -- User ID not specified, so no user to channel permissions to
- -- check
- return c.id;
- end if;
-
- -- Check user to channel permissions
- select rhn_channel.loose_user_role_check(c.id, user_id_in, 'subscribe')
- into channel_subscribable;
-
- if channel_subscribable = 1 then
- return c.id;
- end if;
-
- -- Base channel exists, but is not subscribable; keep trying
- denied_channel_id := c.id;
- end loop;
-
- if denied_channel_id is not null then
- perform rhn_exception.raise_exception('no_subscribe_permissions');
- end if;
- -- No base channel applies
- return NULL;
- end$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION clear_subscriptions(server_id_in IN NUMERIC, deleting_server IN NUMERIC default 0,
- update_family_countsYN IN NUMERIC default 1 ) returns void
- AS $$
- declare
- server_channels cursor(server_id_in numeric) for
- select s.org_id, sc.channel_id, cfm.channel_family_id
- from rhnServer s,
- rhnServerChannel sc,
- rhnChannelFamilyMembers cfm
- where s.id = server_id_in
- and s.id = sc.server_id
- and sc.channel_id = cfm.channel_id
- order by cfm.channel_family_id;
- last_channel_family_id rhnChannelFamilyMembers.channel_family_id%type := -1;
- last_channel_org_id rhnServer.org_id%type := -1;
- BEGIN
- for channel in server_channels(server_id_in)
- loop
- perform rhn_channel.unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server, 0);
- if update_family_countsYN > 0
- and channel.channel_family_id != last_channel_family_id then
- -- update family counts only once
- -- after all channels with same family has been fetched
- if last_channel_family_id != -1 then
- perform rhn_channel.update_family_counts(channel.channel_family_id, channel.org_id);
- end if;
- last_channel_family_id := channel.channel_family_id;
- last_channel_org_id := channel.org_id;
- end if;
- end loop;
- if update_family_countsYN > 0 and last_channel_family_id != -1 then
- -- update the last family fetched
- perform rhn_channel.update_family_counts(last_channel_family_id, last_channel_org_id);
- end if;
- END$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION unsubscribe_server(server_id_in IN NUMERIC, channel_id_in NUMERIC, immediate_in NUMERIC default 1, unsubscribe_children_in numeric default 0,
- deleting_server in numeric default 0,
- update_family_countsYN in numeric default 1) returns void
- AS $$
- declare
- channel_family_id_val NUMERIC;
- server_org_id_val NUMERIC;
- available_subscriptions NUMERIC;
- server_already_in_chan BOOLEAN;
- channel_family_is_proxy cursor(channel_family_id_in numeric) for
- select 1
- from rhnChannelFamily
- where id = channel_family_id_in
- and label = 'rhn-proxy';
- channel_family_is_satellite cursor(channel_family_id_in numeric) for
- select 1
- from rhnChannelFamily
- where id = channel_family_id_in
- and label = 'rhn-satellite';
- child record;
- BEGIN
- -- In PostgreSQL recursion with opened cursors is not allowed so we use
- -- FOR IN SELECT form which is ok.
- FOR child IN select c.id
- from rhnChannel c,
- rhnServerChannel sc
- where 1=1
- and c.parent_channel = channel_id_in
- and c.id = sc.channel_id
- and sc.server_id = server_id_in
- LOOP
- if unsubscribe_children_in = 1 then
- perform rhn_channel.unsubscribe_server(server_id_in,
- child.id,
- immediate_in,
- unsubscribe_children_in,
- deleting_server,
- update_family_countsYN);
- else
- perform rhn_exception.raise_exception('channel_unsubscribe_child_exists');
- end if;
- END LOOP;
-
- server_already_in_chan := rhn_channel.check_server_subscription(server_id_in, channel_id_in);
-
- IF NOT server_already_in_chan
- THEN
- RETURN;
- END IF;
-
- if deleting_server = 0 then
-
- insert into rhnServerHistory (id,server_id,summary,details) (
- select nextval('rhn_event_id_seq'),
- server_id_in,
- 'unsubscribed from channel ' || SUBSTR(c.label, 0, 106),
- c.label
- from rhnChannel c
- where c.id = channel_id_in
- );
-
- UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
- end if;
-
- DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in;
-
- if deleting_server = 0 then
- perform queue_server(server_id_in, immediate_in);
- end if;
-
- channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
- IF channel_family_id_val IS NULL
- THEN
- perform rhn_exception.raise_exception('channel_unsubscribe_no_family');
- END IF;
-
- for ignore in channel_family_is_satellite(channel_family_id_val) loop
- delete from rhnSatelliteInfo where server_id = server_id_in;
- end loop;
-
- for ignore in channel_family_is_proxy(channel_family_id_val) loop
- delete from rhnProxyInfo where server_id = server_id_in;
- end loop;
- SELECT org_id INTO server_org_id_val
- FROM rhnServer
- WHERE id = server_id_in;
-
- if update_family_countsYN = 1 then
- perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
- end if;
- END$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION family_for_channel(channel_id_in IN NUMERIC)
- RETURNS NUMERIC
- AS $$
- declare
- channel_family_id_val NUMERIC;
- BEGIN
- SELECT channel_family_id INTO channel_family_id_val
- FROM rhnChannelFamilyMembers
- WHERE channel_id = channel_id_in;
-
- IF NOT FOUND THEN
- RETURN NULL;
- END IF;
-
- RETURN channel_family_id_val;
- END$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION available_family_subscriptions(channel_family_id_in IN NUMERIC, org_id_in IN NUMERIC)
- RETURNS NUMERIC
- AS $$
- declare
- cfp record;
- current_members_val NUMERIC;
- max_members_val NUMERIC;
- found NUMERIC;
- BEGIN
- for cfp in SELECT * FROM rhnOrgChannelFamilyPermissions
- WHERE channel_family_id = channel_family_id_in
- AND org_id = org_id_in
- LOOP
- found := 1;
- current_members_val := cfp.current_members;
- max_members_val := cfp.max_members;
- END LOOP;
-
- -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it.
- -- either way, there are no available subscriptions
-
- IF found IS NULL
- THEN
- RETURN 0;
- END IF;
-
- -- null max members? in that case, pass it on; NULL means infinite
- IF max_members_val IS NULL
- THEN
- RETURN NULL;
- END IF;
-
- -- otherwise, return the delta
- RETURN max_members_val - current_members_val;
- END$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION available_fve_family_subs(channel_family_id_in IN NUMERIC, org_id_in IN NUMERIC)
- RETURNS NUMERIC
- AS $$
- declare
- cfp record;
- fve_current_members_val NUMERIC;
- fve_max_members_val NUMERIC;
- found NUMERIC;
- BEGIN
- for cfp in SELECT * FROM rhnOrgChannelFamilyPermissions
- WHERE channel_family_id = channel_family_id_in
- AND org_id = org_id_in
- LOOP
- found := 1;
- fve_current_members_val := cfp.fve_current_members;
- fve_max_members_val := cfp.fve_max_members;
- END LOOP;
-
- -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it.
- -- either way, there are no available subscriptions
-
- IF found IS NULL
- THEN
- RETURN 0;
- END IF;
-
- -- null max members? in that case, pass it on; NULL means infinite
- IF fve_max_members_val IS NULL
- THEN
- RETURN NULL;
- END IF;
-
- -- otherwise, return the delta
- RETURN fve_max_members_val - fve_current_members_val;
- END$$ language plpgsql;
-
- -- *******************************************************************
- -- FUNCTION: channel_family_current_members
- -- Calculates and returns the actual count of systems consuming
- -- physical channel subscriptions.
- -- Called by: update_family_counts
- -- rhn_entitlements.repoll_virt_guest_entitlements
- -- *******************************************************************
- create or replace function channel_family_current_members(channel_family_id_in IN NUMERIC,
- org_id_in IN NUMERIC)
- returns numeric
- as $$
- declare
- current_members_count numeric := 0;
- begin
- select count(distinct server_id)
- into current_members_count
- from rhnChannelFamilyServerPhysical cfsp
- where cfsp.channel_family_id = channel_family_id_in
- and cfsp.customer_id = org_id_in;
- return current_members_count;
- end$$ language plpgsql;
-
-
- create or replace function cfam_curr_fve_members(
- channel_family_id_in IN NUMERIC,
- org_id_in IN NUMERIC)
- returns numeric
- as $$
- declare
- current_members_count numeric := 0;
-
- begin
- select count(sc.server_id)
- into current_members_count
- from rhnServerChannel sc,
- rhnChannelFamilyMembers cfm,
- rhnServer s
- where s.org_id = org_id_in
- and s.id = sc.server_id
- and cfm.channel_family_id = channel_family_id_in
- and cfm.channel_id = sc.channel_id
- and exists (
- select 1
- from rhnChannelFamilyServerFve cfsp
- where cfsp.CHANNEL_FAMILY_ID = channel_family_id_in
- and cfsp.server_id = s.id
- );
-
- return current_members_count;
- end$$ language plpgsql;
- CREATE OR REPLACE FUNCTION update_family_counts(channel_family_id_in IN NUMERIC,
- org_id_in IN NUMERIC) returns void
- AS $$
- BEGIN
- update rhnPrivateChannelFamily
- set current_members = rhn_channel.channel_family_current_members(channel_family_id_in, org_id_in),
- fve_current_members = rhn_channel.cfam_curr_fve_members(channel_family_id_in,org_id_in)
- where org_id = org_id_in
- and channel_family_id = channel_family_id_in;
- END$$ language plpgsql;
-
- create or replace function update_group_family_counts(group_label_in IN VARCHAR,
- org_id_in IN NUMERIC)
- returns void
- as $$
- declare
- i record;
- BEGIN
- FOR i IN (
- SELECT DISTINCT CFM.channel_family_id, SG.org_id
- FROM rhnChannelFamilyMembers CFM
- JOIN rhnServerChannel SC
- ON SC.channel_id = CFM.channel_id
- JOIN rhnServerGroupMembers SGM
- ON SC.server_id = SGM.server_id
- JOIN rhnServerGroup SG
- ON SGM.server_group_id = SG.id
- JOIN rhnServerGroupType SGT
- ON SG.group_type = SGT.id
- WHERE SGT.label = group_label_in
- AND SG.org_id = org_id_in
- AND SGT.is_base = 'Y'
- ) LOOP
- perform rhn_channel.update_family_counts(i.channel_family_id, i.org_id);
- END LOOP;
- END$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION available_chan_subscriptions(channel_id_in IN NUMERIC,
- org_id_in IN NUMERIC)
- RETURNS NUMERIC
- AS $$
- declare
- channel_family_id_val NUMERIC;
- BEGIN
- SELECT channel_family_id INTO STRICT channel_family_id_val
- FROM rhnChannelFamilyMembers
- WHERE channel_id = channel_id_in;
-
- RETURN rhn_channel.available_family_subscriptions(
- channel_family_id_val, org_id_in);
- END$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION available_fve_chan_subs(channel_id_in IN NUMERIC,
- org_id_in IN NUMERIC)
- RETURNS NUMERIC
- AS $$
- declare
- channel_family_id_val NUMERIC;
- BEGIN
- SELECT channel_family_id INTO STRICT channel_family_id_val
- FROM rhnChannelFamilyMembers
- WHERE channel_id = channel_id_in;
-
- RETURN rhn_channel.available_fve_family_subs(
- channel_family_id_val, org_id_in);
- END$$ language plpgsql;
-
- create or replace function unsubscribe_server_from_family(server_id_in in numeric,
- channel_family_id_in in numeric)
- returns void
- as $$
- begin
- delete
- from rhnServerChannel rsc
- where rsc.server_id = server_id_in
- and channel_id in (
- select rcfm.channel_id
- from rhnChannelFamilyMembers rcfm
- where rcfm.channel_family_id = channel_family_id_in);
- end$$ language plpgsql;
-
- create or replace function get_org_id(channel_id_in in numeric)
- returns numeric
- as $$
- declare
- org_id_out numeric;
- begin
- select org_id into strict org_id_out
- from rhnChannel
- where id = channel_id_in;
-
- return org_id_out;
- end$$ language plpgsql;
-
- create or replace function get_cfam_org_access(cfam_id_in in numeric, org_id_in in numeric)
- returns numeric
- as $$
- begin
- if exists(
- select 1
- from rhnOrgChannelFamilyPermissions cfp
- where cfp.org_id = org_id_in
- ) then
- return 1;
- else
- return 0;
- end if;
- end$$ language plpgsql;
-
- create or replace function get_org_access(channel_id_in in numeric, org_id_in in numeric)
- returns integer
- as $$
- begin
- -- the idea: if we get past this query,
- -- the org has access to the channel, else not
- if exists(
- select 1
- from rhnChannelFamilyMembers CFM,
- rhnOrgChannelFamilyPermissions CFP
- where cfp.org_id = org_id_in
- and CFM.channel_family_id = CFP.channel_family_id
- and CFM.channel_id = channel_id_in
- and (CFP.max_members > 0 or CFP.max_members is null or CFP.fve_max_members > 0 or CFP.fve_max_members is null or CFP.org_id = 1) )
- then
- return 1;
- else
- return 0;
- end if;
- end$$ language plpgsql;
-
- -- check if a user has a given role, or if such a role is inferrable
- -- returns NULL if OK, error message otherwise
- create or replace function user_role_check_debug(channel_id_in in numeric,
- user_id_in in numeric,
- role_in in varchar)
- returns varchar
- as $$
- declare
- org_id numeric;
- begin
- org_id := rhn_user.get_org_id(user_id_in);
-
- -- channel might be shared
- if role_in = 'subscribe' and
- rhn_channel.shared_user_role_check(channel_id_in, user_id_in, role_in) = 1 then
- return NULL;
- end if;
-
- if role_in = 'manage' and
- COALESCE(rhn_channel.get_org_id(channel_id_in), -1) <> org_id then
- return 'channel_not_owned';
- end if;
-
- if role_in = 'subscribe' and
- rhn_channel.get_org_access(channel_id_in, org_id) = 0 then
- return 'channel_not_available';
- end if;
-
- -- channel admins have all roles
- if rhn_user.check_role_implied(user_id_in, 'channel_admin') = 1 then
- return NULL;
- end if;
-
- -- the subscribe permission is inferred
- -- UNLESS the not_globally_subscribable flag is set
- if role_in = 'subscribe'
- then
- if rhn_channel.org_channel_setting(channel_id_in,
- org_id,
- 'not_globally_subscribable') = 0 then
- return NULL;
- end if;
- end if;
-
- -- all other roles (manage right now) are explicitly granted
- if rhn_channel.direct_user_role_check(channel_id_in,
- user_id_in, role_in) = 1 then
- return NULL;
- end if;
- return 'direct_permission';
- end$$ language plpgsql;
-
- -- same as above, but with 1/0 output; useful in views, etc
- create or replace function user_role_check(channel_id_in in numeric, user_id_in in numeric, role_in in varchar)
- returns numeric
- as $$
- begin
- if rhn_channel.user_role_check_debug(channel_id_in,
- user_id_in, role_in) is NULL then
- return 1;
- else
- return 0;
- end if;
- end$$ language plpgsql;
-
- --
- -- For multiorg phase II, this function simply checks to see if the user's
- -- has a trust relationship that includes this channel by id.
- --
- create or replace function shared_user_role_check(channel_id in numeric, user_id in numeric, role in varchar)
- returns numeric
- as $$
- declare
- n numeric;
- oid numeric;
- begin
- oid := rhn_user.get_org_id(user_id);
- select 1 into n
- from rhnSharedChannelView s
- where s.id = channel_id and s.org_trust_id = oid;
-
- if not found then
- return 0;
- end if;
-
- return 1;
- end$$ language plpgsql;
-
- -- same as above, but returns 1 if user_id_in is null
- -- This is useful in queries where user_id is not specified
- create or replace function loose_user_role_check(channel_id_in in numeric, user_id_in in numeric, role_in in varchar)
- returns numeric
- as $$
- begin
- if user_id_in is null then
- return 1;
- end if;
- return rhn_channel.user_role_check(channel_id_in, user_id_in, role_in);
- end$$ language plpgsql;
-
- -- directly checks the table, no inferred permissions
- create or replace function direct_user_role_check(channel_id_in in numeric, user_id_in in numeric, role_in in varchar)
- returns numeric
- as $$
- declare
- throwaway numeric;
- begin
- -- the idea: if we get past this query, the user has the role, else no
- select 1 into throwaway
- from rhnChannelPermissionRole CPR,
- rhnChannelPermission CP
- where CP.user_id = user_id_in
- and CP.channel_id = channel_id_in
- and CPR.label = role_in
- and CP.role_id = CPR.id;
-
- if not found then
- return 0;
- end if;
-
- return 1;
- end$$ language plpgsql;
-
- -- check if an org has a certain setting
- create or replace function org_channel_setting(channel_id_in in numeric, org_id_in in numeric, setting_in in varchar)
- returns numeric
- as $$
- declare
- throwaway numeric;
- begin
- -- the idea: if we get past this query, the org has the setting
- select 1 into throwaway
- from rhnOrgChannelSettingsType OCST,
- rhnOrgChannelSettings OCS
- where OCS.org_id = org_id_in
- and OCS.channel_id = channel_id_in
- and OCST.label = setting_in
- and OCS.setting_id = OCST.id;
-
- if not found then
- return 0;
- end if;
-
- return 1;
- end$$ language plpgsql;
-
- CREATE OR REPLACE FUNCTION channel_priority(channel_id_in IN numeric)
- RETURNS numeric
- AS $$
- declare
- channel_name varchar(256);
- priority numeric;
- end_of_life_val timestamptz;
- org_id_val numeric;
- BEGIN
-
- select name, end_of_life, org_id
- into channel_name, end_of_life_val, org_id_val
- from rhnChannel
- where id = channel_id_in;
-
- if end_of_life_val is not null then
- return -400;
- end if;
-
- if channel_name like 'Red Hat Enterprise Linux%' or channel_name like 'RHEL%' then
- priority := 1000;
- if channel_name not like '%Beta%' then
- priority := priority + 1000;
- end if;
-
- priority := priority +
- case
- when channel_name like '%v. 5%' then 600
- when channel_name like '%v. 4%' then 500
- when channel_name like '%v. 3%' then 400
- when channel_name like '%v. 2%' then 300
- when channel_name like '%v. 1%' then 200
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like 'Red Hat Enterprise Linux (v. 5%' then 60
- when (channel_name like '%AS%' and channel_name not like '%Extras%') then 50
- when (channel_name like '%ES%' and channel_name not like '%Extras%') then 40
- when (channel_name like '%WS%' and channel_name not like '%Extras%') then 30
- when (channel_name like '%Desktop%' and channel_name not like '%Extras%') then 20
- when channel_name like '%Extras%' then 10
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like '%)' then 5
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like '%32-bit x86%' then 4
- when channel_name like '%64-bit Intel Itanium%' then 3
- when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
- else 0
- end;
- elsif channel_name like 'Red Hat Desktop%' then
- priority := 900;
-
- if channel_name not like '%Beta%' then
- priority := priority + 50;
- end if;
-
- priority := priority +
- case
- when channel_name like '%v. 4%' then 40
- when channel_name like '%v. 3%' then 30
- when channel_name like '%v. 2%' then 20
- when channel_name like '%v. 1%' then 10
- else 0
- end;
-
- priority := priority +
- case
- when channel_name like '%32-bit x86%' then 4
- when channel_name like '%64-bit Intel Itanium%' then 3
- when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
- else 0
- end;
-
- elsif org_id_val is not null then
- priority := 600;
- else
- priority := 500;
- end if;
-
- return -priority;
-
- end$$ language plpgsql;
-
- -- right now this only does the accounting changes; the cascade
- -- actually does the rhnServerChannel delete.
- create or replace function delete_server_channels(server_id_in in numeric) returns void
- as $$
- begin
- update rhnPrivateChannelFamily
- set current_members = current_members -1
- where org_id in (
- select org_id
- from rhnServer
- where id = server_id_in
- )
- and channel_family_id in (
- select rcfm.channel_family_id
- from rhnChannelFamilyMembers rcfm,
- rhnServerChannel rsc
- where rsc.server_id = server_id_in
- and rsc.channel_id = rcfm.channel_id
- and not exists (
- select 1
- from
- rhnChannelFamilyVirtSubLevel cfvsl,
- rhnSGTypeVirtSubLevel sgtvsl,
- rhnServerEntitlementView sev,
- rhnVirtualInstance vi
- where
- -- system is a virtual instance
- vi.virtual_system_id = server_id_in
- and vi.host_system_id = sev.server_id
- -- system's host has a virt ent
- and sev.label in ('virtualization_host',
- 'virtualization_host_platform')
- and sev.server_group_type_id =
- sgtvsl.server_group_type_id
- -- the host's virt ent grants a cf virt sub level
- and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
- -- the cf is in that virt sub level
- and cfvsl.channel_family_id = rcfm.channel_family_id
- )
- );
- end$$ language plpgsql;
-
- -- this could certainly be optimized to do updates if needs be
- create or replace function refresh_newest_package(channel_id_in in numeric,
- caller_in in varchar default '(unknown)',
- package_name_id_in in numeric default null)
- returns void
- as $$
- -- procedure refreshes rows for name_id = package_name_id_in or
- -- all rows if package_name_id_in is null
- declare
- channel_lm timestamptz;
- begin
- select last_modified
- into channel_lm
- from rhnChannel
- where id = channel_id_in
- for update;
-
- delete from rhnChannelNewestPackage
- where channel_id = channel_id_in
- and (package_name_id_in is null
- or name_id = package_name_id_in);
- insert into rhnChannelNewestPackage
- (channel_id, name_id, evr_id, package_id, package_arch_id)
- (select channel_id,
- name_id, evr_id,
- package_id, package_arch_id
- from rhnChannelNewestPackageView
- where channel_id = channel_id_in
- and (package_name_id_in is null
- or name_id = package_name_id_in)
- );
- insert into rhnChannelNewestPackageAudit (channel_id, caller)
- values (channel_id_in, caller_in);
- update rhnChannel
- set last_modified = greatest(current_timestamp,
- last_modified + interval '1 second')
- where id = channel_id_in;
- end$$ language plpgsql;
-
- create or replace function update_channel ( channel_id_in in numeric, invalidate_ss in numeric default 0,
- date_to_use in timestamptz default current_timestamp ) returns void
- as $$
- declare
- channel_last_modified timestamptz;
- last_modified_value timestamptz;
-
- snapshots cursor for
- select snapshot_id id
- from rhnSnapshotChannel
- where channel_id = channel_id_in;
-
- begin
-
- select last_modified
- into channel_last_modified
- from rhnChannel
- where id = channel_id_in;
-
- last_modified_value := date_to_use;
-
- if last_modified_value <= channel_last_modified then
- last_modified_value := last_modified_value + interval '1 second';
- end if;
-
- update rhnChannel set last_modified = last_modified_value
- where id = channel_id_in;
-
- if invalidate_ss = 1 then
- for snapshot in snapshots loop
- update rhnSnapshot
- set invalid = lookup_snapshot_invalid_reason('channel_modified')
- where id = snapshot.id;
- end loop;
- end if;
-
- end$$ language plpgsql;
-
- create or replace function update_channels_by_package ( package_id_in in numeric, date_to_use in timestamptz default current_timestamp ) returns void
- as $$
- declare
- channels cursor for
- select channel_id
- from rhnChannelPackage
- where package_id = package_id_in
- order by channel_id;
-
- begin
- for channel in channels loop
- -- we want to invalidate the snapshot assocated with the channel when we
- -- do this b/c we know we've added or removed or packages
- perform rhn_channel.update_channel ( channel.channel_id, 1, date_to_use );
- end loop;
- end$$ language plpgsql;
-
-
- create or replace function update_channels_by_errata ( errata_id_in numeric, date_to_use in timestamptz default current_timestamp ) returns void
- as $$
- declare
- channels cursor for
- select channel_id
- from rhnChannelErrata
- where errata_id = errata_id_in
- order by channel_id;
-
- begin
- for channel in channels loop
- -- we won't invalidate snapshots, b/c just changing the errata associated with
- -- a channel shouldn't invalidate snapshots
- perform rhn_channel.update_channel ( channel.channel_id, 0, date_to_use );
- end loop;
- end$$ language plpgsql;
-
- create or replace function update_needed_cache(channel_id_in in numeric) returns void
- as $$
- declare
- server record;
- begin
- -- we intentionaly do a loop here instead of one huge select
- -- b/c we want to break update into smaller transaction to unblock other sessions
- -- querying rhnServerNeededCache
- for server in (
- select sc.server_id as id
- from rhnServerChannel sc
- where sc.channel_id = channel_id_in
- ) loop
- perform rhn_server.update_needed_cache(server.id);
- end loop;
- end$$ language plpgsql;
-
- create or replace function set_comps(channel_id_in in numeric, path_in in varchar, timestamp_in in varchar) returns void
- as $$
- declare
- row record;
- begin
- for row in (
- select relative_filename, last_modified
- from rhnChannelComps
- where channel_id = channel_id_in
- ) loop
- if row.relative_filename = path_in
- and row.last_modified = to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS') then
- return;
- end if;
- end loop;
- delete from rhnChannelComps
- where channel_id = channel_id_in;
- insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
- values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
- end$$ language plpgsql;
-
--- restore the original setting
-update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_channel')+1) ) where name = 'search_path';
commit ab519082232175cba498721360298ddd80e458ab
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 11:37:14 2014 +0100
Revert "'is' followed by 'declare' is rarely needed"
This reverts commit 27b39e4923be5d9a865f891ced55e80f48f17e3e.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index a7c56ff..b393579 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -1102,6 +1102,7 @@ IS
is
-- procedure refreshes rows for name_id = package_name_id_in or
-- all rows if package_name_id_in is null
+ declare
channel_lm timestamp with local time zone;
begin
select last_modified
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index c883c88..3471f21 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 10eaf6c8fb6cd20874ec411571cea6e1646cac72
+-- oracle equivalent source sha1 b89b116bf39a095c05c4ae0f9813fd43f0437132
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
index a7c56ff..b393579 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
@@ -1102,6 +1102,7 @@ IS
is
-- procedure refreshes rows for name_id = package_name_id_in or
-- all rows if package_name_id_in is null
+ declare
channel_lm timestamp with local time zone;
begin
select last_modified
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
index c883c88..3471f21 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 10eaf6c8fb6cd20874ec411571cea6e1646cac72
+-- oracle equivalent source sha1 b89b116bf39a095c05c4ae0f9813fd43f0437132
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
commit 057279af1f70e32ff760f8fd5824d8a24ebf57a4
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Tue Jan 21 18:19:31 2014 +0100
Inconsistency in build vs. eclipse checkstyle.
diff --git a/java/conf/eclipse/checkstyle_eclipse.xml b/java/conf/eclipse/checkstyle_eclipse.xml
index 600b707..c5de47b 100644
--- a/java/conf/eclipse/checkstyle_eclipse.xml
+++ b/java/conf/eclipse/checkstyle_eclipse.xml
@@ -37,10 +37,6 @@ test
<property name="scope" value="public"/>
<property name="allowUndeclaredRTE" value="true"/>
</module>
-<module name="JavadocType">
-<property name="scope" value="package"/>
-<property name="versionFormat" value="\$Rev.*\$"/>
-</module>
<module name="ConstantName">
</module>
<module name="LocalFinalVariableName">
commit af90c5896277d7cc0370df74551b93eec2b050a1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 22 10:42:01 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.122-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b08a85c..8c02550 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.121
+Version: 2.1.122
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.122-1
+- let taskomatic link commons-io
+- fix CVE URL in updateinfo references
+- 1009396 - escape system name for SystemRemoteCommand page
+
* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.121-1
- increase column length for CVE ids
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2e108ea..3d45759 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.121-1 java/
+2.1.122-1 java/
commit 6ecee42766da4cd2a36e55e6f2086a057f27a09c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 21 14:26:28 2014 +0100
let taskomatic link commons-io
addressing:
java.lang.NoClassDefFoundError: org/apache/commons/io/FilenameUtils
at com.redhat.rhn.common.util.StringUtil.addPath(StringUtil.java:812)
...
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf
index a5bc64d..459a840 100644
--- a/java/conf/default/rhn_taskomatic_daemon.conf
+++ b/java/conf/default/rhn_taskomatic_daemon.conf
@@ -80,6 +80,7 @@ wrapper.java.classpath.57=/usr/share/java/commons-pool.jar
wrapper.java.classpath.58=/usr/share/java/quartz-oracle.jar
wrapper.java.classpath.59=/usr/share/java/postgresql-jdbc.jar
wrapper.java.classpath.60=/usr/share/java/mchange-commons.jar
+wrapper.java.classpath.61=/usr/share/java/commons-io.jar
# Java Additional Parameters
wrapper.java.additional.1=-Dibm.dst.compatibility=true
commit 1448c72e7081a711b956c29edc9860870b482d30
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jan 21 11:29:24 2014 +0100
fix CVE URL in updateinfo references
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
index fcd465b..9654085 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
@@ -241,11 +241,12 @@ public class UpdateInfoWriter extends RepomdWriter {
iter = erratum.getCves().iterator();
while (iter.hasNext()) {
Cve cve = (Cve) iter.next();
+ String cveid = sanitize(0L, cve.getName());
SimpleAttributesImpl attr = new SimpleAttributesImpl();
attr.addAttribute("href",
- "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=" + cve);
- attr.addAttribute("id", sanitize(0L, cve.getName()));
+ "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=" + cveid);
+ attr.addAttribute("id", cveid);
attr.addAttribute("type", "cve");
handler.startElement("reference", attr);
handler.endElement("reference");
commit dd8045412992cf44d6ba28acd89d414ac6ae63f7
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jan 21 10:34:32 2014 +0100
give search button an id
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index 328516d..824d83b 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -58,7 +58,7 @@
</div>
<div class="form-group">
<input type="hidden" name="submitted" value="true" />
- <button type="submit" class="btn btn-info input-sm">
+ <button type="submit" class="btn btn-info input-sm" id="search-btn">
<rhn:icon type="header-search" />
</button>
</div>
commit 0450451ba493d84c94df229a3b1ae297444342aa
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jan 21 10:09:29 2014 +0100
1009396 - escape system name for SystemRemoteCommand page
diff --git a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp
index bfdfb87..056ea93 100644
--- a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp
@@ -3,6 +3,7 @@
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ page language="java" import="com.redhat.rhn.frontend.action.systems.SystemRemoteCommandAction.FormData"%>
@@ -13,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<div class="panel panel-default">
<div class="panel-heading">
- <h4><bean:message key="ssm.overview.provisioning.remotecommand.header" arg0="${system.name}"/></h4>
+ <h4><bean:message key="ssm.overview.provisioning.remotecommand.header" arg0="${fn:escapeXml(system.name)}"/></h4>
</div>
<div class="panel-body">
<form name="remoteCommandForm" action="/rhn/systems/details/SystemRemoteCommand.do" method="post" class="form-horizontal" role="form">
commit 7818409492c94c5565e120ee7c966b0fe1e0dfce
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 20 10:14:13 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.1.43-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fb27c50..c8d356d 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.42
+Version: 2.1.43
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Mon Jan 20 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.43-1
+- python rhnSQL: proper cleanup after connection error
+- fixed python tests
+
* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.42-1
- increase length of rhnCVE name column
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e0bbe0e..0880a40 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.42-1 backend/
+2.1.43-1 backend/
commit 37c5f3a914dc42d210121314f4a7097d97fff9b7
Merge: 0713883 4436cc1
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 10:00:15 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit f9a6926996718e38a0ac46d0135436a8ec499d37
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:19 2014 +0100
python tests: initial work on test_server_registration
Started to fix some of the broken tests defined inside of
`test_server_registration`.
diff --git a/backend/server/test/unit-test/rhnSQL/misc_functions.py b/backend/server/test/unit-test/rhnSQL/misc_functions.py
index 4d2311a..ae3ee72 100644
--- a/backend/server/test/unit-test/rhnSQL/misc_functions.py
+++ b/backend/server/test/unit-test/rhnSQL/misc_functions.py
@@ -229,8 +229,25 @@ class InvalidRoleError(Exception):
pass
+def get_server_arch_id(architecture):
+ lookup = """
+ SELECT id
+ FROM rhnServerArch
+ WHERE label = :architecture
+ """
+ h = rhnSQL.prepare(lookup)
+ h.execute(
+ architecture = architecture
+ )
+ row = h.fetchone_dict()
+
+ if row:
+ return row['id']
+ else:
+ return None
+
def create_activation_key(org_id=None, user_id=None, groups=None,
- channels=None, entitlement_level=None, note=None, server_id=None):
+ channels=None, entitlement_level=None, note=None, server_id=None, release=None):
if org_id is None:
need_user = 1
org_id = create_new_org()
@@ -255,9 +272,25 @@ def create_activation_key(org_id=None, user_id=None, groups=None,
if channels is None:
channels = ['rhel-i386-as-3-beta', 'rhel-i386-as-2.1-beta']
+ channel_arch_id = find_or_create_channel_arch(
+ name = "channel - test",
+ label = "test"
+ )
+
# ensure channels are created
- for channel in channels:
- add_channel(channel)
+ for channel_label in channels:
+ channel = add_channel(
+ label = channel_label,
+ org_id = org_id,
+ channel_arch_id = channel_arch_id
+ )
+ populate_rhn_dist_channel_map(
+ channel_id = channel['id'],
+ channel_arch_id = channel_arch_id,
+ org_id = org_id,
+ release = release
+ )
+
if entitlement_level is None:
entitlement_level = 'provisioning_entitled'
@@ -301,6 +334,45 @@ def db_settings(backend):
return settings
+def grant_entitlements(org_id, entitlement, quantity):
+ activate_system_entitlement = rhnSQL.Procedure(
+ "rhn_entitlements.activate_system_entitlement")
+
+ activate_system_entitlement(org_id, entitlement, quantity)
+
+def grant_channel_family_entitlements(org_id, channel_family, quantity):
+ """
+ Check to see if org has a channelfamily associated with it.
+ If not, Create one.
+ """
+ _lookup_chfam = """
+ SELECT 1 from rhnChannelFamily
+ WHERE label='%s'
+ """ % channel_family
+ h = rhnSQL.prepare(_lookup_chfam)
+ row = h.execute()
+ # some extra check for upgrades
+ if row:
+ # Already exists, move on
+ return
+ _query_create_chfam = """
+ INSERT INTO rhnChannelFamily
+ (id, name, label, org_id, product_url)
+ VALUES (sequence_nextval('rhn_channel_family_id_seq'), :name, :label, :org, :url)
+
+ """
+ h = rhnSQL.prepare(_query_create_chfam)
+ try:
+ h.execute(
+ name = 'Private Channel Family %s' % channel_family,
+ label = channel_family,
+ org = org_id,
+ url = '%s url' % channel_family
+ )
+ except rhnSQL.SQLError, e:
+ # if we're here that means we're voilating something
+ raise
+
def find_or_create_arch_type(name, label):
lookup = """
SELECT id from rhnArchType
@@ -364,40 +436,108 @@ def find_or_create_channel_arch(name, label):
return find_or_create_channel_arch(name, label)
-def add_channel(label):
+def add_channel(label, org_id, channel_arch_id):
lookup = """
- SELECT 1 from rhnChannel
- WHERE label='%s'
- """ % label
+ SELECT * from rhnChannel
+ WHERE label = :label
+ """
+
h = rhnSQL.prepare(lookup)
- h.execute()
+ h.execute(label = label)
row = h.fetchone_dict()
+
if row:
- return
+ if row['org_id'] != org_id or row['channel_arch_id'] != channel_arch_id:
+ delete = "DELETE FROM rhnChannel WHERE id = :id"
+ h = rhnSQL.prepare(delete)
+ h.execute(id = row['id'])
+ rhnSQL.commit()
+ else:
+ return row
query_create = """
INSERT INTO rhnChannel
- (id, label, name, channel_arch_id, basedir, summary)
- VALUES (sequence_nextval('rhn_channel_id_seq'), :label, :name, :channel_arch_id, :basedir, :summary)
+ (id, label, org_id, name, channel_arch_id, basedir, summary)
+ VALUES (sequence_nextval('rhn_channel_id_seq'), :label, :org_id, :name, :channel_arch_id, :basedir, :summary)
"""
- channel_arch_id = find_or_create_channel_arch(
- name = "fake_itanium",
- label = "Fake itanium"
- )
-
h = rhnSQL.prepare(query_create)
try:
-
h.execute(
label = label,
+ org_id = org_id,
name = "Name for label %s" % label,
channel_arch_id = channel_arch_id,
basedir = 'basedir',
summary = 'summary'
)
rhnSQL.commit()
+
+ h = rhnSQL.prepare(lookup)
+ h.execute(label = label)
+ return h.fetchone_dict()
except rhnSQL.SQLError, e:
# if we're here that means we're voilating something
raise
+
+def populate_rhn_dist_channel_map(channel_id, channel_arch_id, org_id, release):
+ if not release:
+ release = 'unit test'
+
+ lookup = """
+ SELECT 1 FROM rhnDistChannelMap
+ WHERE release = :release AND
+ channel_arch_id = :channel_arch_id AND
+ org_id = :org_id
+ """
+
+ h = rhnSQL.prepare(lookup)
+ h.execute(
+ release = release,
+ channel_arch_id = channel_arch_id,
+ org_id = org_id
+ )
+ if h.fetchone_dict():
+ return
+
+ query_create = """
+ INSERT INTO rhnDistChannelMap
+ (os, release, channel_arch_id, channel_id, org_id)
+ VALUES (:os, :release, :channel_arch_id, :channel_id, :org_id)
+ """
+
+ h = rhnSQL.prepare(query_create)
+ h.execute(
+ os = "TestOS",
+ release = release,
+ channel_arch_id = channel_arch_id,
+ channel_id = channel_id,
+ org_id = org_id
+ )
+ rhnSQL.commit()
+
+def add_channel_to_server(channel_id, server_id):
+ lookup = """
+ SELECT 1 FROM rhnServerChannel
+ WHERE server_id = :server_id AND
+ channel_id = :channel_id
+ """
+
+ h = rhnSQL.prepare(lookup)
+ row = h.execute(server_id = server_id, channel_id = channel_id)
+ if row:
+ return
+
+ query_create = """
+ INSERT INTO rhnServerChannel
+ (server_id, channel_id)
+ VALUES (:server_id, :channel_id)
+ """
+
+ h = rhnSQL.prepare(query_create)
+ h.execute(
+ channel_id = channel_id,
+ server_id = server_id
+ )
+ rhnSQL.commit()
diff --git a/backend/server/test/unit-test/rhnSQL/test_server_registration.py b/backend/server/test/unit-test/rhnSQL/test_server_registration.py
index 169b9c2..427e1f1 100644
--- a/backend/server/test/unit-test/rhnSQL/test_server_registration.py
+++ b/backend/server/test/unit-test/rhnSQL/test_server_registration.py
@@ -18,17 +18,16 @@
#
import sys
+import time
import unittest
from spacewalk.common import rhnFlags
-from spacewalk.common.rhnConfig import initCFG
-from spacewalk.server import rhnSQL, rhnServer, rhnChannel
-from spacewalk.server.xmlrpc import registration
+from spacewalk.common.rhnConfig import initCFG, CFG
+from spacewalk.server import rhnSQL, rhnServer, rhnChannel, rhnUser
+from spacewalk.server.handlers.xmlrpc import registration
import misc_functions
DB_SETTINGS = misc_functions.db_settings("oracle")
-
-
class Tests(unittest.TestCase):
_channel = 'redhat-advanced-server-i386'
_channel_family = 'rhel-as'
@@ -44,6 +43,7 @@ class Tests(unittest.TestCase):
password = DB_SETTINGS["password"],
database = DB_SETTINGS["database"]
)
+ rhnSQL.clear_log_id()
def tearDown(self):
# Roll back any unsaved data
@@ -51,11 +51,21 @@ class Tests(unittest.TestCase):
def test_new_server_1(self):
"Test normal server registration, with username/password"
- u = self._create_new_user()
- username = u.contact['login']
- password = u.contact['password']
+ u, password = self._create_new_user()
+ username = u.contact['login']
+ org_id = u.contact['org_id']
+ entitlements = self._entitlements
+ os_release = "2.1as"
+
+ t = misc_functions.create_activation_key(
+ org_id = u.contact['org_id'],
+ entitlement_level = entitlements,
+ user_id = u.getid(),
+ release = os_release
+ )
+
params = build_new_system_params_with_username(username=username,
- password=password, os_release="2.1AS")
+ password=password, os_release=os_release)
system_id = register_new_system(params)
rhnSQL.commit()
@@ -69,16 +79,25 @@ class Tests(unittest.TestCase):
self.assertEqual(channels[0]['label'], self._channel)
def test_new_server_token_1(self):
- "Test registration with token"
- u = self._create_new_user()
- org_id = u.contact['org_id']
+ "test registration with token"
+ u, _ = self._create_new_user()
+ org_id = u.contact['org_id']
entitlements = self._entitlements
- t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid())
+ os_release = "2.1as"
+
+ t = misc_functions.create_activation_key(
+ org_id = u.contact['org_id'],
+ entitlement_level = entitlements,
+ user_id = u.getid(),
+ release = os_release
+ )
token = t.get_token()
- params = build_new_system_params_with_token(token=token)
+ params = build_new_system_params_with_token(
+ token=token,
+ os_release=os_release
+ )
system_id = register_new_system(params)
rhnSQL.commit()
@@ -88,18 +107,27 @@ class Tests(unittest.TestCase):
def test_new_server_token_2(self):
"Test registration with token that specifies a base channel"
- u = self._create_new_user()
- org_id = u.contact['org_id']
+
+ # FIXME: the test fails because there's no channel associated with the
+ # freshly created Server: rhnServerChannel is not populated by the
+ # registration code.
+
+ u, _ = self._create_new_user()
+ org_id = u.contact['org_id']
base_channel = 'rhel-i386-as-3'
entitlements = self._entitlements
+ os_release = "2.1as"
+
t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
entitlement_level=entitlements, user_id=u.getid(),
- channels=[base_channel])
+ channels=[base_channel], release=os_release)
token = t.get_token()
- params = build_new_system_params_with_token(token=token,
- os_release="2.1AS")
+ params = build_new_system_params_with_token(
+ token=token,
+ os_release=os_release
+ )
system_id = register_new_system(params)
rhnSQL.commit()
@@ -114,9 +142,10 @@ class Tests(unittest.TestCase):
def test_new_server_reactivation_token_1(self):
"Test server re-registration"
- u = self._create_new_user()
- username = u.contact['login']
- password = u.contact['password']
+ u, password = self._create_new_user()
+ username = u.contact['login']
+ os_release = "2.1AS"
+
params = build_new_system_params_with_username(username=username,
password=password, os_release="2.1AS")
@@ -134,12 +163,14 @@ class Tests(unittest.TestCase):
entitlements = self._entitlements
t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
entitlement_level=entitlements, user_id=u.getid(),
- channels=[base_channel], server_id=server_id_1)
+ channels=[base_channel], server_id=server_id_1, release=os_release)
token = t.get_token()
- params = build_new_system_params_with_token(token=token,
- os_release="2.1AS")
+ params = build_new_system_params_with_token(
+ token=token,
+ os_release=os_release
+ )
system_id = register_new_system(params)
rhnSQL.commit()
@@ -158,17 +189,19 @@ class Tests(unittest.TestCase):
Resulting server group is the union of all server groups from all
tokens
"""
- u = self._create_new_user()
- org_id = u.contact['org_id']
+ u, _ = self._create_new_user()
+ org_id = u.contact['org_id']
entitlements = self._entitlements
+ os_release = "2.1AS"
+
t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid())
+ entitlement_level=entitlements, user_id=u.getid(), release=os_release)
token1 = t.get_token()
sg1 = t.get_server_groups()
t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid())
+ entitlement_level=entitlements, user_id=u.getid(), release=os_release)
token2 = t.get_token()
sg2 = t.get_server_groups()
@@ -176,7 +209,7 @@ class Tests(unittest.TestCase):
token = token1 + ',' + token2
params = build_new_system_params_with_token(token=token,
- os_release="2.1AS")
+ os_release=os_release)
system_id = register_new_system(params)
rhnSQL.commit()
@@ -195,18 +228,25 @@ class Tests(unittest.TestCase):
def _create_new_user(self):
# Create new org
org_id = misc_functions.create_new_org()
+ users_unencrypted_password = "unittest-password-%.3f" % time.time()
# Grant entitlements to the org
misc_functions.grant_entitlements(org_id, 'enterprise_entitled', 1)
- misc_functions.grant_channel_family_entitlements(org_id,
- self._channel_family, 1)
+ misc_functions.grant_channel_family_entitlements(
+ org_id,
+ "%s-%.3f" % (self._channel_family, time.time()),
+ 1
+ )
# Create new user
- u = misc_functions.create_new_user(org_id=org_id, roles=['org_admin'])
- username = u.contact['login']
- # XXX This will break on satellites where passwords are encrypted
- password = u.contact['password']
- return u
+ u = misc_functions.create_new_user(
+ org_id = org_id,
+ roles = ['org_admin'],
+ password = users_unencrypted_password,
+ encrypt_password = CFG.encrypted_passwords
+ )
+
+ return u, users_unencrypted_password
class Counter:
_counter = 0
@@ -216,7 +256,6 @@ class Counter:
return val
def build_new_system_params_with_username(**kwargs):
- import time
val = Counter().value()
rnd_string = "%d-%d" % (int(time.time()), val)
commit f545c2e9bc4eb5cf489a665cd2d018df0355f3c9
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:18 2014 +0100
python tests: load db settings from conf file
Updated the `test_server_registration` to load the db connection settings from
a configuration file.
diff --git a/backend/server/test/unit-test/rhnSQL/test_server_registration.py b/backend/server/test/unit-test/rhnSQL/test_server_registration.py
index 10288de..169b9c2 100644
--- a/backend/server/test/unit-test/rhnSQL/test_server_registration.py
+++ b/backend/server/test/unit-test/rhnSQL/test_server_registration.py
@@ -25,8 +25,8 @@ from spacewalk.server import rhnSQL, rhnServer, rhnChannel
from spacewalk.server.xmlrpc import registration
import misc_functions
+DB_SETTINGS = misc_functions.db_settings("oracle")
-DB = 'rhnuser/rhnuser@webdev'
class Tests(unittest.TestCase):
@@ -38,7 +38,12 @@ class Tests(unittest.TestCase):
def setUp(self):
initCFG("server.xmlrpc")
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
def tearDown(self):
# Roll back any unsaved data
commit 08fc1d43576a682a9397f2193f37f144b6fe659d
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:16 2014 +0100
python rhnSQL: proper cleanup after connection error
Ensured the global database instance initialized by rhnSQL is not
reused when there's a database connection error.
The bug emerged while running the whole test suite: all the tests
executed after `test_exceptions` failed because they weren't able to
connect to the database.
diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py
index c7d6c16..4b002d0 100644
--- a/backend/server/rhnSQL/__init__.py
+++ b/backend/server/rhnSQL/__init__.py
@@ -111,6 +111,10 @@ def initDB(backend=None, host=None, port=None, username=None,
# raise # pass on, we know those ones
# except (KeyboardInterrupt, SystemExit):
# raise
+ except SQLConnectError, e:
+ global __DB
+ del __DB
+ raise e
except:
raise
#e_type, e_value = sys.exc_info()[:2]
diff --git a/backend/server/test/unit-test/rhnSQL/test_exceptions.py b/backend/server/test/unit-test/rhnSQL/test_exceptions.py
index 4d1b25d..13275fc 100644
--- a/backend/server/test/unit-test/rhnSQL/test_exceptions.py
+++ b/backend/server/test/unit-test/rhnSQL/test_exceptions.py
@@ -5,8 +5,14 @@
#
import unittest
+from spacewalk.common.rhnConfig import CFG, initCFG
from spacewalk.server import rhnSQL
+import misc_functions
+
+DB_SETTINGS = misc_functions.db_settings("oracle")
+
+
class ExceptionsTest(unittest.TestCase):
def test_failed_connection(self):
# Connect to localhost and look for db on a totally bogus port, this
@@ -28,5 +34,16 @@ class ExceptionsTest(unittest.TestCase):
password
)
+ try:
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
+ except:
+ self.fail("Exception raised while trying to connect to the db using proper settings. That's not expected to happen.")
+
+
if __name__ == '__main__':
unittest.main()
commit dbee3092692955c6099acaed5ea1a7286a712825
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:15 2014 +0100
python tests: fixed 'create_activation_key' helper
The 'create_activation_key' helper assumed its channels were already
available inside of the database, but that proved to be wrong in most
cases.
Added a series of helper function required to create channels.
diff --git a/backend/server/test/unit-test/rhnSQL/misc_functions.py b/backend/server/test/unit-test/rhnSQL/misc_functions.py
index d1fa68d..4d2311a 100644
--- a/backend/server/test/unit-test/rhnSQL/misc_functions.py
+++ b/backend/server/test/unit-test/rhnSQL/misc_functions.py
@@ -255,6 +255,10 @@ def create_activation_key(org_id=None, user_id=None, groups=None,
if channels is None:
channels = ['rhel-i386-as-3-beta', 'rhel-i386-as-2.1-beta']
+ # ensure channels are created
+ for channel in channels:
+ add_channel(channel)
+
if entitlement_level is None:
entitlement_level = 'provisioning_entitled'
@@ -296,3 +300,104 @@ def db_settings(backend):
settings['host'] = config.get(backend, 'host')
return settings
+
+def find_or_create_arch_type(name, label):
+ lookup = """
+ SELECT id from rhnArchType
+ WHERE label='%s' AND name = '%s'
+ """ % (label, name)
+ h = rhnSQL.prepare(lookup)
+ h.execute()
+ row = h.fetchone_dict()
+ if row:
+ return row['id']
+
+ query_create = """
+ INSERT INTO rhnArchType
+ (id, label, name)
+ VALUES (sequence_nextval('rhn_archtype_id_seq'), :label, :name)
+
+ """
+ h = rhnSQL.prepare(query_create)
+ try:
+ h.execute(
+ label = label,
+ name = name
+ )
+ rhnSQL.commit()
+ except rhnSQL.SQLError, e:
+ # if we're here that means we're voilating something
+ raise
+
+ return find_or_create_arch_type(name, label)
+
+def find_or_create_channel_arch(name, label):
+ lookup = """
+ SELECT id from rhnChannelArch
+ WHERE label='%s' AND name = '%s'
+ """ % (label, name)
+ h = rhnSQL.prepare(lookup)
+ h.execute()
+ row = h.fetchone_dict()
+ if row:
+ return row['id']
+
+ query_create = """
+ INSERT INTO rhnChannelArch
+ (id, arch_type_id, label, name)
+ VALUES (sequence_nextval('rhn_channel_arch_id_seq'), :arch_type_id, :label, :name)
+
+ """
+ arch_type_id = find_or_create_arch_type(name = name, label = label)
+ h = rhnSQL.prepare(query_create)
+ try:
+ h.execute(
+ arch_type_id = arch_type_id,
+ label = label,
+ name = name
+ )
+ rhnSQL.commit()
+ except rhnSQL.SQLError, e:
+ # if we're here that means we're voilating something
+ raise
+
+ return find_or_create_channel_arch(name, label)
+
+
+def add_channel(label):
+ lookup = """
+ SELECT 1 from rhnChannel
+ WHERE label='%s'
+ """ % label
+ h = rhnSQL.prepare(lookup)
+ h.execute()
+ row = h.fetchone_dict()
+ if row:
+ return
+
+ query_create = """
+ INSERT INTO rhnChannel
+ (id, label, name, channel_arch_id, basedir, summary)
+ VALUES (sequence_nextval('rhn_channel_id_seq'), :label, :name, :channel_arch_id, :basedir, :summary)
+
+ """
+
+ channel_arch_id = find_or_create_channel_arch(
+ name = "fake_itanium",
+ label = "Fake itanium"
+ )
+
+ h = rhnSQL.prepare(query_create)
+ try:
+
+ h.execute(
+ label = label,
+ name = "Name for label %s" % label,
+ channel_arch_id = channel_arch_id,
+ basedir = 'basedir',
+ summary = 'summary'
+ )
+ rhnSQL.commit()
+ except rhnSQL.SQLError, e:
+ # if we're here that means we're voilating something
+ raise
commit 6646328e1a98f7d0694e423d81215a09338f40eb
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:14 2014 +0100
python tests: fixed 'create_new_user' helper
Fixed the 'create_new_user' helper function: removed calls to no longer
available variables, added support for encrypted passwords and fixed
password validation when encrypted passwords are not toggled.
diff --git a/backend/server/test/unit-test/rhnSQL/misc_functions.py b/backend/server/test/unit-test/rhnSQL/misc_functions.py
index 58d8a37..d1fa68d 100644
--- a/backend/server/test/unit-test/rhnSQL/misc_functions.py
+++ b/backend/server/test/unit-test/rhnSQL/misc_functions.py
@@ -23,6 +23,7 @@ import time
import types
from ConfigParser import ConfigParser
+from spacewalk.common.rhnConfig import CFG
from spacewalk.server import rhnSQL, rhnUser
# Add backend/server/test/attic directory to PYTHONPATH
@@ -89,7 +90,7 @@ def build_server_group_params(**kwargs):
params.update(kwargs)
return params
-def create_new_user(org_id=None, username=None, password=None, roles=None):
+def create_new_user(org_id=None, username=None, password=None, roles=None, encrypt_password = False):
"Create a new user"
if org_id is None:
org_id = create_new_org()
@@ -100,6 +101,8 @@ def create_new_user(org_id=None, username=None, password=None, roles=None):
username = "unittest-user-%.3f" % time.time()
if password is None:
password = "unittest-password-%.3f" % time.time()
+ if encrypt_password:
+ password = rhnUser.encrypt_password(password)
if roles is None:
roles = []
@@ -166,6 +169,17 @@ def create_new_user(org_id=None, username=None, password=None, roles=None):
contact_fax
)
+ # update old_password for web_contact, this is required to pass
+ # password validation checks when passwords are not encrypted.
+ if not encrypt_password:
+ h = rhnSQL.prepare("""
+ UPDATE web_contact
+ SET old_password = :old_password
+ WHERE id = :id
+ """)
+ h.execute(old_password = password, id = ret)
+ rhnSQL.commit()
+
u = rhnUser.search(username)
if u is None:
@@ -187,7 +201,7 @@ def create_new_user(org_id=None, username=None, password=None, roles=None):
raise InvalidRoleError(org_id, role)
user_group_id = row['id']
- create_ugm(user_id, user_group_id)
+ create_ugm(u.getid(), user_group_id)
return u
commit af237bc6d2327f23dbd32690a2404f70a9bb0071
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:13 2014 +0100
python: made rhnActivationKey's test more flexible
Changed the code to load db settings from a dedicated ini file.
diff --git a/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py b/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py
index 83794fc..9f9b19f 100644
--- a/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py
+++ b/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py
@@ -17,20 +17,33 @@
#
#
+import os
import sys
import time
import unittest
-from spacewalk.server import rhnSQL, rhnActivationKey
+from spacewalk.server import rhnSQL
+
+sys.path.insert(
+ 0,
+ os.path.abspath(os.path.dirname(os.path.abspath(__file__) + "/../../../attic/"))
+)
+import rhnActivationKey
import misc_functions
-DB = 'rhnuser/rhnuser@webdev'
+DB_SETTINGS = misc_functions.db_settings("oracle")
class Tests(unittest.TestCase):
def setUp(self):
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
+ rhnSQL.clear_log_id()
def tearDown(self):
# Roll back any unsaved data
commit e107ef2c0f0c53c3e7c94fb9eded791aac408edb
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:12 2014 +0100
python test: fixed create_new_user helper function
The previous code was no longer working.
diff --git a/backend/server/test/unit-test/rhnSQL/misc_functions.py b/backend/server/test/unit-test/rhnSQL/misc_functions.py
index 41d278f..58d8a37 100644
--- a/backend/server/test/unit-test/rhnSQL/misc_functions.py
+++ b/backend/server/test/unit-test/rhnSQL/misc_functions.py
@@ -103,13 +103,73 @@ def create_new_user(org_id=None, username=None, password=None, roles=None):
if roles is None:
roles = []
- u = rhnUser.User(username, password)
- u.set_org_id(org_id)
- u.save()
- # The password is scrambled now - re-set it
- u.contact['password'] = password
- u.save()
- user_id = u.getid()
+ login = username
+ oracle_contact_id = None
+ prefix = "Mr."
+ first_names = "First Name %3.f" % time.time()
+ last_name = "Last Name %3.f" % time.time()
+ genqual = None
+ parent_company = None
+ company = "ACME"
+ title = ""
+ phone = ""
+ fax = ""
+ email = "%s(a)example.com" % username
+ pin = 0
+ first_names_ol = " "
+ last_name_ol = " "
+ address1 = " "
+ address2 = " "
+ address3 = " "
+ city = " "
+ state = " "
+ zip_code = " "
+ country = " "
+ alt_first_names = None
+ alt_last_name = None
+ contact_call = "N"
+ contact_mail = "N"
+ contact_email = "N"
+ contact_fax = "N"
+
+ f = rhnSQL.Function('create_new_user', rhnSQL.types.NUMBER())
+ ret = f(
+ org_id,
+ login,
+ password,
+ oracle_contact_id,
+ prefix,
+ first_names,
+ last_name,
+ genqual,
+ parent_company,
+ company,
+ title,
+ phone,
+ fax,
+ email,
+ pin,
+ first_names_ol,
+ last_name_ol,
+ address1,
+ address2,
+ address3,
+ city,
+ state,
+ zip_code,
+ country,
+ alt_first_names,
+ alt_last_name,
+ contact_call,
+ contact_mail,
+ contact_email,
+ contact_fax
+ )
+
+ u = rhnUser.search(username)
+
+ if u is None:
+ raise Exception("Couldn't create the new user - user not found")
# Set roles
h = rhnSQL.prepare("""
@@ -129,8 +189,6 @@ def create_new_user(org_id=None, username=None, password=None, roles=None):
user_group_id = row['id']
create_ugm(user_id, user_group_id)
- rhnSQL.commit()
-
return u
def lookup_org_id(org_id):
commit 38b8e762e02029a89077a34d348ed725ea3528b8
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:11 2014 +0100
python test: fixed test_rhnChannel
All the test are passing now.
diff --git a/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py b/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py
index a0d363e..6dd6bad 100644
--- a/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py
+++ b/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py
@@ -22,13 +22,20 @@ import time
import unittest
from spacewalk.server import rhnSQL, rhnChannel
-DB = 'rhnuser/rhnuser@webdev'
+import misc_functions
+DB_SETTINGS = misc_functions.db_settings("oracle")
class Tests(unittest.TestCase):
def setUp(self):
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
+ rhnSQL.clear_log_id()
def tearDown(self):
# Roll back any unsaved data
@@ -129,7 +136,22 @@ class Tests(unittest.TestCase):
def test_list_channels_1(self):
"""Tests rhnChannel.list_channels"""
- channels = rhnChannel.list_channels(pattern="redhat-%")
+
+ # create some channel
+ cf = rhnChannel.ChannelFamily()
+ cf.load_from_dict(self._new_channel_family_dict())
+ cf.save()
+
+ label = cf.get_label()
+ vdict = self._new_channel_dict(label=label, channel_family=label)
+
+ c = rhnChannel.Channel()
+ for k, v in vdict.items():
+ method = getattr(c, "set_" + k)
+ method(v)
+ c.save()
+
+ channels = rhnChannel.list_channels(pattern="rhn-unittest-%")
self.failUnless(len(channels) > 0)
def _new_channel_dict(self, **kwargs):
@@ -146,7 +168,7 @@ class Tests(unittest.TestCase):
if kwargs.has_key('org_id'):
org_id = kwargs['org_id']
else:
- org_id = 'rhn-noc'
+ org_id = misc_functions.create_new_org()
vdict = {
'label' : label,
commit bdd23539bdb2fdd1644d76a0df3e037e4c4df829
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:10 2014 +0100
python test_1.py: fixed 'execption procedure' test
Changed the test to expect the right type of exception.
diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py b/backend/server/test/unit-test/rhnSQL/test_1.py
index 6a7c076..be121e1 100644
--- a/backend/server/test/unit-test/rhnSQL/test_1.py
+++ b/backend/server/test/unit-test/rhnSQL/test_1.py
@@ -46,7 +46,7 @@ class Tests1(unittest.TestCase):
def test_exception_procedure_1(self):
"Tests exceptions raised by procedure calls"
p = rhnSQL.Procedure("rhn_channel.subscribe_server")
- self.assertRaises(rhnSQL.SQLSchemaError, p, 1000102174, 33)
+ self.assertRaises(rhnSQL.SQLError, p, 1000102174, 33)
def test_function_1(self):
"Tests function calls"
commit 9b29ac6168792e24c49fff844342b020fde23e87
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:09 2014 +0100
python test_1.py: fixed row count test
Ensured the table used by the test is available, plus dropped it on
exit.
Changed the test to use prepared statements rather than straight
'execute'. The latter does not return any information about the number
of items added/removed from the table. Moreover the code used on production
which does this type of checks uses prepared statements. Hence now the test
mimics what is actually done by other parts of spacewalk.
diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py b/backend/server/test/unit-test/rhnSQL/test_1.py
index f883b72..6a7c076 100644
--- a/backend/server/test/unit-test/rhnSQL/test_1.py
+++ b/backend/server/test/unit-test/rhnSQL/test_1.py
@@ -99,17 +99,30 @@ class Tests1(unittest.TestCase):
def test_execute_rowcount(self):
"""Tests row counts"""
- # XXX
table_name = "misatest"
- rhnSQL.execute("delete from misatest")
- ret = rhnSQL.execute("insert into misatest values (1, 1)")
- self.assertEqual(ret, 1)
- ret = rhnSQL.execute("insert into misatest values (2, 2)")
- self.assertEqual(ret, 1)
-
- ret = rhnSQL.execute("delete from misatest")
- self.assertEqual(ret, 2)
- rhnSQL.commit()
+ try:
+ tables = self._list_tables()
+ if not table_name in tables:
+ rhnSQL.execute("create table %s (id int, value int)" % table_name)
+ else:
+ rhnSQL.execute("delete from %s" % table_name)
+
+ insert_statement = rhnSQL.Statement(
+ "insert into %s values (:item_id, :value)" % table_name
+ )
+ h = rhnSQL.prepare(insert_statement)
+ ret = h.execute(item_id = 1, value = 2)
+ self.assertEqual(ret, 1)
+ ret = h.execute(item_id = 2, value = 2)
+ self.assertEqual(ret, 1)
+
+ delete_statement = rhnSQL.Statement("delete from %s" % table_name)
+ h = rhnSQL.prepare(delete_statement)
+ ret = h.execute()
+ self.assertEqual(ret, 2)
+ rhnSQL.commit()
+ finally:
+ rhnSQL.execute("drop table %s" % table_name)
def _list_tables(self):
h = rhnSQL.prepare("select table_name from user_tables")
commit e61e670cac84a99fce317be5abd9b0944c7aeedc
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:08 2014 +0100
python test_1.py: fixed 'test_procedure_1'
Fixed more tests by using the right signature when calling the store
procedure chosen by the tests.
diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py b/backend/server/test/unit-test/rhnSQL/test_1.py
index 7336cbb..f883b72 100644
--- a/backend/server/test/unit-test/rhnSQL/test_1.py
+++ b/backend/server/test/unit-test/rhnSQL/test_1.py
@@ -58,8 +58,7 @@ class Tests1(unittest.TestCase):
def _run_stproc(self):
p = rhnSQL.Procedure("create_new_org")
username = password = "unittest-%.3f" % time.time()
- args = (username, password, None, None, 'P', rhnSQL.types.NUMBER(),
- rhnSQL.types.NUMBER(), rhnSQL.types.NUMBER())
+ args = (username, password, rhnSQL.types.NUMBER())
return apply(p, args), args
def test_procedure_1(self):
@@ -68,12 +67,7 @@ class Tests1(unittest.TestCase):
self.assertEqual(len(args), len(ret))
self.assertEqual(args[0], ret[0])
self.assertEqual(args[1], ret[1])
- self.assertEqual(args[2], ret[2])
- self.assertEqual(args[3], ret[3])
- self.assertEqual(args[4], ret[4])
- self.assertNotEqual(args[5], None)
- self.assertNotEqual(args[6], None)
- self.assertNotEqual(args[7], None)
+ self.failUnless(isinstance(ret[2], types.FloatType))
def test_procedure_2(self):
"""Run the same stored procedure twice. This should excerise the
commit f7c1ceeda812ee52433f759072ef5a74987ebeeb
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:07 2014 +0100
ptyhon test_1.py: fixed 'test_function_1'
Changed the test checking the return value of a sql function to
use a function which does not require testing data to be added to the
db.
diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py b/backend/server/test/unit-test/rhnSQL/test_1.py
index 75b5b5a..7336cbb 100644
--- a/backend/server/test/unit-test/rhnSQL/test_1.py
+++ b/backend/server/test/unit-test/rhnSQL/test_1.py
@@ -50,10 +50,10 @@ class Tests1(unittest.TestCase):
def test_function_1(self):
"Tests function calls"
- p = rhnSQL.Function("rhn_entitlements.get_server_entitlement",
- rhnSQL.types.STRING())
- ret = p(1000102174)
- self.failUnless(isinstance(ret, types.StringType))
+ p = rhnSQL.Function("logging.get_log_id",
+ rhnSQL.types.NUMBER())
+ ret = p()
+ self.failUnless(isinstance(ret, types.FloatType))
def _run_stproc(self):
p = rhnSQL.Procedure("create_new_org")
commit d667238682ebb1443efdb00cffc4b91a77bbadae
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:06 2014 +0100
python tests: initial work on test_1.py
* Read db connection settings from the db_settings.ini file.
* Ensure audit loggin feature won't cause failures.
diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py b/backend/server/test/unit-test/rhnSQL/test_1.py
index c00e697..75b5b5a 100644
--- a/backend/server/test/unit-test/rhnSQL/test_1.py
+++ b/backend/server/test/unit-test/rhnSQL/test_1.py
@@ -11,14 +11,22 @@ import time
import types
from spacewalk.server import rhnSQL
-DB = 'rhnuser/rhnuser@webdev'
+import misc_functions
+
+DB_SETTINGS = misc_functions.db_settings("oracle")
class Tests1(unittest.TestCase):
def setUp(self):
self.table_name = "misatest_%d" % os.getpid()
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
self._cleanup()
+ rhnSQL.clear_log_id()
rhnSQL.execute("create table %s (id int, val varchar2(10))" %
self.table_name)
commit a4147854d2c53c465891417745f7e4520d5ae4bf
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:05 2014 +0100
python: fixed issue inside of Oracle driver
The function which mapped store procedures and functions return types to
rhnSQL's own types didn't process all the known types. In fact it exited
immediately if the first comparison didn't pass.
diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py
index b49154d..30f0464 100644
--- a/backend/server/rhnSQL/driver_cx_Oracle.py
+++ b/backend/server/rhnSQL/driver_cx_Oracle.py
@@ -330,12 +330,14 @@ class Procedure(sql_base.Procedure):
def _call_proc_ret(self, args, ret_type=None):
args = map(to_string, self._munge_args(args))
if ret_type:
+ ret_type_mapped = False
for sqltype, db_type in self._type_mapping:
if isinstance(ret_type, sqltype):
ret_type = db_type
+ ret_type_mapped = True
break
- else:
- raise Exception("Unknown type", ret_type)
+ if not ret_type_mapped:
+ raise Exception("Unknown type", ret_type)
if ret_type:
return self.cursor.callfunc(self.name, ret_type, args)
commit 5b4c74e7b8a5a263c0069772b0e76ae562000b26
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:04 2014 +0100
python: fixed broken test
Made possible to run test_rhnServerGroup without any error.
diff --git a/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py b/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py
index 61638f1..c4aa59e 100644
--- a/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py
+++ b/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py
@@ -17,19 +17,31 @@
#
#
+import os
import sys
import unittest
-from spacewalk.server import rhnSQL, rhnServerGroup
+from spacewalk.server import rhnSQL
-import misc_functions
+sys.path.insert(
+ 0,
+ os.path.abspath(os.path.dirname(os.path.abspath(__file__) + "/../../../attic/"))
+)
+import rhnServerGroup
-DB = 'rhnuser/rhnuser@webdev'
+import misc_functions
+DB_SETTINGS = misc_functions.db_settings("oracle")
class Tests(unittest.TestCase):
def setUp(self):
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
+ rhnSQL.clear_log_id()
def tearDown(self):
# Roll back any unsaved data
commit 5b73be46cb7c1bbc864ae08f7df9f1a549e6b7b0
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:03 2014 +0100
python test_log.py: switched to db_settings.ini
Changed the test to use the db connection params written inside of
db_settings.ini.
diff --git a/backend/server/test/unit-test/rhnSQL/test_lob.py b/backend/server/test/unit-test/rhnSQL/test_lob.py
index cf0df2e..711bbeb 100644
--- a/backend/server/test/unit-test/rhnSQL/test_lob.py
+++ b/backend/server/test/unit-test/rhnSQL/test_lob.py
@@ -7,11 +7,18 @@
import unittest
from spacewalk.server import rhnSQL
-DB = 'rhnuser/rhnuser@webdev'
+import misc_functions
+
+DB_SETTINGS = misc_functions.db_settings("oracle")
class ExceptionsTest(unittest.TestCase):
def setUp(self):
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
self._cleanup()
rhnSQL.execute("create table misatestlob (id int, val blob)")
commit 40b0d0988f8a33150303bf5a4b14bbe1f719df11
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:02 2014 +0100
python tests: remove useless test
Removed useless test which fails immediately because the following
exception is raised: "This test is no more valid; see the bug
https://bugzilla.redhat.com/show_bug.cgi?id=423351".
diff --git a/backend/server/test/unit-test/rhnSQL/test_executemany.py b/backend/server/test/unit-test/rhnSQL/test_executemany.py
deleted file mode 100644
index 7cce482..0000000
--- a/backend/server/test/unit-test/rhnSQL/test_executemany.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2005--2010 Red Hat, Inc.
-#
-#
-#
-
-raise Exception("""
-
-This test is no more valid; see the bug
- https://bugzilla.redhat.com/show_bug.cgi?id=423351
-""")
-
-import os
-import unittest
-from spacewalk.server import rhnSQL
-
-DB = 'rhnuser/rhnuser@webdev'
-
-class ExecutemanyTest(unittest.TestCase):
- def setUp(self):
- self.table_name = "misatest_%d" % os.getpid()
- rhnSQL.initDB(DB)
- self._cleanup()
-
- rhnSQL.execute("create table %s (id int, val varchar2(10))" %
- self.table_name)
-
-
- def _cleanup(self):
- try:
- rhnSQL.execute("drop table %s" % self.table_name)
- except rhnSQL.SQLStatementPrepareError:
- pass
-
- def tearDown(self):
- self._cleanup()
-
- rhnSQL.commit()
-
- def test_executemany(self):
- """
- Tests the case of passing an integer as a value into a VARCHAR2 column
- (executemany makes it more interesting because the driver generally
- verifies the param types; passing a string and an Int takes it one
- step further)
- """
- h = rhnSQL.prepare("""
- insert into %s (id, val) values (:id, :val)
- """ % self.table_name)
- params = {
- 'id' : [1, 2],
- 'val' : ['', 3],
- }
- apply(h.executemany, (), params)
-
- h = rhnSQL.prepare("select id, val from %s" % self.table_name)
- h.execute()
- rows = h.fetchall_dict()
- self.assertEqual(len(rows), 2)
- v_id, v_val = rows[0]['id'], rows[0]['val']
- self.assertEqual(v_id, 1)
- self.assertEqual(v_val, None)
- v_id, v_val = rows[1]['id'], rows[1]['val']
- self.assertEqual(v_id, 2)
- self.assertEqual(v_val, '3')
-
-
-if __name__ == '__main__':
- unittest.main()
commit 8a97328c592c1dcccbff31ed51a8e8cbb50b0e2f
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:01 2014 +0100
python test_exceptions.py: fixed broken test
Call the db connection helper using the right parameters.
diff --git a/backend/server/test/unit-test/rhnSQL/test_exceptions.py b/backend/server/test/unit-test/rhnSQL/test_exceptions.py
index f0b78c6..4d1b25d 100644
--- a/backend/server/test/unit-test/rhnSQL/test_exceptions.py
+++ b/backend/server/test/unit-test/rhnSQL/test_exceptions.py
@@ -9,7 +9,24 @@ from spacewalk.server import rhnSQL
class ExceptionsTest(unittest.TestCase):
def test_failed_connection(self):
- self.assertRaises(rhnSQL.SQLConnectError, rhnSQL.initDB, 'x/y@z')
+ # Connect to localhost and look for db on a totally bogus port, this
+ # makes the test faster.
+ host = "localhost"
+ username = "x"
+ password = "y"
+ database = "z"
+ port = 9000
+
+ self.assertRaises(
+ rhnSQL.SQLConnectError,
+ rhnSQL.initDB,
+ "oracle",
+ host,
+ port,
+ database,
+ username,
+ password
+ )
if __name__ == '__main__':
unittest.main()
commit 3ad9eddb844d0c749c02a45ae639b83f5b9fb1c5
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:09:00 2014 +0100
python tests: renamed a test file
Gave a better name to `test_2.py`.
diff --git a/backend/server/test/unit-test/rhnSQL/test_2.py b/backend/server/test/unit-test/rhnSQL/test_2.py
deleted file mode 100644
index f0b78c6..0000000
--- a/backend/server/test/unit-test/rhnSQL/test_2.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2005--2010 Red Hat, Inc.
-#
-#
-#
-
-import unittest
-from spacewalk.server import rhnSQL
-
-class ExceptionsTest(unittest.TestCase):
- def test_failed_connection(self):
- self.assertRaises(rhnSQL.SQLConnectError, rhnSQL.initDB, 'x/y@z')
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/backend/server/test/unit-test/rhnSQL/test_exceptions.py b/backend/server/test/unit-test/rhnSQL/test_exceptions.py
new file mode 100644
index 0000000..f0b78c6
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/test_exceptions.py
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+# Copyright (c) 2005--2010 Red Hat, Inc.
+#
+#
+#
+
+import unittest
+from spacewalk.server import rhnSQL
+
+class ExceptionsTest(unittest.TestCase):
+ def test_failed_connection(self):
+ self.assertRaises(rhnSQL.SQLConnectError, rhnSQL.initDB, 'x/y@z')
+
+if __name__ == '__main__':
+ unittest.main()
commit 777a8f2e4545aa2f6c0f74a1caf4933462314338
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:59 2014 +0100
python oracle driver: fixed bug inside Procedure
The `_munge_arg` method of `Procedure` was broken because:
* it referenced the old `self.proc` variable which is long gone.
* it always converted all the arguments to the 1st sqltype (which
happened to be `sql_types.NUMERIC`).
This commit fixes the `test_new_org_1` test inside of
`test_misc_functions.py`, plus it causes the other tests to fail in a
different way (that's needed to uncover their real issues and fix them).
diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py
index d4892f0..b49154d 100644
--- a/backend/server/rhnSQL/driver_cx_Oracle.py
+++ b/backend/server/rhnSQL/driver_cx_Oracle.py
@@ -316,9 +316,10 @@ class Procedure(sql_base.Procedure):
def _munge_arg(self, val):
for sqltype, db_specific_type in self._type_mapping:
- var = self.proc.var(db_specific_type, val.size)
- var.setvalue(0, val.get_value())
- return var
+ if isinstance(val, sqltype):
+ var = self.cursor.var(db_specific_type, val.size)
+ var.setvalue(0, val.get_value())
+ return var
# XXX
return val.get_value()
commit 76e498765cd122e6efe0c8622c20e721f2b75a14
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:58 2014 +0100
python: fixed create org helper
The python code didn't invoke the stored procedure with the right
arguments.
diff --git a/backend/server/test/attic/rhnServerGroup.py b/backend/server/test/attic/rhnServerGroup.py
index 6482b05..3d5465a 100644
--- a/backend/server/test/attic/rhnServerGroup.py
+++ b/backend/server/test/attic/rhnServerGroup.py
@@ -105,7 +105,10 @@ class CallableObj:
def create_new_org(username, password):
f = rhnSQL.Procedure('create_new_org')
- ncl = rhnSQL.types.NUMBER
- ret = f(username, password, None, None, 'P', ncl(), ncl(), ncl())
- org_id = ret[-3]
- return int(org_id)
+
+ username = rhnSQL.types.STRING(username)
+ password = rhnSQL.types.STRING(password)
+ ncl = rhnSQL.types.NUMBER
+
+ ret = f(username, password, ncl())
+ return int(ret[2])
commit 17dcd79e79b02e6efb975f0e4d3833a2b23e66c8
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:57 2014 +0100
python: fixed error caused by the audit feature
Ensure the audit log table is cleared.
diff --git a/backend/server/test/unit-test/rhnSQL/test_misc_functions.py b/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
index d7f790a..95d0c20 100644
--- a/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
+++ b/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
@@ -36,6 +36,7 @@ class Tests(unittest.TestCase):
password = DB_SETTINGS["password"],
database = DB_SETTINGS["database"]
)
+ rhnSQL.clear_log_id()
def tearDown(self):
# Roll back any unsaved data
commit 7f20a06f50a7f13b7a13dd396348f8a05e1dbd99
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:56 2014 +0100
python tests: initial work on test_misc_functions
Moved db connection settings to a dedicated file.
diff --git a/backend/server/test/unit-test/rhnSQL/db_settings.ini b/backend/server/test/unit-test/rhnSQL/db_settings.ini
new file mode 100644
index 0000000..18b7776
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/db_settings.ini
@@ -0,0 +1,4 @@
+[oracle]
+user: rhnuser
+password: rhnuser
+database: webdev
diff --git a/backend/server/test/unit-test/rhnSQL/test_misc_functions.py b/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
index 1cd74a7..d7f790a 100644
--- a/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
+++ b/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
@@ -24,14 +24,18 @@ from spacewalk.server import rhnSQL
import misc_functions
-DB = 'rhnuser/rhnuser@webdev'
-
+DB_SETTINGS = misc_functions.db_settings("oracle")
class Tests(unittest.TestCase):
def setUp(self):
initCFG("server")
- rhnSQL.initDB(DB)
+ rhnSQL.initDB(
+ backend = "oracle",
+ username = DB_SETTINGS["user"],
+ password = DB_SETTINGS["password"],
+ database = DB_SETTINGS["database"]
+ )
def tearDown(self):
# Roll back any unsaved data
commit f2bb790e925cee32deb0637e3044872af6a9a5dd
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:55 2014 +0100
Moved python tests to a better location.
Moved all the python tests interacting with a database (and hence
relying on rhnSQL) inside of a dedicated directory.
diff --git a/backend/server/test/unit-test/misc_functions.py b/backend/server/test/unit-test/misc_functions.py
deleted file mode 100644
index e77ee76..0000000
--- a/backend/server/test/unit-test/misc_functions.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2010 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 time
-import types
-from spacewalk.server import rhnSQL, rhnServerGroup, rhnUser, rhnActivationKey
-
-def create_new_org():
- "Create a brand new org; return the new org id"
- org_name = "unittest-org-%.3f" % time.time()
- org_password = "unittest-password-%.3f" % time.time()
-
- org_id = rhnServerGroup.create_new_org(org_name, org_password)
- rhnSQL.commit()
- return org_id
-
-def _create_server_group(org_id, name, description, max_members):
- "Create a server group; return the server group object"
- s = rhnServerGroup.ServerGroup()
- s.set_org_id(org_id)
- s.set_name(name)
- s.set_description(description)
- s.set_max_members(max_members)
- s.save()
- rhnSQL.commit()
- return s
-
-def create_server_group(params):
- "Create a server group from a dictionary with the params"
- return apply(_create_server_group, (), params)
-
-def fetch_server_group(org_id, name):
- "Load a server group object from the org id and name"
- s = rhnServerGroup.ServerGroup()
- s.load(org_id, name)
- return s
-
-_query_fetch_server_groups = rhnSQL.Statement("""
- select sgm.server_group_id
- from rhnServerGroupMembers sgm,
- rhnServerGroup sg
- where sgm.server_id = :server_id
- and sgm.server_group_id = sg.id
- and sg.group_type is null
-""")
-def fetch_server_groups(server_id):
- "Return a server's groups"
- h = rhnSQL.prepare(_query_fetch_server_groups)
- h.execute(server_id=server_id)
- groups = map(lambda x: x['server_group_id'], h.fetchall_dict() or [])
- groups.sort()
- return groups
-
-def build_server_group_params(**kwargs):
- "Build params for server groups"
- params = {
- 'org_id' : 'no such org',
- 'name' : "unittest group name %.3f" % time.time(),
- 'description' : "unittest group description %.3f" % time.time(),
- 'max_members' : 1001,
- }
- params.update(kwargs)
- return params
-
-def create_new_user(org_id=None, username=None, password=None, roles=None):
- "Create a new user"
- if org_id is None:
- org_id = create_new_org()
- else:
- org_id = lookup_org_id(org_id)
-
- if username is None:
- username = "unittest-user-%.3f" % time.time()
- if password is None:
- password = "unittest-password-%.3f" % time.time()
- if roles is None:
- roles = []
-
- u = rhnUser.User(username, password)
- u.set_org_id(org_id)
- u.save()
- # The password is scrambled now - re-set it
- u.contact['password'] = password
- u.save()
- user_id = u.getid()
-
- # Set roles
- h = rhnSQL.prepare("""
- select ug.id
- from rhnUserGroupType ugt, rhnUserGroup ug
- where ug.org_id = :org_id
- and ug.group_type = ugt.id
- and ugt.label = :role
- """)
- create_ugm = rhnSQL.Procedure("rhn_user.add_to_usergroup")
- for role in roles:
- h.execute(org_id=org_id, role=role)
- row = h.fetchone_dict()
- if not row:
- raise InvalidRoleError(org_id, role)
-
- user_group_id = row['id']
- create_ugm(user_id, user_group_id)
-
- rhnSQL.commit()
-
- return u
-
-def lookup_org_id(org_id):
- "Look up the org id by user name"
- if isinstance(org_id, types.StringType):
- # Is it a user?
- u = rhnUser.search(org_id)
-
- if not u:
- raise rhnServerGroup.InvalidUserError(org_id)
-
- return u.contact['org_id']
-
- t = rhnSQL.Table('web_customer', 'id')
- row = t[org_id]
- if not row:
- raise rhnServerGroup.InvalidOrgError(org_id)
- return row['id']
-
-class InvalidEntitlementError(Exception):
- pass
-
-class InvalidRoleError(Exception):
- pass
-
-
-def create_activation_key(org_id=None, user_id=None, groups=None,
- channels=None, entitlement_level=None, note=None, server_id=None):
- if org_id is None:
- need_user = 1
- org_id = create_new_org()
- else:
- need_user = 0
-
- if user_id is None:
- if need_user:
- u = create_new_user(org_id=org_id)
- user_id = u.getid()
- else:
- u = rhnUser.User("", "")
- u.reload(user_id)
-
- if groups is None:
- groups = []
- for i in range(3):
- params = build_server_group_params(org_id=org_id)
- sg = create_server_group(params)
- groups.append(sg.get_id())
-
- if channels is None:
- channels = ['rhel-i386-as-3-beta', 'rhel-i386-as-2.1-beta']
-
- if entitlement_level is None:
- entitlement_level = 'provisioning_entitled'
-
- if note is None:
- note = "Test activation key %d" % int(time.time())
-
- a = rhnActivationKey.ActivationKey()
- a.set_user_id(user_id)
- a.set_org_id(org_id)
- a.set_entitlement_level(entitlement_level)
- a.set_note(note)
- a.set_server_groups(groups)
- a.set_channels(channels)
- a.set_server_id(server_id)
- a.save()
- rhnSQL.commit()
-
- return a
diff --git a/backend/server/test/unit-test/rhnSQL/misc_functions.py b/backend/server/test/unit-test/rhnSQL/misc_functions.py
new file mode 100644
index 0000000..41d278f
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/misc_functions.py
@@ -0,0 +1,226 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2010 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 sys
+import time
+import types
+
+from ConfigParser import ConfigParser
+from spacewalk.server import rhnSQL, rhnUser
+
+# Add backend/server/test/attic directory to PYTHONPATH
+sys.path.insert(
+ 0,
+ os.path.abspath(os.path.dirname(os.path.abspath(__file__) + "/../../../attic/"))
+)
+import rhnActivationKey, rhnServerGroup
+
+def create_new_org():
+ "Create a brand new org; return the new org id"
+ org_name = "unittest-org-%.3f" % time.time()
+ org_password = "unittest-password-%.3f" % time.time()
+
+ org_id = rhnServerGroup.create_new_org(org_name, org_password)
+ rhnSQL.commit()
+ return org_id
+
+def _create_server_group(org_id, name, description, max_members):
+ "Create a server group; return the server group object"
+ s = rhnServerGroup.ServerGroup()
+ s.set_org_id(org_id)
+ s.set_name(name)
+ s.set_description(description)
+ s.set_max_members(max_members)
+ s.save()
+ rhnSQL.commit()
+ return s
+
+def create_server_group(params):
+ "Create a server group from a dictionary with the params"
+ return apply(_create_server_group, (), params)
+
+def fetch_server_group(org_id, name):
+ "Load a server group object from the org id and name"
+ s = rhnServerGroup.ServerGroup()
+ s.load(org_id, name)
+ return s
+
+_query_fetch_server_groups = rhnSQL.Statement("""
+ select sgm.server_group_id
+ from rhnServerGroupMembers sgm,
+ rhnServerGroup sg
+ where sgm.server_id = :server_id
+ and sgm.server_group_id = sg.id
+ and sg.group_type is null
+""")
+def fetch_server_groups(server_id):
+ "Return a server's groups"
+ h = rhnSQL.prepare(_query_fetch_server_groups)
+ h.execute(server_id=server_id)
+ groups = map(lambda x: x['server_group_id'], h.fetchall_dict() or [])
+ groups.sort()
+ return groups
+
+def build_server_group_params(**kwargs):
+ "Build params for server groups"
+ params = {
+ 'org_id' : 'no such org',
+ 'name' : "unittest group name %.3f" % time.time(),
+ 'description' : "unittest group description %.3f" % time.time(),
+ 'max_members' : 1001,
+ }
+ params.update(kwargs)
+ return params
+
+def create_new_user(org_id=None, username=None, password=None, roles=None):
+ "Create a new user"
+ if org_id is None:
+ org_id = create_new_org()
+ else:
+ org_id = lookup_org_id(org_id)
+
+ if username is None:
+ username = "unittest-user-%.3f" % time.time()
+ if password is None:
+ password = "unittest-password-%.3f" % time.time()
+ if roles is None:
+ roles = []
+
+ u = rhnUser.User(username, password)
+ u.set_org_id(org_id)
+ u.save()
+ # The password is scrambled now - re-set it
+ u.contact['password'] = password
+ u.save()
+ user_id = u.getid()
+
+ # Set roles
+ h = rhnSQL.prepare("""
+ select ug.id
+ from rhnUserGroupType ugt, rhnUserGroup ug
+ where ug.org_id = :org_id
+ and ug.group_type = ugt.id
+ and ugt.label = :role
+ """)
+ create_ugm = rhnSQL.Procedure("rhn_user.add_to_usergroup")
+ for role in roles:
+ h.execute(org_id=org_id, role=role)
+ row = h.fetchone_dict()
+ if not row:
+ raise InvalidRoleError(org_id, role)
+
+ user_group_id = row['id']
+ create_ugm(user_id, user_group_id)
+
+ rhnSQL.commit()
+
+ return u
+
+def lookup_org_id(org_id):
+ "Look up the org id by user name"
+ if isinstance(org_id, types.StringType):
+ # Is it a user?
+ u = rhnUser.search(org_id)
+
+ if not u:
+ raise rhnServerGroup.InvalidUserError(org_id)
+
+ return u.contact['org_id']
+
+ t = rhnSQL.Table('web_customer', 'id')
+ row = t[org_id]
+ if not row:
+ raise rhnServerGroup.InvalidOrgError(org_id)
+ return row['id']
+
+class InvalidEntitlementError(Exception):
+ pass
+
+class InvalidRoleError(Exception):
+ pass
+
+
+def create_activation_key(org_id=None, user_id=None, groups=None,
+ channels=None, entitlement_level=None, note=None, server_id=None):
+ if org_id is None:
+ need_user = 1
+ org_id = create_new_org()
+ else:
+ need_user = 0
+
+ if user_id is None:
+ if need_user:
+ u = create_new_user(org_id=org_id)
+ user_id = u.getid()
+ else:
+ u = rhnUser.User("", "")
+ u.reload(user_id)
+
+ if groups is None:
+ groups = []
+ for i in range(3):
+ params = build_server_group_params(org_id=org_id)
+ sg = create_server_group(params)
+ groups.append(sg.get_id())
+
+ if channels is None:
+ channels = ['rhel-i386-as-3-beta', 'rhel-i386-as-2.1-beta']
+
+ if entitlement_level is None:
+ entitlement_level = 'provisioning_entitled'
+
+ if note is None:
+ note = "Test activation key %d" % int(time.time())
+
+ a = rhnActivationKey.ActivationKey()
+ a.set_user_id(user_id)
+ a.set_org_id(org_id)
+ a.set_entitlement_level(entitlement_level)
+ a.set_note(note)
+ a.set_server_groups(groups)
+ a.set_channels(channels)
+ a.set_server_id(server_id)
+ a.save()
+ rhnSQL.commit()
+
+ return a
+
+def db_settings(backend):
+ """
+ Parses the contents of the db_settings.ini file and returns the connection
+ settings of the required backend inside of a dictionary with the following
+ keys:
+ * user
+ * password
+ * database
+ * host (returned only by PostgreSQL backend)
+ """
+ settings = {}
+
+ config = ConfigParser()
+ config.read(os.path.dirname(os.path.abspath(__file__)) + "/db_settings.ini")
+
+ settings['user'] = config.get(backend, 'user')
+ settings['password'] = config.get(backend, 'password')
+ settings['database'] = config.get(backend, 'database')
+ if backend == 'postgresql':
+ settings['host'] = config.get(backend, 'host')
+
+ return settings
diff --git a/backend/server/test/unit-test/rhnSQL/test_misc_functions.py b/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
new file mode 100644
index 0000000..1cd74a7
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/test_misc_functions.py
@@ -0,0 +1,124 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2011 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 sys
+import unittest
+from spacewalk.common.rhnConfig import initCFG
+from spacewalk.server import rhnSQL
+
+import misc_functions
+
+DB = 'rhnuser/rhnuser@webdev'
+
+
+class Tests(unittest.TestCase):
+
+ def setUp(self):
+ initCFG("server")
+ rhnSQL.initDB(DB)
+
+ def tearDown(self):
+ # Roll back any unsaved data
+ rhnSQL.rollback()
+
+ def test_new_org_1(self):
+ org_id = misc_functions.create_new_org()
+ h = rhnSQL.prepare("select id from web_customer where id = :id")
+ h.execute(id=org_id)
+ row = h.fetchone_dict()
+ self.assertNotEqual(row, None)
+ self.assertEqual(row['id'], org_id)
+
+ def _verify_new_user(self, u):
+ uid = u.getid()
+ login = u.contact["login"]
+ org_id = u.contact["org_id"]
+
+ h = rhnSQL.prepare("select login, org_id from web_contact where id = :id")
+ h.execute(id=uid)
+ row = h.fetchone_dict()
+ self.assertNotEqual(row, None)
+ self.assertEqual(row['login'], login)
+ self.assertEqual(row['org_id'], org_id)
+
+ def test_new_user_1(self):
+ "Create a new user"
+ u = misc_functions.create_new_user()
+ self._verify_new_user(u)
+
+ def test_new_user_2(self):
+ "Create a new user in an existing org"
+ org_id = misc_functions.create_new_org()
+ u = misc_functions.create_new_user(org_id=org_id)
+ self._verify_new_user(u)
+ self.assertEqual(org_id, u.contact['org_id'])
+
+ def test_new_users_1(self):
+ "Create a bunch of new users in an org"
+ org_id = misc_functions.create_new_org()
+ for i in range(10):
+ u = misc_functions.create_new_user(org_id=org_id)
+ self._verify_new_user(u)
+ self.assertEqual(org_id, u.contact['org_id'])
+
+ def test_grant_channel_family_1(self):
+ "Grant channel family entitlements"
+ org_id = misc_functions.create_new_org()
+ channel_family = 'rhel-as'
+ quantity = 19
+ misc_functions.grant_channel_family_entitlements(org_id,
+ channel_family, quantity)
+
+ h = rhnSQL.prepare("""
+ select cfp.max_members
+ from rhnChannelFamily cf, rhnChannelFamilyPermissions cfp
+ where cfp.org_id = :org_id
+ and cfp.channel_family_id = cf.id
+ and cf.label = :channel_family
+ """)
+ h.execute(org_id=org_id, channel_family=channel_family)
+ row = h.fetchone_dict()
+ self.assertNotEqual(row, None)
+ self.assertEqual(row['max_members'], quantity)
+
+ def test_grant_entitlements_q(self):
+ "Grant entitlements"
+ org_id = misc_functions.create_new_org()
+ entitlement_level = 'provisioning_entitled'
+ quantity = 17
+
+ misc_functions.grant_entitlements(org_id, entitlement_level, quantity)
+
+ # Verify
+ h = rhnSQL.prepare("""
+ select sg.max_members quantity
+ from rhnServerGroupType sgt, rhnServerGroup sg
+ where sg.org_id = :org_id
+ and sg.group_type = sgt.id
+ and sgt.label = :entitlement_level
+ """)
+ h.execute(org_id=org_id, entitlement_level=entitlement_level)
+ row = h.fetchone_dict()
+
+ self.assertNotEqual(row, None)
+ self.assertEqual(row['quantity'], quantity)
+
+
+if __name__ == '__main__':
+ sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py b/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py
new file mode 100644
index 0000000..83794fc
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/test_rhnActivationKey.py
@@ -0,0 +1,98 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2010 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 sys
+import time
+import unittest
+from spacewalk.server import rhnSQL, rhnActivationKey
+
+import misc_functions
+
+DB = 'rhnuser/rhnuser@webdev'
+
+
+class Tests(unittest.TestCase):
+
+ def setUp(self):
+ rhnSQL.initDB(DB)
+
+ def tearDown(self):
+ # Roll back any unsaved data
+ rhnSQL.rollback()
+
+ def test_new_activation_key_1(self):
+ org_id = misc_functions.create_new_org()
+ u = misc_functions.create_new_user(org_id=org_id)
+
+ groups = []
+ for i in range(3):
+ params = misc_functions.build_server_group_params(org_id=org_id)
+ sg = misc_functions.create_server_group(params)
+ groups.append(sg.get_id())
+ groups.sort()
+
+ channels = ['rhn-tools-rhel-2.1-as-i386',
+ 'rhn-tools-rhel-2.1-es-i386', 'rhn-tools-rhel-2.1-ws-i386']
+ channels.sort()
+
+ token_user_id = u.getid()
+ token_org_id = org_id
+ token_entitlement_level = {
+ 'provisioning_entitled' : None,
+ 'enterprise_entitled' : None,
+ }
+ token_note = "Test activation key %d" % int(time.time())
+
+ a = misc_functions.create_activation_key(org_id=token_org_id,
+ user_id=token_user_id, entitlement_level=token_entitlement_level,
+ note=token_note, groups=groups, channels=channels)
+
+ token = a.get_token()
+
+ a = rhnActivationKey.ActivationKey()
+ a.load(token)
+
+ self.assertEqual(a.get_user_id(), token_user_id)
+ self.assertEqual(a.get_org_id(), token_org_id)
+ self.assertEqual(a.get_entitlement_level(), token_entitlement_level)
+ self.assertEqual(a.get_note(), token_note)
+ g = a.get_server_groups()
+ g.sort()
+ self.assertEqual(g, groups)
+
+ g = a.get_channels()
+ g.sort()
+ self.assertEqual(g, channels)
+
+ def test_exception_token_load_1(self):
+ a = rhnActivationKey.ActivationKey()
+ self.assertRaises(rhnActivationKey.InvalidTokenError, a.load, "a")
+
+ def test_exception_token_channels_1(self):
+ a = rhnActivationKey.ActivationKey()
+ self.assertRaises(rhnActivationKey.InvalidChannelError, a.set_channels,
+ ["a"])
+
+ def test_exception_token_entitlement_level_1(self):
+ a = rhnActivationKey.ActivationKey()
+ self.assertRaises(rhnActivationKey.InvalidEntitlementError,
+ a.set_entitlement_level, {'a' : None})
+
+if __name__ == '__main__':
+ sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py b/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py
new file mode 100644
index 0000000..a0d363e
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/test_rhnChannel.py
@@ -0,0 +1,190 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2011 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 sys
+import time
+import unittest
+from spacewalk.server import rhnSQL, rhnChannel
+
+DB = 'rhnuser/rhnuser@webdev'
+
+
+class Tests(unittest.TestCase):
+
+ def setUp(self):
+ rhnSQL.initDB(DB)
+
+ def tearDown(self):
+ # Roll back any unsaved data
+ rhnSQL.rollback()
+
+ def test_new_channel_1(self):
+ """Tests new channel creation"""
+ cf = rhnChannel.ChannelFamily()
+ cf.load_from_dict(self._new_channel_family_dict())
+ cf.save()
+
+ label = cf.get_label()
+ vdict = self._new_channel_dict(label=label, channel_family=label)
+
+ c = rhnChannel.Channel()
+ for k, v in vdict.items():
+ method = getattr(c, "set_" + k)
+ method(v)
+ c.save()
+ channel_id = c.get_id()
+
+ c = rhnChannel.Channel()
+ c.load_by_label(label)
+ for k, v in vdict.items():
+ method = getattr(c, "get_" + k)
+ dbv = method()
+ self.assertEqual(v, dbv)
+ rhnSQL.commit()
+ return c
+
+ def test_new_channel_2(self):
+ """Tests new channel creation from dictionary"""
+ cf = rhnChannel.ChannelFamily()
+ cf.load_from_dict(self._new_channel_family_dict())
+ cf.save()
+
+ label = cf.get_label()
+ vdict = self._new_channel_dict(label=label, channel_family=label)
+
+ c = rhnChannel.Channel()
+ c.load_from_dict(vdict)
+ c.save()
+ channel_id = c.get_id()
+
+ c = rhnChannel.Channel()
+ c.load_by_label(label)
+ for k, v in vdict.items():
+ method = getattr(c, "get_" + k)
+ dbv = method()
+ self.assertEqual(v, dbv)
+ rhnSQL.commit()
+ return c
+
+ def test_new_channel_family_1(self):
+ """Tests new channel family creation"""
+ vdict = self._new_channel_family_dict()
+ label = vdict['label']
+
+ c = rhnChannel.ChannelFamily()
+ for k, v in vdict.items():
+ method = getattr(c, "set_" + k)
+ method(v)
+ c.save()
+ channel_id = c.get_id()
+
+ c = rhnChannel.ChannelFamily()
+ c.load_by_label(label)
+ for k, v in vdict.items():
+ method = getattr(c, "get_" + k)
+ dbv = method()
+ self.assertEqual(v, dbv)
+ rhnSQL.commit()
+ return c
+
+ def test_new_channel_family_2(self):
+ """Tests new channel family creation from a dict"""
+ vdict = self._new_channel_family_dict()
+ label = vdict['label']
+
+ c = rhnChannel.ChannelFamily()
+ c.load_from_dict(vdict)
+ c.save()
+ channel_id = c.get_id()
+
+ c = rhnChannel.ChannelFamily()
+ c.load_by_label(label)
+ for k, v in vdict.items():
+ method = getattr(c, "get_" + k)
+ dbv = method()
+ self.assertEqual(v, dbv)
+ rhnSQL.commit()
+ return c
+
+ def test_list_channel_families_1(self):
+ """Tests rhnChannel.list_channel_families"""
+ channel_families = rhnChannel.list_channel_families()
+ self.failUnless(len(channel_families) > 0)
+
+ def test_list_channels_1(self):
+ """Tests rhnChannel.list_channels"""
+ channels = rhnChannel.list_channels(pattern="redhat-%")
+ self.failUnless(len(channels) > 0)
+
+ def _new_channel_dict(self, **kwargs):
+ if not hasattr(self, '_counter'):
+ self._counter = 0
+
+ label = kwargs.get('label')
+ if label is None:
+ label = 'rhn-unittest-%.3f-%s' % (time.time(), self._counter)
+ self._counter = self._counter + 1
+
+ release = kwargs.get('release') or 'release-' + label
+ os = kwargs.get('os') or 'Unittest Distro'
+ if kwargs.has_key('org_id'):
+ org_id = kwargs['org_id']
+ else:
+ org_id = 'rhn-noc'
+
+ vdict = {
+ 'label' : label,
+ 'name' : kwargs.get('name') or label,
+ 'summary' : kwargs.get('summary') or label,
+ 'description' : kwargs.get('description') or label,
+ 'basedir' : kwargs.get('basedir') or '/',
+ 'channel_arch' : kwargs.get('channel_arch') or 'channel-x86_64',
+ 'channel_families' : [ kwargs.get('channel_family') or label ],
+ 'org_id' : org_id,
+ 'gpg_key_url' : kwargs.get('gpg_key_url'),
+ 'gpg_key_id' : kwargs.get('gpg_key_id'),
+ 'gpg_key_fp' : kwargs.get('gpg_key_fp'),
+ 'end_of_life' : kwargs.get('end_of_life'),
+ 'dists' : [{
+ 'release' : release,
+ 'os' : os,
+ }],
+ }
+ return vdict
+
+ def _new_channel_family_dict(self, **kwargs):
+ if not hasattr(self, '_counter'):
+ self._counter = 0
+
+ label = kwargs.get('label')
+ if label is None:
+ label = 'rhn-unittest-%.3f-%s' % (time.time(), self._counter)
+ self._counter = self._counter + 1
+
+ product_url = kwargs.get('product_url') or 'http://rhn.redhat.com'
+
+ vdict = {
+ 'label' : label,
+ 'name' : kwargs.get('name') or label,
+ 'product_url' : product_url,
+ }
+ return vdict
+
+if __name__ == '__main__':
+ sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py b/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py
new file mode 100644
index 0000000..61638f1
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/test_rhnServerGroup.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2010 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 sys
+import unittest
+from spacewalk.server import rhnSQL, rhnServerGroup
+
+import misc_functions
+
+DB = 'rhnuser/rhnuser@webdev'
+
+
+class Tests(unittest.TestCase):
+
+ def setUp(self):
+ rhnSQL.initDB(DB)
+
+ def tearDown(self):
+ # Roll back any unsaved data
+ rhnSQL.rollback()
+
+ def test_new_org_1(self):
+ org_id = misc_functions.create_new_org()
+ h = rhnSQL.prepare("select id from web_customer where id = :id")
+ h.execute(id=org_id)
+ row = h.fetchone_dict()
+ self.assertNotEqual(row, None)
+ self.assertEqual(row['id'], org_id)
+
+ def test_new_server_group_new_org_1(self):
+ org_id = misc_functions.create_new_org()
+ params = misc_functions.build_server_group_params(org_id=org_id)
+
+ misc_functions.create_server_group(params)
+
+ s = misc_functions.fetch_server_group(params['org_id'], params['name'])
+ self.assertEqual(s.get_name(), params['name'])
+ self.assertEqual(s.get_description(), params['description'])
+ self.assertEqual(s.get_max_members(), params['max_members'])
+
+ def test_exception_user_missing_1(self):
+ params = misc_functions.build_server_group_params(org_id="no such user")
+ self.assertRaises(rhnServerGroup.InvalidUserError,
+ misc_functions.create_server_group, params)
+
+ def test_exception_org_missing_1(self):
+ params = misc_functions.build_server_group_params(org_id=-1)
+ self.assertRaises(rhnServerGroup.InvalidOrgError,
+ misc_functions.create_server_group, params)
+
+
+if __name__ == '__main__':
+ sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/rhnSQL/test_server_registration.py b/backend/server/test/unit-test/rhnSQL/test_server_registration.py
new file mode 100644
index 0000000..10288de
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/test_server_registration.py
@@ -0,0 +1,245 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2012 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.
+#
+#
+# Tests verious codepaths for server registration
+#
+
+import sys
+import unittest
+from spacewalk.common import rhnFlags
+from spacewalk.common.rhnConfig import initCFG
+from spacewalk.server import rhnSQL, rhnServer, rhnChannel
+from spacewalk.server.xmlrpc import registration
+
+import misc_functions
+
+DB = 'rhnuser/rhnuser@webdev'
+
+
+class Tests(unittest.TestCase):
+ _channel = 'redhat-advanced-server-i386'
+ _channel_family = 'rhel-as'
+ _entitlements = {
+ 'enterprise_entitled' : None
+ }
+
+ def setUp(self):
+ initCFG("server.xmlrpc")
+ rhnSQL.initDB(DB)
+
+ def tearDown(self):
+ # Roll back any unsaved data
+ rhnSQL.rollback()
+
+ def test_new_server_1(self):
+ "Test normal server registration, with username/password"
+ u = self._create_new_user()
+ username = u.contact['login']
+ password = u.contact['password']
+ params = build_new_system_params_with_username(username=username,
+ password=password, os_release="2.1AS")
+
+ system_id = register_new_system(params)
+ rhnSQL.commit()
+
+ s = rhnServer.get(system_id)
+ self.assertNotEqual(s, None)
+
+ server_id = s.getid()
+ channels = rhnChannel.channels_for_server(server_id)
+ self.assertEqual(len(channels), 1)
+ self.assertEqual(channels[0]['label'], self._channel)
+
+ def test_new_server_token_1(self):
+ "Test registration with token"
+ u = self._create_new_user()
+ org_id = u.contact['org_id']
+ entitlements = self._entitlements
+ t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
+ entitlement_level=entitlements, user_id=u.getid())
+
+ token = t.get_token()
+
+ params = build_new_system_params_with_token(token=token)
+
+ system_id = register_new_system(params)
+ rhnSQL.commit()
+
+ s = rhnServer.get(system_id)
+ self.assertNotEqual(s, None)
+
+ def test_new_server_token_2(self):
+ "Test registration with token that specifies a base channel"
+ u = self._create_new_user()
+ org_id = u.contact['org_id']
+ base_channel = 'rhel-i386-as-3'
+ entitlements = self._entitlements
+ t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
+ entitlement_level=entitlements, user_id=u.getid(),
+ channels=[base_channel])
+
+ token = t.get_token()
+
+ params = build_new_system_params_with_token(token=token,
+ os_release="2.1AS")
+
+ system_id = register_new_system(params)
+ rhnSQL.commit()
+
+ s = rhnServer.get(system_id)
+ self.assertNotEqual(s, None)
+
+ server_id = s.getid()
+ channels = rhnChannel.channels_for_server(server_id)
+ self.assertEqual(len(channels), 1)
+ self.assertEqual(channels[0]['label'], base_channel)
+
+ def test_new_server_reactivation_token_1(self):
+ "Test server re-registration"
+ u = self._create_new_user()
+ username = u.contact['login']
+ password = u.contact['password']
+ params = build_new_system_params_with_username(username=username,
+ password=password, os_release="2.1AS")
+
+ system_id = register_new_system(params)
+ rhnSQL.commit()
+
+ s1 = rhnServer.get(system_id)
+ self.assertNotEqual(s1, None)
+
+ server_id_1 = s1.getid()
+ groups1 = misc_functions.fetch_server_groups(server_id_1)
+
+ # Build a re-registration token
+ base_channel = 'rhel-i386-as-3'
+ entitlements = self._entitlements
+ t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
+ entitlement_level=entitlements, user_id=u.getid(),
+ channels=[base_channel], server_id=server_id_1)
+
+ token = t.get_token()
+
+ params = build_new_system_params_with_token(token=token,
+ os_release="2.1AS")
+ system_id = register_new_system(params)
+ rhnSQL.commit()
+
+ s2 = rhnServer.get(system_id)
+ server_id_2 = s2.getid()
+
+ groups2 = misc_functions.fetch_server_groups(server_id_2)
+
+ self.assertNotEqual(s2, None)
+ self.assertEqual(server_id_1, server_id_2)
+ # Should be subscribed to the same groups
+ self.assertEqual(groups1, groups2)
+
+ def test_new_server_multiple_tokens_1(self):
+ """Test registration with multiple activation tokens
+ Resulting server group is the union of all server groups from all
+ tokens
+ """
+ u = self._create_new_user()
+ org_id = u.contact['org_id']
+ entitlements = self._entitlements
+ t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
+ entitlement_level=entitlements, user_id=u.getid())
+
+ token1 = t.get_token()
+ sg1 = t.get_server_groups()
+
+ t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
+ entitlement_level=entitlements, user_id=u.getid())
+
+ token2 = t.get_token()
+ sg2 = t.get_server_groups()
+
+ token = token1 + ',' + token2
+
+ params = build_new_system_params_with_token(token=token,
+ os_release="2.1AS")
+
+ system_id = register_new_system(params)
+ rhnSQL.commit()
+
+ s = rhnServer.get(system_id)
+ self.assertNotEqual(s, None)
+
+ server_id = s.getid()
+ sgs = misc_functions.fetch_server_groups(server_id)
+ sgstgt = sg1 + sg2
+ sgstgt.sort()
+
+ self.assertEqual(sgs, sgstgt)
+
+
+ def _create_new_user(self):
+ # Create new org
+ org_id = misc_functions.create_new_org()
+
+ # Grant entitlements to the org
+ misc_functions.grant_entitlements(org_id, 'enterprise_entitled', 1)
+ misc_functions.grant_channel_family_entitlements(org_id,
+ self._channel_family, 1)
+
+ # Create new user
+ u = misc_functions.create_new_user(org_id=org_id, roles=['org_admin'])
+ username = u.contact['login']
+ # XXX This will break on satellites where passwords are encrypted
+ password = u.contact['password']
+ return u
+
+class Counter:
+ _counter = 0
+ def value(self):
+ val = self._counter
+ self._counter = val + 1
+ return val
+
+def build_new_system_params_with_username(**kwargs):
+ import time
+ val = Counter().value()
+ rnd_string = "%d-%d" % (int(time.time()), val)
+
+ params = {
+ 'os_release' : '9',
+ 'architecture' : 'i686-redhat-linux',
+ 'profile_name' : "unittest server " + rnd_string,
+ 'username' : 'no such user',
+ 'password' : 'no such password',
+ }
+ params.update(kwargs)
+ if params.has_key('token'):
+ del params['token']
+ return params
+
+def build_new_system_params_with_token(**kwargs):
+ params = {
+ 'token' : kwargs.get('token', "no such token"),
+ }
+ params.update(apply(build_new_system_params_with_username, (), kwargs))
+ del params['username']
+ del params['password']
+ return params
+
+def register_new_system(params):
+ rhnFlags.reset()
+ return registration.Registration().new_system(params)
+
+
+if __name__ == '__main__':
+ sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/test_misc_functions.py b/backend/server/test/unit-test/test_misc_functions.py
deleted file mode 100644
index 04f038b..0000000
--- a/backend/server/test/unit-test/test_misc_functions.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2011 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 sys
-import unittest
-from spacewalk.common.rhnConfig import initCFG
-from spacewalk.server import rhnSQL
-
-import misc_functions
-
-DB = 'rhnuser/rhnuser@webdev'
-
-
-class Tests(unittest.TestCase):
-
- def setUp(self):
- initCFG("server")
- rhnSQL.initDB(DB)
-
- def tearDown(self):
- # Roll back any unsaved data
- rhnSQL.rollback()
-
- def test_new_org_1(self):
- org_id = misc_functions.create_new_org()
- h = rhnSQL.prepare("select id from web_customer where id = :id")
- h.execute(id=org_id)
- row = h.fetchone_dict()
- self.assertNotEqual(row, None)
- self.assertEqual(row['id'], org_id)
-
- def _verify_new_user(self, u):
- uid = u.getid()
- login = u.contact["login"]
- org_id = u.contact["org_id"]
-
- h = rhnSQL.prepare("select login, org_id from web_contact where id = :id")
- h.execute(id=uid)
- row = h.fetchone_dict()
- self.assertNotEqual(row, None)
- self.assertEqual(row['login'], login)
- self.assertEqual(row['org_id'], org_id)
-
- def test_new_user_1(self):
- "Create a new user"
- u = misc_functions.create_new_user()
- self._verify_new_user(u)
-
- def test_new_user_2(self):
- "Create a new user in an existing org"
- org_id = misc_functions.create_new_org()
- u = misc_functions.create_new_user(org_id=org_id)
- self._verify_new_user(u)
- self.assertEqual(org_id, u.contact['org_id'])
-
- def test_new_users_1(self):
- "Create a bunch of new users in an org"
- org_id = misc_functions.create_new_org()
- for i in range(10):
- u = misc_functions.create_new_user(org_id=org_id)
- self._verify_new_user(u)
- self.assertEqual(org_id, u.contact['org_id'])
-
- def test_grant_channel_family_1(self):
- "Grant channel family entitlements"
- org_id = misc_functions.create_new_org()
- channel_family = 'rhel-as'
- quantity = 19
- misc_functions.grant_channel_family_entitlements(org_id,
- channel_family, quantity)
-
- h = rhnSQL.prepare("""
- select cfp.max_members
- from rhnChannelFamily cf, rhnChannelFamilyPermissions cfp
- where cfp.org_id = :org_id
- and cfp.channel_family_id = cf.id
- and cf.label = :channel_family
- """)
- h.execute(org_id=org_id, channel_family=channel_family)
- row = h.fetchone_dict()
- self.assertNotEqual(row, None)
- self.assertEqual(row['max_members'], quantity)
-
- def test_grant_entitlements_q(self):
- "Grant entitlements"
- org_id = misc_functions.create_new_org()
- entitlement_level = 'provisioning_entitled'
- quantity = 17
-
- misc_functions.grant_entitlements(org_id, entitlement_level, quantity)
-
- # Verify
- h = rhnSQL.prepare("""
- select sg.max_members quantity
- from rhnServerGroupType sgt, rhnServerGroup sg
- where sg.org_id = :org_id
- and sg.group_type = sgt.id
- and sgt.label = :entitlement_level
- """)
- h.execute(org_id=org_id, entitlement_level=entitlement_level)
- row = h.fetchone_dict()
-
- self.assertNotEqual(row, None)
- self.assertEqual(row['quantity'], quantity)
-
-
-if __name__ == '__main__':
- sys.exit(unittest.main() or 0)
-
diff --git a/backend/server/test/unit-test/test_rhnActivationKey.py b/backend/server/test/unit-test/test_rhnActivationKey.py
deleted file mode 100644
index 83794fc..0000000
--- a/backend/server/test/unit-test/test_rhnActivationKey.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2010 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 sys
-import time
-import unittest
-from spacewalk.server import rhnSQL, rhnActivationKey
-
-import misc_functions
-
-DB = 'rhnuser/rhnuser@webdev'
-
-
-class Tests(unittest.TestCase):
-
- def setUp(self):
- rhnSQL.initDB(DB)
-
- def tearDown(self):
- # Roll back any unsaved data
- rhnSQL.rollback()
-
- def test_new_activation_key_1(self):
- org_id = misc_functions.create_new_org()
- u = misc_functions.create_new_user(org_id=org_id)
-
- groups = []
- for i in range(3):
- params = misc_functions.build_server_group_params(org_id=org_id)
- sg = misc_functions.create_server_group(params)
- groups.append(sg.get_id())
- groups.sort()
-
- channels = ['rhn-tools-rhel-2.1-as-i386',
- 'rhn-tools-rhel-2.1-es-i386', 'rhn-tools-rhel-2.1-ws-i386']
- channels.sort()
-
- token_user_id = u.getid()
- token_org_id = org_id
- token_entitlement_level = {
- 'provisioning_entitled' : None,
- 'enterprise_entitled' : None,
- }
- token_note = "Test activation key %d" % int(time.time())
-
- a = misc_functions.create_activation_key(org_id=token_org_id,
- user_id=token_user_id, entitlement_level=token_entitlement_level,
- note=token_note, groups=groups, channels=channels)
-
- token = a.get_token()
-
- a = rhnActivationKey.ActivationKey()
- a.load(token)
-
- self.assertEqual(a.get_user_id(), token_user_id)
- self.assertEqual(a.get_org_id(), token_org_id)
- self.assertEqual(a.get_entitlement_level(), token_entitlement_level)
- self.assertEqual(a.get_note(), token_note)
- g = a.get_server_groups()
- g.sort()
- self.assertEqual(g, groups)
-
- g = a.get_channels()
- g.sort()
- self.assertEqual(g, channels)
-
- def test_exception_token_load_1(self):
- a = rhnActivationKey.ActivationKey()
- self.assertRaises(rhnActivationKey.InvalidTokenError, a.load, "a")
-
- def test_exception_token_channels_1(self):
- a = rhnActivationKey.ActivationKey()
- self.assertRaises(rhnActivationKey.InvalidChannelError, a.set_channels,
- ["a"])
-
- def test_exception_token_entitlement_level_1(self):
- a = rhnActivationKey.ActivationKey()
- self.assertRaises(rhnActivationKey.InvalidEntitlementError,
- a.set_entitlement_level, {'a' : None})
-
-if __name__ == '__main__':
- sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/test_rhnChannel.py b/backend/server/test/unit-test/test_rhnChannel.py
deleted file mode 100644
index a0d363e..0000000
--- a/backend/server/test/unit-test/test_rhnChannel.py
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2011 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 sys
-import time
-import unittest
-from spacewalk.server import rhnSQL, rhnChannel
-
-DB = 'rhnuser/rhnuser@webdev'
-
-
-class Tests(unittest.TestCase):
-
- def setUp(self):
- rhnSQL.initDB(DB)
-
- def tearDown(self):
- # Roll back any unsaved data
- rhnSQL.rollback()
-
- def test_new_channel_1(self):
- """Tests new channel creation"""
- cf = rhnChannel.ChannelFamily()
- cf.load_from_dict(self._new_channel_family_dict())
- cf.save()
-
- label = cf.get_label()
- vdict = self._new_channel_dict(label=label, channel_family=label)
-
- c = rhnChannel.Channel()
- for k, v in vdict.items():
- method = getattr(c, "set_" + k)
- method(v)
- c.save()
- channel_id = c.get_id()
-
- c = rhnChannel.Channel()
- c.load_by_label(label)
- for k, v in vdict.items():
- method = getattr(c, "get_" + k)
- dbv = method()
- self.assertEqual(v, dbv)
- rhnSQL.commit()
- return c
-
- def test_new_channel_2(self):
- """Tests new channel creation from dictionary"""
- cf = rhnChannel.ChannelFamily()
- cf.load_from_dict(self._new_channel_family_dict())
- cf.save()
-
- label = cf.get_label()
- vdict = self._new_channel_dict(label=label, channel_family=label)
-
- c = rhnChannel.Channel()
- c.load_from_dict(vdict)
- c.save()
- channel_id = c.get_id()
-
- c = rhnChannel.Channel()
- c.load_by_label(label)
- for k, v in vdict.items():
- method = getattr(c, "get_" + k)
- dbv = method()
- self.assertEqual(v, dbv)
- rhnSQL.commit()
- return c
-
- def test_new_channel_family_1(self):
- """Tests new channel family creation"""
- vdict = self._new_channel_family_dict()
- label = vdict['label']
-
- c = rhnChannel.ChannelFamily()
- for k, v in vdict.items():
- method = getattr(c, "set_" + k)
- method(v)
- c.save()
- channel_id = c.get_id()
-
- c = rhnChannel.ChannelFamily()
- c.load_by_label(label)
- for k, v in vdict.items():
- method = getattr(c, "get_" + k)
- dbv = method()
- self.assertEqual(v, dbv)
- rhnSQL.commit()
- return c
-
- def test_new_channel_family_2(self):
- """Tests new channel family creation from a dict"""
- vdict = self._new_channel_family_dict()
- label = vdict['label']
-
- c = rhnChannel.ChannelFamily()
- c.load_from_dict(vdict)
- c.save()
- channel_id = c.get_id()
-
- c = rhnChannel.ChannelFamily()
- c.load_by_label(label)
- for k, v in vdict.items():
- method = getattr(c, "get_" + k)
- dbv = method()
- self.assertEqual(v, dbv)
- rhnSQL.commit()
- return c
-
- def test_list_channel_families_1(self):
- """Tests rhnChannel.list_channel_families"""
- channel_families = rhnChannel.list_channel_families()
- self.failUnless(len(channel_families) > 0)
-
- def test_list_channels_1(self):
- """Tests rhnChannel.list_channels"""
- channels = rhnChannel.list_channels(pattern="redhat-%")
- self.failUnless(len(channels) > 0)
-
- def _new_channel_dict(self, **kwargs):
- if not hasattr(self, '_counter'):
- self._counter = 0
-
- label = kwargs.get('label')
- if label is None:
- label = 'rhn-unittest-%.3f-%s' % (time.time(), self._counter)
- self._counter = self._counter + 1
-
- release = kwargs.get('release') or 'release-' + label
- os = kwargs.get('os') or 'Unittest Distro'
- if kwargs.has_key('org_id'):
- org_id = kwargs['org_id']
- else:
- org_id = 'rhn-noc'
-
- vdict = {
- 'label' : label,
- 'name' : kwargs.get('name') or label,
- 'summary' : kwargs.get('summary') or label,
- 'description' : kwargs.get('description') or label,
- 'basedir' : kwargs.get('basedir') or '/',
- 'channel_arch' : kwargs.get('channel_arch') or 'channel-x86_64',
- 'channel_families' : [ kwargs.get('channel_family') or label ],
- 'org_id' : org_id,
- 'gpg_key_url' : kwargs.get('gpg_key_url'),
- 'gpg_key_id' : kwargs.get('gpg_key_id'),
- 'gpg_key_fp' : kwargs.get('gpg_key_fp'),
- 'end_of_life' : kwargs.get('end_of_life'),
- 'dists' : [{
- 'release' : release,
- 'os' : os,
- }],
- }
- return vdict
-
- def _new_channel_family_dict(self, **kwargs):
- if not hasattr(self, '_counter'):
- self._counter = 0
-
- label = kwargs.get('label')
- if label is None:
- label = 'rhn-unittest-%.3f-%s' % (time.time(), self._counter)
- self._counter = self._counter + 1
-
- product_url = kwargs.get('product_url') or 'http://rhn.redhat.com'
-
- vdict = {
- 'label' : label,
- 'name' : kwargs.get('name') or label,
- 'product_url' : product_url,
- }
- return vdict
-
-if __name__ == '__main__':
- sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/test_rhnServerGroup.py b/backend/server/test/unit-test/test_rhnServerGroup.py
deleted file mode 100644
index 61638f1..0000000
--- a/backend/server/test/unit-test/test_rhnServerGroup.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2010 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 sys
-import unittest
-from spacewalk.server import rhnSQL, rhnServerGroup
-
-import misc_functions
-
-DB = 'rhnuser/rhnuser@webdev'
-
-
-class Tests(unittest.TestCase):
-
- def setUp(self):
- rhnSQL.initDB(DB)
-
- def tearDown(self):
- # Roll back any unsaved data
- rhnSQL.rollback()
-
- def test_new_org_1(self):
- org_id = misc_functions.create_new_org()
- h = rhnSQL.prepare("select id from web_customer where id = :id")
- h.execute(id=org_id)
- row = h.fetchone_dict()
- self.assertNotEqual(row, None)
- self.assertEqual(row['id'], org_id)
-
- def test_new_server_group_new_org_1(self):
- org_id = misc_functions.create_new_org()
- params = misc_functions.build_server_group_params(org_id=org_id)
-
- misc_functions.create_server_group(params)
-
- s = misc_functions.fetch_server_group(params['org_id'], params['name'])
- self.assertEqual(s.get_name(), params['name'])
- self.assertEqual(s.get_description(), params['description'])
- self.assertEqual(s.get_max_members(), params['max_members'])
-
- def test_exception_user_missing_1(self):
- params = misc_functions.build_server_group_params(org_id="no such user")
- self.assertRaises(rhnServerGroup.InvalidUserError,
- misc_functions.create_server_group, params)
-
- def test_exception_org_missing_1(self):
- params = misc_functions.build_server_group_params(org_id=-1)
- self.assertRaises(rhnServerGroup.InvalidOrgError,
- misc_functions.create_server_group, params)
-
-
-if __name__ == '__main__':
- sys.exit(unittest.main() or 0)
diff --git a/backend/server/test/unit-test/test_server_registration.py b/backend/server/test/unit-test/test_server_registration.py
deleted file mode 100644
index 10288de..0000000
--- a/backend/server/test/unit-test/test_server_registration.py
+++ /dev/null
@@ -1,245 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2012 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.
-#
-#
-# Tests verious codepaths for server registration
-#
-
-import sys
-import unittest
-from spacewalk.common import rhnFlags
-from spacewalk.common.rhnConfig import initCFG
-from spacewalk.server import rhnSQL, rhnServer, rhnChannel
-from spacewalk.server.xmlrpc import registration
-
-import misc_functions
-
-DB = 'rhnuser/rhnuser@webdev'
-
-
-class Tests(unittest.TestCase):
- _channel = 'redhat-advanced-server-i386'
- _channel_family = 'rhel-as'
- _entitlements = {
- 'enterprise_entitled' : None
- }
-
- def setUp(self):
- initCFG("server.xmlrpc")
- rhnSQL.initDB(DB)
-
- def tearDown(self):
- # Roll back any unsaved data
- rhnSQL.rollback()
-
- def test_new_server_1(self):
- "Test normal server registration, with username/password"
- u = self._create_new_user()
- username = u.contact['login']
- password = u.contact['password']
- params = build_new_system_params_with_username(username=username,
- password=password, os_release="2.1AS")
-
- system_id = register_new_system(params)
- rhnSQL.commit()
-
- s = rhnServer.get(system_id)
- self.assertNotEqual(s, None)
-
- server_id = s.getid()
- channels = rhnChannel.channels_for_server(server_id)
- self.assertEqual(len(channels), 1)
- self.assertEqual(channels[0]['label'], self._channel)
-
- def test_new_server_token_1(self):
- "Test registration with token"
- u = self._create_new_user()
- org_id = u.contact['org_id']
- entitlements = self._entitlements
- t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid())
-
- token = t.get_token()
-
- params = build_new_system_params_with_token(token=token)
-
- system_id = register_new_system(params)
- rhnSQL.commit()
-
- s = rhnServer.get(system_id)
- self.assertNotEqual(s, None)
-
- def test_new_server_token_2(self):
- "Test registration with token that specifies a base channel"
- u = self._create_new_user()
- org_id = u.contact['org_id']
- base_channel = 'rhel-i386-as-3'
- entitlements = self._entitlements
- t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid(),
- channels=[base_channel])
-
- token = t.get_token()
-
- params = build_new_system_params_with_token(token=token,
- os_release="2.1AS")
-
- system_id = register_new_system(params)
- rhnSQL.commit()
-
- s = rhnServer.get(system_id)
- self.assertNotEqual(s, None)
-
- server_id = s.getid()
- channels = rhnChannel.channels_for_server(server_id)
- self.assertEqual(len(channels), 1)
- self.assertEqual(channels[0]['label'], base_channel)
-
- def test_new_server_reactivation_token_1(self):
- "Test server re-registration"
- u = self._create_new_user()
- username = u.contact['login']
- password = u.contact['password']
- params = build_new_system_params_with_username(username=username,
- password=password, os_release="2.1AS")
-
- system_id = register_new_system(params)
- rhnSQL.commit()
-
- s1 = rhnServer.get(system_id)
- self.assertNotEqual(s1, None)
-
- server_id_1 = s1.getid()
- groups1 = misc_functions.fetch_server_groups(server_id_1)
-
- # Build a re-registration token
- base_channel = 'rhel-i386-as-3'
- entitlements = self._entitlements
- t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid(),
- channels=[base_channel], server_id=server_id_1)
-
- token = t.get_token()
-
- params = build_new_system_params_with_token(token=token,
- os_release="2.1AS")
- system_id = register_new_system(params)
- rhnSQL.commit()
-
- s2 = rhnServer.get(system_id)
- server_id_2 = s2.getid()
-
- groups2 = misc_functions.fetch_server_groups(server_id_2)
-
- self.assertNotEqual(s2, None)
- self.assertEqual(server_id_1, server_id_2)
- # Should be subscribed to the same groups
- self.assertEqual(groups1, groups2)
-
- def test_new_server_multiple_tokens_1(self):
- """Test registration with multiple activation tokens
- Resulting server group is the union of all server groups from all
- tokens
- """
- u = self._create_new_user()
- org_id = u.contact['org_id']
- entitlements = self._entitlements
- t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid())
-
- token1 = t.get_token()
- sg1 = t.get_server_groups()
-
- t = misc_functions.create_activation_key(org_id=u.contact['org_id'],
- entitlement_level=entitlements, user_id=u.getid())
-
- token2 = t.get_token()
- sg2 = t.get_server_groups()
-
- token = token1 + ',' + token2
-
- params = build_new_system_params_with_token(token=token,
- os_release="2.1AS")
-
- system_id = register_new_system(params)
- rhnSQL.commit()
-
- s = rhnServer.get(system_id)
- self.assertNotEqual(s, None)
-
- server_id = s.getid()
- sgs = misc_functions.fetch_server_groups(server_id)
- sgstgt = sg1 + sg2
- sgstgt.sort()
-
- self.assertEqual(sgs, sgstgt)
-
-
- def _create_new_user(self):
- # Create new org
- org_id = misc_functions.create_new_org()
-
- # Grant entitlements to the org
- misc_functions.grant_entitlements(org_id, 'enterprise_entitled', 1)
- misc_functions.grant_channel_family_entitlements(org_id,
- self._channel_family, 1)
-
- # Create new user
- u = misc_functions.create_new_user(org_id=org_id, roles=['org_admin'])
- username = u.contact['login']
- # XXX This will break on satellites where passwords are encrypted
- password = u.contact['password']
- return u
-
-class Counter:
- _counter = 0
- def value(self):
- val = self._counter
- self._counter = val + 1
- return val
-
-def build_new_system_params_with_username(**kwargs):
- import time
- val = Counter().value()
- rnd_string = "%d-%d" % (int(time.time()), val)
-
- params = {
- 'os_release' : '9',
- 'architecture' : 'i686-redhat-linux',
- 'profile_name' : "unittest server " + rnd_string,
- 'username' : 'no such user',
- 'password' : 'no such password',
- }
- params.update(kwargs)
- if params.has_key('token'):
- del params['token']
- return params
-
-def build_new_system_params_with_token(**kwargs):
- params = {
- 'token' : kwargs.get('token', "no such token"),
- }
- params.update(apply(build_new_system_params_with_username, (), kwargs))
- del params['username']
- del params['password']
- return params
-
-def register_new_system(params):
- rhnFlags.reset()
- return registration.Registration().new_system(params)
-
-
-if __name__ == '__main__':
- sys.exit(unittest.main() or 0)
commit edbeac7dbed55ee8bb041d351d274f0a29c8be55
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:54 2014 +0100
python test: moved non-unit test files to proper location
diff --git a/backend/server/test/cx_create_table.py b/backend/server/test/cx_create_table.py
new file mode 100644
index 0000000..31e23c6
--- /dev/null
+++ b/backend/server/test/cx_create_table.py
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2008 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 sys
+import cx_Oracle
+
+def main():
+ if len(sys.argv) != 2:
+ sys.stdout.write("Usage: %s <connectstring>\n" % sys.argv[0])
+ return 1
+ dbh = cx_Oracle.connect(sys.argv[1])
+
+ table_name = "test_%d" % os.getpid()
+ if 1:
+ test2(dbh, table_name)
+ else:
+ test1(dbh, table_name)
+ test1(dbh, table_name)
+
+def test1(dbh, table_name):
+ tn = table_name.upper()
+ create_table(dbh, table_name)
+ assert tn in list_tables(dbh), "Table %s not created" % table_name
+ drop_table(dbh, table_name)
+ assert tn not in list_tables(dbh), "Table %s not dropped" % table_name
+
+def test2(dbh, table_name):
+ tn = table_name.upper()
+ h1 = create_table(dbh, table_name)
+ assert tn in list_tables(dbh), "Table %s not created" % table_name
+ h2 = drop_table(dbh, table_name)
+ assert tn not in list_tables(dbh), "Table %s not dropped" % table_name
+
+
+ h1.execute(None)
+ assert tn in list_tables(dbh), "Table %s not created" % table_name
+ h2.execute(None)
+ assert tn not in list_tables(dbh), "Table %s not dropped" % table_name
+
+def create_table(dbh, table_name):
+ h = dbh.cursor()
+ h.execute("create table %s (id int)" % table_name)
+ return h
+
+def drop_table(dbh, table_name):
+ h = dbh.cursor()
+ h.execute("drop table %s" % table_name)
+ return h
+
+def list_tables(dbh):
+ h = dbh.cursor()
+ h.execute("select table_name from user_tables")
+ return map(lambda x: x[0].upper(), h.fetchall())
+
+if __name__ == '__main__':
+ sys.exit(main() or 0)
diff --git a/backend/server/test/test_capabilities.py b/backend/server/test/test_capabilities.py
new file mode 100644
index 0000000..e5b709d
--- /dev/null
+++ b/backend/server/test/test_capabilities.py
@@ -0,0 +1,94 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2011 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.
+#
+#
+# test case for bugzilla 127319
+#
+# Usage: ./xxx.py <server-name> <db>
+#
+
+import os
+import sys
+
+_topdir = os.path.dirname(sys.argv[0])
+_basedir = os.path.abspath(_topdir + '/../..')
+if _basedir not in sys.path:
+ sys.path.append(_basedir)
+
+import time
+from rhn import rpclib
+from spacewalk.server import rhnSQL, rhnServer, rhnCapability
+from spacewalk.common.rhnConfig import ConfigParserError
+
+def main():
+ if len(sys.argv) == 1:
+ server_name = 'xmlrpc.rhn.webdev.redhat.com'
+ else:
+ server_name = sys.argv[1]
+
+ if len(sys.argv) <= 2:
+ db_name = 'rhnuser/rhnuser@webdev'
+ else:
+ db_name = sys.argv[2]
+
+ try:
+ rhnSQL.initDB(db_name)
+ except ConfigParserError:
+ # database is not available when running in rpmbuild time
+ print "Test skipped"
+ return 0
+
+ uri = "http://%s/XMLRPC" % (server_name, )
+ s = rpclib.Server(uri)
+
+ username = password = "test-username-%.3f" % time.time()
+ email = "misa+%s(a)redhat.com" % username
+
+ s.registration.reserve_user(username, password)
+ s.registration.new_user(username, password, email)
+
+ data = {
+ 'os_release' : '9',
+ 'architecture' : 'athlon-redhat-linux',
+ 'profile_name' : 'Test profile for %s' % username,
+ 'username' : username,
+ 'password' : password,
+ }
+ systemid = s.registration.new_system(data)
+
+ str_caps = [
+ 'this.is.bogus1(0)=0',
+ 'this.is.bogus2(1)=1',
+ 'this.is.bogus3(2)=2',
+ ]
+ for cap in str_caps:
+ s.add_header('X-RHN-Client-Capability', cap)
+
+ # Add some packages
+ packages = [
+ ['a', '1', '1', ''],
+ ['b', '2', '2', ''],
+ ['c', '3', '3', ''],
+ ]
+ s.registration.update_packages(systemid, packages)
+
+ sobj = rhnServer.get(systemid)
+ server_id = sobj.getid()
+ print "Registered server", server_id
+
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main() or 0)
diff --git a/backend/server/test/unit-test/cx_create_table.py b/backend/server/test/unit-test/cx_create_table.py
deleted file mode 100644
index 31e23c6..0000000
--- a/backend/server/test/unit-test/cx_create_table.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2008 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 sys
-import cx_Oracle
-
-def main():
- if len(sys.argv) != 2:
- sys.stdout.write("Usage: %s <connectstring>\n" % sys.argv[0])
- return 1
- dbh = cx_Oracle.connect(sys.argv[1])
-
- table_name = "test_%d" % os.getpid()
- if 1:
- test2(dbh, table_name)
- else:
- test1(dbh, table_name)
- test1(dbh, table_name)
-
-def test1(dbh, table_name):
- tn = table_name.upper()
- create_table(dbh, table_name)
- assert tn in list_tables(dbh), "Table %s not created" % table_name
- drop_table(dbh, table_name)
- assert tn not in list_tables(dbh), "Table %s not dropped" % table_name
-
-def test2(dbh, table_name):
- tn = table_name.upper()
- h1 = create_table(dbh, table_name)
- assert tn in list_tables(dbh), "Table %s not created" % table_name
- h2 = drop_table(dbh, table_name)
- assert tn not in list_tables(dbh), "Table %s not dropped" % table_name
-
-
- h1.execute(None)
- assert tn in list_tables(dbh), "Table %s not created" % table_name
- h2.execute(None)
- assert tn not in list_tables(dbh), "Table %s not dropped" % table_name
-
-def create_table(dbh, table_name):
- h = dbh.cursor()
- h.execute("create table %s (id int)" % table_name)
- return h
-
-def drop_table(dbh, table_name):
- h = dbh.cursor()
- h.execute("drop table %s" % table_name)
- return h
-
-def list_tables(dbh):
- h = dbh.cursor()
- h.execute("select table_name from user_tables")
- return map(lambda x: x[0].upper(), h.fetchall())
-
-if __name__ == '__main__':
- sys.exit(main() or 0)
diff --git a/backend/server/test/unit-test/test_capabilities.py b/backend/server/test/unit-test/test_capabilities.py
deleted file mode 100644
index 908dbdc..0000000
--- a/backend/server/test/unit-test/test_capabilities.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2011 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.
-#
-#
-# test case for bugzilla 127319
-#
-# Usage: ./xxx.py <server-name> <db>
-#
-
-import os
-import sys
-
-_topdir = os.path.dirname(sys.argv[0])
-_basedir = os.path.abspath(_topdir + '/../../..')
-if _basedir not in sys.path:
- sys.path.append(_basedir)
-
-import time
-from rhn import rpclib
-from spacewalk.server import rhnSQL, rhnServer, rhnCapability
-from spacewalk.common.rhnConfig import ConfigParserError
-
-def main():
- if len(sys.argv) == 1:
- server_name = 'xmlrpc.rhn.webdev.redhat.com'
- else:
- server_name = sys.argv[1]
-
- if len(sys.argv) <= 2:
- db_name = 'rhnuser/rhnuser@webdev'
- else:
- db_name = sys.argv[2]
-
- try:
- rhnSQL.initDB(db_name)
- except ConfigParserError:
- # database is not available when running in rpmbuild time
- print "Test skipped"
- return 0
-
- uri = "http://%s/XMLRPC" % (server_name, )
- s = rpclib.Server(uri)
-
- username = password = "test-username-%.3f" % time.time()
- email = "misa+%s(a)redhat.com" % username
-
- s.registration.reserve_user(username, password)
- s.registration.new_user(username, password, email)
-
- data = {
- 'os_release' : '9',
- 'architecture' : 'athlon-redhat-linux',
- 'profile_name' : 'Test profile for %s' % username,
- 'username' : username,
- 'password' : password,
- }
- systemid = s.registration.new_system(data)
-
- str_caps = [
- 'this.is.bogus1(0)=0',
- 'this.is.bogus2(1)=1',
- 'this.is.bogus3(2)=2',
- ]
- for cap in str_caps:
- s.add_header('X-RHN-Client-Capability', cap)
-
- # Add some packages
- packages = [
- ['a', '1', '1', ''],
- ['b', '2', '2', ''],
- ['c', '3', '3', ''],
- ]
- s.registration.update_packages(systemid, packages)
-
- sobj = rhnServer.get(systemid)
- server_id = sobj.getid()
- print "Registered server", server_id
-
- return 0
-
-if __name__ == '__main__':
- sys.exit(main() or 0)
commit 3ed202f548c443be407636b629459e2180c86fc5
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:53 2014 +0100
python tests: remove useless files
All these files are empty except for `setpath.py` which is not being
used.
diff --git a/backend/test/unit/spacewalk/__init__.py b/backend/test/unit/spacewalk/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/backend/test/unit/spacewalk/test/__init__.py b/backend/test/unit/spacewalk/test/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/backend/test/unit/spacewalk/test/server/__init__.py b/backend/test/unit/spacewalk/test/server/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/backend/test/unit/spacewalk/test/setpath.py b/backend/test/unit/spacewalk/test/setpath.py
deleted file mode 100644
index 8a92d8f..0000000
--- a/backend/test/unit/spacewalk/test/setpath.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import sys
-import os
-import os.path
-
-PYTHON_PATH_SETUP = False
-
-def setup_python_path():
- """
- Configure the Python path to run the backend tests from a source checkout.
- Can be called many times in a test run, but should only actually do
- something the first time.
- """
- global PYTHON_PATH_SETUP
- if PYTHON_PATH_SETUP:
- print "PYTHONPATH already configured, skipping."
- return
- print "Configuring PYTHONPATH..."
- if not os.environ.has_key('SPACEWALK_GIT'):
- raise Exception("SPACEWALK_GIT environment variable not set")
-
- gitdir = os.path.expanduser(os.environ['SPACEWALK_GIT'])
- sys.path.insert(0, os.path.join(gitdir, "client/rhel/rhnlib/"))
- sys.path.insert(0, os.path.join(gitdir, "backend"))
- PYTHON_PATH_SETUP = True
-
-setup_python_path()
-
-
-
-
commit b5bcd67c049378cbe971c03654ce24cc9a7a22fa
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Wed Jan 15 18:08:52 2014 +0100
Move python test to proper location and fix nosetests
Move the rhnsql-test into the directory containing all the test covering
the rhnSQL module.
This makes possible to run the test using nosetests. That wasn't
possible previously because of an import error.
The test imports a function from `spacewalk.server.rhnSQL.driver_postgresql`.
The import statement works fine from python's interactive shell, but not
from nosetets. That happens because nosetests prepends the directory containing
all the test files to the `PYTHONPATH`.
With `rhnsql-tests.py` located inside of `/git_chekout/backend/test/unit/spacewalk/test/server`
the PYTHONPATH used by nosetest is going to have
`/git_checkout/backend/test/unit` as first element.
That will cause nosetest to look for `spacewalk.server` module inside of
`/git_checkout/backend/test/unit/spacewalk`. This directory actually
exists on the system, but it just contains the test files. The right directory
to load is `/path_to_python_modules/spacewalk/server`.
diff --git a/backend/server/test/unit-test/rhnSQL/rhnsql-tests.py b/backend/server/test/unit-test/rhnSQL/rhnsql-tests.py
new file mode 100644
index 0000000..c2855cb
--- /dev/null
+++ b/backend/server/test/unit-test/rhnSQL/rhnsql-tests.py
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2008--2010 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.
+#
+
+"""
+Pure unit tests for components of rhnSQL.
+
+NOTE: Not hitting the database here!
+"""
+
+import unittest
+
+from spacewalk.server.rhnSQL.driver_postgresql import convert_named_query_params
+
+class RhnSQLTests(unittest.TestCase):
+ """ Pure unit tests for components of rhnSQL. """
+
+ def test_convert_named_query_params(self):
+ query = "INSERT INTO people(id, name, phone) VALUES(:id, :name, :phone)"
+ expected_query = \
+ "INSERT INTO people(id, name, phone) VALUES($1, $2, $3)"
+
+ (new_query, param_index, args_found) = convert_named_query_params(query)
+ self.assertEquals(expected_query, new_query)
+ self.assertEquals(3, len(param_index.keys()))
+ self.assertEquals(3, args_found)
+ self.assertEquals([1], param_index['id'])
+ self.assertEquals([2], param_index['name'])
+ self.assertEquals([3], param_index['phone'])
+
+ def test_convert_named_params_none_required(self):
+ query = "SELECT * FROM people"
+
+ (new_query, param_index, args_found) = convert_named_query_params(query)
+ self.assertEquals(query, new_query)
+ self.assertEquals(0, len(param_index.keys()))
+
+ def test_convert_named_params_multiple_uses(self):
+ query = "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)"
+ expected_query = \
+ "INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)"
+
+ (new_query, param_index, args_found) = convert_named_query_params(query)
+ self.assertEquals(expected_query, new_query)
+ self.assertEquals(4, args_found)
+ self.assertEquals(2, len(param_index.keys()))
+ self.assertEquals([1, 3], param_index['a'])
+ self.assertEquals([2, 4], param_index['b'])
+
+ def test_date_format_conversion_issue(self):
+ query = "SELECT TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS') issued FROM rhnSatelliteCert WHERE id=:id, name=:name"
+ expected_query = "SELECT TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS') issued FROM rhnSatelliteCert WHERE id=$1, name=$2"
+ (new_query, param_index, args_found) = convert_named_query_params(query)
+ self.assertEquals(expected_query, new_query)
+ self.assertEquals(2, args_found)
+ self.assertEquals(2, len(param_index.keys()))
+ self.assertEquals([1], param_index['id'])
+ self.assertEquals([2], param_index['name'])
diff --git a/backend/test/unit/spacewalk/test/server/rhnsql-tests.py b/backend/test/unit/spacewalk/test/server/rhnsql-tests.py
deleted file mode 100644
index 926a9c9..0000000
--- a/backend/test/unit/spacewalk/test/server/rhnsql-tests.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 2008--2010 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.
-#
-
-"""
-Pure unit tests for components of rhnSQL.
-
-NOTE: Not hitting the database here!
-"""
-
-import unittest
-
-from spacewalk.server.rhnSQL.driver_postgresql import convert_named_query_params
-
-class RhnSQLTests(unittest.TestCase):
- """ Pure unit tests for components of rhnSQL. """
-
- def test_convert_named_query_params(self):
- query = "INSERT INTO people(id, name, phone) VALUES(:id, :name, :phone)"
- expected_query = \
- "INSERT INTO people(id, name, phone) VALUES($1, $2, $3)"
-
- (new_query, param_index, args_found) = convert_named_query_params(query)
- self.assertEquals(expected_query, new_query)
- self.assertEquals(3, len(param_index.keys()))
- self.assertEquals(3, args_found)
- self.assertEquals([1], param_index['id'])
- self.assertEquals([2], param_index['name'])
- self.assertEquals([3], param_index['phone'])
-
- def test_convert_named_params_none_required(self):
- query = "SELECT * FROM people"
-
- (new_query, param_index, args_found) = convert_named_query_params(query)
- self.assertEquals(query, new_query)
- self.assertEquals(0, len(param_index.keys()))
-
- def test_convert_named_params_multiple_uses(self):
- query = "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)"
- expected_query = \
- "INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)"
-
- (new_query, param_index, args_found) = convert_named_query_params(query)
- self.assertEquals(expected_query, new_query)
- self.assertEquals(4, args_found)
- self.assertEquals(2, len(param_index.keys()))
- self.assertEquals([1, 3], param_index['a'])
- self.assertEquals([2, 4], param_index['b'])
-
- def test_date_format_conversion_issue(self):
- query = "SELECT TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS') issued FROM rhnSatelliteCert WHERE id=:id, name=:name"
- expected_query = "SELECT TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS') issued FROM rhnSatelliteCert WHERE id=$1, name=$2"
- (new_query, param_index, args_found) = convert_named_query_params(query)
- self.assertEquals(expected_query, new_query)
- self.assertEquals(2, args_found)
- self.assertEquals(2, len(param_index.keys()))
- self.assertEquals([1], param_index['id'])
- self.assertEquals([2], param_index['name'])
-
-
-
-
commit 4436cc192f292c9c692273ba817d0622588ba7f4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 20 09:25:09 2014 +0100
added forgotten subpackages to yum repo
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index d86a5c9..af65715 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -28,6 +28,7 @@
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">font-awesome</packagereq>
+ <packagereq type="optional">font-awesome-devel</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -67,6 +68,7 @@
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">roboto</packagereq>
+ <packagereq type="optional">roboto-condensed</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora18.xml b/rel-eng/comps/comps-spacewalk-server-fedora18.xml
index 149dd35..a1aa191 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora18.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora18.xml
@@ -29,6 +29,7 @@
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">font-awesome</packagereq>
+ <packagereq type="optional">font-awesome-devel</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -68,6 +69,7 @@
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">roboto</packagereq>
+ <packagereq type="optional">roboto-condensed</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora19.xml b/rel-eng/comps/comps-spacewalk-server-fedora19.xml
index 0de2848..b825be2 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora19.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora19.xml
@@ -29,6 +29,7 @@
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">font-awesome</packagereq>
+ <packagereq type="optional">font-awesome-devel</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -68,6 +69,7 @@
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">roboto</packagereq>
+ <packagereq type="optional">roboto-condensed</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora20.xml b/rel-eng/comps/comps-spacewalk-server-fedora20.xml
index 0de2848..b825be2 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora20.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora20.xml
@@ -29,6 +29,7 @@
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">font-awesome</packagereq>
+ <packagereq type="optional">font-awesome-devel</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -68,6 +69,7 @@
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">roboto</packagereq>
+ <packagereq type="optional">roboto-condensed</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index d36c579..7eda09b 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -43,6 +43,7 @@
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">font-awesome</packagereq>
+ <packagereq type="optional">font-awesome-devel</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">hibernate3</packagereq>
<packagereq type="default">hibernate3-manual</packagereq>
@@ -109,6 +110,7 @@
<packagereq type="default">relaxngDatatype</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">roboto</packagereq>
+ <packagereq type="optional">roboto-condensed</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index d5a666d..d0cacad 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -29,6 +29,7 @@
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">font-awesome</packagereq>
+ <packagereq type="optional">font-awesome-devel</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -70,6 +71,7 @@
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">roboto</packagereq>
+ <packagereq type="optional">roboto-condensed</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
commit 3e2ebb7a7a169e1f584399bf7fc0ee34750b0128
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 20 08:36:19 2014 +0100
let mash put new font packages to yum repo
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index 8adf7d4..d86a5c9 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -27,6 +27,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">font-awesome</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -65,6 +66,7 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">roboto</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora18.xml b/rel-eng/comps/comps-spacewalk-server-fedora18.xml
index 2fbb81f..149dd35 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora18.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora18.xml
@@ -28,6 +28,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">font-awesome</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -66,6 +67,7 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">roboto</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora19.xml b/rel-eng/comps/comps-spacewalk-server-fedora19.xml
index 028bccb..0de2848 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora19.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora19.xml
@@ -28,6 +28,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">font-awesome</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -66,6 +67,7 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">roboto</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora20.xml b/rel-eng/comps/comps-spacewalk-server-fedora20.xml
index 028bccb..0de2848 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora20.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora20.xml
@@ -28,6 +28,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">font-awesome</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -66,6 +67,7 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">roboto</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 19b6eff..d36c579 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -42,6 +42,7 @@
<packagereq type="default">dom4j-repolib</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">font-awesome</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">hibernate3</packagereq>
<packagereq type="default">hibernate3-manual</packagereq>
@@ -107,6 +108,7 @@
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">relaxngDatatype</packagereq>
<packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">roboto</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 8030812..d5a666d 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -28,6 +28,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">font-awesome</packagereq>
<packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
@@ -68,6 +69,7 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">roboto</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
<packagereq type="default">SatConfig-cluster</packagereq>
commit 32ad751b98032bc7b4f2bffde235eaa7f7bd5861
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 15:03:17 2014 +0100
Automatic commit of package [spacewalk-branding] release [2.1.20-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index e1f84e6..01f4a7f 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 2.1.19
+Version: 2.1.20
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -86,6 +86,10 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.20-1
+- Roboto font has been moved to separate package
+- font-awesome has been moved to separate package
+
* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.19-1
- Fix to use .less files in development mode (2)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 9ea7e24..ad54907 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-2.1.19-1 branding/
+2.1.20-1 branding/
commit dd01b5dece78cc2635e0b495d1fba41856ef6545
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 14:32:04 2014 +0100
Roboto font has been moved to separate package
diff --git a/branding/fonts/Roboto/LICENSE.txt b/branding/fonts/Roboto/LICENSE.txt
deleted file mode 100755
index d645695..0000000
--- a/branding/fonts/Roboto/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/branding/fonts/Roboto/Roboto-Bold.ttf b/branding/fonts/Roboto/Roboto-Bold.ttf
deleted file mode 100755
index aaf374d..0000000
Binary files a/branding/fonts/Roboto/Roboto-Bold.ttf and /dev/null differ
diff --git a/branding/fonts/Roboto/Roboto-Light.ttf b/branding/fonts/Roboto/Roboto-Light.ttf
deleted file mode 100755
index 664e1b2..0000000
Binary files a/branding/fonts/Roboto/Roboto-Light.ttf and /dev/null differ
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index e6dd9f1..e1f84e6 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -26,6 +26,7 @@ BuildRequires: bootstrap-less <= 3.0.0
Requires: httpd
Requires: bootstrap <= 3.0.0
Requires: font-awesome >= 4.0.0
+Requires: roboto >= 1.2
%description
Spacewalk specific branding, CSS, and images.
commit db484557c2adc0c9126906a4cd587b1f3c369bf0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 14:00:22 2014 +0100
font-awesome has been moved to separate package
diff --git a/branding/fonts/font-awesome/css/font-awesome.css b/branding/fonts/font-awesome/css/font-awesome.css
deleted file mode 100644
index fff309b..0000000
--- a/branding/fonts/font-awesome/css/font-awesome.css
+++ /dev/null
@@ -1,1361 +0,0 @@
-/*!
- * Font Awesome 4.0.1
- * the iconic font designed for Bootstrap
- * ------------------------------------------------------------------------------
- * The full suite of pictographic icons, examples, and documentation can be
- * found at http://fontawesome.io. Stay up to date on Twitter at
- * http://twitter.com/fontawesome.
- *
- * License
- * ------------------------------------------------------------------------------
- * - The Font Awesome font is licensed under SIL OFL 1.1 -
- * http://scripts.sil.org/OFL
- * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- * http://opensource.org/licenses/mit-license.html
- * - Font Awesome documentation licensed under CC BY 3.0 -
- * http://creativecommons.org/licenses/by/3.0/
- * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- * Author - Dave Gandy
- * ------------------------------------------------------------------------------
- * Email: dave(a)fontawesome.io
- * Twitter: http://twitter.com/davegandy
- * Work: Lead Product Designer @ Kyruus - http://kyruus.com
- */
-/* FONT PATH
- * -------------------------- */
-@font-face {
- font-family: 'FontAwesome';
- src: url('../fonts/fontawesome-webfont.eot?v=4.0.1');
- src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-.fa {
- display: inline-block;
- font-family: FontAwesome;
- font-style: normal;
- font-weight: normal;
- line-height: 1;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-/* makes the font 33% larger relative to the icon container */
-.fa-lg {
- font-size: 1.3333333333333333em;
- line-height: 0.75em;
- vertical-align: -15%;
-}
-.fa-2x {
- font-size: 2em;
-}
-.fa-3x {
- font-size: 3em;
-}
-.fa-4x {
- font-size: 4em;
-}
-.fa-5x {
- font-size: 5em;
-}
-.fa-fw {
- width: 1.2857142857142858em;
- text-align: center;
-}
-.fa-ul {
- padding-left: 0;
- margin-left: 2.142857142857143em;
- list-style-type: none;
-}
-.fa-ul > li {
- position: relative;
-}
-.fa-li {
- position: absolute;
- left: -2.142857142857143em;
- width: 2.142857142857143em;
- top: 0.14285714285714285em;
- text-align: center;
-}
-.fa-li.fa-lg {
- left: -1.8571428571428572em;
-}
-.fa-border {
- padding: .2em .25em .15em;
- border: solid 0.08em #eeeeee;
- border-radius: .1em;
-}
-.pull-right {
- float: right;
-}
-.pull-left {
- float: left;
-}
-.fa.pull-left {
- margin-right: .3em;
-}
-.fa.pull-right {
- margin-left: .3em;
-}
-.fa-spin {
- -webkit-animation: spin 2s infinite linear;
- -moz-animation: spin 2s infinite linear;
- -o-animation: spin 2s infinite linear;
- animation: spin 2s infinite linear;
-}
-@-moz-keyframes spin {
- 0% {
- -moz-transform: rotate(0deg);
- }
- 100% {
- -moz-transform: rotate(359deg);
- }
-}
-@-webkit-keyframes spin {
- 0% {
- -webkit-transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- }
-}
-@-o-keyframes spin {
- 0% {
- -o-transform: rotate(0deg);
- }
- 100% {
- -o-transform: rotate(359deg);
- }
-}
-@-ms-keyframes spin {
- 0% {
- -ms-transform: rotate(0deg);
- }
- 100% {
- -ms-transform: rotate(359deg);
- }
-}
-@keyframes spin {
- 0% {
- transform: rotate(0deg);
- }
- 100% {
- transform: rotate(359deg);
- }
-}
-.fa-rotate-90 {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
- -webkit-transform: rotate(90deg);
- -moz-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- -o-transform: rotate(90deg);
- transform: rotate(90deg);
-}
-.fa-rotate-180 {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
- -webkit-transform: rotate(180deg);
- -moz-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- -o-transform: rotate(180deg);
- transform: rotate(180deg);
-}
-.fa-rotate-270 {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
- -webkit-transform: rotate(270deg);
- -moz-transform: rotate(270deg);
- -ms-transform: rotate(270deg);
- -o-transform: rotate(270deg);
- transform: rotate(270deg);
-}
-.fa-flip-horizontal {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
- -webkit-transform: scale(-1, 1);
- -moz-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- -o-transform: scale(-1, 1);
- transform: scale(-1, 1);
-}
-.fa-flip-vertical {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
- -webkit-transform: scale(1, -1);
- -moz-transform: scale(1, -1);
- -ms-transform: scale(1, -1);
- -o-transform: scale(1, -1);
- transform: scale(1, -1);
-}
-.fa-stack {
- position: relative;
- display: inline-block;
- width: 2em;
- height: 2em;
- line-height: 2em;
- vertical-align: middle;
-}
-.fa-stack-1x,
-.fa-stack-2x {
- position: absolute;
- left: 0;
- width: 100%;
- text-align: center;
-}
-.fa-stack-1x {
- line-height: inherit;
-}
-.fa-stack-2x {
- font-size: 2em;
-}
-.fa-inverse {
- color: #ffffff;
-}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
- readers do not read off random characters that represent icons */
-.fa-glass:before {
- content: "\f000";
-}
-.fa-music:before {
- content: "\f001";
-}
-.fa-search:before {
- content: "\f002";
-}
-.fa-envelope-o:before {
- content: "\f003";
-}
-.fa-heart:before {
- content: "\f004";
-}
-.fa-star:before {
- content: "\f005";
-}
-.fa-star-o:before {
- content: "\f006";
-}
-.fa-user:before {
- content: "\f007";
-}
-.fa-film:before {
- content: "\f008";
-}
-.fa-th-large:before {
- content: "\f009";
-}
-.fa-th:before {
- content: "\f00a";
-}
-.fa-th-list:before {
- content: "\f00b";
-}
-.fa-check:before {
- content: "\f00c";
-}
-.fa-times:before {
- content: "\f00d";
-}
-.fa-search-plus:before {
- content: "\f00e";
-}
-.fa-search-minus:before {
- content: "\f010";
-}
-.fa-power-off:before {
- content: "\f011";
-}
-.fa-signal:before {
- content: "\f012";
-}
-.fa-gear:before,
-.fa-cog:before {
- content: "\f013";
-}
-.fa-trash-o:before {
- content: "\f014";
-}
-.fa-home:before {
- content: "\f015";
-}
-.fa-file-o:before {
- content: "\f016";
-}
-.fa-clock-o:before {
- content: "\f017";
-}
-.fa-road:before {
- content: "\f018";
-}
-.fa-download:before {
- content: "\f019";
-}
-.fa-arrow-circle-o-down:before {
- content: "\f01a";
-}
-.fa-arrow-circle-o-up:before {
- content: "\f01b";
-}
-.fa-inbox:before {
- content: "\f01c";
-}
-.fa-play-circle-o:before {
- content: "\f01d";
-}
-.fa-rotate-right:before,
-.fa-repeat:before {
- content: "\f01e";
-}
-.fa-refresh:before {
- content: "\f021";
-}
-.fa-list-alt:before {
- content: "\f022";
-}
-.fa-lock:before {
- content: "\f023";
-}
-.fa-flag:before {
- content: "\f024";
-}
-.fa-headphones:before {
- content: "\f025";
-}
-.fa-volume-off:before {
- content: "\f026";
-}
-.fa-volume-down:before {
- content: "\f027";
-}
-.fa-volume-up:before {
- content: "\f028";
-}
-.fa-qrcode:before {
- content: "\f029";
-}
-.fa-barcode:before {
- content: "\f02a";
-}
-.fa-tag:before {
- content: "\f02b";
-}
-.fa-tags:before {
- content: "\f02c";
-}
-.fa-book:before {
- content: "\f02d";
-}
-.fa-bookmark:before {
- content: "\f02e";
-}
-.fa-print:before {
- content: "\f02f";
-}
-.fa-camera:before {
- content: "\f030";
-}
-.fa-font:before {
- content: "\f031";
-}
-.fa-bold:before {
- content: "\f032";
-}
-.fa-italic:before {
- content: "\f033";
-}
-.fa-text-height:before {
- content: "\f034";
-}
-.fa-text-width:before {
- content: "\f035";
-}
-.fa-align-left:before {
- content: "\f036";
-}
-.fa-align-center:before {
- content: "\f037";
-}
-.fa-align-right:before {
- content: "\f038";
-}
-.fa-align-justify:before {
- content: "\f039";
-}
-.fa-list:before {
- content: "\f03a";
-}
-.fa-dedent:before,
-.fa-outdent:before {
- content: "\f03b";
-}
-.fa-indent:before {
- content: "\f03c";
-}
-.fa-video-camera:before {
- content: "\f03d";
-}
-.fa-picture-o:before {
- content: "\f03e";
-}
-.fa-pencil:before {
- content: "\f040";
-}
-.fa-map-marker:before {
- content: "\f041";
-}
-.fa-adjust:before {
- content: "\f042";
-}
-.fa-tint:before {
- content: "\f043";
-}
-.fa-edit:before,
-.fa-pencil-square-o:before {
- content: "\f044";
-}
-.fa-share-square-o:before {
- content: "\f045";
-}
-.fa-check-square-o:before {
- content: "\f046";
-}
-.fa-move:before {
- content: "\f047";
-}
-.fa-step-backward:before {
- content: "\f048";
-}
-.fa-fast-backward:before {
- content: "\f049";
-}
-.fa-backward:before {
- content: "\f04a";
-}
-.fa-play:before {
- content: "\f04b";
-}
-.fa-pause:before {
- content: "\f04c";
-}
-.fa-stop:before {
- content: "\f04d";
-}
-.fa-forward:before {
- content: "\f04e";
-}
-.fa-fast-forward:before {
- content: "\f050";
-}
-.fa-step-forward:before {
- content: "\f051";
-}
-.fa-eject:before {
- content: "\f052";
-}
-.fa-chevron-left:before {
- content: "\f053";
-}
-.fa-chevron-right:before {
- content: "\f054";
-}
-.fa-plus-circle:before {
- content: "\f055";
-}
-.fa-minus-circle:before {
- content: "\f056";
-}
-.fa-times-circle:before {
- content: "\f057";
-}
-.fa-check-circle:before {
- content: "\f058";
-}
-.fa-question-circle:before {
- content: "\f059";
-}
-.fa-info-circle:before {
- content: "\f05a";
-}
-.fa-crosshairs:before {
- content: "\f05b";
-}
-.fa-times-circle-o:before {
- content: "\f05c";
-}
-.fa-check-circle-o:before {
- content: "\f05d";
-}
-.fa-ban:before {
- content: "\f05e";
-}
-.fa-arrow-left:before {
- content: "\f060";
-}
-.fa-arrow-right:before {
- content: "\f061";
-}
-.fa-arrow-up:before {
- content: "\f062";
-}
-.fa-arrow-down:before {
- content: "\f063";
-}
-.fa-mail-forward:before,
-.fa-share:before {
- content: "\f064";
-}
-.fa-resize-full:before {
- content: "\f065";
-}
-.fa-resize-small:before {
- content: "\f066";
-}
-.fa-plus:before {
- content: "\f067";
-}
-.fa-minus:before {
- content: "\f068";
-}
-.fa-asterisk:before {
- content: "\f069";
-}
-.fa-exclamation-circle:before {
- content: "\f06a";
-}
-.fa-gift:before {
- content: "\f06b";
-}
-.fa-leaf:before {
- content: "\f06c";
-}
-.fa-fire:before {
- content: "\f06d";
-}
-.fa-eye:before {
- content: "\f06e";
-}
-.fa-eye-slash:before {
- content: "\f070";
-}
-.fa-warning:before,
-.fa-exclamation-triangle:before {
- content: "\f071";
-}
-.fa-plane:before {
- content: "\f072";
-}
-.fa-calendar:before {
- content: "\f073";
-}
-.fa-random:before {
- content: "\f074";
-}
-.fa-comment:before {
- content: "\f075";
-}
-.fa-magnet:before {
- content: "\f076";
-}
-.fa-chevron-up:before {
- content: "\f077";
-}
-.fa-chevron-down:before {
- content: "\f078";
-}
-.fa-retweet:before {
- content: "\f079";
-}
-.fa-shopping-cart:before {
- content: "\f07a";
-}
-.fa-folder:before {
- content: "\f07b";
-}
-.fa-folder-open:before {
- content: "\f07c";
-}
-.fa-resize-vertical:before {
- content: "\f07d";
-}
-.fa-resize-horizontal:before {
- content: "\f07e";
-}
-.fa-bar-chart-o:before {
- content: "\f080";
-}
-.fa-twitter-square:before {
- content: "\f081";
-}
-.fa-facebook-square:before {
- content: "\f082";
-}
-.fa-camera-retro:before {
- content: "\f083";
-}
-.fa-key:before {
- content: "\f084";
-}
-.fa-gears:before,
-.fa-cogs:before {
- content: "\f085";
-}
-.fa-comments:before {
- content: "\f086";
-}
-.fa-thumbs-o-up:before {
- content: "\f087";
-}
-.fa-thumbs-o-down:before {
- content: "\f088";
-}
-.fa-star-half:before {
- content: "\f089";
-}
-.fa-heart-o:before {
- content: "\f08a";
-}
-.fa-sign-out:before {
- content: "\f08b";
-}
-.fa-linkedin-square:before {
- content: "\f08c";
-}
-.fa-thumb-tack:before {
- content: "\f08d";
-}
-.fa-external-link:before {
- content: "\f08e";
-}
-.fa-sign-in:before {
- content: "\f090";
-}
-.fa-trophy:before {
- content: "\f091";
-}
-.fa-github-square:before {
- content: "\f092";
-}
-.fa-upload:before {
- content: "\f093";
-}
-.fa-lemon-o:before {
- content: "\f094";
-}
-.fa-phone:before {
- content: "\f095";
-}
-.fa-square-o:before {
- content: "\f096";
-}
-.fa-bookmark-o:before {
- content: "\f097";
-}
-.fa-phone-square:before {
- content: "\f098";
-}
-.fa-twitter:before {
- content: "\f099";
-}
-.fa-facebook:before {
- content: "\f09a";
-}
-.fa-github:before {
- content: "\f09b";
-}
-.fa-unlock:before {
- content: "\f09c";
-}
-.fa-credit-card:before {
- content: "\f09d";
-}
-.fa-rss:before {
- content: "\f09e";
-}
-.fa-hdd-o:before {
- content: "\f0a0";
-}
-.fa-bullhorn:before {
- content: "\f0a1";
-}
-.fa-bell:before {
- content: "\f0f3";
-}
-.fa-certificate:before {
- content: "\f0a3";
-}
-.fa-hand-o-right:before {
- content: "\f0a4";
-}
-.fa-hand-o-left:before {
- content: "\f0a5";
-}
-.fa-hand-o-up:before {
- content: "\f0a6";
-}
-.fa-hand-o-down:before {
- content: "\f0a7";
-}
-.fa-arrow-circle-left:before {
- content: "\f0a8";
-}
-.fa-arrow-circle-right:before {
- content: "\f0a9";
-}
-.fa-arrow-circle-up:before {
- content: "\f0aa";
-}
-.fa-arrow-circle-down:before {
- content: "\f0ab";
-}
-.fa-globe:before {
- content: "\f0ac";
-}
-.fa-wrench:before {
- content: "\f0ad";
-}
-.fa-tasks:before {
- content: "\f0ae";
-}
-.fa-filter:before {
- content: "\f0b0";
-}
-.fa-briefcase:before {
- content: "\f0b1";
-}
-.fa-fullscreen:before {
- content: "\f0b2";
-}
-.fa-group:before {
- content: "\f0c0";
-}
-.fa-chain:before,
-.fa-link:before {
- content: "\f0c1";
-}
-.fa-cloud:before {
- content: "\f0c2";
-}
-.fa-flask:before {
- content: "\f0c3";
-}
-.fa-cut:before,
-.fa-scissors:before {
- content: "\f0c4";
-}
-.fa-copy:before,
-.fa-files-o:before {
- content: "\f0c5";
-}
-.fa-paperclip:before {
- content: "\f0c6";
-}
-.fa-save:before,
-.fa-floppy-o:before {
- content: "\f0c7";
-}
-.fa-square:before {
- content: "\f0c8";
-}
-.fa-reorder:before {
- content: "\f0c9";
-}
-.fa-list-ul:before {
- content: "\f0ca";
-}
-.fa-list-ol:before {
- content: "\f0cb";
-}
-.fa-strikethrough:before {
- content: "\f0cc";
-}
-.fa-underline:before {
- content: "\f0cd";
-}
-.fa-table:before {
- content: "\f0ce";
-}
-.fa-magic:before {
- content: "\f0d0";
-}
-.fa-truck:before {
- content: "\f0d1";
-}
-.fa-pinterest:before {
- content: "\f0d2";
-}
-.fa-pinterest-square:before {
- content: "\f0d3";
-}
-.fa-google-plus-square:before {
- content: "\f0d4";
-}
-.fa-google-plus:before {
- content: "\f0d5";
-}
-.fa-money:before {
- content: "\f0d6";
-}
-.fa-caret-down:before {
- content: "\f0d7";
-}
-.fa-caret-up:before {
- content: "\f0d8";
-}
-.fa-caret-left:before {
- content: "\f0d9";
-}
-.fa-caret-right:before {
- content: "\f0da";
-}
-.fa-columns:before {
- content: "\f0db";
-}
-.fa-unsorted:before,
-.fa-sort:before {
- content: "\f0dc";
-}
-.fa-sort-down:before,
-.fa-sort-asc:before {
- content: "\f0dd";
-}
-.fa-sort-up:before,
-.fa-sort-desc:before {
- content: "\f0de";
-}
-.fa-envelope:before {
- content: "\f0e0";
-}
-.fa-linkedin:before {
- content: "\f0e1";
-}
-.fa-rotate-left:before,
-.fa-undo:before {
- content: "\f0e2";
-}
-.fa-legal:before,
-.fa-gavel:before {
- content: "\f0e3";
-}
-.fa-dashboard:before,
-.fa-tachometer:before {
- content: "\f0e4";
-}
-.fa-comment-o:before {
- content: "\f0e5";
-}
-.fa-comments-o:before {
- content: "\f0e6";
-}
-.fa-flash:before,
-.fa-bolt:before {
- content: "\f0e7";
-}
-.fa-sitemap:before {
- content: "\f0e8";
-}
-.fa-umbrella:before {
- content: "\f0e9";
-}
-.fa-paste:before,
-.fa-clipboard:before {
- content: "\f0ea";
-}
-.fa-lightbulb-o:before {
- content: "\f0eb";
-}
-.fa-exchange:before {
- content: "\f0ec";
-}
-.fa-cloud-download:before {
- content: "\f0ed";
-}
-.fa-cloud-upload:before {
- content: "\f0ee";
-}
-.fa-user-md:before {
- content: "\f0f0";
-}
-.fa-stethoscope:before {
- content: "\f0f1";
-}
-.fa-suitcase:before {
- content: "\f0f2";
-}
-.fa-bell-o:before {
- content: "\f0a2";
-}
-.fa-coffee:before {
- content: "\f0f4";
-}
-.fa-cutlery:before {
- content: "\f0f5";
-}
-.fa-file-text-o:before {
- content: "\f0f6";
-}
-.fa-building:before {
- content: "\f0f7";
-}
-.fa-hospital:before {
- content: "\f0f8";
-}
-.fa-ambulance:before {
- content: "\f0f9";
-}
-.fa-medkit:before {
- content: "\f0fa";
-}
-.fa-fighter-jet:before {
- content: "\f0fb";
-}
-.fa-beer:before {
- content: "\f0fc";
-}
-.fa-h-square:before {
- content: "\f0fd";
-}
-.fa-plus-square:before {
- content: "\f0fe";
-}
-.fa-angle-double-left:before {
- content: "\f100";
-}
-.fa-angle-double-right:before {
- content: "\f101";
-}
-.fa-angle-double-up:before {
- content: "\f102";
-}
-.fa-angle-double-down:before {
- content: "\f103";
-}
-.fa-angle-left:before {
- content: "\f104";
-}
-.fa-angle-right:before {
- content: "\f105";
-}
-.fa-angle-up:before {
- content: "\f106";
-}
-.fa-angle-down:before {
- content: "\f107";
-}
-.fa-desktop:before {
- content: "\f108";
-}
-.fa-laptop:before {
- content: "\f109";
-}
-.fa-tablet:before {
- content: "\f10a";
-}
-.fa-mobile-phone:before,
-.fa-mobile:before {
- content: "\f10b";
-}
-.fa-circle-o:before {
- content: "\f10c";
-}
-.fa-quote-left:before {
- content: "\f10d";
-}
-.fa-quote-right:before {
- content: "\f10e";
-}
-.fa-spinner:before {
- content: "\f110";
-}
-.fa-circle:before {
- content: "\f111";
-}
-.fa-mail-reply:before,
-.fa-reply:before {
- content: "\f112";
-}
-.fa-github-alt:before {
- content: "\f113";
-}
-.fa-folder-o:before {
- content: "\f114";
-}
-.fa-folder-open-o:before {
- content: "\f115";
-}
-.fa-expand-o:before {
- content: "\f116";
-}
-.fa-collapse-o:before {
- content: "\f117";
-}
-.fa-smile-o:before {
- content: "\f118";
-}
-.fa-frown-o:before {
- content: "\f119";
-}
-.fa-meh-o:before {
- content: "\f11a";
-}
-.fa-gamepad:before {
- content: "\f11b";
-}
-.fa-keyboard-o:before {
- content: "\f11c";
-}
-.fa-flag-o:before {
- content: "\f11d";
-}
-.fa-flag-checkered:before {
- content: "\f11e";
-}
-.fa-terminal:before {
- content: "\f120";
-}
-.fa-code:before {
- content: "\f121";
-}
-.fa-reply-all:before {
- content: "\f122";
-}
-.fa-mail-reply-all:before {
- content: "\f122";
-}
-.fa-star-half-empty:before,
-.fa-star-half-full:before,
-.fa-star-half-o:before {
- content: "\f123";
-}
-.fa-location-arrow:before {
- content: "\f124";
-}
-.fa-crop:before {
- content: "\f125";
-}
-.fa-code-fork:before {
- content: "\f126";
-}
-.fa-unlink:before,
-.fa-chain-broken:before {
- content: "\f127";
-}
-.fa-question:before {
- content: "\f128";
-}
-.fa-info:before {
- content: "\f129";
-}
-.fa-exclamation:before {
- content: "\f12a";
-}
-.fa-superscript:before {
- content: "\f12b";
-}
-.fa-subscript:before {
- content: "\f12c";
-}
-.fa-eraser:before {
- content: "\f12d";
-}
-.fa-puzzle-piece:before {
- content: "\f12e";
-}
-.fa-microphone:before {
- content: "\f130";
-}
-.fa-microphone-slash:before {
- content: "\f131";
-}
-.fa-shield:before {
- content: "\f132";
-}
-.fa-calendar-o:before {
- content: "\f133";
-}
-.fa-fire-extinguisher:before {
- content: "\f134";
-}
-.fa-rocket:before {
- content: "\f135";
-}
-.fa-maxcdn:before {
- content: "\f136";
-}
-.fa-chevron-circle-left:before {
- content: "\f137";
-}
-.fa-chevron-circle-right:before {
- content: "\f138";
-}
-.fa-chevron-circle-up:before {
- content: "\f139";
-}
-.fa-chevron-circle-down:before {
- content: "\f13a";
-}
-.fa-html5:before {
- content: "\f13b";
-}
-.fa-css3:before {
- content: "\f13c";
-}
-.fa-anchor:before {
- content: "\f13d";
-}
-.fa-unlock-o:before {
- content: "\f13e";
-}
-.fa-bullseye:before {
- content: "\f140";
-}
-.fa-ellipsis-horizontal:before {
- content: "\f141";
-}
-.fa-ellipsis-vertical:before {
- content: "\f142";
-}
-.fa-rss-square:before {
- content: "\f143";
-}
-.fa-play-circle:before {
- content: "\f144";
-}
-.fa-ticket:before {
- content: "\f145";
-}
-.fa-minus-square:before {
- content: "\f146";
-}
-.fa-minus-square-o:before {
- content: "\f147";
-}
-.fa-level-up:before {
- content: "\f148";
-}
-.fa-level-down:before {
- content: "\f149";
-}
-.fa-check-square:before {
- content: "\f14a";
-}
-.fa-pencil-square:before {
- content: "\f14b";
-}
-.fa-external-link-square:before {
- content: "\f14c";
-}
-.fa-share-square:before {
- content: "\f14d";
-}
-.fa-compass:before {
- content: "\f14e";
-}
-.fa-toggle-down:before,
-.fa-caret-square-o-down:before {
- content: "\f150";
-}
-.fa-toggle-up:before,
-.fa-caret-square-o-up:before {
- content: "\f151";
-}
-.fa-toggle-right:before,
-.fa-caret-square-o-right:before {
- content: "\f152";
-}
-.fa-euro:before,
-.fa-eur:before {
- content: "\f153";
-}
-.fa-gbp:before {
- content: "\f154";
-}
-.fa-dollar:before,
-.fa-usd:before {
- content: "\f155";
-}
-.fa-rupee:before,
-.fa-inr:before {
- content: "\f156";
-}
-.fa-cny:before,
-.fa-rmb:before,
-.fa-yen:before,
-.fa-jpy:before {
- content: "\f157";
-}
-.fa-ruble:before,
-.fa-rouble:before,
-.fa-rub:before {
- content: "\f158";
-}
-.fa-won:before,
-.fa-krw:before {
- content: "\f159";
-}
-.fa-bitcoin:before,
-.fa-btc:before {
- content: "\f15a";
-}
-.fa-file:before {
- content: "\f15b";
-}
-.fa-file-text:before {
- content: "\f15c";
-}
-.fa-sort-alpha-asc:before {
- content: "\f15d";
-}
-.fa-sort-alpha-desc:before {
- content: "\f15e";
-}
-.fa-sort-amount-asc:before {
- content: "\f160";
-}
-.fa-sort-amount-desc:before {
- content: "\f161";
-}
-.fa-sort-numeric-asc:before {
- content: "\f162";
-}
-.fa-sort-numeric-desc:before {
- content: "\f163";
-}
-.fa-thumbs-up:before {
- content: "\f164";
-}
-.fa-thumbs-down:before {
- content: "\f165";
-}
-.fa-youtube-square:before {
- content: "\f166";
-}
-.fa-youtube:before {
- content: "\f167";
-}
-.fa-xing:before {
- content: "\f168";
-}
-.fa-xing-square:before {
- content: "\f169";
-}
-.fa-youtube-play:before {
- content: "\f16a";
-}
-.fa-dropbox:before {
- content: "\f16b";
-}
-.fa-stack-overflow:before {
- content: "\f16c";
-}
-.fa-instagram:before {
- content: "\f16d";
-}
-.fa-flickr:before {
- content: "\f16e";
-}
-.fa-adn:before {
- content: "\f170";
-}
-.fa-bitbucket:before {
- content: "\f171";
-}
-.fa-bitbucket-square:before {
- content: "\f172";
-}
-.fa-tumblr:before {
- content: "\f173";
-}
-.fa-tumblr-square:before {
- content: "\f174";
-}
-.fa-long-arrow-down:before {
- content: "\f175";
-}
-.fa-long-arrow-up:before {
- content: "\f176";
-}
-.fa-long-arrow-left:before {
- content: "\f177";
-}
-.fa-long-arrow-right:before {
- content: "\f178";
-}
-.fa-apple:before {
- content: "\f179";
-}
-.fa-windows:before {
- content: "\f17a";
-}
-.fa-android:before {
- content: "\f17b";
-}
-.fa-linux:before {
- content: "\f17c";
-}
-.fa-dribbble:before {
- content: "\f17d";
-}
-.fa-skype:before {
- content: "\f17e";
-}
-.fa-foursquare:before {
- content: "\f180";
-}
-.fa-trello:before {
- content: "\f181";
-}
-.fa-female:before {
- content: "\f182";
-}
-.fa-male:before {
- content: "\f183";
-}
-.fa-gittip:before {
- content: "\f184";
-}
-.fa-sun-o:before {
- content: "\f185";
-}
-.fa-moon-o:before {
- content: "\f186";
-}
-.fa-archive:before {
- content: "\f187";
-}
-.fa-bug:before {
- content: "\f188";
-}
-.fa-vk:before {
- content: "\f189";
-}
-.fa-weibo:before {
- content: "\f18a";
-}
-.fa-renren:before {
- content: "\f18b";
-}
-.fa-pagelines:before {
- content: "\f18c";
-}
-.fa-stack-exchange:before {
- content: "\f18d";
-}
-.fa-arrow-circle-o-right:before {
- content: "\f18e";
-}
-.fa-arrow-circle-o-left:before {
- content: "\f190";
-}
-.fa-toggle-left:before,
-.fa-caret-square-o-left:before {
- content: "\f191";
-}
-.fa-dot-circle-o:before {
- content: "\f192";
-}
-.fa-wheelchair:before {
- content: "\f193";
-}
-.fa-vimeo-square:before {
- content: "\f194";
-}
-.fa-turkish-lira:before,
-.fa-try:before {
- content: "\f195";
-}
diff --git a/branding/fonts/font-awesome/css/font-awesome.min.css b/branding/fonts/font-awesome/css/font-awesome.min.css
deleted file mode 100644
index a93257a..0000000
--- a/branding/fonts/font-awesome/css/font-awesome.min.css
+++ /dev/null
@@ -1,395 +0,0 @@
-@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.1');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.1') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}
-.fa-2x{font-size:2em}
-.fa-3x{font-size:3em}
-.fa-4x{font-size:4em}
-.fa-5x{font-size:5em}
-.fa-fw{width:1.2857142857142858em;text-align:center}
-.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}
-.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}
-.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}
-.pull-right{float:right}
-.pull-left{float:left}
-.fa.pull-left{margin-right:.3em}
-.fa.pull-right{margin-left:.3em}
-.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}
-@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)} 100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)} 100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)} 100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)} 100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)} 100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}
-.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}
-.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}
-.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}
-.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}
-.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}
-.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}
-.fa-stack-1x{line-height:inherit}
-.fa-stack-2x{font-size:2em}
-.fa-inverse{color:#fff}
-.fa-glass:before{content:"\f000"}
-.fa-music:before{content:"\f001"}
-.fa-search:before{content:"\f002"}
-.fa-envelope-o:before{content:"\f003"}
-.fa-heart:before{content:"\f004"}
-.fa-star:before{content:"\f005"}
-.fa-star-o:before{content:"\f006"}
-.fa-user:before{content:"\f007"}
-.fa-film:before{content:"\f008"}
-.fa-th-large:before{content:"\f009"}
-.fa-th:before{content:"\f00a"}
-.fa-th-list:before{content:"\f00b"}
-.fa-check:before{content:"\f00c"}
-.fa-times:before{content:"\f00d"}
-.fa-search-plus:before{content:"\f00e"}
-.fa-search-minus:before{content:"\f010"}
-.fa-power-off:before{content:"\f011"}
-.fa-signal:before{content:"\f012"}
-.fa-gear:before,.fa-cog:before{content:"\f013"}
-.fa-trash-o:before{content:"\f014"}
-.fa-home:before{content:"\f015"}
-.fa-file-o:before{content:"\f016"}
-.fa-clock-o:before{content:"\f017"}
-.fa-road:before{content:"\f018"}
-.fa-download:before{content:"\f019"}
-.fa-arrow-circle-o-down:before{content:"\f01a"}
-.fa-arrow-circle-o-up:before{content:"\f01b"}
-.fa-inbox:before{content:"\f01c"}
-.fa-play-circle-o:before{content:"\f01d"}
-.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}
-.fa-refresh:before{content:"\f021"}
-.fa-list-alt:before{content:"\f022"}
-.fa-lock:before{content:"\f023"}
-.fa-flag:before{content:"\f024"}
-.fa-headphones:before{content:"\f025"}
-.fa-volume-off:before{content:"\f026"}
-.fa-volume-down:before{content:"\f027"}
-.fa-volume-up:before{content:"\f028"}
-.fa-qrcode:before{content:"\f029"}
-.fa-barcode:before{content:"\f02a"}
-.fa-tag:before{content:"\f02b"}
-.fa-tags:before{content:"\f02c"}
-.fa-book:before{content:"\f02d"}
-.fa-bookmark:before{content:"\f02e"}
-.fa-print:before{content:"\f02f"}
-.fa-camera:before{content:"\f030"}
-.fa-font:before{content:"\f031"}
-.fa-bold:before{content:"\f032"}
-.fa-italic:before{content:"\f033"}
-.fa-text-height:before{content:"\f034"}
-.fa-text-width:before{content:"\f035"}
-.fa-align-left:before{content:"\f036"}
-.fa-align-center:before{content:"\f037"}
-.fa-align-right:before{content:"\f038"}
-.fa-align-justify:before{content:"\f039"}
-.fa-list:before{content:"\f03a"}
-.fa-dedent:before,.fa-outdent:before{content:"\f03b"}
-.fa-indent:before{content:"\f03c"}
-.fa-video-camera:before{content:"\f03d"}
-.fa-picture-o:before{content:"\f03e"}
-.fa-pencil:before{content:"\f040"}
-.fa-map-marker:before{content:"\f041"}
-.fa-adjust:before{content:"\f042"}
-.fa-tint:before{content:"\f043"}
-.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}
-.fa-share-square-o:before{content:"\f045"}
-.fa-check-square-o:before{content:"\f046"}
-.fa-move:before{content:"\f047"}
-.fa-step-backward:before{content:"\f048"}
-.fa-fast-backward:before{content:"\f049"}
-.fa-backward:before{content:"\f04a"}
-.fa-play:before{content:"\f04b"}
-.fa-pause:before{content:"\f04c"}
-.fa-stop:before{content:"\f04d"}
-.fa-forward:before{content:"\f04e"}
-.fa-fast-forward:before{content:"\f050"}
-.fa-step-forward:before{content:"\f051"}
-.fa-eject:before{content:"\f052"}
-.fa-chevron-left:before{content:"\f053"}
-.fa-chevron-right:before{content:"\f054"}
-.fa-plus-circle:before{content:"\f055"}
-.fa-minus-circle:before{content:"\f056"}
-.fa-times-circle:before{content:"\f057"}
-.fa-check-circle:before{content:"\f058"}
-.fa-question-circle:before{content:"\f059"}
-.fa-info-circle:before{content:"\f05a"}
-.fa-crosshairs:before{content:"\f05b"}
-.fa-times-circle-o:before{content:"\f05c"}
-.fa-check-circle-o:before{content:"\f05d"}
-.fa-ban:before{content:"\f05e"}
-.fa-arrow-left:before{content:"\f060"}
-.fa-arrow-right:before{content:"\f061"}
-.fa-arrow-up:before{content:"\f062"}
-.fa-arrow-down:before{content:"\f063"}
-.fa-mail-forward:before,.fa-share:before{content:"\f064"}
-.fa-resize-full:before{content:"\f065"}
-.fa-resize-small:before{content:"\f066"}
-.fa-plus:before{content:"\f067"}
-.fa-minus:before{content:"\f068"}
-.fa-asterisk:before{content:"\f069"}
-.fa-exclamation-circle:before{content:"\f06a"}
-.fa-gift:before{content:"\f06b"}
-.fa-leaf:before{content:"\f06c"}
-.fa-fire:before{content:"\f06d"}
-.fa-eye:before{content:"\f06e"}
-.fa-eye-slash:before{content:"\f070"}
-.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}
-.fa-plane:before{content:"\f072"}
-.fa-calendar:before{content:"\f073"}
-.fa-random:before{content:"\f074"}
-.fa-comment:before{content:"\f075"}
-.fa-magnet:before{content:"\f076"}
-.fa-chevron-up:before{content:"\f077"}
-.fa-chevron-down:before{content:"\f078"}
-.fa-retweet:before{content:"\f079"}
-.fa-shopping-cart:before{content:"\f07a"}
-.fa-folder:before{content:"\f07b"}
-.fa-folder-open:before{content:"\f07c"}
-.fa-resize-vertical:before{content:"\f07d"}
-.fa-resize-horizontal:before{content:"\f07e"}
-.fa-bar-chart-o:before{content:"\f080"}
-.fa-twitter-square:before{content:"\f081"}
-.fa-facebook-square:before{content:"\f082"}
-.fa-camera-retro:before{content:"\f083"}
-.fa-key:before{content:"\f084"}
-.fa-gears:before,.fa-cogs:before{content:"\f085"}
-.fa-comments:before{content:"\f086"}
-.fa-thumbs-o-up:before{content:"\f087"}
-.fa-thumbs-o-down:before{content:"\f088"}
-.fa-star-half:before{content:"\f089"}
-.fa-heart-o:before{content:"\f08a"}
-.fa-sign-out:before{content:"\f08b"}
-.fa-linkedin-square:before{content:"\f08c"}
-.fa-thumb-tack:before{content:"\f08d"}
-.fa-external-link:before{content:"\f08e"}
-.fa-sign-in:before{content:"\f090"}
-.fa-trophy:before{content:"\f091"}
-.fa-github-square:before{content:"\f092"}
-.fa-upload:before{content:"\f093"}
-.fa-lemon-o:before{content:"\f094"}
-.fa-phone:before{content:"\f095"}
-.fa-square-o:before{content:"\f096"}
-.fa-bookmark-o:before{content:"\f097"}
-.fa-phone-square:before{content:"\f098"}
-.fa-twitter:before{content:"\f099"}
-.fa-facebook:before{content:"\f09a"}
-.fa-github:before{content:"\f09b"}
-.fa-unlock:before{content:"\f09c"}
-.fa-credit-card:before{content:"\f09d"}
-.fa-rss:before{content:"\f09e"}
-.fa-hdd-o:before{content:"\f0a0"}
-.fa-bullhorn:before{content:"\f0a1"}
-.fa-bell:before{content:"\f0f3"}
-.fa-certificate:before{content:"\f0a3"}
-.fa-hand-o-right:before{content:"\f0a4"}
-.fa-hand-o-left:before{content:"\f0a5"}
-.fa-hand-o-up:before{content:"\f0a6"}
-.fa-hand-o-down:before{content:"\f0a7"}
-.fa-arrow-circle-left:before{content:"\f0a8"}
-.fa-arrow-circle-right:before{content:"\f0a9"}
-.fa-arrow-circle-up:before{content:"\f0aa"}
-.fa-arrow-circle-down:before{content:"\f0ab"}
-.fa-globe:before{content:"\f0ac"}
-.fa-wrench:before{content:"\f0ad"}
-.fa-tasks:before{content:"\f0ae"}
-.fa-filter:before{content:"\f0b0"}
-.fa-briefcase:before{content:"\f0b1"}
-.fa-fullscreen:before{content:"\f0b2"}
-.fa-group:before{content:"\f0c0"}
-.fa-chain:before,.fa-link:before{content:"\f0c1"}
-.fa-cloud:before{content:"\f0c2"}
-.fa-flask:before{content:"\f0c3"}
-.fa-cut:before,.fa-scissors:before{content:"\f0c4"}
-.fa-copy:before,.fa-files-o:before{content:"\f0c5"}
-.fa-paperclip:before{content:"\f0c6"}
-.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}
-.fa-square:before{content:"\f0c8"}
-.fa-reorder:before{content:"\f0c9"}
-.fa-list-ul:before{content:"\f0ca"}
-.fa-list-ol:before{content:"\f0cb"}
-.fa-strikethrough:before{content:"\f0cc"}
-.fa-underline:before{content:"\f0cd"}
-.fa-table:before{content:"\f0ce"}
-.fa-magic:before{content:"\f0d0"}
-.fa-truck:before{content:"\f0d1"}
-.fa-pinterest:before{content:"\f0d2"}
-.fa-pinterest-square:before{content:"\f0d3"}
-.fa-google-plus-square:before{content:"\f0d4"}
-.fa-google-plus:before{content:"\f0d5"}
-.fa-money:before{content:"\f0d6"}
-.fa-caret-down:before{content:"\f0d7"}
-.fa-caret-up:before{content:"\f0d8"}
-.fa-caret-left:before{content:"\f0d9"}
-.fa-caret-right:before{content:"\f0da"}
-.fa-columns:before{content:"\f0db"}
-.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}
-.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}
-.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}
-.fa-envelope:before{content:"\f0e0"}
-.fa-linkedin:before{content:"\f0e1"}
-.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}
-.fa-legal:before,.fa-gavel:before{content:"\f0e3"}
-.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}
-.fa-comment-o:before{content:"\f0e5"}
-.fa-comments-o:before{content:"\f0e6"}
-.fa-flash:before,.fa-bolt:before{content:"\f0e7"}
-.fa-sitemap:before{content:"\f0e8"}
-.fa-umbrella:before{content:"\f0e9"}
-.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}
-.fa-lightbulb-o:before{content:"\f0eb"}
-.fa-exchange:before{content:"\f0ec"}
-.fa-cloud-download:before{content:"\f0ed"}
-.fa-cloud-upload:before{content:"\f0ee"}
-.fa-user-md:before{content:"\f0f0"}
-.fa-stethoscope:before{content:"\f0f1"}
-.fa-suitcase:before{content:"\f0f2"}
-.fa-bell-o:before{content:"\f0a2"}
-.fa-coffee:before{content:"\f0f4"}
-.fa-cutlery:before{content:"\f0f5"}
-.fa-file-text-o:before{content:"\f0f6"}
-.fa-building:before{content:"\f0f7"}
-.fa-hospital:before{content:"\f0f8"}
-.fa-ambulance:before{content:"\f0f9"}
-.fa-medkit:before{content:"\f0fa"}
-.fa-fighter-jet:before{content:"\f0fb"}
-.fa-beer:before{content:"\f0fc"}
-.fa-h-square:before{content:"\f0fd"}
-.fa-plus-square:before{content:"\f0fe"}
-.fa-angle-double-left:before{content:"\f100"}
-.fa-angle-double-right:before{content:"\f101"}
-.fa-angle-double-up:before{content:"\f102"}
-.fa-angle-double-down:before{content:"\f103"}
-.fa-angle-left:before{content:"\f104"}
-.fa-angle-right:before{content:"\f105"}
-.fa-angle-up:before{content:"\f106"}
-.fa-angle-down:before{content:"\f107"}
-.fa-desktop:before{content:"\f108"}
-.fa-laptop:before{content:"\f109"}
-.fa-tablet:before{content:"\f10a"}
-.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}
-.fa-circle-o:before{content:"\f10c"}
-.fa-quote-left:before{content:"\f10d"}
-.fa-quote-right:before{content:"\f10e"}
-.fa-spinner:before{content:"\f110"}
-.fa-circle:before{content:"\f111"}
-.fa-mail-reply:before,.fa-reply:before{content:"\f112"}
-.fa-github-alt:before{content:"\f113"}
-.fa-folder-o:before{content:"\f114"}
-.fa-folder-open-o:before{content:"\f115"}
-.fa-expand-o:before{content:"\f116"}
-.fa-collapse-o:before{content:"\f117"}
-.fa-smile-o:before{content:"\f118"}
-.fa-frown-o:before{content:"\f119"}
-.fa-meh-o:before{content:"\f11a"}
-.fa-gamepad:before{content:"\f11b"}
-.fa-keyboard-o:before{content:"\f11c"}
-.fa-flag-o:before{content:"\f11d"}
-.fa-flag-checkered:before{content:"\f11e"}
-.fa-terminal:before{content:"\f120"}
-.fa-code:before{content:"\f121"}
-.fa-reply-all:before{content:"\f122"}
-.fa-mail-reply-all:before{content:"\f122"}
-.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}
-.fa-location-arrow:before{content:"\f124"}
-.fa-crop:before{content:"\f125"}
-.fa-code-fork:before{content:"\f126"}
-.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}
-.fa-question:before{content:"\f128"}
-.fa-info:before{content:"\f129"}
-.fa-exclamation:before{content:"\f12a"}
-.fa-superscript:before{content:"\f12b"}
-.fa-subscript:before{content:"\f12c"}
-.fa-eraser:before{content:"\f12d"}
-.fa-puzzle-piece:before{content:"\f12e"}
-.fa-microphone:before{content:"\f130"}
-.fa-microphone-slash:before{content:"\f131"}
-.fa-shield:before{content:"\f132"}
-.fa-calendar-o:before{content:"\f133"}
-.fa-fire-extinguisher:before{content:"\f134"}
-.fa-rocket:before{content:"\f135"}
-.fa-maxcdn:before{content:"\f136"}
-.fa-chevron-circle-left:before{content:"\f137"}
-.fa-chevron-circle-right:before{content:"\f138"}
-.fa-chevron-circle-up:before{content:"\f139"}
-.fa-chevron-circle-down:before{content:"\f13a"}
-.fa-html5:before{content:"\f13b"}
-.fa-css3:before{content:"\f13c"}
-.fa-anchor:before{content:"\f13d"}
-.fa-unlock-o:before{content:"\f13e"}
-.fa-bullseye:before{content:"\f140"}
-.fa-ellipsis-horizontal:before{content:"\f141"}
-.fa-ellipsis-vertical:before{content:"\f142"}
-.fa-rss-square:before{content:"\f143"}
-.fa-play-circle:before{content:"\f144"}
-.fa-ticket:before{content:"\f145"}
-.fa-minus-square:before{content:"\f146"}
-.fa-minus-square-o:before{content:"\f147"}
-.fa-level-up:before{content:"\f148"}
-.fa-level-down:before{content:"\f149"}
-.fa-check-square:before{content:"\f14a"}
-.fa-pencil-square:before{content:"\f14b"}
-.fa-external-link-square:before{content:"\f14c"}
-.fa-share-square:before{content:"\f14d"}
-.fa-compass:before{content:"\f14e"}
-.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}
-.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}
-.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}
-.fa-euro:before,.fa-eur:before{content:"\f153"}
-.fa-gbp:before{content:"\f154"}
-.fa-dollar:before,.fa-usd:before{content:"\f155"}
-.fa-rupee:before,.fa-inr:before{content:"\f156"}
-.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}
-.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}
-.fa-won:before,.fa-krw:before{content:"\f159"}
-.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}
-.fa-file:before{content:"\f15b"}
-.fa-file-text:before{content:"\f15c"}
-.fa-sort-alpha-asc:before{content:"\f15d"}
-.fa-sort-alpha-desc:before{content:"\f15e"}
-.fa-sort-amount-asc:before{content:"\f160"}
-.fa-sort-amount-desc:before{content:"\f161"}
-.fa-sort-numeric-asc:before{content:"\f162"}
-.fa-sort-numeric-desc:before{content:"\f163"}
-.fa-thumbs-up:before{content:"\f164"}
-.fa-thumbs-down:before{content:"\f165"}
-.fa-youtube-square:before{content:"\f166"}
-.fa-youtube:before{content:"\f167"}
-.fa-xing:before{content:"\f168"}
-.fa-xing-square:before{content:"\f169"}
-.fa-youtube-play:before{content:"\f16a"}
-.fa-dropbox:before{content:"\f16b"}
-.fa-stack-overflow:before{content:"\f16c"}
-.fa-instagram:before{content:"\f16d"}
-.fa-flickr:before{content:"\f16e"}
-.fa-adn:before{content:"\f170"}
-.fa-bitbucket:before{content:"\f171"}
-.fa-bitbucket-square:before{content:"\f172"}
-.fa-tumblr:before{content:"\f173"}
-.fa-tumblr-square:before{content:"\f174"}
-.fa-long-arrow-down:before{content:"\f175"}
-.fa-long-arrow-up:before{content:"\f176"}
-.fa-long-arrow-left:before{content:"\f177"}
-.fa-long-arrow-right:before{content:"\f178"}
-.fa-apple:before{content:"\f179"}
-.fa-windows:before{content:"\f17a"}
-.fa-android:before{content:"\f17b"}
-.fa-linux:before{content:"\f17c"}
-.fa-dribbble:before{content:"\f17d"}
-.fa-skype:before{content:"\f17e"}
-.fa-foursquare:before{content:"\f180"}
-.fa-trello:before{content:"\f181"}
-.fa-female:before{content:"\f182"}
-.fa-male:before{content:"\f183"}
-.fa-gittip:before{content:"\f184"}
-.fa-sun-o:before{content:"\f185"}
-.fa-moon-o:before{content:"\f186"}
-.fa-archive:before{content:"\f187"}
-.fa-bug:before{content:"\f188"}
-.fa-vk:before{content:"\f189"}
-.fa-weibo:before{content:"\f18a"}
-.fa-renren:before{content:"\f18b"}
-.fa-pagelines:before{content:"\f18c"}
-.fa-stack-exchange:before{content:"\f18d"}
-.fa-arrow-circle-o-right:before{content:"\f18e"}
-.fa-arrow-circle-o-left:before{content:"\f190"}
-.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}
-.fa-dot-circle-o:before{content:"\f192"}
-.fa-wheelchair:before{content:"\f193"}
-.fa-vimeo-square:before{content:"\f194"}
-.fa-turkish-lira:before,.fa-try:before{content:"\f195"}
diff --git a/branding/fonts/font-awesome/fonts/FontAwesome.otf b/branding/fonts/font-awesome/fonts/FontAwesome.otf
deleted file mode 100644
index 4dfe30a..0000000
Binary files a/branding/fonts/font-awesome/fonts/FontAwesome.otf and /dev/null differ
diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.eot b/branding/fonts/font-awesome/fonts/fontawesome-webfont.eot
deleted file mode 100755
index e054c93..0000000
Binary files a/branding/fonts/font-awesome/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.svg b/branding/fonts/font-awesome/fonts/fontawesome-webfont.svg
deleted file mode 100755
index 36d43b8..0000000
--- a/branding/fonts/font-awesome/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" " horiz-adv-x="448" />
-<glyph unicode="	" horiz-adv-x="448" />
-<glyph unicode=" " horiz-adv-x="448" />
-<glyph unicode="¨" horiz-adv-x="1792" />
-<glyph unicode="©" horiz-adv-x="1792" />
-<glyph unicode="®" horiz-adv-x="1792" />
-<glyph unicode="´" horiz-adv-x="1792" />
-<glyph unicode="Æ" horiz-adv-x="1792" />
-<glyph unicode=" " horiz-adv-x="768" />
-<glyph unicode=" " />
-<glyph unicode=" " horiz-adv-x="768" />
-<glyph unicode=" " />
-<glyph unicode=" " horiz-adv-x="512" />
-<glyph unicode=" " horiz-adv-x="384" />
-<glyph unicode=" " horiz-adv-x="256" />
-<glyph unicode=" " horiz-adv-x="256" />
-<glyph unicode=" " horiz-adv-x="192" />
-<glyph unicode=" " horiz-adv-x="307" />
-<glyph unicode=" " horiz-adv-x="85" />
-<glyph unicode=" " horiz-adv-x="307" />
-<glyph unicode=" " horiz-adv-x="384" />
-<glyph unicode="™" horiz-adv-x="1792" />
-<glyph unicode="∞" horiz-adv-x="1792" />
-<glyph unicode="≠" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0
45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40
0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q
-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.
5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34
-82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -
103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5
11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -
2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14
t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-
128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -2
2.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 4
7t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-
9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-
64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t
-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
-<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0
16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9
23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0
58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37
-51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22
-15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 3
7 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -
6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107
225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24
8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5
20t129 -23.5t137 -77.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf b/branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf
deleted file mode 100755
index 7ec2e1d..0000000
Binary files a/branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.woff b/branding/fonts/font-awesome/fonts/fontawesome-webfont.woff
deleted file mode 100755
index 27d80b1..0000000
Binary files a/branding/fonts/font-awesome/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 3ab7b3a..e6dd9f1 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -24,7 +24,8 @@ BuildRequires: java-devel >= 1.5.0
BuildRequires: nodejs-less
BuildRequires: bootstrap-less <= 3.0.0
Requires: httpd
-Requires: bootstrap <= 3.0.0
+Requires: bootstrap <= 3.0.0
+Requires: font-awesome >= 4.0.0
%description
Spacewalk specific branding, CSS, and images.
commit de62d920d00e9229c7b6d51eb54f3880877f10d2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 14:51:44 2014 +0100
Automatic commit of package [roboto] minor release [1.2-2].
diff --git a/rel-eng/packages/roboto b/rel-eng/packages/roboto
index e0a4f3c..92085a4 100644
--- a/rel-eng/packages/roboto
+++ b/rel-eng/packages/roboto
@@ -1 +1 @@
-1.2-1 spec-tree/roboto/
+1.2-2 spec-tree/roboto/
diff --git a/spec-tree/roboto/roboto.spec b/spec-tree/roboto/roboto.spec
index 88095a4..4349903 100644
--- a/spec-tree/roboto/roboto.spec
+++ b/spec-tree/roboto/roboto.spec
@@ -1,6 +1,6 @@
Name: roboto
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Roboto font
Group: Application/Internet
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.2-2
+- koji build needs Group specified
+
* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.2-1
- initial build of roboto package
commit 5c38a2685896599b61710f36c19c9351d0efb0a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 14:48:29 2014 +0100
koji build needs Group specified
diff --git a/spec-tree/roboto/roboto.spec b/spec-tree/roboto/roboto.spec
index 573ec30..88095a4 100644
--- a/spec-tree/roboto/roboto.spec
+++ b/spec-tree/roboto/roboto.spec
@@ -21,7 +21,8 @@ This is the normal family, which can be used alongside the Roboto Condensed fami
and the Roboto Slab family.
%package condensed
-Summary: Roboto Condensed font
+Summary: Roboto Condensed font
+Group: Application/Internet
%description condensed
Roboto has a dual nature. It has a mechanical skeleton and the forms are largely
commit 2778435c49b5c0cd68e19a4d309c9c4df9be4acb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 14:40:56 2014 +0100
Automatic commit of package [roboto] minor release [1.2-1].
diff --git a/rel-eng/packages/roboto b/rel-eng/packages/roboto
new file mode 100644
index 0000000..e0a4f3c
--- /dev/null
+++ b/rel-eng/packages/roboto
@@ -0,0 +1 @@
+1.2-1 spec-tree/roboto/
diff --git a/spec-tree/roboto/roboto.spec b/spec-tree/roboto/roboto.spec
index 0dba36f..573ec30 100644
--- a/spec-tree/roboto/roboto.spec
+++ b/spec-tree/roboto/roboto.spec
@@ -60,4 +60,7 @@ rm -rf %{buildroot}
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.2-1
+- initial build of roboto package
+
commit 073d60c902cca5323e97b1fecdfb9c4e96428edb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 14:30:47 2014 +0100
initial build of roboto package
diff --git a/spec-tree/roboto/roboto.spec b/spec-tree/roboto/roboto.spec
new file mode 100644
index 0000000..0dba36f
--- /dev/null
+++ b/spec-tree/roboto/roboto.spec
@@ -0,0 +1,63 @@
+Name: roboto
+Version: 1.2
+Release: 1%{?dist}
+Summary: Roboto font
+
+Group: Application/Internet
+License: Apache Software License v2
+URL: http://developer.android.com/design/style/typography.html
+Source0: http://developer.android.com/downloads/design/roboto-1.2.zip
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch: noarch
+
+%description
+Roboto has a dual nature. It has a mechanical skeleton and the forms are largely
+geometric. At the same time, the font features friendly and open curves. While some
+grotesks distort their letterforms to force a rigid rhythm, Roboto doesn’t
+compromise, allowing letters to be settle in to their natural width. This makes for a
+more natural reading rhythm more commonly found in humanist and serif types.
+
+This is the normal family, which can be used alongside the Roboto Condensed family
+and the Roboto Slab family.
+
+%package condensed
+Summary: Roboto Condensed font
+
+%description condensed
+Roboto has a dual nature. It has a mechanical skeleton and the forms are largely
+geometric. At the same time, the font features friendly and open curves. While some
+grotesks distort their letterforms to force a rigid rhythm, Roboto doesn’t
+compromise, allowing letters to be settle in to their natural width. This makes for a
+more natural reading rhythm more commonly found in humanist and serif types.
+
+This is the normal family, which can be used alongside the Roboto Condensed family
+and the Roboto Slab family.
+
+
+%prep
+%setup -q -c
+
+%build
+
+%install
+rm -rf %{buildroot}
+install -d -m 755 %{buildroot}%{_var}/www/html/fonts/
+rm -f Roboto_v1.2/*/{Icon,.DS_Store}
+cp -a Roboto_v1.2/Roboto Roboto_v1.2/RobotoCondensed %{buildroot}%{_var}/www/html/fonts/
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc
+%{_var}/www/html/fonts/Roboto
+
+%files condensed
+%defattr(-,root,root,-)
+%{_var}/www/html/fonts/RobotoCondensed
+
+
+%changelog
+
diff --git a/spec-tree/roboto/tito.props b/spec-tree/roboto/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/roboto/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
commit 58039e7d93fe6be053920907d70971852e2baa28
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 13:37:22 2014 +0100
Automatic commit of package [font-awesome] minor release [4.0.3-1].
diff --git a/rel-eng/packages/font-awesome b/rel-eng/packages/font-awesome
new file mode 100644
index 0000000..368cef9
--- /dev/null
+++ b/rel-eng/packages/font-awesome
@@ -0,0 +1 @@
+4.0.3-1 spec-tree/font-awesome/
diff --git a/spec-tree/font-awesome/font-awesome.spec b/spec-tree/font-awesome/font-awesome.spec
index edcf0be..0bc5310 100644
--- a/spec-tree/font-awesome/font-awesome.spec
+++ b/spec-tree/font-awesome/font-awesome.spec
@@ -61,4 +61,7 @@ rm -rf %{buildroot}
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 4.0.3-1
+- initial build of font-awesome package
+
commit 0de7a19207d98210db95fc342037c85bc2fb61ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 13:33:06 2014 +0100
initial build of font-awesome package
diff --git a/spec-tree/font-awesome/font-awesome.spec b/spec-tree/font-awesome/font-awesome.spec
new file mode 100644
index 0000000..edcf0be
--- /dev/null
+++ b/spec-tree/font-awesome/font-awesome.spec
@@ -0,0 +1,64 @@
+Name: font-awesome
+Version: 4.0.3
+Release: 1%{?dist}
+Summary: The iconic font designed for Bootstrap
+
+Group: Application/Internet
+License: OFL 1.1 and MIT
+URL: http://fontawesome.io/
+Source0: http://fontawesome.io/assets/font-awesome-4.0.3.zip
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch: noarch
+
+%description
+Font Awesome gives you scalable vector icons that can instantly be customized — size,
+color, drop shadow, and anything that can be done with the power of CSS.
+
+%package devel
+Summary: Less and Scss files for Font Awesome development
+Group: Application/Development
+
+%description devel
+Less and Scss files for Font Awesome development.
+
+%prep
+%setup -q
+
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -d -m 755 %{buildroot}%{_var}/www/html/fonts/font-awesome
+install -d -m 755 %{buildroot}%{_datadir}/font-awesome
+
+for dir in css fonts ; do
+ install -d -m 755 %{buildroot}%{_var}/www/html/fonts/font-awesome/$dir
+ for file in $dir/* ; do
+ install -m 644 $file %{buildroot}%{_var}/www/html/fonts/font-awesome/$dir/
+ done
+done
+
+for dir in less scss ; do
+ install -d -m 755 %{buildroot}%{_datadir}/font-awesome/$dir
+ for file in $dir/* ; do
+ install -m 644 $file %{buildroot}%{_datadir}/font-awesome/$dir/
+ done
+done
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_var}/www/html/fonts/font-awesome
+
+%files devel
+%defattr(-,root,root,-)
+%{_datadir}/font-awesome
+
+
+%changelog
+
diff --git a/spec-tree/font-awesome/tito.props b/spec-tree/font-awesome/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/font-awesome/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
commit 327c97ad66cc0fc78301582a6e40ea05c8a65a5f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 13:31:57 2014 +0100
Automatic commit of package [spacewalk-jpp-workaround] release [2.1.2-1].
diff --git a/rel-eng/packages/spacewalk-jpp-workaround b/rel-eng/packages/spacewalk-jpp-workaround
index fa88249..1acf6e9 100644
--- a/rel-eng/packages/spacewalk-jpp-workaround
+++ b/rel-eng/packages/spacewalk-jpp-workaround
@@ -1 +1 @@
-2.1.1-1 spec-tree/spacewalk-jpp-workaround/
+2.1.2-1 spec-tree/spacewalk-jpp-workaround/
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index c23eb2a..93ac945 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -1,5 +1,5 @@
Name: spacewalk-jpp-workaround
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
Summary: Workaround package to fulfill jpackage broken dependencies
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1
+- obsoleted package should be also provided
+
* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
- fixed tito build warning
- jpackage-utils were replaced with javapackages-tools in fc20
commit 8067bfd4b306aa7cc6459e34a6f19c7cef4b9c5a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 11:43:56 2014 +0100
obsoleted package should be also provided
yum install spacewalk-postgresql
Package jpackage-utils is obsoleted by spacewalk-jpp-workaround, but obsoleting package does not provide for requirements
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 8408941..c23eb2a 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -39,6 +39,8 @@ Requires: struts >= 1.3.10
Provides: jakarta-commons-logging = 1.1.3
Requires: apache-commons-logging
Obsoletes: jpackage-utils >= 5.0.0
+Requires: javapackages-tools
+Provides: jpackage-utils
%endif
%description
commit 1288bf3afeda9c218eb34e9e60c4e6eba68badb5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 10:58:50 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.121-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 95a75f6..b08a85c 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.120
+Version: 2.1.121
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.121-1
+- increase column length for CVE ids
+
* Fri Jan 17 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.120-1
- fix checkstyle
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 390d52e..2e108ea 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.120-1 java/
+2.1.121-1 java/
commit e0735fd8922da31283ffd46b2f0f9c367af6697d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 10:58:11 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.1.42-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5342ddb..fb27c50 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.41
+Version: 2.1.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.42-1
+- increase length of rhnCVE name column
+
* Tue Jan 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.41-1
- Updating the copyright years info
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b0cdd08..e0bbe0e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.41-1 backend/
+2.1.42-1 backend/
commit a43a6d1f8a779f5312b1ac3570abc3ab9aca411d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 17 10:57:50 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.36-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index ec1e342..aa4bcc8 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.35-1 schema/spacewalk/
+2.1.36-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 4e64cce..023335c 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.35
+Version: 2.1.36
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jan 17 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.36-1
+- increase length of rhnCVE name column
+
* Fri Jan 17 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.35-1
- 'is' followed by 'declare' is rarely needed
commit e4adb41def454502abcf69e99e49192aab8f766d
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Jan 15 12:00:04 2014 +0100
java: increase column length for CVE ids
diff --git a/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml
index 7b3c630..04837f8 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml
@@ -11,7 +11,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<param name="sequence">rhn_cve_id_seq</param>
</generator>
</id>
- <property name="name" column="name" type="string" length="13" />
+ <property name="name" column="name" type="string" length="20" />
</class>
<query name="Cve.lookupByName">
<![CDATA[from com.redhat.rhn.domain.errata.Cve as cve
commit dcb0e7fda6f79c2c2affee1c21c2a3244797ded7
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Jan 15 11:01:59 2014 +0100
backend: increase length of rhnCVE name column
diff --git a/backend/server/importlib/backendOracle.py b/backend/server/importlib/backendOracle.py
index 604192c..4c118f3 100644
--- a/backend/server/importlib/backendOracle.py
+++ b/backend/server/importlib/backendOracle.py
@@ -242,7 +242,7 @@ class OracleBackend(Backend):
Table('rhnCVE',
fields = {
'id' : DBint(),
- 'name' : DBstring(13),
+ 'name' : DBstring(20),
},
pk = ['name'],
),
commit 7ebe3a7d542c171af11eb819cd50ca86507a674f
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Jan 15 10:32:33 2014 +0100
increase length of rhnCVE name column
diff --git a/schema/spacewalk/common/tables/rhnCVE.sql b/schema/spacewalk/common/tables/rhnCVE.sql
index 1056841..8a87c30 100644
--- a/schema/spacewalk/common/tables/rhnCVE.sql
+++ b/schema/spacewalk/common/tables/rhnCVE.sql
@@ -19,7 +19,7 @@ CREATE TABLE rhnCVE
id NUMBER NOT NULL
CONSTRAINT rhn_cve_id_pk PRIMARY KEY
USING INDEX TABLESPACE [[2m_tbs]],
- name VARCHAR2(13) NOT NULL
+ name VARCHAR2(20) NOT NULL
)
ENABLE ROW MOVEMENT
;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.oracle
new file mode 100644
index 0000000..4a69f93
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.oracle
@@ -0,0 +1 @@
+alter table rhnCVE MODIFY (name varchar2(20));
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.postgresql
new file mode 100644
index 0000000..4d95439
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-inc-length-rhnCVE-name.sql.postgresql
@@ -0,0 +1,4 @@
+-- oracle equivalent source sha1 46195ba34d7b16f69ba16ff2d982b8a7fb0e5e39
+
+ALTER TABLE rhnCVE
+ ALTER COLUMN name TYPE varchar(20);
commit 04d54d15b576aa1cb92bed3037cae78a069c65af
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jan 17 10:50:40 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.35-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 781f543..ec1e342 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.34-1 schema/spacewalk/
+2.1.35-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 0a30591..4e64cce 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.34
+Version: 2.1.35
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jan 17 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.35-1
+- 'is' followed by 'declare' is rarely needed
+
* Fri Jan 17 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.34-1
- rename the schema files to have the proper naming
commit 27b39e4923be5d9a865f891ced55e80f48f17e3e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jan 17 10:48:46 2014 +0100
'is' followed by 'declare' is rarely needed
In truth, it even causes errors on Oracle.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index b393579..a7c56ff 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -1102,7 +1102,6 @@ IS
is
-- procedure refreshes rows for name_id = package_name_id_in or
-- all rows if package_name_id_in is null
- declare
channel_lm timestamp with local time zone;
begin
select last_modified
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 3471f21..c883c88 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 b89b116bf39a095c05c4ae0f9813fd43f0437132
+-- oracle equivalent source sha1 10eaf6c8fb6cd20874ec411571cea6e1646cac72
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
index b393579..a7c56ff 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.oracle
@@ -1102,7 +1102,6 @@ IS
is
-- procedure refreshes rows for name_id = package_name_id_in or
-- all rows if package_name_id_in is null
- declare
channel_lm timestamp with local time zone;
begin
select last_modified
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
index 3471f21..c883c88 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/037-rhn_channel.pkb.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 b89b116bf39a095c05c4ae0f9813fd43f0437132
+-- oracle equivalent source sha1 10eaf6c8fb6cd20874ec411571cea6e1646cac72
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
commit f791c191cf642a32d68804cb32340ff861d17e53
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 17 10:09:31 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.120-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d2e7ab3..95a75f6 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.119
+Version: 2.1.120
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 17 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.120-1
+- fix checkstyle
+
* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.119-1
- checkstyle fixes
- avoid reassigning parameters in StringUtil
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c9c7530..390d52e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.119-1 java/
+2.1.120-1 java/
commit e2d83bd0374146005107eb584154ab415a79e462
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 17 10:00:09 2014 +0100
fix checkstyle
diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
index b4a8005..17218ca 100644
--- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java
+++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
@@ -112,7 +112,7 @@ public class StringUtil {
/**
* Convert the passed in string to a valid java method name. This basically
* capitalizes each word and removes all word delimiters.
- * @param str The string to convert
+ * @param strIn The string to convert
* @return The converted string
*/
public static String beanify(String strIn) {
@@ -141,7 +141,7 @@ public class StringUtil {
*
* For example: someFieldName -> some_field_name
*
- * @param str The string to convert
+ * @param strIn The string to convert
* @return The converted string
*/
public static String debeanify(String strIn) {
@@ -161,7 +161,7 @@ public class StringUtil {
/**
* Converts the passed in string to a valid java Class name. This basically
* capitalizes each word and removes all word delimiters.
- * @param str The string to convert.
+ * @param strIn The string to convert.
* @return The converted string.
*/
public static String classify(String strIn) {
@@ -266,7 +266,7 @@ public class StringUtil {
/**
* Create a random password of the specified length
- * @param length length of random password
+ * @param lengthIn length of random password
* @return String new random password
*/
public static String makeRandomPassword(int lengthIn) {
commit 39ef74cacb20ff9fb8e453546223142077609a26
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 17 08:46:17 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.34-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 2fcbcdf..781f543 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.33-1 schema/spacewalk/
+2.1.34-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 08fbce0..0a30591 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.33
+Version: 2.1.34
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jan 17 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.34-1
+- rename the schema files to have the proper naming
+
* Thu Jan 16 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.33-1
- Tables to have mapping from external groups to internal roles
(rhnUserGroupType).
commit e53166af6e4ce97d18f71ee833f806645b421572
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 17 08:44:15 2014 +0100
rename the schema files to have the proper naming
(and location)
diff --git a/schema/spacewalk/common/rhnConfiguration.sql b/schema/spacewalk/common/rhnConfiguration.sql
deleted file mode 100644
index 5132ac8..0000000
--- a/schema/spacewalk/common/rhnConfiguration.sql
+++ /dev/null
@@ -1,29 +0,0 @@
---
--- Copyright (c) 2014 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.
---
-
-CREATE TABLE rhnConfiguration
-(
- key VARCHAR2(64) NOT NULL
- CONSTRAINT rhnConfig_key_pk PRIMARY KEY,
- description VARCHAR2(512) NOT NULL,
- value VARCHAR2(512),
- default_value VARCHAR2(512),
- created TIMESTAMP WITH LOCAL TIME ZONE
- DEFAULT (current_timestamp) NOT NULL,
- modified TIMESTAMP WITH LOCAL TIME ZONE
- DEFAULT (current_timestamp) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
diff --git a/schema/spacewalk/common/tables/rhnConfiguration.sql b/schema/spacewalk/common/tables/rhnConfiguration.sql
new file mode 100644
index 0000000..5132ac8
--- /dev/null
+++ b/schema/spacewalk/common/tables/rhnConfiguration.sql
@@ -0,0 +1,29 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+CREATE TABLE rhnConfiguration
+(
+ key VARCHAR2(64) NOT NULL
+ CONSTRAINT rhnConfig_key_pk PRIMARY KEY,
+ description VARCHAR2(512) NOT NULL,
+ value VARCHAR2(512),
+ default_value VARCHAR2(512),
+ created TIMESTAMP WITH LOCAL TIME ZONE
+ DEFAULT (current_timestamp) NOT NULL,
+ modified TIMESTAMP WITH LOCAL TIME ZONE
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnUserExtGroup.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnUserExtGroup.sql
deleted file mode 100644
index 8597783..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnUserExtGroup.sql
+++ /dev/null
@@ -1,35 +0,0 @@
---
--- Copyright (c) 2014 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.
---
-
-
-CREATE TABLE rhnUserExtGroup
-(
- id NUMBER NOT NULL
- CONSTRAINT rhn_userExtGroup_id_pk PRIMARY KEY
- USING INDEX TABLESPACE [[64k_tbs]],
- label VARCHAR2(512) NOT NULL,
- created timestamp with local time zone
- DEFAULT (current_timestamp) NOT NULL,
- modified timestamp with local time zone
- DEFAULT (current_timestamp) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE UNIQUE INDEX rhn_userextgroup_label_uq
- ON rhnUserExtGroup (label)
- TABLESPACE [[64k_tbs]];
-
-CREATE SEQUENCE rhn_userextgroup_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.oracle
deleted file mode 100644
index d923b16..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.oracle
+++ /dev/null
@@ -1,24 +0,0 @@
---
--- Copyright (c) 2014 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.
---
-
-create or replace trigger
-rhn_userextgr_mod_trig
-before insert or update on rhnUserExtGroup
-for each row
-begin
- :new.modified := current_timestamp;
-end;
-/
-show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.postgresql
deleted file mode 100644
index 1e1a7d0..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.postgresql
+++ /dev/null
@@ -1,29 +0,0 @@
--- oracle equivalent source sha1 790a351b27de9c2cdd19035a7af2e26bb8695eb0
---
--- Copyright (c) 2014 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.
---
-
-create or replace function rhn_userextgr_mod_trig_fun() returns trigger as
-$$
-begin
- new.modified := current_timestamp;
- return new;
-end;
-$$ language plpgsql;
-
-create trigger
-rhn_userextgr_mod_trig
-before insert or update on rhnUserExtGroup
-for each row
-execute procedure rhn_userextgr_mod_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup.sql
new file mode 100644
index 0000000..8597783
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup.sql
@@ -0,0 +1,35 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+
+CREATE TABLE rhnUserExtGroup
+(
+ id NUMBER NOT NULL
+ CONSTRAINT rhn_userExtGroup_id_pk PRIMARY KEY
+ USING INDEX TABLESPACE [[64k_tbs]],
+ label VARCHAR2(512) NOT NULL,
+ created timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL,
+ modified timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE UNIQUE INDEX rhn_userextgroup_label_uq
+ ON rhnUserExtGroup (label)
+ TABLESPACE [[64k_tbs]];
+
+CREATE SEQUENCE rhn_userextgroup_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.oracle
new file mode 100644
index 0000000..d923b16
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.oracle
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_userextgr_mod_trig
+before insert or update on rhnUserExtGroup
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.postgresql
new file mode 100644
index 0000000..1e1a7d0
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroup-trigger.sql.postgresql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 790a351b27de9c2cdd19035a7af2e26bb8695eb0
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_userextgr_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_userextgr_mod_trig
+before insert or update on rhnUserExtGroup
+for each row
+execute procedure rhn_userextgr_mod_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroupMapping.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroupMapping.sql
deleted file mode 100644
index 45b7212..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroupMapping.sql
+++ /dev/null
@@ -1,42 +0,0 @@
---
--- Copyright (c) 2014 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.
---
-
-
-CREATE TABLE rhnUserExtGroupMapping
-(
- id NUMBER NOT NULL
- CONSTRAINT rhn_userExtGroupMap_id_pk PRIMARY KEY
- USING INDEX TABLESPACE [[64k_tbs]],
- ext_group_id NUMBER NOT NULL
- constraint rhn_userextgroupmap_e_fk
- references rhnUserExtGroup(id)
- on delete cascade,
- int_group_type_id NUMBER NOT NULL
- constraint rhn_userextgroupmap_i_fk
- references rhnUserGroupType(id)
- on delete cascade,
- created timestamp with local time zone
- DEFAULT (current_timestamp) NOT NULL,
- modified timestamp with local time zone
- DEFAULT (current_timestamp) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE UNIQUE INDEX rhn_userextgroupmap_ei_uq
- ON rhnUserExtGroupMapping (ext_group_id, int_group_type_id)
- TABLESPACE [[64k_tbs]];
-
-CREATE SEQUENCE rhn_userextgroupmap_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.oracle
deleted file mode 100644
index a448299..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.oracle
+++ /dev/null
@@ -1,24 +0,0 @@
---
--- Copyright (c) 2014 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.
---
-
-create or replace trigger
-rhn_userextgrmap_mod_trig
-before insert or update on rhnUserExtGroupMapping
-for each row
-begin
- :new.modified := current_timestamp;
-end;
-/
-show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.postgresql
deleted file mode 100644
index 0d4cff9..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.postgresql
+++ /dev/null
@@ -1,29 +0,0 @@
--- oracle equivalent source sha1 7209f810f513f6a5c97bd1ec2ddd7af1199f61b1
---
--- Copyright (c) 2014 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.
---
-
-create or replace function rhn_userextgrmap_mod_trig_fun() returns trigger as
-$$
-begin
- new.modified := current_timestamp;
- return new;
-end;
-$$ language plpgsql;
-
-create trigger
-rhn_userextgrmap_mod_trig
-before insert or update on rhnUserExtGroupMapping
-for each row
-execute procedure rhn_userextgrmap_mod_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping.sql
new file mode 100644
index 0000000..45b7212
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping.sql
@@ -0,0 +1,42 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+
+CREATE TABLE rhnUserExtGroupMapping
+(
+ id NUMBER NOT NULL
+ CONSTRAINT rhn_userExtGroupMap_id_pk PRIMARY KEY
+ USING INDEX TABLESPACE [[64k_tbs]],
+ ext_group_id NUMBER NOT NULL
+ constraint rhn_userextgroupmap_e_fk
+ references rhnUserExtGroup(id)
+ on delete cascade,
+ int_group_type_id NUMBER NOT NULL
+ constraint rhn_userextgroupmap_i_fk
+ references rhnUserGroupType(id)
+ on delete cascade,
+ created timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL,
+ modified timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE UNIQUE INDEX rhn_userextgroupmap_ei_uq
+ ON rhnUserExtGroupMapping (ext_group_id, int_group_type_id)
+ TABLESPACE [[64k_tbs]];
+
+CREATE SEQUENCE rhn_userextgroupmap_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.oracle
new file mode 100644
index 0000000..a448299
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.oracle
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_userextgrmap_mod_trig
+before insert or update on rhnUserExtGroupMapping
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.postgresql
new file mode 100644
index 0000000..0d4cff9
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/046-rhnUserExtGroupMapping-trigger.sql.postgresql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 7209f810f513f6a5c97bd1ec2ddd7af1199f61b1
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_userextgrmap_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_userextgrmap_mod_trig
+before insert or update on rhnUserExtGroupMapping
+for each row
+execute procedure rhn_userextgrmap_mod_trig_fun();
commit c1deb6d284c55b8d913baf03f40b301bd2bc5051
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 22:53:20 2014 +0100
ignore commit 682096e when reporting untagged commits
diff --git a/rel-eng/git-untagged-commits.pl b/rel-eng/git-untagged-commits.pl
index 797288b..8a20357 100755
--- a/rel-eng/git-untagged-commits.pl
+++ b/rel-eng/git-untagged-commits.pl
@@ -35,7 +35,7 @@ for my $file (@files) {
my $name = File::Basename::basename($file);
my ($version, $dir) = split /\s/, $line;
my @changes =
- grep { not /^\S+\s([Bb]umping package versions for|All the NoTgzBuilders are now|%defattr is not needed since rpm 4\.4|Purging %changelog entries|replace legacy name of Tagger with new one)/ }
+ grep { not /^\S+\s([Bb]umping package versions for|%defattr is not needed since rpm 4\.4|Purging %changelog entries|replace legacy name of Tagger with new one|fixed tito build warning)/ }
`git log --pretty=format:'%h %s (%ae)' $name-$version..HEAD -- $cdup$dir`;
if (@changes) {
print "$name-$version..HEAD:\n";
commit 9da6dc44b19ff89a946094463d23eca57a28c065
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 22:40:24 2014 +0100
Automatic commit of package [bootstrap] minor release [3.0.0-4].
diff --git a/rel-eng/packages/bootstrap b/rel-eng/packages/bootstrap
index 2209ec4..9a9cf31 100644
--- a/rel-eng/packages/bootstrap
+++ b/rel-eng/packages/bootstrap
@@ -1 +1 @@
-3.0.0-3 spec-tree/bootstrap/
+3.0.0-4 spec-tree/bootstrap/
diff --git a/spec-tree/bootstrap/bootstrap.spec b/spec-tree/bootstrap/bootstrap.spec
index 156ca83..4364fb6 100644
--- a/spec-tree/bootstrap/bootstrap.spec
+++ b/spec-tree/bootstrap/bootstrap.spec
@@ -1,6 +1,6 @@
Name: bootstrap
Version: 3.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.
Group: Applications/Internet
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 3.0.0-4
+- Fix to use .less files in development mode (2)
+
* Mon Jan 13 2014 Michael Mraka <michael.mraka(a)redhat.com> 3.0.0-3
- allow to use .less files in development mode
commit 3f71520facb2f5adea1fee51b2d3ee85ce6379e3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 22:36:09 2014 +0100
Automatic commit of package [spacewalk-branding] release [2.1.19-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 58b7cd4..3ab7b3a 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 2.1.18
+Version: 2.1.19
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -84,6 +84,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.19-1
+- Fix to use .less files in development mode (2)
+
* Tue Jan 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.18-1
- Fix to use .less files in development mode
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 29d24d3..9ea7e24 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-2.1.18-1 branding/
+2.1.19-1 branding/
commit de60e6fb72d7c80b41fe92c2ece7f09f17a1f266
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 22:33:49 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.119-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a6693e7..d2e7ab3 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.118
+Version: 2.1.119
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.119-1
+- checkstyle fixes
+- avoid reassigning parameters in StringUtil
+
* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.118-1
- %%attr() mode not applicaple to symlink
- fixed conflict with apache-commons-validator
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 72debc9..c9c7530 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.118-1 java/
+2.1.119-1 java/
commit c5fa620bde7772ba30e24c05e30bdffcc9cd7dfe
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 22:30:47 2014 +0100
checkstyle fixes
./code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java:152: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java:176: Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
index 81f55c9..f2725f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
@@ -149,8 +149,8 @@ public class LoginSetupAction extends RhnAction {
updateCmd.setLastName(lastname);
updateCmd.setEmail(email);
updateCmd.updateUser();
- log.warn("Externally authenticated login " + remoteUserString + " (" + firstname + " " +
- lastname + ")");
+ log.warn("Externally authenticated login " + remoteUserString +
+ " (" + firstname + " " + lastname + ")");
}
}
catch (LookupException le) {
@@ -173,8 +173,8 @@ public class LoginSetupAction extends RhnAction {
createCmd.validate();
createCmd.storeNewUser();
remoteUser = createCmd.getUser();
- log.warn("Externally authenticated login " + remoteUserString + " (" + firstname + " " +
- lastname + ") created.");
+ log.warn("Externally authenticated login " + remoteUserString +
+ " (" + firstname + " " + lastname + ") created.");
}
}
if (remoteUser != null) {
commit 95828b525efd332f076a9c572ce58ec59c0b7756
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 17:01:42 2014 +0100
Automatic commit of package [spacewalk-jpp-workaround] release [2.1.1-1].
diff --git a/rel-eng/packages/spacewalk-jpp-workaround b/rel-eng/packages/spacewalk-jpp-workaround
index f1ad7ae..fa88249 100644
--- a/rel-eng/packages/spacewalk-jpp-workaround
+++ b/rel-eng/packages/spacewalk-jpp-workaround
@@ -1 +1 @@
-1.0.5-1 spec-tree/spacewalk-jpp-workaround/
+2.1.1-1 spec-tree/spacewalk-jpp-workaround/
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 255a7da..8408941 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -1,5 +1,5 @@
Name: spacewalk-jpp-workaround
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
Summary: Workaround package to fulfill jpackage broken dependencies
@@ -63,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
+- fixed tito build warning
+- jpackage-utils were replaced with javapackages-tools in fc20
+
* Fri Jan 10 2014 Tomas Lestach <tlestach(a)redhat.com> 1.0.5-1
- introduce commons-logging workaround for fc20
commit 682096e31e29d75b1a4e804c55a1dbc19e754f09
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 16:54:57 2014 +0100
fixed tito build warning
Warning: build.py.props file is obsolete. Please rename it to 'tito.props'.
diff --git a/client/solaris/smartpm/build.py.props b/client/solaris/smartpm/build.py.props
deleted file mode 100644
index f7b67f9..0000000
--- a/client/solaris/smartpm/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-
diff --git a/client/solaris/smartpm/tito.props b/client/solaris/smartpm/tito.props
new file mode 100644
index 0000000..c1211ec
--- /dev/null
+++ b/client/solaris/smartpm/tito.props
@@ -0,0 +1,2 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
diff --git a/selinux/oracle-instantclient-selinux/build.py.props b/selinux/oracle-instantclient-selinux/build.py.props
deleted file mode 100644
index 2222932..0000000
--- a/selinux/oracle-instantclient-selinux/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/selinux/oracle-instantclient-selinux/tito.props b/selinux/oracle-instantclient-selinux/tito.props
new file mode 100644
index 0000000..355908e
--- /dev/null
+++ b/selinux/oracle-instantclient-selinux/tito.props
@@ -0,0 +1,2 @@
+[buildconfig]
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spacewalk/package/build.py.props b/spacewalk/package/build.py.props
deleted file mode 100644
index 355908e..0000000
--- a/spacewalk/package/build.py.props
+++ /dev/null
@@ -1,2 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spacewalk/package/tito.props b/spacewalk/package/tito.props
new file mode 100644
index 0000000..355908e
--- /dev/null
+++ b/spacewalk/package/tito.props
@@ -0,0 +1,2 @@
+[buildconfig]
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/c-ares19/build.py.props b/spec-tree/c-ares19/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/c-ares19/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/c-ares19/tito.props b/spec-tree/c-ares19/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/c-ares19/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/cobbler-loaders/build.py.props b/spec-tree/cobbler-loaders/build.py.props
deleted file mode 100644
index c1211ec..0000000
--- a/spec-tree/cobbler-loaders/build.py.props
+++ /dev/null
@@ -1,2 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
diff --git a/spec-tree/cobbler-loaders/tito.props b/spec-tree/cobbler-loaders/tito.props
new file mode 100644
index 0000000..c1211ec
--- /dev/null
+++ b/spec-tree/cobbler-loaders/tito.props
@@ -0,0 +1,2 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
diff --git a/spec-tree/cobbler20/build.py.props b/spec-tree/cobbler20/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/cobbler20/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/cobbler20/tito.props b/spec-tree/cobbler20/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/cobbler20/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/cx_Oracle/build.py.props b/spec-tree/cx_Oracle/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/cx_Oracle/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/cx_Oracle/tito.props b/spec-tree/cx_Oracle/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/cx_Oracle/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/dwr/build.py.props b/spec-tree/dwr/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/dwr/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/dwr/tito.props b/spec-tree/dwr/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/dwr/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/gyp/build.py.props b/spec-tree/gyp/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/gyp/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/gyp/tito.props b/spec-tree/gyp/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/gyp/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/heirloom-pkgtools/build.py.props b/spec-tree/heirloom-pkgtools/build.py.props
deleted file mode 100644
index f747a3d..0000000
--- a/spec-tree/heirloom-pkgtools/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-tagger = tito.tagger.ReleaseTagger
-
diff --git a/spec-tree/heirloom-pkgtools/tito.props b/spec-tree/heirloom-pkgtools/tito.props
new file mode 100644
index 0000000..2a8b6d9
--- /dev/null
+++ b/spec-tree/heirloom-pkgtools/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+builder = spacewalkx.builderx.NoTgzBuilder
+tagger = tito.tagger.ReleaseTagger
diff --git a/spec-tree/http-parser/build.py.props b/spec-tree/http-parser/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/http-parser/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/http-parser/tito.props b/spec-tree/http-parser/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/http-parser/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/jpam/build.py.props b/spec-tree/jpam/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/jpam/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/jpam/tito.props b/spec-tree/jpam/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/jpam/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/libuv/build.py.props b/spec-tree/libuv/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/libuv/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/libuv/tito.props b/spec-tree/libuv/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/libuv/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/mod_perl/build.py.props b/spec-tree/mod_perl/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/mod_perl/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/mod_perl/tito.props b/spec-tree/mod_perl/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/mod_perl/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nodejs-less/build.py.props b/spec-tree/nodejs-less/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/nodejs-less/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nodejs-less/tito.props b/spec-tree/nodejs-less/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/nodejs-less/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nodejs-packaging/build.py.props b/spec-tree/nodejs-packaging/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/nodejs-packaging/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nodejs-packaging/tito.props b/spec-tree/nodejs-packaging/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/nodejs-packaging/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nodejs/build.py.props b/spec-tree/nodejs/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/nodejs/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nodejs/tito.props b/spec-tree/nodejs/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/nodejs/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/nutch/build.py.props b/spec-tree/nutch/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/nutch/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/nutch/tito.props b/spec-tree/nutch/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/nutch/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/perl-DBD-Oracle/build.py.props b/spec-tree/perl-DBD-Oracle/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/perl-DBD-Oracle/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/perl-DBD-Oracle/tito.props b/spec-tree/perl-DBD-Oracle/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/perl-DBD-Oracle/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/perl-Net-INET6Glue/build.py.props b/spec-tree/perl-Net-INET6Glue/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/perl-Net-INET6Glue/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/perl-Net-INET6Glue/tito.props b/spec-tree/perl-Net-INET6Glue/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/perl-Net-INET6Glue/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/quartz/build.py.props b/spec-tree/quartz/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/quartz/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/quartz/tito.props b/spec-tree/quartz/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/quartz/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/redstone-xmlrpc/build.py.props b/spec-tree/redstone-xmlrpc/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/redstone-xmlrpc/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/redstone-xmlrpc/tito.props b/spec-tree/redstone-xmlrpc/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/redstone-xmlrpc/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/scons/build.py.props b/spec-tree/scons/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/scons/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/scons/tito.props b/spec-tree/scons/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/scons/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/simple-core/build.py.props b/spec-tree/simple-core/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/simple-core/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/simple-core/tito.props b/spec-tree/simple-core/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/simple-core/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/spacewalk-jpp-workaround/build.py.props b/spec-tree/spacewalk-jpp-workaround/build.py.props
deleted file mode 100644
index 355908e..0000000
--- a/spec-tree/spacewalk-jpp-workaround/build.py.props
+++ /dev/null
@@ -1,2 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/spacewalk-jpp-workaround/tito.props b/spec-tree/spacewalk-jpp-workaround/tito.props
new file mode 100644
index 0000000..355908e
--- /dev/null
+++ b/spec-tree/spacewalk-jpp-workaround/tito.props
@@ -0,0 +1,2 @@
+[buildconfig]
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/spacewalk-oro-compat/build.py.props b/spec-tree/spacewalk-oro-compat/build.py.props
deleted file mode 100644
index f747a3d..0000000
--- a/spec-tree/spacewalk-oro-compat/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-tagger = tito.tagger.ReleaseTagger
-
diff --git a/spec-tree/spacewalk-oro-compat/tito.props b/spec-tree/spacewalk-oro-compat/tito.props
new file mode 100644
index 0000000..2a8b6d9
--- /dev/null
+++ b/spec-tree/spacewalk-oro-compat/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+builder = spacewalkx.builderx.NoTgzBuilder
+tagger = tito.tagger.ReleaseTagger
diff --git a/spec-tree/spacewalk-repo/build.py.props b/spec-tree/spacewalk-repo/build.py.props
deleted file mode 100644
index f747a3d..0000000
--- a/spec-tree/spacewalk-repo/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-tagger = tito.tagger.ReleaseTagger
-
diff --git a/spec-tree/spacewalk-repo/tito.props b/spec-tree/spacewalk-repo/tito.props
new file mode 100644
index 0000000..2a8b6d9
--- /dev/null
+++ b/spec-tree/spacewalk-repo/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+builder = spacewalkx.builderx.NoTgzBuilder
+tagger = tito.tagger.ReleaseTagger
diff --git a/spec-tree/stringtree-json/build.py.props b/spec-tree/stringtree-json/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/stringtree-json/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/stringtree-json/tito.props b/spec-tree/stringtree-json/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/stringtree-json/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/susestudio-java-client/build.py.props b/spec-tree/susestudio-java-client/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/susestudio-java-client/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/susestudio-java-client/tito.props b/spec-tree/susestudio-java-client/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/susestudio-java-client/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/tanukiwrapper/build.py.props b/spec-tree/tanukiwrapper/build.py.props
deleted file mode 100644
index 142e9dd..0000000
--- a/spec-tree/tanukiwrapper/build.py.props
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/spec-tree/tanukiwrapper/tito.props b/spec-tree/tanukiwrapper/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/v8/build.py.props b/spec-tree/v8/build.py.props
deleted file mode 100644
index 8c63ded..0000000
--- a/spec-tree/v8/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-tagger = tito.tagger.ReleaseTagger
-builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/v8/tito.props b/spec-tree/v8/tito.props
new file mode 100644
index 0000000..8c63ded
--- /dev/null
+++ b/spec-tree/v8/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
commit 11cb5bdf6eae26a4d5d609806209f0e40bb74015
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 16 16:51:46 2014 +0100
avoid reassigning parameters in StringUtil
diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
index 3199d5a..b4a8005 100644
--- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java
+++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
@@ -31,6 +31,7 @@ import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -114,8 +115,8 @@ public class StringUtil {
* @param str The string to convert
* @return The converted string
*/
- public static String beanify(String str) {
- str = str.trim();
+ public static String beanify(String strIn) {
+ String str = strIn.trim();
StringBuffer result = new StringBuffer(str.length());
boolean wasWhitespace = false;
@@ -143,8 +144,8 @@ public class StringUtil {
* @param str The string to convert
* @return The converted string
*/
- public static String debeanify(String str) {
- str = str.trim();
+ public static String debeanify(String strIn) {
+ String str = strIn.trim();
StringBuffer result = new StringBuffer(str.length());
for (int i = 0; i < str.length(); i++) {
@@ -163,8 +164,8 @@ public class StringUtil {
* @param str The string to convert.
* @return The converted string.
*/
- public static String classify(String str) {
- str = str.trim();
+ public static String classify(String strIn) {
+ String str = strIn.trim();
StringBuffer result = new StringBuffer(str.length());
boolean wasWhitespace = false;
@@ -268,13 +269,13 @@ public class StringUtil {
* @param length length of random password
* @return String new random password
*/
- public static String makeRandomPassword(int length) {
- if (length < 5) {
+ public static String makeRandomPassword(int lengthIn) {
+ if (lengthIn < 5) {
throw new IllegalArgumentException("Length too short");
}
- StringBuffer sb = new StringBuffer(length);
+ StringBuffer sb = new StringBuffer(lengthIn);
Random rand = new Random();
-
+ int length = lengthIn;
while (length-- > 5) {
sb.append((char) ('A' + rand.nextInt(26)));
}
@@ -808,13 +809,7 @@ public class StringUtil {
* @return the full path with no duplicate '/'s
*/
public static String addPath(String originalPath, String toAdd) {
- if (originalPath.charAt(originalPath.length() - 1) != '/') {
- originalPath = originalPath + "/";
- }
- if (toAdd.charAt(0) == '/') {
- toAdd = toAdd.substring(1);
- }
- return originalPath + toAdd;
+ return FilenameUtils.normalize(originalPath + toAdd);
}
/**
commit aa487cf52a644be78cd94567bad1e941666b18d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 16:49:36 2014 +0100
Automatic commit of package [spacewalk-search] release [2.1.13-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index e31c4f0..4f879c8 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-2.1.12-1 search-server/spacewalk-search/
+2.1.13-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 9248ce8..b71fc48 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.12
+Version: 2.1.13
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -198,6 +198,10 @@ fi
%{_var}/lib/rhn/search/indexes/docs
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.13-1
+- %%attr() mode not applicaple to symlink
+- resolve conflict between {apache,jakarta}-commons-cli on Fedora 20
+
* Wed Jan 08 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.12-1
- let spacewalk-search buildrequire javapackages-tools
commit a6d113c9a40a73c4673f7223c652f28320426f97
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 16:49:13 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.118-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9ed7180..a6693e7 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.117
+Version: 2.1.118
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.118-1
+- %%attr() mode not applicaple to symlink
+- fixed conflict with apache-commons-validator
+- resolve conflict between {apache,jakarta}-commons-cli on Fedora 20
+
* Thu Jan 16 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.117-1
- remove unused method
- create external authentication page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c8d53ae..72debc9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.117-1 java/
+2.1.118-1 java/
commit cf7543755f5a708b2e1ea5cf4c0e5f923d9f7a98
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 16:35:37 2014 +0100
%attr() mode not applicaple to symlink
fixing
warning: Explicit %attr() mode not applicaple to symlink: /root/rpmbuild/BUILDROOT/spacewalk-search-2.1.12-1.git.106.57fb94e.fc20.x86_64/usr/bin/rhnsearchd
warning: Explicit %attr() mode not applicaple to symlink: /root/rpmbuild/BUILDROOT/spacewalk-search-2.1.12-1.git.106.57fb94e.fc20.x86_64/var/lib/rhn/search/indexes/docs
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 90fcd5d..9248ce8 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -189,13 +189,13 @@ fi
%else
%attr(755, root, root) %{_initrddir}/rhn-search
%endif
-%attr(755, root, root) %{_bindir}/rhnsearchd
+%{_bindir}/rhnsearchd
%{_prefix}/share/rhn/config-defaults/rhn_search.conf
%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
%{_sysconfdir}/logrotate.d/rhn-search
%dir %attr(755, root, root) %{_var}/lib/rhn/search
%dir %attr(755, root, root) %{_var}/lib/rhn/search/indexes
-%attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
+%{_var}/lib/rhn/search/indexes/docs
%changelog
* Wed Jan 08 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.12-1
commit 31853295a5f1d453b3cc7a45887f302bcae19420
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 16:26:48 2014 +0100
resolve conflict between {apache,jakarta}-commons-cli on Fedora 20
fixing yum install spacewalk-postgresql
Transaction check error:
file /usr/share/java/commons-cli.jar conflicts between attempted installs of apache-commons-cli-1.2-11.fc20.noarch and jakarta-commons-cli-0:1.1-1.jpp5.noarch
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index b930ae9..90fcd5d 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -20,13 +20,14 @@ BuildArch: noarch
Requires: c3p0 >= 0.9.1
Requires: cglib
Requires: doc-indexes
-Requires: jakarta-commons-cli
Requires: jakarta-commons-codec
Requires: jakarta-commons-httpclient
Requires: jakarta-commons-lang >= 0:2.1
%if 0%{?fedora}
+Requires: apache-commons-cli
Requires: apache-commons-logging
%else
+Requires: jakarta-commons-cli
Requires: jakarta-commons-logging
%endif
%if 0%{?fedora} >= 20
@@ -58,13 +59,14 @@ Obsoletes: rhn-search < 5.3.0
BuildRequires: ant
#BuildRequires: apache-ibatis-sqlmap
BuildRequires: c3p0 >= 0.9.1
-BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-httpclient
BuildRequires: jakarta-commons-lang >= 0:2.1
%if 0%{?fedora}
+BuildRequires: apache-commons-cli
BuildRequires: apache-commons-logging
%else
+BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-logging
%endif
BuildRequires: java-devel >= 1.6.0
commit 1577f4c611bc6fed65f974fd790714a068fbb381
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 15:05:10 2014 +0100
%attr() mode not applicaple to symlink
RPM build errors:
Explicit %attr() mode not applicaple to symlink: /root/rpmbuild/BUILDROOT/spacewalk-java-2.1.116-1.git.4.eced133.fc20.x86_64/usr/bin/taskomaticd
Explicit %attr() mode not applicaple to symlink: /root/rpmbuild/BUILDROOT/spacewalk-java-2.1.116-1.git.4.eced133.fc20.x86_64/usr/share/rhn/lib/spacewalk-asm.jar
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6f169b8..9ed7180 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -777,8 +777,8 @@ fi
%else
%attr(755, root, root) %{_initrddir}/taskomatic
%endif
-%attr(755, root, root) %{_bindir}/taskomaticd
-%attr(755, root, root) %{_datadir}/rhn/lib/spacewalk-asm.jar
+%{_bindir}/taskomaticd
+%{_datadir}/rhn/lib/spacewalk-asm.jar
%files config
commit c2afdea18763bbe4ea097b0b9192175c324b35cd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 14:09:15 2014 +0100
fixed conflict with apache-commons-validator
adressing yum install spacewalk-postgresql
Transaction check error:
file /usr/share/java/commons-validator.jar conflicts between attempted installs of spacewalk-java-2.1.113-1.fc20.noarch and apache-commons-validator-1.4.0-6.fc20.noarch
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fe55412..6f169b8 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -473,7 +473,9 @@ ln -s -f %{_javadir}/hibernate3/hibernate-ehcache.jar $RPM_BUILD_ROOT%{_javadir}
# on Fedora 19 some jars are named differently
%if 0%{?fedora} && 0%{?fedora} > 18
mkdir -p $RPM_BUILD_ROOT%{_javadir}
+%if 0%{?fedora} < 20
ln -s -f %{_javadir}/apache-commons-validator.jar $RPM_BUILD_ROOT%{_javadir}/commons-validator.jar
+%endif
ln -s -f %{_javadir}/mchange-commons-java.jar $RPM_BUILD_ROOT%{_javadir}/mchange-commons.jar
ln -s -f %{_javadir}/jboss-logging/jboss-logging.jar $RPM_BUILD_ROOT%{_javadir}/jboss-logging.jar
%endif
@@ -674,7 +676,9 @@ fi
%{_javadir}/hibernate3/hibernate-ehcache-3.jar
%endif
%if 0%{?fedora} && 0%{?fedora} > 18
+%if 0%{?fedora} < 20
%{_javadir}/commons-validator.jar
+%endif
%{_javadir}/mchange-commons.jar
%{_javadir}/jboss-logging.jar
%{jardir}/jboss-loggingjboss-logging.jar
commit ab7f54aa4f0246603985119e82329106b68c7ee7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 13:46:17 2014 +0100
resolve conflict between {apache,jakarta}-commons-cli on Fedora 20
fixing yum install spacewalk-postgresql
Transaction check error:
file /usr/share/java/commons-cli.jar conflicts between attempted installs of apache-commons-cli-1.2-11.fc20.noarch and jakarta-commons-cli-0:1.1-1.jpp5.noarch
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ec791f3..fe55412 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -66,7 +66,6 @@ Requires: java-devel >= 1:1.6.0
Requires: jakarta-commons-lang >= 0:2.1
Requires: jakarta-commons-codec
Requires: jakarta-commons-discovery
-Requires: jakarta-commons-cli
Requires: jakarta-commons-el
Requires: jakarta-commons-fileupload
Requires: jakarta-taglibs-standard
@@ -207,9 +206,11 @@ BuildRequires: postgresql-jdbc
%if 0%{?fedora}
# spelling checker is only for Fedoras (no aspell in RHEL6)
BuildRequires: aspell aspell-en libxslt
+Requires: apache-commons-cli
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
%else
+Requires: jakarta-commons-cli
BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-io
%endif
@@ -337,12 +338,13 @@ Requires: hibernate3 >= 0:3.2.4
Requires: java >= 0:1.6.0
Requires: java-devel >= 0:1.6.0
Requires: jakarta-commons-lang >= 0:2.1
-Requires: jakarta-commons-cli
Requires: jakarta-commons-codec
Requires: jakarta-commons-dbcp
%if 0%{?fedora}
+Requires: apache-commons-cli
Requires: apache-commons-logging
%else
+Requires: jakarta-commons-cli
Requires: jakarta-commons-logging
%endif
Requires: jakarta-taglibs-standard
commit b37e5811be94d5a1a21a79b263139c51f9697d0d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 12:24:50 2014 +0100
jpackage-utils were replaced with javapackages-tools in fc20
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index eadadaa..255a7da 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -1,5 +1,5 @@
Name: spacewalk-jpp-workaround
-Version: 1.0.5
+Version: 2.1.0
Release: 1%{?dist}
Summary: Workaround package to fulfill jpackage broken dependencies
@@ -38,6 +38,7 @@ Requires: struts >= 1.3.10
%if 0%{?fedora} >= 20
Provides: jakarta-commons-logging = 1.1.3
Requires: apache-commons-logging
+Obsoletes: jpackage-utils >= 5.0.0
%endif
%description
commit 52bad8e0e54e9e4f9094e4446310144a8693e136
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 16 16:25:44 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.117-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 24c7f50..ec791f3 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.116
+Version: 2.1.117
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -795,6 +795,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 16 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.117-1
+- remove unused method
+- create external authentication page
+- removed unused import
+
* Wed Jan 15 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.116-1
- removed unused methods
- selectable doesn't work properly with ListRhnSetHelper
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3331396..c8d53ae 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.116-1 java/
+2.1.117-1 java/
commit 67be88b20c50b2d0169501af85f6e0e3f278b3bd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 16 16:25:17 2014 +0100
remove unused method
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index d643224..84e7717 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -157,7 +157,6 @@ public class ConfigDefaults {
public static final String LOOKUP_EXCEPT_SEND_EMAIL = "lookup_exception_email";
public static final String KS_PARTITION_DEFAULT = "kickstart.partition.default";
- public static final String IPA_DEFAULT_USER_ORG = "java.ipa.default_user_org";
/**
* System Currency defaults
@@ -617,16 +616,4 @@ public class ConfigDefaults {
public int getTaskoChannelRepodataWorkers() {
return Config.get().getInt(TASKOMATIC_CHANNEL_REPODATA_WORKERS, 1);
}
-
- /**
- * Returns Max taskomatic channel repodata workers
- * @return Max taskomatic channel repodata workers
- */
- public Long getIpaDefaultUserOrgId() {
- Integer ipaDefaultUserOrg = Config.get().getInteger(IPA_DEFAULT_USER_ORG);
- if (ipaDefaultUserOrg != null) {
- return ipaDefaultUserOrg.longValue();
- }
- throw new ConfigException(IPA_DEFAULT_USER_ORG + " not set!");
- }
}
commit 734f036c2585a4951ca1bbffc87df705e913ee86
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 16 16:22:50 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.33-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index abadb88..2fcbcdf 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.32-1 schema/spacewalk/
+2.1.33-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 8062d72..08fbce0 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.32
+Version: 2.1.33
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Jan 16 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.33-1
+- Tables to have mapping from external groups to internal roles
+ (rhnUserGroupType).
+- introduce 1st configuration key
+- introduce rhnConfiguration table
+
* Thu Jan 16 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.32-1
- Changed gpg keys so they match reality.
commit 6406c9ce65b8d68ba86cca50955b1cca01219597
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 14 09:23:36 2014 +0800
Tables to have mapping from external groups to internal roles (rhnUserGroupType).
diff --git a/schema/spacewalk/common/tables/rhnUserExtGroup.sql b/schema/spacewalk/common/tables/rhnUserExtGroup.sql
new file mode 100644
index 0000000..8597783
--- /dev/null
+++ b/schema/spacewalk/common/tables/rhnUserExtGroup.sql
@@ -0,0 +1,35 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+
+CREATE TABLE rhnUserExtGroup
+(
+ id NUMBER NOT NULL
+ CONSTRAINT rhn_userExtGroup_id_pk PRIMARY KEY
+ USING INDEX TABLESPACE [[64k_tbs]],
+ label VARCHAR2(512) NOT NULL,
+ created timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL,
+ modified timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE UNIQUE INDEX rhn_userextgroup_label_uq
+ ON rhnUserExtGroup (label)
+ TABLESPACE [[64k_tbs]];
+
+CREATE SEQUENCE rhn_userextgroup_seq;
diff --git a/schema/spacewalk/common/tables/rhnUserExtGroupMapping.sql b/schema/spacewalk/common/tables/rhnUserExtGroupMapping.sql
new file mode 100644
index 0000000..45b7212
--- /dev/null
+++ b/schema/spacewalk/common/tables/rhnUserExtGroupMapping.sql
@@ -0,0 +1,42 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+
+CREATE TABLE rhnUserExtGroupMapping
+(
+ id NUMBER NOT NULL
+ CONSTRAINT rhn_userExtGroupMap_id_pk PRIMARY KEY
+ USING INDEX TABLESPACE [[64k_tbs]],
+ ext_group_id NUMBER NOT NULL
+ constraint rhn_userextgroupmap_e_fk
+ references rhnUserExtGroup(id)
+ on delete cascade,
+ int_group_type_id NUMBER NOT NULL
+ constraint rhn_userextgroupmap_i_fk
+ references rhnUserGroupType(id)
+ on delete cascade,
+ created timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL,
+ modified timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE UNIQUE INDEX rhn_userextgroupmap_ei_uq
+ ON rhnUserExtGroupMapping (ext_group_id, int_group_type_id)
+ TABLESPACE [[64k_tbs]];
+
+CREATE SEQUENCE rhn_userextgroupmap_seq;
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index 4125c6e..25e79d4 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -195,6 +195,7 @@ rhnTaskoSchedule :: rhnTaskoBunch
rhnTaskoTemplate :: rhnTaskoBunch rhnTaskoTask
rhnTransactionPackage :: rhnTransactionOperation rhnPackageArch \
rhnPackageEVR rhnPackageName
+rhnUserExtGroupMapping :: rhnUserExtGroup rhnUserGroupType
rhnUserGroupMembers :: web_contact rhnUserGroup
rhnUserGroup :: web_customer rhnUserGroupType
rhnUserInfo :: web_contact rhnTimezone
diff --git a/schema/spacewalk/oracle/triggers/rhnUserExtGroup.sql b/schema/spacewalk/oracle/triggers/rhnUserExtGroup.sql
new file mode 100644
index 0000000..d923b16
--- /dev/null
+++ b/schema/spacewalk/oracle/triggers/rhnUserExtGroup.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_userextgr_mod_trig
+before insert or update on rhnUserExtGroup
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/oracle/triggers/rhnUserExtGroupMapping.sql b/schema/spacewalk/oracle/triggers/rhnUserExtGroupMapping.sql
new file mode 100644
index 0000000..a448299
--- /dev/null
+++ b/schema/spacewalk/oracle/triggers/rhnUserExtGroupMapping.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_userextgrmap_mod_trig
+before insert or update on rhnUserExtGroupMapping
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/postgres/triggers/rhnUserExtGroup.sql b/schema/spacewalk/postgres/triggers/rhnUserExtGroup.sql
new file mode 100644
index 0000000..1e1a7d0
--- /dev/null
+++ b/schema/spacewalk/postgres/triggers/rhnUserExtGroup.sql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 790a351b27de9c2cdd19035a7af2e26bb8695eb0
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_userextgr_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_userextgr_mod_trig
+before insert or update on rhnUserExtGroup
+for each row
+execute procedure rhn_userextgr_mod_trig_fun();
diff --git a/schema/spacewalk/postgres/triggers/rhnUserExtGroupMapping.sql b/schema/spacewalk/postgres/triggers/rhnUserExtGroupMapping.sql
new file mode 100644
index 0000000..0d4cff9
--- /dev/null
+++ b/schema/spacewalk/postgres/triggers/rhnUserExtGroupMapping.sql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 7209f810f513f6a5c97bd1ec2ddd7af1199f61b1
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_userextgrmap_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_userextgrmap_mod_trig
+before insert or update on rhnUserExtGroupMapping
+for each row
+execute procedure rhn_userextgrmap_mod_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnUserExtGroup.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnUserExtGroup.sql
new file mode 100644
index 0000000..8597783
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnUserExtGroup.sql
@@ -0,0 +1,35 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+
+CREATE TABLE rhnUserExtGroup
+(
+ id NUMBER NOT NULL
+ CONSTRAINT rhn_userExtGroup_id_pk PRIMARY KEY
+ USING INDEX TABLESPACE [[64k_tbs]],
+ label VARCHAR2(512) NOT NULL,
+ created timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL,
+ modified timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE UNIQUE INDEX rhn_userextgroup_label_uq
+ ON rhnUserExtGroup (label)
+ TABLESPACE [[64k_tbs]];
+
+CREATE SEQUENCE rhn_userextgroup_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.oracle
new file mode 100644
index 0000000..d923b16
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.oracle
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_userextgr_mod_trig
+before insert or update on rhnUserExtGroup
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.postgresql
new file mode 100644
index 0000000..1e1a7d0
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/043-rhnUserExtGroup-trigger.sql.postgresql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 790a351b27de9c2cdd19035a7af2e26bb8695eb0
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_userextgr_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_userextgr_mod_trig
+before insert or update on rhnUserExtGroup
+for each row
+execute procedure rhn_userextgr_mod_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroupMapping.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroupMapping.sql
new file mode 100644
index 0000000..45b7212
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/044-rhnUserExtGroupMapping.sql
@@ -0,0 +1,42 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+
+CREATE TABLE rhnUserExtGroupMapping
+(
+ id NUMBER NOT NULL
+ CONSTRAINT rhn_userExtGroupMap_id_pk PRIMARY KEY
+ USING INDEX TABLESPACE [[64k_tbs]],
+ ext_group_id NUMBER NOT NULL
+ constraint rhn_userextgroupmap_e_fk
+ references rhnUserExtGroup(id)
+ on delete cascade,
+ int_group_type_id NUMBER NOT NULL
+ constraint rhn_userextgroupmap_i_fk
+ references rhnUserGroupType(id)
+ on delete cascade,
+ created timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL,
+ modified timestamp with local time zone
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE UNIQUE INDEX rhn_userextgroupmap_ei_uq
+ ON rhnUserExtGroupMapping (ext_group_id, int_group_type_id)
+ TABLESPACE [[64k_tbs]];
+
+CREATE SEQUENCE rhn_userextgroupmap_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.oracle
new file mode 100644
index 0000000..a448299
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.oracle
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_userextgrmap_mod_trig
+before insert or update on rhnUserExtGroupMapping
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.postgresql
new file mode 100644
index 0000000..0d4cff9
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/045-rhnUserExtGroupMapping-trigger.sql.postgresql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 7209f810f513f6a5c97bd1ec2ddd7af1199f61b1
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_userextgrmap_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_userextgrmap_mod_trig
+before insert or update on rhnUserExtGroupMapping
+for each row
+execute procedure rhn_userextgrmap_mod_trig_fun();
commit 0aac65672a8436cc7091cabf5e7ccf4373b11dec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 13 17:26:53 2014 +0100
create external authentication page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml
index ec00fc1..e9fef60 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml
@@ -9,4 +9,28 @@
</query>
</mode>
+<mode name="get_satconfig_value">
+ <query params="key">
+ SELECT value
+ FROM rhnConfiguration
+ WHERE key = :key
+ </query>
+</mode>
+
+<write-mode name="set_satconfig_value">
+ <query params="key, value">
+ UPDATE rhnConfiguration
+ SET value = :value
+ WHERE key = :key
+ </query>
+</write-mode>
+
+<write-mode name="reset_satconfig_default_value">
+ <query params="key">
+ UPDATE rhnConfiguration
+ SET value = default_value
+ WHERE key = :key
+ </query>
+</write-mode>
+
</datasource_modes>
diff --git a/java/code/src/com/redhat/rhn/domain/common/SatConfigFactory.java b/java/code/src/com/redhat/rhn/domain/common/SatConfigFactory.java
new file mode 100644
index 0000000..38f36e3
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/common/SatConfigFactory.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2014 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.
+ */
+package com.redhat.rhn.domain.common;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.db.datasource.ModeFactory;
+import com.redhat.rhn.common.db.datasource.SelectMode;
+import com.redhat.rhn.common.db.datasource.WriteMode;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
+
+import org.apache.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * SatConfigFactory
+ * @version $Rev$
+ */
+public class SatConfigFactory extends HibernateFactory {
+
+ private static SatConfigFactory singleton = new SatConfigFactory();
+ private static Logger log = Logger.getLogger(CommonFactory.class);
+
+ public static final String ORG_ID_FOR_EXT_AUTH = "orgid_for_ext_authentications";
+
+ private SatConfigFactory() {
+ super();
+ }
+
+ @Override
+ protected Logger getLogger() {
+ return log;
+ }
+
+ /**
+ * return satellite configuration long value for a specified key
+ * @param key key
+ * @return value long value
+ */
+ public static Long getSatConfigLongValue(String key) {
+ String stringValue = getSatConfigValue(key);
+ if (stringValue != null) {
+ try {
+ return Long.parseLong(stringValue);
+ }
+ catch (NumberFormatException nfe) {
+ log.error("Satellite configuration '" + key + "' value (" + stringValue +
+ ") cannot be converted to Long.");
+ }
+ }
+ return null;
+ }
+
+ /**
+ * return satellite configuration value for a specified key
+ * @param key key
+ * @return value
+ */
+ public static String getSatConfigValue(String key) {
+ Map params = new HashMap();
+ params.put("key", key);
+ SelectMode m = ModeFactory.getMode("util_queries",
+ "get_satconfig_value");
+ DataResult<Map> dr = m.execute(params);
+ if (!dr.isEmpty()) {
+ return (String) dr.get(0).get("value");
+ }
+ log.error("'" + key + "' not found within the satellite configuration.");
+ return null;
+ }
+
+ /**
+ * set a satellite configuration value for a specified key
+ * @param key key
+ * @param value value
+ */
+ public static void setSatConfigValue(String key, String value) {
+ Map params = new HashMap();
+ params.put("key", key);
+ params.put("value", value);
+ WriteMode m = ModeFactory.getWriteMode("util_queries",
+ "set_satconfig_value");
+ m.executeUpdate(params);
+ }
+
+ /**
+ * reset a satellite configuration value to a default value for a specified key
+ * @param key key
+ */
+ public static void resetSatConfigDefaultValue(String key) {
+ Map params = new HashMap();
+ params.put("key", key);
+ WriteMode m = ModeFactory.getWriteMode("util_queries",
+ "reset_satconfig_default_value");
+ m.executeUpdate(params);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
index ada0ca2..81f55c9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
@@ -14,11 +14,11 @@
*/
package com.redhat.rhn.frontend.action;
-import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.hibernate.LookupException;
+import com.redhat.rhn.domain.common.SatConfigFactory;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.domain.user.User;
@@ -121,6 +121,9 @@ public class LoginSetupAction extends RhnAction {
String email = decodeFromIso88591(
(String) request.getAttribute("REMOTE_USER_EMAIL"), null);
+ Long defaultOrgId = SatConfigFactory.getSatConfigLongValue(
+ SatConfigFactory.ORG_ID_FOR_EXT_AUTH);
+
User remoteUser = null;
try {
log.info("REMOTE_USER_CUSTOM_N: " +
@@ -136,21 +139,27 @@ public class LoginSetupAction extends RhnAction {
createErrorMessage(request, "account.user.disabled", remoteUserString);
remoteUser = null;
}
- else {
+ else if (!remoteUser.getOrg().getId().equals(defaultOrgId)) {
+ createErrorMessage(request, "account.user.wrong_org", remoteUserString);
+ remoteUser = null;
+ }
+ if (remoteUser != null) {
UpdateUserCommand updateCmd = new UpdateUserCommand(remoteUser);
updateCmd.setFirstNames(firstname);
updateCmd.setLastName(lastname);
updateCmd.setEmail(email);
updateCmd.updateUser();
- log.warn("Kerberos login " + remoteUserString + " (" + firstname + " " +
+ log.warn("Externally authenticated login " + remoteUserString + " (" + firstname + " " +
lastname + ")");
}
}
catch (LookupException le) {
- Long defaultOrgId = ConfigDefaults.get().getIpaDefaultUserOrgId();
- Org defaultOrg = OrgFactory.lookupById(defaultOrgId);
+ Org defaultOrg = null;
+ if (defaultOrgId != null) {
+ defaultOrg = OrgFactory.lookupById(defaultOrgId);
+ }
if (defaultOrg == null) {
- log.warn("Cannot find organization with id: " + defaultOrgId);
+ log.error("Cannot find organization with id: " + defaultOrgId);
}
else {
CreateUserCommand createCmd = new CreateUserCommand();
@@ -164,7 +173,7 @@ public class LoginSetupAction extends RhnAction {
createCmd.validate();
createCmd.storeNewUser();
remoteUser = createCmd.getUser();
- log.warn("Kerberos login " + remoteUserString + " (" + firstname + " " +
+ log.warn("Externally authenticated login " + remoteUserString + " (" + firstname + " " +
lastname + ") created.");
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthenticationAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthenticationAction.java
new file mode 100644
index 0000000..7b15191
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthenticationAction.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2009--2012 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.
+ */
+package com.redhat.rhn.frontend.action.multiorg;
+
+import com.redhat.rhn.common.db.datasource.DataList;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.common.SatConfigFactory;
+import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.OrgDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.manager.org.OrgManager;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.apache.struts.util.LabelValueBean;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * ExtAuthenticationAction
+ */
+public class ExtAuthenticationAction extends RhnAction {
+
+ /** {@inheritDoc} */
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm formIn,
+ HttpServletRequest request, HttpServletResponse response) {
+ DynaActionForm daForm = (DynaActionForm) formIn;
+ RequestContext ctx = new RequestContext(request);
+
+ if (ctx.isSubmitted()) {
+
+ String toOrgString = daForm.getString("to_org");
+ if (!StringUtils.isBlank(toOrgString)) {
+ // just check the org id is valid
+ OrgFactory.lookupById(Long.parseLong(toOrgString));
+ }
+ else {
+ toOrgString = null;
+ }
+ // store the value
+ SatConfigFactory.setSatConfigValue(SatConfigFactory.ORG_ID_FOR_EXT_AUTH,
+ toOrgString);
+
+ createSuccessMessage(request, "message.ext_auth_updated", null);
+ return mapping.findForward("success");
+ }
+
+ // not submitted
+ setupForm(request, daForm);
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ private void setupForm(HttpServletRequest request, DynaActionForm form) {
+ RequestContext ctx = new RequestContext(request);
+ User user = ctx.getCurrentUser();
+ DataList<OrgDto> dr = OrgManager.activeOrgs(user);
+
+ List <LabelValueBean> orgs = new LinkedList<LabelValueBean>();
+ orgs.add(lv(
+ LocalizationService.getInstance().getMessage("message.ext_auth_disable"),
+ null));
+ for (OrgDto orgDto : dr) {
+ orgs.add(lv(orgDto.getName(), orgDto.getId().toString()));
+ }
+ request.setAttribute("orgs", orgs);
+
+ Long actOrgId = SatConfigFactory.getSatConfigLongValue(
+ SatConfigFactory.ORG_ID_FOR_EXT_AUTH);
+ if (actOrgId != null) {
+ form.set("to_org", actOrgId.toString());
+ }
+ else {
+ form.set("to_org", null);
+ }
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 062a0ba..f3675ca 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -994,6 +994,12 @@
<context context-type="sourcefile">Login or Logout</context>
</context-group>
</trans-unit>
+ <trans-unit id="account.user.wrong_org">
+ <source>Account {0} isn't available in the organization configured for external authenticated users.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Login or Logout</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="user.enable">
<source>Reactivated user <strong>{0}</strong>.</source>
<context-group name="ctx">
@@ -5227,7 +5233,7 @@ user before attempting to deactivate their account.</source>
</context-group>
</trans-unit>
<trans-unit id="message.kerbuserlogged">
- <source>You've logged as <strong>{0}</strong> using the Kerberos ticket. To be able to login using this account without Kerberos ticket, please set your password on <a href="/rhn/account/UserDetails.do"><strong>{0} user page</strong></a>.</source>
+ <source>You've logged as externally authenticated <strong>{0}</strong> user. To be able to login using this account with login and password, please set your password on <a href="/rhn/account/UserDetails.do"><strong>{0} user page</strong></a>.</source>
<context-group name="ctx">
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
@@ -6811,6 +6817,18 @@ Follow this url to see the full list of inactive systems:
<context context-type="sourcefile">/rhn/admin/multiorg/OrgSoftwareSubscriptions.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="message.ext_auth_disable">
+ <source>Disable external authentication</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgDetails</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="message.ext_auth_updated">
+ <source>External Authentication was successfully updated.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgDetails</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="message.org_name_updated">
<source>Organization {0} was successfully updated.</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index b11a188..c4cdf75 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -3306,6 +3306,12 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/admin/multiorg/Users.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="org.allusers.title1">
+ <source>Users Across @@PRODUCT_NAME@@ - External Authentication</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/Users.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="orgdetails.jsp.header">
<source>Organization Details</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 7295668..68e1856 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -581,6 +581,12 @@
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
</trans-unit>
+ <trans-unit id="External Authentication">
+ <source>External Authentication</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Navigation Menu</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="Master Setup">
<source>Master Setup</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/nav/admin_user.xml b/java/code/webapp/WEB-INF/nav/admin_user.xml
new file mode 100644
index 0000000..2c0df16
--- /dev/null
+++ b/java/code/webapp/WEB-INF/nav/admin_user.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="admin_user" invisible="1" formvar="uid" title-depth="1">
+ <rhn-tab name="Users" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/Users.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="External Authentication" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/ExternalAuthentication.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 7e4e51c..862de23 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -284,6 +284,9 @@
<rhn-tab name="Users" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Users.do">
<rhn-tab-url>/rhn/admin/multiorg/SatRoleConfirm.do</rhn-tab-url>
+ <rhn-tab name="External Authentication" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/ExternalAuthentication.do</rhn-tab-url>
+ </rhn-tab>
</rhn-tab>
<rhn-tab name="Spacewalk Configuration" acl="user_role(satellite_admin)" url="/rhn/admin/config/GeneralConfig.do">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/extauth.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/extauth.jsp
new file mode 100644
index 0000000..da68d57
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/extauth.jsp
@@ -0,0 +1,57 @@
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+
+<html:html>
+ <head>
+ <script language="javascript" type="text/javascript">
+function modifyUploadCheckbox(checkbox) {
+ if (checkbox.checked == false) {
+ document.getElementById("crashfile_upload_enabled").disabled = true;
+ } else {
+ document.getElementById("crashfile_upload_enabled").disabled = false;
+ }
+}
+ </script>
+ </head>
+ <body>
+ <rhn:toolbar base="h1" icon="header-organisation"
+ miscUrl="${url}"
+ miscAcl="user_role(org_admin)"
+ miscText="${text}"
+ miscImg="${img}"
+ miscAlt="${text}"
+ imgAlt="users.jsp.imgAlt">
+ <bean:message key="org.allusers.title1" />
+ </rhn:toolbar>
+
+ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/admin_user.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+
+
+ <div class="panel-body">
+ <html:form method="post" action="/admin/multiorg/ExternalAuthentication.do">
+ <rhn:csrf />
+ <html:hidden property="submitted" value="true"/>
+ <div class="row-0 form-group">
+ <div class="col-md-2">
+ <bean:message key="sdc.details.migrate.org"/>
+ </div>
+ <div class="col-md-3">
+ <html:select property="to_org" styleClass="form-control">
+ <html:options collection="orgs"
+ property="value" labelProperty="label" />
+ </html:select>
+ </div>
+ </div>
+ <hr/>
+ <div class="text-right">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="config.update"/>
+ </html:submit>
+ </div>
+ </html:form>
+ </div>
+
+</body>
+</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
index 1841615..3f6cecf 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
@@ -16,6 +16,8 @@
<bean:message key="org.allusers.title" />
</rhn:toolbar>
+<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/admin_user.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+
<div class="page-summary">
<p>
<bean:message key="org.allusers.summary" arg0="${orgName}" />
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index f49f3c2..1e96b02 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -317,6 +317,10 @@
<form-property name="refersTo" type="java.lang.String"/>
<form-property name="notes" type="java.lang.String"/>
</form-bean>
+ <form-bean name="extAuthForm"
+ type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
+ <form-property name="to_org" type="java.lang.String"/>
+ </form-bean>
<form-bean name="packageSearchForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
<form-property name="search_string" type="java.lang.String"/>
@@ -5623,6 +5627,21 @@
path="/WEB-INF/pages/admin/multiorg/configuration.jsp" />
</action>
+ <action path="/admin/multiorg/ExternalAuthentication"
+ scope="request"
+ name="extAuthForm"
+ input="/WEB-INF/pages/admin/multiorg/extauth.jsp"
+ type="com.redhat.rhn.frontend.action.multiorg.ExtAuthenticationAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true" />
+ <set-property property="acls" value="user_role(satellite_admin)"/>
+ <forward name="default" path="/WEB-INF/pages/admin/multiorg/extauth.jsp" />
+ <forward name="success"
+ path="/admin/multiorg/ExternalAuthentication.do" redirect="true" />
+ <forward name="error"
+ path="/WEB-INF/pages/admin/multiorg/extauth.jsp" />
+ </action>
+
<action path="/multiorg/channels/OrgList"
scope="request"
input="/WEB-INF/pages/multiorg/channels/orglist.jsp"
commit 7a0fdec3b6bdba40d58c262ca71abfc0af886cbc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 13 16:18:50 2014 +0100
introduce 1st configuration key
diff --git a/schema/spacewalk/common/data/rhnConfiguration.sql b/schema/spacewalk/common/data/rhnConfiguration.sql
new file mode 100644
index 0000000..ec7a976
--- /dev/null
+++ b/schema/spacewalk/common/data/rhnConfiguration.sql
@@ -0,0 +1 @@
+INSERT INTO rhnConfiguration (key, description) VALUES ('orgid_for_ext_authentications', 'Organization id, where externally authenticated users will be created.');
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnConfiguration-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnConfiguration-data.sql
new file mode 100644
index 0000000..ec7a976
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/042-rhnConfiguration-data.sql
@@ -0,0 +1 @@
+INSERT INTO rhnConfiguration (key, description) VALUES ('orgid_for_ext_authentications', 'Organization id, where externally authenticated users will be created.');
commit 1aa3b01601e988897342c69379690d535da3cb6f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 13 15:07:01 2014 +0100
introduce rhnConfiguration table
diff --git a/schema/spacewalk/common/rhnConfiguration.sql b/schema/spacewalk/common/rhnConfiguration.sql
new file mode 100644
index 0000000..5132ac8
--- /dev/null
+++ b/schema/spacewalk/common/rhnConfiguration.sql
@@ -0,0 +1,29 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+CREATE TABLE rhnConfiguration
+(
+ key VARCHAR2(64) NOT NULL
+ CONSTRAINT rhnConfig_key_pk PRIMARY KEY,
+ description VARCHAR2(512) NOT NULL,
+ value VARCHAR2(512),
+ default_value VARCHAR2(512),
+ created TIMESTAMP WITH LOCAL TIME ZONE
+ DEFAULT (current_timestamp) NOT NULL,
+ modified TIMESTAMP WITH LOCAL TIME ZONE
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
diff --git a/schema/spacewalk/oracle/triggers/rhnConfiguration.sql b/schema/spacewalk/oracle/triggers/rhnConfiguration.sql
new file mode 100644
index 0000000..538c6d1
--- /dev/null
+++ b/schema/spacewalk/oracle/triggers/rhnConfiguration.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_conf_mod_trig
+before insert or update on rhnConfiguration
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/postgres/triggers/rhnConfiguration.sql b/schema/spacewalk/postgres/triggers/rhnConfiguration.sql
new file mode 100644
index 0000000..b7c6b91
--- /dev/null
+++ b/schema/spacewalk/postgres/triggers/rhnConfiguration.sql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 ebf4903b278ce8c8315da67743451186fb9b8b7a
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_conf_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_conf_mod_trig
+before insert or update on rhnConfiguration
+for each row
+execute procedure rhn_conf_mod_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-rhnConfiguration.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-rhnConfiguration.sql
new file mode 100644
index 0000000..5132ac8
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/040-rhnConfiguration.sql
@@ -0,0 +1,29 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+CREATE TABLE rhnConfiguration
+(
+ key VARCHAR2(64) NOT NULL
+ CONSTRAINT rhnConfig_key_pk PRIMARY KEY,
+ description VARCHAR2(512) NOT NULL,
+ value VARCHAR2(512),
+ default_value VARCHAR2(512),
+ created TIMESTAMP WITH LOCAL TIME ZONE
+ DEFAULT (current_timestamp) NOT NULL,
+ modified TIMESTAMP WITH LOCAL TIME ZONE
+ DEFAULT (current_timestamp) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.oracle
new file mode 100644
index 0000000..538c6d1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.oracle
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace trigger
+rhn_conf_mod_trig
+before insert or update on rhnConfiguration
+for each row
+begin
+ :new.modified := current_timestamp;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.postgresql
new file mode 100644
index 0000000..b7c6b91
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/041-rhnConfiguration-trigger.sql.postgresql
@@ -0,0 +1,29 @@
+-- oracle equivalent source sha1 ebf4903b278ce8c8315da67743451186fb9b8b7a
+--
+-- Copyright (c) 2014 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.
+--
+
+create or replace function rhn_conf_mod_trig_fun() returns trigger as
+$$
+begin
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_conf_mod_trig
+before insert or update on rhnConfiguration
+for each row
+execute procedure rhn_conf_mod_trig_fun();
commit 4025bc4c4a881e9fe9f1dacd5740e3ec51b64828
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 16 15:01:54 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.32-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 905132e..abadb88 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.31-1 schema/spacewalk/
+2.1.32-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 1e26e74..8062d72 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.31
+Version: 2.1.32
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Jan 16 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.32-1
+- Changed gpg keys so they match reality.
+
* Wed Jan 15 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.31-1
- 1053591 - refresh_newest_package: lock rhnChannel at the beginning
commit c96c3ddfc7b6cb2260e9faa5a4b8276fc3c88c42
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 14:43:41 2014 +0100
removed unused import
diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
index f6fd876..6ffb726 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
@@ -18,7 +18,6 @@ import com.redhat.rhn.common.util.Asserts;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.SetCleanup;
-import com.redhat.rhn.domain.server.ManagedServerGroup;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
commit 9924a463d1faa8dc1a67cf1e79e532600b4a4ade
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 16 14:43:02 2014 +0100
Automatic commit of package [spacewalk-utils] release [2.1.25-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 526dc8d..fc065d6 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.24-1 utils/
+2.1.25-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 1d7efee..c719894 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.24
+Version: 2.1.25
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -91,6 +91,13 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Thu Jan 16 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.25-1
+- Changed gpg keys so they match reality.
+- Removing unsupported Fedora 17
+- Adding Fedora 20 to spacewalk-common-channels
+- adding 2.1 repositories to spacewalk-common-channels
+- remove openSUSE 12.2 and add openSUSE 13.1 channels
+
* Tue Jan 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.24-1
- Updating the copyright years info
commit 47ea7729710dbc24f51ee14bcbea77e7c86faa6b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 16 14:39:36 2014 +0100
Automatic commit of package [spacewalk-web] release [2.1.49-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index cc6a235..2c66972 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.48-1 web/
+2.1.49-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index be079ac..db38a52 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.48
+Version: 2.1.49
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.49-1
+- 1053787 - fixed icon name
+- 1053787 - point links to new java ProbesList pages
+
* Tue Jan 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.48-1
- Updating the copyright years info
commit 333515fb46ee77ea6f25acc994904e01b0b4e78d
Author: Paul Robert Marino <prmarino1(a)gmail.com>
Date: Thu Jan 16 14:23:05 2014 +0100
1053787 - fixed icon name
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 5c86880..792dd3d 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -168,7 +168,7 @@ sub system_locked_info {
my $ret = {};
if ($data->{LOCKED}) {
- $ret->{icon} = 'fa fa-1-5x spacewalk-icon-locked-system';
+ $ret->{icon} = 'system-locked';
$ret->{status_str} = 'System locked';
$ret->{status_class} = 'system-status-locked';
$ret->{message} = 'more info';
commit ae9eb7e9ee2ad196248df250d02109901c579cb4
Author: Paul Robert Marino <prmarino1(a)gmail.com>
Date: Thu Jan 16 14:21:29 2014 +0100
1053787 - point links to new java ProbesList pages
I found a bug in some of the perl pages where there was a link to
/network/systems/details/probes/index.pxt?sid=${sid} instad of the new path to
/rhn/systems/details/probes/ProbesList.do?sid=${sid}
I tracked it down to one of the modules and corrected the path this is
related to but not the actual fix for
https://bugzilla.redhat.com/show_bug.cgi?id=1053787
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 204cf4a..5c86880 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -274,27 +274,27 @@ sub system_monitoring_info {
if ($data->{MONITORING_STATUS} eq "CRITICAL") {
$ret->{icon} = 'monitoring-crit';
$ret->{status_str} = 'Critical probes';
- $ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
+ $ret->{system_link} = "/rhn/systems/details/probes/ProbesList.do?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "WARNING") {
$ret->{icon} = 'monitoring-warn';
$ret->{status_str} = 'Warning probes';
- $ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
+ $ret->{system_link} = "/rhn/systems/details/probes/ProbesList.do?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "UNKNOWN") {
$ret->{icon} = 'monitoring-unknown';
$ret->{status_str} = 'Unknown probes';
- $ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
+ $ret->{system_link} = "/rhn/systems/details/probes/ProbesList.do?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "PENDING") {
$ret->{icon} = 'monitoring-pending';
$ret->{status_str} = 'Pending probes';
- $ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
+ $ret->{system_link} = "/rhn/systems/details/probes/ProbesList.do?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "OK") {
$ret->{icon} = 'monitoring-ok';
$ret->{status_str} = 'OK';
- $ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
+ $ret->{system_link} = "/rhn/systems/details/probes/ProbesList.do?sid=${sid}";
}
return $ret;
commit 3fc53c209624a423d49b78183edaf16b958b8ff2
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 16 13:41:16 2014 +0100
Changed gpg keys so they match reality.
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index 1c66937..8a741b3 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -57,7 +57,9 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-- Fedora 19
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '07477e65fb4b18e6', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
-
+-- Fedora 20
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '2eb161fa246110c1', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
-- CentOS
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index e992231..0970864 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -91,8 +91,8 @@ archs = %(_x86_archs)s
checksum = sha256
name = Fedora 20 (%(arch)s)
gpgkey_url = https://fedoraproject.org/static/FB4B18E6.txt
-gpgkey_id = FB4B18E6
-gpgkey_fingerprint = CA81 B2C8 5E4F 4D4A 1A3F 7234 0747 7E65 FB4B 18E6
+gpgkey_id = 246110C1
+gpgkey_fingerprint = C7C9 A9C8 9153 F201 83CE 7CBA 2EB1 61FA 2461 10C1
yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-20&arch=%(arch)s
dist_map_release = 20
commit a13fe9e8a5d13109970634f74801c688ba112ea9
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 16 12:16:01 2014 +0100
Removing unsupported Fedora 17
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 090f9f3..e992231 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -34,32 +34,6 @@ _spacewalk_gpgkey_id = 430A1C35
_spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-[fedora17]
-archs = %(_x86_archs)s
-checksum = sha256
-name = Fedora 17 (%(arch)s)
-gpgkey_url = http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i38...
-gpgkey_id = 069C8460
-gpgkey_fingerprint = 25DB B54B DED7 0987 F4C1 0042 B4EB F579 069C 8460
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-17&arch=%(arch)s
-dist_map_release = 17
-
-[fedora17-updates]
-label = %(base_channel)s-updates
-name = Fedora 17 Updates (%(arch)s)
-archs = %(_x86_archs)s
-checksum = sha256
-base_channels = fedora17-%(arch)s
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-f17&arch...
-
-[fedora17-debug]
-label = %(base_channel)s-debug
-name = Fedora 17 Debug (%(arch)s)
-archs = %(_x86_archs)s
-checksum = sha256
-base_channels = fedora17-%(arch)s
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-17&arch=%(ar...
-
[fedora18]
archs = %(_x86_archs)s
checksum = sha256
@@ -322,15 +296,6 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.8/RHEL/6/%(arch)s/
-[spacewalk18-server-fedora17]
-name = Spacewalk Server 1.8 for %(base_channel_name)s
-archs = %(_x86_archs)s
-base_channels = fedora17-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.8/Fedora/17/%(arch)s/
-
[spacewalk18-server-oraclelinux5]
name = Spacewalk Server 1.8 for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -376,15 +341,6 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.8-client/RHEL/6/%(arch)s/
-[spacewalk18-client-fedora17]
-name = Spacewalk Client 1.8 for %(base_channel_name)s
-archs = %(_x86_archs)s
-base_channels = fedora17-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.8-client/Fedora/17/%(arch)s/
-
[spacewalk18-client-oraclelinux5]
name = Spacewalk Client 1.8 for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -431,15 +387,6 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/6/%(arch)s/
-[spacewalk19-server-fedora17]
-name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = %(_x86_archs)s
-base_channels = fedora17-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.9/Fedora/17/%(arch)s/
-
[spacewalk19-server-fedora18]
name = Spacewalk Server 1.9 for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -494,15 +441,6 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/6/%(arch)s/
-[spacewalk19-client-fedora17]
-name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = %(_x86_archs)s
-base_channels = fedora17-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.9-client/Fedora/17/%(arch)s/
-
[spacewalk19-client-fedora18]
name = Spacewalk Client 1.9 for %(base_channel_name)s
archs = %(_x86_archs)s
commit e003771083303c733d574e20f43469172e90276f
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 16 11:51:13 2014 +0100
Adding Fedora 20 to spacewalk-common-channels
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 9554225..090f9f3 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -112,6 +112,40 @@ checksum = sha256
base_channels = fedora19-%(arch)s
yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-19&arch=%(ar...
+[fedora20]
+archs = %(_x86_archs)s
+checksum = sha256
+name = Fedora 20 (%(arch)s)
+gpgkey_url = https://fedoraproject.org/static/FB4B18E6.txt
+gpgkey_id = FB4B18E6
+gpgkey_fingerprint = CA81 B2C8 5E4F 4D4A 1A3F 7234 0747 7E65 FB4B 18E6
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-20&arch=%(arch)s
+dist_map_release = 20
+
+[fedora20-updates]
+label = %(base_channel)s-updates
+name = Fedora 20 Updates (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora20-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-f20&arch...
+
+[fedora20-debug]
+label = %(base_channel)s-debug
+name = Fedora 20 Debug (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora20-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-20&arch=%(ar...
+
+[fedora20-updates-debug]
+label = %(base_channel)s-updates-debug
+name = Fedora 20 Updates Debug (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora20-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f2...
+
[scientific6]
archs = %(_x86_archs)s
name = Scientific Linux 6 (%(arch)s)
@@ -668,6 +702,15 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/2.1/Fedora/19/%(arch)s/
+[spacewalk21-server-fedora20]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora20-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/Fedora/20/%(arch)s/
+
[spacewalk21-server-oraclelinux5]
name = Spacewalk Server (N) for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -722,6 +765,15 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/2.1-client/Fedora/18/%(arch)s/
+[spacewalk21-client-fedora20]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora20-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/Fedora/20/%(arch)s/
+
[spacewalk21-client-fedora19]
name = Spacewalk Client (N) for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -794,6 +846,15 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/nightly/Fedora/19/%(arch)s/
+[spacewalk-nightly-server-fedora20]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora20-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/nightly/Fedora/20/%(arch)s/
+
[spacewalk-nightly-server-oraclelinux5]
name = Spacewalk Server (N) for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -857,6 +918,15 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/nightly-client/Fedora/19/%(arch)s/
+[spacewalk-nightly-client-fedora20]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora20-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/nightly-client/Fedora/20/%(arch)s/
+
[spacewalk-nightly-client-oraclelinux5]
name = Spacewalk Client (N) for %(base_channel_name)s
archs = %(_x86_archs)s
commit 8cf57eeeac0f0a5742b2e4a37d08546bc268aa5f
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Wed Jan 15 13:51:36 2014 +0100
adding 2.1 repositories to spacewalk-common-channels
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 61b4d69..9554225 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -623,6 +623,132 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/2.0-client/RHEL/6/%(arch)s/
+[spacewalk21-server-centos5]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = centos5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/RHEL/5/%(arch)s/
+
+[spacewalk21-server-centos6]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = centos6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/RHEL/6/%(arch)s/
+
+[spacewalk21-server-scientific6]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = scientific6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/RHEL/6/%(arch)s/
+
+[spacewalk21-server-fedora18]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora18-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/Fedora/18/%(arch)s/
+
+[spacewalk21-server-fedora19]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora19-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/Fedora/19/%(arch)s/
+
+[spacewalk21-server-oraclelinux5]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/RHEL/5/%(arch)s/
+
+[spacewalk21-server-oraclelinux6]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1/RHEL/6/%(arch)s/
+
+[spacewalk21-client-centos5]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = centos5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/RHEL/5/%(arch)s/
+
+[spacewalk21-client-centos6]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = centos6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/RHEL/6/%(arch)s/
+
+[spacewalk21-client-scientific6]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = scientific6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/RHEL/6/%(arch)s/
+
+[spacewalk21-client-fedora18]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora18-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/Fedora/18/%(arch)s/
+
+[spacewalk21-client-fedora19]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = fedora19-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/Fedora/19/%(arch)s/
+
+[spacewalk21-client-oraclelinux5]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/RHEL/5/%(arch)s/
+
+[spacewalk21-client-oraclelinux6]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = %(_x86_archs)s
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/2.1-client/RHEL/6/%(arch)s/
+#---
[spacewalk-nightly-server-centos5]
name = Spacewalk Server (N) for %(base_channel_name)s
archs = %(_x86_archs)s
@@ -748,7 +874,7 @@ gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/nightly-client/RHEL/6/%(arch)s/
-
+#---
[opensuse12_3]
checksum = sha256
10 years, 3 months
Changes to 'master-action-chaining'
by Silvio Moioli
New branch 'master-action-chaining' available with the following commits:
commit 50b2634aba29d43d5c219fdba43bd1636e7bc93e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:44:48 2014 +0100
Action Chain List page added
commit 17335d743212a42ab9835054cddfb2c9b7f11e7c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:21:11 2014 +0100
Reboot: use proper user messages
commit b17f8643ae0ea56ce27361fcdceac93676880649
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:18:15 2014 +0100
Reboot: allow queuing to Action Chains
commit e4ac5ef37433efc54cc90fd2d8315448a8f7caf6
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:00:37 2014 +0100
Deploy Configuration: use proper user message
commit 880b5f585422a357d3acb40eabf8383bc82458a7
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 17:42:37 2014 +0100
Deploy Configuration: allow queuing to Action Chains
commit 3a630411436fc731a085cbbfba0a804a1d080331
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:36:34 2014 +0100
Remote Command: use proper user message
commit 86d53679a3ebbbeb93102a0805f54f68c088d162
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:32:05 2014 +0100
Remote Command: allow queuing to Action Chains
commit 7b6c0ab99f407248d768f2f5391025c15c3b4855
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:53:37 2014 +0100
Errata actions: use proper user message
commit 5a90e8c7c2c9153ada864a4db03d690e1c980307
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:27:50 2014 +0100
Errata actions: allow queuing to Action Chains
commit 1d033d7aaf7d997d36420cb5d01e6cbf5d9956be
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 12:17:04 2014 +0100
Remove functionality to add remote command before a package action, it is superseded by Action Chains
commit badd40b371e5aaa23cafe49a0a5a213f8714d2a0
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 13:44:54 2014 +0100
Single system package actions: use proper user message
commit 1cb067c677119c4d9e0d415f501af42ac652a2fb
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 09:23:45 2014 +0100
Single system package actions: allow queuing to Action Chains
commit 21d469a43ddad0f2805ee9da538924609cd83dee
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:50 2014 +0100
Controller helper tests added
commit d4049a453f1fb937b254c9cad291cdf86ee0ee16
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:38 2014 +0100
Controller helper class added
commit 4dc4e767b95a4cbb7a7838f7c02e04c08ea79ebd
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:48 2014 +0100
ORM class tests added
commit 9f48dad62f1ba336448a18936afa84f7ba01ccdb
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:23 2014 +0100
ORM classes for new tables added
commit 8844fcb10460d7d9838e89e376e09e7b1539b3fe
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 13 12:23:52 2014 +0100
New tables and upgrade scripts added
commit 730de9a0111e4400271e17aeb63506e8522854c3
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:27 2014 +0100
Front-end code for action chain creation/selection added
commit 25bf239d0d361ca3713c6511e52cc4dbf4dabd63
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 14:48:17 2014 +0100
Javascript library jQuery UI added
commit 4c2ebc130156fb13afb0474265185d84b07cdb9a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:55 2014 +0100
Javascript library select2 added
commit 3681a0dc29c5186cf173dd3dfae1ab8887bcfc00
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 8 18:34:43 2014 +0100
Refactoring: use a fragment for scheduling options on supported operations
10 years, 3 months
Changes to 'refs/tags/spacewalk-java-2.1.124-1'
by Milan Zazrivec
Tag 'spacewalk-java-2.1.124-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2014-01-22 15:41 +0000
Tagging package [spacewalk-java] version [2.1.124-1] in directory [java/].
Changes since spacewalk-java-2.1.123-1:
Milan Zazrivec (2):
1053591 - fix deadlock when cloning using spacewalk-clone-by-date
Automatic commit of package [spacewalk-java] release [2.1.124-1].
---
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 35 +++++++++-
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 10 ++
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 3
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 1
java/spacewalk-java.spec | 5 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 51 insertions(+), 5 deletions(-)
---
10 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Milan Zazrivec
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 13e4df80c3d69a0c321af20bbac0f37ec60be7ab
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 16:41:09 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.124-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7bdae62..55f1947 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.123
+Version: 2.1.124
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.124-1
+- 1053591 - fix deadlock when cloning using spacewalk-clone-by-date
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.123-1
- Bugfix: ISE when cobbler components are missing (not installed)
- port reboot_confirm.pxt from perl to java
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e538d17..776cd27 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.123-1 java/
+2.1.124-1 java/
10 years, 3 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 35 +++++++++-
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 10 ++
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 3
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 1
4 files changed, 46 insertions(+), 3 deletions(-)
New commits:
commit bded6355c0ef72f980cbedac7ede350bf6b81fc6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 16:38:24 2014 +0100
1053591 - fix deadlock when cloning using spacewalk-clone-by-date
We need to explicitly lock one row of rhnChannel table to avoid
a db deadlock.
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index 8d1fcc2..502b995 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
+ * Copyright (c) 2009--2014 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
@@ -25,9 +25,11 @@ import org.apache.log4j.Logger;
import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
import org.hibernate.MappingException;
import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.Version;
import org.hibernate.metadata.ClassMetadata;
import java.io.ByteArrayOutputStream;
@@ -385,6 +387,37 @@ public abstract class HibernateFactory {
}
/**
+ * Return a locked persistent instance of the given entity class with
+ * the given identifier, or null if there is no such persistent instance.
+ * (If the instance, or a proxy for the instance, is already associated
+ * with the session, return that instance or proxy.)
+ * @param clazz a persistent class
+ * @param id an identifier
+ * @return Object persistent instance or null
+ */
+ protected Object lockObject(Class clazz, Serializable id) {
+ Object retval = null;
+ Session session = null;
+
+ try {
+ session = HibernateFactory.getSession();
+ String hVersion = HibernateFactory.getHibernateVersion().substring(0, 3);
+
+ retval = session.get(clazz, id, LockMode.UPGRADE);
+ }
+ catch (MappingException me) {
+ getLogger().error("Mapping not found for " + clazz.getName(), me);
+
+ }
+ catch (HibernateException he) {
+ getLogger().error("Hibernate exception: " + he.toString());
+ }
+
+ return retval;
+ }
+
+
+ /**
* Util to reload an object using Hibernate
* @param obj to be reloaded
* @return Object found if not, null
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 1689ac3..0116382 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
+ * Copyright (c) 2009--2014 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
@@ -1179,4 +1179,12 @@ public class ChannelFactory extends HibernateFactory {
}
return ids;
}
+
+ /*
+ * Locks the given Channel for update on a database level
+ * @param c Channel to lock
+ */
+ public static void lock(Channel c) {
+ singleton.lockObject(Channel.class, c.getId());
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
index 90766c6..51036c7 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
+ * Copyright (c) 2009--2014 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
@@ -58,6 +58,7 @@ public class ChannelEditor {
* @param packageIds A list containing the ids of packages to add.
*/
public void addPackages(User user, Channel channel, Collection packageIds) {
+ ChannelFactory.lock(channel);
changePackages(user, channel, packageIds, true);
}
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index 18d9412..59e75ed 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -1338,6 +1338,7 @@ public class ErrataManager extends BaseManager {
public static void cloneErrataApiAsync(Channel chan, List<Long> errata,
User user, boolean inheritPackages) {
Logger.getLogger(ErrataManager.class).debug("Cloning");
+ ChannelFactory.lock(chan);
for (long eid : errata) {
NewCloneErrataEvent neve = new NewCloneErrataEvent(chan, eid, user,
inheritPackages);
10 years, 3 months
Changes to 'refs/tags/spacewalk-java-2.1.123-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.123-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-22 15:27 +0000
Tagging package [spacewalk-java] version [2.1.123-1] in directory [java/].
Changes since spacewalk-setup-2.1.10-1:
Bo Maryniuk (1):
Bugfix: ISE when cobbler components are missing (not installed)
Flavio Castelli (1):
Add extra log folder /var/log/rhn/tasko/sat/ in spacewalk-debug.
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [2.1.123-1].
---
backend/satellite_tools/spacewalk-debug | 6 ++
java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 22 ++++++++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +
java/spacewalk-java.spec | 8 +++
rel-eng/packages/spacewalk-java | 2
5 files changed, 35 insertions(+), 6 deletions(-)
---
10 years, 3 months