April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-theme for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2014-04-26 11:45:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-SLE.changes 2014-04-05 14:42:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-SLE.changes 2014-04-26 11:45:19.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Apr 24 06:44:46 UTC 2014 - jsrain(a)suse.cz + +- graphics and style adjustments by Ken Wimer (bnc#868722) +- 3.1.17 + +------------------------------------------------------------------- +Wed Apr 23 08:55:46 UTC 2014 - jsrain(a)suse.cz + +- added style for header bar with logo (bnc#868722) +- 3.1.16 + +------------------------------------------------------------------- +Wed Apr 16 09:40:01 CEST 2014 - locilka(a)suse.com + +- New dialog labels, text hightlighting, BarGraph, Tab shifting + buttons (by Ken Wimer) + (bnc#869727, bnc#868268) +- 3.1.15 + +------------------------------------------------------------------- yast2-theme.changes: same change Old: ---- yast2-theme-3.1.14.tar.bz2 New: ---- yast2-theme-3.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme-SLE.spec ++++++ --- /var/tmp/diff_new_pack.41Oqyf/_old 2014-04-26 11:45:21.000000000 +0200 +++ /var/tmp/diff_new_pack.41Oqyf/_new 2014-04-26 11:45:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme-SLE -Version: 3.1.14 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build yast2-theme.spec: same change ++++++ yast2-theme-3.1.14.tar.bz2 -> yast2-theme-3.1.17.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-3.1.14.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-3.1.17.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-04-26 11:45:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-04-13 13:13:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-04-26 11:45:17.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 22 13:55:01 CEST 2014 - aschnell(a)suse.de + +- moved lock file to /run/libstorage + +------------------------------------------------------------------- +Fri Apr 11 18:10:00 CEST 2014 - aschnell(a)suse.de + +- removed workaround for blkid file-system misdetection + (bnc#869359) +- 2.25.12 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.11.tar.bz2 New: ---- libstorage-2.25.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.fAqgBQ/_old 2014-04-26 11:45:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fAqgBQ/_new 2014-04-26 11:45:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.11 +Version: 2.25.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 @@ -90,8 +90,8 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -install -d -m 755 $RPM_BUILD_ROOT/var/run/libstorage -touch $RPM_BUILD_ROOT/var/run/libstorage/lock +install -d -m 755 $RPM_BUILD_ROOT/run/libstorage +touch $RPM_BUILD_ROOT/run/libstorage/lock %{find_lang} libstorage @@ -153,7 +153,7 @@ %files -n libstorage5 -f libstorage.lang %defattr(-,root,root) %{_libdir}/libstorage.so.* -%ghost /var/run/libstorage +%ghost /run/libstorage /var/adm/fillup-templates/sysconfig.storage-libstorage %doc %dir %{prefix}/share/doc/packages/libstorage %doc %{prefix}/share/doc/packages/libstorage/AUTHORS ++++++ libstorage-2.25.11.tar.bz2 -> libstorage-2.25.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/VERSION new/libstorage-2.25.12/VERSION --- old/libstorage-2.25.11/VERSION 2014-03-25 14:10:55.000000000 +0100 +++ new/libstorage-2.25.12/VERSION 2014-04-14 10:23:54.000000000 +0200 @@ -1 +1 @@ -2.25.11 +2.25.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/libstorage.spec.in new/libstorage-2.25.12/libstorage.spec.in --- old/libstorage-2.25.11/libstorage.spec.in 2014-04-08 14:04:19.000000000 +0200 +++ new/libstorage-2.25.12/libstorage.spec.in 2014-04-22 14:12:23.000000000 +0200 @@ -82,8 +82,8 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -install -d -m 755 $RPM_BUILD_ROOT/var/run/libstorage -touch $RPM_BUILD_ROOT/var/run/libstorage/lock +install -d -m 755 $RPM_BUILD_ROOT/run/libstorage +touch $RPM_BUILD_ROOT/run/libstorage/lock %{find_lang} libstorage @@ -145,7 +145,7 @@ %files -n libstorage@LIBVERSION_MAJOR@ -f libstorage.lang %defattr(-,root,root) %{_libdir}/libstorage.so.* -%ghost /var/run/libstorage +%ghost /run/libstorage /var/adm/fillup-templates/sysconfig.storage-libstorage %doc %dir %{prefix}/share/doc/packages/libstorage %doc %{prefix}/share/doc/packages/libstorage/AUTHORS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/Lock.cc new/libstorage-2.25.12/storage/Lock.cc --- old/libstorage-2.25.11/storage/Lock.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.12/storage/Lock.cc 2014-04-22 14:12:23.000000000 +0200 @@ -33,6 +33,9 @@ #include "storage/Lock.h" +#define LOCKDIR "/run/libstorage" + + namespace storage { @@ -56,12 +59,12 @@ y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); - if (mkdir("/var/run/libstorage", 0755) == -1 && errno != EEXIST) + if (mkdir(LOCKDIR, 0755) == -1 && errno != EEXIST) { y2err("creating directory for lock-file failed: " << strerror(errno)); } - fd = open("/var/run/libstorage/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT | O_CLOEXEC, + fd = open(LOCKDIR "/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (fd < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/Storage.cc new/libstorage-2.25.12/storage/Storage.cc --- old/libstorage-2.25.11/storage/Storage.cc 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.12/storage/Storage.cc 2014-04-15 12:13:27.000000000 +0200 @@ -4310,7 +4310,6 @@ ret = co.addNfs(nfsDev, 0, opts, "", nfs4); if( instsys() ) { - SystemCmd c; string prog_name = RPCBINDBIN; //We don't have rpcbind (#423026, #427428) ... @@ -4321,8 +4320,9 @@ prog_name = PORTMAPBIN; } + SystemCmd c; c.execute( prog_name ); - c.execute( "/usr/sbin/rpc.statd" ); + c.execute(RPCSTATDBIN); } if( ret==0 && (ret=co.vBegin()->mount( mdir ))==0 ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/StorageDefines.h new/libstorage-2.25.12/storage/StorageDefines.h --- old/libstorage-2.25.11/storage/StorageDefines.h 2014-02-24 14:59:33.000000000 +0100 +++ new/libstorage-2.25.12/storage/StorageDefines.h 2014-04-15 12:13:27.000000000 +0200 @@ -84,6 +84,7 @@ #define GREPBIN "/usr/bin/grep" #define PORTMAPBIN "/sbin/portmap" #define RPCBINDBIN "/sbin/rpcbind" +#define RPCSTATDBIN "/usr/sbin/rpc.statd" #define NTFSRESIZEBIN "/usr/sbin/ntfsresize" #define XFSGROWFSBIN "/usr/sbin/xfs_growfs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/SystemInfo/CmdBlkid.cc new/libstorage-2.25.12/storage/SystemInfo/CmdBlkid.cc --- old/libstorage-2.25.11/storage/SystemInfo/CmdBlkid.cc 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.12/storage/SystemInfo/CmdBlkid.cc 2014-04-14 10:23:54.000000000 +0200 @@ -110,17 +110,6 @@ } } - i = m.find("SEC_TYPE"); - if (i != m.end()) - { - map<string, FsType>::const_iterator it2 = fs_table.find(i->second); - if (it2 != fs_table.end()) - { - entry.is_fs = true; - entry.fs_type = it2->second; - } - } - if (entry.is_fs) { i = m.find("UUID"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/gen_md5sum.cc new/libstorage-2.25.12/storage/gen_md5sum.cc --- old/libstorage-2.25.11/storage/gen_md5sum.cc 2014-04-08 14:05:38.000000000 +0200 +++ new/libstorage-2.25.12/storage/gen_md5sum.cc 2014-04-22 14:12:26.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "277120fc472f2cc939a01a797317df12" -#define SOURCES_MD5_DATE " Tue 8 Apr 14:05:38 CEST 2014 " +#define SOURCES_MD5SUM "ce93c2502ebd3b2b7021850a607862fa" +#define SOURCES_MD5_DATE " Tue 22 Apr 14:12:26 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/testsuite/single.out/blkid.out new/libstorage-2.25.12/testsuite/single.out/blkid.out --- old/libstorage-2.25.11/testsuite/single.out/blkid.out 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.12/testsuite/single.out/blkid.out 2014-04-14 10:23:54.000000000 +0200 @@ -16,5 +16,5 @@ data[/dev/sda2] -> is_luks:true luks_uuid:f98def5a-6553-49a1-940d-df55a77d7d28 parse3 -data[/dev/dasda1] -> is_fs:true fs_type:ext2 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 +data[/dev/dasda1] -> is_fs:true fs_type:ext4 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 -- 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-pkg-bindings for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2014-04-26 11:45:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2014-04-13 13:13:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2014-04-26 11:45:15.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 22 12:40:55 UTC 2014 - lslezak(a)suse.cz + +- remeber the base product NVRA (instead of the zypp product + reference which might be invalidated) to properly create the + /etc/products.d/baseproduct symlink (bnc#873885) +- 3.1.9 + +------------------------------------------------------------------- +Tue Apr 15 14:48:45 UTC 2014 - lslezak(a)suse.cz + +- fixed repeated service save problem (bnc#873198, bnc#873683#c7) +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.7.tar.bz2 New: ---- yast2-pkg-bindings-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.1PdtvQ/_old 2014-04-26 11:45:16.000000000 +0200 +++ /var/tmp/diff_new_pack.1PdtvQ/_new 2014-04-26 11:45:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.1PdtvQ/_old 2014-04-26 11:45:16.000000000 +0200 +++ /var/tmp/diff_new_pack.1PdtvQ/_new 2014-04-26 11:45:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-3.1.7.tar.bz2 -> yast2-pkg-bindings-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings-devel-doc.spec 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings-devel-doc.spec 2014-04-22 16:21:42.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 3.1.7 +Version: 3.1.9 Release: 0 License: GPL-2.0 Group: Documentation/HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.changes 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.changes 2014-04-22 16:21:42.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Apr 22 12:40:55 UTC 2014 - lslezak(a)suse.cz + +- remeber the base product NVRA (instead of the zypp product + reference which might be invalidated) to properly create the + /etc/products.d/baseproduct symlink (bnc#873885) +- 3.1.9 + +------------------------------------------------------------------- +Tue Apr 15 14:48:45 UTC 2014 - lslezak(a)suse.cz + +- fixed repeated service save problem (bnc#873198, bnc#873683#c7) +- 3.1.8 + +------------------------------------------------------------------- Wed Apr 2 15:11:58 UTC 2014 - lslezak(a)suse.cz - properly initialize "autorefresh_skipped" attribute (leaving it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.spec 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.spec 2014-04-22 16:21:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/BaseProduct.cc new/yast2-pkg-bindings-3.1.9/src/BaseProduct.cc --- old/yast2-pkg-bindings-3.1.7/src/BaseProduct.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.9/src/BaseProduct.cc 2014-04-22 16:21:42.000000000 +0200 @@ -0,0 +1,22 @@ +/* + * File: BaseProduct.cc + * Author: lslezak(a)suse.cz + * + */ + +#include "BaseProduct.h" + +BaseProduct::BaseProduct( + const std::string& product_name, + const zypp::Edition& product_edition, + const zypp::Arch& product_arch, + const std::string& source_repo_alias +) : + name(product_name), + edition(product_edition), + arch(product_arch), + repo_alias(source_repo_alias) +{ +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/BaseProduct.h new/yast2-pkg-bindings-3.1.9/src/BaseProduct.h --- old/yast2-pkg-bindings-3.1.7/src/BaseProduct.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.9/src/BaseProduct.h 2014-04-22 16:21:42.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * File: BaseProduct.h + * Author: lslezak(a)suse.cz + * + * Remember the attributes of the base product for creating the + * /etc/products.d/baseproduct symlink. + * + * (Note: zypp::Product reference cannot be used as it might be invalidated + * after adding/removing repositories or at target reload after commit.) + */ + +#ifndef BASEPRODUCT_H +#define BASEPRODUCT_H + +#include <string> +#include <zypp/Edition.h> +#include <zypp/Arch.h> + +class BaseProduct { + +public: + BaseProduct( + const std::string& product_name, + const zypp::Edition& product_edition, + const zypp::Arch& product_arch, + const std::string& source_repo_alias + ); + + std::string name; + // zypp::Edition contains both version and release + zypp::Edition edition; + zypp::Arch arch; + std::string repo_alias; +}; + +#endif /* BASEPRODUCT_H */ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Makefile.am new/yast2-pkg-bindings-3.1.9/src/Makefile.am --- old/yast2-pkg-bindings-3.1.7/src/Makefile.am 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Makefile.am 2014-04-22 16:21:42.000000000 +0200 @@ -53,6 +53,7 @@ ServiceManager.cc ServiceManager.h \ Service.cc \ Network.cc \ + BaseProduct.h BaseProduct.cc \ HelpTexts.h i18n.h log.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Package.cc new/yast2-pkg-bindings-3.1.9/src/Package.cc --- old/yast2-pkg-bindings-3.1.7/src/Package.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Package.cc 2014-04-22 16:21:42.000000000 +0200 @@ -2643,6 +2643,53 @@ return MPS2YCPMap( ducounter.disk_usage( pkg ) ); } + +zypp::Product::constPtr PkgFunctions::FindInstalledBaseProduct() +{ + // access to the Pool of Selectables + zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); + + // iterate over zypp::Products + for_(product_it, selectablePool.byKindBegin<zypp::Product>(), + selectablePool.byKindEnd<zypp::Product>()) + { + // search an installed product + for_(installed_product_it, (*product_it)->installedBegin(), + (*product_it)->installedEnd()) + { + // get the resolvable + zypp::ResObject::constPtr res = *installed_product_it; + + // check if NVRA matches the base product + if (res && res->name() == base_product->name && + res->edition() == base_product->edition && + res->arch() == base_product->arch) + + { + zypp::Product::constPtr product = + boost::dynamic_pointer_cast<const zypp::Product>(res); + + if (product) + { + y2milestone("Found installed base product: %s-%s-%s (%s)", + product->name().c_str(), + product->edition().asString().c_str(), + product->arch().asString().c_str(), + product->summary().c_str() + ); + + return product; + } + } + } + } + + // matching installed product was not found + y2error("Cannot find the installed base product"); + + return NULL; +} + // helper function - create a symbolic link to the created base product (by SourceCreateBase() function) // returns 'true' on success // see http://en.opensuse.org/Product_Management/Code11/installed @@ -2653,7 +2700,10 @@ y2milestone("Creating symlink for the base product..."); // get the package - zypp::sat::Solvable refsolvable = base_product->referencePackage(); + zypp::Product::constPtr installed_product = FindInstalledBaseProduct(); + if (!installed_product) return false; + + zypp::sat::Solvable refsolvable = installed_product->referencePackage(); if (refsolvable != zypp::sat::Solvable::noSolvable) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.cc new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.cc --- old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.cc 2014-04-22 16:21:42.000000000 +0200 @@ -141,6 +141,7 @@ if (base_product) { + delete base_product; base_product = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.h new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.h --- old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.h 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.h 2014-04-22 16:21:42.000000000 +0200 @@ -55,6 +55,7 @@ #include <i18n.h> #include "ServiceManager.h" +#include "BaseProduct.h" #include "PkgError.h" class PkgProgress; @@ -160,7 +161,9 @@ bool aliasExists(const std::string &alias, const std::list<zypp::RepoInfo> &reps) const; - zypp::Product::constPtr FindBaseProduct(const std::string &alias) const; + // remember the base product attributes for finding it later in + // the installed system + void RememberBaseProduct(const std::string &alias); zypp::RepoManager* CreateRepoManager(); @@ -224,7 +227,7 @@ ServiceManager service_manager; - zypp::Product::constPtr base_product; + BaseProduct* base_product; std::vector<zypp::filesystem::TmpDir> tmp_dirs; @@ -260,6 +263,9 @@ // helper for installing/removing/upgrading a resolvable bool ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action); + // it finds the resolvable using attributes saved earlier by RememberBaseProduct + zypp::Product::constPtr FindInstalledBaseProduct(); + public: // general /* TYPEINFO: void(string) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgService.cc new/yast2-pkg-bindings-3.1.9/src/PkgService.cc --- old/yast2-pkg-bindings-3.1.7/src/PkgService.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgService.cc 2014-04-16 11:31:36.000000000 +0200 @@ -54,3 +54,7 @@ return _old_alias; } +void PkgService::setOrigAlias(const std::string& orig_alias) +{ + _old_alias = orig_alias; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgService.h new/yast2-pkg-bindings-3.1.9/src/PkgService.h --- old/yast2-pkg-bindings-3.1.7/src/PkgService.h 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgService.h 2014-04-16 11:31:36.000000000 +0200 @@ -40,6 +40,7 @@ std::string origAlias() const; + void setOrigAlias(const std::string& orig_alias); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/ServiceManager.cc new/yast2-pkg-bindings-3.1.9/src/ServiceManager.cc --- old/yast2-pkg-bindings-3.1.7/src/ServiceManager.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/ServiceManager.cc 2014-04-16 11:31:36.000000000 +0200 @@ -53,7 +53,7 @@ } } -void ServiceManager::SaveServices(zypp::RepoManager &repomgr) const +void ServiceManager::SaveServices(zypp::RepoManager &repomgr) { for_ (it, _known_services.begin(), _known_services.end()) { @@ -75,9 +75,9 @@ } } -bool ServiceManager::SaveService(const std::string &alias, zypp::RepoManager &repomgr) const +bool ServiceManager::SaveService(const std::string &alias, zypp::RepoManager &repomgr) { - PkgServices::const_iterator serv_it = _known_services.find(alias); + PkgServices::iterator serv_it = _known_services.find(alias); if (serv_it == _known_services.end()) { @@ -287,7 +287,7 @@ return _known_services.size(); } -void ServiceManager::SavePkgService(const PkgService &s_known, zypp::RepoManager &repomgr) const +void ServiceManager::SavePkgService(PkgService &s_known, zypp::RepoManager &repomgr) const { const std::string alias(s_known.alias()); const zypp::ServiceInfo s_stored = repomgr.getService(alias); @@ -305,6 +305,8 @@ y2milestone("Adding new service %s", alias.c_str()); // add the service repomgr.addService(s_known); + // set the old alias to properly save it next time + s_known.setOrigAlias(alias); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/ServiceManager.h new/yast2-pkg-bindings-3.1.9/src/ServiceManager.h --- old/yast2-pkg-bindings-3.1.7/src/ServiceManager.h 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/ServiceManager.h 2014-04-16 11:31:36.000000000 +0200 @@ -42,9 +42,9 @@ void LoadServices(const zypp::RepoManager &repomgr); - void SaveServices(zypp::RepoManager &repomgr) const; + void SaveServices(zypp::RepoManager &repomgr); - bool SaveService(const std::string &alias, zypp::RepoManager &repomgr) const; + bool SaveService(const std::string &alias, zypp::RepoManager &repomgr); bool AddService(const std::string &alias, const std::string &url); @@ -70,7 +70,7 @@ private: // internal helper method - void SavePkgService(const PkgService &s_known, zypp::RepoManager &repomgr) const; + void SavePkgService(PkgService &s_known, zypp::RepoManager &repomgr) const; // current alias -> PkgService for convenient search by alias typedef std::map<std::string, PkgService> PkgServices; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Source_Create.cc new/yast2-pkg-bindings-3.1.9/src/Source_Create.cc --- old/yast2-pkg-bindings-3.1.7/src/Source_Create.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Source_Create.cc 2014-04-22 16:21:42.000000000 +0200 @@ -674,7 +674,7 @@ if (base && !base_product) { y2milestone("Searching a base product..."); - base_product = FindBaseProduct(repo->repoInfo().alias()); + RememberBaseProduct(repo->repoInfo().alias()); } } catch ( const zypp::Exception& excpt) @@ -709,7 +709,7 @@ if (base && !base_product) { y2milestone("Searching the base product..."); - base_product = FindBaseProduct(repo->repoInfo().alias()); + RememberBaseProduct(repo->repoInfo().alias()); } } } @@ -872,10 +872,8 @@ return ret; } -zypp::Product::constPtr PkgFunctions::FindBaseProduct(const std::string &alias) const +void PkgFunctions::RememberBaseProduct(const std::string &alias) { - zypp::Product::constPtr product = NULL; - // access to the Pool of Selectables zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); @@ -891,35 +889,28 @@ // check the repository if (res && res->repoInfo().alias() == alias) { - product = boost::dynamic_pointer_cast<const zypp::Product>(res); + zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(res); if (product) { - break; + y2milestone("Found base product: %s-%s-%s (%s)", + product->name().c_str(), + product->edition().asString().c_str(), + product->arch().asString().c_str(), + product->summary().c_str() + ); + + base_product = new BaseProduct( + product->name(), + product->edition(), + product->arch(), + alias + ); } } } - - if (product) - { - break; - } } // no product in the pool - if (!product) - { - y2error("No base product has been found"); - } - else - { - y2milestone("Found base product: %s %s (%s-%s)", - product->summary().c_str(), - product->edition().asString().c_str(), - product->name().c_str(), - product->edition().asString().c_str() - ); - } - - return product; + y2error("No base product has been found"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Source_Set.cc new/yast2-pkg-bindings-3.1.9/src/Source_Set.cc --- old/yast2-pkg-bindings-3.1.7/src/Source_Set.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Source_Set.cc 2014-04-22 16:21:42.000000000 +0200 @@ -374,9 +374,10 @@ repo->setDeleted(); // removing the base product repository? - if (base_product && base_product->repoInfo().alias() == repo_alias) + if (base_product && base_product->repo_alias == repo_alias) { y2warning("Resetting the base product, the base product repository has been removed"); + delete base_product; base_product = NULL; } } -- 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-ruby-bindings for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-ruby-bindings for openSUSE:Factory checked in at 2014-04-26 11:45:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ruby-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-03-21 12:14:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new/yast2-ruby-bindings.changes 2014-04-26 11:45:13.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 22 09:31:18 UTC 2014 - jreidinger(a)suse.com + +- Fix hang out of YaST2 in Turkish locale(bnc#852242) +- 3.1.16 + +------------------------------------------------------------------- Old: ---- yast2-ruby-bindings-3.1.15.tar.bz2 New: ---- yast2-ruby-bindings-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.rW18w5/_old 2014-04-26 11:45:15.000000000 +0200 +++ /var/tmp/diff_new_pack.rW18w5/_new 2014-04-26 11:45:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 ++++++ yast2-ruby-bindings-3.1.15.tar.bz2 -> yast2-ruby-bindings-3.1.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.changes 2014-03-14 20:50:36.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.changes 2014-04-22 14:36:42.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 22 09:31:18 UTC 2014 - jreidinger(a)suse.com + +- Fix hang out of YaST2 in Turkish locale(bnc#852242) +- 3.1.16 + +------------------------------------------------------------------- Fri Mar 14 15:33:30 UTC 2014 - mvidner(a)suse.com - Show the caller in the Internal error popup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.spec 2014-03-14 20:50:36.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.spec 2014-04-22 14:36:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.15/src/binary/Y2RubyComponent.cc new/yast2-ruby-bindings-3.1.16/src/binary/Y2RubyComponent.cc --- old/yast2-ruby-bindings-3.1.15/src/binary/Y2RubyComponent.cc 2014-03-14 20:50:36.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.16/src/binary/Y2RubyComponent.cc 2014-04-22 14:36:42.000000000 +0200 @@ -94,6 +94,9 @@ size_t size = res.size(); if (size==0) return res; + // convert always in C locale (bnc#852242) + char *old_locale = strdup(setlocale(LC_ALL, NULL)); + setlocale(LC_ALL, "C"); res[0] = tolower(res[0]); //first character and first char after :: is lowercase without underscore for(size_t i = res.find("::"); i!= string::npos; i = res.find("::",i+1)) @@ -111,5 +114,7 @@ res.replace(i,1,tmp); //replace upper by _lower } } + setlocale(LC_ALL, old_locale); + free(old_locale); return res; } -- 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-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2014-04-26 11:45:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2014-04-13 13:13:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2014-04-26 11:45:12.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 22 07:33:01 UTC 2014 - mchang(a)suse.com + +- enable btrfs snapshot booting on ppc +- remove suse_btrfs_grub2_install.sh as it's no longer used +- 0.812 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.811.tar.xz New: ---- perl-Bootloader-0.812.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.7pspqO/_old 2014-04-26 11:45:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7pspqO/_new 2014-04-26 11:45:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.811 +Version: 0.812 Release: 0 Requires: coreutils Requires: e2fsprogs ++++++ perl-Bootloader-0.811.tar.xz -> perl-Bootloader-0.812.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/perl-Bootloader.changes new/perl-Bootloader-0.812/perl-Bootloader.changes --- old/perl-Bootloader-0.811/perl-Bootloader.changes 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/perl-Bootloader.changes 2014-04-22 11:43:36.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 22 07:33:01 UTC 2014 - mchang(a)suse.com + +- enable btrfs snapshot booting on ppc +- remove suse_btrfs_grub2_install.sh as it's no longer used +- 0.812 + +------------------------------------------------------------------- Wed Apr 9 15:06:33 CEST 2014 - snwint(a)suse.de - drop old log /var/log/YaST2/perl-BL-standalone-log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/src/Core/GRUB2.pm new/perl-Bootloader-0.812/src/Core/GRUB2.pm --- old/perl-Bootloader-0.811/src/Core/GRUB2.pm 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/src/Core/GRUB2.pm 2014-04-22 11:43:36.000000000 +0200 @@ -979,7 +979,7 @@ my $suse_btrfs = delete $globinfo{"suse_btrfs"} || ""; # per default enable btrfs snapshot boot configs only on i386-pc # other architectures (s390, ppc) are planned but not ready - if ($suse_btrfs eq "" and $self->{'target'} eq "i386-pc") { + if ($suse_btrfs eq "" and $self->{'target'} =~ /(i386-pc|powerpc-ieee1275)/) { $suse_btrfs = "true"; } # $root = " root=$root" if $root ne ""; @@ -1341,20 +1341,6 @@ next; } - if ($glob{suse_btrfs} eq "true" and -e "/usr/sbin/suse_btrfs_grub2_install.sh") { - # enable btrfs snapshot boot configs only on i386-pc - # other architectures (s390, ppc) are planned but not ready - if ($self->{'target'} eq "i386-pc") { - my $rootfs = qx(/usr/sbin/grub2-probe -t fs /); - my $bootfs = qx(/usr/sbin/grub2-probe -t fs /boot); - chomp $rootfs; - chomp $bootfs; - if ($rootfs eq "btrfs" and $bootfs eq "btrfs") { - $cmd = "/usr/sbin/suse_btrfs_grub2_install.sh"; - } - } - } - my $ret = $self->RunCommand ("$cmd $opt"); return 0 if (0 != $ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.812/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.811/src/Core/GRUB2EFI.pm 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/src/Core/GRUB2EFI.pm 2014-04-22 11:43:36.000000000 +0200 @@ -911,14 +911,6 @@ if ($self->{secure_boot}) { $opt = "--config-file=/boot/grub2/grub.cfg"; $cmd = "/usr/sbin/shim-install"; - } elsif ($glob{suse_btrfs} eq "true" and -e "/usr/sbin/suse_btrfs_grub2_install.sh") { - my $rootfs = qx(/usr/sbin/grub2-probe -t fs /); - my $bootfs = qx(/usr/sbin/grub2-probe -t fs /boot); - chomp $rootfs; - chomp $bootfs; - if ($rootfs eq "btrfs" and $bootfs eq "btrfs") { - $cmd = "/usr/sbin/suse_btrfs_grub2_install.sh"; - } } $ret = $self->RunCommand ("$cmd $opt"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/version new/perl-Bootloader-0.812/version --- old/perl-Bootloader-0.811/version 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/version 2014-04-22 11:43:36.000000000 +0200 @@ -1 +1 @@ -0.811 +0.812 -- 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-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-04-26 11:45:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-04-13 13:13:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-04-26 11:45:11.000000000 +0200 @@ -1,0 +2,54 @@ +Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com + +- Use correct check for partition setup for grub2 on s390 + (bnc#873951) +- 3.1.29 + +------------------------------------------------------------------- +Thu Apr 17 14:46:17 UTC 2014 - jreidinger(a)suse.com + +- do not complain for missing bios order on s390(bnc#874106) +- 3.1.28 + +------------------------------------------------------------------- +Thu Apr 17 11:18:31 UTC 2014 - jreidinger(a)suse.com + +- improve logging if setting kernel paramater failed to help with + bnc#873996 +- remove graphic adapter configuration on s390 (bnc#874010) +- 3.1.27 + +------------------------------------------------------------------- +Wed Apr 16 19:49:56 UTC 2014 - jreidinger(a)suse.com + +- allow switching to grub2 also on ppc +- Do not raise exception for grub2efi on non-pc architectures + (bnc#873861) +- 3.1.26 + +------------------------------------------------------------------- +Wed Apr 16 12:11:53 UTC 2014 - jreidinger(a)suse.com + +- fix crash on s390 due to missing loader widget(bnc#873911) +- 3.1.25 + +------------------------------------------------------------------- +Tue Apr 15 10:52:27 UTC 2014 - jreidinger(a)suse.com + +- fix proposing when proposal do not change (bnc#873620) +- 3.1.24 + +------------------------------------------------------------------- +Tue Apr 15 10:38:17 UTC 2014 - jreidinger(a)suse.com + +- cleaning up deprecated code to improve stability and maintenance + of code +- 3.1.23 + +------------------------------------------------------------------- +Tue Apr 15 08:33:29 UTC 2014 - mchang(a)suse.com + +- remove error if boot directory on xfs file system (bnc#864370) +- 3.1.22 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.21.tar.bz2 New: ---- yast2-bootloader-3.1.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.qJXJZj/_old 2014-04-26 11:45:12.000000000 +0200 +++ /var/tmp/diff_new_pack.qJXJZj/_new 2014-04-26 11:45:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.21 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.21.tar.bz2 -> yast2-bootloader-3.1.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes new/yast2-bootloader-3.1.29/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/package/yast2-bootloader.changes 2014-04-22 11:18:41.000000000 +0200 @@ -1,4 +1,58 @@ ------------------------------------------------------------------- +Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com + +- Use correct check for partition setup for grub2 on s390 + (bnc#873951) +- 3.1.29 + +------------------------------------------------------------------- +Thu Apr 17 14:46:17 UTC 2014 - jreidinger(a)suse.com + +- do not complain for missing bios order on s390(bnc#874106) +- 3.1.28 + +------------------------------------------------------------------- +Thu Apr 17 11:18:31 UTC 2014 - jreidinger(a)suse.com + +- improve logging if setting kernel paramater failed to help with + bnc#873996 +- remove graphic adapter configuration on s390 (bnc#874010) +- 3.1.27 + +------------------------------------------------------------------- +Wed Apr 16 19:49:56 UTC 2014 - jreidinger(a)suse.com + +- allow switching to grub2 also on ppc +- Do not raise exception for grub2efi on non-pc architectures + (bnc#873861) +- 3.1.26 + +------------------------------------------------------------------- +Wed Apr 16 12:11:53 UTC 2014 - jreidinger(a)suse.com + +- fix crash on s390 due to missing loader widget(bnc#873911) +- 3.1.25 + +------------------------------------------------------------------- +Tue Apr 15 10:52:27 UTC 2014 - jreidinger(a)suse.com + +- fix proposing when proposal do not change (bnc#873620) +- 3.1.24 + +------------------------------------------------------------------- +Tue Apr 15 10:38:17 UTC 2014 - jreidinger(a)suse.com + +- cleaning up deprecated code to improve stability and maintenance + of code +- 3.1.23 + +------------------------------------------------------------------- +Tue Apr 15 08:33:29 UTC 2014 - mchang(a)suse.com + +- remove error if boot directory on xfs file system (bnc#864370) +- 3.1.22 + +------------------------------------------------------------------- Thu Apr 10 11:18:51 UTC 2014 - jreidinger(a)suse.com - drop not-supported bootloaders except grub1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec new/yast2-bootloader-3.1.29/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/package/yast2-bootloader.spec 2014-04-22 11:18:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.21 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb new/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb --- old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb 2014-04-22 11:18:41.000000000 +0200 @@ -47,16 +47,27 @@ Bootloader.Reset end - if Bootloader.getLoaderType == "grub2" - if !Mode.update - if !Bootloader.proposed_cfg_changed && !Mode.autoinst - Bootloader.blRead(true, true) - BootCommon.was_read = true - end + # proposal not changed by user so repropose it from scratch + if !Bootloader.proposed_cfg_changed && !Mode.autoinst + Builtins.y2milestone "Proposal not modified, so repropose from scratch" + Bootloader.ResetEx(false) + end + if Mode.update + if ["grub2", "grub2-efi"].include? Bootloader.getLoaderType + Builtins.y2milestone "update of grub2, do not repropose" + Bootloader.blRead(true, true) + else + BootCommon.setLoaderType(nil) + Bootloader.Reset Bootloader.Propose end + else + # in installation always propose missing stuff + Bootloader.Propose + end + if Bootloader.getLoaderType == "grub2" @ret["links"] = [ "enable_boot_mbr", "disable_boot_mbr", @@ -65,25 +76,8 @@ "enable_boot_boot", "disable_boot_boot" ] - elsif Bootloader.getLoaderType == "grub2-efi" - if !Mode.update - if !Bootloader.proposed_cfg_changed && !Mode.autoinst - Bootloader.blRead(true, true) - BootCommon.was_read = true - end - - Bootloader.Propose - end - else - # repropose if grub2 is not used during upgrade - if Mode.update - Builtins.y2milestone("Cfg not changed before, recreating") - Bootloader.ResetEx(false) - BootCommon.setLoaderType(nil) - end - - Bootloader.Propose end + # to make sure packages will get installed BootCommon.setLoaderType(BootCommon.getLoaderType(false)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -662,11 +662,6 @@ Builtins.y2milestone("/boot is in logical partition: %1", is_logical) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = BootCommon.KeepMBR(BootCommon.mbrDisk) - # if is primary, store bootloader there exit = 0 @@ -699,7 +694,7 @@ Ops.set( BootCommon.globals, "generic_mbr", - out != "vista" && !keep_mbr ? "true" : "false" + out != "vista" ? "true" : "false" ) if out == "vista" Builtins.y2milestone("Vista MBR...") @@ -719,15 +714,6 @@ selected_location = :mbr end - if keep_mbr - if is_logical && extended != nil - selected_location = :extended - else - selected_location = BootStorage.BootPartitionDevice != - BootStorage.RootPartitionDevice ? :boot : :root - end - end - SetBootloaderDevice(selected_location) if !Builtins.contains( BootStorage.getPartitionList(:boot, "grub"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub/options.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub/options.rb 2014-04-22 11:18:41.000000000 +0200 @@ -370,6 +370,7 @@ ) ), "init" => fun_ref(method(:InitConsole), "void (string)"), + "handle" => fun_ref(method(:HandleConsole), "void (string, map)"), "store" => fun_ref(method(:StoreConsole), "void (string, map)"), "help" => Ops.get(@grub_help_messages, "serial", "") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/dialogs.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/dialogs.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/dialogs.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/dialogs.rb 2014-04-22 11:18:41.000000000 +0200 @@ -68,6 +68,7 @@ def kernel_tab widgets = ["vgamode", "append", "append_failsafe", "console"] widgets.delete("console") if Arch.s390 # there is no console on s390 (bnc#868909) + widgets.delete("vgamode") if Arch.s390 # there is no graphic adapter on s390 (bnc#874010) { "id" => "kernel_tab", @@ -282,6 +283,8 @@ @_grub2_widgets = { "loader_location" => grubBootLoaderLocationWidget } when /ppc/ @_grub2_widgets = { "loader_location" => grub_on_ppc_location } + when /s390/ + @_grub2_widgets = {} #no loader location for s390 as it is automatic else raise "unsuppoted architecture #{Arch.architecture}" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -668,11 +668,6 @@ ) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = BootCommon.KeepMBR(BootCommon.mbrDisk) - # if is primary, store bootloader there exit = 0 @@ -705,7 +700,7 @@ Ops.set( BootCommon.globals, "generic_mbr", - out != "vista" && !keep_mbr ? "true" : "false" + out != "vista" ? "true" : "false" ) if out == "vista" Builtins.y2milestone("Vista MBR...") @@ -725,19 +720,7 @@ selected_location = :mbr end - if keep_mbr - if is_logical && extended != nil - selected_location = :extended - else - selected_location = BootStorage.BootPartitionDevice != - BootStorage.RootPartitionDevice ? :boot : :root - end - end - if is_logical_and_btrfs - if keep_mbr - Builtins.y2milestone("force to use mbr even if keep_mbr is suggested") - end Builtins.y2milestone( "/boot is on logical parititon and uses btrfs, mbr is favored in this situration" ) @@ -1074,7 +1057,7 @@ BootStorage.ProposeDeviceMap md_mbr = BootStorage.addMDSettingsToGlobals Ops.set(BootCommon.globals, "boot_md_mbr", md_mbr) if md_mbr != "" - BootCommon.InitializeLibrary(true, "grub") + BootCommon.InitializeLibrary(true, "grub2") end if !Mode.autoinst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/i386.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/i386.rb 2014-04-22 11:18:41.000000000 +0200 @@ -105,21 +105,6 @@ @_thinkpad_mbr end - # Keep the MBR contents on the specified disk? Check whether the contents - # should be kept because ot contains vendor-specific data - # @param [String] disk string the disk to be checked - # @return [Boolean] true to keep the contents - def KeepMBR(disk) - # FIXME: see bug #464485 there is problem with detection of - # MBR the 3rd byte is 0 after recovery thinkpad notebook with - # recovery CD, next missing cooperate with Lenovo there also - # missing any specification about Lenovo's changes in MBR - - Builtins.y2milestone("Skip checking of MBR for thinkpad sequence") - - false - end - # Add the partition holding firmware to bootloader? # @param [String] disk string the disk to be checked # @return [Boolean] true if firmware partition is to be added @@ -127,61 +112,6 @@ !ThinkPadMBR(disk) end - # Display bootloader summary - # @return a list of summary lines - def i386Summary - ret = Summary() - order_sum = DiskOrderSummary() - ret = Builtins.add(ret, order_sum) if order_sum != nil - deep_copy(ret) - end - - # Propose the boot loader location for i386 (and similar) platform - def i386LocationProposal - if !@was_proposed - DetectDisks() - @del_parts = BootStorage.getPartitionList( - :deleted, - getLoaderType(false) - ) - # check whether edd is loaded; if not: load it - lsmod_command = "lsmod | grep edd" - Builtins.y2milestone("Running command %1", lsmod_command) - lsmod_out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), lsmod_command) - ) - Builtins.y2milestone("Command output: %1", lsmod_out) - edd_loaded = Ops.get_integer(lsmod_out, "exit", 0) == 0 - if !edd_loaded - command = "/sbin/modprobe edd" - Builtins.y2milestone("Loading EDD module, running %1", command) - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), command) - ) - Builtins.y2milestone("Command output: %1", out) - end - end - - # refresh device map - if (BootStorage.device_mapping == nil || - Builtins.size(BootStorage.device_mapping) == 0) && - getLoaderType(false) == "grub" - BootStorage.ProposeDeviceMap - end - - if DisksChanged() && !Mode.autoinst - if askLocationResetPopup(@loader_device) - @selected_location = nil - @loader_device = nil - Builtins.y2milestone("Reconfiguring locations") - DetectDisks() - end - end - - nil - end - - # Do updates of MBR after the bootloader is installed # @return [Boolean] true on success def PostUpdateMBR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lib_iface.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lib_iface.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lib_iface.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lib_iface.rb 2014-04-22 11:18:41.000000000 +0200 @@ -272,24 +272,6 @@ res_data.unlink end - # Display the log file written by the underlying bootloader libraries - def bootloaderError(error) - bl_logfile = "/var/log/YaST2/y2log_bootloader" - bl_log = Convert.to_string(SCR.Read(path(".target.string"), bl_logfile)) - - errorWithLogPopup( - Builtins.sformat( - # error popup - label, %1 is bootloader name - _("Error occurred while installing %1."), - getLoaderName(getLoaderType(false), :summary) - ), - bl_log - ) - Builtins.y2error("%1", error) - - nil - end - # Read the files from the system to internal cache of the library # @param [Boolean] avoid_reading_device_map do not read the device map, but use internal # data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lilolike.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lilolike.rb 2014-04-22 11:18:41.000000000 +0200 @@ -48,33 +48,6 @@ ] end - # Check whether disk settings were changed since last checking - # @return [Boolean] true if needs to recheck - def DisksChanged - return false if Mode.config - mp = Storage.GetMountPoints - actual_root = Ops.get_string(mp, ["/", 0], "") - actual_boot = Ops.get_string(mp, ["/boot", 0], actual_root) - - # don't change configuration if '/' and '/boot' were not changed - # and location is "floppy", "mbr" or "boot" - if actual_boot == BootStorage.BootPartitionDevice && - actual_root == BootStorage.RootPartitionDevice && - @selected_location != "custom" && - @selected_location != "" && - @selected_location != nil - return false - end - - all_partitions = BootStorage.getPartitionList(:boot, getLoaderType(false)) - - if !Builtins.contains(all_partitions, @loader_device) - Builtins.y2milestone("Location should be set again") - return true - end - false - end - # FindMbrDisk() # try to find the system's mbr device # @return [String] mbr device @@ -186,11 +159,6 @@ Builtins.y2milestone("/boot is in logical partition: %1", is_logical) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = KeepMBR(@loader_device) - exit = 0 # if is primary, store bootloader there if disk_is_mbr && !is_logical @@ -198,29 +166,11 @@ @loader_device = BootStorage.BootPartitionDevice @activate = true @activate_changed = true - - # check if there is raid and if it soft-raid select correct device for analyse MBR - # bnc #398356 - if Ops.greater_than(Builtins.size(needed_devices), 1) - disk = soft_MDraid_boot_disk(partitions) - end - disk = Ops.get_string(dp, "disk", "") if disk == "" - out = examineMBR(disk) - - @repl_mbr = out != "vista" && !keep_mbr elsif Ops.greater_than(Builtins.size(needed_devices), 1) @loader_device = "mbr_md" @selected_location = "mbr_md" end - if keep_mbr - if is_logical && extended != nil - @loader_device = extended - else - @loader_device = BootStorage.BootPartitionDevice - end - @selected_location = "boot" - end if !Builtins.contains( BootStorage.getPartitionList(:boot, getLoaderType(false)), @loader_device @@ -494,7 +444,6 @@ parts = BootStorage.getPartitionList(:parts_old, getLoaderType(false)) if @partitioning_last_change != Storage.GetTargetChangeTime && @files_edited displayFilesEditedPopup - @files_edited_warned = true return end @@ -670,19 +619,6 @@ nil end - - # Update sections of bootloader menu (removes obsolete thinks and - # place for ugly hacks (but doesn't efect zypper dup)) - # modifies internal structures - # label update is done in perl-Bootloader during updating kernel - # Purpose is don't break anything, but expect that previous state is - # working - def UpdateSections - Builtins.foreach(@sections) do |section| - end - - nil - end # Update global options of bootloader # modifies internal sreuctures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -650,222 +650,6 @@ Builtins.toset(ret) end - # Get last change time of file - # @param [String] filename string name of file - # @return [String] last change date as YYYY-MM-DD-HH-MM-SS - def getFileChangeDate(filename) - stat = Convert.to_map(SCR.Read(path(".target.stat"), filename)) - ctime = Ops.get_integer(stat, "ctime", 0) - command = Builtins.sformat( - "date --date='1970-01-01 00:00:00 %1 seconds' +\"%%Y-%%m-%%d-%%H-%%M-%%S\"", - ctime - ) - out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) - c_time = Ops.get_string(out, "stdout", "") - Builtins.y2debug("File %1: last change %2", filename, c_time) - c_time - end - - # Save current MBR to /boot/backup_mbr - # Also save to /var/lib/YaST2/backup_boot_sectors/%device, if some - # existing, rename it - # @param [String] device string name of device - def saveMBR(device) - device_file = Builtins.mergestring(Builtins.splitstring(device, "/"), "_") - device_file_path = Ops.add( - "/var/lib/YaST2/backup_boot_sectors/", - device_file - ) - device_file_path_to_logs = Ops.add("/var/log/YaST2/", device_file) - SCR.Execute( - path(".target.bash"), - "test -d /var/lib/YaST2/backup_boot_sectors || mkdir /var/lib/YaST2/backup_boot_sectors" - ) - if Ops.greater_than(SCR.Read(path(".target.size"), device_file_path), 0) - contents = Convert.convert( - SCR.Read(path(".target.dir"), "/var/lib/YaST2/backup_boot_sectors"), - :from => "any", - :to => "list <string>" - ) - contents = Builtins.filter(contents) do |c| - Builtins.regexpmatch( - c, - Builtins.sformat("%1-.*-.*-.*-.*-.*-.*", device_file) - ) - end - contents = Builtins.sort(contents) - index = 0 - siz = Builtins.size(contents) - while Ops.less_than(Ops.add(index, 10), siz) - SCR.Execute( - path(".target.remove"), - Builtins.sformat( - "/var/lib/YaST2/backup_boot_sectors/%1", - Ops.get(contents, index, "") - ) - ) - index = Ops.add(index, 1) - end - change_date = getFileChangeDate(device_file_path) - SCR.Execute( - path(".target.bash"), - Builtins.sformat("/bin/mv %1 %1-%2", device_file_path, change_date) - ) - end - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - device_file_path - ) - ) - # save MBR to yast2 log directory - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - device_file_path_to_logs - ) - ) - if device == @mbrDisk - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - "/boot/backup_mbr" - ) - ) - - # save thinkpad MBR - if ThinkPadMBR(device) - device_file_path_thinkpad = Ops.add(device_file_path, "thinkpadMBR") - Builtins.y2milestone("Backup thinkpad MBR") - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "cp %1 %2 2>&1", - device_file_path, - device_file_path_thinkpad - ) - ) - end - end - - nil - end - - # Update contents of MBR (active partition and booting code) - # FIXME move tis function to lilolike.ycp - # @return [Boolean] true on success - def updateMBR - # FIXME: do the real thing in perl_Bootloader - if getLoaderType(false) == "grub" - @activate = Ops.get(@globals, "activate", "false") == "true" - @repl_mbr = Ops.get(@globals, "generic_mbr", "false") == "true" - end - - Builtins.y2milestone( - "Updating disk system area, activate partition: %1, replace MBR: %2", - @activate, - @repl_mbr - ) - if @backup_mbr - Builtins.y2milestone( - "Doing MBR backup: MBR Disk: %1, loader device: %2", - @mbrDisk, - @loader_device - ) - disks_to_rewrite = Convert.convert( - Builtins.toset( - Builtins.merge(getMbrsToRewrite, [@mbrDisk, @loader_device]) - ), - :from => "list", - :to => "list <string>" - ) - Builtins.y2milestone( - "Creating backup of boot sectors of %1", - disks_to_rewrite - ) - Builtins.foreach(disks_to_rewrite) { |d| saveMBR(d) } - end - ret = true - # if the bootloader stage 1 is not installed in the MBR, but - # ConfigureLocation() asked us to replace some problematic existing - # MBR, then overwrite the boot code (only, not the partition list!) in - # the MBR with a generic (currently DOS?) bootloader - if @repl_mbr && @loader_device != @mbrDisk - PackageSystem.Install("syslinux") if !Stage.initial - Builtins.y2milestone( - "Updating code in MBR: MBR Disk: %1, loader device: %2", - @mbrDisk, - @loader_device - ) - disks_to_rewrite = getMbrsToRewrite - Builtins.foreach(disks_to_rewrite) do |d| - Builtins.y2milestone("Copying generic MBR code to %1", d) - # added fix 446 -> 440 Vista booting problem bnc # 396444 - command = Builtins.sformat( - "/bin/dd bs=440 count=1 if=%1 of=%2", - "/usr/share/syslinux/mbr.bin", - d - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - end - - Builtins.foreach(getPartitionsToActivate) do |m_activate| - num = Ops.get_integer(m_activate, "num", 0) - mbr_dev = Ops.get_string(m_activate, "mbr", "") - if num != 0 && mbr_dev != "" - # if primary partition - if !Ops.is_integer?(num) || Ops.less_or_equal(num, 4) - Builtins.y2milestone("Activating partition %1 on %2", num, mbr_dev) - # FIXME: this is the most rotten code since molded sliced bread - # move to bootloader/Core/GRUB.pm or similar - # TESTME: make sure that parted does not destroy BSD - # slices (#suse24740): cf. section 5.1 of "info parted": - # Parted only supports the BSD disk label system. - # Parted is unlikely to support the partition slice - # system in the future because the semantics are rather - # strange, and don't work like "normal" partition tables - # do. - # string command = sformat - # ("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num); - # As a workaround for #167602, moved back to - # /sbin/activate, because it does not cause the kernel to - # forget about an activated extended partition (it changes - # the data on disk without using any ioctl). - # FIXME: investigate proper handling of the activate flag - # (kernel ioctls in parted etc.) and fix parted - command = Builtins.sformat( - "/usr/sbin/parted -s %1 set %2 boot on", - mbr_dev, - num - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - WFM.Execute(path(".local.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - else - Builtins.y2error("Cannot activate %1", m_activate) - end - end if @activate - ret - end - # Rewrite current MBR with /var/lib/YaST2/backup_boot_sectors/%device # Warning!!! don't use for bootsectors, 440 bytes of sector are written # @param [String] device string device to rewrite MBR to @@ -1052,21 +836,6 @@ @additional_failsafe_params end - # Get additional kernel parameters from control file - # @return [String] additional kernel parameters - def GetAdditionalKernelParams - ProductFeatures.GetStringFeature( - "globals", - "additional_kernel_parameters" - ) - end - - # Get additional kernel parameters splitted to a list - # @return a list of additional kernel parameters - def ListAdditionalKernelParams - ListKernelParamsInLine(GetAdditionalKernelParams()) - end - # Update graphical bootloader to contain help text of current language # And make the selected installation language default # @return [Boolean] true on success diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/popups.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/popups.rb 2014-04-22 11:18:41.000000000 +0200 @@ -41,20 +41,6 @@ end # Display question - # @param [String] name string name of currently selected section (to clone) - # @return [Boolean] true if answered yes - def askClone(name) - # yes-no popup - Popup.YesNo( - Builtins.sformat( - _( - "Clone the selected section '%1' instead\nof creating a new empty section?\n" - ), - name - ) - ) - end - # Display question # @return [Boolean] true if answered yes def confirmAbortPopup # yes-no popup question @@ -66,17 +52,6 @@ end # Display question - # @return [Boolean] true if answered yes - def resetSectsPopup - # yes-no popup question - Popup.YesNo( - _( - "Really reset your settings for sections?\nAll your changes made in section management will be lost.\n" - ) - ) - end - - # Display question # @param [String] title string section title # @return [Boolean] true if answered yes def confirmSectionDeletePopup(title) @@ -84,23 +59,6 @@ Popup.YesNo(Builtins.sformat(_("Really delete section %1?"), title)) end - # Display question - # @return [Boolean] true if answered yes - def resetAllPopup - # yes-no popup question - Popup.YesNo( - _("Really reset all\nyour settings? All your changes will be lost.\n") - ) - end - - # Display error - def setLocationErrorPopup - # error popup - Report.Error(_("Set the boot loader location.")) - - nil - end - # Display error def emptyPasswdErrorPopup # error popup @@ -274,24 +232,6 @@ ) end - - # Display popup - def displayGfxMenuChangePopup - # message popup, gfxmenu is option name, leave as is - Popup.Message( - _("The disk settings have changed.\nCheck the gfxmenu settings.\n") - ) - - nil - end - - # Display yes-no popup - # @return true if confirmed - def confirmOptionDeletePopup - # yes-no popup - Popup.YesNo(_("Really delete the selected option?")) - end - # Display error popup with log # @param [String] header string error header # @param [String] log string logfile contents @@ -321,50 +261,6 @@ nil end - - # Display popup - def displayNoSupportPopup - # message popup - Popup.Message(_("Sorry, there are currently\nno options to set here.")) - - nil - end - - # Display popup - def noBootloaderPopup - # error report - Report.Error(_("Unable to install the boot loader.")) - - nil - end - - # Display popup - # @param [String] bootloader string printable name of used bootloader - def floppyWrittenPopup(bootloader) - confirm_boot_msg = Misc.boot_msg - # data saved to floppy disk - # popup, %1 is bootloader name - msg = Builtins.sformat( - _("The %1 boot sector has been written to the floppy disk."), - bootloader - ) - msg = Ops.add( - Ops.add(msg, "\n"), - # popup - continuing - alternative 1 ... - _( - "Leave the floppy disk in the drive. The system will now be rebooted." - ) - ) - - if Ops.greater_than(Builtins.size(confirm_boot_msg), 0) - msg = Ops.add(Ops.add(msg, "\n\n"), confirm_boot_msg) - end - Misc.boot_msg = "" - # empty that Misc::boot_msg indicate the message has been displayed - Popup.TimedOKCancel(msg, 10) - - nil - end # Display popup - confirmation befopre restoring MBR # @param [String] device string device to restore to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/wizards.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/wizards.rb 2014-04-22 11:18:41.000000000 +0200 @@ -38,7 +38,6 @@ ) ) end - bl = Bootloader.getLoaderType # run generic sequence aliases = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.29/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/lib/bootloader/grub2base.rb 2014-04-22 11:18:41.000000000 +0200 @@ -53,8 +53,6 @@ def Update Read(true, true) - #we don't handle sections, grub2 section create them for us - #BootCommon::UpdateSections (); BootCommon.UpdateGlobals nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb new/yast2-bootloader-3.1.29/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootCommon.rb 2014-04-22 11:18:41.000000000 +0200 @@ -48,14 +48,6 @@ # map of global options and types for new perl-Bootloader interface @global_options = {} - # map of section options and types for new perl-Bootloader interface - @section_options = {} - - # boolean value indicate if "/" is on logical - # and primary /boot doesn't exist - - @boot_device_on_logical = false - # map of global options and values @globals = {} @@ -107,39 +99,21 @@ @current_section = {} - # Option types for different bootloaders - @opt_types = {} - # device holding MBR for bootloader @mbrDisk = "" - # was currently edited section changed (== true) - @one_section_changed = false - # Backup original MBR before installing bootloader @backup_mbr = false # Activate bootloader partition during installation? @activate = false - - # FATE #303548 - Grub: limit device.map to devices detected by BIOS - # Ask user if he wants to edit again bootloader settings - # It is used if device.map is limited and "boot" disk is out of range - # The range is the first 8 devices - @ask_user = false - - # Replace MBR with generic code after bootloader installation? - @repl_mbr = false - # Kernel parameters at previous detection @kernelCmdLine = "" # were settings changed (== true) @changed = false - - @edited_files = {} # common variables # type of bootloader to configure/being configured @@ -163,9 +137,6 @@ # summary dialog state - # Show verbose summary output - @verbose = false - # ui help variables @@ -194,8 +165,6 @@ @location_changed = false # Were configuration files manually edited and chamged? @files_edited = false - # Has been files edited warning already shown? - @files_edited_warned = false # time of last change of partitioning @partitioning_last_change = 0 # true if memtest was removed by user (manually) during the installation @@ -272,37 +241,6 @@ ret end - - # Get the size of memory for XEN's domain 0 - # @return the memory size in kB - def Dom0MemorySize - memory = Convert.convert( - SCR.Read(path(".probe.memory")), - :from => "any", - :to => "list <map>" - ) - - Builtins.y2milestone("memory: %1", memory) - memory_size = 0 - - Builtins.foreach(memory) do |info| - # internal class, main memory - if Ops.get_integer(info, "class_id", 0) == 257 && - Ops.get_integer(info, "sub_class_id", 0) == 2 - minf = Ops.get_list(info, ["resource", "phys_mem"], []) - Builtins.foreach(minf) do |i| - memory_size = Ops.add(memory_size, Ops.get_integer(i, "range", 0)) - end - end - end - - # size in kB lowered 64 MB for XEN itself - memory_size = Ops.subtract(Ops.divide(memory_size, 1024), 64 * 1024) - Builtins.y2milestone("Memory size for XEN domain 0: %1", memory_size) - memory_size - end - - # Create section for linux kernel # @param [String] title string the section name to create (untranslated) # @return a map describing the section @@ -506,7 +444,6 @@ "device_map" => BootStorage.remapDeviceMap(BootStorage.device_mapping) } if !(@loader_type == "grub" || @loader_type == "grub2") - Ops.set(exp, "repl_mbr", @repl_mbr) Ops.set(exp, "activate", @activate) end @@ -521,11 +458,7 @@ @globals = Ops.get_map(settings, "global", {}) @sections = Ops.get_list(settings, "sections", []) - # FIXME: for grub, repl_mbr is replaced by globals["generic_mbr"]; same - # for activate; remove the following when no bootloader uses these - # variables any more if !(@loader_type == "grub" || @loader_type == "grub2") - @repl_mbr = Ops.get_boolean(settings, "repl_mbr", false) @activate = Ops.get_boolean(settings, "activate", false) end BootStorage.device_mapping = Ops.get_map(settings, "device_map", {}) @@ -595,7 +528,6 @@ @sections = [] @globals = {} # DetectDisks (); - @repl_mbr = false @activate = false @activate_changed = false @removed_sections = [] @@ -769,75 +701,15 @@ # Display bootloader summary # @return a list of summary lines def Summary - if getLoaderType(false) == "none" + bl = getLoaderType(false) + if bl == "none" return [ HTML.Colorize(getLoaderName(getLoaderType(false), :summary), "red") ] end - targetMap = Storage.GetTargetMap - boot_target = Ops.get_map(targetMap, @loader_device, {}) - target_name = "" - if boot_target == {} - target_name = @loader_device - if target_name == "mbr_md" - mbrs = Builtins.maplist( - Md2Partitions(BootStorage.BootPartitionDevice) - ) do |d, id| - p_dev = Storage.GetDiskPartition(d) - Ops.get_string(p_dev, "disk", "") - end - # summary part, %1 is a list of device names - target_name = Builtins.sformat( - _("Master boot records of disks %1"), - Builtins.mergestring(mbrs, ", ") - ) - end - else - target_name = Ops.get_string(boot_target, "name", "disk") - end - target_name = AddMbrToDescription(target_name, @loader_device) - - result = [] - # summary text, %1 is bootloader name (eg. LILO) - result = Builtins.add( - result, - Builtins.sformat( - _("Boot Loader Type: %1"), - getLoaderName(getLoaderType(false), :summary) - ) - ) - # summary text, location is location description (eg. /dev/hda) - result = Builtins.add( - result, - Builtins.sformat(_("Location: %1"), target_name) - ) - sects = [] - Builtins.foreach(@sections) do |s| - title = Ops.get_string(s, "name", "") - # section name "suffix" for default section - _def = title == Ops.get(@globals, "default", "") ? _(" (default)") : "" - sects = Builtins.add( - sects, - String.EscapeTags(Builtins.sformat("+ %1%2", title, _def)) - ) - end - # summary text. %1 is list of bootloader sections - result = Builtins.add( - result, - Builtins.sformat( - _("Sections:<br>%1"), - Builtins.mergestring(sects, "<br>") - ) - ) - if @loader_device == "/dev/null" - # summary text - result = Builtins.add( - result, - _("Do not install boot loader; just create \nconfiguration files") - ) - end - deep_copy(result) + # each Boot* should have own summary, that can differ + raise "Not implemented for bootloader \"#{bl}\"" end # Update read settings to new version of configuration files @@ -1106,7 +978,7 @@ ) end end - if Arch.s390 + if Arch.s390 || Arch.ppc ret = ["grub2"] end # in order not to display it twice when "none" is selected @@ -1151,8 +1023,6 @@ end publish :variable => :global_options, :type => "map <string, any>" - publish :variable => :section_options, :type => "map <string, any>" - publish :variable => :boot_device_on_logical, :type => "boolean" publish :variable => :globals, :type => "map <string, string>" publish :variable => :sections, :type => "list <map <string, any>>" publish :variable => :cached_settings_base_data_change_time, :type => "integer" @@ -1163,19 +1033,13 @@ publish :variable => :current_section_name, :type => "string" publish :variable => :current_section_index, :type => "integer" publish :variable => :current_section, :type => "map <string, any>" - publish :variable => :opt_types, :type => "map <string, map <string, string>>" publish :variable => :mbrDisk, :type => "string" - publish :variable => :one_section_changed, :type => "boolean" publish :variable => :backup_mbr, :type => "boolean" publish :variable => :activate, :type => "boolean" - publish :variable => :ask_user, :type => "boolean" - publish :variable => :repl_mbr, :type => "boolean" publish :variable => :kernelCmdLine, :type => "string" publish :variable => :changed, :type => "boolean" - publish :variable => :edited_files, :type => "map <string, string>" publish :variable => :del_parts, :type => "list <string>" publish :variable => :write_settings, :type => "map" - publish :variable => :verbose, :type => "boolean" publish :variable => :other_bl, :type => "map" publish :variable => :activate_changed, :type => "boolean" publish :variable => :save_all, :type => "boolean" @@ -1183,12 +1047,9 @@ publish :variable => :was_read, :type => "boolean" publish :variable => :location_changed, :type => "boolean" publish :variable => :files_edited, :type => "boolean" - publish :variable => :files_edited_warned, :type => "boolean" publish :variable => :partitioning_last_change, :type => "integer" publish :variable => :removed_sections, :type => "list <string>" - publish :variable => :read_default_section_name, :type => "string" publish :variable => :update_section_types, :type => "list <string>" - publish :variable => :bootloaders, :type => "list <string>" publish :variable => :enable_md_array_redundancy, :type => "boolean" publish :variable => :enable_selinux, :type => "boolean" publish :function => :getLoaderType, :type => "string (boolean)" @@ -1218,17 +1079,13 @@ publish :function => :getKernelParamFromLine, :type => "string (string, string)" publish :function => :setKernelParamToLine, :type => "string (string, string, string)" publish :function => :myToInteger, :type => "integer (any)" - publish :function => :updateMBR, :type => "boolean ()" publish :function => :restoreMBR, :type => "boolean (string)" publish :function => :UpdateKernelParams, :type => "string (string)" publish :function => :getSwapPartitions, :type => "map <string, integer> ()" publish :function => :translateSectionTitle, :type => "string (string)" publish :function => :UpdateInstallationKernelParameters, :type => "void ()" publish :function => :GetAdditionalFailsafeParams, :type => "string ()" - publish :function => :GetAdditionalKernelParams, :type => "string ()" - publish :function => :ListAdditionalKernelParams, :type => "list <string> ()" publish :function => :UpdateGfxMenuContents, :type => "boolean ()" - publish :function => :MemtestPresent, :type => "boolean ()" publish :function => :BootloaderInstallable, :type => "boolean ()" publish :function => :PartitionInstallable, :type => "boolean ()" publish :function => :findRelativeDefaultLinux, :type => "string ()" @@ -1240,23 +1097,17 @@ publish :function => :GetSerialFromAppend, :type => "void ()" publish :function => :UpdateProposalFromClient, :type => "boolean ()" publish :function => :DiskOrderSummary, :type => "string ()" - publish :function => :DisksChanged, :type => "boolean ()" - publish :function => :KeepMBR, :type => "boolean (string)" publish :function => :AddFirmwareToBootloader, :type => "boolean (string)" - publish :function => :i386Summary, :type => "list <string> ()" - publish :function => :i386LocationProposal, :type => "void ()" publish :function => :PostUpdateMBR, :type => "boolean ()" publish :function => :FindMBRDisk, :type => "string ()" publish :function => :Md2Partition, :type => "string (string)" publish :function => :RunDelayedUpdates, :type => "void ()" publish :function => :FixGlobals, :type => "void ()" publish :function => :FixSections, :type => "void (void ())" - publish :function => :UpdateSections, :type => "void ()" publish :function => :UpdateGlobals, :type => "void ()" publish :function => :RemoveUnexistentSections, :type => "void (string, string)" publish :function => :UpdateAppend, :type => "void ()" publish :function => :UpdateGfxMenu, :type => "void ()" - publish :function => :DefineMultipath, :type => "boolean (map <string, string>)" publish :function => :SetDiskInfo, :type => "void ()" publish :function => :InitializeLibrary, :type => "boolean (boolean, string)" publish :function => :SetSections, :type => "boolean (list <map <string, any>>)" @@ -1264,18 +1115,14 @@ publish :function => :SetGlobal, :type => "boolean (map <string, string>)" publish :function => :GetGlobal, :type => "map <string, string> ()" publish :function => :SetDeviceMap, :type => "boolean (map <string, string>)" - publish :function => :GetDeviceMap, :type => "map <string, string> ()" - publish :function => :bootloaderError, :type => "void (string)" publish :function => :ReadFiles, :type => "boolean (boolean)" publish :function => :CommitSettings, :type => "boolean ()" publish :function => :UpdateBootloader, :type => "boolean ()" - publish :function => :SetSecureBoot, :type => "boolean (boolean)" publish :function => :InitializeBootloader, :type => "boolean ()" publish :function => :GetFilesContents, :type => "map <string, string> ()" publish :function => :SetFilesContents, :type => "boolean (map <string, string>)" publish :function => :XenPresent, :type => "boolean ()" publish :function => :isTrustedGrub, :type => "boolean ()" - publish :function => :Dom0MemorySize, :type => "integer ()" publish :function => :Export, :type => "map ()" publish :function => :Import, :type => "boolean (map)" publish :function => :Read, :type => "boolean (boolean, boolean)" @@ -1284,7 +1131,6 @@ publish :function => :Save, :type => "boolean (boolean, boolean, boolean)" publish :function => :Update, :type => "void ()" publish :function => :Write, :type => "boolean ()" - publish :function => :setCurrentLoaderAttribs, :type => "void (string)" publish :function => :setLoaderType, :type => "void (string)" publish :function => :setSystemSecureBootStatus, :type => "void (boolean)" publish :function => :Section2Index, :type => "integer (string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB.rb 2014-04-22 11:18:41.000000000 +0200 @@ -799,7 +799,6 @@ def Update Read(true, true) - BootCommon.UpdateSections BootCommon.UpdateGlobals nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB2.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb 2014-04-22 11:18:41.000000000 +0200 @@ -122,10 +122,7 @@ BootCommon.globals["boot_custom"] = partition when /s390/ - zipl_partition = Storage.GetEntryForMountpoint("/boot/zipl") - raise "missing separate /boot/zipl partition" if zipl_partition.empty? - - BootCommon.globals["boot_custom"] = zipl_partition["device"] + Builtins.y2milestone "no partition needed for grub2 on s390" else raise "unsuported architecture #{Arch.architecture}" end @@ -140,7 +137,7 @@ end prep_partitions = partitions.select do |partition| - partition["fsid"] == 0x41 + [0x41, 0x108].include? partition["fsid"] end y2milestone "detected prep partitions #{prep_partitions.inspect}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB2EFI.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB2EFI.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB2EFI.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB2EFI.rb 2014-04-22 11:18:41.000000000 +0200 @@ -103,14 +103,15 @@ # Constructor def BootGRUB2EFI - if Arch.i386 + if Arch.i386 packages = ["grub2-i386-efi"] elsif Arch.x86_64 packages = ["grub2-x86_64-efi", "shim", "mokutil"] else - raise "no grub packages for EFI available for this architecture" + # do not raise exception as we call constructor everywhere even if it doesn't make sense + packages = [] end - + Ops.set( BootCommon.bootloader_attribs, "grub2-efi", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb new/yast2-bootloader-3.1.29/src/modules/BootSupportCheck.rb --- old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootSupportCheck.rb 2014-04-22 11:18:41.000000000 +0200 @@ -225,20 +225,9 @@ ) end end - if Ops.get(p, "used_fs") == :xfs - AddNewProblem( - _( - "The /boot directory is on an XFS filesystem. System may not boot." - ) - ) - Builtins.y2error("The /boot directory is on an XFS filesystem") - result = false - raise Break - else - found_boot = true - Builtins.y2milestone("/boot filesystem is OK") - raise Break - end + found_boot = true + Builtins.y2milestone("/boot filesystem is OK") + raise Break end end raise Break if !result || found_boot @@ -263,22 +252,32 @@ # @return [Boolean] true on success def CheckBios_ID - ret = true + return true if Arch.s390 # s390 do not have bios boot order (bnc#874106) + if BootStorage.bois_id_missing AddNewProblem( _( "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\"" ) ) - ret = false + return false end - ret + + return true end - # Check that the root partition is reachable - def RootPartition - true + def check_zipl_part + boot_part = Storage.GetEntryForMountpoint("/boot/zipl") + boot_part = Storage.GetEntryForMountpoint("/boot") if boot_part.empty? + boot_part = Storage.GetEntryForMountpoint("/") if boot_part.empty? + + if [:ext2, :ext3, :ext4].include? boot_part["used_fs"] + return true + else + AddNewProblem(_( "Missing ext partition for booting. Cannot install boot code.")) + return false + end end # GRUB-related check @@ -291,7 +290,9 @@ # GRUB2-related check def GRUB2 - GRUB() + ret = GRUB() + # ensure that s390 have ext* partition for booting (bnc#873951) + ret &&= check_zipl_part if Arch.s390 end # GRUB2EFI-related check @@ -315,9 +316,6 @@ # detect correct bootloader type supported = CorrectLoaderType() && supported - # check whether root partition can be reached - supported = RootPartition() && supported - # check specifics for individual loaders if lt == "grub" supported = GRUB() && supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/Bootloader.rb new/yast2-bootloader-3.1.29/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.21/src/modules/Bootloader.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/Bootloader.rb 2014-04-22 11:18:41.000000000 +0200 @@ -1050,16 +1050,27 @@ elsif section == "LINUX_DEFAULT" section = getProposedDefaultSection end - return false if section == nil + if section.nil? + Builtins.y2error("section is nil, so kernel parameter cannot be set") + return false + end + sectnum = -1 index = -1 Builtins.foreach(BootCommon.sections) do |s| - index = Ops.add(index, 1) + index += 1 sectnum = index if Ops.get_string(s, "name", "") == section end - return false if sectnum == -1 - slabel = "" - return false if (key == "vga" || key == "root") && value == "true" + if sectnum == -1 + Builtins.y2error "Cannot find given section #{section} in sections #{BootCommon.sections.inspect}" + return false + end + + if (key == "vga" || key == "root") && value == "true" + Builtins.y2error "invalid values passed as kernel param #{key.inspect} => #{value.inspect}" + return false + end + if Builtins.contains(["root", "vga"], key) if value != "false" if key == "vga" @@ -1095,8 +1106,8 @@ Ops.set(BootCommon.sections, [sectnum, "__changed"], true) end BootCommon.changed = true - ret = true - ret + + return true end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firmwarekit for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package firmwarekit for openSUSE:Factory checked in at 2014-04-26 11:45:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firmwarekit (Old) and /work/SRC/openSUSE:Factory/.firmwarekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "firmwarekit" Changes: -------- --- /work/SRC/openSUSE:Factory/firmwarekit/firmwarekit.changes 2012-03-20 11:26:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.firmwarekit.new/firmwarekit.changes 2014-04-26 11:45:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 21 09:11:01 UTC 2014 - coolo(a)suse.com + +- remove buildrequire on sysvinit - not needed at all + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.HekW6c/_old 2014-04-26 11:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.HekW6c/_new 2014-04-26 11:45:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package firmwarekit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,46 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: firmwarekit -BuildRequires: bash coreutils dhcp-client findutils gawk gdb glib2-devel -BuildRequires: grep iproute2 module-init-tools ncurses-devel newt newt-devel -BuildRequires: perl pkgconfig sed sharutils slang-devel sysvinit -BuildRequires: acpica dmidecode -BuildRequires: termcap util-linux wget xorg-x11-util-devel +BuildRequires: acpica +BuildRequires: bash +BuildRequires: coreutils +BuildRequires: dhcp-client +BuildRequires: dmidecode +BuildRequires: findutils +BuildRequires: gawk +BuildRequires: gdb +BuildRequires: glib2-devel +BuildRequires: grep +BuildRequires: iproute2 +BuildRequires: module-init-tools +BuildRequires: ncurses-devel +BuildRequires: newt +BuildRequires: newt-devel +BuildRequires: perl +BuildRequires: pkgconfig +BuildRequires: sed +BuildRequires: sharutils +BuildRequires: slang-devel +BuildRequires: termcap +BuildRequires: util-linux +BuildRequires: wget +BuildRequires: xorg-x11-util-devel Url: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines -Version: 3 -Release: 45 License: LGPL-2.1+ Group: System/Boot -AutoReqProv: on +Version: 3 +Release: 0 PreReq: gzip -Requires: acpica dmidecode -Requires: hwinfo util-linux powertop +Requires: acpica +Requires: dmidecode +Requires: hwinfo +Requires: powertop +Requires: util-linux Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines +Group: System/Boot BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 Source0: %{name}-r%{version}.tar.bz2 @@ -61,12 +81,6 @@ related bugs. If you have an ACPI error/warning, run this tool and provide output for bug tracking information - - -Authors: --------- - Intel - %prep %setup -q -n linuxfirmwarekit %patch0 -p1 -- 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-users for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2014-04-26 11:45:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2014-04-13 13:13:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2014-04-26 11:45:08.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com + +- bnc#872903 + - fixed internal error (missing IsManaged method) +- 3.1.22 + +------------------------------------------------------------------- Old: ---- yast2-users-3.1.21.tar.bz2 New: ---- yast2-users-3.1.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.PWOx9u/_old 2014-04-26 11:45:09.000000000 +0200 +++ /var/tmp/diff_new_pack.PWOx9u/_new 2014-04-26 11:45:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.21.tar.bz2 -> yast2-users-3.1.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/package/yast2-users.changes new/yast2-users-3.1.22/package/yast2-users.changes --- old/yast2-users-3.1.21/package/yast2-users.changes 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/package/yast2-users.changes 2014-04-18 10:43:45.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com + +- bnc#872903 + - fixed internal error (missing IsManaged method) +- 3.1.22 + +------------------------------------------------------------------- Thu Apr 4 15:06:27 UTC 2014 - ckornacker(a)suse.com - hide Kerberos passwords from process list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/package/yast2-users.spec new/yast2-users-3.1.22/package/yast2-users.spec --- old/yast2-users-3.1.21/package/yast2-users.spec 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/package/yast2-users.spec 2014-04-18 10:43:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/src/clients/inst_auth.rb new/yast2-users-3.1.22/src/clients/inst_auth.rb --- old/yast2-users-3.1.21/src/clients/inst_auth.rb 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/src/clients/inst_auth.rb 2014-04-18 10:43:45.000000000 +0200 @@ -69,7 +69,7 @@ Builtins.y2debug("net_devices: %1", @net_devices) @found = Ops.greater_than(Builtins.size(@net_devices), 0) || - NetworkService.IsManaged + NetworkService.is_network_manager if !@found && Builtins.size(Ldap.initial_defaults) == 0 Builtins.y2milestone( -- 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-control for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2014-04-26 11:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old) and /work/SRC/openSUSE:Factory/.yast2-installation-control.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation-control" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2014-04-05 14:43:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new/yast2-installation-control.changes 2014-04-26 11:45:07.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 10:17:58 CEST 2014 - locilka(a)suse.com + +- Added software->default_patterns - patterns selected for + installation by default (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-installation-control-3.1.5.tar.bz2 New: ---- yast2-installation-control-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation-control.spec ++++++ --- /var/tmp/diff_new_pack.97P9ri/_old 2014-04-26 11:45:08.000000000 +0200 +++ /var/tmp/diff_new_pack.97P9ri/_new 2014-04-26 11:45:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-control-3.1.5.tar.bz2 -> yast2-installation-control-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/control/control.rnc new/yast2-installation-control-3.1.6/control/control.rnc --- old/yast2-installation-control-3.1.5/control/control.rnc 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/control/control.rnc 2014-04-18 10:42:40.000000000 +0200 @@ -259,6 +259,7 @@ | software_packages | kernel_packages | packages_transmogrify + | default_patterns ## Whether it is allowed to delete a package during upgrade delete_old_packages = element delete_old_packages { BOOLEAN } @@ -368,6 +369,9 @@ element package { text }+ } +## Comma and/or space-separated list of default patterns selected for installation +default_patterns = element default_patterns { text } + ## Software / Package-manager related variables software = element software { software_elements* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/control/control.rng new/yast2-installation-control-3.1.6/control/control.rng --- old/yast2-installation-control-3.1.5/control/control.rng 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/control/control.rng 2014-04-18 10:42:40.000000000 +0200 @@ -496,6 +496,7 @@ <ref name="software_packages"/> <ref name="kernel_packages"/> <ref name="packages_transmogrify"/> + <ref name="default_patterns"/> </choice> </define> <define name="delete_old_packages"> @@ -770,6 +771,12 @@ </oneOrMore> </element> </define> + <define name="default_patterns"> + <a:documentation>Comma and/or space-separated list of default patterns selected for installation</a:documentation> + <element name="default_patterns"> + <text/> + </element> + </define> <define name="software"> <a:documentation>Software / Package-manager related variables</a:documentation> <element name="software"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/package/yast2-installation-control.changes new/yast2-installation-control-3.1.6/package/yast2-installation-control.changes --- old/yast2-installation-control-3.1.5/package/yast2-installation-control.changes 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/package/yast2-installation-control.changes 2014-04-18 10:42:40.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 10:17:58 CEST 2014 - locilka(a)suse.com + +- Added software->default_patterns - patterns selected for + installation by default (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- Wed Apr 2 13:38:56 UTC 2014 - jreidinger(a)suse.com - add element for separate ssh service enablement (bnc#865056) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/package/yast2-installation-control.spec new/yast2-installation-control-3.1.6/package/yast2-installation-control.spec --- old/yast2-installation-control-3.1.5/package/yast2-installation-control.spec 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/package/yast2-installation-control.spec 2014-04-18 10:42:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-04-26 11:45:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-04-12 21:58:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-04-26 11:45:05.000000000 +0200 @@ -1,0 +2,35 @@ +Thu Apr 17 13:56:31 UTC 2014 - werner(a)suse.de + +- Extend avoid-divide-by-zero-sigtrap.patch to make the crash + handler know about SIGTRAP and SIGSYS + +------------------------------------------------------------------- +Thu Apr 17 13:37:06 UTC 2014 - werner(a)suse.de + +- Add avoid-divide-by-zero-sigtrap.patch which fixes bnc#867663 + that is a divide by zero on a jobless system + +------------------------------------------------------------------- +Wed Apr 16 10:17:13 UTC 2014 - werner(a)suse.de + +- Use latest regenerate-initrd rpm macros (fate#313506) +- Add rescue-emergency-target-conflicts.patch to avoid that + emergency and rescue sulogin are fighting on console + +------------------------------------------------------------------- +Tue Apr 15 12:19:24 UTC 2014 - werner(a)suse.de + +- Modify systemd-sleep-grub to let hybrid-sleep.target work even + on XEN, changes from Thomas Blume (bnc#873432) + +------------------------------------------------------------------- +Mon Apr 14 13:55:36 UTC 2014 - werner(a)suse.de + +- Add backported upstream patch + 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +- Add patch systemd-detect-xendom.patch from Thomas Blume + to be able to detect XEN dom0 as well as domU +- systemd conflicts with sysvinit, ven if the package systemd-sysvinit + does already conflict with sysvinit-init (bnc#873444) + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch avoid-divide-by-zero-sigtrap.patch rescue-emergency-target-conflicts.patch systemd-detect-xendom.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: binutils-gold %endif %endif +BuildRequires: config(suse-module-tools) %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets %endif @@ -104,6 +105,9 @@ %endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) +%if 0%{?suse_version} > 1310 +Conflicts: sysvinit +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs @@ -375,6 +379,14 @@ Patch193: portmap-wants-rpcbind-socket.patch # PATCH-FIX-USTREAM added at 2014/03/11 Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch +# PATCH-FIX-USTREAM added at 2014/03/14 +Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +# PATCH-FIX-SUSE Detect XEN dom0 as well as domU +Patch196: systemd-detect-xendom.patch +# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console +Patch197: rescue-emergency-target-conflicts.patch +# PATCH-FIX-SUSE Avoid a divide by zero sigtrap +Patch198: avoid-divide-by-zero-sigtrap.patch # UDEV PATCHES # ============ @@ -463,6 +475,17 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} +Requires(post): sed +Requires(post): systemd +%if %{defined regenerate_initrd_post} +Requires(post): coreutils +Requires(postun): coreutils +Requires(posttrans): suse-module-tools +Requires(posttrans): /sbin/mkinitrd +%else +Requires(post): /sbin/mkinitrd +Requires(postun): /sbin/mkinitrd +%endif Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 @@ -737,6 +760,10 @@ %patch192 -p1 %patch193 -p1 %patch194 -p0 +%patch195 -p0 +%patch196 -p1 +%patch197 -p1 +%patch198 -p1 # udev patches %patch1001 -p1 @@ -1121,9 +1148,14 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi @@ -1135,12 +1167,22 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi +%if %{defined regenerate_initrd_post} +%posttrans -n %{udevpkgname} +%regenerate_initrd_posttrans +%endif + %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -40,6 +40,7 @@ BuildRequires: binutils-gold %endif %endif +BuildRequires: config(suse-module-tools) %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets %endif @@ -99,6 +100,9 @@ %endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) +%if 0%{?suse_version} > 1310 +Conflicts: sysvinit +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs @@ -370,6 +374,14 @@ Patch193: portmap-wants-rpcbind-socket.patch # PATCH-FIX-USTREAM added at 2014/03/11 Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch +# PATCH-FIX-USTREAM added at 2014/03/14 +Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +# PATCH-FIX-SUSE Detect XEN dom0 as well as domU +Patch196: systemd-detect-xendom.patch +# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console +Patch197: rescue-emergency-target-conflicts.patch +# PATCH-FIX-SUSE Avoid a divide by zero sigtrap +Patch198: avoid-divide-by-zero-sigtrap.patch # UDEV PATCHES # ============ @@ -458,6 +470,17 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} +Requires(post): sed +Requires(post): systemd +%if %{defined regenerate_initrd_post} +Requires(post): coreutils +Requires(postun): coreutils +Requires(posttrans): suse-module-tools +Requires(posttrans): /sbin/mkinitrd +%else +Requires(post): /sbin/mkinitrd +Requires(postun): /sbin/mkinitrd +%endif Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 @@ -732,6 +755,10 @@ %patch192 -p1 %patch193 -p1 %patch194 -p0 +%patch195 -p0 +%patch196 -p1 +%patch197 -p1 +%patch198 -p1 # udev patches %patch1001 -p1 @@ -1116,9 +1143,14 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi @@ -1130,12 +1162,22 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi +%if %{defined regenerate_initrd_post} +%posttrans -n %{udevpkgname} +%regenerate_initrd_posttrans +%endif + %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig ++++++ 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch ++++++ Based on b2103dccb354de3f38c49c14ccb637bdf665e40f Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Sat, 5 Apr 2014 13:59:01 -0400 Subject: [PATCH] reduce the amount of messages logged to /dev/kmsg when "debug" is specified --- src/core/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- src/core/main.c +++ src/core/main.c 2014-04-14 13:50:48.490814738 +0000 @@ -412,12 +412,8 @@ static int parse_proc_cmdline_word(const if (arg_show_status == _SHOW_STATUS_UNSET) arg_show_status = SHOW_STATUS_AUTO; } else if (streq(word, "debug")) { - /* Log to kmsg, the journal socket will fill up before the - * journal is started and tools running during that time - * will block with every log message for for 60 seconds, - * before they give up. */ - log_set_max_level(LOG_DEBUG); - log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG); + if (detect_container(NULL) > 0) + log_set_target(LOG_TARGET_CONSOLE); } else if (!in_initrd()) { unsigned i; ++++++ avoid-divide-by-zero-sigtrap.patch ++++++ Nasty bug reported on bnc#867663 --- systemd-210/src/core/manager.c +++ systemd-210/src/core/manager.c 2014-04-17 13:29:07.366236714 +0000 @@ -1780,7 +1780,8 @@ static int manager_dispatch_jobs_in_prog assert(m); assert(source); - manager_print_jobs_in_progress(m); + if (m->n_running_jobs > 0) + manager_print_jobs_in_progress(m); next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC; r = sd_event_source_set_time(source, next); --- systemd-210/src/shared/def.h +++ systemd-210/src/shared/def.h 2014-04-17 13:47:10.946234983 +0000 @@ -37,7 +37,7 @@ #define SYSTEMD_CGROUP_CONTROLLER "name=systemd" -#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT +#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT,SIGTRAP,SIGSYS #define SIGNALS_IGNORE SIGPIPE #define DIGITS "0123456789" ++++++ rescue-emergency-target-conflicts.patch ++++++ --- systemd-210/units/emergency.target +++ systemd-210/units/emergency.target 2014-04-15 11:11:18.618235831 +0000 @@ -10,4 +10,5 @@ Description=Emergency Mode Documentation=man:systemd.special(7) Requires=emergency.service After=emergency.service +Conflicts=getty.target rescue.target AllowIsolate=yes --- systemd-210/units/rescue.target +++ systemd-210/units/rescue.target 2014-04-15 11:14:40.606808928 +0000 @@ -10,7 +10,8 @@ Description=Rescue Mode Documentation=man:systemd.special(7) Requires=sysinit.target rescue.service After=sysinit.target rescue.service -Conflicts=getty.target +Conflicts=getty.target emergency.target +Before=emergency.target AllowIsolate=yes [Install] ++++++ systemd-detect-xendom.patch ++++++ diff -Naur systemd-210/src/shared/virt.c systemd-210-mod/src/shared/virt.c --- systemd-210/src/shared/virt.c 2014-02-24 15:38:03.909784909 +0100 +++ systemd-210/src/shared/virt.c 2014-04-10 13:48:05.568766957 +0200 @@ -149,7 +149,7 @@ /* Returns a short identifier for the various VM implementations */ int detect_vm(const char **id) { - _cleanup_free_ char *hvtype = NULL, *cpuinfo_contents = NULL; + _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL; static thread_local int cached_found = -1; static thread_local const char *cached_id = NULL; const char *_id = NULL; @@ -166,13 +166,18 @@ /* Try high-level hypervisor sysfs file first: * * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */ - r = read_one_line_file("/sys/hypervisor/type", &hvtype); + r = read_one_line_file("/proc/xen/capabilities", &domcap); if (r >= 0) { - if (streq(hvtype, "xen")) { - _id = "xen"; + if (strstr(domcap, "control_d")) { + r = 0; + _id = "xen-dom0"; + } else { r = 1; - goto finish; + _id = "xen-domU"; } + + goto finish; + } else if (r != -ENOENT) return r; ++++++ systemd-sleep-grub ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -50,10 +50,10 @@ fi ;; - linux*noresume*) + linux*noresume*|module*xen*noresume*) echo " Skipping grub entry #${J}, because it has the noresume option" >&2 ;; - linux*root=*) + linux*root=*|module*xen*root=*) local ROOT ROOT=${LINE#*root=} DUMMY=($ROOT) @@ -77,7 +77,7 @@ # DEBUG "Found kernel entry #${I}: '${DUMMY[1]##*/}'" INFO let I++ ;; - linux*) + linux*|module*xen*) # a kernel without "root="? We better skip that one... echo " Skipping grub entry #${J}, because it has no root= option" >&2 ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-04-26 11:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-03-06 19:18:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-04-26 11:45:02.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 17 15:00:25 CEST 2014 - aschnell(a)suse.de + +- fixed parent of snapshot generated by rollback + +------------------------------------------------------------------- +Thu Apr 10 10:17:49 CEST 2014 - aschnell(a)suse.de + +- added rollback support (fate#317062) +- version 0.2.2 + +------------------------------------------------------------------- +Thu Apr 03 17:49:12 CEST 2014 - aschnell(a)suse.de + +- fixed execution of grub plugin (bnc#871880) + +------------------------------------------------------------------- +Tue Apr 01 20:04:33 CEST 2014 - aschnell(a)suse.de + +- allow to add snapshots subvolume to fstab (for fate#317062) + +------------------------------------------------------------------- @@ -30 +51 @@ -- 0.2.1 +- version 0.2.1 @@ -37 +58 @@ -- 0.2.0 +- version 0.2.0 @@ -54 +75 @@ -- 0.1.8 +- version 0.1.8 @@ -77 +98 @@ -- 0.1.7 +- version 0.1.7 @@ -88 +109 @@ -- 0.1.6 +- version 0.1.6 @@ -101 +122 @@ -- 0.1.5 +- version 0.1.5 Old: ---- snapper-0.2.1.tar.bz2 New: ---- snapper-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.pwTK3b/_old 2014-04-26 11:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.pwTK3b/_new 2014-04-26 11:45:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: snapper -Version: 0.2.1 +Version: 0.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -27,6 +27,12 @@ BuildRequires: libacl-devel BuildRequires: libtool BuildRequires: libxml2-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +BuildRequires: libmount-devel >= 2.24 +%endif BuildRequires: pkg-config %if ! 0%{?mandriva_version} BuildRequires: dbus-1-devel @@ -75,6 +81,9 @@ ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} \ --docdir=%{prefix}/share/doc/packages/snapper \ +%if 0%{?suse_version} <= 1310 + --disable-rollback \ +%endif --disable-silent-rules --disable-ext4 make %{?jobs:-j%jobs} @@ -160,6 +169,12 @@ Requires: libsnapper2 = %version Requires: libstdc++-devel Requires: libxml2-devel +%if 0%{?suse_version} > 1230 +Requires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +Requires: libmount-devel >= 2.24 +%endif Summary: Header files and documentation for libsnapper Group: Development/Languages/C and C++ ++++++ snapper-0.2.1.tar.bz2 -> snapper-0.2.2.tar.bz2 ++++++ ++++ 3409 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 yast2-slp for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2014-04-26 11:45:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2014-03-21 12:13:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2014-04-26 11:45:01.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com + +- Correct summary and description in spec file (bnc#868453) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.1.5.tar.bz2 New: ---- yast2-slp-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.TJptcw/_old 2014-04-26 11:45:02.000000000 +0200 +++ /var/tmp/diff_new_pack.TJptcw/_new 2014-04-26 11:45:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,14 +39,13 @@ Requires: yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - SLP Agent and Browser +Summary: YaST2 - SLP Agent and Library License: GPL-2.0+ Group: System/YaST Url: https://github.com/yast/yast-slp %description -This module enables YaST modules to register services with SLP. -Additionally, it offers a simple browser of SLP registered services. +This package provides YaST modules to lookup/advertise services with SLP. %prep %setup -n %{name}-%{version} ++++++ yast2-slp-3.1.5.tar.bz2 -> yast2-slp-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.5/package/yast2-slp.changes new/yast2-slp-3.1.6/package/yast2-slp.changes --- old/yast2-slp-3.1.5/package/yast2-slp.changes 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.6/package/yast2-slp.changes 2014-04-16 16:27:35.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com + +- Correct summary and description in spec file (bnc#868453) +- 3.1.6 + +------------------------------------------------------------------- Mon Mar 10 14:13:13 UTC 2014 - vmoravec(a)suse.com - Fix dns resolution exception (bnc#867357) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.5/package/yast2-slp.spec new/yast2-slp-3.1.6/package/yast2-slp.spec --- old/yast2-slp-3.1.5/package/yast2-slp.spec 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.6/package/yast2-slp.spec 2014-04-16 16:27:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,12 +34,11 @@ Requires: openslp yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - SLP Agent and Browser +Summary: YaST2 - SLP Agent and Library Url: https://github.com/yast/yast-slp %description -This module enables YaST modules to register services with SLP. -Additionally, it offers a simple browser of SLP registered services. +This package provides YaST modules to lookup/advertise services with SLP. %prep %setup -n %{name}-%{version} -- 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-hardware-detection for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-hardware-detection for openSUSE:Factory checked in at 2014-04-26 11:44:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-hardware-detection (Old) and /work/SRC/openSUSE:Factory/.yast2-hardware-detection.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-hardware-detection" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-hardware-detection/yast2-hardware-detection.changes 2013-11-18 14:59:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-hardware-detection.new/yast2-hardware-detection.changes 2014-04-26 11:45:00.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 11:31:23 CEST 2014 - snwint(a)suse.de + +- update hardware agent to use the latest libhd flags (bnc #841170) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-hardware-detection-3.1.1.tar.bz2 New: ---- yast2-hardware-detection-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-hardware-detection.spec ++++++ --- /var/tmp/diff_new_pack.Ep8Mdf/_old 2014-04-26 11:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Ep8Mdf/_new 2014-04-26 11:45:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-hardware-detection # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-hardware-detection -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,7 +27,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool # needed for all yast packages -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # autodocs BuildRequires: doxygen # testsuite ++++++ yast2-hardware-detection-3.1.1.tar.bz2 -> yast2-hardware-detection-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/VERSION new/yast2-hardware-detection-3.1.2/VERSION --- old/yast2-hardware-detection-3.1.1/VERSION 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/agent/HwParse.cc new/yast2-hardware-detection-3.1.2/agent/HwParse.cc --- old/yast2-hardware-detection-3.1.1/agent/HwParse.cc 2013-11-04 16:09:53.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/agent/HwParse.cc 2014-04-16 11:48:36.000000000 +0200 @@ -710,6 +710,31 @@ out->add (YCPString ("hotpluggable"), YCPBoolean (true)); } + if (hd->is.dualport) + { + out->add (YCPString ("dualport"), YCPBoolean (true)); + } + + if (hd->is.fcoe) + { + out->add (YCPString ("fcoe"), YCPBoolean (true)); + } + + if (hd->is.fcoe_offload) + { + out->add (YCPString ("fcoeoffload"), YCPBoolean (true)); + } + + if (hd->is.iscsi_offload) + { + out->add (YCPString ("iscsioffload"), YCPBoolean (true)); + } + + if (hd->is.storage_only) + { + out->add (YCPString ("storageonly"), YCPBoolean (true)); + } + // hd detail if (hd->detail) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.changes new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.changes --- old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.changes 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.changes 2014-04-16 11:48:36.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 16 11:31:23 CEST 2014 - snwint(a)suse.de + +- update hardware agent to use the latest libhd flags (bnc #841170) +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.spec new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.spec --- old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.spec 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.spec 2014-04-16 11:48:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-hardware-detection -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool # needed for all yast packages -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # autodocs BuildRequires: doxygen # testsuite -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-04-26 11:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-04-12 21:33:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-04-26 11:44:58.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Apr 16 09:56:31 CEST 2014 - hare(a)suse.de + +- Enable multipath correctly during booting (bnc#873686) + Add: 0022-90multipath-Fixup-service-file-for-booting.patch + +------------------------------------------------------------------- +Mon Apr 14 14:19:49 UTC 2014 - pwieczorkiewicz(a)suse.com + +- fix-iscsi-firmware.patch: + Fix according to dracut-037 updates (iscsistarted-iscsi:). + +------------------------------------------------------------------- +Mon Apr 14 09:00:26 UTC 2014 - pwieczorkiewicz(a)suse.com + +- add_dracuts_network_params_for_iscsi.patch: + Add missing dracut's cmdline parameters to make network mandatory + and boot using iBFT when present. Without them iBFT booting does + not work. + +------------------------------------------------------------------- New: ---- 0022-90multipath-Fixup-service-file-for-booting.patch add_dracuts_network_params_for_iscsi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200 @@ -57,6 +57,8 @@ Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch Patch33: 0021-90multipath-install-correct-multipath-rules.patch +Patch34: add_dracuts_network_params_for_iscsi.patch +Patch35: 0022-90multipath-Fixup-service-file-for-booting.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -118,6 +120,8 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 %build %configure\ ++++++ 0022-90multipath-Fixup-service-file-for-booting.patch ++++++ >From 10eda256afc1f1de0bffa26afdbdcf04394aeeeb Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Wed, 16 Apr 2014 09:35:28 +0200 Subject: 90multipath: Fixup service file for booting 'Type=forking' caused systemd to immediately terminate the entire process, and not creating any device maps. So we should be using 'Type=simple' here. References: bnc#873686 Signed-off-by: Hannes Reinecke <hare(a)suse.de> --- modules.d/90multipath/module-setup.sh | 4 ++-- modules.d/90multipath/multipathd.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh index 508241e..0149df9 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -92,8 +92,8 @@ install() { if dracut_module_included "systemd"; then inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service" - mkdir -p "${initdir}${systemdsystemconfdir}/sysinit.target.wants" - ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemconfdir}/sysinit.target.wants/multipathd.service" + mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants" + ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemunitdir}/sysinit.target.wants/multipathd.service" else inst_hook pre-trigger 02 "$moddir/multipathd.sh" inst_hook cleanup 02 "$moddir/multipathd-stop.sh" diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service index 01e497c..50a0883 100644 --- a/modules.d/90multipath/multipathd.service +++ b/modules.d/90multipath/multipathd.service @@ -5,9 +5,9 @@ DefaultDependencies=no Conflicts=shutdown.target [Service] -Type=forking +Type=simple ExecStartPre=/sbin/modprobe dm-multipath -ExecStart=/sbin/multipathd +ExecStart=/sbin/multipathd -s -d ExecReload=/sbin/multipathd reconfigure ExecStop=/sbin/multipathd shutdown -- 1.8.1.4 ++++++ add_dracuts_network_params_for_iscsi.patch ++++++ Index: dracut-037/modules.d/95iscsi/module-setup.sh =================================================================== --- dracut-037.orig/modules.d/95iscsi/module-setup.sh 2014-03-19 17:16:08.000000000 +0100 +++ dracut-037/modules.d/95iscsi/module-setup.sh 2014-04-14 13:40:02.560200357 +0200 @@ -39,6 +39,22 @@ depends() { installkernel() { local _arch=$(uname -m) + install_ibft() { + local IBFT_NICS="ethernet" + local IBFT_ROOT="/sys/firmware/ibft" + + # When iBFT is detected: + # - mark network as mandatory + # - specify firmware booting cmdline parameter + if [ -d "${IBFT_ROOT}/${IBFT_NICS}"* ]; then + echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" + echo "rd.iscsi.firmware=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" + fi + } + + # Detect iBFT and perform mandatory steps + install_ibft + instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs iscsi_module_filter() { ++++++ fix-iscsi-firmware.patch ++++++ --- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200 @@ -8,16 +8,12 @@ modules.d/95iscsi/parse-iscsiroot.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 4be9d56..ec7764e 100755 ---- a/modules.d/95iscsi/parse-iscsiroot.sh -+++ b/modules.d/95iscsi/parse-iscsiroot.sh -@@ -61,10 +61,9 @@ fi - - # iscsi_firmware does not need argument checking - if [ -n "$iscsi_firmware" ] ; then -- netroot=${netroot:-iscsi:} -+ netroot=${netroot:-iscsi} +Index: dracut-037/modules.d/95iscsi/parse-iscsiroot.sh +=================================================================== +--- dracut-037.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-03-19 17:16:08.000000000 +0100 ++++ dracut-037/modules.d/95iscsi/parse-iscsiroot.sh 2014-04-15 11:49:40.922075002 +0200 +@@ -64,7 +64,6 @@ if [ -n "$iscsi_firmware" ] ; then + netroot=${netroot:-iscsi:} modprobe -q iscsi_boot_sysfs 2>/dev/null modprobe -q iscsi_ibft - initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'" @@ -33,6 +29,3 @@ fi fi --- -1.8.1.4 - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2014-04-26 11:44:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2014-04-12 22:03:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-04-26 11:44:56.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 15 08:36:46 UTC 2014 - tchvatal(a)suse.com + +- Fix sorting of RC kernels to be older than first regular of the + series. Fixes bnc#827531. + +- added patches: + * grub2-use-rpmsort-for-version-sorting.patch + +------------------------------------------------------------------- New: ---- grub2-use-rpmsort-for-version-sorting.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.D2OAl1/_old 2014-04-26 11:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.D2OAl1/_new 2014-04-26 11:44:58.000000000 +0200 @@ -139,6 +139,7 @@ Patch36: 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch Patch38: grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch +Patch39: grub2-use-rpmsort-for-version-sorting.patch # Btrfs snapshot booting related patches Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch Patch102: 0003-cmdline-add-envvar-loader_cmdline_append.patch @@ -329,6 +330,7 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 ++++++ grub2-use-rpmsort-for-version-sorting.patch ++++++ diff -urN grub-2.02~beta2.old/util/grub-mkconfig_lib.in grub-2.02~beta2/util/grub-mkconfig_lib.in --- grub-2.02~beta2.old/util/grub-mkconfig_lib.in 2014-04-11 15:20:42.451394845 +0200 +++ grub-2.02~beta2/util/grub-mkconfig_lib.in 2014-04-11 15:58:02.940618803 +0200 @@ -229,7 +229,7 @@ version_test_numeric_a="$version_test_numeric_b" version_test_numeric_b="$version_test_numeric_c" fi - if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then + if [ "`printf '%s\n' "$version_test_gt_a" "$version_test_gt_b" | /usr/lib/rpm/rpmsort -r | head -n1`" = "$version_test_gt_a" ] ; then return 0 else return 1 -- 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-ntp-client for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2014-04-26 11:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ntp-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2014-04-05 14:43:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2014-04-26 11:44:55.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 09:58:18 CEST 2014 - locilka(a)suse.com + +- Fixed evaluation of starting the NTP service (bnc#872389) +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.7.tar.bz2 New: ---- yast2-ntp-client-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.kxEHeC/_old 2014-04-26 11:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.kxEHeC/_new 2014-04-26 11:44:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ ++++++ yast2-ntp-client-3.1.7.tar.bz2 -> yast2-ntp-client-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.changes 2014-04-15 10:11:35.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 15 09:58:18 CEST 2014 - locilka(a)suse.com + +- Fixed evaluation of starting the NTP service (bnc#872389) +- 3.1.8 + +------------------------------------------------------------------- Thu Apr 3 11:52:14 UTC 2014 - jreidinger(a)suse.com - change path for ntptimeset(bnc#871367) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.spec 2014-04-15 10:11:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb new/yast2-ntp-client-3.1.8/src/modules/NtpClient.rb --- old/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/src/modules/NtpClient.rb 2014-04-15 10:11:35.000000000 +0200 @@ -870,11 +870,15 @@ Report.Error(Message.CannotAdjustService("NTP")) end - if @run_service && !@write_only && Service.Restart(@service_name) - # error report - Report.Error(_("Cannot restart the NTP daemon.")) + if @run_service + unless @write_only + # error report + Report.Error(_("Cannot restart the NTP daemon.")) unless Service.Restart(@service_name) + end + else + Service.Stop(@service_name) end - Service.Stop(@service_name) if !@run_service + if @synchronize_time SCR.Write( path(".target.string"), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yum for openSUSE:Factory checked in at 2014-04-26 11:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yum (Old) and /work/SRC/openSUSE:Factory/.yum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yum" Changes: -------- --- /work/SRC/openSUSE:Factory/yum/yum.changes 2014-03-15 17:35:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yum.new/yum.changes 2014-04-26 11:44:54.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 14 12:54:31 UTC 2014 - adrian(a)suse.de + +- fix "repotag" support in modifyrepo + new patch: yum-3.4.3-fix-repo-tag.patch +- include debian build descriptions, since we require this + for travis-ci testing + +------------------------------------------------------------------- New: ---- debian.changelog debian.rules debian.series debian.tar.gz yum-3.4.3-fix-repo-tag.patch yum.dsc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.HcUBhb/_old 2014-04-26 11:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HcUBhb/_new 2014-04-26 11:44:55.000000000 +0200 @@ -38,6 +38,8 @@ Patch7: %{name}-3.4.3-updatesd-dbus-conf-syntax.patch # PATCH-FIX-UPSTREAM Patch8: %{name}-3.4.3-speedup-bnc810074.patch +# PATCH-FIX-OPENSUSE +Patch9: %{name}-3.4.3-fix-repo-tag.patch BuildRequires: dbus-1 BuildRequires: intltool BuildRequires: python-devel @@ -93,10 +95,11 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 +%patch3 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Fix non-executable scripts rpmlint issue: sed -i "s|#!.*/usr/bin/python.*||" rpmUtils/{arch,__init__,miscutils,oldUtils,transaction,updates}.py ++++++ debian.changelog ++++++ yum (2011.10.10-1) unstable; urgency=low * initial debian packaging for travis -- Adrian Schroeter <adrian(a)suse.de> Tue, 11 Jun 2013 19:30:22 +0200 ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany # This file and all modifications and additions to the pristine package # are under the same license as the package itself. # # Please submit bugfixes or commens via http://bugs.opensuse.org # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 configure: configure-stamp configure-stamp: touch configure-stamp build: build-stamp build-stamp: configure-stamp touch build-stamp clean: dh $@ install: install-stamp install-stamp: dh install dh_perl dh_gencontrol -a dh_md5sums -a dh_builddeb -a touch $@ override_dh_auto_test: true override_dh_auto_install: make install DESTDIR=/.build.packages/BUILD/debian/yum cd yum && make install 'PKGDIR=$$(PYLIBDIR)/$$(PACKAGE)' DESTDIR=/.build.packages/BUILD/debian/yum cd rpmUtils && make install 'PKGDIR=$$(PYLIBDIR)/$$(PACKAGE)' DESTDIR=/.build.packages/BUILD/debian/yum binary-arch: binary-indep: install dh $@ binary: binary-arch binary-indep .PHONY: binary binary-arch binary-indep install clean build ++++++ debian.series ++++++ # Patch series file for quilt, created by quilt setup # Source: yum-3.4.3.tar.gz # Patchdir: yum-3.4.3 # yum-3.4.3-license-to-confirm.patch yum-3.4.3-suse-changelogs.patch yum-3.4.3-suse-missing-tags.patch yum-3.4.3-add-lib-cpp-file.patch yum-3.4.3-updatesd-dbus-conf-syntax.patch yum-3.4.3-speedup-bnc810074.patch yum-3.4.3-fix-repo-tag.patch ++++++ yum-3.4.3-fix-repo-tag.patch ++++++ --- a/yum/repoMDObject.py.orig 2014-04-14 16:38:41.520300670 +0000 +++ b/yum/repoMDObject.py 2014-04-14 16:40:58.680570788 +0000 @@ -187,6 +187,8 @@ class RepoMD: child_name = ns_cleanup(child.tag) if child_name == 'content': self.tags['content'].add(child.text) + if child_name == 'repo': + self.tags['repo'].add(child.text) if child_name == 'distro': cpeid = child.attrib.get('cpeid', '') distro = self.tags['distro'].setdefault(cpeid,set()) @@ -218,6 +220,8 @@ class RepoMD: print 'revision: %s' % self.revision if self.tags['content']: print 'tags content: %s' % ", ".join(sorted(self.tags['content'])) + if self.tags['repo']: + print 'tags repo: %s' % ", ".join(sorted(self.tags['repo'])) if self.tags['distro']: for distro in sorted(self.tags['distro']): print 'tags distro: %s' % distro ++++++ yum-3.4.3-suse-missing-tags.patch ++++++ --- /var/tmp/diff_new_pack.HcUBhb/_old 2014-04-26 11:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HcUBhb/_new 2014-04-26 11:44:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- ./yum/mdparser.py.orig 2014-03-13 11:04:20.753615026 +0000 -+++ ./yum/mdparser.py 2014-03-13 11:04:51.698614971 +0000 +--- a/yum/mdparser.py.orig 2014-03-13 11:04:20.753615026 +0000 ++++ b/yum/mdparser.py 2014-03-13 11:04:51.698614971 +0000 @@ -155,7 +155,8 @@ class PrimaryEntry(BaseEntry): p[name] = child.text ++++++ yum.dsc ++++++ Format: 1.0 Source: yum Version: 3.4.3 Binary: yum Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 4), python-dev, python-libxml2, python-rpm, python-urlgrabber, python-sqlitecachec -- 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-iscsi-client for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2014-04-26 11:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2014-04-13 13:13:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2014-04-26 11:44:53.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 14 12:28:33 CEST 2014 - gs(a)suse.de + +- reintroduce exception in case of socket not found + (Requires: open-iscsi is bug-fix for bnc #872049) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-3.1.5.tar.bz2 New: ---- yast2-iscsi-client-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.i9IxIp/_old 2014-04-26 11:44:54.000000000 +0200 +++ /var/tmp/diff_new_pack.i9IxIp/_new 2014-04-26 11:44:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-client-3.1.5.tar.bz2 -> yast2-iscsi-client-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.changes 2014-04-14 13:23:39.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 14 12:28:33 CEST 2014 - gs(a)suse.de + +- reintroduce exception in case of socket not found + (Requires: open-iscsi is bug-fix for bnc #872049) +- 3.1.6 + +------------------------------------------------------------------- Tue Apr 8 14:37:23 CEST 2014 - gs(a)suse.de - don't throw exception if socket not found (bnc #872049) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.spec 2014-04-14 13:23:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.6/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/src/modules/IscsiClientLib.rb 2014-04-14 13:23:40.000000000 +0200 @@ -999,7 +999,8 @@ startIScsid else # find socket (only in installed system) - @iscsid_socket = SystemdSocket.find("iscsid") + # throw exception if socket not found + @iscsid_socket = SystemdSocket.find!("iscsid") @serviceStatus = true if Service.Status("iscsi") == 0 @socketStatus = true if iscsidSocketActive? -- 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-services-manager for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2014-04-26 11:44:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2014-03-21 12:14:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2014-04-26 11:44:52.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 10 14:31:57 UTC 2014 - vmoravec(a)suse.com + +- Add support for legacy runlevel autoyast profile and improve + profile specifications (bnc#865347) +- 3.1.12 + +------------------------------------------------------------------- Old: ---- yast2-services-manager-3.1.11.tar.bz2 New: ---- yast2-services-manager-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.2bLswL/_old 2014-04-26 11:44:52.000000000 +0200 +++ /var/tmp/diff_new_pack.2bLswL/_new 2014-04-26 11:44:52.000000000 +0200 @@ -24,8 +24,9 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.11 +Version: 3.1.12 Release: 0 + BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +39,7 @@ Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel +Conflicts: yast2-runlevel BuildRequires: ruby BuildRequires: update-desktop-files @@ -82,6 +84,7 @@ %dir %{yast_dir}/lib/ %{yast_dir}/lib/services-manager/ %{_prefix}/share/applications/YaST2/services-manager.desktop +%{_prefix}/share/applications/YaST2/runlevel.desktop %dir %_docdir/ %_docdir/%name/ ++++++ yast2-services-manager-3.1.11.tar.bz2 -> yast2-services-manager-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/README.md new/yast2-services-manager-3.1.12/README.md --- old/yast2-services-manager-3.1.11/README.md 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/README.md 2014-04-14 13:07:39.000000000 +0200 @@ -2,8 +2,59 @@ Systemd target and services configuration library for Yast -Running -======= +## Autoyast profile - sudo yast2 services-manager +### Current profile for services and default target + +```xml +<services-manager> + <default_target>multi-user</default_target> + <services> + <enable config:type="list"> + <service>postfix</service> + <service>rsyslog</service> + <service>sshd</service> + </enable> + <disable config:type="list"> + <service>libvirtd</service> + </disable> + </services> + </services-manager> +``` +### Legacy runlevel profile [DEPRECATED] + +```xml +<runlevel> + <default>3</default> + <services config:type="list"> + <service> + <service_name>sshd</service_name> + <service_status>enable</service_status> + <service_start>3</service_start> + </service> + </services> +</runlevel> +``` + +### Legacy list of services [DEPRECATED] + +```xml + <services-manager> + <default_target>multi-user</default_target> + <services config:type="list"> + <service>cron</service> + <service>postfix</service> + <service>rsyslog</service> + <service>sshd</service> + </services> + </services-manager> +``` + +## Running + +`sudo yast services-manager` + +or + +`sudo yast services` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/package/yast2-services-manager.changes new/yast2-services-manager-3.1.12/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.11/package/yast2-services-manager.changes 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/package/yast2-services-manager.changes 2014-04-14 13:07:39.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 10 14:31:57 UTC 2014 - vmoravec(a)suse.com + +- Add support for legacy runlevel autoyast profile and improve + profile specifications (bnc#865347) +- 3.1.12 + +------------------------------------------------------------------- Tue Mar 18 13:37:40 UTC 2014 - vmoravec(a)suse.com - Do not crash installation with empty services list (bnc#868614) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/package/yast2-services-manager.spec new/yast2-services-manager-3.1.12/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.11/package/yast2-services-manager.spec 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/package/yast2-services-manager.spec 2014-04-14 13:07:39.000000000 +0200 @@ -24,7 +24,8 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.11 +Version: 3.1.12 + Release: 0 BuildArch: noarch @@ -38,6 +39,7 @@ Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel +Conflicts: yast2-runlevel BuildRequires: ruby BuildRequires: update-desktop-files @@ -82,6 +84,7 @@ %dir %{yast_dir}/lib/ %{yast_dir}/lib/services-manager/ %{_prefix}/share/applications/YaST2/services-manager.desktop +%{_prefix}/share/applications/YaST2/runlevel.desktop %dir %_docdir/ %_docdir/%name/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/autoyast_rnc/services-manager.rnc new/yast2-services-manager-3.1.12/src/autoyast_rnc/services-manager.rnc --- old/yast2-services-manager-3.1.11/src/autoyast_rnc/services-manager.rnc 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/autoyast_rnc/services-manager.rnc 2014-04-14 13:07:39.000000000 +0200 @@ -2,15 +2,57 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" +# runlevel legacy schema + +runlevel_service_name = element service_name { text } +runlevel_service_status = element service_status { text } +runlevel_service_start = element service_start { text } +runlevel_service_stop = element service_stop { text } + +runlevel_service = + element service { + attribute config:type { text }? & + runlevel_service_name? & + runlevel_service_start? & + runlevel_service_stop? & + runlevel_service_status? + } + +runlevel_services = + element services { + attribute config:type { "list" }?, + runlevel_service* + } + +runlevel_default = element \default { text } + +runlevel_content = element runlevel { runlevel_default? & runlevel_services? } + +# current services-manager schema + service = element service { text } -services = element services { - attribute config:type { text }?, - service* -} +enabled = + element enabled { + attribute config:type { text }? & + service* + } + +disabled = + element disabled { + attribute config:type { text }? & + service* + } + +services = + element services { attribute config:type { text }? & enabled } | + element services { attribute config:type { text }? & disabled } | + element services { attribute config:type { text }? & service* } default_target = element default_target { text } -services-manager = element services-manager { - default_target? & services? -} +services_manager_content = default_target? & services? + +services-manager = + element services-manager { services_manager_content } | + element runlevel { runlevel_content } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/desktop/runlevel.desktop new/yast2-services-manager-3.1.12/src/desktop/runlevel.desktop --- old/yast2-services-manager-3.1.11/src/desktop/runlevel.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/desktop/runlevel.desktop 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,23 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-System; + +X-KDE-ModuleType=Library +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=services-manager +X-SuSE-YaST-AutoInstClient=services-manager_auto + +X-SuSE-YaST-Group=System +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= + +Icon=yast-runlevel +Exec=xdg-su -c "/sbin/yast2 services-manager" + +Name=Services Manager +GenericName=Configure running services and the default target +StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/lib/services-manager/services_manager_profile.rb new/yast2-services-manager-3.1.12/src/lib/services-manager/services_manager_profile.rb --- old/yast2-services-manager-3.1.11/src/lib/services-manager/services_manager_profile.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/lib/services-manager/services_manager_profile.rb 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,155 @@ +module Yast + import "Report" + + ### Supported profiles + # + # @example Extended profile with list of services to be enabled and disabled + # + # <services-manager> + # <default_target>multi-user</default_target> + # <services> + # <enable config:type="list"> + # <service>at</service> + # <service>cron</service> + # <service>nscd</service> + # <service>openct</service> + # <service>postfix</service> + # <service>rsyslog</service> + # <service>sshd</service> + # </enable> + # <disable config:type="list"> + # <service>libvirtd</service> + # </disable> + # </services> + # </services-manager> + # + # @deprecated Legacy profile with incomplete support for services + # @example Simple list of services + # Supported are only services to be enabled. This profile is missing + # services which are going to be disabled. + # + # <services-manager> + # <default_target>multi-user</default_target> + # <services config:type="list"> + # <service>cron</service> + # <service>postfix</service> + # <service>sshd</service> + # </services> + # </services-manager> + # + # @deprecated Legacy runlevel profile + # @example Runlevel profle + # + # <runlevel> + # <default>3</default> + # <services config:type="list"> + # <service> + # <service_name>sshd</service_name> + # <service_status>enable</service_status> + # <service_start>3</service_start> + # </service> + # </services> + # </runlevel> + # + ### + + class ServicesManagerProfile + include Yast::Logger + + ENABLE = 'enable' + DISABLE = 'disable' + + # Service object with two attributes: + # @attr [String] name of the service unit. Suffix '.service' is optional. + # @attr [String] required status on the target system. Can be 'enable' or 'disable'. + Service = Struct.new(:name, :status) + + # Profile data passed from autoyast, a Hash expected + # @return [Hash] + attr_reader :autoyast_profile + + # List of Service structs + # @return [Array<Service>] + attr_reader :services + + # Name of the systemd default target unit. Suffix '.target' is optional. + # @return [String] if the target has been specified in the profile. Can be nil. + attr_reader :target + + def initialize autoyast_profile + @autoyast_profile = autoyast_profile + @services = [] + extract_services + extract_target + end + + private + + def extract_services + services = autoyast_profile['services'] + return if services.nil? || services.empty? + + if services.all? {|item| item.is_a?(::String) } + load_from_simple_list(services) + elsif services.is_a?(Hash) && ( services.key?(ENABLE) || services.key?(DISABLE)) + load_from_extended_list(services) + elsif services.all? {|i| i.is_a?(Hash) && (i.key?('service_name') || i.key?('service_status')) } + load_from_runlevel_list(services) + else + Yast::Report.Error _("Unknown autoyast services profile schema for 'services-manager'") + return + end + log.info "Extracted services from autoyast profile: #{self.services}" + end + + def extract_target + if autoyast_profile.key?('default_target') + @target = autoyast_profile['default_target'] + elsif autoyast_profile.key?('default') + @target = case autoyast_profile['default'] + when "2", "3", "4" + "multi-user" + when "5" + "graphical" + when "0" + log.error "You can't set the default target to 'poweroff' in autoyast profile" + nil + when "1" + log.error "You can't set the default target to 'rescue' in autoyast profile" + nil + else + log.error "Target '#{autoyast_profile['default']}' is not valid" + nil + end + end + end + + def load_from_simple_list services + self.services.concat( + services.map {|service_name| Service.new(service_name, ENABLE)} + ) + end + + def load_from_runlevel_list services + self.services.concat( + services.map do |service| + Service.new(service['service_name'], service['service_status']) + end + ) + end + + def load_from_extended_list services + self.services.concat( + services.fetch(ENABLE, []).map do |service_name| + Service.new(service_name, ENABLE) + end + ) + + self.services.concat( + services.fetch(DISABLE, []).map do |service_name| + Service.new(service_name, DISABLE) + end + ) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager.rb new/yast2-services-manager-3.1.12/src/modules/services_manager.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager.rb 2014-04-14 13:07:39.000000000 +0200 @@ -1,4 +1,5 @@ require 'yast' +require 'services-manager/services_manager_profile' module Yast import "ServicesManagerTarget" @@ -23,8 +24,9 @@ end def import data - ServicesManagerTarget.import data[TARGET] - ServicesManagerService.import data[SERVICES] + profile = ServicesManagerProfile.new(data) + ServicesManagerTarget.import(profile) + ServicesManagerService.import(profile) end def reset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager_service.rb new/yast2-services-manager-3.1.12/src/modules/services_manager_service.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager_service.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager_service.rb 2014-04-14 13:07:39.000000000 +0200 @@ -233,23 +233,23 @@ exported_services.keys end - def import imported_services=[] - if imported_services.nil? || imported_services.empty? - Builtins.y2error("No services for import provided.") - return false - end - Builtins.y2milestone("Imported services: #{imported_services}") + def import profile + Builtins.y2milestone("List of services from autoyast profile: #{profile.services.map(&:name)}") non_existent_services = [] - # All imported will be enabled - imported_services.each do |service| - if exists?(service) - enable(service) + profile.services.each do |service| + case service.status + when 'enable' + exists?(service.name) ? enable(service.name) : non_existent_services << service.name + when 'disable' + exists?(service.name) ? disable(service.name) : non_existent_services << service.name else - non_existent_services << service - Builtins.y2error("Service '#{service}' doesn't exist on this system") + Builtins.y2error("Unknown status '#{service.status}' for service '#{service.name}'") end end - non_existent_services.empty? + return true if non_existent_services.empty? + + Builtins.y2error("Services #{non_existent_services.inspect} don't exist on this system") + false end # Saves the current configuration in memory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager_target.rb new/yast2-services-manager-3.1.12/src/modules/services_manager_target.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager_target.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager_target.rb 2014-04-14 13:07:39.000000000 +0200 @@ -65,12 +65,9 @@ default_target end - def import new_target - if new_target.to_s.empty? - Builtins.y2error("New default target not provided") - return - end - self.default_target = new_target + def import profile + return false if profile.target.nil? || profile.target.empty? + self.default_target = profile.target end def inspect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/test/services_manager_profile_test.rb new/yast2-services-manager-3.1.12/test/services_manager_profile_test.rb --- old/yast2-services-manager-3.1.11/test/services_manager_profile_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/test/services_manager_profile_test.rb 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,142 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +require 'services-manager/services_manager_profile' + +module Yast + describe ServicesManagerProfile do + attr_reader :profile, :autoyast_profile + + context "legacy runlevel autoyast profile" do + before do + @autoyast_profile = { + 'default' => '3', + 'services' => [ + { + 'service_name' => 'sshd', + 'service_status' => 'enable', + 'service_start' => '3' + }, + { + 'service_name' => 'libvirt', + 'service_status' => 'disable', + 'service_start' => '5' + }, + ] + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object with services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(2) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides collection of services to be disabled" do + service = profile.services.find {|s| s.name == 'libvirt'} + expect(service).not_to be_nil + expect(service.status).to eq('disable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('multi-user') + end + end + + context "simplified services profile" do + before do + @autoyast_profile = { + 'default_target'=>'graphical', + 'services' => [ 'sshd', 'iscsi' ] + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object that provides services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(2) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('graphical') + end + end + + context "extended services autoyast profile" do + before do + @autoyast_profile = { + 'default_target' => 'multi-user', + 'services' => { + 'enable' => ['sshd', 'iscsi' ], + 'disable' => ['nginx', 'libvirt'] + } + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object that provides services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(4) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be disabled" do + service = profile.services.find {|s| s.name == 'nginx'} + expect(service).not_to be_nil + expect(service.status).to eq('disable') + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('multi-user') + end + end + + context "missing services and target entries in profile" do + before do + @autoyast_profile = {} + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "provides not target information" do + expect(profile.target).to be_nil + end + + it "provides empty list of services" do + expect(profile.services).to be_empty + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-plugins-good for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package gstreamer-plugins-good for openSUSE:Factory checked in at 2014-04-26 11:04:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-good (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-good" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-good/gstreamer-plugins-good.changes 2014-02-21 14:25:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new/gstreamer-plugins-good.changes 2014-04-26 11:04:40.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 25 11:40:04 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.2.4: + + Bugs fixed: bgo#725104, bgo#722185, bgo#724619, bgo#725124, + bgo#725712, bgo#725860, bgo#726777, bgo#728017, bgo#728041, + bgo#724638, bgo#727329. +- Drop gsp-docs-fix-mismatched-para-tags.patch and + gsp-docs-use-docbook-markup-for-xi:include.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- gsp-docs-fix-mismatched-para-tags.patch gsp-docs-use-docbook-markup-for-xi:include.patch gst-plugins-good-1.2.3.tar.xz New: ---- gst-plugins-good-1.2.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-good.spec ++++++ --- /var/tmp/diff_new_pack.AVF2Ds/_old 2014-04-26 11:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.AVF2Ds/_new 2014-04-26 11:04:40.000000000 +0200 @@ -22,24 +22,20 @@ Name: gstreamer-plugins-good %define _name gst-plugins-good -Version: 1.2.3 +Version: 1.2.4 Release: 0 %define gst_branch 1.0 Summary: GStreamer Streaming-Media Framework Plug-Ins License: LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://gstreamer.freedesktop.org/ -Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.t… -# PATCH-FIX-UPSTREAM gsp-docs-fix-mismatched-para-tags.patch bgo#724085 zaitor(a)opensuse.org -- docs: fix mismatched para tags, newer gtkdoc is more sensitive to mismatched docbook tags. -Patch0: gsp-docs-fix-mismatched-para-tags.patch -# PATCH-FIX-UPSTREAM gsp-docs-use-docbook-markup-for-xi:include.patch zaitor(a)opensuse.org -- docs: use docbook markup for xi:include It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in CDATA break xi:inlcude examples. -Patch1: gsp-docs-use-docbook-markup-for-xi:include.patch +Source0: http://download.gnome.org/sources/gst-plugins-good/1.2/%{_name}-%{version}.… %if 0%{?ENABLE_AALIB} BuildRequires: aalib-devel %endif BuildRequires: gcc-c++ BuildRequires: glib2-devel >= 2.31.14 -BuildRequires: gstreamer-devel >= 1.2.0 +BuildRequires: gstreamer-devel >= 1.2.4 BuildRequires: gstreamer-plugins-base-devel >= 1.2.1 BuildRequires: gtk-doc >= 1.12 BuildRequires: libICE-devel @@ -119,8 +115,6 @@ chmod 0644 %{S:0} %setup -q -n %{_name}-%{version} translation-update-upstream po gst-plugins-good-%{gst_branch} -%patch0 -p1 -%patch1 -p1 %build # FIXME: ++++++ gst-plugins-good-1.2.3.tar.xz -> gst-plugins-good-1.2.4.tar.xz ++++++ ++++ 5145 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 wt for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package wt for openSUSE:Factory checked in at 2014-04-26 10:12:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wt (Old) and /work/SRC/openSUSE:Factory/.wt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wt" Changes: -------- --- /work/SRC/openSUSE:Factory/wt/wt.changes 2012-02-20 16:19:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wt.new/wt.changes 2014-04-26 10:12:10.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Apr 14 07:17:02 UTC 2014 - dap.darkness(a)gmail.com + +- Added _constraints file to prevent out of memory issue. + +------------------------------------------------------------------- +Thu Apr 3 17:17:02 UTC 2014 - dap.darkness(a)gmail.com + +- Update to 3.3.2: + * WRasterImage: now also support skia as backend. + * Namespace Wt::Signals was created. + * Checkboxes are rendered when CheckStateRole is present. + * Client SSL certificates can be queried from WResources. + * Fixed regression in resource continations. + * Added binary WebGL VBO buffers. + * Layouts: various bug fixes and improvements. + * Render: added support for repeating table headers. + * Render: added support for explicit page breaks and % widths. + * Fix popup widgets confusing preferred size calculations. + * New API for payment with an implementation for PayPal. + * layouts: fix various issues. + * WTextEdit: fix behaviour inside a WPanel. + * Render: code reorganizations for java port. + * QueryModel: added stableResultRow() method. + * Dbo/Exception: add support for SQLSTATE code information. + * Mail/Client: log configuration that will be used on first use. + * WAnchor: use <a> tag even if no link has been provided. + * WDoubleSpinBox: fix formatting. + * WSlider: add more hooks for custom styles. +- Added SourceUrl. +- doxygen, firebird-devel, libharu-devel and pango-devel + became required to build because of cmake warnings. +- Rpm_opt_flags became set via cmake option. +- DWT_CMAKE_FINDER_INSTALL_DIR cmake option became broken + and was replaced by manual file moving. +- DBUILD_EXAMPLES cmake option was enabled + because of FIXME comment at spec-file. +- DENABLE_EXT cmake option was enabled + to satisfy leechcraft requirements. +- Don't package INSTALL file. +- RPM_BUILD_ROOT macro was replaced by buildroot. +- Let make be verbose: V=1. + +------------------------------------------------------------------- Old: ---- wt-3.2.0.tar.bz2 New: ---- _constraints wt-3.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wt.spec ++++++ --- /var/tmp/diff_new_pack.OuLLdm/_old 2014-04-26 10:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.OuLLdm/_new 2014-04-26 10:12:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,40 @@ # - Name: wt -Url: http://www.webtoolkit.eu/wt/ +Version: 3.3.2 +Release: 0 +Summary: Web Toolkit License: GPL-2.0 Group: Development/Libraries/C and C++ -Version: 3.2.0 -Release: 1 -Summary: Web Toolkit -Source0: %{name}-%{version}.tar.bz2 -Requires: FastCGI openssl -BuildRequires: gcc-c++ -BuildRequires: FastCGI-devel openssl-devel +Url: http://www.webtoolkit.eu/wt/ +Source0: https://downloads.sourceforge.net/project/witty/wt/%{version}/wt-%{version}… +BuildRequires: FastCGI-devel +%if 0%{?suse_version} < 1220 +BuildRequires: Mesa-devel +%endif # wt will build with boost-devel < 1.36.0 but it won't work BuildRequires: boost-devel >= 1.36.0 - -BuildRequires: graphviz postgresql-devel -BuildRequires: cmake libqt4-devel pkgconfig +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: fdupes +%if 0%{?suse_version} >= 1220 +BuildRequires: firebird-devel +%endif +BuildRequires: gcc-c++ +BuildRequires: graphviz +%if 0%{?suse_version} >= 1230 +BuildRequires: libharu-devel +%endif +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: pango-devel +BuildRequires: pkgconfig +BuildRequires: postgresql-devel + +Requires: FastCGI +Requires: openssl BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,10 +64,12 @@ %package devel Summary: Web Toolkit - Development Files Group: Development/Libraries/C and C++ -Requires: FastCGI-devel openssl-devel Xerces-c-devel +Requires: %{name} = %{version} +Requires: FastCGI-devel +Requires: Xerces-c-devel Requires: boost-devel >= 1.34.1 Requires: mxml-devel >= 2.3 -Requires: %{name} = %{version} +Requires: openssl-devel %description devel Development files for the Wt library. @@ -93,47 +110,54 @@ %define WTRUNGROUP www mkdir wt-build cd wt-build -CFLAGS=$RPM_OPT_FLAGS CXXFLAGS="$RPM_OPT_FLAGS" \ cmake .. \ + -DCMAKE_C_FLAGS="%{optflags}" \ + -DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake/Modules" \ -DLIB_INSTALL_DIR=%{_lib} \ -DCONNECTOR_HTTP=ON \ -DCONNECTOR_FCGI=ON \ +%if 0%{?suse_version} < 1220 + -DWT_NO_BOOST_RANDOM=ON \ +%endif + -DENABLE_EXT=True \ -DWEBGROUP="%{WTRUNGROUP}" -DWEBUSER="%{WTRUNUSER}" \ -DRUNDIR="%{WTRUNDIR}" \ - -DBUILD_EXAMPLES=OFF -# FIXME: Examples are temporarily disabled to avoid a boost bug that produces -# some errors while compiling the tests. -make %{?_smp_mflags} + -DBUILD_EXAMPLES=ON +make V=1 %{?_smp_mflags} %install cd wt-build -make DESTDIR="$RPM_BUILD_ROOT" install +make V=1 DESTDIR="%{buildroot}" install # hack for broken cmake configs on archs with /lib64 %ifarch ppc64 s390x -mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT/usr/%{_lib} || true -rm -Rf $RPM_BUILD_ROOT/usr/lib +mv %{buildroot}/usr/lib/* %{buildroot}/usr/%{_lib} || true +rm -Rf %{buildroot}/usr/lib %endif # end hack -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name} -mkdir -p $RPM_BUILD_ROOT/%{WTSRVDIR} -mkdir -p $RPM_BUILD_ROOT/%{WTRUNDIR} -mkdir $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/ -cp -rv ../doc/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/ -mv -v $RPM_BUILD_ROOT/%{_datadir}/Wt $RPM_BUILD_ROOT/%{_datadir}/wt +mkdir -p %{buildroot}/%{_docdir}/%{name} +mkdir -p %{buildroot}/%{WTSRVDIR} +mkdir -p %{buildroot}/%{WTRUNDIR} +mkdir %{buildroot}/%{_docdir}/%{name}-devel/ +cp -rv ../doc/* %{buildroot}/%{_docdir}/%{name}-devel/ +mv -v %{buildroot}/%{_datadir}/Wt %{buildroot}/%{_datadir}/wt # We mustn't package .orig files -find $RPM_BUILD_ROOT/%{_includedir}/Wt -name '*.orig' -delete +find %{buildroot}/%{_includedir}/Wt -name '*.orig' -delete # Remove the installdox script used for the installation of documentation. -rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/reference/html/installdox +rm %{buildroot}/%{_docdir}/%{name}-devel/examples/html/installdox # Remove shell scripts used for generating some images. -rm $RPM_BUILD_ROOT/%{_datadir}/wt/resources/themes/*/*/generate.sh +rm %{buildroot}/%{_datadir}/wt/resources/themes/*/*/generate.sh + +# Move cmake module to the correct location. +install -v -m 0755 -d %{buildroot}/%{_datadir}/cmake/Modules +mv -v %{buildroot}/%{_prefix}/cmake/*.cmake \ + %{buildroot}/%{_datadir}/cmake/Modules -%fdupes $RPM_BUILD_ROOT/%{_docdir} -%fdupes $RPM_BUILD_ROOT/%{_datadir} +%fdupes %{buildroot}/%{_docdir} +%fdupes %{buildroot}/%{_datadir} %post -p /sbin/ldconfig @@ -142,11 +166,11 @@ %files %defattr(-,root,root) %{_libdir}/*.so.%{version} -%doc Changelog INSTALL LICENSE +%doc Changelog LICENSE %dir %{WTSRVDIR} -%dir /etc/wt +%dir %{_sysconfdir}/wt %{_datadir}/wt -%config(noreplace) /etc/wt/wt_config.xml +%config(noreplace) %{_sysconfdir}/wt/wt_config.xml %attr(-,%{WTRUNUSER},%{WTRUNGROUP}) %{WTRUNDIR} %files devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ulogd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2014-04-26 10:12:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ulogd" Changes: -------- --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2013-11-30 16:23:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2014-04-26 10:12:01.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 12:37:59 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 2.0.4 +* ulogd 2.0.4 features a new JSON output plugin allowing easy + integration with log management systems. + +------------------------------------------------------------------- Old: ---- ulogd-2.0.3.tar.bz2 ulogd-2.0.3.tar.bz2.sig New: ---- ulogd-2.0.4.tar.bz2 ulogd-2.0.4.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ulogd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ulogd -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Userspace logging for Netfilter License: GPL-2.0 @@ -125,13 +125,13 @@ mkdir -p "$b/var/log/ulogd"; mkdir -p "$b/%_sysconfdir"; install -pm0644 ulogd.conf "$b/%_sysconfdir/"; -mkdir -p "$b/%_initrddir" "$b/%_sbindir"; -install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; -ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; - %if 0%{?_unitdir:1} mkdir -p "$b/%_unitdir"; install -pm0644 "%{S:4}" "$b/%_unitdir"; +%else +mkdir -p "$b/%_initrddir" "$b/%_sbindir"; +install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; +ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; %endif %pre @@ -141,16 +141,13 @@ %service_add_pre ulogd.service %endif -%post %if 0%{?_unitdir:1} +%post %service_add_post ulogd.service %endif -%preun -%if 0%{?suse_version} -%stop_on_removal ulogd -%endif %if 0%{?_unitdir:1} +%preun %service_del_preun ulogd.service %endif @@ -165,9 +162,7 @@ %files %defattr(-,root,root) %config(noreplace) %_sysconfdir/ulogd.conf -%_initddir/%name %_sbindir/ulogd -%_sbindir/rc%name %dir %_libdir/%name %_libdir/%name/ulogd_[fir]*.so* %_libdir/%name/ulogd_output_GRAPHITE.so* @@ -181,6 +176,9 @@ %attr(0750,ulogd,root) /var/log/ulogd %if 0%{?_unitdir:1} %_unitdir/ulogd.service +%else +%_initddir/%name +%_sbindir/rc%name %endif # These are the dependency-heavy things: ++++++ ulogd-2.0.3.tar.bz2 -> ulogd-2.0.4.tar.bz2 ++++++ ++++ 1862 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/ulogd-2.0.3/build-aux/missing new/ulogd-2.0.4/build-aux/missing --- old/ulogd-2.0.3/build-aux/missing 2013-11-19 19:32:15.000000000 +0100 +++ new/ulogd-2.0.4/build-aux/missing 2014-03-23 16:39:32.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) 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/ulogd-2.0.3/config.h.in new/ulogd-2.0.4/config.h.in --- old/ulogd-2.0.3/config.h.in 2013-11-19 19:32:15.000000000 +0100 +++ new/ulogd-2.0.4/config.h.in 2014-03-23 16:39:31.000000000 +0100 @@ -34,9 +34,6 @@ /* Define to 1 if you have the `pq' library (-lpq). */ #undef HAVE_LIBPQ -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#undef HAVE_LIBPTHREAD - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H 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/ulogd-2.0.3/configure.ac new/ulogd-2.0.4/configure.ac --- old/ulogd-2.0.3/configure.ac 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/configure.ac 2014-03-23 16:30:50.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([ulogd], [2.0.3]) +AC_INIT([ulogd], [2.0.4]) AC_PREREQ([2.50]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b]) @@ -39,7 +39,8 @@ regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter" AC_SUBST([regular_CFLAGS]) -AC_CHECK_LIB(pthread, pthread_create) +AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""]) +AC_SUBST([libpthread_LIBS]) dnl Check for the right nfnetlink version PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) @@ -116,6 +117,17 @@ enable_pcap="no" fi +AC_ARG_WITH([jansson], AS_HELP_STRING([--without-jansson], [Build without JSON output plugin [default=test]])) +AS_IF([test "x$with_jansson" != "xno"], [ + PKG_CHECK_MODULES([libjansson], [jansson], [], [:]) +]) +AM_CONDITIONAL([HAVE_JANSSON], [test -n "$libjansson_LIBS"]) +if test "x$libjansson_LIBS" != "x"; then + enable_jansson="yes" +else + enable_jansson="no" +fi + dnl AC_SUBST(DATABASE_DIR) dnl AC_SUBST(DATABASE_LIB) dnl AC_SUBST(DATABASE_LIB_DIR) @@ -151,5 +163,6 @@ MySQL plugin: ${enable_mysql} SQLITE3 plugin: ${enable_sqlite3} DBI plugin: ${enable_dbi} + JSON plugin: ${enable_jansson} " echo "You can now run 'make' and 'make install'" 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/ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c new/ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c --- old/ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c 2014-03-23 16:30:50.000000000 +0100 @@ -259,6 +259,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_tcpSourcePort, }, + .cim_name = "src_port", }, [KEY_TCP_DPORT] = { .type = ULOGD_RET_UINT16, @@ -268,6 +269,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_tcpDestinationPort, }, + .cim_name = "dest_port", }, [KEY_TCP_SEQ] = { .type = ULOGD_RET_UINT32, @@ -368,6 +370,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_udpSourcePort, }, + .cim_name = "src_port", }, [KEY_UDP_DPORT] = { .type = ULOGD_RET_UINT16, @@ -377,6 +380,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_udpDestinationPort, }, + .cim_name = "dest_port", }, [KEY_UDP_LEN] = { .type = ULOGD_RET_UINT16, @@ -512,12 +516,14 @@ [KEY_SCTP_SPORT] = { .type = ULOGD_RET_UINT16, .flags = ULOGD_RETF_NONE, - .name = "sctp.sport", + .name = "sctp.sport", + .cim_name = "src_port", }, [KEY_SCTP_DPORT] = { .type = ULOGD_RET_UINT16, .flags = ULOGD_RETF_NONE, - .name = "sctp.dport", + .name = "sctp.dport", + .cim_name = "dest_port", }, [KEY_SCTP_CSUM] = { .type = ULOGD_RET_UINT32, 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/ulogd-2.0.3/filter/ulogd_filter_IP2STR.c new/ulogd-2.0.4/filter/ulogd_filter_IP2STR.c --- old/ulogd-2.0.3/filter/ulogd_filter_IP2STR.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/filter/ulogd_filter_IP2STR.c 2014-03-23 16:30:50.000000000 +0100 @@ -102,18 +102,22 @@ { .type = ULOGD_RET_STRING, .name = "ip.saddr.str", + .cim_name = "src_ip", }, { .type = ULOGD_RET_STRING, .name = "ip.daddr.str", + .cim_name = "dest_ip", }, { .type = ULOGD_RET_STRING, .name = "orig.ip.saddr.str", + .cim_name = "src_ip", }, { .type = ULOGD_RET_STRING, .name = "orig.ip.daddr.str", + .cim_name = "dest_ip", }, { .type = ULOGD_RET_STRING, 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/ulogd-2.0.3/include/ulogd/db.h new/ulogd-2.0.4/include/ulogd/db.h --- old/ulogd-2.0.3/include/ulogd/db.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/db.h 2014-03-23 16:30:50.000000000 +0100 @@ -65,7 +65,7 @@ #define TIME_ERR ((time_t)-1) /* Be paranoid */ #define RECONNECT_DEFAULT 2 #define MAX_ONESHOT_REQUEST 10 -#define RING_BUFFER_DEFAULT_SIZE 10 +#define RING_BUFFER_DEFAULT_SIZE 0 #define DB_CES \ { \ 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/ulogd-2.0.3/include/ulogd/printpkt.h new/ulogd-2.0.4/include/ulogd/printpkt.h --- old/ulogd-2.0.3/include/ulogd/printpkt.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/printpkt.h 2014-03-23 16:30:50.000000000 +0100 @@ -3,7 +3,6 @@ enum pkt_keys { KEY_OOB_FAMILY, - KEY_OOB_TIME_SEC, KEY_OOB_PREFIX, KEY_OOB_IN, KEY_OOB_OUT, 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/ulogd-2.0.3/include/ulogd/ulogd.h new/ulogd-2.0.4/include/ulogd/ulogd.h --- old/ulogd-2.0.3/include/ulogd/ulogd.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/ulogd.h 2014-03-23 16:30:50.000000000 +0100 @@ -17,6 +17,7 @@ #include <stdio.h> #include <signal.h> /* need this because of extension-sighandler */ #include <sys/types.h> +#include <inttypes.h> #include <string.h> #include <config.h> @@ -97,6 +98,9 @@ u_int16_t field_id; } ipfix; + /* Store field name for Common Information Model */ + char *cim_name; + union { /* and finally the returned value */ union { 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/ulogd-2.0.3/input/flow/ulogd_inpflow_NFCT.c new/ulogd-2.0.4/input/flow/ulogd_inpflow_NFCT.c --- old/ulogd-2.0.3/input/flow/ulogd_inpflow_NFCT.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/input/flow/ulogd_inpflow_NFCT.c 2014-03-23 16:30:50.000000000 +0100 @@ -621,7 +621,7 @@ propagate_ct(upi, upi, ct, type, ts); } -static void set_timestamp_from_ct(struct ct_timestamp *ts, +static int set_timestamp_from_ct_try(struct ct_timestamp *ts, struct nf_conntrack *ct, int name) { int attr_name; @@ -636,7 +636,15 @@ nfct_get_attr_u64(ct, attr_name) / NSEC_PER_SEC; ts->time[name].tv_usec = (nfct_get_attr_u64(ct, attr_name) % NSEC_PER_SEC) / 1000; - } else + return 1; + } + return 0; +} + +static void set_timestamp_from_ct(struct ct_timestamp *ts, + struct nf_conntrack *ct, int name) +{ + if (!set_timestamp_from_ct_try(ts, ct, name)) gettimeofday(&ts->time[name], NULL); } @@ -732,8 +740,10 @@ break; case NFCT_T_DESTROY: set_timestamp_from_ct(&tmp, ct, STOP); - tmp.time[START].tv_sec = 0; - tmp.time[START].tv_usec = 0; + if (!set_timestamp_from_ct_try(&tmp, ct, START)) { + tmp.time[START].tv_sec = 0; + tmp.time[START].tv_usec = 0; + } break; default: ulogd_log(ULOGD_NOTICE, "unsupported message type\n"); 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/ulogd-2.0.3/m4/libtool.m4 new/ulogd-2.0.4/m4/libtool.m4 --- old/ulogd-2.0.3/m4/libtool.m4 2013-11-19 19:32:12.000000000 +0100 +++ new/ulogd-2.0.4/m4/libtool.m4 2014-03-23 16:39:29.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) 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/ulogd-2.0.3/output/Makefile.am new/ulogd-2.0.4/output/Makefile.am --- old/ulogd-2.0.3/output/Makefile.am 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/output/Makefile.am 2014-03-23 16:30:50.000000000 +0100 @@ -9,6 +9,10 @@ ulogd_output_NACCT.la ulogd_output_XML.la \ ulogd_output_GRAPHITE.la +if HAVE_JANSSON +pkglib_LTLIBRARIES += ulogd_output_JSON.la +endif + ulogd_output_GPRINT_la_SOURCES = ulogd_output_GPRINT.c ulogd_output_GPRINT_la_LDFLAGS = -avoid-version -module @@ -32,3 +36,9 @@ ulogd_output_GRAPHITE_la_SOURCES = ulogd_output_GRAPHITE.c ulogd_output_GRAPHITE_la_LDFLAGS = -avoid-version -module + +if HAVE_JANSSON +ulogd_output_JSON_la_SOURCES = ulogd_output_JSON.c +ulogd_output_JSON_la_LIBADD = ${libjansson_LIBS} +ulogd_output_JSON_la_LDFLAGS = -avoid-version -module +endif 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/ulogd-2.0.3/output/ulogd_output_JSON.c new/ulogd-2.0.4/output/ulogd_output_JSON.c --- old/ulogd-2.0.3/output/ulogd_output_JSON.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ulogd-2.0.4/output/ulogd_output_JSON.c 2014-03-23 16:30:50.000000000 +0100 @@ -0,0 +1,292 @@ +/* ulogd_output_JSON.c + * + * ulogd output target for logging to a file in JSON format. + * + * (C) 2014 by Eric Leblond <eric(a)regit.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <errno.h> +#include <inttypes.h> +#include <ulogd/ulogd.h> +#include <ulogd/conffile.h> +#include <jansson.h> + +#ifndef ULOGD_JSON_DEFAULT +#define ULOGD_JSON_DEFAULT "/var/log/ulogd.json" +#endif + +#ifndef ULOGD_JSON_DEFAULT_DEVICE +#define ULOGD_JSON_DEFAULT_DEVICE "Netfilter" +#endif + +struct json_priv { + FILE *of; + int sec_idx; + int usec_idx; +}; + +enum json_conf { + JSON_CONF_FILENAME = 0, + JSON_CONF_SYNC, + JSON_CONF_TIMESTAMP, + JSON_CONF_DEVICE, + JSON_CONF_BOOLEAN_LABEL, + JSON_CONF_MAX +}; + +static struct config_keyset json_kset = { + .num_ces = JSON_CONF_MAX, + .ces = { + [JSON_CONF_FILENAME] = { + .key = "file", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_NONE, + .u = {.string = ULOGD_JSON_DEFAULT }, + }, + [JSON_CONF_SYNC] = { + .key = "sync", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 0 }, + }, + [JSON_CONF_TIMESTAMP] = { + .key = "timestamp", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 1 }, + }, + [JSON_CONF_DEVICE] = { + .key = "device", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_NONE, + .u = { .string = ULOGD_JSON_DEFAULT_DEVICE }, + }, + [JSON_CONF_BOOLEAN_LABEL] = { + .key = "boolean_label", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 0 }, + }, + }, +}; + +#define MAX_LOCAL_TIME_STRING 32 + +static int json_interp(struct ulogd_pluginstance *upi) +{ + struct json_priv *opi = (struct json_priv *) &upi->private; + unsigned int i; + json_t *msg; + + msg = json_object(); + if (!msg) { + ulogd_log(ULOGD_ERROR, "Unable to create JSON object\n"); + return ULOGD_IRET_ERR; + } + + if (upi->config_kset->ces[JSON_CONF_TIMESTAMP].u.value != 0) { + time_t now; + char timestr[MAX_LOCAL_TIME_STRING]; + struct tm *t; + struct tm result; + struct ulogd_key *inp = upi->input.keys; + + + if (pp_is_valid(inp, opi->sec_idx)) + now = (time_t) ikey_get_u64(&inp[opi->sec_idx]); + else + now = time(NULL); + t = localtime_r(&now, &result); + + if (pp_is_valid(inp, opi->usec_idx)) { + snprintf(timestr, MAX_LOCAL_TIME_STRING, + "%04d-%02d-%02dT%02d:%02d:%02d.%06u", + t->tm_year + 1900, t->tm_mon + 1, + t->tm_mday, t->tm_hour, + t->tm_min, t->tm_sec, + ikey_get_u32(&inp[opi->usec_idx])); + } else { + snprintf(timestr, MAX_LOCAL_TIME_STRING, + "%04d-%02d-%02dT%02d:%02d:%02d", + t->tm_year + 1900, t->tm_mon + 1, + t->tm_mday, t->tm_hour, + t->tm_min, t->tm_sec); + } + + json_object_set_new(msg, "timestamp", json_string(timestr)); + } + + if (upi->config_kset->ces[JSON_CONF_DEVICE].u.string) { + char *dvc = upi->config_kset->ces[JSON_CONF_DEVICE].u.string; + json_object_set_new(msg, "dvc", json_string(dvc)); + } + + + + for (i = 0; i < upi->input.num_keys; i++) { + struct ulogd_key *key = upi->input.keys[i].u.source; + char *field_name; + + if (!key) + continue; + + if (!IS_VALID(*key)) + continue; + + field_name = key->cim_name ? key->cim_name : key->name; + + switch (key->type) { + case ULOGD_RET_STRING: + json_object_set_new(msg, field_name, json_string(key->u.value.ptr)); + break; + case ULOGD_RET_BOOL: + case ULOGD_RET_INT8: + case ULOGD_RET_INT16: + case ULOGD_RET_INT32: + json_object_set_new(msg, field_name, json_integer(key->u.value.i32)); + break; + case ULOGD_RET_UINT8: + if ((upi->config_kset->ces[JSON_CONF_BOOLEAN_LABEL].u.value != 0) + && (!strcmp(key->name, "raw.label"))) { + if (key->u.value.ui8) + json_object_set_new(msg, "action", json_string("allowed")); + else + json_object_set_new(msg, "action", json_string("blocked")); + break; + } + case ULOGD_RET_UINT16: + case ULOGD_RET_UINT32: + case ULOGD_RET_UINT64: + json_object_set_new(msg, field_name, json_integer(key->u.value.ui64)); + default: + /* don't know how to interpret this key. */ + break; + } + } + + json_dumpf(msg, opi->of, 0); + fprintf(opi->of, "\n"); + + json_decref(msg); + + if (upi->config_kset->ces[JSON_CONF_SYNC].u.value != 0) + fflush(opi->of); + + return ULOGD_IRET_OK; +} + +static void sighup_handler_print(struct ulogd_pluginstance *upi, int signal) +{ + struct json_priv *oi = (struct json_priv *) &upi->private; + FILE *old = oi->of; + + switch (signal) { + case SIGHUP: + ulogd_log(ULOGD_NOTICE, "JSON: reopening logfile\n"); + oi->of = fopen(upi->config_kset->ces[0].u.string, "a"); + if (!oi->of) { + ulogd_log(ULOGD_ERROR, "can't open JSON " + "log file: %s\n", + strerror(errno)); + oi->of = old; + } else { + fclose(old); + } + break; + default: + break; + } +} + +static int json_configure(struct ulogd_pluginstance *upi, + struct ulogd_pluginstance_stack *stack) +{ + int ret; + + ret = ulogd_wildcard_inputkeys(upi); + if (ret < 0) + return ret; + + ret = config_parse_file(upi->id, upi->config_kset); + if (ret < 0) + return ret; + + return 0; +} + +static int json_init(struct ulogd_pluginstance *upi) +{ + struct json_priv *op = (struct json_priv *) &upi->private; + unsigned int i; + + op->of = fopen(upi->config_kset->ces[0].u.string, "a"); + if (!op->of) { + ulogd_log(ULOGD_FATAL, "can't open JSON log file: %s\n", + strerror(errno)); + return -1; + } + + /* search for time */ + op->sec_idx = -1; + op->usec_idx = -1; + for (i = 0; i < upi->input.num_keys; i++) { + struct ulogd_key *key = upi->input.keys[i].u.source; + if (!strcmp(key->name, "oob.time.sec")) + op->sec_idx = i; + else if (!strcmp(key->name, "oob.time.usec")) + op->usec_idx = i; + } + + return 0; +} + +static int json_fini(struct ulogd_pluginstance *pi) +{ + struct json_priv *op = (struct json_priv *) &pi->private; + + if (op->of != stdout) + fclose(op->of); + + return 0; +} + +static struct ulogd_plugin json_plugin = { + .name = "JSON", + .input = { + .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW | ULOGD_DTYPE_SUM, + }, + .output = { + .type = ULOGD_DTYPE_SINK, + }, + .configure = &json_configure, + .interp = &json_interp, + .start = &json_init, + .stop = &json_fini, + .signal = &sighup_handler_print, + .config_kset = &json_kset, + .version = VERSION, +}; + +void __attribute__ ((constructor)) init(void); + +void init(void) +{ + ulogd_register_plugin(&json_plugin); +} 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/ulogd-2.0.3/output/ulogd_output_NACCT.c new/ulogd-2.0.4/output/ulogd_output_NACCT.c --- old/ulogd-2.0.3/output/ulogd_output_NACCT.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/output/ulogd_output_NACCT.c 2014-03-23 16:30:50.000000000 +0100 @@ -127,7 +127,7 @@ 'timestamp' value use 'flow.end.sec' */ if (ikey_get_u8(&inp[KEY_IP_PROTO]) == IPPROTO_ICMP) { snprintf(buf, sizeof(buf), - "%u\t%u\t%s\t%u\t%s\t%u\t%llu\t%llu", + "%u\t%u\t%s\t%u\t%s\t%u\t%" PRIu64 "\t%" PRIu64, ikey_get_u32(&inp[KEY_FLOW_END]), ikey_get_u8(&inp[KEY_IP_PROTO]), (char *) ikey_get_ptr(&inp[KEY_IP_SADDR]), @@ -138,7 +138,7 @@ ikey_get_u64(&inp[KEY_RAW_PKTLEN])); } else { snprintf(buf, sizeof(buf), - "%u\t%u\t%s\t%u\t%s\t%u\t%llu\t%llu", + "%u\t%u\t%s\t%u\t%s\t%u\t%" PRIu64 "\t%" PRIu64, ikey_get_u32(&inp[KEY_FLOW_END]), ikey_get_u8(&inp[KEY_IP_PROTO]), (char *) ikey_get_ptr(&inp[KEY_IP_SADDR]), 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/ulogd-2.0.3/src/Makefile.am new/ulogd-2.0.4/src/Makefile.am --- old/ulogd-2.0.3/src/Makefile.am 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/src/Makefile.am 2014-03-23 16:30:50.000000000 +0100 @@ -7,5 +7,5 @@ sbin_PROGRAMS = ulogd ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c addr.c -ulogd_LDADD = ${libdl_LIBS} -ulogd_LDFLAGS = -export-dynamic -lpthread +ulogd_LDADD = ${libdl_LIBS} ${libpthread_LIBS} +ulogd_LDFLAGS = -export-dynamic 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/ulogd-2.0.3/src/conffile.c new/ulogd-2.0.4/src/conffile.c --- old/ulogd-2.0.3/src/conffile.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/src/conffile.c 2014-03-23 16:30:50.000000000 +0100 @@ -146,7 +146,7 @@ return -ERRTOOLONG; } - if (!(wordend = get_word(line, " \t\n[]", (char *) wordbuf))) + if (!(wordend = get_word(line, " \t\n\r[]", (char *) wordbuf))) continue; pr_debug("word: \"%s\"\n", wordbuf); if (!strcmp(wordbuf, section)) { @@ -178,7 +178,7 @@ return -ERRTOOLONG; } - if (!(wordend = get_word(line, " =\t\n", (char *) &wordbuf))) + if (!(wordend = get_word(line, " =\t\n\r", (char *) &wordbuf))) continue; if (wordbuf[0] == '[' ) { @@ -195,7 +195,7 @@ continue; } - wordend = get_word(wordend, " =\t\n", (char *) &wordbuf); + wordend = get_word(wordend, " =\t\n\r", (char *) &wordbuf); args = (char *)&wordbuf; if (ce->hit && !(ce->options & CONFIG_OPT_MULTI)) 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/ulogd-2.0.3/src/ulogd.c new/ulogd-2.0.4/src/ulogd.c --- old/ulogd-2.0.3/src/ulogd.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/src/ulogd.c 2014-03-23 16:30:50.000000000 +0100 @@ -442,7 +442,7 @@ timestr = ctime(&tm); timestr[strlen(timestr)-1] = '\0'; fprintf(outfd, "%s <%1.1d> %s:%d ", timestr, level, file, line); - if (verbose) + if (verbose && outfd != stderr) fprintf(stderr, "%s <%1.1d> %s:%d ", timestr, level, file, line); @@ -452,7 +452,7 @@ /* flush glibc's buffer */ fflush(outfd); - if (verbose) { + if (verbose && outfd != stderr) { va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); @@ -1383,9 +1383,10 @@ } /* command line has precedence on config file */ - if (loglevel) + if (loglevel) { loglevel_ce.u.value = loglevel; loglevel_ce.flag |= CONFIG_FLAG_VAL_PROTECTED; + } if (ulogd_pidfile) { if (create_pidfile() < 0) 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/ulogd-2.0.3/ulogd.conf.in new/ulogd-2.0.4/ulogd.conf.in --- old/ulogd-2.0.3/ulogd.conf.in 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/ulogd.conf.in 2014-03-23 16:30:50.000000000 +0100 @@ -49,6 +49,7 @@ plugin="@pkglibdir@/ulogd_raw2packet_BASE.so" plugin="@pkglibdir@/ulogd_inpflow_NFACCT.so" plugin="@pkglibdir@/ulogd_output_GRAPHITE.so" +#plugin="@pkglibdir@/ulogd_output_JSON.so" # this is a stack for logging packet send by system via LOGEMU #stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -92,6 +93,9 @@ # this is a stack for logging packet to PGsql after a collect via NFLOG #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,pgsql1:PGSQL +# this is a stack for logging packet to JSON formatted file after a collect via NFLOG +#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,json1:JSON + # this is a stack for logging packets to syslog after a collect via NFLOG #stack=log3:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG @@ -195,6 +199,17 @@ directory="/var/log/" sync=1 +[json1] +sync=1 +#file="/var/log/ulogd.json" +#timestamp=0 +# device name to be used in JSON message +#device="My awesome Netfilter firewall" +# If boolean_label is set to 1 then the numeric_label put on packet +# by the input plugin is coding the action on packet: if 0, then +# packet has been blocked and if non null it has been accepted. +#boolean_label=1 + [pcap1] #default file is /var/log/ulogd.pcap #file="/var/log/ulogd.pcap" 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/ulogd-2.0.3/util/db.c new/ulogd-2.0.4/util/db.c --- old/ulogd-2.0.3/util/db.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/util/db.c 2014-03-23 16:30:50.000000000 +0100 @@ -590,7 +590,8 @@ "permanently disabling plugin\n"); di->interp = &disabled_interp_db; return NULL; - } + } else /* try to re run query */ + continue; } *wr_place = RING_NO_QUERY; di->ring.rd_item++; @@ -619,6 +620,23 @@ ulogd_log(ULOGD_ERROR, "No SIGHUP handling if ring buffer is used\n"); break; + case SIGTERM: + case SIGINT: + if (di->ring.size) { + int s = pthread_cancel(di->db_thread_id); + if (s != 0) { + ulogd_log(ULOGD_ERROR, + "Can't cancel injection thread\n"); + break; + } + s = pthread_join(di->db_thread_id, NULL); + if (s != 0) { + ulogd_log(ULOGD_ERROR, + "Error waiting for injection thread" + "cancelation\n"); + } + } + break; default: break; } 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/ulogd-2.0.3/util/printflow.c new/ulogd-2.0.4/util/printflow.c --- old/ulogd-2.0.3/util/printflow.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/util/printflow.c 2014-03-23 16:30:50.000000000 +0100 @@ -135,9 +135,10 @@ }; int printflow_keys_num = sizeof(printflow_keys)/sizeof(*printflow_keys); -#define pp_print(buf_cur, label, res, x, type) \ +#define pp_pri(type) PRI##type +#define pp_print_u(buf_cur, label, res, x, type) \ if (pp_is_valid(res, x)) \ - buf_cur += sprintf(buf_cur, label"=%u ", ikey_get_##type(&res[x])); + buf_cur += sprintf(buf_cur, label"=%" pp_pri(type) " ", ikey_get_##type(&res[x])); int printflow_print(struct ulogd_key *res, char *buf) { @@ -175,20 +176,20 @@ switch (ikey_get_u8(&res[PRINTFLOW_ORIG_IP_PROTOCOL])) { case IPPROTO_TCP: buf_cur += sprintf(buf_cur, "PROTO=TCP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); break; case IPPROTO_UDP: buf_cur += sprintf(buf_cur, "PROTO=UDP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); break; case IPPROTO_ICMP: buf_cur += sprintf(buf_cur, "PROTO=ICMP "); - pp_print(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); - pp_print(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); + pp_print_u(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); + pp_print_u(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); break; case IPPROTO_ESP: @@ -200,13 +201,13 @@ break; default: - pp_print(buf_cur, "PROTO", res, PRINTFLOW_ORIG_IP_PROTOCOL, u8); + pp_print_u(buf_cur, "PROTO", res, PRINTFLOW_ORIG_IP_PROTOCOL, u8); break; } orig_out: - pp_print(buf_cur, "PKTS", res, PRINTFLOW_ORIG_RAW_PKTCOUNT, u64); - pp_print(buf_cur, "BYTES", res, PRINTFLOW_ORIG_RAW_PKTLEN, u64); + pp_print_u(buf_cur, "PKTS", res, PRINTFLOW_ORIG_RAW_PKTCOUNT, u64); + pp_print_u(buf_cur, "BYTES", res, PRINTFLOW_ORIG_RAW_PKTLEN, u64); buf_cur += sprintf(buf_cur, ", REPLY: "); @@ -226,20 +227,20 @@ switch (ikey_get_u8(&res[PRINTFLOW_REPLY_IP_PROTOCOL])) { case IPPROTO_TCP: buf_cur += sprintf(buf_cur, "PROTO=TCP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); break; case IPPROTO_UDP: buf_cur += sprintf(buf_cur, "PROTO=UDP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); break; case IPPROTO_ICMP: buf_cur += sprintf(buf_cur, "PROTO=ICMP "); - pp_print(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); - pp_print(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); + pp_print_u(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); + pp_print_u(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); break; case IPPROTO_ESP: @@ -251,13 +252,13 @@ break; default: - pp_print(buf_cur, "PROTO", res, PRINTFLOW_REPLY_IP_PROTOCOL, u8); + pp_print_u(buf_cur, "PROTO", res, PRINTFLOW_REPLY_IP_PROTOCOL, u8); break; } reply_out: - pp_print(buf_cur, "PKTS", res, PRINTFLOW_REPLY_RAW_PKTCOUNT, u64); - pp_print(buf_cur, "BYTES", res, PRINTFLOW_REPLY_RAW_PKTLEN, u64); + pp_print_u(buf_cur, "PKTS", res, PRINTFLOW_REPLY_RAW_PKTCOUNT, u64); + pp_print_u(buf_cur, "BYTES", res, PRINTFLOW_REPLY_RAW_PKTLEN, u64); strcat(buf_cur, "\n"); return 0; 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/ulogd-2.0.3/util/printpkt.c new/ulogd-2.0.4/util/printpkt.c --- old/ulogd-2.0.3/util/printpkt.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/util/printpkt.c 2014-03-23 16:30:50.000000000 +0100 @@ -39,7 +39,6 @@ struct ulogd_key printpkt_keys[] = { [KEY_OOB_FAMILY] = { .name = "oob.family", }, [KEY_OOB_PROTOCOL] = { .name = "oob.protocol", }, - [KEY_OOB_TIME_SEC] = { .name = "oob.time.sec", }, [KEY_OOB_PREFIX] = { .name = "oob.prefix", }, [KEY_OOB_IN] = { .name = "oob.in", }, [KEY_OOB_OUT] = { .name = "oob.out", }, ++++++ ulogd-conf.diff ++++++ --- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.000000000 +0200 @@ -1,11 +1,11 @@ --- - ulogd.conf.in | 27 ++++++++++----------------- - 1 file changed, 10 insertions(+), 17 deletions(-) + ulogd.conf.in | 29 +++++++++++------------------ + 1 file changed, 11 insertions(+), 18 deletions(-) -Index: ulogd-2.0.3/ulogd.conf.in +Index: ulogd-2.0.4/ulogd.conf.in =================================================================== ---- ulogd-2.0.3.orig/ulogd.conf.in -+++ ulogd-2.0.3/ulogd.conf.in +--- ulogd-2.0.4.orig/ulogd.conf.in ++++ ulogd-2.0.4/ulogd.conf.in @@ -6,9 +6,10 @@ # GLOBAL OPTIONS ###################################################################### @@ -18,7 +18,7 @@ # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) (default 5) # loglevel=1 -@@ -56,9 +57,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT +@@ -57,9 +58,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT # this is a stack for packet-based logging via LOGEMU #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -28,7 +28,7 @@ # this is a stack for packet-based logging via LOGEMU with filtering on MARK #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -@@ -170,34 +168,29 @@ numeric_label=1 # you can label the log +@@ -174,34 +172,29 @@ numeric_label=1 # you can label the log #netlink_socket_buffer_maxsize=1085440 #bind=1 @@ -61,6 +61,15 @@ +directory="/var/log/ulogd/" sync=1 + [json1] + sync=1 +-#file="/var/log/ulogd.json" ++#file="/var/log/ulogd/ulogd.json" + #timestamp=0 + # device name to be used in JSON message + #device="My awesome Netfilter firewall" +@@ -212,7 +205,7 @@ sync=1 + [pcap1] #default file is /var/log/ulogd.pcap -#file="/var/log/ulogd.pcap" @@ -68,7 +77,7 @@ sync=1 [mysql1] -@@ -282,12 +275,12 @@ procedure="INSERT_PACKET_FULL" +@@ -297,12 +290,12 @@ procedure="INSERT_PACKET_FULL" [sqlite3_ct] table="ulog_ct" @@ -83,7 +92,7 @@ buffer=200 [sys2] -@@ -295,7 +288,7 @@ facility=LOG_LOCAL2 +@@ -310,7 +303,7 @@ facility=LOG_LOCAL2 [nacct1] sync = 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smuxi for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package smuxi for openSUSE:Factory checked in at 2014-04-26 10:11:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smuxi (Old) and /work/SRC/openSUSE:Factory/.smuxi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smuxi" Changes: -------- --- /work/SRC/openSUSE:Factory/smuxi/smuxi.changes 2013-12-24 16:04:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.smuxi.new/smuxi.changes 2014-04-26 10:11:53.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 23 18:29:49 UTC 2014 - develop7(a)develop7.info + +- Updated to version 0.11: + + User Interface Enhancements: + - The chat list can be shrunken. + - The highlight counter is now a separate column. + + Multi Identity Support. + + Message Patterns. + + Hooks Enhancements. + + Twitter Enhancements. + + JabbR (Beta) Enhancements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- smuxi-0.10.tar.gz New: ---- smuxi-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smuxi.spec ++++++ --- /var/tmp/diff_new_pack.nU6Nuk/_old 2014-04-26 10:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nU6Nuk/_new 2014-04-26 10:11:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package smuxi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: smuxi -Version: 0.10 +Version: 0.11 Release: 0 # FIXME: when db4o is in Factory, uncomment BuildRequires for it Url: http://www.smuxi.org @@ -27,7 +27,7 @@ Group: Productivity/Networking/IRC #BuildRequires: indicate-sharp BuildRequires: intltool -BuildRequires: mono-devel >= 1.9 +BuildRequires: mono-devel >= 2.6 BuildRequires: update-desktop-files BuildRequires: mono(System.Web.Extensions) #BuildRequires: pkgconfig(db4o) >= 8.0 ++++++ smuxi-0.10.tar.gz -> smuxi-0.11.tar.gz ++++++ ++++ 8229 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 scim-bridge for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at 2014-04-26 10:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old) and /work/SRC/openSUSE:Factory/.scim-bridge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-bridge" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes 2012-09-14 12:37:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes 2014-04-26 10:11:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 15:38:46 UTC 2014 - dmueller(a)suse.com + +- remove dependency on qt3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.XYs4z6/_old 2014-04-26 10:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.XYs4z6/_new 2014-04-26 10:11:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-bridge # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,6 @@ BuildRequires: gtk2-devel BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: qt3-devel BuildRequires: scim-devel Summary: Scim Bridge License: LGPL-2.1+ @@ -113,22 +112,14 @@ libtoolize --force -c --automake export CFLAGS="$RPM_OPT_FLAGS" -%configure --disable-static --with-pic --enable-gtk2-immodule --enable-qt3-immodule --enable-qt4-immodule --enable-documents +%configure --disable-static --with-pic --enable-gtk2-immodule --disable-qt3-immodule \ + --enable-qt4-immodule --enable-documents %{__make} %{?jobs:-j%jobs} %install make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT/%{gtk_prefix}/%{_lib}/gtk-2.0/immodules/im-scim-bridge.*a -pushd $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/ - if [ %_lib = lib64 ]; then - mv im-scim-bridge.so im-scim-bridge.lib64.so - mv im-scim-bridge.la im-scim-bridge.lib64.la - else - : - fi -popd -rm -f $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.*a mkdir -p $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods mv $RPM_BUILD_ROOT/usr/plugins/inputmethods/im-scim-bridge* $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods pushd $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods @@ -182,13 +173,8 @@ %defattr(-, root, root) %{gtk_prefix}/%{_lib}/gtk-2.0/immodules - %files -n scim-bridge-qt %defattr(-, root, root) -%dir /usr/lib/qt3/ -%dir /usr/lib/qt3/plugins/ -%dir /usr/lib/qt3/plugins/inputmethods/ -/usr/lib/qt3/plugins/inputmethods/im-scim-bridge*.so %dir %qt4_plugindir/ %dir %qt4_plugindir/inputmethods/ %qt4_plugindir/inputmethods/im-scim-bridge*.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 rekonq for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package rekonq for openSUSE:Factory checked in at 2014-04-26 10:11:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rekonq (Old) and /work/SRC/openSUSE:Factory/.rekonq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rekonq" Changes: -------- --- /work/SRC/openSUSE:Factory/rekonq/rekonq.changes 2014-01-13 10:55:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rekonq.new/rekonq.changes 2014-04-26 10:11:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 7 18:29:32 UTC 2014 - tittiatcoke(a)gmail.com + +- Remove nepomuk-core from the buildrequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekonq.spec ++++++ --- /var/tmp/diff_new_pack.BxHFhd/_old 2014-04-26 10:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BxHFhd/_new 2014-04-26 10:11:29.000000000 +0200 @@ -29,8 +29,7 @@ BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= 4.8.3 BuildRequires: libqca2-devel -BuildRequires: libqt4-devel >= 4.8.0 -BuildRequires: nepomuk-core-devel +BuildRequires: libqt4-devel >= 4.8.0l # for opera sync service BuildRequires: qoauth-devel %if 0%{?suse_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0