June 2013 - openSUSE Commits - openSUSE Mailing Lists

commit iodbc for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package iodbc for openSUSE:Factory checked in at 2013-06-28 12:05:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iodbc (Old) and /work/SRC/openSUSE:Factory/.iodbc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iodbc" Changes: -------- --- /work/SRC/openSUSE:Factory/iodbc/iodbc.changes 2012-11-21 17:01:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iodbc.new/iodbc.changes 2013-06-28 12:05:33.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 22 05:28:45 UTC 2013 - jengelh(a)inai.de + +- Set proper extension for tar archive + +------------------------------------------------------------------- Old: ---- libiodbc-3.52.8.tar.bz2 New: ---- libiodbc-3.52.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iodbc.spec ++++++ --- /var/tmp/diff_new_pack.Ja04Ko/_old 2013-06-28 12:05:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Ja04Ko/_new 2013-06-28 12:05:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iodbc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -23,7 +23,7 @@ License: LGPL-2.0 or BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://www.iodbc.org/ -Source: libiodbc-%{version}.tar.bz2 +Source: libiodbc-%{version}.tar.gz Patch1: fix-nonvoid-return.diff Patch2: config-h.diff %if 0%{?suse_version} > 1110 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-fcoe-client for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2013-06-28 12:01:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fcoe-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2013-02-28 10:24:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2013-06-28 12:01:12.000000000 +0200 @@ -2 +2 @@ -Wed May 16 14:47:54 CEST 2012 - gs(a)suse.de +Thu Jun 20 10:14:38 CEST 2013 - gs(a)suse.de @@ -4 +4,11 @@ -- Add 'Retry' button, internal code cleanup +- Allow several VLAN interfaces per network device, including + special handling of VLAN id 0 (see bnc #813621) +- V 2.23.0 + +------------------------------------------------------------------- +Wed May 15 14:09:09 CEST 2013 - gs(a)suse.de + +- Detect FCoE capable interfaces correctly (bnc #813621) +- Write configuration files for VLAN id 0 (bnc #812602) +- Show MAC address (bnc #812601) +- V 2.22.4 Old: ---- yast2-fcoe-client-2.22.3.tar.bz2 New: ---- yast2-fcoe-client-2.23.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.CJi7Mp/_old 2013-06-28 12:01:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJi7Mp/_new 2013-06-28 12:01:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 2.22.3 +Version: 2.23.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-fcoe-client-2.22.3.tar.bz2 -> yast2-fcoe-client-2.23.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/Makefile.am new/yast2-fcoe-client-2.23.0/Makefile.am --- old/yast2-fcoe-client-2.22.3/Makefile.am 2013-02-22 10:51:00.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/Makefile.am 2013-06-24 16:10:13.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/Makefile.am.common new/yast2-fcoe-client-2.23.0/Makefile.am.common --- old/yast2-fcoe-client-2.22.3/Makefile.am.common 2013-02-22 10:51:00.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/Makefile.am.common 2013-06-24 16:10:13.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/Makefile.in new/yast2-fcoe-client-2.23.0/Makefile.in --- old/yast2-fcoe-client-2.22.3/Makefile.in 2013-02-22 10:51:06.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/Makefile.in 2013-06-24 16:10:19.000000000 +0200 @@ -980,19 +980,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/VERSION new/yast2-fcoe-client-2.23.0/VERSION --- old/yast2-fcoe-client-2.22.3/VERSION 2013-01-22 11:18:22.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/VERSION 2013-06-20 10:30:51.000000000 +0200 @@ -1 +1 @@ -2.22.3 +2.23.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/configure new/yast2-fcoe-client-2.23.0/configure --- old/yast2-fcoe-client-2.22.3/configure 2013-02-22 10:51:05.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/configure 2013-06-24 16:10:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-fcoe-client 2.22.3. +# Generated by GNU Autoconf 2.69 for yast2-fcoe-client 2.23.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-fcoe-client' PACKAGE_TARNAME='yast2-fcoe-client' -PACKAGE_VERSION='2.22.3' -PACKAGE_STRING='yast2-fcoe-client 2.22.3' +PACKAGE_VERSION='2.23.0' +PACKAGE_STRING='yast2-fcoe-client 2.23.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-fcoe-client 2.22.3 to adapt to many kinds of systems. +\`configure' configures yast2-fcoe-client 2.23.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-fcoe-client 2.22.3:";; + short | recursive ) echo "Configuration of yast2-fcoe-client 2.23.0:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-fcoe-client configure 2.22.3 +yast2-fcoe-client configure 2.23.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-fcoe-client $as_me 2.22.3, which was +It was created by yast2-fcoe-client $as_me 2.23.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-fcoe-client' - VERSION='2.22.3' + VERSION='2.23.0' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.22.3" +VERSION="2.23.0" RPMNAME="yast2-fcoe-client" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-fcoe-client $as_me 2.22.3, which was +This file was extended by yast2-fcoe-client $as_me 2.23.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-fcoe-client config.status 2.22.3 +yast2-fcoe-client config.status 2.23.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/configure.in new/yast2-fcoe-client-2.23.0/configure.in --- old/yast2-fcoe-client-2.22.3/configure.in 2013-02-22 10:51:00.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/configure.in 2013-06-24 16:10:13.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-fcoe-client dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-fcoe-client, 2.22.3, http://bugs.opensuse.org/, yast2-fcoe-client) +AC_INIT(yast2-fcoe-client, 2.23.0, http://bugs.opensuse.org/, yast2-fcoe-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.3" +VERSION="2.23.0" RPMNAME="yast2-fcoe-client" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/src/FcoeClient.ycp new/yast2-fcoe-client-2.23.0/src/FcoeClient.ycp --- old/yast2-fcoe-client-2.22.3/src/FcoeClient.ycp 2013-01-22 11:18:22.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/src/FcoeClient.ycp 2013-06-20 10:10:51.000000000 +0200 @@ -81,6 +81,26 @@ boolean write_only = false; /** + */ +boolean test_mode = false; + +/** + * Constructor + */ +global void FcoeClient() +{ + if ( getenv("FCOE_CLIENT_TEST_MODE") == "1" ) + { + y2milestone( "Running in test mode" ); + test_mode = true; + } + else + { + test_mode = false; + } +} + +/** * Abort function * return boolean return true if abort */ @@ -131,6 +151,14 @@ } /** + * @return true if test mode is set (environment variable FCOE_CLIENT_TEST_MODE) + */ +global boolean TestMode() +{ + return test_mode; +} + +/** * Set write_only flag (for autoinstallation). */ global void SetWriteOnly(boolean value) { @@ -229,7 +257,9 @@ // map containing information about networks cards and VLAN, FCoE and DCB status list <map> network_interfaces = []; -// Returns the map containing all detected interfaces including +// Returns the map containing all detected interfaces (possibly including +// several entries for a network interface if several VLAN interfaces are +// detected) global list <map> GetNetworkCards() { return network_interfaces; @@ -299,12 +329,12 @@ //eth0 | 200 | 00:0d:ec:a2:ef:00 //eth3 | 200 | 00:0d:ec:a2:ef:01 // -global map GetVlanInterfaces( list net_devices ) +global map<string, list> GetVlanInterfaces( list net_devices ) { // Add option -u (or --link_up): don't shut down interfaces // to be able to detect DCB state afterwards (see bnc #737683) string vlan_cmd = "LANG=POSIX fipvlan -u"; - map vlan_info = $[]; + map<string, list> vlan_info = $[]; if ( !Mode::autoinst() ) vlan_cmd = vlan_cmd + " -l " + FcoeClient::number_of_retries; // reduce number of retries @@ -317,21 +347,60 @@ y2milestone( "Executing command: %1", vlan_cmd ); map output = (map)SCR::Execute( .target.bash_output, vlan_cmd ); y2milestone( "Output: %1", output ); - - list <string> lines = splitstring( output["stdout"]:"", "\n" ); + + list <string> lines = []; + if ( !TestMode() ) + { + lines = splitstring( output["stdout"]:"", "\n" ); + } + else // test data + { + lines = splitstring("Fibre Channel Forwarders +< Discovered\ninterface | VLAN | FCF MAC +< \n------------------------------------------\neth1 | 500 |54:7f:ee:09:55:9f\neth15 | 2012 |54:7f:ee:04:55:9f\neth15 | 0 | 54:7f:ee:04:55:9f\neth15 | 200 | 54:7f:ee:04:55:9f\neth1 | 301 |54:7f:ee:06:55:9f\neth1 | 400 |54:7f:ee:07:55:9f\n\n", "\n"); + } foreach ( string dev, (list<string>)net_devices, { foreach( string line, (list<string>)lines, { - // check whether there is a line for the given interface, e.g. + // Check whether there is a line for the given interface, e.g. // eth3 | 200 | 00:0d:ec:a2:ef:00\n - // and extract name/number of VLAN channel. - if ( String::StartsWith( line, dev ) ) + // Get VLAN channel from second column and FCF MAC from third. + line = deletechars( line, " \t" ); + list<string> columns = splitstring( line, "|" ); + if ( columns[0]:"" == dev ) { - line = deletechars( line, " \t" ); - string vlan_interface = substring( line, findfirstof( line, "|" )+1, - findlastof( line, "|" )-findfirstof( line, "|")-1 ); - y2milestone( "Interface: %1 VLAN: %2", dev, vlan_interface ); - vlan_info = add( vlan_info, dev, vlan_interface ); + // get VLAN and FCF MAC and add it to vlan_info + map<string, string> vlan_interface = $["vlan":columns[1]:""]; + vlan_interface = add( vlan_interface, "fcf", columns[2]:""); + y2milestone( "Interface: %1 VLAN: %2 FCF: %3", dev, columns[1]:"", columns[2]:"" ); + + if ( vlan_info[dev]:[] == [] ) + { + vlan_info = add( vlan_info, dev, [vlan_interface] ); + } + else + { + list<map> vlans = (list<map>)vlan_info[dev]:[]; + + // add vlan_interface only if no entry with identical FCF MAC exists + if ( find ( map vlan, vlans, ``(vlan["fcf"]:"" == vlan_interface["fcf"]:"")) == nil ) + { + vlans = add( vlans, vlan_interface ); + } + else if ( vlan_interface["vlan"]:"" == "0" ) // for VLAN = 0 replace existing entry + { + // VLAN = 0 'wins' (see bnc #813621, comment #4) + vlans = maplist ( map vlan, vlans, { + if ( vlan["fcf"]:"" == vlan_interface["fcf"]:"" ) + { + y2milestone("VLAN = 0 is taken"); + vlan["vlan"] = "0"; + } + return vlan; + }); + } + vlan_info[dev] = vlans; + } } } ); } ); @@ -357,6 +426,9 @@ { string vlan_device_name = ""; + if ( TestMode() && interface != "eth15" ) + return interface + "." + vlan_interface; + string command = sformat( "sed -n 's/\$[^ ]*\$ *.*%1*.*%2/\\1/p' /proc/net/vlan/config", vlan_interface, interface ); y2milestone( "Executing command: %1", command ); @@ -370,6 +442,10 @@ { y2milestone( "Returning: %1", vlan_device_name ); } + else + { + y2error( "FCoE VLAN not found in /proc/net/vlan/config" ); + } return vlan_device_name; } @@ -380,17 +456,20 @@ global map<string, string> CreateFcoeConfig( string vlan_device_name, map netcard ) { string file_name = ""; + string device_name = ""; boolean file_exists = false; map <string, string> status_map = $[]; - // if AUTO_VLAN is set to "yes" - if ( netcard["auto_vlan"]:"no" == "yes" ) + // if AUTO_VLAN is set to "yes" or VLAN is set to "0" (means no VLAN created but FCoE started on device) + if ( netcard["auto_vlan"]:"no" == "yes" || netcard["vlan_interface"]:"" == "0" ) { + device_name = netcard["dev_name"]:""; // set file name to cfg-<interface>, e.g. /etc/fcoe/cfg-eth3 - file_name = sformat( "/etc/fcoe/cfg-%1", netcard["dev_name"]:"" ); + file_name = sformat( "/etc/fcoe/cfg-%1", device_name ); } else { + device_name = vlan_device_name; // set file name to cfg-<vlan_device_name>, e.g. /etc/fcoe/cfg-eth3.200 file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); } @@ -434,7 +513,7 @@ status_map = add( status_map, "FCOE_ENABLE", netcard["fcoe_enable"]:"yes"); status_map = add( status_map, "DCB_REQUIRED", netcard["dcb_required"]:"no"); status_map = add( status_map, "AUTO_VLAN", netcard["auto_vlan"]:"no"); - status_map = add( status_map, "cfg_device", file_name ); + status_map = add( status_map, "cfg_device", device_name ); } else { @@ -466,7 +545,7 @@ return $[]; } - y2milestone( "VLAN channel %1 found", vlan_device_name ); + y2milestone( "Checking configuration for %1", vlan_device_name ); file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); @@ -476,10 +555,7 @@ if ( !FileUtils::Exists( file_name ) ) { - y2warning( "Cannot read config file for %1 in /etc/fcoe", vlan_device_name ); - Report::Warning( sformat(_("Cannot read config file for %1. -You may edit the settings and recreate the FCoE -VLAN interface to get a valid configuration."), vlan_device_name) ); + // no config file found - return empty status map return status_map; } device = device_name; @@ -663,16 +739,46 @@ } // -// dev_name device fcoe_vlan fcoe_enable dcb_required auto_vlan dcb_capable vlan_interface cfg_file -// eth3 Ethernet card ... eth3.200 yes/no yes/no yes/no yes/no 200 eth3.200 +// Check whether there are configured FCoE VLANs for the given network interface +// Return list of configured VLANs +// +global list IsConfigured( string device_name ) +{ + list configured_vlans = []; + list<map> interfaces = GetNetworkCards(); + + foreach ( map interface, interfaces, { + if ( device_name == interface["dev_name"]:"" && + interface["fcoe_vlan"]:"" != NOT_CONFIGURED && + interface["fcoe_vlan"]:"" != NOT_AVAILABLE ) + { + configured_vlans = add( configured_vlans, interface["vlan_interface"]:"" ); + } + } ); + return configured_vlans; +} + +// list <map> network_interfaces +// +// dev_name mac_addr device vlan_interface fcoe_vlan fcoe_enable dcb_required auto_vlan dcb_capable cfg_device +// eth3 08:00:... Gigabit... 200 eth3.200 yes/no yes/no yes/no yes/no eth3.200 // // Detect network interface cards (hardware probe) and get status // global boolean DetectNetworkCards() { - list <map> netcards = (list<map>)SCR::Read(.probe.netcard); - y2milestone( "Detected netcards: %1", netcards ); + list <map> netcards = []; + if ( !TestMode() ) + { + netcards = (list<map>)SCR::Read(.probe.netcard); + } + else // test data + { + netcards = [ $["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth1", "dev_names":["eth1"], "device":"TEST Ethernet Controller", "model":"Intel PRO/1000 MT Desktop Adapter","resource":$["hwaddr":[$["addr":"08:00:27:11:64:e4"]]] ], $["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth15", "dev_names":["eth15"], "device":"TEST Gigabit Ethernet Controller", "model":"Intel PRO/1000 MT Desktop Adapter", "resource":$["hwaddr":[$["addr":"08:23:27:11:64:78"]]]] ]; + } + y2milestone( "Detected netcards: %1", netcards ); + if ( netcards == [] || netcards == nil ) return false; @@ -684,78 +790,141 @@ // The 'fipvlan' command which is called in GetVlanInterfaces configures the interfaces itself, // therefore it's not needed any longer to call 'ifconfig <if> up' here. - map vlan_info = GetVlanInterfaces( net_devices ); + map <string, list> vlan_info = GetVlanInterfaces( net_devices ); foreach ( map card, netcards, { map info_map = $[]; - map <string, string> status_map = $[]; string fcoe_vlan_interface = ""; - string dcb_capable = ""; - string dcb_default = ""; - - if ( vlan_info[card["dev_name"]:""]:"" == "" ) + string dcb_capable = ""; + + if ( vlan_info[card["dev_name"]:""]:[] == [] ) { // Interface down or FCoE not enabled on the switch - we can't do anything here. fcoe_vlan_interface = NOT_AVAILABLE; - } - else - { - fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_info[card["dev_name"]:""]:"" ); - if ( fcoe_vlan_interface != "" ) - { - status_map = GetFcoeStatus( fcoe_vlan_interface, card["dev_name"]:"" ); - if ( status_map == $[] ) - { - // the interface isn't configured correctly - fcoe_vlan_interface = NOT_CONFIGURED; - } - } - else - { - // FCoE VLAN interface not yet configured (status_map remains empty) - fcoe_vlan_interface = NOT_CONFIGURED; - } - } - dcb_capable = DCBCapable( card["dev_name"]:"" ); + // add infos about the card + dcb_capable = DCBCapable( card["dev_name"]:"" ); + info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable + info_map = add( info_map, "dev_name", card["dev_name"]:""); // network card, e.g. eth3 + info_map = add( info_map, "mac_addr", card["resource", "hwaddr", 0, "addr"]:"" ); // MAC address + if ( card["device"]:"" != "" ) + { + info_map = add( info_map, "device", card["device"]:""); // device name + } + else + { + info_map = add( info_map, "device", card["model"]:""); // model + } + info_map = add( info_map, "fcoe_vlan", fcoe_vlan_interface ); // FCoE VLAN interface, e.g. eth3.200 - info_map = add( info_map, "dev_name", card["dev_name"]:""); // network card, e.g. eth3 - if ( card["device"]:"" != "" ) - { - info_map = add( info_map, "device", card["device"]:""); // device name + network_interfaces = add( network_interfaces, info_map ); } else { - info_map = add( info_map, "device", card["model"]:""); // model - } + // add infos about card and VLAN interfaces + list vlans = vlan_info[card["dev_name"]:""]:[]; + foreach ( map vlan, (list<map>) vlans, { + map <string, string> status_map = $[]; + map info_map = $[]; + string fcoe_vlan_interface = ""; + string dcb_capable = ""; + string dcb_default = ""; + + if ( vlan["vlan"]:"" == "0" ) + { + // for VLAN interface "0" means start FCoE on network interface (without creating a VLAN + // i.e. there isn't an entry in /proc/net/vlan/config) + fcoe_vlan_interface = card["dev_name"]:""; + } + else // get FCoE VLAN interface from /proc/net/vlan/config + { + fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan["vlan"]:"" ); + } + if ( fcoe_vlan_interface != "" ) + { + status_map = GetFcoeStatus( fcoe_vlan_interface, card["dev_name"]:"" ); + if ( status_map == $[] ) + { + // if a 'fcoe_vlan_interface' is created for a 'vlan' != 0 there should be + // a valid configuration available + if ( vlan["vlan"]:"" != "0" ) + { + y2warning( "Cannot read config file for %1 in /etc/fcoe", fcoe_vlan_interface ); + Report::Warning( sformat(_("Cannot read config file for %1. +You may edit the settings and recreate the FCoE +VLAN interface to get a valid configuration."), fcoe_vlan_interface) ); + } + else // for vlan == 0 it means FCoE is not (yet) started + { + y2milestone( "FCoE not configured" ); + } + // the interface isn't configured + fcoe_vlan_interface = NOT_CONFIGURED; + } + else // add additionally check for VLAN = 0 + { + // is FCoE really configured on interface itself or configured for a VLAN interface? + if ( vlan["vlan"]:"" == "0" ) + { + foreach ( string vlan_cfg_name, (list<string>) vlans, { + // no ifcfg-<if>.<vlan> written for vlan = 0 (see WriteSysconfigFiles() ) + if ( FileUtils::Exists( sformat( "/etc/sysconfig/network/ifcfg-%1.%2", + card["dev_name"]:"", vlan_cfg_name ) ) ) + { + fcoe_vlan_interface = NOT_CONFIGURED; + status_map = $[]; + } + }); + } + } + } + else + { + // FCoE VLAN interface not yet configured (status_map remains empty) + fcoe_vlan_interface = NOT_CONFIGURED; + } + dcb_capable = DCBCapable( card["dev_name"]:"" ); + + info_map = add( info_map, "dev_name", card["dev_name"]:""); // network card, e.g. eth3 + info_map = add( info_map, "mac_addr", card["resource", "hwaddr", 0, "addr"]:"" ); // MAC address + + if ( card["device"]:"" != "" ) + { + info_map = add( info_map, "device", card["device"]:""); // device name + } + else + { + info_map = add( info_map, "device", card["model"]:""); // model + } - info_map = add( info_map, "fcoe_vlan", fcoe_vlan_interface ); // FCoE VLAN interface, e.g. eth3.200 - - if ( fcoe_vlan_interface != NOT_AVAILABLE ) - { - // default for FCoE enable is yes - info_map = add( info_map, "fcoe_enable", status_map["FCOE_ENABLE"]:"yes" ); // FCOE_ENABLE + info_map = add( info_map, "fcoe_vlan", fcoe_vlan_interface ); // FCoE VLAN interface, e.g. eth3.200 - // exception for Broadcom cards: DCB_REQUIRED should be set to "no" (bnc #728658) - if ( (card["driver"]:"" != "bnx2x") && (dcb_capable == "yes") ) - { - dcb_default = "yes"; - } - else - { - dcb_default = "no"; - } - info_map = add( info_map, "dcb_required", status_map["DCB_REQUIRED"]:dcb_default ); + // default for FCoE enable is yes + info_map = add( info_map, "fcoe_enable", status_map["FCOE_ENABLE"]:"yes" ); // FCOE_ENABLE - // default is AUTO_VLAN="yes", create /etc/fcoe/cfg-ethx file without VLAN device in name - // (e.g. /etc/fcoe/cfg-eth3), see bnc #724563 - info_map = add( info_map, "auto_vlan", status_map["AUTO_VLAN"]:"yes"); // AUTO_VLAN - } - info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable - info_map = add( info_map, "vlan_interface", vlan_info[card["dev_name"]:""]:"" ); // VLAN interface, e.g. 200 - info_map = add( info_map, "cfg_file", status_map["cfg_device"]:"" ); // part of cfg-file name, e.g. eth3.200 + // exception for Broadcom cards: DCB_REQUIRED should be set to "no" (bnc #728658) + if ( (card["driver"]:"" != "bnx2x") && (dcb_capable == "yes") ) + { + dcb_default = "yes"; + } + else + { + dcb_default = "no"; + } + info_map = add( info_map, "dcb_required", status_map["DCB_REQUIRED"]:dcb_default ); + + // default is AUTO_VLAN="yes", create /etc/fcoe/cfg-ethx file without VLAN device in name + // (e.g. /etc/fcoe/cfg-eth3), see bnc #724563 + info_map = add( info_map, "auto_vlan", status_map["AUTO_VLAN"]:"yes"); // AUTO_VLAN + + info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable + info_map = add( info_map, "vlan_interface", vlan["vlan"]:"" ); // VLAN interface, e.g. 200 + info_map = add( info_map, "cfg_device", status_map["cfg_device"]:"" ); // part of cfg-file name, e.g. eth3.200 + network_interfaces = add( network_interfaces, info_map ); + + }); + } //else - network_interfaces = add( network_interfaces, info_map ); } ); // sort the list of interfaces (eth0, eth1, eth2...) @@ -820,13 +989,17 @@ if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { - y2milestone( "Writing /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); - // write /etc/sysconfig/network/ifcfg-<fcoe-vlan-interface>, e.g. ifcfg-eth3.200 - SCR::Write(.network.value + card["fcoe_vlan"]:"" + "BOOTPROTO", "static" ); - SCR::Write(.network.value + card["fcoe_vlan"]:"" + "STARTMODE", "nfsroot" ); - SCR::Write(.network.value + card["fcoe_vlan"]:"" + "ETHERDEVICE", card["dev_name"]:"" ); - SCR::Write(.network.value + card["fcoe_vlan"]:"" + "USERCONTROL", "no" ); - + // write ifcfg-<if>.>VLAN> only if VLAN was created (not for VLAN = 0 which means + // FCoE is started on the network interface itself) + if ( card["vlan_interface"]:"" != "0" ) + { + y2milestone( "Writing /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); + // write /etc/sysconfig/network/ifcfg-<fcoe-vlan-interface>, e.g. ifcfg-eth3.200 + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "BOOTPROTO", "static" ); + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "STARTMODE", "nfsroot" ); + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "ETHERDEVICE", card["dev_name"]:"" ); + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "USERCONTROL", "no" ); + } string ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", card["dev_name"]:"" ); y2milestone( "Writing %1", ifcfg_file ); @@ -869,18 +1042,18 @@ string command = ""; map output = $[]; - y2milestone( "Writing /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); - success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "FCOE_ENABLE", card[ "fcoe_enable"]:"no" ); + y2milestone( "Writing /etc/fcoe/cfg-%1", card["cfg_device"]:"" ); + success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_device"]:"" + "FCOE_ENABLE", card[ "fcoe_enable"]:"no" ); if ( !success ) { y2error( "Writing FCOE_ENABLE=%1 failed", card[ "fcoe_enable"]:"no" ); } - success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "DCB_REQUIRED", card["dcb_required"]:"no" ); + success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_device"]:"" + "DCB_REQUIRED", card["dcb_required"]:"no" ); if ( !success ) { y2error( "Writing DCB_REQUIRED=%1 failed", card["dcb_required"]:"no" ); } - success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "AUTO_VLAN", card["auto_vlan"]:"no" ); + success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_device"]:"" + "AUTO_VLAN", card["auto_vlan"]:"no" ); if ( !success ) { y2error( "Writing AUTO_VLAN=%1 failed", card["auto_vlan"]:"no" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/src/Makefile.in new/yast2-fcoe-client-2.23.0/src/Makefile.in --- old/yast2-fcoe-client-2.22.3/src/Makefile.in 2013-02-22 10:51:06.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/src/Makefile.in 2013-06-24 16:10:19.000000000 +0200 @@ -582,7 +582,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/src/complex.ycp new/yast2-fcoe-client-2.23.0/src/complex.ycp --- old/yast2-fcoe-client-2.22.3/src/complex.ycp 2013-01-22 11:18:22.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/src/complex.ycp 2013-06-20 10:10:51.000000000 +0200 @@ -190,8 +190,9 @@ foreach ( map card, (list<map>)netcards, { table_items = add( table_items, - `item(`id(row), card["dev_name"]:"", card["device"]:"", card["fcoe_vlan"]:"", - card["fcoe_enable"]:"", card["dcb_required"]:"", card["auto_vlan"]:"", card["dcb_capable"]:"" ) + `item(`id(row), card["dev_name"]:"", card["mac_addr"]:"", card["device"]:"", + card["vlan_interface"]:"", card["fcoe_vlan"]:"", card["fcoe_enable"]:"", + card["dcb_required"]:"", card["auto_vlan"]:"", card["dcb_capable"]:"" ) ); row = row + 1; }); @@ -255,7 +256,8 @@ UI::ChangeWidget( `id(`auto), `Enabled, false ); } // headline of the edit dialog - configuration of values for a certain network interface - UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of Interface %1"), card["fcoe_vlan"]:"" ) ); + UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of VLAN interface %1 on %2"), + card["vlan_interface"]:"", card["dev_name"]:"" ) ); } /** @@ -300,7 +302,35 @@ // Starting FCoE on interface eth3.200 map card = FcoeClient::GetCurrentNetworkCard(); + y2milestone( "Selected card: %1", card ); string dev_name = card["dev_name"]:""; + + list configured_vlans = FcoeClient::IsConfigured( dev_name ); + + if ( configured_vlans != [] ) + { + y2milestone( "Configured VLANs on %1: %2", dev_name, configured_vlans ); + + if ( contains( configured_vlans, "0" ) ) + { + // text of an error popup + Popup::Error( sformat( _("Cannot start FCoE on VLAN interface %1 +because FCoE is already configured on +network interface %2 itself."), card["vlan_interface"]:"", dev_name ) ); + return nil; + } + if ( card["vlan_interface"]:"" == "0" ) + { + // text of an error popup + Popup::Error( sformat( _("Cannot start FCoE on network interface %1 itself +because FCoE is already configured on +VLAN interface(s) %2."), dev_name, configured_vlans ) ); + return nil; + } + Popup::Warning( sformat( "FCoE VLAN interface(s) %1 already configured on %2.", + configured_vlans, dev_name ) ); + } + string command = sformat( "fipvlan -c -s %1", dev_name ); map output = $[]; @@ -313,8 +343,8 @@ boolean ret = Popup::YesNoHeadline( _("Creating and Starting FCoE on Detected VLAN Device"), // question to the user: really create and start FCoE sformat( _("Do you really want to create a FCoE network -interface for discovered FCoE VLAN interface -on %1 and start the FCoE initiator?"), dev_name ) ); +interface for discovered VLAN interface %1 +on %2 and start the FCoE initiator?"), card["vlan_interface"]:"", dev_name ) ); if ( ret == true ) { if ( Stage::initial() ) // first stage of installation - create and start FCoE VLAN interface @@ -355,9 +385,17 @@ y2milestone( "Output: %1", output ); if ( output["exit"]:255 != 0 ) { - // text of an error popup: command failed on the network interface - Popup::Error( sformat( _("Command \"%1\" on %2 failed."), command, dev_name ) ); - return nil; + if ( !FcoeClient::TestMode() ) + { + // text of an error popup: command failed on the network interface + Popup::Error( sformat( _("Command \"%1\" on %2 failed."), command, dev_name ) ); + return nil; + } + else + { + Popup::Warning( _("Creating FCoE interface failed. +Continue because running in test mode") ); + } } } } @@ -366,20 +404,30 @@ y2milestone( "Starting FCoE canceled" ); return nil; } - + // Get values and exchange list (table) entries - fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", card["vlan_interface"]:"" ); + + if ( card["vlan_interface"]:"" == "0" ) + { + // for VLAN interface "0" there isn't an entry in /proc/net/vlan/config + fcoe_vlan_interface = card["dev_name"]:"" ; + } + else // get interface from /proc/net/vlan/config + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", card["vlan_interface"]:"" ); + } if ( fcoe_vlan_interface != "" ) { - y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); // write config for FCoE VLAN interface status_map = FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); - + y2milestone("GOT status map: %1", status_map ); + // command to be able to revert the creation of FCoE VLAN interface in case of 'Cancel' // FcoeClient::AddRevertCommand( sformat("fcoeadm -d %1 && vconfig rem %2", status_map["cfg_device"]:"", fcoe_vlan_interface ) ); // 'fcoeadm -d <if>/<if>.<vlan>' fails here, 'vconfig rem <if>.<vlan>' succeeds - // and removes the interface properly (tested on RC1) + // and removes the interface properly (tested on SP2 RC1) + // TODO: Retest for SLES12 FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); } else @@ -392,17 +440,17 @@ card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; card["dcb_required"] = status_map["DCB_REQUIRED"]:""; card["auto_vlan"] = status_map["AUTO_VLAN"]:""; - card["cfg_file"] = status_map["cfg_device"]:""; + card["cfg_device"] = status_map["cfg_device"]:""; FcoeClient::SetModified( true ); FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); // replace values in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), status_map["FCOE_ENABLE"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["DCB_REQUIRED"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["AUTO_VLAN"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), fcoe_vlan_interface ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["FCOE_ENABLE"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 6), status_map["DCB_REQUIRED"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 7), status_map["AUTO_VLAN"]:"" ); AdjustButtons(); } else if ( action == `remove ) @@ -439,46 +487,78 @@ y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); // call fcoeadm -d <fcoe_vlan> first (bnc #719443) - command = sformat( "fcoeadm -d %1", card["cfg_file"]:"") ; + command = sformat( "fcoeadm -d %1", card["cfg_device"]:"") ; y2milestone( "Calling %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); - if ( output["exit"]:255 == 0 ) + if ( output["exit"]:255 == 0 || FcoeClient::TestMode() ) { command = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; y2milestone( "Calling %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); - if ( output["exit"]:255 == 0 ) + if ( output["exit"]:255 == 0 || FcoeClient::TestMode() ) { - command = sformat( "rm /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); - y2milestone( "Calling %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); - command = sformat( "rm /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); - y2milestone( "Calling %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); - + boolean del_cfg = true; + // check whether /etc/fcoe/cfg-file is also used for another VLAN interface. + // Example: eth1 have FCoE configured on VLAN 200 and 300 with AUTO_VLAN="yes" + // -> /etc/fcoe/cfg-eth1 applies to both. + list <map> interfaces = FcoeClient::GetNetworkCards(); + + foreach ( map interface, interfaces, { + if ( interface["dev_name"]:"" == card["dev_name"]:"" && + interface["vlan_interface"]:"" != card["vlan_interface"]:"" && + interface["cfg_device"]:"" == card["cfg_device"]:"" ) + { + y2milestone( sformat( "/etc/fcoe/cfg-%1 also used for VLAN %2", + card["cfg_device"]:"", interface["vlan_interface"]:"" ) ); + del_cfg = false; + } + }); + + if ( del_cfg ) + { + command = sformat( "rm /etc/fcoe/cfg-%1", card["cfg_device"]:"" ); + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + } + else + { + y2milestone( sformat( "/etc/fcoe/cfg-%1 not deleted", card["cfg_device"]:"" ) ); + } + + if ( card["vlan_interface"]:"" != "0" ) + { + command = sformat( "rm /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + } + else + { + y2milestone( sformat( "/etc/sysconfig/network/ifcfg-%1 not deleted", + card["fcoe_vlan"]:"" ) ); + } // set new values in global map network_interfaces card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; card["fcoe_enable"] = "yes"; // exception for Broadcom cards: DCB_REQUIRED should be set to "no" (bnc #728658) card["dcb_required"] = ((card["driver"]:"" != "bnx2x") && (card["dcb_capable"]:""=="yes"))?"yes":"no"; card["auto_vlan"] = "yes"; // default is "yes" (bnc #724563) - card["cfg_file"] = ""; + card["cfg_device"] = ""; FcoeClient::SetModified( true ); FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); // replace values in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), card["auto_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4 ), card["fcoe_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5 ), card["fcoe_enable"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 6 ), card["dcb_required"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 7 ), card["auto_vlan"]:"" ); AdjustButtons(); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/src/dialogs.ycp new/yast2-fcoe-client-2.23.0/src/dialogs.ycp --- old/yast2-fcoe-client-2.22.3/src/dialogs.ycp 2013-01-22 11:18:22.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/src/dialogs.ycp 2013-06-20 10:10:51.000000000 +0200 @@ -67,9 +67,10 @@ { return `VBox( `VStretch(), + `VSpacing(1), // heading is replaced later (InitEditDialog) `Label( `id(`heading), ("Configuration of Interface .......................") ), - `VSpacing(2), + `VSpacing(1), `HBox ( `HStretch(), `Frame( (""), @@ -134,7 +135,7 @@ `VBox( `Table(`id(`interfaces), `opt(`notify, `immediate, `keepSorting ), // column headers of a table with network interfaces (keep them short) - `header(_("Device Name"), _("Model"), _("FCoE VLAN Interface"), + `header(_("Device"), _("MAC Address"), _("Model"), _("VLAN"), _("FCoE VLAN Interface"), // continue column headers _("FCoE Enable"), _("DCB Required"), _("AUTO VLAN"), _("DCB capable") ), [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-2.22.3/src/fcoe-client_auto.ycp new/yast2-fcoe-client-2.23.0/src/fcoe-client_auto.ycp --- old/yast2-fcoe-client-2.22.3/src/fcoe-client_auto.ycp 2013-01-22 11:18:22.000000000 +0100 +++ new/yast2-fcoe-client-2.23.0/src/fcoe-client_auto.ycp 2013-06-12 12:30:51.000000000 +0200 @@ -189,17 +189,24 @@ } else // get FCoE VLAN interface { - fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", - card["vlan_interface"]:"" ); + if ( card["vlan_interface"]:"" == "0" ) + { + // VLAN interface "0" means start FCoE on network interface + fcoe_vlan_interface = card["dev_name"]:""; + } + else + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", + card["vlan_interface"]:"" ); + } if ( fcoe_vlan_interface != "" ) { y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); // create /etc/fcoe/ethx file and get values - FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); - status_map = FcoeClient::GetFcoeStatus( fcoe_vlan_interface, card["dev_name"]:"" ); + status_map = FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); // apply modified data detected_netcards[ index, "fcoe_vlan"] = fcoe_vlan_interface; - detected_netcards[ index, "cfg_file"] = status_map["cfg_device"]:""; + detected_netcards[ index, "cfg_device"] = status_map["cfg_device"]:""; detected_netcards[ index, "fcoe_enable"] = status_map["FCOE_ENABLE"]:""; detected_netcards[ index, "dcb_required"] = status_map["DCB_REQUIRED"]:""; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vlc for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2013-06-28 12:00:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2013-06-21 18:55:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2013-06-28 12:00:54.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 11 22:01:52 UTC 2013 - dvaleev(a)suse.com + +- Enable SSE for x86 only + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.crv9z5/_old 2013-06-28 12:00:55.000000000 +0200 +++ /var/tmp/diff_new_pack.crv9z5/_new 2013-06-28 12:00:55.000000000 +0200 @@ -257,8 +257,14 @@ %build echo '********* BOOTSTRAPPING *********' date +%ifarch %{ix86} x86_64 export CFLAGS="%{optflags} -L%{_libdir}/live -msse" export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse" +%else +export CFLAGS="%{optflags} -L%{_libdir}/live" +export CXXFLAGS="%{optflags} -L%{_libdir}/live" +%endif + #./bootstrap %configure \ --disable-dependency-tracking \ @@ -424,7 +430,9 @@ %dir %{_libdir}/vlc/lua/playlist %dir %{_libdir}/vlc/lua/sd %dir %{_libdir}/vlc/plugins +%ifarch %{ix86} x86_64 %dir %{_libdir}/vlc/plugins/3dnow +%endif %dir %{_libdir}/vlc/plugins/access %dir %{_libdir}/vlc/plugins/access_output %dir %{_libdir}/vlc/plugins/audio_filter @@ -437,13 +445,17 @@ %dir %{_libdir}/vlc/plugins/lua %dir %{_libdir}/vlc/plugins/meta_engine %dir %{_libdir}/vlc/plugins/misc +%ifarch %{ix86} x86_64 %dir %{_libdir}/vlc/plugins/mmx %dir %{_libdir}/vlc/plugins/mmxext +%endif %dir %{_libdir}/vlc/plugins/mux %dir %{_libdir}/vlc/plugins/notify %dir %{_libdir}/vlc/plugins/packetizer %dir %{_libdir}/vlc/plugins/services_discovery +%ifarch %{ix86} x86_64 %dir %{_libdir}/vlc/plugins/sse2 +%endif %dir %{_libdir}/vlc/plugins/stream_filter %dir %{_libdir}/vlc/plugins/stream_out %dir %{_libdir}/vlc/plugins/text_renderer @@ -504,7 +516,9 @@ %{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/jamendo.luac %{_libdir}/vlc/lua/sd/metachannels.luac +%ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/3dnow/libmemcpy3dn_plugin.so +%endif %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so %{_libdir}/vlc/plugins/access/libaccess_attachment_plugin.so %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so @@ -679,11 +693,13 @@ %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so %{_libdir}/vlc/plugins/misc/libxml_plugin.so %{_libdir}/vlc/plugins/misc/libxscreensaver_plugin.so +%ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so %{_libdir}/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so %{_libdir}/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so %{_libdir}/vlc/plugins/mmx/libmemcpymmx_plugin.so %{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so +%endif %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so %{_libdir}/vlc/plugins/mux/libmux_dummy_plugin.so @@ -712,9 +728,11 @@ %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so +%ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/sse2/libi420_rgb_sse2_plugin.so %{_libdir}/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.so %{_libdir}/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so +%endif %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so %{_libdir}/vlc/plugins/stream_filter/libstream_filter_dash_plugin.so %{_libdir}/vlc/plugins/stream_filter/libstream_filter_httplive_plugin.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tesseract for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package tesseract for openSUSE:Factory checked in at 2013-06-28 12:00:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tesseract (Old) and /work/SRC/openSUSE:Factory/.tesseract.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tesseract" Changes: -------- --- /work/SRC/openSUSE:Factory/tesseract/tesseract.changes 2013-05-07 16:02:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tesseract.new/tesseract.changes 2013-06-28 12:00:41.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Jun 22 20:00:58 UTC 2013 - asterios.dramis(a)gmail.com + +- Split library into separate package (libtesseract3). +- Removed debuginfo package (not needed). +- There is no need anymore to regenerate the build system (removed automake and + libtool build requirements). +- Added pkg-config build requirement (fix for rpmlint error + "no-pkg-config-provides"). Removed also not needed + "Provides: pkgconfig(%{name})" entry. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tesseract.spec ++++++ --- /var/tmp/diff_new_pack.9xBOGU/_old 2013-06-28 12:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.9xBOGU/_new 2013-06-28 12:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tesseract # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,25 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: tesseract + %define tarname tesseract-ocr +%define so_ver 3 + +Name: tesseract Version: 3.02.02 Release: 0 -License: Apache-2.0 and GPL-2.0+ Summary: Open Source OCR Engine -Url: http://code.google.com/p/tesseract-ocr/ +License: Apache-2.0 and GPL-2.0+ Group: Productivity/Graphics/Other +Url: http://code.google.com/p/tesseract-ocr/ Source0: http://tesseract-ocr.googlecode.com/files/%{tarname}-%{version}.tar.gz Source1: http://tesseract-ocr.googlecode.com/files/%{tarname}-%{version}-doc-html.ta… -BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: liblept-devel -BuildRequires: libtool +BuildRequires: pkg-config Recommends: tesseract-traineddata-american Provides: %{tarname} = %{version} -Provides: pkgconfig(%{name}) -BuildRoot: %{_tmppath}/%{tarname}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A commercial quality OCR engine originally developed at HP between 1985 and @@ -43,27 +44,26 @@ %package devel Summary: Tesseract Open Source OCR Engine Development files Group: Development/Libraries/Other -Requires: %{name} = %{version} Requires: liblept-devel +Requires: libtesseract%{so_ver} = %{version} %description devel -Headers and static libraries for the Tesseract Open Source OCR Engine. +This package contains development files for the Tesseract Open Source OCR +Engine. -%package debuginfo -Summary: Tesseract Open Source OCR Engine debugging files -Group: Development/Libraries/Other -Requires: %{name} = %{version} +%package -n libtesseract%{so_ver} +Summary: Open Source OCR Engine +Group: System/Libraries -%description debuginfo -Debugging libs for the Tesseract Open Source OCR Engine. +%description -n libtesseract%{so_ver} +A commercial quality OCR engine originally developed at HP between 1985 and +1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was +open-sourced by HP and UNLV in 2005. From 2007 it is developed by Google. %prep %setup -q -b1 -n %{tarname} -## FIXME: do something with %{SOURCE1} %build -# Regenerate build system because of missing Makefile.in -./autogen.sh export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIC" %configure --disable-static make %{?_smp_mflags} @@ -83,9 +83,9 @@ # Fix rpmlint warning "files-duplicate" %fdupes -s %{buildroot} -%post -p /sbin/ldconfig +%post -n libtesseract%{so_ver} -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libtesseract%{so_ver} -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -94,7 +94,6 @@ %dir %{_datadir}/tessdata %{_datadir}/tessdata/configs/ %{_datadir}/tessdata/tessconfigs/ -%{_libdir}/lib%{name}*.so.* %{_mandir}/man1/*.1%{ext_man} %{_mandir}/man5/*.5%{ext_man} @@ -105,8 +104,8 @@ %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/*.pc -%files debuginfo +%files -n libtesseract%{so_ver} %defattr(-,root,root,-) -/usr/lib/debug/* +%{_libdir}/libtesseract.so.%{so_ver}* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scim-qtimm for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package scim-qtimm for openSUSE:Factory checked in at 2013-06-28 11:58:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-qtimm (Old) and /work/SRC/openSUSE:Factory/.scim-qtimm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-qtimm" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-qtimm/scim-qtimm.changes 2011-09-23 12:45:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-qtimm.new/scim-qtimm.changes 2013-06-28 11:58:05.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 26 20:56:40 UTC 2013 - schwab(a)suse.de + +- Properly detect lib64 architectures + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-qtimm.spec ++++++ --- /var/tmp/diff_new_pack.VQ5tnm/_old 2013-06-28 11:58:05.000000000 +0200 +++ /var/tmp/diff_new_pack.VQ5tnm/_new 2013-06-28 11:58:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package scim-qtimm (Version 0.9.4) +# spec file for package scim-qtimm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %if %suse_version > 1120 %bcond_with skim @@ -24,13 +23,13 @@ %endif Name: scim-qtimm -BuildRequires: gcc-c++ qt3-devel scim-devel +BuildRequires: gcc-c++ +BuildRequires: qt3-devel +BuildRequires: scim-devel %if %{with skim} -BuildRequires: kdelibs3-devel skim +BuildRequires: kdelibs3-devel +BuildRequires: skim %endif -License: GPL-2.0+ -Group: System/I18n/Chinese -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: scim-qtimm-64bit @@ -38,8 +37,10 @@ # Supplements: packageand(scim:qt3) Summary: Qt input module plugin for SCIM +License: GPL-2.0+ +Group: System/I18n/Chinese Version: 0.9.4 -Release: 274 +Release: 0 Url: http://www.scim-im.org/ # CVS repository: # cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim login @@ -91,14 +92,14 @@ export KDEDIR=/opt/kde3 %if %{with skim} ./configure $configkde \ -%ifarch x86_64 ppc64 s309x +%if "%_lib" == "lib64" --enable-libsuffix=64 \ %endif --enable-tests \ --enable-scim-debug %else %configure \ -%ifarch x86_64 ppc64 s309x +%if "%_lib" == "lib64" --enable-libsuffix=64 \ %endif --enable-tests \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-websocket for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package rubygem-websocket for openSUSE:Factory checked in at 2013-06-28 11:55:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-websocket (Old) and /work/SRC/openSUSE:Factory/.rubygem-websocket.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-websocket" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-websocket/rubygem-websocket.changes 2013-03-08 11:20:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-websocket.new/rubygem-websocket.changes 2013-06-28 11:55:26.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jun 18 05:31:16 UTC 2013 - coolo(a)suse.com + +- updated to version 1.1.0 + - allow raising ruby errors instead of setting `error` flag + - allow access to handshake headers + - add from_rack method + - add from_hash method + - stop extending handlers - it should improve performance for opening connection + +------------------------------------------------------------------- Old: ---- websocket-1.0.7.gem New: ---- websocket-1.1.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-websocket.spec ++++++ --- /var/tmp/diff_new_pack.U2Bxvs/_old 2013-06-28 11:55:26.000000000 +0200 +++ /var/tmp/diff_new_pack.U2Bxvs/_new 2013-06-28 11:55:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: rubygem-websocket -Version: 1.0.7 +Version: 1.1.0 Release: 0 %define mod_name websocket %define mod_full_name %{mod_name}-%{version} @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby-macros >= 1 Url: http://github.com/imanel/websocket-ruby -Source: %{mod_full_name}.gem +Source: http://rubygems.org/gems/%{mod_full_name}.gem Summary: Universal Ruby library to handle WebSocket protocol License: MIT Group: Development/Languages/Ruby @@ -59,9 +59,13 @@ %install %gem_install -f +mkdir -p %{buildroot}%{_docdir}/%{name} +ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/CHANGELOG.md %buildroot/%{_docdir}/%{name}/CHANGELOG.md +ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/README.md %buildroot/%{_docdir}/%{name}/README.md %files %defattr(-,root,root,-) +%{_docdir}/%{name} %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ %exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-chef for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package rubygem-chef for openSUSE:Factory checked in at 2013-06-28 11:55:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-chef (Old) and /work/SRC/openSUSE:Factory/.rubygem-chef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-chef" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-chef/rubygem-chef.changes 2013-06-17 10:18:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-chef.new/rubygem-chef.changes 2013-06-28 11:55:17.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 25 14:53:33 UTC 2013 - nkrinner(a)suse.com + +- /etc/chef/chef.rb got dropped and replaced by client.rb +- Fixed bnc#809159 VUL-0: rubygem-chef: disables security checks incorrectly +- Secure default in /etc/chef/client.rb + +------------------------------------------------------------------- New: ---- CHEF-3938-dont-disable-gpg-checks-in-zypper-commands.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-chef.spec ++++++ --- /var/tmp/diff_new_pack.JW14jx/_old 2013-06-28 11:55:18.000000000 +0200 +++ /var/tmp/diff_new_pack.JW14jx/_new 2013-06-28 11:55:18.000000000 +0200 @@ -38,6 +38,8 @@ Source3: chef-client.service # PATCH-FIX-UPSTREAM: fix the group provider in openSUSE 12.3 Patch0: CHEF-4015-group.patch +# PATCH-FIX-UPSTREAM +Patch1: CHEF-3938-dont-disable-gpg-checks-in-zypper-commands.patch Summary: A systems integration framework, built to bring the benefits of License: Apache-2.0 Group: Development/Languages/Ruby @@ -66,6 +68,7 @@ %prep %gem_unpack %patch0 -p1 +%patch1 -p1 %gem_build %build @@ -75,7 +78,7 @@ mkdir -p %{buildroot}/etc/chef mkdir -p %{buildroot}%{_sbindir} -install -m 0640 %{S:1} %{buildroot}/etc/chef/chef.rb +install -m 0640 %{S:1} %{buildroot}/etc/chef/client.rb %if %{with_systemd} mkdir -p %{buildroot}%{_unitdir} cp %{S:3} %{buildroot}%{_unitdir} @@ -129,7 +132,7 @@ %files %defattr(-,root,root,-) -%config(noreplace) %attr(0640, root, chef) /etc/chef/chef.rb +%config(noreplace) %attr(0640, root, chef) /etc/chef/client.rb %{_bindir}/chef-client %{_bindir}/chef-solo %{_bindir}/knife ++++++ CHEF-3938-dont-disable-gpg-checks-in-zypper-commands.patch ++++++ diff --git a/lib/chef/config.rb b/lib/chef/config.rb index ca912b6..eba8972 100644 --- a/lib/chef/config.rb +++ b/lib/chef/config.rb @@ -297,6 +297,12 @@ def self.formatters signing_ca_domain "opensource.opscode.com" signing_ca_email "opensource-cert(a)opscode.com" + # Zypper package provider gpg checks. Set to true to enable package + # gpg signature checking. This will be default in the + # future. Setting to false disables the warnings. + # Leaving this set to nil or false is a security hazard! + zypper_check_gpg nil + # Report Handlers report_handlers [] diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb index 4372746..f547e56 100644 --- a/lib/chef/provider/package/zypper.rb +++ b/lib/chef/provider/package/zypper.rb @@ -91,11 +91,11 @@ def install_package(name, version) ) elsif version run_command( - :command => "zypper -n --no-gpg-checks install -l #{name}=#{version}" + :command => "zypper -n#{gpg_checks} install -l #{name}=#{version}" ) else run_command( - :command => "zypper -n --no-gpg-checks install -l #{name}" + :command => "zypper -n#{gpg_checks} install -l #{name}" ) end end @@ -107,11 +107,11 @@ def upgrade_package(name, version) ) elsif version run_command( - :command => "zypper -n --no-gpg-checks install -l #{name}=#{version}" + :command => "zypper -n#{gpg_checks} install -l #{name}=#{version}" ) else run_command( - :command => "zypper -n --no-gpg-checks install -l #{name}" + :command => "zypper -n#{gpg_checks} install -l #{name}" ) end end @@ -123,21 +123,33 @@ def remove_package(name, version) ) elsif version run_command( - :command => "zypper -n --no-gpg-checks remove #{name}=#{version}" + :command => "zypper -n#{gpg_checks} remove #{name}=#{version}" ) else run_command( - :command => "zypper -n --no-gpg-checks remove #{name}" + :command => "zypper -n#{gpg_checks} remove #{name}" ) end - - end def purge_package(name, version) remove_package(name, version) end - + + private + def gpg_checks() + case Chef::Config[:zypper_check_gpg] + when true + "" + when false + " --no-gpg-checks" + when nil + Chef::Log.warn("Chef::Config[:zypper_check_gpg] was not set. " + + "All packages will be installed without gpg signature checks. " + + "This is a security hazard.") + " --no-gpg-checks" + end + end end end end diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb index fab78f4..c0b2fe4 100644 --- a/spec/unit/provider/package/zypper_spec.rb +++ b/spec/unit/provider/package/zypper_spec.rb @@ -92,8 +92,24 @@ describe "install_package" do it "should run zypper install with the package name and version" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(true) @provider.should_receive(:run_command).with({ - :command => "zypper -n --no-gpg-checks install -l emacs=1.0", + :command => "zypper -n install -l emacs=1.0", + }) + @provider.install_package("emacs", "1.0") + end + it "should run zypper install without gpg checks" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(false) + @provider.should_receive(:run_command).with({ + :command => "zypper -n --no-gpg-checks install -l emacs=1.0", + }) + @provider.install_package("emacs", "1.0") + end + it "should warn about gpg checks on zypper install" do + Chef::Log.should_receive(:warn).with( + /All packages will be installed without gpg signature checks/) + @provider.should_receive(:run_command).with({ + :command => "zypper -n --no-gpg-checks install -l emacs=1.0", }) @provider.install_package("emacs", "1.0") end @@ -101,6 +117,22 @@ describe "upgrade_package" do it "should run zypper update with the package name and version" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(true) + @provider.should_receive(:run_command).with({ + :command => "zypper -n install -l emacs=1.0", + }) + @provider.upgrade_package("emacs", "1.0") + end + it "should run zypper update without gpg checks" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(false) + @provider.should_receive(:run_command).with({ + :command => "zypper -n --no-gpg-checks install -l emacs=1.0", + }) + @provider.upgrade_package("emacs", "1.0") + end + it "should warn about gpg checks on zypper upgrade" do + Chef::Log.should_receive(:warn).with( + /All packages will be installed without gpg signature checks/) @provider.should_receive(:run_command).with({ :command => "zypper -n --no-gpg-checks install -l emacs=1.0", }) @@ -110,8 +142,24 @@ describe "remove_package" do it "should run zypper remove with the package name" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(true) + @provider.should_receive(:run_command).with({ + :command => "zypper -n remove emacs=1.0", + }) + @provider.remove_package("emacs", "1.0") + end + it "should run zypper remove without gpg checks" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(false) + @provider.should_receive(:run_command).with({ + :command => "zypper -n --no-gpg-checks remove emacs=1.0", + }) + @provider.remove_package("emacs", "1.0") + end + it "should warn about gpg checks on zypper remove" do + Chef::Log.should_receive(:warn).with( + /All packages will be installed without gpg signature checks/) @provider.should_receive(:run_command).with({ - :command => "zypper -n --no-gpg-checks remove emacs=1.0", + :command => "zypper -n --no-gpg-checks remove emacs=1.0", }) @provider.remove_package("emacs", "1.0") end @@ -122,6 +170,21 @@ @provider.should_receive(:remove_package).with("emacs", "1.0") @provider.purge_package("emacs", "1.0") end + it "should run zypper purge without gpg checks" do + Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(false) + @provider.should_receive(:run_command).with({ + :command => "zypper -n --no-gpg-checks remove emacs=1.0", + }) + @provider.purge_package("emacs", "1.0") + end + it "should warn about gpg checks on zypper purge" do + Chef::Log.should_receive(:warn).with( + /All packages will be installed without gpg signature checks/) + @provider.should_receive(:run_command).with({ + :command => "zypper -n --no-gpg-checks remove emacs=1.0", + }) + @provider.purge_package("emacs", "1.0") + end end describe "on an older zypper" do ++++++ chef.rb ++++++ --- /var/tmp/diff_new_pack.JW14jx/_old 2013-06-28 11:55:18.000000000 +0200 +++ /var/tmp/diff_new_pack.JW14jx/_new 2013-06-28 11:55:18.000000000 +0200 @@ -30,6 +30,8 @@ solr_home_path File.join(supportdir, 'solr', 'home') solr_heap_size '256M' +zypper_check_gpg true + umask 0022 Mixlib::Log::Formatter.show_time = false -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-sip for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at 2013-06-28 11:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sip (Old) and /work/SRC/openSUSE:Factory/.python-sip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sip" Changes: -------- --- /work/SRC/openSUSE:Factory/python-sip/python-sip.changes 2013-05-02 11:44:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-sip.new/python-sip.changes 2013-06-28 11:54:49.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jun 19 07:19:09 UTC 2013 - dmueller(a)suse.com + +- update to 4.14.7: + - The internal API version is increased to 10.0 requiring the regeneration of + all modules. + - Added the /Sequence/ function annotation. + - %ConvertFromTypeCode can now be specified for classes. + - Added sipEnableAutoconversion() to the C API. + - Added sipSetDestroyOnExit() to the C API. + - Bug fixes. + +------------------------------------------------------------------- Old: ---- sip-4.14.6.tar.gz New: ---- sip-4.14.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.ZEOqP0/_old 2013-06-28 11:54:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ZEOqP0/_new 2013-06-28 11:54:50.000000000 +0200 @@ -17,10 +17,10 @@ %define rversion %{version} -%define python_sip_api 9.2 +%define python_sip_api 10.0 Name: python-sip -Version: 4.14.6 +Version: 4.14.7 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP ++++++ python3-sip.spec ++++++ --- /var/tmp/diff_new_pack.ZEOqP0/_old 2013-06-28 11:54:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ZEOqP0/_new 2013-06-28 11:54:50.000000000 +0200 @@ -18,10 +18,10 @@ %global py3_incdir %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc(True))" 2>/dev/null || echo PYTHON-NOT-FOUND) %define rversion %{version} -%define python_sip_api 9.2 +%define python_sip_api 10.0 Name: python3-sip -Version: 4.14.6 +Version: 4.14.7 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP ++++++ sip-4.14.6.tar.gz -> sip-4.14.7.tar.gz ++++++ ++++ 9044 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 perl-MooseX-Types-Parameterizable for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package perl-MooseX-Types-Parameterizable for openSUSE:Factory checked in at 2013-06-28 11:53:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MooseX-Types-Parameterizable (Old) and /work/SRC/openSUSE:Factory/.perl-MooseX-Types-Parameterizable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MooseX-Types-Parameterizable" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MooseX-Types-Parameterizable/perl-MooseX-Types-Parameterizable.changes 2012-02-20 16:16:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-MooseX-Types-Parameterizable.new/perl-MooseX-Types-Parameterizable.changes 2013-06-28 11:53:59.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 26 12:18:25 UTC 2013 - coolo(a)suse.com + +- remove broken test (see RT#85551): remove-buggy-test.patch + +------------------------------------------------------------------- New: ---- remove-buggy-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MooseX-Types-Parameterizable.spec ++++++ --- /var/tmp/diff_new_pack.WlmS5x/_old 2013-06-28 11:53:59.000000000 +0200 +++ /var/tmp/diff_new_pack.WlmS5x/_new 2013-06-28 11:53:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-MooseX-Types-Parameterizable # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -20,11 +20,12 @@ Version: 0.08 Release: 0 %define cpan_name MooseX-Types-Parameterizable -Summary: Create your own Parameterizable Types. +Summary: Create your own Parameterizable Types License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/MooseX-Types-Parameterizable/ Source: http://www.cpan.org/authors/id/J/JJ/JJNAPIORK/%{cpan_name}-%{version}.tar.gz +Patch0: remove-buggy-test.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -77,7 +78,8 @@ %prep %setup -q -n %{cpan_name}-%{version} -# buggy +%patch0 -p1 +# buggy MANUAL rm t/09-coercions-bug.t %build ++++++ remove-buggy-test.patch ++++++ Index: MooseX-Types-Parameterizable-0.08/t/05-pod-examples.t =================================================================== --- MooseX-Types-Parameterizable-0.08.orig/t/05-pod-examples.t +++ MooseX-Types-Parameterizable-0.08/t/05-pod-examples.t @@ -236,7 +236,8 @@ use Test::More; Test::More::is MySpecialVarchar([40])->coerce("abc"), 'abc'; Test::More::is_deeply( MySpecialVarchar([40])->coerce([qw/d e f/]), [qw/d e f/]); - Test::More::is MySpecialVarchar([40])->coerce({a=>1, b=>2}), 'ab'; + # hashes are random, so you can't know + #Test::More::is MySpecialVarchar([40])->coerce({a=>1, b=>2}), 'ab'; } { -- 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-Moo for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package perl-Moo for openSUSE:Factory checked in at 2013-06-28 11:53:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Moo (Old) and /work/SRC/openSUSE:Factory/.perl-Moo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Moo" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Moo/perl-Moo.changes 2012-01-17 16:13:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Moo.new/perl-Moo.changes 2013-06-28 11:53:22.000000000 +0200 @@ -1,0 +2,59 @@ +Tue Jun 4 08:46:21 UTC 2013 - coolo(a)suse.com + +- updated to 1.002000 + - add 'moosify' attribute key to provide code for inflating to Moose + - fix warnings about unknown attribute parameters on metaclass inflation + - don't pass 'handles' down when doing 'has +' to avoid unDWIMmy explosions + - throw a useful exception when typemap doesn't return a value + - avoid localising @_ when not required for Sub::Quote + - successfully inflate a metaclass for attributeless classes (RT#86415) + - fix false default values used with non-lazy accessors + - stop built values that fail isa checks still getting stored in the object + - stop lazy+weak_ref accessors re-building their value on every call + - make lazy+weak_ref accessors return undef if built value isn't already + stored elsewhere (Moose compatibility) + - stop isa checks being called on every access for lazy attributes + - bump Devel::GlobalDestruction dependency to fix warning on cleanup + when run under -c (RT#78617) + - document Moose type constraint creation for roles and classes + (actually fixed in 1.001000) + + 1.001000 - 2013-03-16 + - add support for FOREIGNBUILDARGS when inheriting from non-Moo classes + - non-ref default values are allowed without using a sub + - has will refuse to overwrite locally defined subs with generated + accessors. + - added more meta resources and added more support relevant links into + the POD documentation + - clarify in docs that default and built values won't call triggers + (RT#82310) + - expand is => 'lazy' doc to make it clear that you can make rw lazy + attributes if you really want to + - handles => "RoleName" tries to load the module + - fix delegation to false/undef attributes (RT#83361) + + 1.000008 - 2013-02-06 + - Re-export on 'use Moo' after 'no Moo' + - Export meta() into roles (but mark as non-method to avoid composing it) + - Don't generate an accessor for rw attributes if reader+writer both set + - Support builder => sub {} ala MooseX::AttributeShortcuts + - Fix 'no Moo;' to preserve non-sub package variables + - Switch to testing for Mouse::Util->can('find_meta') to avoid + exploding on ancient Mouse installs + - Fix loading order bug that results in _install_coderef being treated + as indirect object notation + + 1.000007 - 2012-12-15 + - Correctly handle methods dragged along by role composition + - Die if Moo and Moo::Role are imported into the same package + + 1.000006 - 2012-11-16 + - Don't use $_ as loop variable when calling arbitrary code (RT#81072) + - Bump Role::Tiny prereq to fix method modifier breakage on 5.10.0 + + 1.000005 - 2012-10-23 + - fix POD typo (RT#80060) + - include init_arg name in constructor errors (RT#79596) + - bump Class::Method::Modifiers dependency to avoid warnings on 5.8 + +------------------------------------------------------------------- Old: ---- Moo-0.009013.tar.gz New: ---- Moo-1.002000.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Moo.spec ++++++ --- /var/tmp/diff_new_pack.9uBWAk/_old 2013-06-28 11:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.9uBWAk/_new 2013-06-28 11:53:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Moo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,35 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: perl-Moo -Version: 0.009013 +Version: 1.002000 Release: 0 %define cpan_name Moo -Summary: Minimalist Object Orientation (with Moose compatiblity) +Summary: Minimalist Object Orientation (with Moose compatibility) License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Moo/ -Source: http://www.cpan.org/authors/id/R/RI/RIBASUSHI/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/M/MS/MSTROUT/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Class::Method::Modifiers) >= 1.07 +BuildRequires: perl(Class::Method::Modifiers) >= 1.1 +BuildRequires: perl(Devel::GlobalDestruction) >= 0.11 +BuildRequires: perl(Module::Runtime) >= 0.012 +BuildRequires: perl(Role::Tiny) >= 1.002004 BuildRequires: perl(Test::Fatal) >= 0.003 BuildRequires: perl(Test::More) >= 0.96 -BuildRequires: perl(strictures) >= 1.001001 -Requires: perl(Class::Method::Modifiers) >= 1.07 -Requires: perl(strictures) >= 1.001001 +BuildRequires: perl(strictures) >= 1.004003 +Requires: perl(Class::Method::Modifiers) >= 1.1 +Requires: perl(Devel::GlobalDestruction) >= 0.11 +Requires: perl(Module::Runtime) >= 0.012 +Requires: perl(Role::Tiny) >= 1.002004 +Requires: perl(strictures) >= 1.004003 %{perl_requires} %description -This module is an extremely light-weight, high-performance the Moose -manpage replacement. It also avoids depending on any XS modules to allow -simple deployments. The name 'Moo' is based on the idea that it provides -almost -but not quite- two thirds of the Moose manpage. +This module is an extremely light-weight subset of the Moose manpage +optimised for rapid startup and "pay only for what you use". + +It also avoids depending on any XS modules to allow simple deployments. The +name 'Moo' is based on the idea that it provides almost -- but not quite -- +two thirds of the Moose manpage. + +Unlike the Mouse manpage this module does not aim at full compatibility +with the Moose manpage's surface syntax, preferring instead of provide full +interoperability via the metaclass inflation capabilities described in the +/MOO AND MOOSE manpage. -Unlike 'Mouse' this module does not aim at full the Moose manpage -compatibility. See the /INCOMPATIBILITIES manpage for more details. +For a full list of the minor differences between the Moose manpage and the +Moo manpage's surface syntax, see the /INCOMPATIBILITIES WITH MOOSE +manpage. %prep %setup -q -n %{cpan_name}-%{version} ++++++ Moo-0.009013.tar.gz -> Moo-1.002000.tar.gz ++++++ ++++ 7381 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