August 2014 - openSUSE Commits - openSUSE Mailing Lists

commit utempter for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package utempter for openSUSE:Factory checked in at 2014-08-29 17:42:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/utempter (Old) and /work/SRC/openSUSE:Factory/.utempter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "utempter" Changes: -------- --- /work/SRC/openSUSE:Factory/utempter/utempter.changes 2013-06-25 06:56:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.utempter.new/utempter.changes 2014-08-29 17:42:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 14 15:59:02 UTC 2014 - fcrozat(a)suse.com + +- Obsoletes utempter-32bit in libutempter0-32bit. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ utempter.spec ++++++ --- /var/tmp/diff_new_pack.uroL0i/_old 2014-08-29 17:42:14.000000000 +0200 +++ /var/tmp/diff_new_pack.uroL0i/_new 2014-08-29 17:42:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package utempter # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.uroL0i/_old 2014-08-29 17:42:14.000000000 +0200 +++ /var/tmp/diff_new_pack.uroL0i/_new 2014-08-29 17:42:14.000000000 +0200 @@ -1,2 +1,3 @@ libutempter0 + obsoletes "utempter-<targettype> < <version>" utempter-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit digikam for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package digikam for openSUSE:13.1:Update checked in at 2014-08-29 11:08:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/digikam (Old) and /work/SRC/openSUSE:13.1:Update/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='digikam.2964' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsodium for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package libsodium for openSUSE:Factory checked in at 2014-08-28 21:05:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsodium (Old) and /work/SRC/openSUSE:Factory/.libsodium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsodium" Changes: -------- --- /work/SRC/openSUSE:Factory/libsodium/libsodium.changes 2014-07-17 06:58:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsodium.new/libsodium.changes 2014-08-28 21:05:55.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 28 15:14:29 UTC 2014 - idonmez(a)suse.com + +- Update to version 0.7.0 + * Added sodium_malloc() and sodium_allocarray() for secure memory + allocation. + * ed25519 keys can be converted to curve25519 keys with + crypto_sign_ed25519_pk_to_curve25519() and + crypto_sign_ed25519_sk_to_curve25519(). + * aes256 was removed. + +------------------------------------------------------------------- Old: ---- libsodium-0.6.1.tar.gz New: ---- libsodium-0.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsodium.spec ++++++ --- /var/tmp/diff_new_pack.nF2ZRD/_old 2014-08-28 21:05:57.000000000 +0200 +++ /var/tmp/diff_new_pack.nF2ZRD/_new 2014-08-28 21:05:57.000000000 +0200 @@ -16,9 +16,9 @@ # -%define lname libsodium10 +%define lname libsodium13 Name: libsodium -Version: 0.6.1 +Version: 0.7.0 Release: 0 Summary: Portable NaCl-based crypto library License: ISC ++++++ libsodium-0.6.1.tar.gz -> libsodium-0.7.0.tar.gz ++++++ ++++ 4527 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-08-28 21:05:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-08-25 11:05:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-08-28 21:05:54.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 28 13:19:09 UTC 2014 - kgronlund(a)suse.com + +- high: constants: Add acl_target and acl_group to cib_cli_map (bnc#894041) +- cibconfig: Clean up output from crm_verify (bnc#893138) +- upstream: 2.1.0-38-g7d05ad6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.uCJeZU/_old 2014-08-28 21:05:55.000000000 +0200 +++ /var/tmp/diff_new_pack.uCJeZU/_new 2014-08-28 21:05:55.000000000 +0200 @@ -41,7 +41,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.1+git33 +Version: 2.1+git38 Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/Makefile.am new/crmsh/modules/Makefile.am --- old/crmsh/modules/Makefile.am 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/modules/Makefile.am 2014-08-28 15:12:04.000000000 +0200 @@ -23,6 +23,7 @@ cache.py \ cibconfig.py \ cibstatus.py \ + cibverify.py \ clidisplay.py \ cliformat.py \ cmd_status.py \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibconfig.py new/crmsh/modules/cibconfig.py --- old/crmsh/modules/cibconfig.py 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/modules/cibconfig.py 2014-08-28 15:12:04.000000000 +0200 @@ -59,6 +59,7 @@ from cliformat import cli_nvpair, cli_acl_rule, rsc_set_constraint, get_kind, head_id_format from cliformat import cli_operations, simple_rsc_constraint, cli_rule, cli_format from cliformat import cli_acl_role, cli_acl_permission +import cibverify def show_unrecognized_elems(cib_elem): @@ -640,9 +641,6 @@ return rc -cib_verify = "crm_verify -V -p" - - class CibObjectSetRaw(CibObjectSet): ''' Edit or display one or more CIB objects (XML). @@ -702,10 +700,12 @@ if not self.obj_set: return True clidisplay.disable_pretty() - rc = pipe_string(cib_verify, self.repr(format=-1)) + cib = self.repr(format=-1) clidisplay.enable_pretty() + rc = cibverify.verify(cib) + if rc not in (0, 1): - common_debug("verify (rc=%s): %s" % (rc, self.repr())) + common_debug("verify (rc=%s): %s" % (rc, cib)) return rc in (0, 1) def ptest(self, nograph, scores, utilization, actions, verbosity): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibverify.py new/crmsh/modules/cibverify.py --- old/crmsh/modules/cibverify.py 1970-01-01 01:00:00.000000000 +0100 +++ new/crmsh/modules/cibverify.py 2014-08-28 15:12:04.000000000 +0200 @@ -0,0 +1,43 @@ +# Copyright (C) 2014 Kristoffer Gronlund <kgronlund(a)suse.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +import re +import utils +from msg import err_buf + + +cib_verify = "crm_verify --verbose -p" +VALIDATE_RE = re.compile(r"^Entity: line (\d)+: element (\w+): " + + r"Relax-NG validity error : (.+)$") + + +def _prettify(line, indent=0): + m = VALIDATE_RE.match(line) + if m: + return "%s%s (%s): %s" % (indent*' ', m.group(2), m.group(1), m.group(3)) + return line + + +def verify(cib): + rc, _, stderr = utils.get_stdout_stderr(cib_verify, cib) + for i, line in enumerate(line for line in stderr.split('\n') if line): + line = _prettify(line, 0 if i == 0 else 7) + if i == 0: + err_buf.error(line) + else: + err_buf.writemsg(line) + return rc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/constants.py new/crmsh/modules/constants.py --- old/crmsh/modules/constants.py 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/modules/constants.py 2014-08-28 15:12:04.000000000 +0200 @@ -32,6 +32,8 @@ "cluster_property_set": "property", "rsc_defaults": "rsc_defaults", "op_defaults": "op_defaults", + "acl_target": "acl_target", + "acl_group": "acl_group", "acl_user": "user", "acl_role": "role", "fencing-topology": "fencing_topology", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/common.excl new/crmsh/test/testcases/common.excl --- old/crmsh/test/testcases/common.excl 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/common.excl 2014-08-28 15:12:04.000000000 +0200 @@ -11,7 +11,7 @@ .EXT crm_resource --list-ocf-alternatives Dummy ^\.EXT crmd version ^\.EXT cibadmin \-Ql -^\.EXT crm_verify \-V \-p +^\.EXT crm_verify \-\-verbose \-p ^\.EXT cibadmin \-p \-P ^\.EXT crm_diff \-\-help ^\.EXT crm_diff \-o [^ ]+ \-n \- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/confbasic-xml.exp new/crmsh/test/testcases/confbasic-xml.exp --- old/crmsh/test/testcases/confbasic-xml.exp 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/confbasic-xml.exp 2014-08-28 15:12:04.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config> <cluster_property_set id="cib-bootstrap-options"> @@ -10,30 +10,18 @@ </cluster_property_set> </crm_config> <nodes> - <node uname="node2" id="node2"> - <utilization id="node2-utilization"> - <nvpair name="cpu" value="4" id="node2-utilization-cpu"/> - </utilization> - </node> <node uname="node1" id="node1"> <instance_attributes id="node1-instance_attributes"> <nvpair name="mem" value="16G" id="node1-instance_attributes-mem"/> </instance_attributes> </node> + <node uname="node2" id="node2"> + <utilization id="node2-utilization"> + <nvpair name="cpu" value="4" id="node2-utilization-cpu"/> + </utilization> + </node> </nodes> <resources> - <primitive id="st" class="stonith" type="ssh"> - <instance_attributes id="st-instance_attributes"> - <nvpair name="hostlist" value="node1 node2" id="st-instance_attributes-hostlist"/> - </instance_attributes> - <meta_attributes id="st-meta_attributes"> - <nvpair name="target-role" value="Started" id="st-meta_attributes-target-role"/> - </meta_attributes> - <operations> - <op name="start" requires="nothing" timeout="60s" interval="0" id="st-start-0"/> - <op name="monitor" interval="60m" timeout="60s" id="st-monitor-60m"/> - </operations> - </primitive> <group id="g1"> <primitive id="d1" class="ocf" provider="pacemaker" type="Dummy"> <operations id="d1-ops"> @@ -43,7 +31,7 @@ <nvpair name="OCF_CHECK_LEVEL" value="10" id="d1-ops-monitor-120m-instance_attributes-OCF_CHECK_LEVEL"/> </instance_attributes> </op> - <op interval="60s" timeout="30s" name="monitor" id="d1-monitor-60s"/> + <op name="monitor" interval="60s" timeout="30s" id="d1-monitor-60s"/> </operations> </primitive> <primitive id="d2" class="ocf" provider="heartbeat" type="Delay"> @@ -53,36 +41,57 @@ <operations> <op name="start" timeout="60s" interval="0" id="d2-start-0"/> <op name="stop" timeout="60s" interval="0" id="d2-stop-0"/> - <op role="Started" interval="60s" timeout="30s" name="monitor" id="d2-monitor-60s"/> + <op name="monitor" role="Started" interval="60s" timeout="30s" id="d2-monitor-60s"/> </operations> </primitive> </group> - <primitive id="st2" class="stonith" type="ssh"> - <instance_attributes id="st2-instance_attributes"> - <nvpair name="hostlist" value="node1 node2" id="st2-instance_attributes-hostlist"/> - </instance_attributes> - </primitive> <clone id="c"> <meta_attributes id="c-meta_attributes"> <nvpair name="clone-max" value="1" id="c-meta_attributes-clone-max"/> </meta_attributes> <primitive id="d3" class="ocf" provider="pacemaker" type="Dummy"/> </clone> + <master id="m"> + <primitive id="d4" class="ocf" provider="pacemaker" type="Dummy"/> + </master> <master id="m5"> <primitive id="s5" class="ocf" provider="pacemaker" type="Stateful"> <operations id-ref="d1-ops"/> </primitive> </master> - <master id="m"> - <primitive id="d4" class="ocf" provider="pacemaker" type="Dummy"/> - </master> <master id="m6"> <primitive id="s6" class="ocf" provider="pacemaker" type="Stateful"> <operations id-ref="d1-ops"/> </primitive> </master> + <primitive id="st" class="stonith" type="ssh"> + <instance_attributes id="st-instance_attributes"> + <nvpair name="hostlist" value="node1 node2" id="st-instance_attributes-hostlist"/> + </instance_attributes> + <meta_attributes id="st-meta_attributes"> + <nvpair name="target-role" value="Started" id="st-meta_attributes-target-role"/> + </meta_attributes> + <operations> + <op name="start" requires="nothing" timeout="60s" interval="0" id="st-start-0"/> + <op name="monitor" interval="60m" timeout="60s" id="st-monitor-60m"/> + </operations> + </primitive> + <primitive id="st2" class="stonith" type="ssh"> + <instance_attributes id="st2-instance_attributes"> + <nvpair name="hostlist" value="node1 node2" id="st2-instance_attributes-hostlist"/> + </instance_attributes> + </primitive> </resources> <constraints> + <rsc_order id="o3" kind="Serialize" first="m5" then="m6"/> + <rsc_ticket id="ticket-C_master" ticket="ticket-C" loss-policy="fence"> + <resource_set id="ticket-C_master-0"> + <resource_ref id="m6"/> + </resource_set> + <resource_set role="Master" id="ticket-C_master-1"> + <resource_ref id="m5"/> + </resource_set> + </rsc_ticket> <rsc_location id="l3" rsc="m5"> <rule score="INFINITY" id="l3-rule"> <expression attribute="#uname" operation="eq" value="node1" id="l3-rule-expression"/> @@ -90,9 +99,26 @@ </rule> </rsc_location> <rsc_location id="l1" rsc="g1" score="100" node="node1"/> + <rsc_location id="l2" rsc="c"> + <rule id="l2-rule1" score="100"> + <expression attribute="#uname" operation="eq" value="node1" id="l2-rule1-expression"/> + </rule> + </rsc_location> + <rsc_ticket id="ticket-B_m6_m5" ticket="ticket-B" loss-policy="fence"> + <resource_set id="ticket-B_m6_m5-0"> + <resource_ref id="m6"/> + <resource_ref id="m5"/> + </resource_set> + </rsc_ticket> + <rsc_location id="l4" rsc="m5"> + <rule score="-INFINITY" boolean-op="or" id="l4-rule"> + <expression attribute="pingd" operation="not_defined" id="l4-rule-expression"/> + <expression attribute="pingd" operation="lte" value="0" id="l4-rule-expression-0"/> + </rule> + </rsc_location> <rsc_location id="l5" rsc="m5"> <rule score="-INFINITY" boolean-op="or" id="l5-rule"> - <expression operation="not_defined" attribute="pingd" id="l5-rule-expression"/> + <expression attribute="pingd" operation="not_defined" id="l5-rule-expression"/> <expression attribute="pingd" operation="lte" value="0" id="l5-rule-expression-0"/> </rule> <rule score="INFINITY" id="l5-rule-0"> @@ -100,66 +126,40 @@ <expression attribute="pingd" operation="gt" value="0" id="l5-rule-0-expression-0"/> </rule> <rule score="INFINITY" id="l5-rule-1"> - <date_expression operation="lt" id="l5-rule-1-expression" end="2009-05-26"/> - <date_expression operation="in_range" id="l5-rule-1-expression-0" start="2009-05-26" end="2009-07-26"/> - <date_expression operation="in_range" id="l5-rule-1-expression-1" start="2009-05-26"> - <duration id="l5-rule-1-expression-1-duration" years="2009"/> + <date_expression operation="lt" end="2009-05-26" id="l5-rule-1-expression"/> + <date_expression operation="in_range" start="2009-05-26" end="2009-07-26" id="l5-rule-1-expression-0"/> + <date_expression operation="in_range" start="2009-05-26" id="l5-rule-1-expression-1"> + <duration years="2009" id="l5-rule-1-expression-1-duration"/> </date_expression> <date_expression operation="date_spec" id="l5-rule-1-expression-2"> - <date_spec id="l5-rule-1-expression-2-date_spec" years="2009" hours="09-17"/> + <date_spec years="2009" hours="09-17" id="l5-rule-1-expression-2-date_spec"/> </date_expression> </rule> </rsc_location> + <rsc_colocation id="c2" score="INFINITY" rsc="m5" rsc-role="Master" with-rsc="d1" with-rsc-role="Started"/> + <rsc_ticket id="ticket-A_m6" ticket="ticket-A" rsc="m6"/> + <rsc_order id="o2" kind="Optional" first="d1" first-action="start" then="m5" then-action="promote"/> <rsc_location id="l6" rsc="m5"> <rule id-ref="l2-rule1"/> </rsc_location> - <rsc_colocation id="c2" score="INFINITY" rsc="m5" rsc-role="Master" with-rsc="d1" with-rsc-role="Started"/> + <rsc_order id="o1" kind="Mandatory" first="m5" then="m6"/> + <rsc_colocation id="c1" score="INFINITY" rsc="m6" with-rsc="m5"/> <rsc_location id="l7" rsc="m5"> <rule id-ref="l2-rule1"/> </rsc_location> - <rsc_colocation id="c1" score="INFINITY" rsc="m6" with-rsc="m5"/> - <rsc_order id="o1" kind="Mandatory" first="m5" then="m6"/> - <rsc_ticket id="ticket-B_m6_m5" ticket="ticket-B" loss-policy="fence"> - <resource_set id="ticket-B_m6_m5-0"> - <resource_ref id="m6"/> - <resource_ref id="m5"/> - </resource_set> - </rsc_ticket> - <rsc_ticket id="ticket-A_m6" ticket="ticket-A" rsc="m6"/> <rsc_order id="o4" score="INFINITY" first="m5" then="m6"/> - <rsc_order id="o3" kind="Serialize" first="m5" then="m6"/> - <rsc_order id="o2" kind="Optional" first="d1" first-action="start" then="m5" then-action="promote"/> - <rsc_location id="l4" rsc="m5"> - <rule score="-INFINITY" boolean-op="or" id="l4-rule"> - <expression operation="not_defined" attribute="pingd" id="l4-rule-expression"/> - <expression attribute="pingd" operation="lte" value="0" id="l4-rule-expression-0"/> - </rule> - </rsc_location> - <rsc_ticket id="ticket-C_master" ticket="ticket-C" loss-policy="fence"> - <resource_set id="ticket-C_master-0"> - <resource_ref id="m6"/> - </resource_set> - <resource_set id="ticket-C_master-1" role="Master"> - <resource_ref id="m5"/> - </resource_set> - </rsc_ticket> - <rsc_location id="l2" rsc="c"> - <rule id="l2-rule1" score="100"> - <expression attribute="#uname" operation="eq" value="node1" id="l2-rule1-expression"/> - </rule> - </rsc_location> </constraints> - <fencing-topology> - <fencing-level target="node1" devices="st" index="1" id="fencing"/> - <fencing-level target="node1" devices="st2" index="2" id="fencing-0"/> - <fencing-level target="node2" devices="st" index="1" id="fencing-1"/> - <fencing-level target="node2" devices="st2" index="2" id="fencing-2"/> - </fencing-topology> <rsc_defaults> <meta_attributes id="rsc-options"> <nvpair name="failure-timeout" value="10m" id="rsc-options-failure-timeout"/> </meta_attributes> </rsc_defaults> + <fencing-topology> + <fencing-level devices="st" index="1" target="node1" id="fencing"/> + <fencing-level devices="st2" index="2" target="node1" id="fencing-0"/> + <fencing-level devices="st" index="1" target="node2" id="fencing-1"/> + <fencing-level devices="st2" index="2" target="node2" id="fencing-2"/> + </fencing-topology> <op_defaults> <meta_attributes id="opsdef2"> <nvpair name="record-pending" value="true" id="opsdef2-record-pending"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/history.exp new/crmsh/test/testcases/history.exp --- old/crmsh/test/testcases/history.exp 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/history.exp 2014-08-28 15:12:04.000000000 +0200 @@ -276,5 +276,6 @@ .TRY History 2 .INP: history .INP: session load _crmsh_regtest +.EXT tar -xj < history-test.tar.bz2 .INP: exclude corosync|crmd|pengine|stonith-ng|cib|attrd|mgmtd|sshd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/node.exp new/crmsh/test/testcases/node.exp --- old/crmsh/test/testcases/node.exp 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/node.exp 2014-08-28 15:12:04.000000000 +0200 @@ -9,7 +9,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -30,7 +30,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -51,7 +51,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -73,7 +73,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -95,7 +95,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -119,7 +119,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -144,7 +144,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/ra.exp new/crmsh/test/testcases/ra.exp --- old/crmsh/test/testcases/ra.exp 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/ra.exp 2014-08-28 15:12:04.000000000 +0200 @@ -74,7 +74,7 @@ Eg. node1:1;node2:2,3 would tell the cluster to use port 1 for node1 and ports 2 and 3 for node2 pcmk_host_list (string): A list of machines controlled by this device (Optional unless pcmk_host_check=static-list). -pcmk_host_check (string, [dynamic-list]): How to determin which machines are controlled by the device. +pcmk_host_check (string, [dynamic-list]): How to determine which machines are controlled by the device. Allowed values: dynamic-list (query the device), static-list (check the pcmk_host_list attribute), none (assume every device can fence every machine) pcmk_reboot_action (string, [reboot]): Advanced use only: An alternate command to run instead of 'reboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/resource.exp new/crmsh/test/testcases/resource.exp --- old/crmsh/test/testcases/resource.exp 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/resource.exp 2014-08-28 15:12:04.000000000 +0200 @@ -7,7 +7,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -27,7 +27,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -48,7 +48,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -69,7 +69,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -92,7 +92,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -113,7 +113,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -134,7 +134,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -156,7 +156,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -178,7 +178,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -197,7 +197,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -220,7 +220,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -243,7 +243,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -262,7 +262,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -288,7 +288,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -314,7 +314,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -340,7 +340,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -370,7 +370,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -400,7 +400,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -432,7 +432,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -464,7 +464,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -492,7 +492,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -516,7 +516,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -540,7 +540,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -568,7 +568,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -592,7 +592,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/rset-xml.exp new/crmsh/test/testcases/rset-xml.exp --- old/crmsh/test/testcases/rset-xml.exp 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/testcases/rset-xml.exp 2014-08-28 15:12:04.000000000 +0200 @@ -1,11 +1,12 @@ <?xml version="1.0" ?> -<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> <node uname="node1" id="node1"/> </nodes> <resources> + <primitive id="d5" class="ocf" provider="heartbeat" type="Dummy"/> <primitive id="st" class="stonith" type="ssh"> <instance_attributes id="st-instance_attributes"> <nvpair name="hostlist" value="node1" id="st-instance_attributes-hostlist"/> @@ -14,20 +15,19 @@ <op name="start" timeout="60s" interval="0" id="st-start-0"/> </operations> </primitive> - <primitive id="d5" class="ocf" provider="heartbeat" type="Dummy"/> <primitive id="d3" class="ocf" provider="heartbeat" type="Dummy"/> <primitive id="d1" class="ocf" provider="pacemaker" type="Dummy"/> </resources> <constraints> <rsc_colocation id="c2" score="INFINITY" rsc="d3" with-rsc="d1"/> <rsc_colocation id="c1" score="INFINITY"> - <resource_set id="c1-1" sequential="false"> + <resource_set sequential="false" id="c1-1"> <resource_ref id="d1"/> <resource_ref id="d3"/> </resource_set> </rsc_colocation> - <rsc_colocation id="c3" score="INFINITY" rsc="d3" with-rsc="d1"/> <rsc_order id="o1" kind="Serialize" first="d1" then="d3"/> + <rsc_colocation id="c3" score="INFINITY" rsc="d3" with-rsc="d1"/> </constraints> </configuration> </cib> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test_parse.py new/crmsh/test/unittests/test_parse.py --- old/crmsh/test/unittests/test_parse.py 2014-08-22 13:11:04.000000000 +0200 +++ new/crmsh/test/unittests/test_parse.py 2014-08-28 15:12:04.000000000 +0200 @@ -351,6 +351,17 @@ self.assertEqual(4, len(out)) # new type of acls + + out = self.parser.parse("acl_target foo a") + self.assertEqual('acl_target', out.tag) + self.assertEqual('foo', out.get('id')) + self.assertEqual(['a'], out.xpath('./role/@id')) + + out = self.parser.parse("acl_target foo a b") + self.assertEqual('acl_target', out.tag) + self.assertEqual('foo', out.get('id')) + self.assertEqual(['a', 'b'], out.xpath('./role/@id')) + out = self.parser.parse("acl_target foo a b c") self.assertEqual('acl_target', out.tag) self.assertEqual('foo', out.get('id')) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-MIME-Types for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package perl-MIME-Types for openSUSE:Factory checked in at 2014-08-28 21:05:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MIME-Types (Old) and /work/SRC/openSUSE:Factory/.perl-MIME-Types.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MIME-Types" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MIME-Types/perl-MIME-Types.changes 2014-04-23 17:32:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-MIME-Types.new/perl-MIME-Types.changes 2014-08-28 21:05:53.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 27 12:47:22 UTC 2014 - mardnh(a)gmx.de + +- update to version 2.05: + Improvements: + - rename ::Type::isAscii() into ::Type::isText() + - add source table broofa + rt.cpan.org#98308 [Lars Dɪᴇᴄᴋᴏᴡ] + - add source table freedesktop + rt.cpan.org#98309 [Lars Dɪᴇᴄᴋᴏᴡ] + - update iana types + +------------------------------------------------------------------- Old: ---- MIME-Types-2.04.tar.gz New: ---- MIME-Types-2.05.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MIME-Types.spec ++++++ --- /var/tmp/diff_new_pack.XzITFA/_old 2014-08-28 21:05:54.000000000 +0200 +++ /var/tmp/diff_new_pack.XzITFA/_new 2014-08-28 21:05:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-MIME-Types -Version: 2.04 +Version: 2.05 Release: 0 %define cpan_name MIME-Types Summary: MIME-Type Determination ++++++ MIME-Types-2.04.tar.gz -> MIME-Types-2.05.tar.gz ++++++ ++++ 3377 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openvpn for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package openvpn for openSUSE:Factory checked in at 2014-08-28 21:05:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvpn (Old) and /work/SRC/openSUSE:Factory/.openvpn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvpn" Changes: -------- --- /work/SRC/openSUSE:Factory/openvpn/openvpn.changes 2014-06-10 14:39:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvpn.new/openvpn.changes 2014-08-28 21:05:51.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 25 09:12:08 UTC 2014 - idonmez(a)suse.com + +- Update to version 2.3.4 + * Add support for client-cert-not-required for PolarSSL. + * Introduce safety check for http proxy options. + +------------------------------------------------------------------- Old: ---- openvpn-2.3.2.tar.gz openvpn-2.3.2.tar.gz.asc New: ---- openvpn-2.3.4.tar.gz openvpn-2.3.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvpn.spec ++++++ --- /var/tmp/diff_new_pack.zEaw7q/_old 2014-08-28 21:05:52.000000000 +0200 +++ /var/tmp/diff_new_pack.zEaw7q/_new 2014-08-28 21:05:52.000000000 +0200 @@ -32,7 +32,7 @@ %else PreReq: %insserv_prereq %fillup_prereq %endif -Version: 2.3.2 +Version: 2.3.4 Release: 0 Summary: Full-featured SSL VPN solution using a TUN/TAP Interface License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1 ++++++ openvpn-2.3.2.tar.gz -> openvpn-2.3.4.tar.gz ++++++ ++++ 13864 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qt-creator for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2014-08-28 21:05:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-creator (Old) and /work/SRC/openSUSE:Factory/.qt-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt-creator" Changes: -------- --- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2013-12-13 12:00:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes 2014-08-28 21:05:50.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 26 11:11:57 UTC 2014 - cgiboudeaux(a)gmx.com + +- Update to 3.2.0 + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/3.2/dist/changes-3.2.0 + for the complete changelog + +------------------------------------------------------------------- Old: ---- qt-creator-opensource-src-3.0.0.tar.gz New: ---- qt-creator-opensource-src-3.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.As4WaU/_old 2014-08-28 21:05:51.000000000 +0200 +++ /var/tmp/diff_new_pack.As4WaU/_new 2014-08-28 21:05:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt-creator # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: qt-creator -Version: 3.0.0 +Version: 3.2.0 Release: 0 Summary: Lightweight IDE License: SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Tools/IDE Url: http://www.qtsoftware.com/developer/qt-creator/ -%define rversion 3.0.0 -Source: http://download.qt-project.org/official_releases/qtcreator/3.0/%{rversion}/… +%define rversion 3.2.0 +Source: http://download.qt-project.org/official_releases/qtcreator/3.2/%{rversion}/… Source1: qtcreator.desktop Patch1: system-botan-lib.diff Patch2: hardcoded-runpath.diff @@ -117,6 +117,7 @@ %dir %{_datadir}/icons/hicolor/*/apps %dir %{_docdir}/libqt4/qch %doc %{_docdir}/libqt4/qch/qtcreator.qch +%{_bindir}/buildoutputparser %{_bindir}/qmlpuppet %{_bindir}/qtcreator %{_bindir}/qtcreator_process_stub ++++++ hardcoded-runpath.diff ++++++ --- /var/tmp/diff_new_pack.As4WaU/_old 2014-08-28 21:05:51.000000000 +0200 +++ /var/tmp/diff_new_pack.As4WaU/_new 2014-08-28 21:05:51.000000000 +0200 @@ -1,15 +1,14 @@ diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri -index c243fa1..f210a93 100644 +index 0fe283d..f7e04d0 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri -@@ -119,13 +119,7 @@ macx { - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ - } +@@ -127,12 +127,7 @@ macx { + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../ } else:linux-* { - #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - QMAKE_RPATHDIR += \$\$ORIGIN - QMAKE_RPATHDIR += \$\$ORIGIN/.. -- QMAKE_RPATHDIR += \$\$ORIGIN/../.. - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' - QMAKE_RPATHDIR = ++++++ qbs-path.diff ++++++ --- /var/tmp/diff_new_pack.As4WaU/_old 2014-08-28 21:05:51.000000000 +0200 +++ /var/tmp/diff_new_pack.As4WaU/_new 2014-08-28 21:05:51.000000000 +0200 @@ -1,9 +1,11 @@ ---- a/src/shared/qbs/src/plugins/plugins.pri 2013-07-05 11:52:12.000000000 -0300 -+++ b/src/shared/qbs/src/plugins/plugins.pri 2013-07-16 12:40:32.000000000 -0300 -@@ -17,5 +17,5 @@ - installPrefix = $${QBS_RESOURCES_INSTALL_DIR} +diff --git a/src/shared/qbs/src/plugins/plugins.pri b/src/shared/qbs/src/plugins/plugins.pri +index a348d52..ac91f19 100644 +--- a/src/shared/qbs/src/plugins/plugins.pri ++++ b/src/shared/qbs/src/plugins/plugins.pri +@@ -19,5 +19,5 @@ include(../library_dirname.pri) + installPrefix = $${QBS_PLUGINS_INSTALL_DIR} else: \ - installPrefix = $${QBS_INSTALL_PREFIX} --target.path = $${installPrefix}/lib/qbs/plugins + installPrefix = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME} +-target.path = $${installPrefix}/qbs/plugins +target.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins/qbs/ INSTALLS += target ++++++ qt-creator-opensource-src-3.0.0.tar.gz -> qt-creator-opensource-src-3.2.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/qt-creator/qt-creator-opensource-src-3.0.0.tar.gz /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator-opensource-src-3.2.0.tar.gz differ: char 5, line 1 ++++++ system-botan-lib.diff ++++++ --- /var/tmp/diff_new_pack.As4WaU/_old 2014-08-28 21:05:51.000000000 +0200 +++ /var/tmp/diff_new_pack.As4WaU/_new 2014-08-28 21:05:51.000000000 +0200 @@ -1,8 +1,8 @@ diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri -index 7998aa9..6716043 100644 +index 6055e91..4b715c0 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri -@@ -1,56 +1,2 @@ +@@ -1,57 +1,2 @@ -INCLUDEPATH *= $$PWD/.. -HEADERS += $$PWD/botan.h - @@ -40,6 +40,7 @@ - BOTAN_HAS_MUTEX_WIN32 - - win32-msvc* { +- QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs - QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 - DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS - } else { @@ -50,8 +51,8 @@ -} - -unix:*-g++* { -- QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long -- QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long +- QMAKE_CFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long +- QMAKE_CXXFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long - QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04 -} - @@ -61,9 +62,8 @@ -} +INCLUDEPATH *= /usr/include/botan-1.10 +LIBS *= -lbotan-1.10 -\ No newline at end of file diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp -index 24fd747..2085f5c 100644 +index 19a6282..3a888ee 100644 --- a/src/libs/ssh/sshcryptofacility.cpp +++ b/src/libs/ssh/sshcryptofacility.cpp @@ -37,6 +37,11 @@ @@ -79,7 +79,7 @@ #include <QDebug> #include <QList> diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h -index 21056f7..a5ebb38 100644 +index fbf7a22..fcb62ee 100644 --- a/src/libs/ssh/sshcryptofacility_p.h +++ b/src/libs/ssh/sshcryptofacility_p.h @@ -31,9 +31,11 @@ @@ -95,7 +95,7 @@ namespace QSsh { namespace Internal { diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp -index b21f1ab..46135cb 100644 +index 700b268..7e34f9f 100644 --- a/src/libs/ssh/sshkeyexchange.cpp +++ b/src/libs/ssh/sshkeyexchange.cpp @@ -36,6 +36,12 @@ @@ -112,7 +112,7 @@ #ifdef CREATOR_SSH_DEBUG #include <iostream> diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp -index 395057a..b1cad7d 100644 +index 3a943bc..f5aea35 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp @@ -35,6 +35,11 @@ @@ -128,7 +128,7 @@ #include <QDateTime> #include <QInputDialog> diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h -index 9ffdc90..6cdd7d6 100644 +index 2f6953f..7570acc 100644 --- a/src/libs/ssh/sshkeypasswordretriever_p.h +++ b/src/libs/ssh/sshkeypasswordretriever_p.h @@ -30,6 +30,7 @@ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint-tests for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package rpmlint-tests for openSUSE:Factory checked in at 2014-08-28 21:05:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint-tests (Old) and /work/SRC/openSUSE:Factory/.rpmlint-tests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint-tests" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint-tests/rpmlint-tests.changes 2014-05-06 17:42:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint-tests.new/rpmlint-tests.changes 2014-08-28 21:05:46.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 21 15:09:10 UTC 2014 - lnussel(a)suse.de + +- fix rclink* tests by adding expected systemd macros + +------------------------------------------------------------------- +Thu Aug 21 13:12:44 UTC 2014 - lnussel(a)suse.de + +- add test cases for systemd macros + +------------------------------------------------------------------- Old: ---- rpmlint-tests-13.2+git20140506.829452f.tar.xz New: ---- rpmlint-tests-13.2+git20140821.c02617a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-tests.spec ++++++ --- /var/tmp/diff_new_pack.eEc3BT/_old 2014-08-28 21:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.eEc3BT/_new 2014-08-28 21:05:47.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 13.2+git20140506.829452f +Version: 13.2+git20140821.c02617a Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain ++++++ rpmlint-tests-13.2+git20140506.829452f.tar.xz -> rpmlint-tests-13.2+git20140821.c02617a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink3.spec new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink3.spec --- old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink3.spec 2014-05-06 11:12:15.000000000 +0200 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink3.spec 2014-08-21 17:08:55.000000000 +0200 @@ -31,6 +31,18 @@ install -m 755 blah %buildroot/etc/init.d/blah install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service +%pre +%service_add_pre blah.service + +%preun +%service_del_preun blah.service + +%post +%service_add_post blah.service + +%postun +%service_del_postun blah.service + %clean rm -rf %buildroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink4.spec new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink4.spec --- old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink4.spec 2014-05-06 11:12:15.000000000 +0200 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink4.spec 2014-08-21 17:08:55.000000000 +0200 @@ -26,6 +26,18 @@ install -d -m 755 %buildroot/usr/sbin install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service +%pre +%service_add_pre blah.service + +%preun +%service_del_preun blah.service + +%post +%service_add_post blah.service + +%postun +%service_del_postun blah.service + %clean rm -rf %buildroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink5.spec new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink5.spec --- old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink5.spec 2014-05-06 11:12:15.000000000 +0200 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink5.spec 2014-08-21 17:08:55.000000000 +0200 @@ -27,6 +27,18 @@ install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service ln -s /etc/init.d/blah %buildroot/usr/sbin/rcblah +%pre +%service_add_pre blah.service + +%preun +%service_del_preun blah.service + +%post +%service_add_post blah.service + +%postun +%service_del_postun blah.service + %clean rm -rf %buildroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink6.spec new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink6.spec --- old/rpmlint-tests-13.2+git20140506.829452f/tests/rclink6.spec 2014-05-06 11:12:15.000000000 +0200 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/rclink6.spec 2014-08-21 17:08:55.000000000 +0200 @@ -27,6 +27,18 @@ install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service ln -s /usr/sbin/service %buildroot%_sbindir/rcblah +%pre +%service_add_pre blah.service + +%preun +%service_del_preun blah.service + +%post +%service_add_post blah.service + +%postun +%service_del_postun blah.service + %clean rm -rf %buildroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-bad.ref new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-bad.ref --- old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-bad.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-bad.ref 2014-08-21 17:08:55.000000000 +0200 @@ -0,0 +1,6 @@ +systemd-bad: W: systemd-service-without-service_del_preun foobar.service +systemd-bad: W: systemd-service-without-service_del_postun foobar.service +systemd-bad: W: systemd-service-without-service_add_pre foobar.service +systemd-bad: W: systemd-service-without-service_add_post foobar.service +systemd-bad: W: suse-missing-rclink foobar +1 packages and 0 specfiles checked; 0 errors, 5 warnings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-bad.spec new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-bad.spec --- old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-bad.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-bad.spec 2014-08-21 17:08:55.000000000 +0200 @@ -0,0 +1,44 @@ +Name: systemd-bad +Version: 0 +Release: 0 +Group: Development/Tools/Building +Summary: Lorem ipsum +License: GPL-2.0+ +Url: http://www.opensuse.org/ +BuildArch: noarch + +%description +Lorem ipsum dolor sit amet, consectetur adipisici elit, sed +eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim +ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut +aliquid ex ea commodi consequat. Quis aute iure reprehenderit in +voluptate velit esse cillum dolore eu fugiat nulla pariatur. +Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui +officia deserunt mollit anim id est laborum. + +%prep +%build +cat > foobar.service <<EOF +[Unit] +Description=Foobar Daemon + +[Service] +ExecStart=/usr/sbin/foobar + +[Install] +WantedBy=multi-user.target +EOF + +%install +install -D -m 644 foobar.service %buildroot/usr/lib/systemd/system/foobar.service + +%clean +rm -rf %buildroot + +%files +%defattr(-,root,root) +/usr/lib/systemd/system/foobar.service + +%changelog +* Mon Apr 18 2011 lnussel(a)suse.de +- dummy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-good.ref new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-good.ref --- old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-good.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-good.ref 2014-08-21 17:08:55.000000000 +0200 @@ -0,0 +1 @@ +1 packages and 0 specfiles checked; 0 errors, 0 warnings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-good.spec new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-good.spec --- old/rpmlint-tests-13.2+git20140506.829452f/tests/systemd-good.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-tests-13.2+git20140821.c02617a/tests/systemd-good.spec 2014-08-21 17:08:55.000000000 +0200 @@ -0,0 +1,59 @@ +Name: systemd-good +Version: 0 +Release: 0 +Group: Development/Tools/Building +Summary: Lorem ipsum +License: GPL-2.0+ +Url: http://www.opensuse.org/ +BuildArch: noarch + +%description +Lorem ipsum dolor sit amet, consectetur adipisici elit, sed +eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim +ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut +aliquid ex ea commodi consequat. Quis aute iure reprehenderit in +voluptate velit esse cillum dolore eu fugiat nulla pariatur. +Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui +officia deserunt mollit anim id est laborum. + +%prep +%build +cat > foobar.service <<EOF +[Unit] +Description=Foobar Daemon + +[Service] +ExecStart=/usr/sbin/foobar + +[Install] +WantedBy=multi-user.target +EOF + +%install +mkdir -p %buildroot%{_sbindir} +ln -s service %buildroot%{_sbindir}/rcfoobar +install -D -m 644 foobar.service %buildroot/usr/lib/systemd/system/foobar.service + +%pre +%service_add_pre foobar.service + +%preun +%service_del_preun foobar.service + +%post +%service_add_post foobar.service + +%postun +%service_del_postun foobar.service + +%clean +rm -rf %buildroot + +%files +%defattr(-,root,root) +%{_sbindir}/rcfoobar +/usr/lib/systemd/system/foobar.service + +%changelog +* Mon Apr 18 2011 lnussel(a)suse.de +- dummy -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-08-28 21:05:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-07-13 14:06:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-08-28 21:05:43.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Aug 19 06:42:53 UTC 2014 - michal.hrusecky(a)opensuse.org + +- fix privileges as a last step of upgrade + +------------------------------------------------------------------- +Mon Aug 18 17:39:33 UTC 2014 - michal.hrusecky(a)opensuse.org + +- Update to 10.0.13 + * Release notes: + http://kb.askmonty.org/v/mariadb-10013-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-10013-changelog + +------------------------------------------------------------------- Old: ---- mariadb-10.0.12.tar.bz2 New: ---- _constraints mariadb-10.0.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.Viq49H/_old 2014-08-28 21:05:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Viq49H/_new 2014-08-28 21:05:46.000000000 +0200 @@ -40,7 +40,7 @@ Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers -Version: 10.0.12 +Version: 10.0.13 Release: 0 %define srv_vers 5.6.17 Url: http://www.mariab.org ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">9</size> </disk> </hardware> </constraints> ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mariadb-10.0.12.tar.bz2 -> mariadb-10.0.13.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.0.12.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-10.0.13.tar.bz2 differ: char 11, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch new/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch 2014-08-19 08:08:50.000000000 +0200 @@ -0,0 +1,100 @@ +PATCH-P0-FEATURE-UPSTREAM: Keep datadir across multiple calls + +mysql_upgrade script asks for datadir multiple times during update but at some +point privileges gets updated and if --skip-grant-tables was used (like in SUSE +init scripts), datadir is no longer queryable. So we cache the value. + +Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> + +Index: client/mysql_upgrade.c +=================================================================== +--- client/mysql_upgrade.c.orig ++++ client/mysql_upgrade.c +@@ -608,21 +608,37 @@ static int extract_variable_from_show(DY + + static int get_upgrade_info_file_name(char* name) + { +- DYNAMIC_STRING ds_datadir; +- DBUG_ENTER("get_upgrade_info_file_name"); ++ static char *data_dir = NULL; ++ static size_t len; + +- if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) +- die("Out of memory"); ++ DBUG_ENTER("get_upgrade_info_file_name"); + +- if (run_query("show variables like 'datadir'", +- &ds_datadir, FALSE) || +- extract_variable_from_show(&ds_datadir, name)) ++ if(data_dir==NULL) + { ++ DYNAMIC_STRING ds_datadir; ++ ++ if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) ++ die("Out of memory"); ++ ++ if (run_query("show variables like 'datadir'", ++ &ds_datadir, FALSE) || ++ extract_variable_from_show(&ds_datadir, name) ++ ) ++ { ++ dynstr_free(&ds_datadir); ++ DBUG_RETURN(1); /* Query failed */ ++ } + dynstr_free(&ds_datadir); +- DBUG_RETURN(1); /* Query failed */ +- } ++ len = strlen(name)+1; ++ if ((data_dir=(char*)malloc(sizeof(char)*len))==NULL) ++ { ++ die("Out of memory"); ++ } ++ strncpy(data_dir,name,len); + +- dynstr_free(&ds_datadir); ++ } else { ++ strncpy(name, data_dir, len); ++ } + + fn_format(name, "mysql_upgrade_info", name, "", MYF(0)); + DBUG_PRINT("exit", ("name: %s", name)); +@@ -757,7 +773,7 @@ static int run_mysqlcheck_upgrade(const + + static int run_mysqlcheck_fixnames(void) + { +- verbose("Phase 2/3: Fixing table and database names"); ++ verbose("Phase 2/4: Fixing table and database names"); + print_conn_args("mysqlcheck"); + return run_tool(mysqlcheck_path, + NULL, /* Send output from mysqlcheck directly to screen */ +@@ -1000,7 +1016,7 @@ int main(int argc, char **argv) + Read the mysql_upgrade_info file to check if mysql_upgrade + already has been run for this installation of MySQL + */ +- if (!opt_force && upgrade_already_done()) ++ if (upgrade_already_done() && !opt_force) + { + printf("This installation of MySQL is already upgraded to %s, " + "use --force if you still need to run mysql_upgrade\n", +@@ -1016,15 +1032,17 @@ int main(int argc, char **argv) + /* + Run "mysqlcheck" and "mysql_fix_privilege_tables.sql" + */ +- verbose("Phase 1/3: Running 'mysql_fix_privilege_tables'..."); +- if (run_mysqlcheck_upgrade("--databases", "mysql") || +- run_sql_fix_privilege_tables()) ++ verbose("Phase 1/4: Checking and upgrading mysql tables"); ++ if (run_mysqlcheck_upgrade("--databases", "mysql")) + die("Upgrade failed" ); + if (!opt_systables_only && + (run_mysqlcheck_fixnames() || +- verbose("Phase 3/3: Checking and upgrading tables") || ++ verbose("Phase 3/4: Checking and upgrading tables") || + run_mysqlcheck_upgrade("--all-databases","--skip-database=mysql"))) + die("Upgrade failed" ); ++ verbose("Phase 4/4: Running 'mysql_fix_privilege_tables'..."); ++ if (run_sql_fix_privilege_tables()) ++ die("Upgrade failed" ); + + verbose("OK"); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-5.5.31-upgrade-datadir.patch new/mysql-patches/mysql-patches/mysql-5.5.31-upgrade-datadir.patch --- old/mysql-patches/mysql-patches/mysql-5.5.31-upgrade-datadir.patch 2014-06-18 18:50:38.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-5.5.31-upgrade-datadir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Keep datadir across multiple calls - -mysql_upgrade script asks for datadir multiple times during update but at some -point privileges gets updated and if --skip-grant-tables was used (like in SUSE -init scripts), datadir is no longer queryable. So we cache the value. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: client/mysql_upgrade.c -=================================================================== ---- client/mysql_upgrade.c.orig -+++ client/mysql_upgrade.c -@@ -557,21 +557,37 @@ static int extract_variable_from_show(DY - - static int get_upgrade_info_file_name(char* name) - { -- DYNAMIC_STRING ds_datadir; -- DBUG_ENTER("get_upgrade_info_file_name"); -+ static char *data_dir = NULL; -+ static size_t len; - -- if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) -- die("Out of memory"); -+ DBUG_ENTER("get_upgrade_info_file_name"); - -- if (run_query("show variables like 'datadir'", -- &ds_datadir, FALSE) || -- extract_variable_from_show(&ds_datadir, name)) -+ if(data_dir==NULL) - { -+ DYNAMIC_STRING ds_datadir; -+ -+ if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) -+ die("Out of memory"); -+ -+ if (run_query("show variables like 'datadir'", -+ &ds_datadir, FALSE) || -+ extract_variable_from_show(&ds_datadir, name) -+ ) -+ { -+ dynstr_free(&ds_datadir); -+ DBUG_RETURN(1); /* Query failed */ -+ } - dynstr_free(&ds_datadir); -- DBUG_RETURN(1); /* Query failed */ -- } -+ len = strlen(name)+1; -+ if ((data_dir=(char*)malloc(sizeof(char)*len))==NULL) -+ { -+ die("Out of memory"); -+ } -+ strncpy(data_dir,name,len); - -- dynstr_free(&ds_datadir); -+ } else { -+ strncpy(name, data_dir, len); -+ } - - fn_format(name, "mysql_upgrade_info", name, "", MYF(0)); - DBUG_PRINT("exit", ("name: %s", name)); -@@ -880,7 +896,7 @@ int main(int argc, char **argv) - Read the mysql_upgrade_info file to check if mysql_upgrade - already has been run for this installation of MySQL - */ -- if (!opt_force && upgrade_already_done()) -+ if (upgrade_already_done() && !opt_force) - { - printf("This installation of MySQL is already upgraded to %s, " - "use --force if you still need to run mysql_upgrade\n", ++++++ rc.mysql.systemd ++++++ --- /var/tmp/diff_new_pack.Viq49H/_old 2014-08-28 21:05:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Viq49H/_new 2014-08-28 21:05:46.000000000 +0200 @@ -35,7 +35,7 @@ rc_check () { _rc_status_ret=$? - test "_rc_status_ret" || _rc_status_ret=0 + test "$_rc_status_ret" || _rc_status_ret=0 test $_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret test $_rc_status -eq 0 || _rc_status_all=$_rc_status return 0$_rc_status_ret ++++++ series ++++++ --- /var/tmp/diff_new_pack.Viq49H/_old 2014-08-28 21:05:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Viq49H/_new 2014-08-28 21:05:46.000000000 +0200 @@ -10,7 +10,7 @@ mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-10.0.11-group.patch mariadb-10.0.5-deharcode-libdir.patch -mysql-5.5.31-upgrade-datadir.patch +mariadb-10.0.13-upgrade-datadir.patch mysql-community-server-5.6.12-srv_buf_size.patch mariadb-10.0.9-perl-in-bench.patch mariadb-10.0.11-header_files_const_warnings.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '14

