September 2009 - openSUSE Commits - openSUSE Mailing Lists

commit gnome-packagekit for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at Mon Sep 28 08:56:01 CEST 2009. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2009-09-10 02:41:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2009-09-25 19:48:59.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 25 17:45:49 UTC 2009 - sreeves(a)novell.com + +- Fix for bnc#538353 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-packagekit-BNC538353.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.hRuLPI/_old 2009-09-28 08:55:46.000000000 +0200 +++ /var/tmp/diff_new_pack.hRuLPI/_new 2009-09-28 08:55:46.000000000 +0200 @@ -20,13 +20,14 @@ Name: gnome-packagekit Url: http://packagekit.org/ Version: 2.27.92 -Release: 1 +Release: 2 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 Patch1: gnome-packagekit_release.patch #PATCH-FEATURE-OPENSUSE gnome-packagekit-fate302445.patch fate 302445 Patch3: gnome-packagekit-fate302445.patch Patch5: gnome-packagekit-BNC383261.patch +Patch6: gnome-packagekit-BNC538353.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: DeviceKit-power-devel BuildRequires: PackageKit-devel @@ -74,6 +75,7 @@ %patch1 -p1 %patch3 -p1 %patch5 -p1 +%patch6 -p1 %build #autoreconf -f -i ++++++ gnome-packagekit-BNC538353.patch ++++++ Index: gnome-packagekit-2.27.92/src/gpk-watch.c =================================================================== --- gnome-packagekit-2.27.92.orig/src/gpk-watch.c +++ gnome-packagekit-2.27.92/src/gpk-watch.c @@ -1565,8 +1565,8 @@ gpk_watch_set_proxies (GpkWatch *watch) egg_debug ("already scheduled"); return FALSE; } - watch->priv->set_proxy_timeout = g_timeout_add (GPK_WATCH_SET_PROXY_RATE_LIMIT, - (GSourceFunc) gpk_watch_set_proxies_ratelimit, watch); +// watch->priv->set_proxy_timeout = g_timeout_add (GPK_WATCH_SET_PROXY_RATE_LIMIT, +// (GSourceFunc) gpk_watch_set_proxies_ratelimit, watch); return TRUE; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox-branding-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package MozillaFirefox-branding-openSUSE for openSUSE:Factory checked in at Mon Sep 28 08:55:30 CEST 2009. -------- --- MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2009-09-25 10:23:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2009-09-28 07:24:37.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 28 07:23:19 CEST 2009 - wr(a)rosenauer.org + +- update susefox to snapshot 20090928 + * fixed syntax error in install.rdf which prevented the addon from + being loaded + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susefox-20090925.tar.bz2 New: ---- susefox-20090928.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.17TFAY/_old 2009-09-28 08:55:22.000000000 +0200 +++ /var/tmp/diff_new_pack.17TFAY/_new 2009-09-28 08:55:22.000000000 +0200 @@ -23,10 +23,10 @@ Name: MozillaFirefox-branding-openSUSE License: BSD 3-clause (or similar) ; GPL v2 or later Version: 3.5 -Release: 6 +Release: 7 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers -Source: susefox-20090925.tar.bz2 +Source: susefox-20090928.tar.bz2 Source1: search-addons.tar.bz2 Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js ++++++ susefox-20090925.tar.bz2 -> susefox-20090928.tar.bz2 ++++++ ++++ 3723 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wxGTK for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package wxGTK for openSUSE:Factory checked in at Sun Sep 27 00:27:00 CEST 2009. -------- --- wxGTK/wxGTK.changes 2009-09-05 11:55:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/wxGTK/wxGTK.changes 2009-09-25 17:54:19.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 25 17:53:00 CEST 2009 - sbrabec(a)suse.cz + +- Disabled STL (bnc#530027). See also + http://lists.opensuse.org/opensuse-factory/2009-09/msg00386.html +- Removed obsolete RPATH. +- The GSocket symbol clash fix replaced by the upstream one. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wxGTK-GSocket-hack.patch New: ---- wxGTK-GSocket-clash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK.spec ++++++ --- /var/tmp/diff_new_pack.Sy7YS2/_old 2009-09-27 00:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Sy7YS2/_new 2009-09-27 00:26:23.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Libraries AutoReqProv: on Version: 2.8.10.1 -Release: 2 +Release: 3 %define wx_version %(echo %{version} | sed 's/\.[0-9][0-9]*\.[0-9][0-9]*$//') Summary: C++ Framework for Cross-Platform Development %if 0 @@ -47,7 +47,7 @@ Patch1: wxGTK-enable-wxrc.patch Patch3: wxGTK-datarootdir.patch Patch5: wxGTK-missing_return.patch -Patch6: wxGTK-GSocket-hack.patch +Patch6: wxGTK-GSocket-clash.patch Patch7: wxGTK-python-abi.patch Patch8: wxGTK-python-no-strict-aliasing.patch Patch9: wxGTK-python-no-GraphicsRenderer-CreateBitmap.patch @@ -158,10 +158,7 @@ %patch1 %patch3 %patch5 -# Apply patch only in repositories with new GLib. It makes the library binary incompatible! -if pkg-config --atleast-version=2.21 glib-2.0 ; then -%patch6 -fi +%patch6 -p4 %patch7 %patch8 %patch9 @@ -179,7 +176,6 @@ common_configure_opts="--prefix=%{_prefix} \ --datadir=%{_datadir} \ --libdir=%{_libdir} \ - --enable-rpath=%{_libdir} \ --with-opengl \ --with-libmspack \ --with-sdl \ @@ -198,8 +194,9 @@ --enable-tabdialog \ --enable-std_iostreams\ --enable-plugins \ - --disable-precomp-headers \ - --enable-stl" + --disable-precomp-headers" +# Recommended by developers but breaks some packages (bnc#530027) and ABI compatibility: +#--enable-stl # build ANSI version pushd wxWidgets-ansi ../configure --disable-unicode ${common_configure_opts} ++++++ wxGTK-GSocket-clash.patch ++++++ Index: /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/gsockgtk.cpp =================================================================== --- /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/gsockgtk.cpp (revision 37159) +++ /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/gsockgtk.cpp (revision 61009) @@ -16,6 +16,11 @@ #include <stdio.h> +// newer versions of glib define its own GSocket but we unfortunately use this +// name in our own (semi-)public header and so can't change it -- rename glib +// one instead +#define GSocket GlibGSocket #include <gdk/gdk.h> #include <glib.h> +#undef GSocket #include "wx/gsocket.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit susedoc for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package susedoc for openSUSE:Factory checked in at Sun Sep 27 00:25:12 CEST 2009. -------- --- susedoc/susedoc.changes 2009-07-09 13:56:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/susedoc/susedoc.changes 2009-09-25 10:41:46.000000000 +0200 @@ -2 +2 @@ -Thu Jul 9 13:55:10 CEST 2009 - toms(a)suse.de +Fri Sep 25 07:33:41 UTC 2009 - toms(a)suse.de @@ -4,5 +4,67 @@ -- Corrected SPEC file problems: - . Removed files-duplicate filter in susedoc-rpmlintrc - . Removed macro in version keyword - . Added susedoc-rpmlintrc as source - . Inserted fdupes to avoid file duplicates +- Improved SPEC file: + * Disabled addFilter line in rpmlintrc file, added comments + * Corrected PreReq to libxml2 sgml-skel, removed awk + * Used versioned Obsoletes/Provides for novdoc-schema + Thanks very much, Lars! :-) + +------------------------------------------------------------------- +Thu Sep 24 13:55:40 CEST 2009 - toms(a)suse.de + +- Added template for PI suse-quickstart which can hold different + color schemas for openSUSE (suse, dark-suse) or Novell (novell). + +------------------------------------------------------------------- +Mon Aug 31 13:19:56 CEST 2009 - toms(a)suse.de + +- Fixed really the forgotten translation for ko.xml + +------------------------------------------------------------------- +Tue Aug 25 15:33:08 CEST 2009 - toms(a)suse.de + +- Fixed some translation of ko.xml +- Corrected appearance of part for Korean + (label+gentext instead of gentext+label) +=> Thanks to Patrick Tinley! + +------------------------------------------------------------------- +Mon Aug 24 10:19:51 CEST 2009 - toms(a)suse.de + +- Integrated parameters for FOP and XEP in l10n/*.xml files for + pocket layout. Thanks to Luiz! + +------------------------------------------------------------------- +Wed Aug 19 09:09:06 CEST 2009 - toms(a)suse.de + +- Fixed bug when building Quickstarts with FOP: licenses were omitted + Thanks to Luiz Fernando Ranghetti! + +------------------------------------------------------------------- +Thu Aug 13 09:02:30 CEST 2009 - toms(a)suse.de + +- Corrected id -> role in fo/articletitlepage.xsl (Thanks Luiz!) +- Finalized new pocket format + +------------------------------------------------------------------- +Thu Aug 6 15:05:21 CEST 2009 - toms(a)suse.de + +- Requires version 1.75 docbook-xsl-stylesheets +- Requires mplus-fonts and liberation-fonts (for pocket format) + +------------------------------------------------------------------- +Thu Aug 6 08:47:56 CEST 2009 - toms(a)suse.de + +- Removed "部" in part title of zh_TW (Thanks Patrick!) + +------------------------------------------------------------------- +Tue Aug 4 13:31:55 CEST 2009 - toms(a)suse.de + +- Added language fix for es, hu, and zh_{cn,tw} +- Prepared pocket format (work in progress) +- Enhanced list of recommended fonts with dejavu, liberation-fonts + +------------------------------------------------------------------- +Wed Jul 8 08:42:32 CEST 2009 - toms(a)suse.de + +- Changed SPEC file, mostly due to FOP: + . Added requires section: dejavu LinuxLibertine + . Added recommends section: fifth-leg-font calling whatdependson for head-i586 Old: ---- susedoc-4.2_20090707.tar.bz2 New: ---- susedoc-4.2_20090924.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc.spec ++++++ --- /var/tmp/diff_new_pack.OHSkZh/_old 2009-09-27 00:24:39.000000000 +0200 +++ /var/tmp/diff_new_pack.OHSkZh/_new 2009-09-27 00:24:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc (Version 4.2_20090707) +# spec file for package susedoc (Version 4.2_20090924) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,16 +18,21 @@ # norootforbuild %define dtdversion 1.0 +%define packageversion 4.2 %define dtdname novdoc %define docbuilddir /usr/share/susedoc +%define _version 20090924 +%define _name susedoc +%define regcat /usr/bin/sgml-register-catalog Name: susedoc -#Version: %{packageversion}_%{_version} -Version: 4.2_20090707 +Version: %{packageversion}_%{_version} Release: 1 Summary: XML Build Mechanics for Novell, SUSE, and openSUSE Documentation -Requires: libxml2 libxslt inkscape transfig ImageMagick java xml-commons-resolver docbook-xsl-stylesheets svg-dtd freefont xalan-j2 dia fop >= 0.94 make +Requires: libxml2 libxslt inkscape transfig ImageMagick java xml-commons-resolver svg-dtd freefont xalan-j2 dia fop >= 0.94 make +Requires: docbook-xsl-stylesheets >= 1.75 Requires: docbook_4 xmlformat optipng +Requires: dejavu LinuxLibertine mplus-fonts liberation-fonts # #%if 0%{?opensuse_bs} #%else @@ -35,7 +40,7 @@ #%endif # %if %suse_version >= 1100 -Recommends: agfa-fonts +Recommends: agfa-fonts fifth-leg-font # Korean Fonts: Recommends: unfonts # Japanese Fonts: @@ -46,22 +51,24 @@ Recommends: FZSongTi FZHeiTi FZFangSong %endif BuildRequires: sgml-skel unzip +%if 0%{?suse_version} > 1020 BuildRequires: fdupes +%endif License: GPL Group: Productivity/Publishing/XML AutoReqProv: on # Needs to be fixed to openSUSE build server: Url: http://www.opensuse.org/Documentation_Team -Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-rpmlintrc +Source0: %{_name}-%{packageversion}_%{_version}.tar.bz2 +Source1: susedoc-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%define regcat /usr/bin/sgml-register-catalog -PreReq: %{regcat} /usr/bin/xmlcatalog -PreReq: awk +PreReq: libxml2 sgml-skel +%if %suse_version <= 1100 Obsoletes: novdoc-schema Provides: novdoc-schema #Recommends: agfa-fonts ttf-founder unfonts sazanami-fonts +%endif %description This RPM consists of a set of stylesheets, scripts and makefiles that @@ -108,7 +115,6 @@ xmlcatbin=/usr/bin/xmlcatalog # build root catalog fragment %{__rm} -f %{FOR_ROOT_CAT}.tmp %{FOR_XSLT_CAT}.tmp -# [ -e bin/create_dm_docu.py ] && %{__rm} bin/create_dm_docu.py $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp #CATALOG=%{xml_mod_dtd_dir}/catalog.xml NOVCAT=%{xml_mod_dtd_dir}/catalog.xml @@ -122,7 +128,7 @@ /<\/catalog/i\ </group>' \ %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} -# +# Register different URNs: $xmlcatbin --noout --create %{FOR_XSLT_CAT}.tmp $xmlcatbin --noout --add "system" "urn:x-suse:xslt:profiling:docbook41-profile.xsl" \ "file://%{docbuilddir}/xslt/profiling/docbook41-profile.xsl" %{FOR_XSLT_CAT}.tmp @@ -146,7 +152,7 @@ %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \ && %{__rm} -rf $RPM_BUILD_ROOT -mkdir %buildroot +%{__mkdir} %buildroot %{__mkdir_p} $RPM_BUILD_ROOT/usr/share \ $RPM_BUILD_ROOT/%{_bindir} \ $RPM_BUILD_ROOT/%{xml_dir}/%{dtdname}/schema/{dtd,rng}/%{dtdversion} @@ -168,7 +174,11 @@ %{INSTALL_DATA} %{FOR_XSLT_CAT} $cat_dir %define all_cat CATALOG.%{dtdname}-%{dtdversion} %{__mv} $RPM_BUILD_ROOT/%{docbuilddir}/bin/susedoc-new.py $RPM_BUILD_ROOT/%{_bindir} -%fdupes $RPM_BUILD_ROOT +# create symlinks: +%if 0%{?suse_version} > 1020 + %fdupes -s $RPM_BUILD_ROOT/%{docbuilddir}/etc/XEP + %fdupes -s $RPM_BUILD_ROOT/%{docbuilddir}/xslt +%endif #---------------------- %post @@ -202,7 +212,7 @@ %files %defattr(-,root,root) -#%dir %{sgml_dir} +# %dir %{sgml_dir} %config %{sgml_var_dir}/* %config %{xml_sysconf_dir}/%{FOR_ROOT_CAT} %config %{xml_sysconf_dir}/%{FOR_XSLT_CAT} @@ -210,6 +220,6 @@ %{sgml_dir}/CATALOG.%{dtdname}-%{dtdversion} %{xml_dir}/%{dtdname}/ %{docbuilddir} - # + %changelog ++++++ susedoc-4.2_20090707.tar.bz2 -> susedoc-4.2_20090924.tar.bz2 ++++++ ++++ 13065 lines of diff (skipped) ++++++ susedoc-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.OHSkZh/_old 2009-09-27 00:24:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OHSkZh/_new 2009-09-27 00:24:41.000000000 +0200 @@ -3,3 +3,9 @@ addFilter("no-packager-tag") addFilter("explicit-lib-dependency libxml2") addFilter("explicit-lib-dependency libxslt") +# We need this package and RPM has no way to determine this: +addFilter("explicit-lib-dependency liberation-fonts") +# For the future, this might be enabled: +# addFilter("files-duplicate .*/flyer/header.xsl") +addFilter("zero-length .*/FOP/README") +addFilter("non-executable-script .*/bin/create_dm_docu.py") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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-packager for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Sun Sep 27 00:23:36 CEST 2009. -------- --- yast2-packager/yast2-packager.changes 2009-09-09 13:38:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2009-09-23 15:32:00.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 23 15:00:04 CEST 2009 - kmachalkova(a)suse.cz + +- Use getenv to query current language for displaying the license + (instead of uninitialized data from Language:: - bnc#504803, c#28) +- Removed catch-all regexps from license file name patterns - UI + can display only html and txt anyway +- 2.18.12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.18.11.tar.bz2 New: ---- yast2-packager-2.18.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.cYvcOK/_old 2009-09-27 00:23:23.000000000 +0200 +++ /var/tmp/diff_new_pack.cYvcOK/_new 2009-09-27 00:23:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.18.11) +# spec file for package yast2-packager (Version 2.18.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-packager -Version: 2.18.11 +Version: 2.18.12 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.18.11.tar.bz2 +Source0: yast2-packager-2.18.12.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -79,7 +79,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.18.11 +%setup -n yast2-packager-2.18.12 %build %{prefix}/bin/y2tool y2autoconf @@ -127,5 +127,4 @@ /usr/share/YaST2/modules/WebpinPackageSearch.ycp /usr/share/YaST2/modules/WebpinPackageSearch.ybc %{prefix}/share/applications/YaST2/webpin.desktop - %changelog ++++++ yast2-packager-2.18.11.tar.bz2 -> yast2-packager-2.18.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.11/VERSION new/yast2-packager-2.18.12/VERSION --- old/yast2-packager-2.18.11/VERSION 2009-09-09 13:32:25.000000000 +0200 +++ new/yast2-packager-2.18.12/VERSION 2009-09-23 14:53:48.000000000 +0200 @@ -1 +1 @@ -2.18.11 +2.18.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.11/src/modules/ProductLicense.ycp new/yast2-packager-2.18.12/src/modules/ProductLicense.ycp --- old/yast2-packager-2.18.11/src/modules/ProductLicense.ycp 2009-09-09 13:23:13.000000000 +0200 +++ new/yast2-packager-2.18.12/src/modules/ProductLicense.ycp 2009-09-23 10:54:52.000000000 +0200 @@ -37,9 +37,20 @@ list <string> license_patterns = [ "license\\.html", "license\\.%1\\.html", "license\\.htm", "license\\.%1\\.htm", - "license\\.txt", "license\\.%1\\.txt", - "license\\.*$", "license\\.%1\\.*$" + "license\\.txt", "license\\.%1\\.txt" ]; +// no more wildcard patterns here, UI can display only html and txt anyway + +// Helper func. Cuts encoding suffix off the LANG +// env. variable i.e. foo_BAR.UTF-8 => foo_BAR +string EnvLangToLangCode ( string env_lang ) +{ + list <string> tmp = []; + if (env_lang != nil) + tmp = splitstring(env_lang, ".@"); + + return tmp[0]:""; +} /** * Creates a unique identification from filename @@ -624,10 +635,16 @@ if (info_file == nil && size (licenses) == 0) return `auto; + // Let's do getenv here. Language::language may not be initialized + // by now (see bnc#504803, c#28). Language::Language does only + // sysconfig reading, which is not too useful in cases like + // 'LANG=foo_BAR yast repositories' + string language = EnvLangToLangCode( getenv("LANG") ); + // Preferencies how the client selects from available languages list<string> langs = [ - Language::language, - substring (Language::language, 0, 2), // "it_IT" -> "it" + language, + substring (language, 0, 2), // "it_IT" -> "it" "en_US", "en_GB", "en", @@ -647,7 +664,7 @@ }); } - y2milestone ("Preffered lang: %1", Language::language); + y2milestone ("Preffered lang: %1", language); if (size (available_langs) == 0) return `auto; // no license available lic_lang = find (string l, langs, { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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-network for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Sun Sep 27 00:23:07 CEST 2009. -------- --- yast2-network/yast2-network.changes 2009-09-17 09:54:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2009-09-25 19:22:47.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Sep 25 17:50:03 CEST 2009 - kmachalkova(a)suse.cz + +- Display simple firewall & SSH config dialog after clicking on + 'Firewall' headline in initial proposal (bnc#539289) +- 2.18.49 + +------------------------------------------------------------------- +Thu Sep 24 18:37:03 CEST 2009 - kmachalkova(a)suse.cz + +- Propose opening SSH port in firewall in SSH installation + (bnc#535206) +- Enable SSH service if SSH port in firewall is to be opened + (bnc#537980) + +------------------------------------------------------------------- +Thu Sep 17 13:37:54 CEST 2009 - mzugec(a)suse.cz + +- replace STARTMODE='onboot' (which is deprecated) with 'auto' + (bnc#533818) +- 2.18.48 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.18.47.tar.bz2 New: ---- yast2-network-2.18.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.r09nkc/_old 2009-09-27 00:22:51.000000000 +0200 +++ /var/tmp/diff_new_pack.r09nkc/_new 2009-09-27 00:22:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.18.47) +# spec file for package yast2-network (Version 2.18.49) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-network -Version: 2.18.47 +Version: 2.18.49 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.47.tar.bz2 +Source0: yast2-network-2.18.49.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -65,7 +65,7 @@ This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.18.47 +%setup -n yast2-network-2.18.49 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-network-2.18.47.tar.bz2 -> yast2-network-2.18.49.tar.bz2 ++++++ ++++ 19035 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/VERSION new/yast2-network-2.18.49/VERSION --- old/yast2-network-2.18.47/VERSION 2009-09-17 09:16:56.000000000 +0200 +++ new/yast2-network-2.18.49/VERSION 2009-09-25 17:52:13.000000000 +0200 @@ -1 +1 @@ -2.18.47 +2.18.49 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/configure.in new/yast2-network-2.18.49/configure.in --- old/yast2-network-2.18.47/configure.in 2009-09-17 09:47:15.000000000 +0200 +++ new/yast2-network-2.18.49/configure.in 2009-09-25 19:19:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.18.47, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.18.49, http://bugs.opensuse.org/, yast2-network) 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.18.47" +VERSION="2.18.49" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/missing new/yast2-network-2.18.49/missing --- old/yast2-network-2.18.47/missing 2009-09-17 09:47:18.000000000 +0200 +++ new/yast2-network-2.18.49/missing 2009-09-25 19:20:04.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,9 +89,6 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -107,22 +106,15 @@ esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. +# the program). case $1 in - lex*|yacc*) + lex|yacc) # Not GNU programs, they don't have --version. ;; - tar*) + tar) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -146,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $program in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -156,7 +148,7 @@ touch aclocal.m4 ;; - autoconf*) + autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -165,7 +157,7 @@ touch configure ;; - autoheader*) + autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -195,7 +187,7 @@ while read f; do touch "$f"; done ;; - autom4te*) + autom4te) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -218,7 +210,7 @@ fi ;; - bison*|yacc*) + bison|yacc) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -248,7 +240,7 @@ fi ;; - lex*|flex*) + lex|flex) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -271,7 +263,7 @@ fi ;; - help2man*) + help2man) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -285,11 +277,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit $? + exit 1 fi ;; - makeinfo*) + makeinfo) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -318,7 +310,7 @@ touch $file ;; - tar*) + tar) shift # We have already tried tar in the generic part. @@ -371,6 +363,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/clients/firewall_stage1_finish.ycp new/yast2-network-2.18.49/src/clients/firewall_stage1_finish.ycp --- old/yast2-network-2.18.47/src/clients/firewall_stage1_finish.ycp 2009-08-31 15:48:02.000000000 +0200 +++ new/yast2-network-2.18.49/src/clients/firewall_stage1_finish.ycp 2009-09-24 18:35:12.000000000 +0200 @@ -8,6 +8,7 @@ { textdomain "network"; +import "Service"; import "SuSEFirewall"; import "SuSEFirewall4Network"; import "SuSEFirewallProposal"; @@ -55,7 +56,11 @@ //only if we have openssh package - proposal takes care //it gets installed if the user wants to open ssh port if (ssh_enabled) + { SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), true ); + //enable SSH service if the port is to be opened (bnc#537980) + Service::Enable("sshd"); + } //this is equivalent to write-only, do not attempt to restart the service SuSEFirewall::WriteConfiguration(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/clients/firewall_stage1_proposal.ycp new/yast2-network-2.18.49/src/clients/firewall_stage1_proposal.ycp --- old/yast2-network-2.18.47/src/clients/firewall_stage1_proposal.ycp 2009-09-17 09:16:55.000000000 +0200 +++ new/yast2-network-2.18.49/src/clients/firewall_stage1_proposal.ycp 2009-09-25 18:04:48.000000000 +0200 @@ -28,14 +28,88 @@ { textdomain "network"; + import "Label"; + import "Linuxrc"; import "PackagesProposal"; import "ProductControl"; import "ProductFeatures"; import "SuSEFirewall4Network"; import "SuSEFirewallProposal"; + import "Wizard"; string proposal_id = "fw_1ststage"; + symbol FirewallDialogSimple() { + string title = _("Basic Firewall and SSH Configuration"); + + term contents = `VBox ( + `Frame ( + // frame label + _("Firewall and SSH service"), + `HSquash ( + `MarginBox ( + 0.5, 0.5, + `VBox( + `Left(`CheckBox(`id("enable_fw"),`opt(`notify), + _("Enable Firewall"), SuSEFirewall4Network::Enabled1stStage())), + `Left(`CheckBox(`id("open_port"), + _("Open SSH Port and Enable SSH Service"), SuSEFirewall4Network::EnabledSsh1stStage())) + ) + ) + ) + ) + ); + + string help = _("<big>Firewall and SSH</big> +Firewall is a defensive mechanism that protects your computer from network attacks. +SSH is a service that allows logging into this computer remotely via dedicated +SSH client") + + +_("Here you can choose whether the firewall will be enabled or disabled after +the installation. It is recommended to keep it enabled.") + + +_("With enabled firewall, you can decide whether to open firewall port for SSH +service and allow remote SSH logins. This will also enable SSH service (i.e. it +will be started on computer boot)."); + + + Wizard::CreateDialog (); + Wizard::SetTitleIcon ("yast-firewall"); + + Wizard::SetContentsButtons (title, contents, help, Label::BackButton(), Label::OKButton()); + Wizard::SetAbortButton (`cancel, Label::CancelButton()); + Wizard::HideBackButton(); + + UI::ChangeWidget(`id("open_port"),`Enabled, SuSEFirewall4Network::Enabled1stStage()); + + any dialog_ret = nil; + + while (true) { + dialog_ret = UI::UserInput(); + boolean enable = (boolean) UI::QueryWidget(`id("enable_fw"),`Value); + + if (dialog_ret == "enable_fw") { + UI::ChangeWidget(`id("open_port"),`Enabled, enable); + continue; + } + else if( dialog_ret == `next || dialog_ret == `ok) { + boolean open = (boolean) UI::QueryWidget(`id("open_port"),`Value); + boolean can_be_opened = (boolean) UI::QueryWidget(`id("open_port"),`Enabled); + + SuSEFirewall4Network::SetEnabled1stStage(enable); + if (can_be_opened) + SuSEFirewall4Network::SetSshEnabled1stStage(open); + break; + } + else + break; + } + + Wizard::CloseDialog(); + return (symbol) dialog_ret; + + } + // run this only once if (!SuSEFirewallProposal::GetProposalInitialized()) { @@ -45,6 +119,14 @@ ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); SuSEFirewall4Network::SetEnabled1stStage(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); + + //we're installing over SSH, propose opening SSH port (bnc#535206) + if(Linuxrc::usessh()) { + SuSEFirewall4Network::SetSshEnabled1stStage (true); + } else { + SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); + } + SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); SuSEFirewallProposal::SetProposalInitialized(true); @@ -68,9 +150,9 @@ if (SuSEFirewall4Network::Enabled1stStage()) { output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? - _("SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>)") + _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") : - _("SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)") + _("SSH service will be disabled, SSH port will be blocked(<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") ) + "</li>\n"; } @@ -89,6 +171,7 @@ } else if ( func == "AskUser" ) { any chosen_link = param["chosen_id"]:nil; + symbol result = `next; y2milestone("User clicked %1", chosen_link); if (chosen_link == "firewall--enable_firewall_in_proposal") @@ -113,6 +196,11 @@ y2milestone("Disabling SSH"); SuSEFirewall4Network::SetSshEnabled1stStage( false ); } + else if (chosen_link == "firewall_stage1") + { + result = FirewallDialogSimple(); + } + SuSEFirewallProposal::SetChangedByUser(true); //Disable one of the AC steps (see control.$product.xml for appropriate unique IDs) @@ -122,16 +210,16 @@ else ProductControl::DisableSubProposal("network_continue", "firewall"); - ret = $[ "workflow_sequence" : `next ]; + ret = $[ "workflow_sequence" : result ]; } else if ( func == "Description" ) { ret = $[ // Proposal title - "rich_text_title" : _("Firewall"), + "rich_text_title" : _("Firewall and SSH"), // Menu entry label - "menu_title" : _("&Firewall"), + "menu_title" : _("&Firewall and SSH"), "id" : "firewall_stage1" ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/clients/save_network.ycp new/yast2-network-2.18.49/src/clients/save_network.ycp --- old/yast2-network-2.18.47/src/clients/save_network.ycp 2009-07-07 09:52:23.000000000 +0200 +++ new/yast2-network-2.18.49/src/clients/save_network.ycp 2009-09-24 17:10:34.000000000 +0200 @@ -279,7 +279,7 @@ } else { - network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + network_configuration = sformat("%1STARTMODE='auto'\n", network_configuration); } // reference to hardware configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/lan/YaPI/NETWORK.pm new/yast2-network-2.18.49/src/lan/YaPI/NETWORK.pm --- old/yast2-network-2.18.47/src/lan/YaPI/NETWORK.pm 2009-09-17 09:16:55.000000000 +0200 +++ new/yast2-network-2.18.49/src/lan/YaPI/NETWORK.pm 2009-09-25 11:48:52.000000000 +0200 @@ -116,9 +116,9 @@ # LanItems->Write(); YaST::YCP::Import ("NetworkInterfaces"); NetworkInterfaces->Read(); - NetworkInterfaces->Add() if NetworkInterfaces->Edit($dev) ne 1; + NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); NetworkInterfaces->Name($dev); - my %config=("STARTMODE" => "onboot", + my %config=("STARTMODE" => "auto", "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, "IPADDR" => $args->{'interface'}->{$dev}->{'ipaddr'} ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/lan/address.ycp new/yast2-network-2.18.49/src/lan/address.ycp --- old/yast2-network-2.18.47/src/lan/address.ycp 2009-06-24 12:42:33.000000000 +0200 +++ new/yast2-network-2.18.49/src/lan/address.ycp 2009-09-24 17:10:34.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: address.ycp 57718 2009-06-24 10:42:32Z mzugec $ + * $Id: address.ycp 58672 2009-09-17 11:51:28Z mzugec $ */ { @@ -790,7 +790,7 @@ { settings = $[ "BOOTPROTO": "static", - "STARTMODE": "onboot", + "STARTMODE": "auto", "TUNNEL" : LanItems::type, "TUNNEL_SET_PERSISTENT" : LanItems::tunnel_set_persistent ? "yes" : "no", "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/modules/Lan.ycp new/yast2-network-2.18.49/src/modules/Lan.ycp --- old/yast2-network-2.18.47/src/modules/Lan.ycp 2009-08-31 15:48:03.000000000 +0200 +++ new/yast2-network-2.18.49/src/modules/Lan.ycp 2009-09-24 17:10:34.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 58360 2009-08-17 09:52:21Z mzugec $ + * $Id: Lan.ycp 58672 2009-09-17 11:51:28Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -817,7 +817,7 @@ NetworkInterfaces::Current["BRIDGE_STP"]="off"; NetworkInterfaces::Current["BRIDGE_FORWARDDELAY"]="0"; // hardcode startmode (bnc#450670), it can't be ifplugd! - NetworkInterfaces::Current["STARTMODE"]="onboot"; + NetworkInterfaces::Current["STARTMODE"]="auto"; // remove description - will be replaced by new (real) one NetworkInterfaces::Current=remove(NetworkInterfaces::Current, "NAME"); if( NetworkInterfaces::Commit() ){ @@ -849,7 +849,7 @@ NetworkInterfaces::Current["BRIDGE_STP"]="off"; NetworkInterfaces::Current["BRIDGE_FORWARDDELAY"]="0"; // hardcode startmode (bnc#450670), it can't be ifplugd! - NetworkInterfaces::Current["STARTMODE"]="onboot"; + NetworkInterfaces::Current["STARTMODE"]="auto"; // remove description - will be replaced by new (real) one NetworkInterfaces::Current=remove(NetworkInterfaces::Current, "NAME"); if( NetworkInterfaces::Commit() ){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.47/src/modules/LanItems.ycp new/yast2-network-2.18.49/src/modules/LanItems.ycp --- old/yast2-network-2.18.47/src/modules/LanItems.ycp 2009-06-25 16:09:22.000000000 +0200 +++ new/yast2-network-2.18.49/src/modules/LanItems.ycp 2009-09-24 17:10:34.000000000 +0200 @@ -1109,7 +1109,7 @@ if (contains(["tun", "tap"], type)){ newdev=$[ "BOOTPROTO" : "static", - "STARTMODE" : "onboot", + "STARTMODE" : "auto", "TUNNEL" : type, "TUNNEL_SET_PERSISTENT" : tunnel_set_persistent ? "yes" : "no", "TUNNEL_SET_OWNER" : tunnel_set_owner, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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-ldap-server for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package yast2-ldap-server for openSUSE:Factory checked in at Sun Sep 27 00:22:33 CEST 2009. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2009-09-14 15:51:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2009-09-25 15:55:22.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 25 13:48:52 UTC 2009 - rhafer(a)novell.com + +- Version 2.18.3 + * Fixed crasher and improved sanity checks when adding new + schema elements (bnc#541819) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-server-2.18.2.tar.bz2 New: ---- yast2-ldap-server-2.18.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.OPTcXX/_old 2009-09-27 00:22:28.000000000 +0200 +++ /var/tmp/diff_new_pack.OPTcXX/_new 2009-09-27 00:22:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-server (Version 2.18.2) +# spec file for package yast2-ldap-server (Version 2.18.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-ldap-server -Version: 2.18.2 +Version: 2.18.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.18.2.tar.bz2 +Source0: yast2-ldap-server-2.18.3.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -35,7 +35,7 @@ Center and during installation. %prep -%setup -n yast2-ldap-server-2.18.2 +%setup -n yast2-ldap-server-2.18.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ldap-server-2.18.2.tar.bz2 -> yast2-ldap-server-2.18.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.2/VERSION new/yast2-ldap-server-2.18.3/VERSION --- old/yast2-ldap-server-2.18.2/VERSION 2009-09-14 15:31:39.000000000 +0200 +++ new/yast2-ldap-server-2.18.3/VERSION 2009-09-25 15:00:23.000000000 +0200 @@ -1 +1 @@ -2.18.2 +2.18.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.2/configure new/yast2-ldap-server-2.18.3/configure --- old/yast2-ldap-server-2.18.2/configure 2009-09-14 15:15:12.000000000 +0200 +++ new/yast2-ldap-server-2.18.3/configure 2009-09-25 12:20:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.18.1. +# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.18.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap-server' PACKAGE_TARNAME='yast2-ldap-server' -PACKAGE_VERSION='2.18.1' -PACKAGE_STRING='yast2-ldap-server 2.18.1' +PACKAGE_VERSION='2.18.2' +PACKAGE_STRING='yast2-ldap-server 2.18.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1532,7 +1532,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-ldap-server 2.18.1 to adapt to many kinds of systems. +\`configure' configures yast2-ldap-server 2.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1604,7 +1604,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap-server 2.18.1:";; + short | recursive ) echo "Configuration of yast2-ldap-server 2.18.2:";; esac cat <<\_ACEOF @@ -1716,7 +1716,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap-server configure 2.18.1 +yast2-ldap-server configure 2.18.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1730,7 +1730,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-ldap-server $as_me 2.18.1, which was +It was created by yast2-ldap-server $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2710,7 +2710,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap-server' - VERSION='2.18.1' + VERSION='2.18.2' cat >>confdefs.h <<_ACEOF @@ -2832,7 +2832,7 @@ -VERSION="2.18.1" +VERSION="2.18.2" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" @@ -17566,7 +17566,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ldap-server $as_me 2.18.1, which was +This file was extended by yast2-ldap-server $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17629,7 +17629,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-ldap-server config.status 2.18.1 +yast2-ldap-server config.status 2.18.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.2/configure.in new/yast2-ldap-server-2.18.3/configure.in --- old/yast2-ldap-server-2.18.2/configure.in 2009-09-14 15:15:02.000000000 +0200 +++ new/yast2-ldap-server-2.18.3/configure.in 2009-09-25 12:20:33.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-server, 2.18.1, http://bugs.opensuse.org/, yast2-ldap-server) +AC_INIT(yast2-ldap-server, 2.18.2, http://bugs.opensuse.org/, yast2-ldap-server) 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.18.1" +VERSION="2.18.2" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.2/src/lib/slapd-config.cpp new/yast2-ldap-server-2.18.3/src/lib/slapd-config.cpp --- old/yast2-ldap-server-2.18.2/src/lib/slapd-config.cpp 2009-04-29 15:47:59.000000000 +0200 +++ new/yast2-ldap-server-2.18.3/src/lib/slapd-config.cpp 2009-09-25 14:59:39.000000000 +0200 @@ -5,7 +5,7 @@ * * Author: Ralf Haferkamp <rhafer(a)suse.de> * - * $Id: slapd-config.cpp 57029 2009-04-29 11:04:19Z lslezak $ + * $Id: slapd-config.cpp 58780 2009-09-25 12:59:49Z rhafer $ */ #include <LDAPConnection.h> @@ -1253,6 +1253,8 @@ tls.applySettings( *this ); } +const std::string OlcSchemaConfig::schemabase = "cn=schema,cn=config"; + OlcSchemaConfig::OlcSchemaConfig() : OlcConfigEntry() { m_dbEntryChanged.setDN("cn=schema,cn=config"); @@ -1264,21 +1266,44 @@ { log_it(SLAPD_LOG_INFO, "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)"); std::string name(this->getStringValue("cn")); - if ( name[0] == '{' ) + std::string dn(e.getDN() ); + if ( name.empty() ) { - std::string::size_type pos = name.find('}'); - std::istringstream indexstr(name.substr(1, pos-1)); - indexstr >> entryIndex; - m_name = name.substr( pos+1, std::string::npos ); - } else { - m_name = name; - entryIndex = 0; + throw std::runtime_error( "Entry '" + dn + "' has no 'cn' Attribute." ); + } + if ( (dn.size() < schemabase.size()) || + (dn.compare( dn.size()-schemabase.size(), schemabase.size(), schemabase )) ) + { + throw std::runtime_error( "Entry '" + dn + "' is not a child of '" + schemabase + "'." ); } + if ( this->getStringValues("olcobjectclasses").empty() && + this->getStringValues("olcattributetypes").empty() ) + { + throw std::runtime_error( "Entry '" + dn + "' does not define any objectclasses or attributetypes." ); + } + + entryIndex = splitIndexFromString( name, m_name ); } OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2) : OlcConfigEntry(e1, e2) { - log_it(SLAPD_LOG_INFO, "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)"); + log_it(SLAPD_LOG_INFO, "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2) : OlcConfigEntry(e1, e2)" ); std::string name(this->getStringValue("cn")); + std::string dn(e2.getDN() ); + if ( name.empty() ) + { + throw std::runtime_error( "Entry '" + dn + "' has no 'cn' Attribute." ); + } + if ( (dn.size() < schemabase.size()) || + (dn.compare( dn.size()-schemabase.size(), schemabase.size(), schemabase )) ) + { + throw std::runtime_error( "Entry '" + dn + "' is not a child of '" + schemabase + "'." ); + } + if ( this->getStringValues("olcobjectclasses").empty() && + this->getStringValues("olcattributetypes").empty() ) + { + throw std::runtime_error( "Entry '" + dn + "' does not define any objectclasses or attributetypes." ); + } + entryIndex = splitIndexFromString( name, m_name ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.2/src/lib/slapd-config.h new/yast2-ldap-server-2.18.3/src/lib/slapd-config.h --- old/yast2-ldap-server-2.18.2/src/lib/slapd-config.h 2009-05-11 14:18:54.000000000 +0200 +++ new/yast2-ldap-server-2.18.3/src/lib/slapd-config.h 2009-09-25 14:48:52.000000000 +0200 @@ -5,7 +5,7 @@ * * Author: Ralf Haferkamp <rhafer(a)suse.de> * - * $Id: slapd-config.h 57115 2009-05-11 12:18:52Z rhafer $ + * $Id: slapd-config.h 58775 2009-09-25 12:49:02Z rhafer $ * */ @@ -292,6 +292,7 @@ virtual void clearChangedEntry(); const std::string& getName() const; const std::vector<LDAPAttrType> getAttributeTypes() const; + static const std::string schemabase; protected: virtual void updateEntryDn( bool origEntry = false); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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-installation for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Sun Sep 27 00:22:10 CEST 2009. -------- --- yast2-installation/yast2-installation.changes 2009-09-14 15:37:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2009-09-24 16:04:16.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 24 15:51:15 CEST 2009 - kmachalkova(a)suse.cz + +- Enable SSH service after reboot if this is SSH or VNC installation + (new ssh_service_finish client) (bnc#535206) +- 2.18.27 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.18.26.tar.bz2 New: ---- yast2-installation-2.18.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.zqdlM4/_old 2009-09-27 00:21:59.000000000 +0200 +++ /var/tmp/diff_new_pack.zqdlM4/_new 2009-09-27 00:21:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.18.26) +# spec file for package yast2-installation (Version 2.18.27) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-installation -Version: 2.18.26 +Version: 2.18.27 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.26.tar.bz2 +Source0: yast2-installation-2.18.27.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -103,7 +103,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.26 +%setup -n yast2-installation-2.18.27 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.18.26.tar.bz2 -> yast2-installation-2.18.27.tar.bz2 ++++++ ++++ 5973 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.26/VERSION new/yast2-installation-2.18.27/VERSION --- old/yast2-installation-2.18.26/VERSION 2009-09-14 15:27:43.000000000 +0200 +++ new/yast2-installation-2.18.27/VERSION 2009-09-24 15:53:21.000000000 +0200 @@ -1 +1 @@ -2.18.26 +2.18.27 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.26/configure.in new/yast2-installation-2.18.27/configure.in --- old/yast2-installation-2.18.26/configure.in 2009-09-14 15:35:34.000000000 +0200 +++ new/yast2-installation-2.18.27/configure.in 2009-09-07 10:42:27.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.18.26, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.18.24, http://bugs.opensuse.org/, yast2-installation) 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.18.26" +VERSION="2.18.24" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.26/control/control.openSUSE.xml new/yast2-installation-2.18.27/control/control.openSUSE.xml --- old/yast2-installation-2.18.26/control/control.openSUSE.xml 2009-09-14 15:27:16.000000000 +0200 +++ new/yast2-installation-2.18.27/control/control.openSUSE.xml 2009-09-24 15:50:02.000000000 +0200 @@ -190,7 +190,7 @@ <online_repos_preselected config:type="boolean">false</online_repos_preselected>  - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_111_Servers.xml</external_sources_link> + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_112_Servers.xml</external_sources_link>  <dropped_packages>FreeNX NX RealPlayer ant-jai art-sharp asterisk asterisk-alsa asterisk-capi asterisk-spandsp asterisk-zaptel astools avalon-framework avalon-framework-manual avalon-logkit avalon-logkit-javadoc avmailgate bbtools bitchx blackbox colorgcc compat-curl2 cpp41 cpp42 cups-SUSE-ppds-dat db42 dbus-1-gtk devs dockutils dragonegg ejb-javadoc freeciv ftgl gal2 gcc41 gcc41-32bit gcc41-ada gcc41-c++ gcc41-fortran gcc41-fortran-32bit gcc41-gij gcc41-gij-32bit gcc41-info gcc41-java gcc41-locale gcc41-obj-c++ gcc41-objc gcc41-objc-32bitgcc42 gcc42-32bit gcc42-c++ gcc42-fortran gcc42-fortran-32bit gcc42-gij gcc42-info gcc42-java gcc42-objc gcc42-objc-32bit gconf-sharp gecko-sharp glade-sharp glib-sharp gnome-cups-manager gnome-filesystem gnome-keyring-manager gnome-mime-data gnome-printer-add gnome-sharp gtk-engines gtk-qt-engine gtk-sharp gtk-sharp-complete gtk-sharp-gapi gtkglarea gtkhtml-sharp2 hermes ial indeview ipgrab ipw3945d ircd jaf-demo jaf-javadoc jaf-manual jai java-1_4_2-cacao java-1_4_2-cacao-devel java-1_4_2-sun java-1_4_2-sun-devel java-1_4_2-sun-plugin javamail-manual jms-javadoc jmx jmx-javadoc jta jta-javadoc kbilliards kfs kino knx kssh libGraphicsMagick1 libMagick10 libWand10 libcurl2 libdjvulibre15 libdvdread3 libexiv2 libgcc41 libgcc41-32bit libgcj41 libgcj41-32bit libgcj41-devel libgcj42 libgcj42-devel libgfortran42 libgfortran42-32bit libgmime-2_0-2 libgpod libgpod2 libiniparser libiniparser-32bit libipoddevice libkdcraw1 libkexiv2 libltdl-3-32bit libmtp libmudflap41 libmudflap41-32bit libmudflap42 libmudflap42-32bit libpisync0 libpri libqtpod librasqal0 libsoprano3 libsoprano3-32bit libstdc++41 libstdc++41-32bit libstdc++41-devel libstdc++42-devel libusb libzypp-zmd-backend limal-bootloader man-pages-de multisync openbox perl-Xmms planmaker powersave-libs qjackconnect radiusclient resmgr-32bit rsaref rsvg-sharp2 rubygem-actionwebservice rug samba-pdb sax2-libsax-csharp siga simutrans sqlite-zmd supertux synce synce-kde tei_3 textmaker tomcat5 tomcat55 tomcat55-common-lib tomcat55-jasper tomcat55-jsp-2_0-api tomcat55-server-lib tomcat55-servlet-2_4-api tpb unace varmon vte-sharp vte-sharp2 websh wlan-kmp-xen xen-doc-ps xgl xgl-hardware-list xmms xmms-jack xmms-lib xmoto yast2-bluetooth yast2-bootfloppy yast2-power-management yast2-powertweak zaptel zaptel-kmp-default zen-updater zmd zope</dropped_packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.26/src/clients/inst_finish.ycp new/yast2-installation-2.18.27/src/clients/inst_finish.ycp --- old/yast2-installation-2.18.26/src/clients/inst_finish.ycp 2009-09-09 14:28:58.000000000 +0200 +++ new/yast2-installation-2.18.27/src/clients/inst_finish.ycp 2009-09-24 15:49:50.000000000 +0200 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 58352 2009-08-14 16:28:15Z kmachalkova $ + * $Id: inst_finish.ycp 58749 2009-09-24 13:49:49Z kmachalkova $ */ { @@ -167,6 +167,7 @@ "firewall_stage1", "ntp-client", "ssh_settings", + "ssh_service", "save_hw_status", "users", "autoinst_scripts2", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.26/src/inst_finish/ssh_service_finish.ycp new/yast2-installation-2.18.27/src/inst_finish/ssh_service_finish.ycp --- old/yast2-installation-2.18.26/src/inst_finish/ssh_service_finish.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.18.27/src/inst_finish/ssh_service_finish.ycp 2009-09-24 15:58:31.000000000 +0200 @@ -0,0 +1,63 @@ +/** + * File: + * ssh_service_finish.ycp + * + * Module: + * Step of base installation finish + * + * Author: + * Bubli <kmachalkova(a)suse.cz> + * + * $Id: ssh_service_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * + */ + +{ + +textdomain "installation"; + +import "Linuxrc"; +import "Service"; + + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +y2milestone ("starting ssh_service_finish"); +y2debug("func=%1", func); +y2debug("param=%1", param); + +if (func == "Info") +{ + return (any)$[ + "steps" : 1, + // progress step title + "title" : _("Enabling SSH service on installed system..."), + "when" : (Linuxrc::usessh () || Linuxrc::vnc()) ? [ `installation, `autoinst ] : [], + ]; +} +else if (func == "Write") +{ + y2milestone("SSH service will be enabled, this is SSH/VNC installation"); + Service::Enable("sshd"); +} +else +{ + y2error ("unknown function: %1", func); + ret = nil; +} + +y2debug("ret=%1", ret); +y2milestone("ssh_service_finish finished"); +return ret; + + +} /* EOF */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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-gtk for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Sun Sep 27 00:21:36 CEST 2009. -------- --- yast2-gtk/yast2-gtk.changes 2009-06-04 15:32:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2009-09-25 11:19:47.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 24 00:00:00 GMT 2009 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.19.10 +- package manager got a face re-lift +- fire the browser as the session's user (bcn#523694). +- table selection ignored for a few seconds (bnc#513085). +- complement our label mapping strategy with an array +of translatable yast2 labels (bnc#446524) +- always use black color on the text against the white +background regardless style (bnc#471059). +- don't show lock&remove options for patterns (bnc#489016). + +------------------------------------------------------------------- @@ -475,0 +489 @@ + calling whatdependson for head-i586 Old: ---- yast2-gtk-2.18.3.tar.bz2 New: ---- yast2-gtk-2.19.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.SsAin3/_old 2009-09-27 00:20:57.000000000 +0200 +++ /var/tmp/diff_new_pack.SsAin3/_new 2009-09-27 00:20:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-gtk (Version 2.18.3) +# spec file for package yast2-gtk (Version 2.19.11) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://en.opensuse.org/YaST2-GTK Name: yast2-gtk -Version: 2.18.3 +Version: 2.19.11 Release: 1 License: LGPL v2.1 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.18.3.tar.bz2 +Source0: yast2-gtk-2.19.11.tar.bz2 Prefix: /usr Source2: yast2-gtk-rpmlintrc BuildRequires: blocxx-devel gcc-c++ gtk2-devel libxcrypt-devel libzypp-devel yast2-devtools @@ -50,7 +50,7 @@ - %prep -%setup -n yast2-gtk-2.18.3 +%setup -n yast2-gtk-2.19.11 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-gtk-2.18.3.tar.bz2 -> yast2-gtk-2.19.11.tar.bz2 ++++++ ++++ 11798 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠Hilbert.suse.de 26 Sep '09

26 Sep '09

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Sun Sep 27 00:20:03 CEST 2009. -------- --- xen/xen.changes 2009-08-29 00:25:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2009-09-25 23:54:48.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Sep 25 15:08:12 MDT 2009 - jfehlig(a)novell.com + +- Add temporary workaround for race between xend writing and + qemu-dm reading from xenstore. The issue is preventing PV + domUs from booting as they have no backend console. + qemu-retry-be-status.patch +- bnc#520234 - npiv does not work with XEN + Update block-npiv +- bnc#496033 - Support for creating NPIV ports without starting vm + block-npiv-common.sh + block-npiv-vport + Update block-npiv +- bnc#500043 - Fix access to NPIV disk from HVM vm + Update xen-qemu-iscsi-fix.patch + +------------------------------------------------------------------- +Tue Sep 15 09:32:59 MDT 2009 - jfehlig(a)novell.com + +- bnc#513921 - Xen doesn't work get an eror when starting the + install processes or starting a pervious installed DomU + 20125-xc-parse-tuple-fix.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 20125-xc-parse-tuple-fix.patch block-npiv-common.sh block-npiv-vport qemu-retry-be-status.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.Z9Y08B/_old 2009-09-27 00:19:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Z9Y08B/_new 2009-09-27 00:19:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 3.4.1_19718_02) +# spec file for package xen (Version 3.4.1_19718_03) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,7 +37,7 @@ %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 3.4.1_19718_02 +Version: 3.4.1_19718_03 Release: 1 License: GPL v2 only Group: System/Kernel @@ -56,7 +56,9 @@ Source10: xmexample.disks Source11: block-nbd Source12: block-iscsi -Source13: block-npiv +Source13: block-npiv-common.sh +Source14: block-npiv +Source15: block-npiv-vport Source16: xmclone.sh Source17: xend-relocation.sh Source18: init.xen_loop @@ -79,6 +81,7 @@ Patch6: 20078-x86_64-branch-emulation.patch Patch7: 20101-hvm-no-compat-virt-start.patch Patch8: 20112-x86-dom0-boot-run-timers.patch +Patch9: 20125-xc-parse-tuple-fix.patch # Our patches Patch100: xen-config.diff Patch101: xend-config.diff @@ -169,6 +172,7 @@ Patch405: blktap-pv-cdrom.patch Patch406: network-nat-open-SuSEfirewall2-FORWARD.patch Patch407: ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch +Patch408: qemu-retry-be-status.patch %if %{?with_kmp}0 Patch450: disable_emulated_device.diff %endif @@ -519,6 +523,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -600,6 +605,7 @@ %patch405 -p1 %patch406 -p1 %patch407 -p1 +%patch408 -p1 %if %{?with_kmp}0 %patch450 -p1 %endif @@ -731,7 +737,7 @@ install -m644 %SOURCE9 %SOURCE10 $RPM_BUILD_ROOT/etc/xen/examples/ # scripts rm -f $RPM_BUILD_ROOT/etc/xen/scripts/block-*nbd -install -m755 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE16 %SOURCE17 $RPM_BUILD_ROOT/etc/xen/scripts/ +install -m755 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 %SOURCE15 %SOURCE16 %SOURCE17 $RPM_BUILD_ROOT/etc/xen/scripts/ ln -s /etc/xen/scripts/vm-monitor $RPM_BUILD_ROOT/etc/xen/scripts/set-lock # Xen API remote authentication files install -d $RPM_BUILD_ROOT/etc/pam.d ++++++ 20125-xc-parse-tuple-fix.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1251297719 -3600 # Node ID ed672a604cc7d0acb9418b29cdc3d65ea84543e8 # Parent 71389988f5d4e6417f7da1d86da984acd5118efc xend: Do not pass pointer to a 16-bit domid_t to PyArg_ParseTuple() when it expects a full integer. Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> diff -r 71389988f5d4 -r ed672a604cc7 tools/python/xen/lowlevel/xc/xc.c --- a/tools/python/xen/lowlevel/xc/xc.c Wed Aug 26 15:35:14 2009 +0100 +++ b/tools/python/xen/lowlevel/xc/xc.c Wed Aug 26 15:41:59 2009 +0100 @@ -654,10 +654,9 @@ static PyObject *pyxc_get_device_group(XcObject *self, PyObject *args) { - domid_t domid; uint32_t bdf = 0; uint32_t max_sdevs, num_sdevs; - int seg, bus, dev, func, rc, i; + int domid, seg, bus, dev, func, rc, i; PyObject *Pystr; char *group_str; char dev_str[9]; @@ -812,7 +811,7 @@ static PyObject *pyxc_dom_set_policy_cpuid(XcObject *self, PyObject *args) { - domid_t domid; + int domid; if ( !PyArg_ParseTuple(args, "i", &domid) ) return NULL; @@ -828,9 +827,8 @@ static PyObject *pyxc_dom_set_cpuid(XcObject *self, PyObject *args) { - domid_t domid; PyObject *sub_input, *config; - unsigned int input[2]; + unsigned int domid, input[2]; char *regs[4], *regs_transform[4]; if ( !PyArg_ParseTuple(args, "IIOO", &domid, ++++++ bdrv_open2_fix_flags.patch ++++++ --- /var/tmp/diff_new_pack.Z9Y08B/_old 2009-09-27 00:19:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Z9Y08B/_new 2009-09-27 00:19:32.000000000 +0200 @@ -19,7 +19,7 @@ - RDONLY as fallback */ if (!(flags & BDRV_O_FILE)) - open_flags = BDRV_O_RDWR | (flags & BDRV_O_CACHE_MASK); -+ open_flags = flags & BDRV_O_CACHE_MASK; ++ open_flags = flags; else open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT); + if (!(open_flags & BDRV_O_RDWR)) ++++++ block-npiv ++++++ --- /var/tmp/diff_new_pack.Z9Y08B/_old 2009-09-27 00:19:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Z9Y08B/_new 2009-09-27 00:19:32.000000000 +0200 @@ -3,209 +3,12 @@ # Usage: block-npiv [add npiv | remove dev] dir=$(dirname "$0") +. "$dir/block-npiv-common.sh" . "$dir/block-common.sh" #set -x #command=$1 -# Look for the NPIV vport with the WWPN -# $1 contains the WWPN (assumes it does not contain a leading "0x") -find_vhost() -{ - unset vhost - - # look in upstream locations - for fchost in /sys/class/fc_vports/* ; do - if test -e $fchost/port_name ; then - wwpn=`cat $fchost/port_name | sed -e s/^0x//` - if test $wwpn = $1 ; then - # Note: makes the assumption the vport will always have an scsi_host child - vhost=`ls -d $fchost/device/host*` - vhost=`basename $vhost` - return - fi - fi - done - - # look in vendor-specific locations - - # Emulex - just looks like another scsi_host - so look at fc_hosts... - for fchost in /sys/class/fc_host/* ; do - if test -e $fchost/port_name ; then - wwpn=`cat $fchost/port_name | sed -e s/^0x//` - if test $wwpn = $1 ; then - # Note: makes the assumption the vport will always have an scsi_host child - vhost=`basename $fchost` - return - fi - fi - done -} - - -# Create a NPIV vport on the fabric w/ FABRICNM, with WWPN,WWNN -# $1 contains FABRICNM -# $2 contains the VPORT WWPN -# $3 contains the VPORT WWNN -# (assumes no name contains a leading "0x") -create_vport() -{ - # find a base adapter with npiv support that is on the right fabric - - # Look via upstream interfaces - for fchost in /sys/class/fc_host/* ; do - if test -e $fchost/vport_create ; then - # is the link up, w/ NPIV support ? - pstate=`cat $fchost/port_state` - ptype=`cat $fchost/port_type | cut -c 1-5` - fname=`cat $fchost/fabric_name | sed -e s/^0x//` - if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then - vmax=`cat $fchost/max_npiv_vports` - vinuse=`cat $fchost/npiv_vports_inuse` - avail=`expr $vmax - $vinuse` - if [ $avail -gt 0 ] ; then - # create the vport - echo $2":"$3 > $fchost/vport_create - if [ $? -eq 0 ] ; then - return 0 - fi - # failed - so we'll just look for the next adapter - fi - fi - fi - done - - # Look in vendor-specific locations - - # Emulex: interfaces mirror upstream, but are under adapter scsi_host - for shost in /sys/class/scsi_host/* ; do - if [ -e $shost/vport_create ] ; then - fchost=`ls -d $shost/device/fc_host*` - # is the link up, w/ NPIV support ? - pstate=`cat $fchost/port_state` - ptype=`cat $fchost/port_type | cut -c 1-5` - fname=`cat $fchost/fabric_name | sed -e s/^0x//` - if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then - vmax=`cat $shost/max_npiv_vports` - vinuse=`cat $shost/npiv_vports_inuse` - avail=`expr $vmax - $vinuse` - if [ $avail -gt 0 ] ; then - # create the vport - echo $2":"$3 > $shost/vport_create - if [ $? -eq 0 ] ; then - return 0 - fi - # failed - so we'll just look for the next adapter - fi - fi - fi - done - - return 1 -} - - -# Look for the LUN on the indicated scsi_host (which is an NPIV vport) -# $1 is the scsi_host name (normalized to simply the hostX name) -# $2 is the WWPN of the tgt port the lun is on -# Note: this implies we don't support a multipath'd lun, or we -# are explicitly identifying a "path" -# $3 is the LUN number of the scsi device -find_sdev() -{ - unset dev - hostno=${1/*host/} - for sdev in /sys/class/scsi_device/${hostno}:*:$3 ; do - if test -e $sdev/device/../fc_trans*/port_name ; then - tgtwwpn=`cat $sdev/device/../fc_trans*/port_name | sed -e s/^0x//` - if test $tgtwwpn = $2 ; then - if test -e $sdev/device/block* ; then - dev=`readlink $sdev/device/block*` - dev=${dev##*/} - return - fi - fi - fi - done -} - - -# Look for the NPIV vhost based on a scsi "sdX" name -# $1 is the "sdX" name -find_vhost_from_dev() -{ - unset vhost - hostno=`readlink /sys/block/$1/device` - hostno=${hostno##*/} - hostno=${hostno%%:*} - if test -z "$hostno" ; then return; fi - vhost="host"$hostno -} - - -# We're about to terminate a vhost based on a scsi device -# Flush all nodes on that vhost as they are about to go away -# $1 is the vhost -flush_nodes_on_vhost() -{ - if test ! -x /sbin/blockdev ; then return; fi - hostno=${1/*host/} - for sdev in /sys/class/scsi_device/${hostno}:* ; do - if test -e $sdev/device/block* ; then - dev=`readlink $sdev/device/block*` - dev=${dev##*/} - dev="/dev/"$dev - if test -n "$dev"; then - blockdev --flushbufs $dev - fi - fi - done -} - - -# Terminate a NPIV vhost -# $1 is vhost -delete_vhost() -{ - # use upstream interface - for vport in /sys/class/fc_vports/* ; do - if test -e $vport/device/$1 ; then - if test -e $vport/vport_delete ; then - echo "1" > $vport/vport_delete - if test $? -ne 0 ; then exit 6; fi - sleep 4 - return - fi - fi - done - - # use vendor specific interface - - # Emulex - if test -e /sys/class/fc_host/$1/device/../scsi_host*/lpfc_drvr_version ; then - shost=`ls -1d /sys/class/fc_host/$1/device/../scsi_host* | sed s/.*scsi_host://` - vportwwpn=`cat /sys/class/fc_host/$1/port_name | sed s/^0x//` - vportwwnn=`cat /sys/class/fc_host/$1/node_name | sed s/^0x//` - echo "$vportwwpn:$vportwwnn" > /sys/class/scsi_host/$shost/vport_delete - if test $? -ne 0 ; then exit 6; fi - sleep 4 - return - fi - - # Qlogic - if test -e /sys/class/fc_host/$1/device/../scsi_host*/driver_version ; then - shost=`ls -1d /sys/class/fc_host/$1/device/../scsi_host* | sed s/.*scsi_host://` - vportwwpn=`cat /sys/class/fc_host/$1/port_name | sed s/^0x//` - vportwwnn=`cat /sys/class/fc_host/$1/node_name | sed s/^0x//` - echo "$vportwwpn:$vportwwnn" > /sys/class/scsi_host/$shost/vport_delete - if test $? -ne 0 ; then exit 6; fi - sleep 4 - return - fi - - exit 6 -} - case "$command" in add) # Params is one big arg, with fields separated by hyphens: ++++++ block-npiv-common.sh ++++++ # Look for the NPIV vport with the WWPN # $1 contains the WWPN (assumes it does not contain a leading "0x") find_vhost() { unset vhost # look in upstream locations for fchost in /sys/class/fc_vports/* ; do if test -e $fchost/port_name ; then wwpn=`cat $fchost/port_name | sed -e s/^0x//` if test $wwpn = $1 ; then # Note: makes the assumption the vport will always have an scsi_host child vhost=`ls -d $fchost/device/host*` vhost=`basename $vhost` return fi fi done # look in vendor-specific locations # Emulex - just looks like another scsi_host - so look at fc_hosts... for fchost in /sys/class/fc_host/* ; do if test -e $fchost/port_name ; then wwpn=`cat $fchost/port_name | sed -e s/^0x//` if test $wwpn = $1 ; then # Note: makes the assumption the vport will always have an scsi_host child vhost=`basename $fchost` return fi fi done } # Create a NPIV vport on the fabric w/ FABRICNM, with WWPN,WWNN # $1 contains FABRICNM # $2 contains the VPORT WWPN # $3 contains the VPORT WWNN # (assumes no name contains a leading "0x") create_vport() { # find a base adapter with npiv support that is on the right fabric # Look via upstream interfaces for fchost in /sys/class/fc_host/* ; do if test -e $fchost/vport_create ; then # is the link up, w/ NPIV support ? pstate=`cat $fchost/port_state` ptype=`cat $fchost/port_type | cut -c 1-5` fname=`cat $fchost/fabric_name | sed -e s/^0x//` if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then vmax=`cat $fchost/max_npiv_vports` vinuse=`cat $fchost/npiv_vports_inuse` avail=`expr $vmax - $vinuse` if [ $avail -gt 0 ] ; then # create the vport echo $2":"$3 > $fchost/vport_create if [ $? -eq 0 ] ; then return 0 fi # failed - so we'll just look for the next adapter fi fi fi done # Look in vendor-specific locations # Emulex: interfaces mirror upstream, but are under adapter scsi_host for shost in /sys/class/scsi_host/* ; do if [ -e $shost/vport_create ] ; then fchost=`ls -d $shost/device/fc_host*` # is the link up, w/ NPIV support ? pstate=`cat $fchost/port_state` ptype=`cat $fchost/port_type | cut -c 1-5` fname=`cat $fchost/fabric_name | sed -e s/^0x//` if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then vmax=`cat $shost/max_npiv_vports` vinuse=`cat $shost/npiv_vports_inuse` avail=`expr $vmax - $vinuse` if [ $avail -gt 0 ] ; then # create the vport echo $2":"$3 > $shost/vport_create if [ $? -eq 0 ] ; then return 0 fi # failed - so we'll just look for the next adapter fi fi fi done return 1 } # Look for the LUN on the indicated scsi_host (which is an NPIV vport) # $1 is the scsi_host name (normalized to simply the hostX name) # $2 is the WWPN of the tgt port the lun is on # Note: this implies we don't support a multipath'd lun, or we # are explicitly identifying a "path" # $3 is the LUN number of the scsi device find_sdev() { unset dev hostno=${1/*host/} for sdev in /sys/class/scsi_device/${hostno}:*:$3 ; do if test -e $sdev/device/../fc_trans*/target${hostno}*/port_name ; then tgtwwpn=`cat $sdev/device/../fc_trans*/target${hostno}*/port_name | sed -e s/^0x//` if test $tgtwwpn = $2 ; then if test -e $sdev/device/block* ; then dev=`ls $sdev/device/block*` dev=${dev##*/} return fi fi fi done } # Look for the NPIV vhost based on a scsi "sdX" name # $1 is the "sdX" name find_vhost_from_dev() { unset vhost hostno=`readlink /sys/block/$1/device` hostno=${hostno##*/} hostno=${hostno%%:*} if test -z "$hostno" ; then return; fi vhost="host"$hostno } # We're about to terminate a vhost based on a scsi device # Flush all nodes on that vhost as they are about to go away # $1 is the vhost flush_nodes_on_vhost() { if test ! -x /sbin/blockdev ; then return; fi hostno=${1/*host/} for sdev in /sys/class/scsi_device/${hostno}:* ; do if test -e $sdev/device/block* ; then dev=`ls $sdev/device/block*` dev="/dev/"$dev if test -n "$dev"; then blockdev --flushbufs $dev fi fi done } # Terminate a NPIV vhost # $1 is vhost delete_vhost() { # use upstream interface for vport in /sys/class/fc_vports/* ; do if test -e $vport/device/$1 ; then if test -e $vport/vport_delete ; then echo "1" > $vport/vport_delete if test $? -ne 0 ; then exit 6; fi sleep 4 return fi fi done # use vendor specific interface # Emulex if test -e /sys/class/fc_host/$1/device/../scsi_host*/lpfc_drvr_version ; then shost=`ls -1d /sys/class/fc_host/$1/device/../scsi_host* | sed s/.*scsi_host://` vportwwpn=`cat /sys/class/fc_host/$1/port_name | sed s/^0x//` vportwwnn=`cat /sys/class/fc_host/$1/node_name | sed s/^0x//` echo "$vportwwpn:$vportwwnn" > /sys/class/scsi_host/$shost/vport_delete if test $? -ne 0 ; then exit 6; fi sleep 4 return fi # Qlogic if test -e /sys/class/fc_host/$1/device/../scsi_host*/driver_version ; then shost=`ls -1d /sys/class/fc_host/$1/device/../scsi_host* | sed s/.*scsi_host://` vportwwpn=`cat /sys/class/fc_host/$1/port_name | sed s/^0x//` vportwwnn=`cat /sys/class/fc_host/$1/node_name | sed s/^0x//` echo "$vportwwpn:$vportwwnn" > /sys/class/scsi_host/$shost/vport_delete if test $? -ne 0 ; then exit 6; fi sleep 4 return fi exit 6 } vport_status() { # Look via upstream interfaces for fchost in /sys/class/fc_host/* ; do if test -e $fchost/vport_create ; then vport_status_display $fchost $fchost fi done # Look in vendor-specific locations # Emulex: interfaces mirror upstream, but are under adapter scsi_host for shost in /sys/class/scsi_host/* ; do if [ -e $shost/vport_create ] ; then fchost=`ls -d $shost/device/fc_host*` vport_status_display $fchost $shost fi done return 0 } vport_status_display() { echo echo "fc_host: " $2 echo "port_state: " `cat $1/port_state` echo "port_type: " `cat $1/port_type` echo "fabric_name: " `cat $1/fabric_name` echo "max_npiv_vports: " `cat $2/max_npiv_vports` echo "npiv_vports_inuse: " `cat $2/npiv_vports_inuse` echo "modeldesc: " `cat $2/modeldesc` echo "speed: " `cat $1/speed` return 0 } ++++++ block-npiv-vport ++++++ #!/bin/bash # Usage: block-npiv-vport [create npivargs | delete vportwwpn | status] dir=$(dirname "$0") . "$dir/block-npiv-common.sh" #set -x command=$1 params=$2 case "$command" in create) # Params is one big arg, with fields separated by hyphens: # FABRIC-VPWWPN-VPWWNN-TGTWWPN-LUN# # arg 2 - Fabric Name # arg 3 - VPORT's WWPN # arg 4 - VPORT's WWNN # arg 5 - Target's WWPN # arg 6 - LUN # on Target # no wwn contains a leading 0x - it is a 16 character hex value # You may want to optionally pick a specific adapter ? NPIVARGS=$params; LUN=${NPIVARGS##*-*-*-*-}; NPIVARGS=${NPIVARGS%-*} if test $LUN = $NPIVARGS ; then exit 1; fi TGTWWPN=${NPIVARGS##*-*-*-}; NPIVARGS=${NPIVARGS%-*} if test $TGTWWPN = $NPIVARGS ; then exit 1; fi VPORTWWNN=${NPIVARGS##*-*-}; NPIVARGS=${NPIVARGS%-*} if test $VPORTWWNN = $NPIVARGS ; then exit 1; fi VPORTWWPN=${NPIVARGS##*-}; NPIVARGS=${NPIVARGS%-*} if test $VPORTWWPN = $NPIVARGS ; then exit 1; fi FABRICNM=$NPIVARGS # Ensure we compare everything using lower-case hex characters TGTWWPN=`echo $TGTWWPN | tr A-Z a-z` VPORTWWPN=`echo $VPORTWWPN | tr A-Z a-z` VPORTWWNN=`echo $VPORTWWNN | tr A-Z a-z` FABRICNM=`echo $FABRICNM | tr A-Z a-z` find_vhost $VPORTWWPN if test -z "$vhost" ; then create_vport $FABRICNM $VPORTWWPN $VPORTWWNN if [ $? -ne 0 ] ; then exit 2; fi sleep 8 find_vhost $VPORTWWPN if test -z "$vhost" ; then exit 3; fi fi exit 0 ;; delete) # Params is VPORT's WWPN # no wwn contains a leading 0x - it is a 16 character hex value VPORTWWPN=$params # Ensure we compare everything using lower-case hex characters VPORTWWPN=`echo $VPORTWWPN | tr A-Z a-z` find_vhost $VPORTWWPN if test -z "$vhost" ; then exit 4; fi delete_vhost $vhost exit 0 ;; status) vport_status exit 0 ;; *) echo "Usage: block-npiv-vport [create npivargs | delete vportwwpn | status]" exit 1 ;; esac ++++++ ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch ++++++ --- /var/tmp/diff_new_pack.Z9Y08B/_old 2009-09-27 00:19:33.000000000 +0200 +++ /var/tmp/diff_new_pack.Z9Y08B/_new 2009-09-27 00:19:33.000000000 +0200 @@ -26,7 +26,7 @@ for (i = 0; i < j; i++) - free_any_clusters(bs, old_cluster[i], 1); -+ free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1); ++ free_any_clusters(bs, be64_to_cpu(old_cluster[i]) & ~QCOW_OFLAG_COPIED, 1); ret = 0; err: ++++++ qemu-retry-be-status.patch ++++++ Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_backend.c =================================================================== --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_backend.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_backend.c @@ -377,8 +377,12 @@ static int xen_be_try_init(struct XenDev int rc = 0; if (!xendev->online) { - xen_be_printf(xendev, 1, "not online\n"); - return -1; + sleep(3); + xenstore_read_be_int(xendev, "online", &xendev->online); + if (!xendev->online) { + xen_be_printf(xendev, 1, "not online\n"); + return -1; + } } if (xendev->ops->init) Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_console.c =================================================================== --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_console.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_console.c @@ -196,9 +196,14 @@ static int con_init(struct XenDevice *xe type = xenstore_read_str(con->console, "type"); if (!type || 0 != strcmp(type, "ioemu")) { - xen_be_printf(xendev, 1, "not for me (type=%s)\n", type); - return -1; + sleep(3); + type = xenstore_read_str(con->console, "type"); + if (!type || 0 != strcmp(type, "ioemu")) { + xen_be_printf(xendev, 1, "not for me (type=%s)\n", type); + return -1; + } } + qemu_free(type); if (!serial_hds[con->xendev.dev]) xen_be_printf(xendev, 1, "WARNING: serial line %d not configured\n", ++++++ xen-qemu-iscsi-fix.patch ++++++ --- /var/tmp/diff_new_pack.Z9Y08B/_old 2009-09-27 00:19:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Z9Y08B/_new 2009-09-27 00:19:34.000000000 +0200 @@ -31,12 +31,12 @@ continue; + + free(params); -+ if (!strcmp(drv,"iscsi")) ++ if (!strcmp(drv,"iscsi") || !strcmp(drv, "npiv")) + { + if (pasprintf(&buf, "%s/node", bpath) == -1) + continue; + -+ /* wait for block-iscsi script to complete and populate the ++ /* wait for block-[iscsi|npiv] script to complete and populate the + * node entry. try 30 times (30 secs) */ + for (j = 0; j < 30; j++) { + params = xs_read(xsh, XBT_NULL, buf, &len); @@ -45,7 +45,7 @@ + sleep(1); + } + if (params == NULL) { -+ fprintf(stderr, "qemu: iscsi device not found -- timed out \n"); ++ fprintf(stderr, "qemu: %s device not found -- timed out \n", drv); + continue; + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0