28 Aug '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-08-28 21:05:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-08-16 15:37:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-08-28 21:05:32.000000000 +0200 @@ -1,0 +2,113 @@ +Tue Aug 26 20:57:32 CEST 2014 - ms(a)suse.de + +- v5.06.155 released + +------------------------------------------------------------------- +Tue Aug 26 20:55:19 CEST 2014 - ms(a)suse.de + +- Make sure kiwi initrd creates /run/lock (bnc #893624) + + The location for /var/lock has been moved to /run/lock and /var/lock + is a symlink instead. /run is a tmpfs and thus the directory must be + created properly + +------------------------------------------------------------------- +Tue Aug 26 19:42:42 CEST 2014 - ms(a)suse.de + +- v5.06.154 released + +------------------------------------------------------------------- +Tue Aug 26 19:36:19 CEST 2014 - ms(a)suse.de + +- Don't prevent the pre-init stage if root= is set in the cmdline + + If a root= information is passed to the cmdline kiwi uses this + device and wrongly indicates the system has completed the first + boot by setting LOCAL_BOOT=yes This prevents the correct setup + of the bootloader device.map as well as the bootloader config + to be written (bnc #893368) + +------------------------------------------------------------------- +Tue Aug 26 19:32:26 CEST 2014 - ms(a)suse.de + +- Prevent creation of custom /etc/ImagePackages file for the + oem and vmx image types. The information there is created + at image creation time already and the call increases the + first boot time, related to (bnc #893368) + +------------------------------------------------------------------- +Tue Aug 26 18:50:13 CEST 2014 - ms(a)suse.de + +- Fixed schema validation error output + + if the schema is invalid kiwi uses jing to create good error + messages but the output of jing was not displayed + +------------------------------------------------------------------- +Mon Aug 25 20:46:22 CEST 2014 - ms(a)suse.de + +- Adapt unit test due to last XSL change + +------------------------------------------------------------------- +Mon Aug 25 20:21:50 CEST 2014 - ms(a)suse.de + +- Fixed xsl/convert58to59.xsl to convert old controller='scsi' + to controller='lsilogic' and not 'ide' which unexpectedly + changes the layout (bnc #893345) + +------------------------------------------------------------------- +Mon Aug 25 19:56:15 CEST 2014 - ms(a)suse.de + +- Fixed NFS root mount, use nolock option (bnc #892672) + +------------------------------------------------------------------- +Mon Aug 25 19:38:45 CEST 2014 - ms(a)suse.de + +- Fixed package update from sle11 to sle12 (bnc #893340) + + the man pages were moved from kiwi-doc to the main kiwi package + between sle11 and sle12. Thus the main kiwi package has to set + the correct file provides/obsoletes in order to avoid conflicts + +------------------------------------------------------------------- +Mon Aug 25 15:51:18 CEST 2014 - ms(a)suse.de + +- make sure e2fsprogs is installed explicitly in isoboot + boot image descriptions for openSUSE 13.1/13.2 and SLE12 + There is no package requirement for e2fsprogs which + pulls it in (bnc #892087) + +------------------------------------------------------------------- +Mon Aug 25 13:11:31 CEST 2014 - ms(a)suse.de + +- Fixed spec file requirements + + cdrkit-cdrtools-compat is a requirement on suse in order to + correctly find the iso tools in the search path + +------------------------------------------------------------------- +Mon Aug 25 09:50:39 CEST 2014 - ms(a)suse.de + +- Fixed legacy service insert/remove using chkconfig + + suseInsertService and suseRemoveService can deal with native systemd + services and legacy SYS V init scripts stored in /etc/init.d/. In case + of legacy services a call to "chkconfig /etc/init.d/${service} on|off" + is issued but fails because chkconfig only expects a service name + and not a full path. + +------------------------------------------------------------------- +Sun Aug 24 14:22:23 CEST 2014 - tbechtold(a)suse.de + +- Set sudoers secure_path for vagrant examples + + secure_path is needed to find executables under i.e. + /sbin/ when vagrant uses sudo. + This fixes the problem when using vagrant-libvirt and + sync a folder via 9p which leads currently to: + + ==> devstack1: mounting p9 share in guest + modprobe 9p + bash: line 2: modprobe: command not found + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.vJz1sc/_old 2014-08-28 21:05:34.000000000 +0200 +++ /var/tmp/diff_new_pack.vJz1sc/_new 2014-08-28 21:05:34.000000000 +0200 @@ -26,9 +26,15 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.153 +Version: 5.06.155 Release: 0 +Provides: kiwi-image:lxc +Provides: kiwi-image:tbz Provides: kiwi-schema = 6.1 +Provides: kiwi:%{_mandir}/man1/KIWI::config.sh.1.gz +Provides: kiwi:%{_mandir}/man1/KIWI::images.sh.1.gz +Provides: kiwi:%{_mandir}/man1/KIWI::kiwirc.1.gz +Provides: kiwi:%{_mandir}/man1/kiwi.1.gz # requirements to build packages BuildRequires: diffutils BuildRequires: e2fsprogs @@ -56,8 +62,6 @@ %ifarch %ix86 x86_64 BuildRequires: syslinux %endif -Provides: kiwi-image:lxc -Provides: kiwi-image:tbz %if 0%{?suse_version} > 1140 BuildRequires: btrfsprogs BuildRequires: cdrkit-cdrtools-compat @@ -239,6 +243,10 @@ Summary: KIWI - Appliance Builder Documentation License: LGPL-2.0+ Group: Documentation/Howto +Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::config.sh.1.gz +Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::images.sh.1.gz +Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::kiwirc.1.gz +Obsoletes: kiwi-doc:%{_mandir}/man1/kiwi.1.gz %if 0%{?suse_version} > 1120 BuildArch: noarch %endif @@ -312,6 +320,7 @@ %endif Requires: dosfstools %if 0%{?suse_version} +Requires: cdrkit-cdrtools-compat Requires: genisoimage %endif @@ -326,7 +335,10 @@ %package -n kiwi-desc-isoboot-requires Provides: kiwi-boot:isoboot Provides: kiwi-image:iso +%if 0%{?suse_version} +Requires: cdrkit-cdrtools-compat Requires: genisoimage +%endif Requires: kiwi-desc-isoboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} isoboot %{myarch} %{mysystems}`) %ifarch ppc ppc64 ppc64le @@ -396,7 +408,10 @@ Group: System/Management Provides: kiwi-boot:vmxboot Provides: kiwi-image:vmx +%if 0%{?suse_version} +Requires: cdrkit-cdrtools-compat Requires: genisoimage +%endif Requires: kiwi-desc-vmxboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} vmxboot %{myarch} %{mysystems}`) %ifarch ppc ppc64 ppc64le @@ -474,6 +489,7 @@ Requires: lvm2 Requires: parted %if 0%{?suse_version} +Requires: cdrkit-cdrtools-compat Requires: genisoimage Requires: multipath-tools %endif @@ -505,10 +521,12 @@ Provides: kiwi-boot:oemboot Provides: kiwi-boot:tbz Provides: kiwi-image:oem +%if 0%{?suse_version} +Requires: cdrkit-cdrtools-compat Requires: genisoimage +%endif Requires: kiwi-desc-oemboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} oemboot %{myarch} %{mysystems}`) - %ifarch ppc ppc64 ppc64le %if 0%{?suse_version} >= 1315 Requires: grub2-powerpc-ieee1275 ++++++ kiwi-docu.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers new/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers --- old/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers 2014-08-12 14:05:04.000000000 +0200 +++ new/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers 2014-08-26 19:44:14.000000000 +0200 @@ -28,6 +28,8 @@ # account if they are allowed to run commands without authentication. #Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + # In the default (unconfigured) configuration, sudo asks for the root password. # This allows use of an ordinary user account for administration of a freshly # installed system. When configuring sudo, delete the two diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers new/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers --- old/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers 2014-08-12 14:05:04.000000000 +0200 +++ new/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers 2014-08-26 19:44:14.000000000 +0200 @@ -28,6 +28,8 @@ # account if they are allowed to run commands without authentication. #Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + # In the default (unconfigured) configuration, sudo asks for the root password. # This allows use of an ordinary user account for administration of a freshly # installed system. When configuring sudo, delete the two ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-08-13 08:41:31.000000000 +0200 +++ new/kiwi/.revision 2014-08-13 08:41:31.000000000 +0200 @@ -1 +1 @@ -051aebcf0541d230e8a1848ec1d0873a7c265cc5 +b49f8be43d5c765e71a556e9c1424774d25f9d42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2014-08-26 19:44:14.000000000 +0200 @@ -54,7 +54,7 @@ fi done if [ -x "/etc/init.d/${service}" ];then - echo "/etc/init.d/${service}" + echo "${service}" fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2014-08-15 12:37:18.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-08-26 20:58:12.000000000 +0200 @@ -1832,7 +1832,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.153"; + $data{Version} = "5.06.155"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-08-15 12:37:18.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-08-26 20:58:12.000000000 +0200 @@ -455,6 +455,10 @@ ln -s fd/0 $prefix/stdin ln -s fd/1 $prefix/stdout ln -s fd/2 $prefix/stderr + #====================================== + # create directories in /run + #-------------------------------------- + mkdir -p -m 0755 /run/lock } #====================================== # mount_rpc_pipefs @@ -4252,7 +4256,6 @@ #-------------------------------------- if [ ! -z "$root" ];then export biosBootDevice=$(dn $root) - export LOCAL_BOOT=yes if [ ! -e /config.partids ];then echo "kiwi_RootPart=1" > /config.partids fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2014-08-26 19:44:14.000000000 +0200 @@ -1879,8 +1879,7 @@ }; if ($@) { my $evaldata=$@; - $kiwi -> error ("Schema validation failed:\n"); - $kiwi -> error ($evaldata); + $kiwi -> error ("Schema validation failed"); $kiwi -> failed (); my $configStr = $systemXML -> parse_file( $controlFile ) -> toString(); my $upgradedStr = $systemTree -> toString(); @@ -1906,9 +1905,10 @@ my $locator = KIWILocator -> instance(); my $jingExec = $locator -> getExecPath('jing'); if ($jingExec) { - KIWIQX::qxx ( - "$jingExec $this->{schema} $upgradedContolFile 2>/dev/null" - ); + $evaldata = KIWIQX::qxx ( + "$jingExec $this->{schema} $upgradedContolFile 2>/dev/null" + ); + $kiwi -> error ("$evaldata\n"); return; } else { $kiwi -> error ("$evaldata\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-preinit new/kiwi/system/boot/armv7l/oemboot/suse-preinit --- old/kiwi/system/boot/armv7l/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -116,32 +116,22 @@ fi #====================================== -# 9) create /etc/ImagePackages -#-------------------------------------- -if [ "$LOCAL_BOOT" = "no" ];then - if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages - fi -fi - -#====================================== -# 10) setup console +# 9) setup console #-------------------------------------- setupConsole #====================================== -# 11) create origin snapshot if possible +# 10) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 12) Run user script +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 13) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2014-08-26 19:44:14.000000000 +0200 @@ -149,6 +149,7 @@ <package name="module-init-tools"/> <package name="which"/> <package name="udev"/> + <package name="e2fsprogs"/> </packages> <packages type="delete"> <package name="cracklib-dict-full"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2014-08-26 19:44:14.000000000 +0200 @@ -147,6 +147,7 @@ <package name="which"/> <package name="udev"/> <package name="sysvinit-tools"/> + <package name="e2fsprogs"/> </packages> <packages type="delete"> <package name="cracklib-dict-full"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2014-08-26 19:44:14.000000000 +0200 @@ -141,6 +141,7 @@ <package name="udev"/> <package name="wicked"/> <package name="sysvinit-tools"/> + <package name="e2fsprogs"/> </packages> <packages type="delete"> <package name="cracklib-dict-full"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2014-08-26 19:44:14.000000000 +0200 @@ -141,6 +141,7 @@ <package name="udev"/> <package name="wicked"/> <package name="sysvinit-tools"/> + <package name="e2fsprogs"/> </packages> <packages type="delete"> <package name="cracklib-dict-full"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2014-08-26 19:44:14.000000000 +0200 @@ -643,9 +643,9 @@ fi setupNFSServices Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..." - imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,rw,nolock $nfsRootServer:$nfsRootDevice" if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then - imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,ro,nolock $nfsRootServer:$nfsRootDevice" fi imageRootName="NFSRoot-System" systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-preinit new/kiwi/system/boot/ix86/oemboot/rhel-preinit --- old/kiwi/system/boot/ix86/oemboot/rhel-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -116,37 +116,27 @@ fi #====================================== -# 9) create /etc/ImagePackages -#-------------------------------------- -if [ "$LOCAL_BOOT" = "no" ];then - if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages - fi -fi - -#====================================== -# 10) setup console +# 9) setup console #-------------------------------------- setupConsole #====================================== -# 11) create origin snapshot if possible +# 10) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 12) update auth config +# 11) update auth config #-------------------------------------- authconfig --updateall #====================================== -# 13) Run user script +# 12) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 14) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-preinit new/kiwi/system/boot/ix86/oemboot/suse-preinit --- old/kiwi/system/boot/ix86/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -116,32 +116,22 @@ fi #====================================== -# 9) create /etc/ImagePackages -#-------------------------------------- -if [ "$LOCAL_BOOT" = "no" ];then - if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages - fi -fi - -#====================================== -# 10) setup console +# 9) setup console #-------------------------------------- setupConsole #====================================== -# 11) create origin snapshot if possible +# 10) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 12) Run user script +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 13) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-preinit new/kiwi/system/boot/ix86/vmxboot/rhel-preinit --- old/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -49,15 +49,7 @@ createFramebufferDevices #====================================== -# 6) create /etc/ImagePackages -#-------------------------------------- -if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages -fi - -#====================================== -# 7) create initrd on diskful +# 6) create initrd on diskful #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then #====================================== @@ -72,34 +64,34 @@ fi #====================================== -# 8) Install boot loader if ok +# 7) Install boot loader if ok #-------------------------------------- if [ $bootLoaderOK = 1 ];then installBootLoader fi #====================================== -# 9) setup console +# 8) setup console #-------------------------------------- setupConsole #====================================== -# 10) create origin snapshot if possible +# 9) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 11) update auth config +# 10) update auth config #-------------------------------------- authconfig --updateall #====================================== -# 12) Run user script +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 13) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-preinit new/kiwi/system/boot/ix86/vmxboot/suse-preinit --- old/kiwi/system/boot/ix86/vmxboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -49,15 +49,7 @@ createFramebufferDevices #====================================== -# 6) create /etc/ImagePackages -#-------------------------------------- -if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages -fi - -#====================================== -# 7) create initrd on diskful +# 6) create initrd on diskful #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then #====================================== @@ -72,29 +64,29 @@ fi #====================================== -# 8) Install boot loader if ok +# 7) Install boot loader if ok #-------------------------------------- if [ $bootLoaderOK = 1 ];then installBootLoader fi #====================================== -# 9) setup console +# 8) setup console #-------------------------------------- setupConsole #====================================== -# 10) create origin snapshot if possible +# 9) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2014-08-26 19:44:14.000000000 +0200 @@ -643,9 +643,9 @@ fi setupNFSServices Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..." - imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,rw,nolock $nfsRootServer:$nfsRootDevice" if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then - imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,ro,nolock $nfsRootServer:$nfsRootDevice" fi imageRootName="NFSRoot-System" systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-preinit new/kiwi/system/boot/ppc/oemboot/suse-preinit --- old/kiwi/system/boot/ppc/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -116,32 +116,22 @@ fi #====================================== -# 9) create /etc/ImagePackages -#-------------------------------------- -if [ "$LOCAL_BOOT" = "no" ];then - if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages - fi -fi - -#====================================== -# 10) setup console +# 9) setup console #-------------------------------------- setupConsole #====================================== -# 11) create origin snapshot if possible +# 10) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 12) Run user script +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 13) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-preinit new/kiwi/system/boot/ppc/vmxboot/suse-preinit --- old/kiwi/system/boot/ppc/vmxboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -49,15 +49,7 @@ createFramebufferDevices #====================================== -# 6) create /etc/ImagePackages -#-------------------------------------- -if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages -fi - -#====================================== -# 7) create initrd on diskful +# 6) create initrd on diskful #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then #====================================== @@ -72,29 +64,29 @@ fi #====================================== -# 8) Install boot loader if ok +# 7) Install boot loader if ok #-------------------------------------- if [ $bootLoaderOK = 1 ];then installBootLoader fi #====================================== -# 9) setup console +# 8) setup console #-------------------------------------- setupConsole #====================================== -# 10) create origin snapshot if possible +# 9) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2014-08-26 19:44:14.000000000 +0200 @@ -659,9 +659,9 @@ fi setupNFSServices Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..." - imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,rw,nolock $nfsRootServer:$nfsRootDevice" if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then - imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,ro,nolock $nfsRootServer:$nfsRootDevice" fi imageRootName="NFSRoot-System" systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit --- old/kiwi/system/boot/s390/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -129,22 +129,12 @@ fi #====================================== -# 10) create /etc/ImagePackages -#-------------------------------------- -if [ "$LOCAL_BOOT" = "no" ];then - if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages - fi -fi - -#====================================== -# 11) setup console +# 10) setup console #-------------------------------------- setupConsole #====================================== -# 11.1) load network module +# 11) load network module #-------------------------------------- if loadNetworkCardS390 "0.0.0191";then #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit --- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200 @@ -62,15 +62,7 @@ fi #====================================== -# 7) create /etc/ImagePackages -#-------------------------------------- -if [ -x /bin/rpm ];then - Echo "Creating initial image package info file" - rpm -qa --last > /etc/ImagePackages -fi - -#====================================== -# 8) create initrd on diskful +# 7) create initrd on diskful #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then #====================================== @@ -85,19 +77,19 @@ fi #====================================== -# 9) Install boot loader if ok +# 8) Install boot loader if ok #-------------------------------------- if [ $bootLoaderOK = 1 ];then installBootLoader fi #====================================== -# 10) setup console +# 9) setup console #-------------------------------------- setupConsole #====================================== -# 10.1) load network module +# 10) load network module #-------------------------------------- if loadNetworkCardS390 "0.0.0191";then #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXML.pm new/kiwi/tests/unit/lib/Test/kiwiXML.pm --- old/kiwi/tests/unit/lib/Test/kiwiXML.pm 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXML.pm 2014-08-26 19:44:14.000000000 +0200 @@ -6265,7 +6265,7 @@ $this -> assert_str_equals('2', $dvdID); $this -> assert_str_equals('ide', $dvdCnt); $this -> assert_str_equals('1', $diskID); - $this -> assert_str_equals('ide', $diskCnt); + $this -> assert_str_equals('lsilogic', $diskCnt); $this -> assert_str_equals('sles', $guest); $this -> assert_str_equals('7', $hwver); $this -> assert_str_equals('1024', $mem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert58to59.xsl new/kiwi/xsl/convert58to59.xsl --- old/kiwi/xsl/convert58to59.xsl 2014-08-12 14:05:05.000000000 +0200 +++ new/kiwi/xsl/convert58to59.xsl 2014-08-26 19:44:14.000000000 +0200 @@ -33,16 +33,16 @@ </xsl:choose> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> - rename controller="scsi" to controller="ide" in vmdisk + rename controller="scsi" to controller="lsilogic" in vmdisk </para> <xsl:template match="vmdisk" mode="conv58to59"> <vmdisk> <xsl:copy-of select="@*[not(local-name(.) = 'controller')]"/> <xsl:choose> <xsl:when test="@controller='scsi'"> - <xsl:variable name="controllername" select='"ide"'/> + <xsl:variable name="controllername" select='"lsilogic"'/> <xsl:attribute name="controller"> <xsl:value-of select="$controllername"/> </xsl:attribute> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0