September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit python-Sphinx for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-Sphinx for openSUSE:Factory checked in at 2014-09-10 17:02:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Sphinx (Old) and /work/SRC/openSUSE:Factory/.python-Sphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Sphinx" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Sphinx/python-Sphinx.changes 2014-03-11 20:33:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-Sphinx.new/python-Sphinx.changes 2014-09-10 17:02:34.000000000 +0200 @@ -1,0 +2,44 @@ +Tue Sep 9 16:14:01 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 1.2.3: + + Features added + * #1518: `sphinx-apidoc` command now have a `--version` option to show version + information and exit + * New locales: Hebrew, European Portuguese, Vietnamese. + + Bugs fixed + * #636: Keep straight single quotes in literal blocks in the LaTeX build. + * #1419: Generated i18n sphinx.js files are missing message catalog entries + from '.js_t' and '.html'. The issue was introduced from Sphinx-1.1 + * #1363: Fix i18n: missing python domain's cross-references with currentmodule + directive or currentclass directive. + * #1444: autosummary does not create the description from attributes docstring. + * #1457: In python3 environment, make linkcheck cause "Can't convert 'bytes' + object to str implicitly" error when link target url has a hash part. + Thanks to Jorge_C. + * #1467: Exception on Python3 if nonexistent method is specified by automethod + * #1441: autosummary can't handle nested classes correctly. + * #1499: With non-callable `setup` in a conf.py, now sphinx-build emits + user-friendly error message. + * #1502: In autodoc, fix display of parameter defaults containing backslashes. + * #1226: autodoc, autosummary: importing setup.py by automodule will invoke + setup process and execute `sys.exit()`. Now sphinx avoids SystemExit + exception and emits warnings without unexpected termination. + * #1503: py:function directive generate incorrectly signature when specifying + a default parameter with an empty list `[]`. Thanks to Geert Jansen. + * #1508: Non-ASCII filename raise exception on make singlehtml, latex, man, + texinfo and changes. + * #1531: On Python3 environment, docutils.conf with 'source_link=true' in the + general section cause type error. + * PR#270, #1533: Non-ASCII docstring cause UnicodeDecodeError when uses with + inheritance-diagram directive. Thanks to WAKAYAMA shirou. + * PR#281, PR#282, #1509: TODO extension not compatible with websupport. Thanks + to Takeshi Komiya. + * #1477: gettext does not extract nodes.line in a table or list. + * #1544: `make text` generate wrong table when it has empty table cells. + * #1522: Footnotes from table get displayed twice in LaTeX. This problem has + been appeared from Sphinx-1.2.1 by #949. + * #508: Sphinx every time exit with zero when is invoked from setup.py command. + ex. `python setup.py build_sphinx -b doctest` return zero even if doctest + failed. + +------------------------------------------------------------------- Old: ---- Sphinx-1.2.2.tar.gz New: ---- Sphinx-1.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.iK8aeQ/_old 2014-09-10 17:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.iK8aeQ/_new 2014-09-10 17:02:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-Sphinx -Version: 1.2.2 +Version: 1.2.3 Release: 0 Url: http://sphinx.pocoo.org Summary: Python documentation generator @@ -82,6 +82,8 @@ # Add Interpreter version suffix to entrypoints (and thus /usr/bin binaries) to # allow for update-alternatives later on: sed -i 's/$sphinx-.*$ =/\1-%{py_ver} =/' setup.py +# Fix wrong end-of-line encoding +sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js %build python setup.py build ++++++ Sphinx-1.2.2.tar.gz -> Sphinx-1.2.3.tar.gz ++++++ ++++ 63230 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 python-numpy for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2014-09-10 17:02:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-numpy (Old) and /work/SRC/openSUSE:Factory/.python-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-numpy" Changes: -------- --- /work/SRC/openSUSE:Factory/python-numpy/python-numpy-doc.changes 2014-08-13 17:19:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy-doc.changes 2014-09-10 17:02:30.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 8 10:01:09 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 1.9.0 + Highlights + * Numerous performance improvements in various areas, most + notably indexing and operations on small arrays are + significantly faster. Indexing operations now also release the + GIL. + * Addition of nanmedian and nanpercentile rounds out the + nanfunction set. +- Remove upstreamed numpy-double-double-le.patch +- Add numpy-1.9.0-remove-__declspec.patch + Fixes spurious warnings during build. These warnings are related + to a windows-specific function that is not built, so the patch + just removed the function. + See: + http://lists.opensuse.org/opensuse-packaging/2014-09/msg00004.html +- Added patch tag for numpy-buildfix.patch + +------------------------------------------------------------------- python-numpy.changes: same change Old: ---- numpy-1.8.2.tar.gz numpy-double-double-le.patch New: ---- numpy-1.9.0-remove-__declspec.patch numpy-1.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-numpy-doc.spec ++++++ --- /var/tmp/diff_new_pack.1awl8n/_old 2014-09-10 17:02:33.000000000 +0200 +++ /var/tmp/diff_new_pack.1awl8n/_new 2014-09-10 17:02:33.000000000 +0200 @@ -19,7 +19,7 @@ %define modname numpy Name: python-numpy-doc %define docname numpydoc -Version: 1.8.2 +Version: 1.9.0 Release: 0 %define docvers 0.4 Url: http://www.numpy.org/ @@ -27,8 +27,10 @@ License: BSD-3-Clause Group: Development/Libraries/Python Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}.tar.gz +# PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes Patch0: numpy-buildfix.patch -Patch1: numpy-double-double-le.patch +# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure +Patch1: numpy-1.9.0-remove-__declspec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel ++++++ python-numpy.spec ++++++ --- /var/tmp/diff_new_pack.1awl8n/_old 2014-09-10 17:02:33.000000000 +0200 +++ /var/tmp/diff_new_pack.1awl8n/_new 2014-09-10 17:02:33.000000000 +0200 @@ -19,15 +19,17 @@ %define with_atlas 0 Name: python-numpy -Version: 1.8.2 +Version: 1.9.0 Release: 0 Url: http://www.numpy.org/ Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause Group: Development/Libraries/Python Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}.tar.gz +# PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes Patch0: numpy-buildfix.patch -Patch1: numpy-double-double-le.patch +# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure +Patch1: numpy-1.9.0-remove-__declspec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel @@ -88,16 +90,16 @@ %prep %setup -q -n numpy-%{version} %patch0 -p1 -%patch1 +%patch1 -p1 # Fix non-executable scripts -sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py %build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build %install python setup.py install --root="%{buildroot}" --prefix="%{_prefix}" -rm -rf %{buildroot}%{python_sitearch}/numpy/{,core,distutils,f2py,fft,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite +rm -rf %{buildroot}%{python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite %if 0%{?suse_version} %fdupes -s %{buildroot}%{_prefix} %endif ++++++ numpy-1.9.0-remove-__declspec.patch ++++++ From: toddrme2178(a)gmail.com Date: 2014-09-09 04:45:00 +0000 Subject: Remove windows-specific function Upstream: openSUSE Fix References: http://lists.opensuse.org/opensuse-packaging/2014-09/msg00004.html http://lists.opensuse.org/opensuse-packaging/2014-09/msg00005.html __declspec(thread) is a windows-specific function that is causing spurious compiler warnings. These warnings can be safely ignored, but are being falsely flagged as serious problems that cause the build to fail. Since this is windows-specific, it can be safely removed. --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -134,7 +134,7 @@ ] # variable attributes tested via "int %s a" % attribute -OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread", "__declspec(thread)"] +OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread"] # Subset of OPTIONAL_STDFUNCS which may alreay have HAVE_* defined by Python.h OPTIONAL_STDFUNCS_MAYBE = ["expm1", "log1p", "acosh", "atanh", "asinh", "hypot", ++++++ numpy-1.8.2.tar.gz -> numpy-1.9.0.tar.gz ++++++ ++++ 145662 lines of diff (skipped) ++++++ numpy-buildfix.patch ++++++ --- /var/tmp/diff_new_pack.1awl8n/_old 2014-09-10 17:02:34.000000000 +0200 +++ /var/tmp/diff_new_pack.1awl8n/_new 2014-09-10 17:02:34.000000000 +0200 @@ -8,11 +8,11 @@ +void main() { - #ifndef __GNUC__ && (__GNUC__ >= 4) + #if (! defined __GNUC__) || (__GNUC__ < 4) --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py -@@ -66,7 +66,7 @@ +@@ -69,7 +69,7 @@ need_rewrite = False for l in f: l = l.rstrip() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2014-09-10 17:02:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2014-08-30 18:56:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2014-09-10 17:02:28.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Sep 5 13:12:04 CEST 2014 - ma(a)suse.de + +- Adapt to new zypp api (bnc#892579) +- version 1.11.13 + +------------------------------------------------------------------- +Thu Sep 4 01:14:52 CEST 2014 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.11.12.tar.bz2 New: ---- zypper-1.11.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.hvGsfC/_old 2014-09-10 17:02:29.000000000 +0200 +++ /var/tmp/diff_new_pack.hvGsfC/_new 2014-09-10 17:02:29.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: cmake >= 2.4.6 BuildRequires: gcc-c++ >= 4.7 BuildRequires: gettext-devel >= 0.15 -BuildRequires: libzypp-devel >= 14.27.2 +BuildRequires: libzypp-devel >= 14.28.0 BuildRequires: readline-devel >= 5.1 Requires: procps %if 0%{?suse_version} @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.11.12 +Version: 1.11.13 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.11.12.tar.bz2 -> zypper-1.11.13.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.11.12.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.11.13.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 libzypp for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2014-09-10 17:02:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-08-30 18:56:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-09-10 17:02:23.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Sep 5 12:46:57 CEST 2014 - ma(a)suse.de + +- Make Repository::isUpdateRepo also check for being referenced + by products (bnc#892579) +- Report repositories skipped as nonroot due to insufficient + permission (bnc#893260) +- version 14.28.0 (28) + +------------------------------------------------------------------- +Thu Sep 4 01:14:34 CEST 2014 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-14.27.2.tar.bz2 New: ---- libzypp-14.28.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.Qk20Db/_old 2014-09-10 17:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Qk20Db/_new 2014-09-10 17:02:24.000000000 +0200 @@ -23,7 +23,7 @@ Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.27.2 +Version: 14.28.0 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-14.27.2.tar.bz2 -> libzypp-14.28.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/VERSION.cmake new/libzypp-14.28.0/VERSION.cmake --- old/libzypp-14.27.2/VERSION.cmake 2014-08-29 14:49:37.000000000 +0200 +++ new/libzypp-14.28.0/VERSION.cmake 2014-09-05 12:49:26.000000000 +0200 @@ -59,10 +59,10 @@ # See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "14") -SET(LIBZYPP_COMPATMINOR "27") -SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_COMPATMINOR "28") +SET(LIBZYPP_MINOR "28") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 14.27.2 (27) +# LAST RELEASED: 14.28.0 (28) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/package/libzypp.changes new/libzypp-14.28.0/package/libzypp.changes --- old/libzypp-14.27.2/package/libzypp.changes 2014-08-29 14:49:37.000000000 +0200 +++ new/libzypp-14.28.0/package/libzypp.changes 2014-09-05 12:49:26.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Sep 5 12:46:57 CEST 2014 - ma(a)suse.de + +- Make Repository::isUpdateRepo also check for being referenced + by products (bnc#892579) +- Report repositories skipped as nonroot due to insufficient + permission (bnc#893260) +- version 14.28.0 (28) + +------------------------------------------------------------------- +Thu Sep 4 01:14:34 CEST 2014 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Fri Aug 29 14:46:25 CEST 2014 - ma(a)suse.de - PackageProvider: consider toplevel cache if --root or --pkg-cachedir Files old/libzypp-14.27.2/po/zypp-po.tar.bz2 and new/libzypp-14.28.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/tests/zypp/CpeId_test.cc new/libzypp-14.28.0/tests/zypp/CpeId_test.cc --- old/libzypp-14.27.2/tests/zypp/CpeId_test.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/tests/zypp/CpeId_test.cc 2014-09-05 12:49:26.000000000 +0200 @@ -361,7 +361,7 @@ CpeId( "", CpeId::noThrow ); BOOST_CHECK_EQUAL( CpeId::NoThrowType::lastMalformed, "" ); - for ( const auto & c : { CpeId(), CpeId( nullptr ), CpeId( "" ), CpeId( std::string() ) } ) + for ( const auto & c : { CpeId(), CpeId( nullptr ), CpeId( "" ), CpeId( std::string() ), CpeId( "cpe:2.3:" ), CpeId( "cpe:/" ) } ) { BOOST_CHECK( ! c ); // evaluate false in boolean context BOOST_CHECK_EQUAL( c.asString(), c.asFs() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/CpeId.cc new/libzypp-14.28.0/zypp/CpeId.cc --- old/libzypp-14.27.2/zypp/CpeId.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/zypp/CpeId.cc 2014-09-05 12:49:26.000000000 +0200 @@ -353,7 +353,7 @@ field.reserve( Attribute::numAttributes ); if ( str::splitFields( cpe_r.c_str()+8/* skip magic 'cpe:2.3:' */, std::back_inserter(field), ":" ) > Attribute::numAttributes ) throw std::invalid_argument( str::Str() << "CpeId:Fs: too many fields (" << field.size() << "); expected 11" /*<< Attribute::numAttributes but g++ currently can't resoolve this as constexpr*/ ); - if ( field.back().empty() ) // A trailing ':' leads to an empty (illegal) field, but we fillup missing fields with ANY|"*" + if ( !field.empty() && field.back().empty() ) // A trailing ':' leads to an empty (illegal) field, but we fillup missing fields with ANY|"*" field.back() = "*"; field.resize( Attribute::numAttributes, "*" ); // fillup with ANY|"*" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/Product.cc new/libzypp-14.28.0/zypp/Product.cc --- old/libzypp-14.27.2/zypp/Product.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/zypp/Product.cc 2014-09-05 12:49:26.000000000 +0200 @@ -205,14 +205,28 @@ Date Product::endOfLife() const { return Date( lookupNumAttribute( sat::SolvAttr::productEndOfLife ) );} - unsigned Product::updateContentIdentifierSize( std::list<Repository::ContentIdentifier> & ret_r ) const + std::vector<Repository::ContentIdentifier> Product::updateContentIdentifier() const + { + std::vector<Repository::ContentIdentifier> ret; + sat::LookupAttr q( sat::SolvAttr::productUpdatesRepoid, sat::SolvAttr::productUpdates, *this ); + if ( ! q.empty() ) + { + ret.reserve( 2 ); + for_( it, q.begin(), q.end() ) + ret.push_back( it.asString() ); + } + return ret; + } + + bool Product::hasUpdateContentIdentifier( const Repository::ContentIdentifier & cident_r ) const { sat::LookupAttr q( sat::SolvAttr::productUpdatesRepoid, sat::SolvAttr::productUpdates, *this ); for_( it, q.begin(), q.end() ) { - ret_r.push_back( it.asString() ); + if ( it.asString() == cident_r ) + return true; } - return q.size(); + return false; } bool Product::isTargetDistribution() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/Product.h new/libzypp-14.28.0/zypp/Product.h --- old/libzypp-14.27.2/zypp/Product.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/zypp/Product.h 2014-09-05 12:49:26.000000000 +0200 @@ -100,10 +100,21 @@ /** The date when this Product goes out of support as indicated by it's medadata. */ Date endOfLife() const; - /** ContentIdentifier of required update repositories. - * \todo remove and provide iterator. - */ - unsigned updateContentIdentifierSize( std::list<Repository::ContentIdentifier> & ret_r ) const; + /** ContentIdentifier of required update repositories. */ + std::vector<Repository::ContentIdentifier> updateContentIdentifier() const; + + /** Whether \a cident_r is listed as required update repository. */ + bool hasUpdateContentIdentifier( const Repository::ContentIdentifier & cident_r ) const; + + /** Whether one of the ContentIdentifier is listed as required update repository. */ + template <class _Iterator> + bool hasUpdateContentIdentifier( _Iterator begin, _Iterator end ) const + { + for_( it, begin, end ) + if ( hasUpdateContentIdentifier( *it ) ) + return true; + return false; + } public: /** This is the \b installed product that is also targeted by the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/RepoManager.cc new/libzypp-14.28.0/zypp/RepoManager.cc --- old/libzypp-14.27.2/zypp/RepoManager.cc 2014-08-29 14:49:37.000000000 +0200 +++ new/libzypp-14.28.0/zypp/RepoManager.cc 2014-09-05 12:49:26.000000000 +0200 @@ -203,7 +203,7 @@ MIL << "repo file: " << file << endl; RepoCollector collector; parser::RepoFileReader parser( file, bind( &RepoCollector::collect, &collector, _1 ) ); - return collector.repos; + return std::move(collector.repos); } //////////////////////////////////////////////////////////////////////////// @@ -220,23 +220,35 @@ { MIL << "directory " << dir << endl; std::list<RepoInfo> repos; - std::list<Pathname> entries; - if ( filesystem::readdir( entries, dir, false ) != 0 ) + bool nonroot( geteuid() != 0 ); + if ( nonroot && ! PathInfo(dir).userMayRX() ) { - // TranslatorExplanation '%s' is a pathname - ZYPP_THROW(Exception(str::form(_("Failed to read directory '%s'"), dir.c_str()))); + JobReport::warning( formatNAC(_("Cannot read repo directory ‘%1%’: Permission denied")) % dir ); } - - str::regex allowedRepoExt("^\\.repo(_[0-9]+)?$"); - for ( std::list<Pathname>::const_iterator it = entries.begin(); it != entries.end(); ++it ) + else { - if (str::regex_match(it->extension(), allowedRepoExt)) + std::list<Pathname> entries; + if ( filesystem::readdir( entries, dir, false ) != 0 ) { - std::list<RepoInfo> tmp = repositories_in_file( *it ); - repos.insert( repos.end(), tmp.begin(), tmp.end() ); + // TranslatorExplanation '%s' is a pathname + ZYPP_THROW(Exception(str::form(_("Failed to read directory '%s'"), dir.c_str()))); + } - //std::copy( collector.repos.begin(), collector.repos.end(), std::back_inserter(repos)); - //MIL << "ok" << endl; + str::regex allowedRepoExt("^\\.repo(_[0-9]+)?$"); + for ( std::list<Pathname>::const_iterator it = entries.begin(); it != entries.end(); ++it ) + { + if ( str::regex_match(it->extension(), allowedRepoExt) ) + { + if ( nonroot && ! PathInfo(*it).userMayR() ) + { + JobReport::warning( formatNAC(_("Cannot read repo file ‘%1%’: Permission denied")) % *it ); + } + else + { + const std::list<RepoInfo> & tmp( repositories_in_file( *it ) ); + repos.insert( repos.end(), tmp.begin(), tmp.end() ); + } + } } } return repos; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/Repository.cc new/libzypp-14.28.0/zypp/Repository.cc --- old/libzypp-14.27.2/zypp/Repository.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/zypp/Repository.cc 2014-09-05 12:49:26.000000000 +0200 @@ -22,6 +22,8 @@ #include "zypp/sat/detail/PoolImpl.h" #include "zypp/Repository.h" +#include "zypp/ResPool.h" +#include "zypp/Product.h" #include "zypp/sat/Pool.h" using std::endl; @@ -158,18 +160,60 @@ bool Repository::providesUpdatesFor( const CpeId & cpeid_r ) const { NO_REPOSITORY_RETURN( false ); + if ( ! cpeid_r ) + return false; // filter queries/products without CpeId, as an empty CpeId matches ANYthing. + + // check in repository metadata for_( it, updatesProductBegin(), updatesProductEnd() ) { if ( compare( cpeid_r, it.cpeId(), SetRelation::subset ) ) return true; } + + // check whether known products refer to this as update repo + sat::LookupRepoAttr myIds( sat::SolvAttr::repositoryRepoid, *this ); // usually just one, but... + if ( ! myIds.empty() ) + { + const ResPool & pool( ResPool::instance() ); + for_( it, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) + { + Product::constPtr prod( (*it)->asKind<Product>() ); + if ( compare( cpeid_r, prod->cpeId(), SetRelation::superset ) ) + { + for_( myId, myIds.begin(), myIds.end() ) + { + if ( prod->hasUpdateContentIdentifier( myId.asString() ) ) + return true; + } + } + } + } return false; } bool Repository::isUpdateRepo() const { NO_REPOSITORY_RETURN( false ); - return ( updatesProductBegin() != updatesProductEnd() ); + + // check in repository metadata + if ( updatesProductBegin() != updatesProductEnd() ) + return true; + + // check whether known products refer to this as update repo + sat::LookupRepoAttr myIds( sat::SolvAttr::repositoryRepoid, *this ); // usually just one, but... + if ( ! myIds.empty() ) + { + const ResPool & pool( ResPool::instance() ); + for_( it, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) + { + for_( myId, myIds.begin(), myIds.end() ) + { + if ( (*it)->asKind<Product>()->hasUpdateContentIdentifier( myId.asString() ) ) + return true; + } + } + } + return false; } bool Repository::solvablesEmpty() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/Repository.h new/libzypp-14.28.0/zypp/Repository.h --- old/libzypp-14.27.2/zypp/Repository.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/zypp/Repository.h 2014-09-05 12:49:26.000000000 +0200 @@ -168,17 +168,20 @@ */ bool maybeOutdated() const; - /** - * if the repository claims to update something then - * it is an update repository - * - * This is implemented by looking at the repository updates - * tag. - * \see http://en.opensuse.org/Standards/Rpm_Metadata#SUSE_repository_info_.28susei… + /** Hint whether the Repo may provide updates for a product. + * + * Either the repository claims to update a product via a repository updates + * tag in it's metadata or a known product lists the repositories ContentIdentifier + * as required update repo. */ bool isUpdateRepo() const; - /** Whether the repository claims to provide updates for product identified by it's \ref CpeId */ + /** Hint whether the Repo may provide updates for a product identified by it's \ref CpeId + * + * Either the repository claims to update a product via a repository updates + * tag in it's metadata or a known product lists the repositories ContentIdentifier + * as required update repo. + */ bool providesUpdatesFor( const CpeId & cpeid_r ) const; /** Whether \ref Repository contains solvables. */ @@ -195,7 +198,7 @@ public: - /** Query class for Repository */ + /** Query class for Repository related products */ class ProductInfoIterator; /** @@ -215,15 +218,18 @@ ProductInfoIterator compatibleWithProductEnd() const; /** - * Get an iterator to the beginning of the repository - * compatible distros. + * Get an iterator to the beginning of distos the repository + * provides upadates for. + * \note This is only a hint within the repositories metadata. + * The same realation might be expressed by a product listing + * this repositories ContentIdentifier as required update repo. * \see Repository::ProductInfoIterator */ ProductInfoIterator updatesProductBegin() const; /** - * Get an iterator to the end of the repository - * compatible distros. + * Get an iterator to the end of distos the repository + * provides upadates for. * \see Repository::ProductInfoIterator */ ProductInfoIterator updatesProductEnd() const; @@ -327,6 +333,9 @@ /** * Query class for Repository related products * + * Products are identified by CpeIds within the repositories metadata. + * \see http://en.opensuse.org/Standards/Rpm_Metadata#SUSE_repository_info_.28susei… + * * The iterator does not provide a dereference * operator so you can do * on it, but you can * access the attributes of each related product @@ -335,7 +344,7 @@ * \code * for_( it, repo.compatibleWithProductBegin(), repo.compatibleWithProductEnd() ) * { - * cout << it.cpeid() << endl; + * cout << it.label() << ": " << it.cpeid() << endl; * } * \endcode * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.2/zypp/sat/Transaction.cc new/libzypp-14.28.0/zypp/sat/Transaction.cc --- old/libzypp-14.27.2/zypp/sat/Transaction.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.28.0/zypp/sat/Transaction.cc 2014-09-05 12:49:26.000000000 +0200 @@ -72,7 +72,7 @@ public: Impl() : _trans( ::transaction_create( nullptr ) ) - { memset( _trans, 0, sizeof(_trans) ); } + { memset( _trans, 0, sizeof(*_trans) ); } Impl( LoadFromPoolType ) : _watcher( myPool().serial() ) -- 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 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-09-10 17:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-07 11:08:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-09-10 17:02:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 09 12:06:28 CEST 2014 - aschnell(a)suse.de + +- disallow shrinking of btrfs filesystems (bnc#894832) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Storage.cc new/libstorage-2.25.14/storage/Storage.cc --- old/libstorage-2.25.14/storage/Storage.cc 2014-08-15 09:08:55.000000000 +0200 +++ new/libstorage-2.25.14/storage/Storage.cc 2014-09-09 17:23:28.000000000 +0200 @@ -5636,7 +5636,9 @@ static FsCapabilitiesX ext4Caps (true, true, true, false, true, true, true, 16, 32*1024); - static FsCapabilitiesX btrfsCaps (true, true, true, true, true, true, + // btrfs can be shrunk but it is not possible to know the minimal possible + // size in advance (see bnc #894832), thus not allowed here + static FsCapabilitiesX btrfsCaps (true, true, false, false, true, true, true, 256, 256*1024); static FsCapabilitiesX xfsCaps (true, true, false, false, true, true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc new/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc --- old/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc 2014-03-06 17:30:22.000000000 +0100 +++ new/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc 2014-09-08 17:43:23.000000000 +0200 @@ -127,7 +127,7 @@ std::ostream& operator<<(std::ostream& s, const Dasdview& dasdview) { - s << "device: " << dasdview.device << " geometry:" << dasdview.geometry + s << "device:" << dasdview.device << " geometry:" << dasdview.geometry << " dasd_format:" << toString(dasdview.dasd_format) << " dasd_type:" << toString(dasdview.dasd_type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Volume.cc new/libstorage-2.25.14/storage/Volume.cc --- old/libstorage-2.25.14/storage/Volume.cc 2014-07-29 13:55:45.000000000 +0200 +++ new/libstorage-2.25.14/storage/Volume.cc 2014-09-09 12:28:47.000000000 +0200 @@ -1755,9 +1755,9 @@ { cmd = BTRFSBIN " filesystem resize "; if( needShrink() ) - cmd += " -" + decString(orig_size_k-size_k) + "K"; + cmd += decString(size_k) + "K"; else - cmd += " max"; + cmd += "max"; cmd += " " + quote(tmp_mount.mount_point); c.execute( cmd ); if( c.retcode()!=0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/gen_md5sum.cc new/libstorage-2.25.14/storage/gen_md5sum.cc --- old/libstorage-2.25.14/storage/gen_md5sum.cc 2014-09-05 10:46:52.000000000 +0200 +++ new/libstorage-2.25.14/storage/gen_md5sum.cc 2014-09-09 17:23:36.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "df650078fdf78940c0c6128a225b2f0c" -#define SOURCES_MD5_DATE " Fri 5 Sep 10:46:52 CEST 2014 " +#define SOURCES_MD5SUM "9fbc6cde91f471eef5a92b261a690292" +#define SOURCES_MD5_DATE " Tue 9 Sep 17:23:36 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/testsuite/single.out/dasdview.out new/libstorage-2.25.14/testsuite/single.out/dasdview.out --- old/libstorage-2.25.14/testsuite/single.out/dasdview.out 2014-02-03 10:49:03.000000000 +0100 +++ new/libstorage-2.25.14/testsuite/single.out/dasdview.out 2014-09-08 17:43:23.000000000 +0200 @@ -1,6 +1,6 @@ parse1 -device: /dev/dasda geometry:[10017,15,12,4096] dasd_format:CDL dasd_type:ECKD +device:/dev/dasda geometry:[10017,15,12,4096] dasd_format:CDL dasd_type:ECKD parse2 -device: /dev/dasdb geometry:[3339,15,0,512] dasd_format:NONE dasd_type:ECKD +device:/dev/dasdb geometry:[3339,15,0,512] dasd_format:NONE dasd_type:ECKD parse3 -device: /dev/dasdc geometry:[777,16,128,512] dasd_format:LDL dasd_type:FBA +device:/dev/dasdc geometry:[777,16,128,512] dasd_format:LDL dasd_type:FBA -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dhcp for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at 2014-09-10 17:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcp (Old) and /work/SRC/openSUSE:Factory/.dhcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dhcp" Changes: -------- --- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2014-08-20 17:51:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dhcp.new/dhcp.changes 2014-09-10 17:02:17.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 3 01:48:48 CEST 2014 - ro(a)suse.de + +- sanitize release line in specfile + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.frtJTW/_old 2014-09-10 17:02:19.000000000 +0200 +++ /var/tmp/diff_new_pack.frtJTW/_new 2014-09-10 17:02:19.000000000 +0200 @@ -42,7 +42,7 @@ BuildRequires: dos2unix BuildRequires: libtool Version: 4.2.6 -Release: 0.<RELEASE0> +Release: 0 Summary: Common Files Used by ISC DHCP Software License: BSD-3-Clause Group: Productivity/Networking/Boot/Servers -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit corosync for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2014-09-10 17:01:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corosync (Old) and /work/SRC/openSUSE:Factory/.corosync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "corosync" Changes: -------- --- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2014-07-10 14:54:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2014-09-10 17:02:13.000000000 +0200 @@ -1,0 +2,74 @@ +Mon Sep 1 08:01:50 UTC 2014 - xli(a)suse.com + +- Update to corosync 2.3.4 +- Drop the obsoleted patches + - corosync-cts-api-error.patch + - bnc#867767-add-version.patch + - bnc#881142-fix-shm-leak.patch +- quorumtool: Sort output by nodeid +- YKD: Fix loading of YKD quorum module +- corosync-quorumtool: add sort options +- cleanup after test-driver +- be consistent in using CPPFLAGS vs CFLAGS +- totemsrp: Fix typo with cont gather +- cpg: Refactor mh_req_exec_cpg_procleave +- cpg: Make sure nodid is always logged as hex num +- cpg: Make sure left nodes are really removed +- mon: Make mon compilable with libstatgrab ver 0.9 +- mon: Fix comparsion typo +- mon: Pass correct pointer to inst +- mon: Make monitoring work +- config: Handle totem_set_volatile_defaults errors +- config: Allow dynamic change of token_coefficient +- Log: Make reload of logging work +- Really clear totemconfig nodes on reload +- Add token_coefficient option +- init: Make init script configurable +- totemiba: Fix incorrect failed log message +- logsys: Log error if blackbox cannot be created +- logsys: Log warning if flightrecorder init fails +- Introduce get_run_dir function +- Move ringid store and load from totem library +- coroparse: More strict numbers parsing +- Doc: Enhance INSTALL file a bit +- Make config.reload_in_progress key read only +- Fix compiler warning introduced by previous patch +- totemconfig: Free ifaddrs list +- totemconfig: Make sure join timeout is less than consensus +- totemconfig: Key change process dependencies +- totemconfig: Log errors on key change and reload +- totemconfig: totem_config_get_ip_version +- totemconfig: refactor nodelist_to_interface func +- corosync-keygen: Replace printf/exit call with err +- votequorum: Add cmap key to reset wait_for_all +- votequorum: Return current ring id in callback +- votequorum: Add ring id to poll call +- votequorum: Do not process events during reload +- votequorum: Block sync until qdevice poll +- votequorum: Make qdev timeout in sync configurable +- votequorum: Properly initialize atb and atb_string +- ipc: Process votequorum messages during sync +- testvotequorum2: Opt for polling with old ringid +- TODO: Remove TODO file +- Makefile: Do not install TODO file +- totem: Inform RRP about membership changes +- totemnet: Add totemnet_member_set_active +- totemrrp: Implement *_membership_changed +- totemudpu: Implement member_set_active +- totemudpu: Send msgs to all members occasionally +- Cancel token holding while in retransmition +- upstart: Make job conf file configurable +- systemd: Config example for corosync wd service +- Install doc: Correct a typo +- init: change return value when starting corosync +- Free object allocated at quorum_register_callback +- corosync-cmapctl: Allow -p option to delete keys +- Implement config file testing mode +- Slightly rework corosync-keygen. +- totemiba: Add multicast recovery +- Indent: Remove space in negation of expression +- Indent: Remove newline before else branch start +- fix memory leak produced by 'corosync -v' +- Handle SIGSEGV and SIGABRT signals + +------------------------------------------------------------------- Old: ---- bnc#867767-add-version.patch bnc#881142-fix-shm-leak.patch corosync-2.3.3.tar.gz corosync-cts-api-error.patch New: ---- corosync-2.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corosync.spec ++++++ --- /var/tmp/diff_new_pack.NaB6ZM/_old 2014-09-10 17:02:15.000000000 +0200 +++ /var/tmp/diff_new_pack.NaB6ZM/_new 2014-09-10 17:02:15.000000000 +0200 @@ -44,17 +44,14 @@ Summary: The Corosync Cluster Engine and Application Programming Interfaces License: BSD-3-Clause Group: Productivity/Clustering/HA -Version: 2.3.3 +Version: 2.3.4 Release: 0 Url: http://www.corosync.org Source0: %{name}-%{version}.tar.gz Source2: baselibs.conf Patch1: corosync-init-lockfile-path-error.patch -Patch2: corosync-cts-api-error.patch -Patch3: bnc#867767-add-version.patch -Patch4: bnc#872651-stop-cluster.patch -Patch5: bnc#881142-fix-shm-leak.patch -Patch6: bnc#882449-corosync-conf-example.patch +Patch2: bnc#872651-stop-cluster.patch +Patch3: bnc#882449-corosync-conf-example.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not # provide openais on purpose, the package has been deleted. @@ -102,9 +99,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build #%if 0%{?buildtrunk} == 1 ++++++ corosync-2.3.3.tar.gz -> corosync-2.3.4.tar.gz ++++++ ++++ 91541 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 xf86-video-qxl for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package xf86-video-qxl for openSUSE:Factory checked in at 2014-09-10 17:01:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-qxl (Old) and /work/SRC/openSUSE:Factory/.xf86-video-qxl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-qxl" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-qxl/xf86-video-qxl.changes 2014-09-01 16:58:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-qxl.new/xf86-video-qxl.changes 2014-09-10 17:02:12.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 29 12:06:38 UTC 2014 - coolo(a)suse.com + +- fix the use of build conditionals + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-qxl.spec ++++++ --- /var/tmp/diff_new_pack.eKDcr9/_old 2014-09-10 17:02:13.000000000 +0200 +++ /var/tmp/diff_new_pack.eKDcr9/_new 2014-09-10 17:02:13.000000000 +0200 @@ -20,7 +20,11 @@ %ifarch x86_64 %if %{suse_version} >= 1230 %bcond_without xspice +%else +%bcond_with xspice %endif +%else +%bcond_with xspice %endif Name: xf86-video-qxl @@ -57,7 +61,7 @@ %description qxl is an Xorg driver for QXL virtual GPU as found in the spice project. -%if 0%{?with_xspice} +%if %{with xspice} %package -n xorg-x11-server-Xspice Summary: XSpice is an X server that can be accessed by a Spice client Group: System/X11/Servers/XF86_4 @@ -85,7 +89,7 @@ %install %make_install -%if 0%{?with_xspice} +%if %{with xspice} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11 install -p -m 644 examples/spiceqxl.xorg.conf.example \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf @@ -102,7 +106,7 @@ %dir %{_libdir}/xorg/modules/drivers %{_libdir}/xorg/modules/drivers/qxl_drv.so -%if 0%{?with_xspice} +%if %{with xspice} %files -n xorg-x11-server-Xspice %defattr(-,root,root) %doc COPYING README.xspice README examples/spiceqxl.xorg.conf.example -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit efibootmgr for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package efibootmgr for openSUSE:Factory checked in at 2014-09-10 17:01:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efibootmgr (Old) and /work/SRC/openSUSE:Factory/.efibootmgr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "efibootmgr" Changes: -------- --- /work/SRC/openSUSE:Factory/efibootmgr/efibootmgr.changes 2014-07-15 16:25:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efibootmgr.new/efibootmgr.changes 2014-09-10 17:02:09.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 9 13:24:25 UTC 2014 - schwab(a)suse.de + +- Enable for aarch64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efibootmgr.spec ++++++ --- /var/tmp/diff_new_pack.O7E1Eg/_old 2014-09-10 17:02:12.000000000 +0200 +++ /var/tmp/diff_new_pack.O7E1Eg/_new 2014-09-10 17:02:12.000000000 +0200 @@ -34,7 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pciutils-devel BuildRequires: zlib-devel -ExclusiveArch: ia64 x86_64 +ExclusiveArch: ia64 x86_64 aarch64 %description The EFI Boot Manager allows the user to edit the Intel Extensible -- 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 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2014-09-10 17:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-27 07:45:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2014-09-10 17:02:06.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 9 11:08:56 UTC 2014 - lslezak(a)suse.cz + +- do not hide libzypp exceptions in Pkg::ResolvableProperties() + call, it makes debugging more difficult, return nil in that case + (bnc#895418) +- 3.1.18 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.17.tar.bz2 New: ---- yast2-pkg-bindings-3.1.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.nIlMAI/_old 2014-09-10 17:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.nIlMAI/_new 2014-09-10 17:02:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.nIlMAI/_old 2014-09-10 17:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.nIlMAI/_new 2014-09-10 17:02:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-3.1.17.tar.bz2 -> yast2-pkg-bindings-3.1.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings-devel-doc.spec 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings-devel-doc.spec 2014-09-09 14:46:22.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 3.1.17 +Version: 3.1.18 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.17/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.changes 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.changes 2014-09-09 14:46:22.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 9 11:08:56 UTC 2014 - lslezak(a)suse.cz + +- do not hide libzypp exceptions in Pkg::ResolvableProperties() + call, it makes debugging more difficult, return nil in that case + (bnc#895418) +- 3.1.18 + +------------------------------------------------------------------- Tue Aug 19 07:39:01 UTC 2014 - lslezak(a)suse.cz - explicitly include <ostream> to avoid possible compile failures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.spec 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.spec 2014-09-09 14:46:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/src/Resolvable_Properties.cc new/yast2-pkg-bindings-3.1.18/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-3.1.17/src/Resolvable_Properties.cc 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/src/Resolvable_Properties.cc 2014-09-09 14:46:22.000000000 +0200 @@ -537,43 +537,39 @@ for (std::set<std::string>::const_iterator kind_it = _kinds.begin(); kind_it != _kinds.end(); ++kind_it) { - try { - zypp::Dep depkind(*kind_it); - zypp::Capabilities deps = item.resolvable()->dep(depkind); - - // add raw dependencies - for_(it, deps.begin(), deps.end()) - { - YCPMap rawdep; - rawdep->add(YCPString(*kind_it), YCPString(it->asString())); - rawdeps->add(rawdep); - } - - zypp::sat::WhatProvides prv(deps); - - // resolve dependencies - for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) - { - if (d->kind().asString().empty() || d->name().empty()) - { - y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str()); - } - else - { - YCPMap ycpdep; - ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); - ycpdep->add (YCPString ("name"), YCPString (d->name())); - ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); - - if (!ycpdeps.contains(ycpdep)) - { - ycpdeps->add (ycpdep); - } - } - } - } - catch (...) - {} + zypp::Dep depkind(*kind_it); + zypp::Capabilities deps = item.resolvable()->dep(depkind); + + // add raw dependencies + for_(it, deps.begin(), deps.end()) + { + YCPMap rawdep; + rawdep->add(YCPString(*kind_it), YCPString(it->asString())); + rawdeps->add(rawdep); + } + + zypp::sat::WhatProvides prv(deps); + + // resolve dependencies + for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) + { + if (d->kind().asString().empty() || d->name().empty()) + { + y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str()); + } + else + { + YCPMap ycpdep; + ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); + ycpdep->add (YCPString ("name"), YCPString (d->name())); + ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); + + if (!ycpdeps.contains(ycpdep)) + { + ycpdeps->add (ycpdep); + } + } + } } if (ycpdeps.size() > 0) @@ -659,36 +655,49 @@ if (nm.empty() || nm == s->name()) { - if (!s->installedEmpty()) - { - // iterate over all installed packages - for_(inst_it, s->installedBegin(), s->installedEnd()) - { - // check version if required - if (vers.empty() || vers == inst_it->resolvable()->edition().asString()) - { - ret->add(Resolvable2YCPMap(*inst_it, req_kind, dependencies)); - } - } - } - - if (!s->availableEmpty()) - { - // iterate over all available packages - for_(avail_it, s->availableBegin(), s->availableEnd()) - { - // check version if required - if (vers.empty() || vers == avail_it->resolvable()->edition().asString()) - { - ret->add(Resolvable2YCPMap(*avail_it, req_kind, dependencies)); - } - } - } - } + try + { + if (!s->installedEmpty()) + { + // iterate over all installed packages + for_(inst_it, s->installedBegin(), s->installedEnd()) + { + // check version if required + if (vers.empty() || vers == inst_it->resolvable()->edition().asString()) + { + ret->add(Resolvable2YCPMap(*inst_it, req_kind, dependencies)); + } + } + } + + if (!s->availableEmpty()) + { + // iterate over all available packages + for_(avail_it, s->availableBegin(), s->availableEnd()) + { + // check version if required + if (vers.empty() || vers == avail_it->resolvable()->edition().asString()) + { + ret->add(Resolvable2YCPMap(*avail_it, req_kind, dependencies)); + } + } + } + } + catch(const zypp::Exception &expt) + { + y2error("ResolvableProperties for \"%s\" failed: %s", + s->name().c_str(), expt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(expt)); + return YCPVoid(); + } + } } } - catch (...) + catch(const zypp::Exception &expt) { + y2error("ResolvableProperties failed: %s", expt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(expt)); + return YCPVoid(); } return ret; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-09-10 17:01:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-08-30 18:56:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-09-10 17:01:56.000000000 +0200 @@ -1,0 +2,111 @@ +Tue Sep 9 13:18:35 CEST 2014 - ms(a)suse.de + +- v5.06.158 released + +------------------------------------------------------------------- +Tue Sep 9 13:14:55 CEST 2014 - ms(a)suse.de + +- Fixed spec file requirement for perl-Config-IniFiles (bnc #895623) + + Older versions of this module doesn't have the 'exists' method + which is used by kiwi + +------------------------------------------------------------------- +Tue Sep 9 10:43:40 CEST 2014 - ms(a)suse.de + +- Remove obsolete/unused code from KIWILog::setFlag + +------------------------------------------------------------------- +Mon Sep 8 22:06:35 CEST 2014 - ms(a)suse.de + +- Follow up fix for message logging + + prevent obsolete in cache newline + +------------------------------------------------------------------- +Mon Sep 8 15:24:26 CEST 2014 - ms(a)suse.de + +- Added missing lvmetad tool + + The tools is required to scan the LVM metadata if it does live + on e.g md devices. It seems the default internal scanning did + not work correctly on pvresize, vgchange, etc... + +------------------------------------------------------------------- +Mon Sep 8 15:22:11 CEST 2014 - aosthof(a)suse.de + +- Fixed indentation + +------------------------------------------------------------------- +Mon Sep 8 14:55:26 CEST 2014 - aosthof(a)suse.de + +- Corrected typo (s/sda1/hda1) + +------------------------------------------------------------------- +Mon Sep 8 14:45:54 CEST 2014 - ms(a)suse.de + +- Fixed building of vagrant boxes (bnc #895353) + + If multiple boxes for different providers are built at once + kiwi uses the result of the first build as input for the next + one which is wrong because it should use the same raw disk + file for all format conversions + +------------------------------------------------------------------- +Mon Sep 8 14:24:06 CEST 2014 - ms(a)suse.de + +- Don't create /var/run (/run) tmpfs for SLE11 systems (bnc #895417) + +------------------------------------------------------------------- +Mon Sep 8 11:42:42 CEST 2014 - ms(a)suse.de + +- Fixed message logging + + Due to the status flags the sequence of log messages could look + broken because of missing newlines at the end of a log message. + This patch checks if a newline is required for the previos message + when the next message is on the way + +------------------------------------------------------------------- +Mon Sep 8 09:59:18 CEST 2014 - ms(a)suse.de + +- Fixed reset of cursor position to work on both stderr _and_ stdout + + This fixes messages displayed in flag colors to be correctly + displayed in the standard terminal output color + +------------------------------------------------------------------- +Mon Sep 8 09:29:11 CEST 2014 - ms(a)suse.de + +- Put kiwiOVFConfigWriter.pm from critic level 2 to 3 because + of too high code complexity for level 2. We need to refactor + the ovf code but for now I just lowered the critic level + +------------------------------------------------------------------- +Fri Sep 5 01:54:32 CEST 2014 - opensuse(a)suse.de + +- make it clear which directory couldn't be created + + If a previous build failed, it might have left the root directory + behind. Giving the path in the error will help the user clean it up. + +------------------------------------------------------------------- +Wed Sep 3 15:07:51 CEST 2014 - aosthof(a)suse.de + +- Added new firmware type 'ec2hvm' to handle EC2 HVM instances properly + +------------------------------------------------------------------- +Tue Sep 2 14:30:15 CEST 2014 - ms(a)suse.de + +- Fixed grub2 EFI setup for aarch64 (bnc #894307) + +------------------------------------------------------------------- +Tue Sep 2 13:51:07 CEST 2014 - ms(a)suse.de + +- Fixed baseSetupUserPermissions (bnc #894378) + + The function should not operate on system user accounts. + The function should not operate on accounts without + login shell + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.39XtT1/_old 2014-09-10 17:01:58.000000000 +0200 +++ /var/tmp/diff_new_pack.39XtT1/_new 2014-09-10 17:01:58.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.157 +Version: 5.06.158 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -76,7 +76,7 @@ Requires: libxslt Requires: perl >= %{perl_version} Requires: perl-Class-Singleton -Requires: perl-Config-IniFiles +Requires: perl-Config-IniFiles >= 2.49 Requires: perl-Digest-SHA1 Requires: perl-File-Slurp Requires: perl-JSON ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.git-hooks/pre-commit new/kiwi/.git-hooks/pre-commit --- old/kiwi/.git-hooks/pre-commit 2014-08-29 22:30:35.000000000 +0200 +++ new/kiwi/.git-hooks/pre-commit 2014-09-09 13:19:25.000000000 +0200 @@ -14,113 +14,160 @@ # The known Perl modules my @kiwiModules = qw ( - KIWIResult.pm + KIWIAnalyseReport.pm + KIWIAnalyseSoftware.pm + KIWIAnalyseSystem.pm + KIWIAnalyseTemplate.pm KIWIArchList.pm KIWIArch.pm KIWIBasePlugin.pm - KIWIFinishEFIPlugin.pm - KIWIPromoDVDPlugin.pm KIWIBoot.pm KIWICache.pm KIWICollect.pm + kiwiCommandLine.pm KIWICommandLine.pm KIWIConfigure.pm - KIWIConfigWriter.pm + kiwiConfigWriterFactory.pm KIWIConfigWriterFactory.pm + KIWIConfigWriter.pm + kiwiContainerBuilder.pm KIWIContainerBuilder.pm + kiwiContainerConfigWriter.pm KIWIContainerConfigWriter.pm KIWIContentPlugin.pm KIWIDescrPlugin.pm KIWIEulaPlugin.pm + kiwiFilesystemOptions.pm KIWIFilesystemOptions.pm + KIWIFinishEFIPlugin.pm KIWIGlobals.pm + kiwiImageBuilderBase.pm KIWIImageBuilderBase.pm + kiwiImageBuildFactory.pm KIWIImageBuildFactory.pm + kiwiImageCreator.pm KIWIImageCreator.pm KIWIImageFormat.pm + kiwiImage.pm KIWIImage.pm KIWIIsoLinux.pm KIWILicensePlugin.pm KIWILiveTreePlugin.pm + kiwiLocator.pm KIWILocator.pm KIWILog.pm - KIWIManager.pm KIWIManagerApt.pm + KIWIManagerEnsconce.pm + KIWIManager.pm KIWIManagerSmart.pm KIWIManagerYum.pm KIWIManagerZypper.pm - KIWIManagerEnsconce.pm - KIWIAnalyseSystem.pm - KIWIAnalyseSoftware.pm - KIWIAnalyseReport.pm - KIWIAnalyseTemplate.pm KIWIMiniIsoPlugin.pm KIWIOverlay.pm + kiwiOVFConfigWriter.pm KIWIOVFConfigWriter.pm KIWIPatternsPlugin.pm + kiwi.pl KIWIProductData.pm + kiwiProfileFile.pm KIWIProfileFile.pm + KIWIPromoDVDPlugin.pm KIWIQX.pm KIWIRepoMetaHandler.pm + KIWIResult.pm KIWIRoot.pm + kiwiRuntimeChecker.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm + kiwiTarArchiveBuilder.pm KIWITarArchiveBuilder.pm KIWITrace.pm KIWIURL.pm KIWIUtil.pm - KIWIXML.pm KIWIXMLDataBase.pm + kiwiXMLDefStripData.pm KIWIXMLDefStripData.pm + kiwiXMLDescriptionData.pm KIWIXMLDescriptionData.pm + kiwiXMLDriverData.pm KIWIXMLDriverData.pm + kiwiXMLEC2ConfigData.pm KIWIXMLEC2ConfigData.pm + kiwiXMLExceptData.pm KIWIXMLExceptData.pm + kiwiXMLFileData.pm KIWIXMLFileData.pm + kiwiXMLInfo.pm KIWIXMLInfo.pm + kiwiXMLInstRepositoryData.pm KIWIXMLInstRepositoryData.pm + kiwiXMLOEMConfigData.pm KIWIXMLOEMConfigData.pm - KIWIXMLVagrantConfigData.pm - KIWIXMLPXEDeployConfigData.pm - KIWIXMLPXEDeployData.pm + kiwiXMLPackageArchiveData.pm KIWIXMLPackageArchiveData.pm + kiwiXMLPackageCollectData.pm KIWIXMLPackageCollectData.pm + kiwiXMLPackageData.pm KIWIXMLPackageData.pm + kiwiXMLPackageIgnoreData.pm KIWIXMLPackageIgnoreData.pm + kiwiXMLPackageProductData.pm KIWIXMLPackageProductData.pm + kiwiXML.pm + KIWIXML.pm + kiwiXMLPreferenceData.pm KIWIXMLPreferenceData.pm + kiwiXMLProductArchitectureData.pm KIWIXMLProductArchitectureData.pm + kiwiXMLProductMetaChrootData.pm KIWIXMLProductMetaChrootData.pm + kiwiXMLProductMetaFileData.pm KIWIXMLProductMetaFileData.pm + kiwiXMLProductOptionsData.pm KIWIXMLProductOptionsData.pm + kiwiXMLProductPackageData.pm KIWIXMLProductPackageData.pm + kiwiXMLProfileData.pm KIWIXMLProfileData.pm + kiwiXMLPXEDeployConfigData.pm + KIWIXMLPXEDeployConfigData.pm + kiwiXMLPXEDeployData.pm + KIWIXMLPXEDeployData.pm KIWIXMLRepositoryBaseData.pm + kiwiXMLRepositoryData.pm KIWIXMLRepositoryData.pm + kiwiXMLSplitData.pm KIWIXMLSplitData.pm + kiwiXMLStripData.pm KIWIXMLStripData.pm + kiwiXMLSystemdiskData.pm KIWIXMLSystemdiskData.pm + kiwiXMLTypeData.pm KIWIXMLTypeData.pm + kiwiXMLUserData.pm KIWIXMLUserData.pm - KIWIXMLVMachineData.pm + kiwiXMLVagrantConfigData.pm + KIWIXMLVagrantConfigData.pm + kiwiXMLValidator.pm KIWIXMLValidator.pm + kiwiXMLVMachineData.pm + KIWIXMLVMachineData.pm KTCommandLine.t KTConfigWriterFactory.t KTContainerBuilder.t KTContainerConfigWriter.t KTFilesystemOptions.t - KTImage.t KTImageBuilderBase.t KTImageBuildFactory.t KTImageCreator.t + KTImage.t KTLocator.t + ktLog.pm KTOVFVConfigWriter.t KTProfileFile.t KTRuntimeChecker.t KTTarArchiveBuilder.t - KTXML.t + ktTestCase.pm KTXMLDefStripData.t KTXMLDescriptionData.t KTXMLDriverData.t @@ -130,8 +177,6 @@ KTXMLInfo.t KTXMLInstRepositoryData.t KTXMLOEMConfigData.t - KTXMLPXEDeployConfigData.t - KTXMLPXEDeployData.t KTXMLPackageArchiveData.t KTXMLPackageCollectData.t KTXMLPackageData.t @@ -144,65 +189,18 @@ KTXMLProductOptionsData.t KTXMLProductPackageData.t KTXMLProfileData.t + KTXMLPXEDeployConfigData.t + KTXMLPXEDeployData.t KTXMLRepositoryData.t KTXMLSplitData.t KTXMLStripData.t KTXMLSystemdiskData.t + KTXML.t KTXMLTypeData.t KTXMLUserData.t - KTXMLVMachineData.t - KTXMLValidator.t KTXMLVagrantConfigData.t - ktLog.pm - ktTestCase.pm - kiwiCommandLine.pm - kiwiConfigWriterFactory.pm - kiwiContainerBuilder.pm - kiwiContainerConfigWriter.pm - kiwiFilesystemOptions.pm - kiwiLocator.pm - kiwiImage.pm - kiwiImageBuilderBase.pm - kiwiImageBuildFactory.pm - kiwiImageCreator.pm - kiwiOVFConfigWriter.pm - kiwiProfileFile.pm - kiwiRuntimeChecker.pm - kiwiTarArchiveBuilder.pm - kiwiXML.pm - kiwiXMLDefStripData.pm - kiwiXMLDescriptionData.pm - kiwiXMLDriverData.pm - kiwiXMLEC2ConfigData.pm - kiwiXMLExceptData.pm - kiwiXMLFileData.pm - kiwiXMLInfo.pm - kiwiXMLInstRepositoryData.pm - kiwiXMLOEMConfigData.pm - kiwiXMLVagrantConfigData.pm - kiwiXMLPXEDeployConfigData.pm - kiwiXMLPXEDeployData.pm - kiwiXMLPackageArchiveData.pm - kiwiXMLPackageCollectData.pm - kiwiXMLPackageData.pm - kiwiXMLPackageIgnoreData.pm - kiwiXMLPackageProductData.pm - kiwiXMLPreferenceData.pm - kiwiXMLProductArchitectureData.pm - kiwiXMLProductMetaChrootData.pm - kiwiXMLProductMetaFileData.pm - kiwiXMLProductOptionsData.pm - kiwiXMLProductPackageData.pm - kiwiXMLProfileData.pm - kiwiXMLRepositoryData.pm - kiwiXMLSplitData.pm - kiwiXMLStripData.pm - kiwiXMLSystemdiskData.pm - kiwiXMLTypeData.pm - kiwiXMLUserData.pm - kiwiXMLVMachineData.pm - kiwiXMLValidator.pm - kiwi.pl + KTXMLValidator.t + KTXMLVMachineData.t ); # List of modules not clean to level 1 (brutal) of perlcritic @@ -258,8 +256,6 @@ KIWIRoot.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm KIWITarArchiveBuilder.pm KIWITrace.pm KIWIURL.pm @@ -445,8 +441,6 @@ KIWIRoot.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm KIWITarArchiveBuilder.pm KIWITrace.pm KIWIURL.pm @@ -501,6 +495,7 @@ KIWIAnalyseTemplate.pm KIWIMiniIsoPlugin.pm KIWIOverlay.pm + KIWIOVFConfigWriter.pm KIWIPatternsPlugin.pm KIWIProductData.pm KIWIQX.pm @@ -508,8 +503,6 @@ KIWIRoot.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm KIWITrace.pm KIWIURL.pm KIWIUtil.pm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/.revision 2014-08-29 22:30:36.000000000 +0200 @@ -1 +1 @@ -7730134ff257c180e86ba97b061f645c23f59a10 +1e4128fc1662592f8937ae0bbae4679cd231fd78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/metadata/KIWIConfig.xml 2014-09-09 13:19:25.000000000 +0200 @@ -26,6 +26,7 @@ locations except for the ones listed here --> <strip type="tools"> + <file name="lvmetad"/> <file name="loadkeys"/> <file name="klogconsole"/> <file name="multipath"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-09-09 13:19:25.000000000 +0200 @@ -561,9 +561,13 @@ my $appid = $this->{mbrid}; my $type = $this->{type}; my $bootloader= "syslinux"; - my $efi_arch = 'x86_64'; - if ($arch ne 'x86_64') { + my $efi_arch; + if ($arch eq 'x86_64') { + $efi_arch = 'x86_64'; + } elsif ($arch =~ /i.86/) { $efi_arch = 'i386'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $efi_arch = 'arm64'; } my $status; my $result; @@ -975,6 +979,9 @@ my $bootloader; if ($arch =~ /ppc|ppc64|ppc64le/) { $bootloader = "yaboot"; + if ($firmware eq "ofw") { + $bootloader = "grub2"; + } } elsif ($arch =~ /arm/) { $bootloader = "uboot"; } elsif (($firmware eq "efi") || ($firmware eq "uefi")) { @@ -3482,9 +3489,9 @@ # Grub2 #------------------------------------------ if ($loader eq "grub2") { - my $efipc = 'x86_64-efi'; - my $grubpc = 'i386-pc'; - my $grubofw = 'powerpc-ieee1275'; + my $efipc; + my $grubpc; + my $grubofw; my $bootbios = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootofw = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootefi = "$tmpdir/boot/grub2-efi/bootpart.cfg"; @@ -3496,14 +3503,32 @@ my $grub_ofw = 'grub2'; my $grub_share = 'grub2'; my $lib = 'lib'; - if ($firmware eq 'ec2') { - $grubpc = 'x86_64-xen'; - if ($arch ne 'x86_64') { - $grubpc = 'i386-xen'; + if ($arch eq 'x86_64') { + $efipc = 'x86_64-efi'; + $grubpc = 'i386-pc'; + if ($firmware eq 'ec2') { + $grubpc = 'x86_64-xen'; } - } - if ($arch ne 'x86_64') { + } elsif ($arch =~ /i.86/) { $efipc = 'i386-efi'; + $grubpc = 'i386-pc'; + if ($firmware eq 'ec2') { + $grubpc = 'i386-xen'; + } + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $efipc = 'arm64-efi'; + $grubpc = 'arm64-efi'; + } elsif ($arch =~ /ppc|ppc64|ppc64le/) { + if ($firmware eq 'ofw') { + $grubofw = 'powerpc-ieee1275'; + } + } else { + $kiwi -> failed (); + $kiwi -> error ( + "grub2: Unsupported architecture/firmware: $arch/$firmware" + ); + $kiwi -> failed (); + return; } if ($zipped) { $test = $unzip; @@ -3583,10 +3608,13 @@ } if ($firmware ne 'ec2') { push @core_modules, 'boot'; - push @bios_core_modules, qw /biosdisk vga vbe chain multiboot/; + push @bios_core_modules, qw /chain/; + if ($arch =~ /i.86|x86_64/) { + push @bios_core_modules, qw /biosdisk vga vbe multiboot/; + } } my @efi_core_modules = ( - 'part_gpt','efi_gop','efi_uga' + 'part_gpt','efi_gop' ); my @ofw_core_modules = ( 'ofnet','part_gpt','part_msdos' @@ -3606,6 +3634,9 @@ if ($firmware eq "ofw") { @bootdir = ("$tmpdir/boot/grub2/$grubofw"); } + if ($arch =~ /i.86|x86_64/) { + push @efi_core_modules,'efi_uga'; + } $status = KIWIQX::qxx ("mkdir -p @bootdir 2>&1"); $result = $? >> 8; if ($result != 0) { @@ -3779,11 +3810,17 @@ return; } my @modules = @efi_core_modules; - my $fo = 'x86_64-efi'; - my $fo_bin = 'bootx64.efi'; - if ($arch ne 'x86_64') { + my $fo; + my $fo_bin; + if ($arch eq 'x86_64') { + $fo = 'x86_64-efi'; + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { $fo = 'i386-efi'; $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo = 'arm64-efi'; + $fo_bin = 'bootaa64.efi'; } my $core= "$tmpdir/EFI/BOOT/$fo_bin"; my $core_opts; @@ -3810,9 +3847,13 @@ my $s_shim_ms = $stages{efi}{shim_ms}; my $s_shim_suse = $stages{efi}{shim_suse}; my $s_signed = $stages{efi}{signed}; - my $fo_bin = 'bootx64.efi'; - if ($arch ne 'x86_64') { + my $fo_bin; + if ($arch eq 'x86_64') { + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo_bin = 'bootaa64.efi'; } $result = 0; if ($zipped) { @@ -4189,6 +4230,22 @@ # ---- $cmdline .= " root=/dev/sda1"; } + if ($firmware eq 'ec2hvm') { + # /.../ + # Similar to the firmware type 'ec2', EC2 needs in case of HVM + # (hardware-assisted virtual machine) instances the root device to be + # set to /dev/hda1. + # + # Reason: + # During the first boot, kiwi tries to detect the root device via + # "hwinfo --storage", takes the first entry and creates an initrd and + # bootlaoder configuration based on this assumption. The problem is, + # that the first entry refers to /dev/sda1 (the second is /dev/hda1). + # During the second reboot, /dev/sda will be removed from the system + # and therefore such an instance won't come up. + # ---- + $cmdline .= " root=/dev/hda1"; + } if ($topic =~ /^KIWI (CD|USB) Boot/) { # /.../ # use predefined set of parameters for simple boot CD @@ -4397,8 +4454,10 @@ print $FD "\t"."set root='hd0,1'"."\n"; if ($arch eq 'x86_64') { print $FD "\t".'chainloader /EFI/BOOT/bootx64.efi'."\n"; - } else { + } elsif ($arch =~ /i.86/) { print $FD "\t".'chainloader /EFI/BOOT/bootx32.efi'."\n"; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + print $FD "\t".'chainloader /EFI/BOOT/bootaa64.efi'."\n"; } } else { print $FD "\t"."set root='hd0'"."\n"; @@ -5527,7 +5586,7 @@ my $loaderTarget; my $targetMessage; if (-e "$stages/core.img") { - # architectures: ix86 and x86_64 + # architectures: ix86, x86_64 and arm if ($chainload) { $loaderTarget = readlink ($bootdev); $loaderTarget =~ s/\.\./\/dev/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2014-09-09 13:19:25.000000000 +0200 @@ -324,12 +324,19 @@ #-------------------------------------- function baseSetupUserPermissions { while read line;do - dir=`echo $line | cut -f6 -d:` - uid=`echo $line | cut -f3 -d:` - usern=`echo $line | cut -f1 -d:` - group=`echo $line | cut -f4 -d:` - if [ -d "$dir" ] && [ $uid -gt 200 ] && [ $usern != "nobody" ];then - group=`cat /etc/group | grep "$group" | cut -f1 -d:` + dir=$(echo $line | cut -f6 -d:) + uid=$(echo $line | cut -f3 -d:) + usern=$(echo $line | cut -f1 -d:) + group=$(echo $line | cut -f4 -d:) + shell=$(echo $line | cut -f7 -d:) + if [ ! -d "$dir" ];then + continue + fi + if [ $uid -lt 1000 ];then + continue + fi + if [[ ! $shell =~ nologin|true|false ]];then + group=$(cat /etc/group | grep "$group" | cut -f1 -d:) chown -c -R $usern:$group $dir/* fi done < /etc/passwd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2014-08-29 22:30:41.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-09-09 13:19:25.000000000 +0200 @@ -1832,7 +1832,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.157"; + $data{Version} = "5.06.158"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2014-08-29 22:30:41.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2014-09-09 13:19:25.000000000 +0200 @@ -564,6 +564,7 @@ if ((! $ovf) || (! -e $ovf)) { return; } + $this->{image} = $box; } $kiwi -> info ("--> Creating box metadata files"); #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-09-09 13:19:25.000000000 +0200 @@ -441,8 +441,10 @@ #-------------------------------------- mkdir -p -m 0755 /run mkdir -p -m 0755 /var/run - mount -t tmpfs -o mode=0755,nodev,nosuid tmpfs /run - mount --bind /run /var/run + if [[ ! $kiwi_iname =~ SLE.11 ]];then + mount -t tmpfs -o mode=0755,nodev,nosuid tmpfs /run + mount --bind /run /var/run + fi #====================================== # mount devpts tmpfs #-------------------------------------- @@ -7550,8 +7552,10 @@ mkdir -p /mnt/dev mkdir -p /mnt/var/run mount --move /dev /mnt/dev - mount --move /run /mnt/run - mount --move /var/run /mnt/var/run + if [[ ! $kiwi_iname =~ SLE.11 ]];then + mount --move /run /mnt/run + mount --move /var/run /mnt/var/run + fi udevKill #====================================== # run preinit stage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILocator.pm new/kiwi/modules/KIWILocator.pm --- old/kiwi/modules/KIWILocator.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWILocator.pm 2014-09-09 13:19:25.000000000 +0200 @@ -83,6 +83,10 @@ } if (mkdir $root) { $rootError = 0; + } else { + $kiwi -> failed(); + $kiwi -> error ("Couldn't mkdir '$root': $!"); + $kiwi -> failed(); } } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILog.pm new/kiwi/modules/KIWILog.pm --- old/kiwi/modules/KIWILog.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWILog.pm 2014-09-09 13:19:25.000000000 +0200 @@ -81,8 +81,8 @@ # Reset cursor position to standard value # --- my $this = shift; - my $FD = $this->{channel}; - print $FD "\033[m\017"; + print STDOUT "\033[m\017"; + print STDERR "\033[m\017"; return; } @@ -93,19 +93,14 @@ # ... # set status flag # --- - my $this = shift; - my $flag = shift; - my $rootEFD = $this->{rootefd}; - my $FD = $this->{channel}; + my $this = shift; + my $flag = shift; + my $FD = $this->{channel}; #========================================== # no flag in file logging mode #------------------------------------------ if ($this->{fileLog}) { - # - # Don't set status flags to the log file, instead - # complete the line with a newline - # - print $FD "\n"; + # Don't set status flags in logging mode return; } #========================================== @@ -127,14 +122,6 @@ } else { print $FD " $flag\n"; } - #========================================== - # save a newline for default log file - #------------------------------------------ - if ($rootEFD) { - print $rootEFD "\n"; - } else { - $this -> saveInCache ("\n"); - } return; } @@ -391,6 +378,8 @@ my $rootEFD = $this->{rootefd}; my $date = $this -> getPrefix ( $lglevel ); my $trace = KIWITrace -> instance(); + my $prev = $this->{last_line}; + my $prev_channel = $this->{last_channel}; #========================================== # no logdata -> return #------------------------------------------ @@ -441,21 +430,43 @@ # send message cache if needed #------------------------------------------ if ((($this->{fileLog}) || ($this->{errorOk})) && (@mcache) && ($rootEFD)) { + my $line = "\n"; foreach my $message (@mcache) { + my $last_line_ending = chop $line; + if ($last_line_ending ne "\n") { + print $rootEFD "\n"; + } print $rootEFD $message; + $line = $message; } undef $this->{mcache}; } #========================================== + # check if last log line ended with a CR + #------------------------------------------ + my $needCR = 0; + if ($prev) { + my $last_line_ending = chop $prev; + if ($last_line_ending ne "\n") { + $needCR = 1; + } + } + #========================================== # print message to root file #------------------------------------------ if (($this->{errorOk}) && ($rootEFD)) { + if ($needCR) { + print $rootEFD "\n"; + } print $rootEFD $result; } #========================================== # print message to log channel (stdin,file) #------------------------------------------ if (($FD) && ((! defined $flag) || ($this->{fileLog}))) { + if (($needCR) && ($this->{fileLog})) { + print $prev_channel "\n"; + } print $FD $result; } #========================================== @@ -536,6 +547,8 @@ my $this = shift; my $logdata = shift; my @mcache; + $this->{last_line} = $logdata; + $this->{last_channel} = $this->{channel}; if (defined $this->{mcache}) { @mcache = @{$this->{mcache}}; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2014-09-09 13:19:25.000000000 +0200 @@ -1643,7 +1643,7 @@ ## the disk layout and the partition table type. By default ## the standard x86 bios firmware setup is used attribute firmware { - "bios" | "ec2" | "efi" | "uefi" | "vboot" | "ofw" + "bios" | "ec2" | "ec2hvm" | "efi" | "uefi" | "vboot" | "ofw" } k.type.bootpartition.attribute = ## specify if an extra boot partition should be used or not. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2014-09-09 13:19:25.000000000 +0200 @@ -2184,6 +2184,7 @@ <choice> <value>bios</value> <value>ec2</value> + <value>ec2hvm</value> <value>efi</value> <value>uefi</value> <value>vboot</value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLTypeData.pm new/kiwi/modules/KIWIXMLTypeData.pm --- old/kiwi/modules/KIWIXMLTypeData.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIXMLTypeData.pm 2014-09-09 13:19:25.000000000 +0200 @@ -2117,7 +2117,7 @@ return; } my %supported = map { ($_ => 1) } qw( - bios ec2 efi uefi vboot ofw + bios ec2 ec2hvm efi uefi vboot ofw ); if (! $supported{$firmware} ) { my $msg = "$caller: specified firmware value '$firmware' is not " -- 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-storage for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-09-10 17:01:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-09-07 11:08:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-09-10 17:01:54.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 8 10:40:42 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) + without specifying the ruby ABI; this layer need not care. +- version 3.1.44 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.43.tar.bz2 New: ---- yast2-storage-3.1.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.7lpqUW/_old 2014-09-10 17:01:55.000000000 +0200 +++ /var/tmp/diff_new_pack.7lpqUW/_new 2014-09-10 17:01:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.43 +Version: 3.1.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,13 +31,6 @@ BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Writer -%if 0%{?suse_version} == 1315 -BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) -BuildRequires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) -%else -BuildRequires: rubygem-rspec -BuildRequires: rubygem-ruby-dbus -%endif BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.22 @@ -45,16 +38,14 @@ BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-ruby-bindings >= 3.1.7 BuildRequires: yast2-testsuite >= 2.19.0 +BuildRequires: rubygem(rspec) +BuildRequires: rubygem(ruby-dbus) Requires: libstorage-ruby >= 2.25.14 Requires: libstorage5 >= 2.25.14 -%if 0%{?suse_version} == 1315 -Requires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) -%else -Requires: rubygem-ruby-dbus -%endif Requires: yast2 >= 3.1.22 Requires: yast2-core >= 2.18.3 Requires: yast2-libyui >= 2.18.7 +Requires: rubygem(ruby-dbus) %ifarch s390 s390x Requires: yast2-s390 %endif ++++++ yast2-storage-3.1.43.tar.bz2 -> yast2-storage-3.1.44.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.43/package/yast2-storage.changes new/yast2-storage-3.1.44/package/yast2-storage.changes --- old/yast2-storage-3.1.43/package/yast2-storage.changes 2014-09-04 18:29:22.000000000 +0200 +++ new/yast2-storage-3.1.44/package/yast2-storage.changes 2014-09-08 12:54:22.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 8 10:40:42 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) + without specifying the ruby ABI; this layer need not care. +- version 3.1.44 + +------------------------------------------------------------------- Thu Sep 04 18:11:49 CEST 2014 - aschnell(a)suse.de - fixed LVM proposal when reusing LVM (bnc#893203) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.43/package/yast2-storage.spec new/yast2-storage-3.1.44/package/yast2-storage.spec --- old/yast2-storage-3.1.43/package/yast2-storage.spec 2014-09-04 18:29:22.000000000 +0200 +++ new/yast2-storage-3.1.44/package/yast2-storage.spec 2014-09-08 12:54:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.43 +Version: 3.1.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,13 +33,8 @@ BuildRequires: libstorage-ruby >= 2.25.14 BuildRequires: libxslt BuildRequires: perl-XML-Writer -%if 0%{?suse_version} == 1315 -BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) -BuildRequires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) -%else -BuildRequires: rubygem-rspec -BuildRequires: rubygem-ruby-dbus -%endif +BuildRequires: rubygem(rspec) +BuildRequires: rubygem(ruby-dbus) BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.22 @@ -49,11 +44,7 @@ BuildRequires: yast2-testsuite >= 2.19.0 Requires: libstorage-ruby >= 2.25.14 Requires: libstorage5 >= 2.25.14 -%if 0%{?suse_version} == 1315 -Requires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) -%else -Requires: rubygem-ruby-dbus -%endif +Requires: rubygem(ruby-dbus) Requires: yast2 >= 3.1.22 Requires: yast2-core >= 2.18.3 Requires: yast2-libyui >= 2.18.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-keyring for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-keyring for openSUSE:Factory checked in at 2014-09-10 17:01:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keyring (Old) and /work/SRC/openSUSE:Factory/.python-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-keyring" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keyring/python-keyring.changes 2014-03-20 07:32:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-keyring.new/python-keyring.changes 2014-09-10 17:01:30.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 28 13:05:31 UTC 2014 - dmueller(a)suse.com + +- reduce/fix build requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keyring.spec ++++++ --- /var/tmp/diff_new_pack.nDMB56/_old 2014-09-10 17:01:33.000000000 +0200 +++ /var/tmp/diff_new_pack.nDMB56/_new 2014-09-10 17:01:33.000000000 +0200 @@ -31,7 +31,9 @@ BuildRequires: python-mock BuildRequires: python-nose BuildRequires: python-pytest-runner +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 BuildRequires: python-unittest2 +%endif Provides: python-keyring-kde = %{version} Obsoletes: python-keyring-kde < %{version} Provides: python-keyring-gnome = %{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 kernel-firmware for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at 2014-09-10 17:01:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old) and /work/SRC/openSUSE:Factory/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes 2014-09-05 12:59:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-firmware.new/kernel-firmware.changes 2014-09-10 17:01:25.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 8 15:33:08 UTC 2014 - eich(a)suse.com + +- Add ast_dp501_fw.bin (bnc#871134 & bnc#895608) + file generated from an array in a header file of xf86-video-ast: + MIT/X11 License + +------------------------------------------------------------------- New: ---- ast_dp501_fw.bin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.wTPVdq/_old 2014-09-10 17:01:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wTPVdq/_new 2014-09-10 17:01:30.000000000 +0200 @@ -29,6 +29,8 @@ # Created with git archive | bzip2 Source0: linux-firmware-%{version}.tar.xz Source1: firmware.sh +# ast_dp501_fw.bin generated from header file of xf86-video-ast: MIT/X11 License +Source2: ast_dp501_fw.bin %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements %define __ksyms_supplements bash %_sourcedir/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements @@ -79,6 +81,7 @@ %prep %setup -q -n linux-firmware-%version +cp %{S:2} . %build # nothing to do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xinit for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2014-09-10 17:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xinit" Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2014-01-08 20:10:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2014-09-10 17:01:22.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 9 07:54:00 UTC 2014 - sndirsch(a)suse.com + +- add info to run chkstat after modifying /etc/permissions.local + in order to run startx (bnc#895647) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit-suse.diff ++++++ --- /var/tmp/diff_new_pack.tDMgsD/_old 2014-09-10 17:01:25.000000000 +0200 +++ /var/tmp/diff_new_pack.tDMgsD/_new 2014-09-10 17:01:25.000000000 +0200 @@ -135,7 +135,7 @@ +if [ "$retval" != 0 -a ! -u "/usr/bin/Xorg" ]; then + echo "-------------------------------------------------------------------------------------------" + echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?" -+ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local" ++ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local and run \"chkstat --system --set\" afterwards" +fi + if [ x"$enable_xauth" = x1 ] ; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdump for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-09-10 17:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-09-08 21:29:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-09-10 17:01:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 9 06:08:44 UTC 2014 - ptesarik(a)suse.cz + +- kdump-count-const-slabs.patch: Add missing addition. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump-count-const-slabs.patch ++++++ --- /var/tmp/diff_new_pack.ZMDdJa/_old 2014-09-10 17:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ZMDdJa/_new 2014-09-10 17:01:22.000000000 +0200 @@ -4,6 +4,7 @@ References: bnc#879460 Patch-mainline: v0.8.16 Git-commit: 3a7c9b3a02893ab9ac39e23cae5ead9e42716927 +Git-commit: 8c0a42e80a89100addc09d584253f1c8accde500 Some slabs do not depend on available memory or system utilization. Their size can be taken directly from the running kernel. @@ -15,8 +16,8 @@ Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> --- - kdumptool/calibrate.cc | 213 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 213 insertions(+) + kdumptool/calibrate.cc | 215 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 215 insertions(+) --- a/kdumptool/calibrate.cc +++ b/kdumptool/calibrate.cc @@ -222,7 +223,7 @@ //{{{ Calibrate ---------------------------------------------------------------- // ----------------------------------------------------------------------------- -@@ -498,6 +693,24 @@ void Calibrate::execute() +@@ -498,6 +693,26 @@ void Calibrate::execute() required += DEF_FRAMEBUFFER_KB; } @@ -236,6 +237,8 @@ + it->first.startsWith("ftrace_") ) { + unsigned long slabsize = it->second->numSlabs() * + it->second->pagesPerSlab() * pagesize / 1024; ++ required += slabsize; ++ + Debug::debug()->dbg("Adding %ld KiB for %s slab cache", + slabsize, it->second->name().c_str()); + } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ibus for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2014-09-10 17:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2014-09-07 11:08:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2014-09-10 17:01:17.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 8 16:39:26 UTC 2014 - fcrozat(a)suse.com + +- Do not suggest to install ibus when installing + libreoffice/libreoffice-gnome on SLE12. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.paJC28/_old 2014-09-10 17:01:19.000000000 +0200 +++ /var/tmp/diff_new_pack.paJC28/_new 2014-09-10 17:01:19.000000000 +0200 @@ -108,7 +108,9 @@ Recommends: %{name}-lang #Fix cursor following problem in KDE4 for libreoffice. +%if 0%{?suse_version} != 1315 Supplements: packageand(libreoffice:libreoffice-gnome) +%endif Provides: locale(ja;ko;zh) Obsoletes: ibus-gnome-shell -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pango for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2014-09-10 17:01:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pango" Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2014-08-20 17:53:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2014-09-10 17:01:13.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Sep 7 21:11:44 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.36.7: + + Add tests for pango markup. + + Add tests for PangoLayout. + + Add an analysis flag for ellipsis (bgo#735719). + + Treat attributes in ellipsis better (bgo#735732). + +------------------------------------------------------------------- Old: ---- pango-1.36.6.tar.xz New: ---- pango-1.36.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.JiDCns/_old 2014-09-10 17:01:16.000000000 +0200 +++ /var/tmp/diff_new_pack.JiDCns/_new 2014-09-10 17:01:16.000000000 +0200 @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.36.6 +Version: 1.36.7 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ ++++++ pango-1.36.6.tar.xz -> pango-1.36.7.tar.xz ++++++ ++++ 2117 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 flash-player for openSUSE:13.1:NonFree:Update
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package flash-player for openSUSE:13.1:NonFree:Update checked in at 2014-09-10 16:51:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:NonFree:Update/flash-player (Old) and /work/SRC/openSUSE:13.1:NonFree:Update/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.ytJryn/_old 2014-09-10 16:51:26.000000000 +0200 +++ /var/tmp/diff_new_pack.ytJryn/_new 2014-09-10 16:51:26.000000000 +0200 @@ -1 +1 @@ -<link package='flash-player.2955' cicount='copy' /> +<link package='flash-player.2996' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flash-player.2996 for openSUSE:12.3:NonFree:Update
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package flash-player.2996 for openSUSE:12.3:NonFree:Update checked in at 2014-09-10 16:51:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:NonFree:Update/flash-player.2996 (Old) and /work/SRC/openSUSE:12.3:NonFree:Update/.flash-player.2996.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player.2996" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:12.3:NonFree:Update/.flash-player.2996.new/flash-player.changes 2014-09-10 16:51:23.000000000 +0200 @@ -0,0 +1,601 @@ +------------------------------------------------------------------- +Tue Sep 9 18:29:24 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.406 (bnc#895856): + * APSB14-21, CVE-2014-0547, CVE-2014-0548, CVE-2014-0549, + CVE-2014-0550, CVE-2014-0551, CVE-2014-0552, CVE-2014-0553, + CVE-2014-0554, CVE-2014-0555, CVE-2014-0556, CVE-2014-0557, + CVE-2014-0559 + +------------------------------------------------------------------- +Wed Aug 13 15:53:26 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.400 (bnc#891688): + * APSB14-18, CVE-2014-0538, CVE-2014-0540, CVE-2014-0541, + CVE-2014-0542, CVE-2014-0543, CVE-2014-0544, CVE-2014-0545 + +------------------------------------------------------------------- +Wed Jul 9 14:31:51 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.394 (bnc#886472): + * APSB14-17, CVE-2014-0537, CVE-2014-0539, CVE-2014-4671 +- License update (LICENSE -> Flash%20Player_14.0.pdf). + +------------------------------------------------------------------- +Wed Jun 11 19:13:21 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.378 (bnc#882187, Redhat#1107822, + Redhat#1107823): + * APSB14-16, CVE-2014-0531, CVE-2014-0532, CVE-2014-0533, + CVE-2014-0534, CVE-2014-0535, CVE-2014-0536 +- Contents of flashplayer_11_sa.i386.tar.gz changed: + spec file updated, supplementary script (update.sh) updated. + Now it accepts both forms of this file seen in past. + +------------------------------------------------------------------- +Wed May 14 21:39:43 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.359 (bnc#877649): + * APSB14-14, CVE-2014-0516, CVE-2014-0517, CVE-2014-0518, + CVE-2014-0519, CVE-2014-0520 + +------------------------------------------------------------------- +Tue Apr 29 15:34:46 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.356 (bnc#875577): + * APSB14-13, CVE-2014-0515 + +------------------------------------------------------------------- +Thu Apr 10 13:45:36 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.350: (bnc#872692) + * APSB14-09, CVE-2014-0506, CVE-2014-0507, CVE-2014-0508, + CVE-2014-0509 + +------------------------------------------------------------------- +Wed Mar 12 16:37:21 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.346: (bnc#867808) + * APSB14-08, CVE-2014-0503, CVE-2013-0504 + +------------------------------------------------------------------- +Fri Feb 21 18:25:14 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.341: (bnc#865021) + * APSB14-07, CVE-2014-0498 CVE-2014-0499 CVE-2014-0502 +- Contents of flashplayer_11_sa.i386.tar.gz changed back: + spec file updated, supplementary script (update.sh) updated. + +------------------------------------------------------------------- +Wed Feb 5 18:45:51 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.336: (bnc#862288) + * APSB14-04, CVE-2014-0497 +- Contents of flashplayer_11_sa.i386.tar.gz changed: + spec file updated, supplementary script (update.sh) updated. + +------------------------------------------------------------------- +Wed Jan 15 19:12:15 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.335: (bnc#858822) + * APSB14-02, CVE-2014-0491, CVE-2014-0492 + +------------------------------------------------------------------- +Thu Dec 12 18:07:46 UTC 2013 - sbrabec(a)suse.com + +- Security update to 11.2.202.332: (bnc#854881) + * APSB13-28, CVE-2013-5331, CVE-2013-5332 + * Prevents possible remote code execution! + +------------------------------------------------------------------- +Wed Nov 13 19:51:26 UTC 2013 - sbrabec(a)suse.com + +- Security update to 11.2.202.327: (bnc#850220) + * APSB13-26, CVE-2013-5329, CVE-2013-5330 +- Supplementary script (update.sh) update: + * Update to the new web pages layout. + * Use original .tar.gz files released by Adobe. + +------------------------------------------------------------------- +Thu Sep 12 16:27:37 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.310: (bnc#839897) + * APSB13-21, CVE-2013-3361, CVE-2013-3362, CVE-2013-3363, + CVE-2013-5324 + +------------------------------------------------------------------- +Wed Jul 10 14:37:53 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.297: (bnc#828810) + * APSB13-17, CVE-2013-3344, CVE-2013-3345, CVE-2013-3347 + +------------------------------------------------------------------- +Wed Jun 12 14:17:57 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.291: (bnc#824512) + * APSB13-16, CVE-2013-3343 + +------------------------------------------------------------------- +Wed May 15 14:08:22 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.285: (bnc#819916) + * APSB13-14, CVE-2013-2728, CVE-2013-3324, CVE-2013-3325, + CVE-2013-3326, CVE-2013-3327, CVE-2013-3328, CVE-2013-3329, + CVE-2013-3330, CVE-2013-3331, CVE-2013-3332, CVE-2013-3333, + CVE-2013-3334, CVE-2013-3335 + +------------------------------------------------------------------- +Wed Apr 10 13:19:35 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.280: (bnc#814635) + * APSB13-11, CVE-2013-1378, CVE-2013-1379, CVE-2013-1380, + CVE-2013-2555 + +------------------------------------------------------------------- +Tue Mar 12 17:42:12 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.275: (bnc#808973) + * APSB13-09, CVE-2013-0646, CVE-2013-0650, CVE-2013-1371, + CVE-2013-1375 + +------------------------------------------------------------------- +Wed Feb 27 16:06:23 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.273: (bnc#806415) + * APSB13-08, CVE-2013-0504, CVE-2013-0643, CVE-2013-0648 + +------------------------------------------------------------------- +Wed Feb 13 14:12:17 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.270: (bnc#803485) + * APSB13-05, CVE-2013-1372, CVE-2013-0645, CVE-2013-1373, + CVE-2013-1369, CVE-2013-1370, CVE-2013-1366, CVE-2013-0649, + CVE-2013-1365, CVE-2013-1374, CVE-2013-1368, CVE-2013-0642, + CVE-2013-0644, CVE-2013-0647, CVE-2013-1367, CVE-2013-0639, + CVE-2013-0638, CVE-2013-0637 + +------------------------------------------------------------------- +Fri Feb 8 14:30:11 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.262: (bnc#802809) + * APSB13-04, CVE-2013-0633, CVE-2013-0634 + +------------------------------------------------------------------- +Wed Jan 9 07:30:35 UTC 2013 - dmueller(a)suse.com + +- Update to 11.2.202.261: (bnc#797442) + * CVE-2013-0630 + +------------------------------------------------------------------- +Wed Dec 12 09:59:37 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.258: (bnc#794062): + * CVE-2012-5676, CVE-2012-5677, CVE-2012-5678 + +------------------------------------------------------------------- +Tue Nov 6 17:31:27 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.251 (bnc#788450): + * CVE-2012-5274, CVE-2012-5275, CVE-2012-5276, CVE-2012-5277, + CVE-2012-5278, CVE-2012-5279, CVE-2012-5280 + +------------------------------------------------------------------- +Tue Oct 9 05:49:34 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.243: (bnc#784168) + * CVE-2012-5248, CVE-2012-5249, CVE-2012-5250, CVE-2012-5251, + CVE-2012-5252, CVE-2012-5253, CVE-2012-5254, CVE-2012-5255, + CVE-2012-5256, CVE-2012-5257, CVE-2012-5258, CVE-2012-5259, + CVE-2012-5260, CVE-2012-5261, CVE-2012-5262, CVE-2012-5263, + CVE-2012-5264, CVE-2012-5265, CVE-2012-5266, CVE-2012-5267, + CVE-2012-5268, CVE-2012-5269, CVE-2012-5270, CVE-2012-5271, + CVE-2012-5272 + +------------------------------------------------------------------- +Wed Aug 15 10:16:23 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.238: (bnc#775986): ++++ 404 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:NonFree:Update/.flash-player.2996.new/flash-player.changes New: ---- Flash%20Player_14.0.pdf README desktop.diff flash-player.changes flash-player.spec flashplayer.desktop flashplayer.png flashplayer_11.1.102.55_sa.x86_64.tar.bz2 flashplayer_11.2.202.406_sa.i386.tar.gz install_flash_player_11.2.202.406_linux.i386.tar.gz install_flash_player_11.2.202.406_linux.x86_64.tar.gz kcm_adobe_flash_player.desktop.patch mms.cfg update.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flash-player.spec ++++++ # # spec file for package flash-player # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_standalone 1 Name: flash-player Version: 11.2.202.406 Release: 0 Summary: Adobe Flash Plugin and Standalone Player License: NON-OSI-COMPLIANT(royalties) Group: Productivity/Networking/Web/Browsers Url: http://get.adobe.com/flashplayer/ %ifarch %ix86 Source0: install_flash_player_%{version}_linux.i386.tar.gz Source1: flashplayer_%{version}_sa.i386.tar.gz %endif %ifarch x86_64 Source0: install_flash_player_%{version}_linux.x86_64.tar.gz Source1: flashplayer_11.1.102.55_sa.x86_64.tar.bz2 %endif # License referenced from http://www.adobe.com/legal/licenses-terms.html Source2: http://wwwimages.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/Fl… Source3: README Source4: flashplayer.desktop Source5: flashplayer.png Source6: mms.cfg Source99: update.sh NoSource: 99 # PATCH-FIX-OPENSUSE desktop.diff -- Fix desktop file to be GNOME compatible Patch0: desktop.diff # PATCH-FIX-OPENSUSE kcm_adobe_flash_player.desktop.patch asterios.dramis(a)gmail.com -- Make the KCM module X-KDE-System-Settings-Parent-Category entry compatible with newer KDE versions Patch1: kcm_adobe_flash_player.desktop.patch %if 0%{?suse_version} > 1100 BuildRequires: kde4-filesystem %endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # flash player dynamically opens that one and segfaults if not available (2008-11-12) %ifarch %ix86 Requires: libasound.so.2 Requires: libcurl.so.4 %endif %ifarch x86_64 Requires: libasound.so.2()(64bit) Requires: libcurl.so.4()(64bit) %endif Provides: flash-plugin = %{version} %if 0%{?suse_version} >= 1110 # flash 10 does not need libflashsupport and using it can cause device conflicts # just let flash talk with the default alsa plugin - bnc#539656 Provides: libflashsupport = 1.2 Obsoletes: libflashsupport <= 1.2 %ifarch x86_64 Provides: libflashsupport-32bit = 1.2 Obsoletes: libflashsupport-32bit <= 1.2 %endif %endif Provides: netscape-plugins Obsoletes: netscape-plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 %if 0%{!?_kde4_libdir:1} %define _kde4_libdir %{_libdir} %endif %if 0%{!?_kde4_datadir:1} %define _kde4_datadir %{_datadir} %endif %if 0%{!?_kde4_sharedir:1} %define _kde4_sharedir %{_kde4_datadir}/kde4 %endif %if 0%{!?_kde4_modulesdir:1} %define _kde4_modulesdir %{_kde4_libdir}/kde4 %endif %if 0%{!?_kde4_servicesdir:1} %define _kde4_servicesdir %{_kde4_sharedir}/services %endif %description This package contains Adobe's Flash Plugin for the supported Web browsers in addition to a standalone flash player application. %if 0%{?suse_version} > 1100 %package gnome Summary: Adobe Flash Plugin and Standalone Player Settings Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} Supplements: packageand(gnome-session:flash-player) %description gnome This package contains Adobe's Flash Plugin Settings for the GNOME desktop. %package kde4 Summary: Adobe Flash Plugin and Standalone Player Settings Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} Supplements: packageand(kdebase4-session:flash-player) %kde4_runtime_requires %description kde4 This package contains Adobe's Flash Plugin Settings for the KDE 4 desktop. %endif %prep %setup -q -c %{name}-%{version} -a 0 -b 1 %patch0 %patch1 cp %{SOURCE2} . cp %{SOURCE3} . mkdir EULA mv Flash%20Player_14.0.pdf EULA/Flash\ Player_14.0.pdf %build %install install -Dpm 0755 libflashplayer.so %{buildroot}%{_libdir}/browser-plugins/libflashplayer.so # bnc#761975 #install -m 644 -D %{SOURCE6} %{buildroot}/etc/adobe/mms.cfg mkdir -p %{buildroot}%{_datadir}/icons rm -rf usr/share/icons/hicolor/24x24 %if 0%{?suse_version} <= 1100 rm -rf usr/share/icons/hicolor/*/apps/flash-player-properties.png %endif cp -a usr/share/icons/* %{buildroot}%{_datadir}/icons %if 0%{?suse_version} > 1100 # KDE frontend install -Dpm 0755 usr/%{_lib}/kde4/kcm_adobe_flash_player.so %{buildroot}%{_kde4_modulesdir}/kcm_adobe_flash_player.so install -Dpm 0644 usr/share/kde4/services/kcm_adobe_flash_player.desktop %{buildroot}%{_kde4_servicesdir}/kcm_adobe_flash_player.desktop # GNOME frontend install -Dpm 0755 usr/bin/flash-player-properties %{buildroot}%{_bindir}/flash-player-properties install -Dpm 0644 usr/share/applications/flash-player-properties.desktop %{buildroot}%{_datadir}/applications/flash-player-properties.desktop %endif %if %build_standalone %if 0%{?suse_version} > 1030 %ifarch %ix86 if test -f install_flash_player_linux_sa/flashplayer ; then install -Dpm 0755 install_flash_player_linux_sa/flashplayer %{buildroot}%{_bindir}/flashplayer else install -Dpm 0755 flashplayer %{buildroot}%{_bindir}/flashplayer fi install -Dpm 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications/flashplayer.desktop install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/flashplayer.png %suse_update_desktop_file flashplayer %endif %endif %endif %if 0%{?suse_version} > 1100 %suse_update_desktop_file flash-player-properties %endif %files %defattr(-,root,root,-) %doc [Rr][eE][aA][dD][Mm][eE]* EULA %{_libdir}/browser-plugins/libflashplayer.so #/etc/adobe/mms.cfg #%dir /etc/adobe %if 0%{?suse_version} > 1020 %{_datadir}/icons/hicolor/*x*/apps/flash-player-properties.png %endif %if %build_standalone %if 0%{?suse_version} > 1030 %ifarch %ix86 %{_bindir}/flashplayer %{_datadir}/applications/flashplayer.desktop %{_datadir}/pixmaps/flashplayer.png %endif %endif %endif %if 0%{?suse_version} > 1100 %files gnome %defattr(-,root,root,-) %{_bindir}/flash-player-properties %{_datadir}/applications/flash-player-properties.desktop %files kde4 %defattr(-,root,root,-) %{_kde4_modulesdir}/kcm_adobe_flash_player.so %{_kde4_servicesdir}/kcm_adobe_flash_player.desktop %endif %changelog ++++++ README ++++++ Adobe Systems Incorporated Flash Player 10 for Linux Version 10.0.32.18 2009 Adobe recommends that all users upgrade to the latest version of Adobe Flash Player for the most recent features, bug fixes, and security fixes. For more information on the new features in Flash Player 9, please visit http://www.adobe.com/products/flashplayer/. For more information on system requirements, fixed issues, and known issues, see the release notes at http://www.adobe.com/go/flashplayer_releasenotes. To confirm which version of Flash Player you have currently installed, see http://www.adobe.com/software/flash/about/. Users should only install Players that have been downloaded from trusted sources, such as http://www.adobe.com/. Your use of this player is governed by the Adobe End User License Agreement found at http://www.adobe.com/products/eulas/players/flash/. Privacy ------- Adobe is committed to preserving the privacy of end users. For more information on configuring Client-side privacy visit the Settings Manager Documentation: http://www.adobe.com/go/flashplayerhelp. Installation instructions ------------------------- Installing the plugin tar.gz using Install script: o Unpack the tar.gz file o In terminal, navigate to the unpacked directory and enter: + $ ./flashplayer-installer + Click Enter key and follow prompts Installing the plugin using RPM: o As root, enter in terminal: + # rpm -Uvh <rpm_package_file> + Click Enter key and follow prompts Installing the standalone player: o Unpack the tar.gz file o To execute the standalone player, + Double-click, or + Enter in terminal: ./flashplayer Uninstallation instructions --------------------------- Manual uninstallation (for users who installed the plugin via Install script): o Delete libflashplayer.so binary and flashplayer.xpt file in directory /home/<user>/.mozilla/plugins/ RPM uninstallation: o As root, enter in terminal: + # rpm -e flash-plugin + Click Enter key and follow prompts Technical Issues and Reporting Bugs ----------------------------------- The Adobe Flash Player Support Center at http://www.adobe.com/support/flashplayer/ is a free online resource for support and troubleshooting information. Bug reports may be submitted at http://www.adobe.com/go/wish. To allow us to investigate reported bugs, please include the following information: 1) Platform and version 2) Browser version 3) Reproducible steps including a URL to the web site where the problem was encountered. If we need further information about a bug, you will be contacted. An automated reply will be sent to assure you that we have received your bug report. Due to the volume of mail received, we are not able to individually respond to each report. Legal ----- Adobe(R) Flash(R) Player. Copyright (C) 1996 - 2009 Adobe Systems Incorporated. All Rights Reserved. Protected by U.S. Patent 6,879,327; Patents Pending in the United States and other countries. Adobe and Flash are either trademarks or registered trademarks in the United States and/or other countries. ++++++ desktop.diff ++++++ --- usr/share/applications/flash-player-properties.desktop +++ usr/share/applications/flash-player-properties.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Adobe Flash Player +GenericName=Adobe Flash Player Settings Comment=Preferences for Adobe Flash Player Comment[bg]=Настройки за Adobe Flash Player Comment[ca]=Preferències quant a la Adobe Flash Player @@ -20,5 +21,5 @@ Terminal=false Type=Application StartupNotify=true -Categories=Settings;GNOME;GTK;X-GNOME-PersonalSettings; +Categories=Settings;Network;WebBrowser;GNOME;GTK;X-GNOME-PersonalSettings; NotShowIn=KDE; ++++++ flashplayer.desktop ++++++ [Desktop Entry] Type=Application Encoding=UTF-8 Name=FlashPlayer GenericName=Flash Standalone Player Comment=Flash Standalone Player Icon=flashplayer Exec=flashplayer Terminal=false Categories=GTK;Application;AudioVideo;Audio;Video;Player; MimeType=application/x-shockwave-flash; ++++++ kcm_adobe_flash_player.desktop.patch ++++++ --- usr/share/kde4/services/kcm_adobe_flash_player.desktop.orig 2011-08-03 09:35:44.000000000 +0300 +++ usr/share/kde4/services/kcm_adobe_flash_player.desktop 2011-08-27 22:00:25.800000030 +0300 @@ -8,7 +8,7 @@ X-KDE-Library=kcm_adobe_flash_player X-KDE-ParentApp=kcontrol -X-KDE-System-Settings-Parent-Category=personal +X-KDE-System-Settings-Parent-Category=personal-information X-KDE-Weight=10 Name=Adobe Flash Player ++++++ mms.cfg ++++++ EnableLinuxHWVideoDecode=1 ++++++ update.sh ++++++ #!/bin/bash # vim: sw=4 et t=$(mktemp -d XXXXXXX) set -e pushd $t &>/dev/null tar xf ../install_flash_player_11*_linux.i386.tar.gz libflashplayer.so md5sum libflashplayer.so > ORIG_FLASH rm libflashplayer.so # fetch the current download url download_url=$(curl -s 'http://get.adobe.com/flashplayer/download/?installer=Flash_Player_11.2_for_…' | egrep -o 'http:\/\/fpdownload.macromedia.com\/get\/flashplayer\/pdc\/11.*\/install_flash_player_11_linux.i386.tar.gz') echo "Trying download $download_url"; wget $download_url tar xf install_flash_player_11_linux.i386.tar.gz libflashplayer.so md5sum libflashplayer.so > NEW_FLASH if cmp -s ORIG_FLASH NEW_FLASH; then echo "no new update available" else echo "*** NEW flashplugin UPDATE AVAILABLE!" version=$(strings libflashplayer.so | grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g') echo "new version is $version" download_url=$(echo $download_url | sed -e 's,i386,ARCH,') for arch in i386 x86_64; do wget -q $(echo $download_url | sed -e "s,ARCH,$arch,") mv install_flash_player_11_linux.$arch.tar.gz install_flash_player_${version}_linux.$arch.tar.gz mv install_flash_player_${version}_linux.$arch.tar.gz .. done sed -i -e "s,Version:.*,Version: $version," ../flash-player.spec ( cd ..; osc vc -m "Security update to $version (bnc#XXXXXX):" ) fi for arch in i386; do if tar tf ../flashplayer_*_sa.$arch.tar.gz | grep -q -F install_flash_player_linux_sa/flashplayer ; then tar xf ../flashplayer_*_sa.$arch.tar.gz install_flash_player_linux_sa/flashplayer md5sum install_flash_player_linux_sa/flashplayer > ORIG_FLASH rm -r install_flash_player_linux_sa else tar xf ../flashplayer_*_sa.$arch.tar.gz flashplayer md5sum flashplayer > ORIG_FLASH rm flashplayer fi wget http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11… if tar xvf flashplayer_11_sa.$arch.tar.gz | grep -q -F install_flash_player_linux_sa/flashplayer ; then md5sum install_flash_player_linux_sa/flashplayer > NEW_FLASH else md5sum flashplayer > NEW_FLASH fi if cmp -s ORIG_FLASH NEW_FLASH; then echo "no new update available" else echo "*** NEW flashplayer UPDATE AVAILABLE!" if test -f install_flash_player_linux_sa/flashplayer ; then version=$(strings install_flash_player_linux_sa/flashplayer | grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g') else version=$(strings flashplayer | grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g') fi echo "new version is $version" mv flashplayer_11_sa.$arch.tar.gz flashplayer_${version}_sa.$arch.tar.gz mv flashplayer_${version}_sa.$arch.tar.gz .. fi done popd &>/dev/null rm -rf $t -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flash-player for openSUSE:12.3:NonFree:Update
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package flash-player for openSUSE:12.3:NonFree:Update checked in at 2014-09-10 16:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:NonFree:Update/flash-player (Old) and /work/SRC/openSUSE:12.3:NonFree:Update/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.G5b0iD/_old 2014-09-10 16:51:25.000000000 +0200 +++ /var/tmp/diff_new_pack.G5b0iD/_new 2014-09-10 16:51:25.000000000 +0200 @@ -1 +1 @@ -<link package='flash-player.2955' cicount='copy' /> +<link package='flash-player.2996' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net-snmp for openSUSE:13.1:Update
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package net-snmp for openSUSE:13.1:Update checked in at 2014-09-10 10:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/net-snmp (Old) and /work/SRC/openSUSE:13.1:Update/.net-snmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "net-snmp" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.fd9GzF/_old 2014-09-10 10:31:23.000000000 +0200 +++ /var/tmp/diff_new_pack.fd9GzF/_new 2014-09-10 10:31:23.000000000 +0200 @@ -1 +1 @@ -<link package='net-snmp.2637' cicount='copy' /> +<link package='net-snmp.2983' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net-snmp for openSUSE:12.3:Update
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package net-snmp for openSUSE:12.3:Update checked in at 2014-09-10 10:31:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/net-snmp (Old) and /work/SRC/openSUSE:12.3:Update/.net-snmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "net-snmp" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.uZyoJy/_old 2014-09-10 10:31:20.000000000 +0200 +++ /var/tmp/diff_new_pack.uZyoJy/_new 2014-09-10 10:31:20.000000000 +0200 @@ -1 +1 @@ -<link package='net-snmp.2637' cicount='copy' /> +<link package='net-snmp.2983' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net-snmp.2983 for openSUSE:12.3:Update
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package net-snmp.2983 for openSUSE:12.3:Update checked in at 2014-09-10 10:31:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/net-snmp.2983 (Old) and /work/SRC/openSUSE:12.3:Update/.net-snmp.2983.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "net-snmp.2983" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:12.3:Update/.net-snmp.2983.new/net-snmp.changes 2014-09-10 10:31:18.000000000 +0200 @@ -0,0 +1,1012 @@ +------------------------------------------------------------------- +Tue Sep 2 21:06:19 UTC 2014 - abergmann(a)suse.com + +- added net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch: + fix remote denial of service problem inside snmptrapd when started + with the "-OQ" option (CVE-2014-3565)(bnc#894361) + +------------------------------------------------------------------- +Mon Mar 10 16:00:45 UTC 2014 - abergmann(a)suse.com + +- net-snmp-5.7.2-fix-icmp-mib-table-handling.patch: fix potential + remote denial of service problem within the Linux ICMP-MIB + implementation (CVE-2014-2284)(bnc#866942) +- net-snmp-5.7.2-fix-perl-trap-handler.patch: fix potential remote + denial of service problem inside the snmptrapd Perl trap handler + (CVE-2014-2285)(bnc#866942) + +------------------------------------------------------------------- +Mon May 20 11:22:24 UTC 2013 - lchiquitto(a)suse.com + +- Disable parallelism during build. The dependencies between the + Perl module and libnetsnmp are not defined correctly and might + result in broken linkage (bnc#819497, bnc#818907) + +------------------------------------------------------------------- +Tue Dec 18 22:01:23 UTC 2012 - lchiquitto(a)suse.com + +- net-snmp-5.7.2-build-fix-for-strlcat.patch: fix exported strlcat() + prototype that could conflict with other packages (bnc#793548) + +------------------------------------------------------------------- +Wed Oct 10 18:21:19 UTC 2012 - lchiquitto(a)suse.com + +- update to version 5.7.2: several bug fixes in the agent, client + utilities and libraries. The CHANGES file shipped with the + package contains a comprehensive list of fixes and improvements +- rebase patches to apply cleanly: + * net-snmp-5.7.2-perl-tk-warning.patch + * net-snmp-5.7.2-socket-path.patch + * net-snmp-5.7.2-testing-empty-arptable.patch + * net-snmp-5.7.2-pie.patch + * net-snmp-5.7.2-velocity-mib.patch + * net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch +- remove patches that are now present in the upstream release: + * net-snmp-5.7.0-recognize-reiserfs.patch + * net-snmp-5.7.1-snmplib-zero-timeout.patch + * net-snmp-5.7.1-old-api-double-free.patch + * net-snmp-5.7.1-use-pclose-to-close-pipes.patch + * net-snmp-5.7.1-fix-handling-of-large-filesystems.patch + * net-snmp-5.7.1-snmplib-default-retries.patch + * net-snmp-5.7.1-fsys-memory-leak.patch + * net-snmp-5.7.1-adjust-copyright-in-agent-txt-file.patch + * net-snmp-5.7.1-recognize-ocfs2.patch + * net-snmp-5.7.1-properly-clean-up-old-requests-in-subagents.patch + * net-snmp-5.7.1-reduce-code-duplication-in-agentx.patch + * net-snmp-5.7.1-log-agentx-disconnections.patch + * net-snmp-5.7.1-more-robust-handling-of-agentx-errors.patch + * net-snmp-5.7.1-report-problems-with-setundo-processing.patch + * net-snmp-5.7.1-fix-array-index-error.patch + +------------------------------------------------------------------- +Fri Sep 7 17:28:00 UTC 2012 - jengelh(a)inai.de + +- Remove redundant sections from specfile +- Avoid shipping .la files + +------------------------------------------------------------------- +Mon May 14 17:39:17 UTC 2012 - lchiquitto(a)suse.com + +- fix array index error that could lead to a crash (CVE-2012-2141) + (bnc#759352) + +------------------------------------------------------------------- +Thu Mar 29 22:14:55 UTC 2012 - lchiquitto(a)suse.com + +- fix agent crash when reloading a subagent (AgentX) during a query + (bnc#670789) + +------------------------------------------------------------------- +Thu Mar 29 22:14:04 UTC 2012 - lchiquitto(a)suse.com + +- add OCFS2 to the list of known file systems + +------------------------------------------------------------------- +Thu Mar 22 11:04:08 UTC 2012 - lchiquitto(a)suse.com + +- update copyright notice of AGENT.txt allowing us to redistribute + the file in our package (from Dave Shield) (bnc#750704) + +------------------------------------------------------------------- +Wed Feb 8 06:09:32 UTC 2012 - coolo(a)suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- +Tue Nov 1 11:01:12 UTC 2011 - lchiquitto(a)suse.com + +- logrotate: use "reload" instead of "try-restart" to avoid an + unnecessary stop/start cycle in the agent (bnc#707636) + +------------------------------------------------------------------- +Fri Oct 21 12:30:29 UTC 2011 - lchiquitto(a)suse.com + +- net-snmp-5.7.1-fsys-memory-leak.patch: fix a memory leak in + agent/mibgroup/hardware/fsys (bnc#725766) +- net-snmp-5.7.1-snmplib-default-retries.patch: change default + number of retries back from 0 to 5 (bnc#725766) +- net-snmp-5.7.1-fix-handling-of-large-filesystems.patch: fix + bug in handling large (>8TB) filesystems (bnc#725766) +- net-snmp-5.7.1-use-pclose-to-close-pipes.patch: use pclose() + instead of fclose() to close a pipe (bnc#725766) +- net-snmp-5.7.1-old-api-double-free.patch: agent: avoid double + free when netsnmp_register_old_api() fails (bnc#725766) +- net-snmp-5.7.1-snmplib-zero-timeout.patch: snmplib: avoid + waiting indefinitely if a session has timeout zero (bnc#725766) + +------------------------------------------------------------------- +Thu Sep 29 00:44:40 UTC 2011 - lchiquitto(a)suse.com + +- update to version 5.7.1: minor release including some bug fixes + +------------------------------------------------------------------- +Fri Sep 16 17:24:39 UTC 2011 - jengelh(a)medozas.de + +- enable net-snmp-devel on all baselib architectures + +------------------------------------------------------------------- +Wed Sep 14 18:33:18 UTC 2011 - lchiquitto(a)suse.com + +- make sure all delegated requests are removed before closing an + AgentX session (bnc#670789) + +------------------------------------------------------------------- +Fri Sep 9 20:41:31 UTC 2011 - lchiquitto(a)suse.com + +- update to version 5.7.1.rc1 but keep package version as 5.7.1 + to avoid update problems when the final version is released + +------------------------------------------------------------------- +Fri Sep 9 20:18:31 UTC 2011 - lchiquitto(a)suse.com + +- small fixes to snmpd and snmptrapd init scripts: + - if $SNMPD_LOGLEVEL is not defined, use LOG_NOTICE instead of + LOG_DEBUG + - improve messages printed and service description + - write snmptrapd logs to /var/log/net-snmpd.log + +------------------------------------------------------------------- +Fri Sep 9 19:36:55 UTC 2011 - lchiquitto(a)suse.com + +- update README.SUSE to reflect some recent changes and drop a bit + of outdated information +- update baselibs to reflect new library version +- spec file cleanup: rename some source files for consistency + +------------------------------------------------------------------- +Thu Sep 1 12:48:57 UTC 2011 - lchiquitto(a)suse.com + +- add ReiserFS to the list of known file systems (bnc#715199) + +------------------------------------------------------------------- +Tue Aug 30 01:43:26 UTC 2011 - lchiquitto(a)suse.com + +- install snmptrapd init script by default (bnc#712175) + +------------------------------------------------------------------- +Tue Aug 30 01:37:28 UTC 2011 - lchiquitto(a)suse.com + +- fix logging option in snmptrapd init script (bnc#712174) + +------------------------------------------------------------------- +Thu Jul 14 17:46:57 UTC 2011 - lchiquitto(a)suse.com + +- update upstream patches from branch V5-7-patches to 20110714 + +------------------------------------------------------------------- +Tue Jul 5 12:28:00 UTC 2011 - lchiquitto(a)suse.com + +- update to version 5.7: + new features and lots of bug fixes +- remove patches that are no longer needed: + net-snmp-5.6.0-enable-hrh-filesys.patch + net-snmp-5.6.1-recognize-jfs-and-xfs.patch + net-snmp-5.6.1-rpm490.patch +- refresh and rename patches to apply cleanly after update: + net-snmp-5.7.0-pie.patch + net-snmp-5.7.0-velocity-mib.patch + +------------------------------------------------------------------- +Thu May 19 14:43:13 CEST 2011 - mls(a)suse.de + +- switch from rpmdb to rpmts to support rpm-4.9.0 + +------------------------------------------------------------------- +Thu May 12 14:49:34 UTC 2011 - lchiquitto(a)suse.com + +- update upstream patches from branch V5-6-patches to 20110512 ++++ 815 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.net-snmp.2983.new/net-snmp.changes New: ---- README.SUSE baselibs.conf net-snmp-5.7.2-build-fix-for-strlcat.patch net-snmp-5.7.2-fix-icmp-mib-table-handling.patch net-snmp-5.7.2-fix-perl-trap-handler.patch net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch net-snmp-5.7.2-net-snmp-config-headercheck.patch net-snmp-5.7.2-perl-tk-warning.patch net-snmp-5.7.2-pie.patch net-snmp-5.7.2-socket-path.patch net-snmp-5.7.2-testing-empty-arptable.patch net-snmp-5.7.2-velocity-mib.patch net-snmp-5.7.2.tar.bz2 net-snmp-rpmlintrc net-snmp.changes net-snmp.logrotate net-snmp.spec net-snmp.sysconfig rc.snmpd rc.snmptrapd snmpd.conf test_installed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ # # spec file for package net-snmp # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define pkg_name net-snmp %ifnarch s390 s390x %define netsnmp_with_sensors 1 %endif %define netsnmp_check 1 %define netsnmp_logfile /var/log/net-snmpd.log %define netsnmp_agentx_socket_dir_fhs /var/run/agentx %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp Version: 5.7.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel BuildRequires: rpm-devel BuildRequires: tcpd-devel %if 0%{?netsnmp_with_sensors} BuildRequires: libsensors4-devel %endif Requires: logrotate Requires: perl-SNMP = %{version} Requires: perl-TermReadKey PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig # bug437293 %ifarch ppc64 Obsoletes: net-snmp-64bit %endif # Url: http://sourceforge.net/projects/net-snmp Source: %{pkg_name}-%{version}.tar.bz2 Source1: rc.snmpd Source2: snmpd.conf Source3: README.SUSE Source4: rc.snmptrapd Source5: net-snmp.logrotate Source6: test_installed Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf Patch1: net-snmp-5.7.2-socket-path.patch Patch2: net-snmp-5.7.2-testing-empty-arptable.patch Patch3: net-snmp-5.7.2-pie.patch Patch5: net-snmp-5.7.2-net-snmp-config-headercheck.patch Patch6: net-snmp-5.7.2-perl-tk-warning.patch Patch7: net-snmp-5.7.2-velocity-mib.patch Patch8: net-snmp-5.7.2-build-fix-for-strlcat.patch Patch23: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch Patch24: net-snmp-5.7.2-fix-icmp-mib-table-handling.patch Patch25: net-snmp-5.7.2-fix-perl-trap-handler.patch Patch26: net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch # Summary: SNMP Daemon License: BSD-3-Clause and MIT Group: Productivity/Networking/Other %description Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: - An extensible agent for responding to SNMP queries including built-in support for a wide range of MIB information modules - Command-line applications to retrieve and manipulate information from SNMP-capable devices - A daemon application for receiving SNMP notifications - A library for developing new SNMP applications, with C and Perl APIs - A graphical MIB browser. This package was originally based on the CMU 2.1.2.1 snmp code. It was renamed from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to net-snmp in November 2000. Authors: -------- Wes Hardaker <hardaker(a)users.sourceforge.net> %define library_name libsnmp30 %package -n libsnmp30 Requires: perl-base = %{perl_version} Requires: snmp-mibs = %{version} # Summary: Shared Libraries from net-snmp License: BSD-3-Clause and MIT Group: Productivity/Networking/Other %description -n libsnmp30 Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: * An extensible agent for responding to SNMP queries including built-in support for a wide range of MIB information modules * Command-line applications to retrieve and manipulate information from SNMP-capable devices * A daemon application for receiving SNMP notifications * A library for developing new SNMP applications, with C and Perl APIs * A graphical MIB browser. This package holds the shared libraries from the net-snmp package. Authors: -------- Wes Hardaker <hardaker(a)users.sourceforge.net> %package devel # bug437293 %ifarch ppc64 Obsoletes: net-snmp-devel-64bit %endif # Requires: %{library_name} = %{version} # for mib2c Requires: libopenssl-devel Requires: perl Requires: perl-SNMP = %{version} Requires: rpm-devel Requires: tcpd-devel Requires: zlib-devel %if 0%{?netsnmp_with_sensors} Requires: libsensors4-devel %endif # Summary: Development files from net-snmp License: BSD-3-Clause and MIT Group: Development/Libraries/C and C++ %description devel Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: * An extensible agent for responding to SNMP queries including built-in support for a wide range of MIB information modules * Command-line applications to retrieve and manipulate information from SNMP-capable devices * A daemon application for receiving SNMP notifications * A library for developing new SNMP applications, with C and Perl APIs * A graphical MIB browser. This package holds the development headers, libraries and API documentation from the net-snmp package. Authors: -------- Wes Hardaker <hardaker(a)users.sourceforge.net> %package -n snmp-mibs # Summary: MIB files from net-snmp License: BSD-3-Clause and MIT Group: Productivity/Networking/Other %description -n snmp-mibs Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: - An extensible agent for responding to SNMP queries including built-in support for a wide range of MIB information modules - Command-line applications to retrieve and manipulate information from SNMP-capable devices - A daemon application for receiving SNMP notifications - A library for developing new SNMP applications, with C and Perl APIs - A graphical MIB browser. This package holds the MIB files from the net-snmp package. Authors: -------- Wes Hardaker <hardaker(a)users.sourceforge.net> %package -n perl-SNMP Requires: %{pkg_name} = %{version} Requires: perl-base = %{perl_version} # Summary: Perl5 SNMP Extension Module License: GPL-2.0+ Group: Development/Libraries/Perl %description -n perl-SNMP The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library. Authors: -------- G.S. Marzot <gmarzot(a)nortelnetworks.com> %prep %setup -q -n %{pkg_name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 %patch26 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \ ip-mib/ipDefaultRouterTable ip-mib/ipAddressPrefixTable \ ip-mib/ipv6ScopeZoneIndexTable ip-mib/ipIfStatsTable" %if 0%{?netsnmp_with_sensors} MIBS="$MIBS ucd-snmp/lmsensorsMib" %endif %configure \ --with-sys-contact="root@localhost" \ --with-sys-location="unknown" \ --with-mib-modules="$MIBS" \ --with-cflags="%{optflags} -fstack-protector-all" \ --with-persistent-directory="/var/lib/net-snmp" \ --with-agentx-socket="%{netsnmp_agentx_socket_dir_fhs}/master" \ --with-logfile="%{netsnmp_logfile}" \ --with-libwrap="%{_prefix}" \ --with-perl-modules="INSTALLDIRS=vendor" \ --with-defaults \ --enable-shared \ --disable-static \ --enable-as-needed \ --without-root-access \ --enable-local-smux \ --enable-ipv6 \ --enable-ucd-snmp-compatibility # Parallel building is disabled because dependencies between the Perl # module and libnetsnmp are not correctly defined. make #%{?_smp_mflags} %check %if 0%{?netsnmp_check} %ifnarch %arm ulimit -c unlimited %{__make} test ||: %{__make} test TESTOPTS='-P tcp' ||: %endif %{__make} perlmodules ||: LD_RUN_PATH="$PWD/snmplib/.libs" LD_LIBRARY_PATH="${PWD}/snmplib/.libs:${PWD}/agent/.libs:${PWD}/agent/helpers/.libs" %{__make} perltest ||: %endif %install %makeinstall INSTALL_PREFIX=%{buildroot} %{__install} -Dd %{buildroot}/var/log %{buildroot}/var/lib/net-snmp %{buildroot}/usr/lib/net-snmp/agents %{buildroot}%{netsnmp_agentx_socket_dir_fhs} %{__install} -D -m 0755 %{SOURCE1} %{buildroot}/etc/init.d/snmpd %{__install} -D -m 0755 %{SOURCE4} %{buildroot}/etc/init.d/snmptrapd %{__install} -D -m 0600 %{SOURCE2} %{buildroot}/etc/snmp/snmpd.conf %{__install} -m 0644 %{SOURCE3} . %{__install} -m 0644 %{SOURCE4} . %{__install} -D -m 0644 %{SOURCE5} %{buildroot}/etc/logrotate.d/net-snmp %{__install} -m 0744 %{SOURCE6} testing/ %{__ln_s} -f /etc/init.d/snmpd %{buildroot}%{_sbindir}/rcsnmpd %{__ln_s} -f /etc/init.d/snmptrapd %{buildroot}%{_sbindir}/rcsnmptrapd %{__install} -m 0644 /dev/null %{buildroot}%{netsnmp_logfile} pushd perl %perl_make_install %perl_process_packlist %{__rm} -f %{buildroot}/%{perl_vendorarch}/Bundle/Makefile.subs.pl popd %{__grep} -v "^#define PACKAGE" %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h > \ %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h.new %{__mv} %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h{.new,} %{__install} -D -m 0644 %{S:7} \ %{buildroot}/var/adm/fillup-templates/sysconfig.%{pkg_name} # %{__ln_s} -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc} # rm -f "%buildroot/%_libdir"/*.la %preun %stop_on_removal snmpd %post /sbin/chkconfig -c snmpd 2> /dev/null && FIRST_ARG=2 %{fillup_only} %postun %restart_on_update snmpd %restart_on_update snmptrapd %{insserv_cleanup} %post -n %{library_name} -p /sbin/ldconfig %postun -n %{library_name} -p /sbin/ldconfig %files %defattr(-,root,root) %doc AGENT.txt COPYING EXAMPLE.conf EXAMPLE.conf.def %doc FAQ NEWS TODO CHANGES %doc README README.agent-mibs README.agentx README.krb5 README.snmpv3 README.thread %dir /etc/snmp %config(noreplace) /etc/snmp/snmpd.conf %config /etc/init.d/snmpd %config /etc/init.d/snmptrapd %{_bindir}/encode_keychange %{_bindir}/fixproc %{_bindir}/ipf-mod.pl %{_bindir}/net-snmp-config %{_bindir}/snmpbulkget %{_bindir}/snmpbulkwalk %{_bindir}/snmpcheck %{_bindir}/snmpconf %{_bindir}/snmpdelta %{_bindir}/snmpdf %{_bindir}/snmpget %{_bindir}/snmpgetnext %{_bindir}/snmpinform %{_bindir}/snmpnetstat %{_bindir}/snmpset %{_bindir}/snmpstatus %{_bindir}/snmptable %{_bindir}/snmptest %{_bindir}/snmptranslate %{_bindir}/snmptrap %{_bindir}/snmpusm %{_bindir}/snmpvacm %{_bindir}/snmpwalk %{_bindir}/traptoemail %{_bindir}/net-snmp-create-v3-user %{_bindir}/net-snmp-cert %{_bindir}/agentxtrap %{_bindir}/snmp-bridge-mib %dir %{_prefix}/lib/net-snmp %dir %{_prefix}/lib/net-snmp/agents %{_mandir}/man[158]/* %{_sbindir}/* /var/lib/net-snmp %dir %ghost %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs} %ghost %{netsnmp_logfile} %config(noreplace) /etc/logrotate.d/net-snmp /var/adm/fillup-templates/sysconfig.%{pkg_name} %{netsnmp_agentx_socket_dir_rfc} %{_datadir}/snmp/snmpconf-data/ %{_datadir}/snmp/snmp_perl.pl %{_datadir}/snmp/snmp_perl_trapd.pl %files -n snmp-mibs %defattr(-,root,root) %dir %{_datadir}/snmp %{_datadir}/snmp/mibs/ %files -n %{library_name} %defattr(-,root,root) %{_libdir}/libsnmp*.so.* %{_libdir}/libnetsnmp*.so.* %files devel %defattr(-,root,root) %doc ChangeLog PORTING %{_mandir}/man3/* %{_includedir}/ucd-snmp %{_includedir}/net-snmp %{_libdir}/libsnmp*.so %{_libdir}/libnetsnmp*.so %{_bindir}/mib2c %{_bindir}/mib2c-update %{_datadir}/snmp/mib2c* %files -n perl-SNMP %defattr(-,root,root) %{perl_vendorarch}/auto/SNMP %{perl_vendorarch}/auto/NetSNMP %{perl_vendorarch}/auto/Bundle %{perl_vendorarch}/SNMP.pm %{perl_vendorarch}/NetSNMP %{_bindir}/tkmib %if 0%{?suse_version} <= 1130 /var/adm/perl-modules/net-snmp %endif %changelog ++++++ README.SUSE ++++++ An SNMP agent is a powerful and complex software and, as such, may be affected by flaws and security issues. We recommend that SNMP access (161/udp,162/udp) be blocked at your firewall. There are also some important changes that have been made in this release of our package: o the daemon now sets a PID file in /var/run/ o logging is now done directly to /var/log/net-snmpd.log instead of sending stderr/stdout through syslog. o the daemon is now started with the '-r'. This option prevents snmpd from exiting if it doesn't have permission to read something. This only occurs if you start snmpd on a high port as a non-root root user. o If you need to run snmptrapd, we've provided an init script in /etc/init.d/snmptrapd, but the service is disabled by default. SNMP traps should be avoided whenever possible because they are unreliable (you should poll with snmpget instead) and snmptrapd has been the source of many of the security problems with SNMP so please don't run this unless you are sure of what you are doing. To enable the service, run chkconfig snmptrapd on and create a configuration file named /etc/snmp/snmptrapd.conf. Then, start the daemon with rcsnmptrapd start Logging is done to /var/log/net-snmpd.log. For more information see the manpages for snmptrapd and snmptrapd.conf. o Master AgentX support is enabled if you have modules in /usr/lib/net-snmp/agents. The domain socket is created as /var/run/agentx/master. You can change this to a network interface if needed (see snmpd(1)). The snmpd init script automatically detects and starts any sub-agents in placed into /var/lib/net-snmp. More documentation on the net-snmp package can be found in this directory as well as the project's homepage: http://www.net-snmp.org/ ++++++ baselibs.conf ++++++ libsnmp30 net-snmp-devel requires -net-snmp-<targettype> requires "libsnmp30-<targettype> = <version>" ++++++ net-snmp-5.7.2-build-fix-for-strlcat.patch ++++++ commit 4a6d0378a3916571ce7604c4a3d54a8c96a8f807 Author: Bart Van Assche <bvanassche(a)acm.org> Date: Sun Oct 28 09:54:12 2012 -0700 Windows: Visual Studio 6 build fix for strlcat() Index: net-snmp-5.7.2/snmplib/strlcat.c =================================================================== --- net-snmp-5.7.2.orig/snmplib/strlcat.c +++ net-snmp-5.7.2/snmplib/strlcat.c @@ -37,7 +37,7 @@ * If retval >= siz, truncation occurred. */ size_t -strlcat(char * __restrict dst, const char * __restrict src, size_t siz) +strlcat(char *dst, const char *src, size_t siz) { char *d = dst; const char *s = src; Index: net-snmp-5.7.2/include/net-snmp/library/system.h =================================================================== --- net-snmp-5.7.2.orig/include/net-snmp/library/system.h +++ net-snmp-5.7.2/include/net-snmp/library/system.h @@ -196,8 +196,7 @@ SOFTWARE. #endif #ifndef HAVE_STRLCAT NETSNMP_IMPORT - size_t strlcat(char * __restrict, const char * __restrict, - size_t); + size_t strlcat(char *, const char *, size_t); #endif int netsnmp_os_prematch(const char *ospmname, ++++++ net-snmp-5.7.2-fix-icmp-mib-table-handling.patch ++++++ commit a1fd64716f6794c55c34d77e618210238a73bfa1 Author: Wes Hardaker <hardaker(a)users.sourceforge.net> Date: Wed Feb 19 15:21:57 2014 -0800 bug fix from fenner: fix ICMP mib table handling on linux diff --git a/agent/mibgroup/mibII/icmp.c b/agent/mibgroup/mibII/icmp.c index af63395..e43380a 100644 --- a/agent/mibgroup/mibII/icmp.c +++ b/agent/mibgroup/mibII/icmp.c @@ -103,10 +103,20 @@ struct icmp_msg_stats_table_entry { int flags; }; +#ifdef linux +/* Linux keeps track of all possible message types */ +#define ICMP_MSG_STATS_IPV4_COUNT 256 +#else #define ICMP_MSG_STATS_IPV4_COUNT 11 +#endif #ifdef NETSNMP_ENABLE_IPV6 +#ifdef linux +/* Linux keeps track of all possible message types */ +#define ICMP_MSG_STATS_IPV6_COUNT 256 +#else #define ICMP_MSG_STATS_IPV6_COUNT 14 +#endif #else #define ICMP_MSG_STATS_IPV6_COUNT 0 #endif /* NETSNMP_ENABLE_IPV6 */ @@ -172,7 +182,7 @@ icmp_msg_stats_load(netsnmp_cache *cache, void *vmagic) inc = 0; linux_read_icmp_msg_stat(&v4icmp, &v4icmpmsg, &flag); if (flag) { - while (254 != k) { + while (255 >= k) { if (v4icmpmsg.vals[k].InType) { icmp_msg_stats_table[i].ipVer = 1; icmp_msg_stats_table[i].icmpMsgStatsType = k; @@ -262,7 +272,7 @@ icmp_msg_stats_load(netsnmp_cache *cache, void *vmagic) inc = 0; linux_read_icmp6_msg_stat(&v6icmp, &v6icmpmsg, &flag); if (flag) { - while (254 != k) { + while (255 >= k) { if (v6icmpmsg.vals[k].InType) { icmp_msg_stats_table[i].ipVer = 2; icmp_msg_stats_table[i].icmpMsgStatsType = k; @@ -1059,6 +1069,12 @@ icmp_stats_table_handler(netsnmp_mib_handler *handler, continue; table_info = netsnmp_extract_table_info(request); subid = table_info->colnum; + DEBUGMSGTL(( "mibII/icmpStatsTable", "oid: " )); + DEBUGMSGOID(( "mibII/icmpStatsTable", request->requestvb->name, + request->requestvb->name_length )); + DEBUGMSG(( "mibII/icmpStatsTable", " In %d InErr %d Out %d OutErr %d\n", + entry->icmpStatsInMsgs, entry->icmpStatsInErrors, + entry->icmpStatsOutMsgs, entry->icmpStatsOutErrors )); switch (subid) { case ICMP_STAT_INMSG: @@ -1124,6 +1140,11 @@ icmp_msg_stats_table_handler(netsnmp_mib_handler *handler, continue; table_info = netsnmp_extract_table_info(request); subid = table_info->colnum; + DEBUGMSGTL(( "mibII/icmpMsgStatsTable", "oid: " )); + DEBUGMSGOID(( "mibII/icmpMsgStatsTable", request->requestvb->name, + request->requestvb->name_length )); + DEBUGMSG(( "mibII/icmpMsgStatsTable", " In %d Out %d Flags 0x%x\n", + entry->icmpMsgStatsInPkts, entry->icmpMsgStatsOutPkts, entry->flags )); switch (subid) { case ICMP_MSG_STAT_IN_PKTS: diff --git a/agent/mibgroup/mibII/kernel_linux.c b/agent/mibgroup/mibII/kernel_linux.c index 397365c..26b899c 100644 --- a/agent/mibgroup/mibII/kernel_linux.c +++ b/agent/mibgroup/mibII/kernel_linux.c @@ -76,9 +76,9 @@ decode_icmp_msg(char *line, char *data, struct icmp4_msg_mib *msg) index = strtol(token, &delim, 0); if (ERANGE == errno) { continue; - } else if (index > LONG_MAX) { + } else if (index > 255) { continue; - } else if (index < LONG_MIN) { + } else if (index < 0) { continue; } if (NULL == (token = strtok_r(dataptr, " ", &saveptr1))) @@ -89,9 +89,9 @@ decode_icmp_msg(char *line, char *data, struct icmp4_msg_mib *msg) index = strtol(token, &delim, 0); if (ERANGE == errno) { continue; - } else if (index > LONG_MAX) { + } else if (index > 255) { continue; - } else if (index < LONG_MIN) { + } else if (index < 0) { continue; } if(NULL == (token = strtok_r(dataptr, " ", &saveptr1))) @@ -419,14 +419,21 @@ linux_read_icmp6_parse(struct icmp6_mib *icmp6stat, vals = name; if (NULL != icmp6msgstat) { + int type; if (0 == strncmp(name, "Icmp6OutType", 12)) { strsep(&vals, "e"); - icmp6msgstat->vals[atoi(vals)].OutType = stats; + type = atoi(vals); + if ( type < 0 || type > 255 ) + continue; + icmp6msgstat->vals[type].OutType = stats; *support = 1; continue; } else if (0 == strncmp(name, "Icmp6InType", 11)) { strsep(&vals, "e"); - icmp6msgstat->vals[atoi(vals)].InType = stats; + type = atoi(vals); + if ( type < 0 || type > 255 ) + continue; + icmp6msgstat->vals[type].InType = stats; *support = 1; continue; } diff --git a/agent/mibgroup/mibII/kernel_linux.h b/agent/mibgroup/mibII/kernel_linux.h index 6bf5d47..c6dfca9 100644 --- a/agent/mibgroup/mibII/kernel_linux.h +++ b/agent/mibgroup/mibII/kernel_linux.h @@ -121,11 +121,11 @@ struct icmp_msg_mib { /* Lets use wrapper structures for future expansion */ struct icmp4_msg_mib { - struct icmp_msg_mib vals[255]; + struct icmp_msg_mib vals[256]; }; struct icmp6_msg_mib { - struct icmp_msg_mib vals[255]; + struct icmp_msg_mib vals[256]; }; struct udp_mib { ++++++ net-snmp-5.7.2-fix-perl-trap-handler.patch ++++++ commit 76e8d6d100320629d8a23be4b0128619600c919d Author: Jan Safranek <jsafranek(a)users.sourceforge.net> Date: Thu Mar 6 09:21:51 2014 +0100 CHANGES: snmpd: PATCH: 1275: from Viliam Púčik: fixed Perl trap handler when processing trap with empty community string. diff --git a/perl/TrapReceiver/TrapReceiver.xs b/perl/TrapReceiver/TrapReceiver.xs index e11ef27..8713efd 100644 --- a/perl/TrapReceiver/TrapReceiver.xs +++ b/perl/TrapReceiver/TrapReceiver.xs @@ -81,18 +81,18 @@ int perl_trapd_handler( netsnmp_pdu *pdu, STOREPDUi("securitymodel", pdu->securityModel); STOREPDUi("securitylevel", pdu->securityLevel); STOREPDU("contextName", - newSVpv(pdu->contextName, pdu->contextNameLen)); + newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen)); STOREPDU("contextEngineID", - newSVpv((char *) pdu->contextEngineID, + newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "", pdu->contextEngineIDLen)); STOREPDU("securityEngineID", - newSVpv((char *) pdu->securityEngineID, + newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "", pdu->securityEngineIDLen)); STOREPDU("securityName", - newSVpv((char *) pdu->securityName, pdu->securityNameLen)); + newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen)); } else { STOREPDU("community", - newSVpv((char *) pdu->community, pdu->community_len)); + newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len)); } if (transport && transport->f_fmtaddr) { ++++++ net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch ++++++ commit f9304c83f76202db0e684269ca1af32e43cd9db4 Author: Jan Safranek <jsafranek(a)users.sourceforge.net> Date: Tue Feb 7 14:53:44 2012 +0100 CHANGES: PATCH 1633670: fixed snmpd crashing when an AgentX subagent disconnect in the middle of processing of a request. I fixed also the memory leak reported in the tracker comments. Index: net-snmp-5.7.2/agent/mibgroup/agentx/master.c =================================================================== --- net-snmp-5.7.2.orig/agent/mibgroup/agentx/master.c +++ net-snmp-5.7.2/agent/mibgroup/agentx/master.c @@ -219,6 +219,9 @@ agentx_got_response(int operation, if (!cache) { DEBUGMSGTL(("agentx/master", "response too late on session %8p\n", session)); + /* response is too late, free the cache */ + if (magic) + netsnmp_free_delegated_cache((netsnmp_delegated_cache*) magic); return 0; } requests = cache->requests; @@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handle result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data); if (result == 0) { snmp_free_pdu(pdu); + if (cb_data) + netsnmp_free_delegated_cache((netsnmp_delegated_cache*) cb_data); } return SNMP_ERR_NOERROR; Index: net-snmp-5.7.2/agent/mibgroup/agentx/master_admin.c =================================================================== --- net-snmp-5.7.2.orig/agent/mibgroup/agentx/master_admin.c +++ net-snmp-5.7.2/agent/mibgroup/agentx/master_admin.c @@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * s * requests, so that the delegated request will be completed and * further requests can be processed */ - netsnmp_remove_delegated_requests_for_session(session); + while (netsnmp_remove_delegated_requests_for_session(session)) { + DEBUGMSGTL(("agentx/master", "Continue removing delegated reqests\n")); + } + if (session->subsession != NULL) { netsnmp_session *subsession = session->subsession; for(; subsession; subsession = subsession->next) { - netsnmp_remove_delegated_requests_for_session(subsession); + while (netsnmp_remove_delegated_requests_for_session(subsession)) { + DEBUGMSGTL(("agentx/master", "Continue removing delegated subsession reqests\n")); + } } } ++++++ net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch ++++++ commit 74ab608f60fe6130e6e1eb37b29b0efe9c9c2293 Author: Jan Safranek <jsafranek(a)users.sourceforge.net> Date: Thu Jul 31 13:46:49 2014 +0200 Added checks for printing variables with wrong types. When -OQ command line argument is used, variable formatter preffers the type of the varible parsed from a MIB file instead of checking type of the variable as parsed from SNMP message. This can lead to crashes when incoming packets contains a variable with NULL type, while the MIB says the variable should be non-NULL, like Integer. The formatter then tries to interpret the NULL (from packet) as Integer (from MIB file). diff --git a/snmplib/mib.c b/snmplib/mib.c index 9d3ca41..c6e0010 100644 --- a/snmplib/mib.c +++ b/snmplib/mib.c @@ -439,17 +439,16 @@ sprint_realloc_octet_string(u_char ** buf, size_t * buf_len, u_char *cp; int output_format, cnt; - if ((var->type != ASN_OCTET_STR) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - const char str[] = "Wrong Type (should be OCTET STRING): "; - if (snmp_cstrcat - (buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OCTET_STR) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + const char str[] = "Wrong Type (should be OCTET STRING): "; + if (!snmp_cstrcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } @@ -702,16 +701,16 @@ sprint_realloc_float(u_char ** buf, size_t * buf_len, const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_OPAQUE_FLOAT) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Float): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OPAQUE_FLOAT) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Float): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -772,17 +771,16 @@ sprint_realloc_double(u_char ** buf, size_t * buf_len, const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_OPAQUE_DOUBLE) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat - (buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Double): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OPAQUE_DOUBLE) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Double): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -847,20 +845,21 @@ sprint_realloc_counter64(u_char ** buf, size_t * buf_len, size_t * out_len, { char a64buf[I64CHARSZ + 1]; - if ((var->type != ASN_COUNTER64 + if (var->type != ASN_COUNTER64 #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES && var->type != ASN_OPAQUE_COUNTER64 && var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_U64 #endif - ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Counter64): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + ) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Counter64): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -948,23 +947,25 @@ sprint_realloc_opaque(u_char ** buf, size_t * buf_len, const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_OPAQUE + if (var->type != ASN_OPAQUE #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES && var->type != ASN_OPAQUE_COUNTER64 && var->type != ASN_OPAQUE_U64 && var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_FLOAT && var->type != ASN_OPAQUE_DOUBLE #endif /* NETSNMP_WITH_OPAQUE_SPECIAL_TYPES */ - ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Opaque): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + ) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Opaque): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } + #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES switch (var->type) { case ASN_OPAQUE_COUNTER64: @@ -1040,17 +1041,16 @@ sprint_realloc_object_identifier(u_char ** buf, size_t * buf_len, { int buf_overflow = 0; - if ((var->type != ASN_OBJECT_ID) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = - "Wrong Type (should be OBJECT IDENTIFIER): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OBJECT_ID) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be OBJECT IDENTIFIER): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1110,16 +1110,16 @@ sprint_realloc_timeticks(u_char ** buf, size_t * buf_len, size_t * out_len, { char timebuf[40]; - if ((var->type != ASN_TIMETICKS) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be Timeticks): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_TIMETICKS) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Timeticks): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_NUMERIC_TIMETICKS)) { @@ -1277,17 +1277,18 @@ sprint_realloc_integer(u_char ** buf, size_t * buf_len, size_t * out_len, { char *enum_string = NULL; - if ((var->type != ASN_INTEGER) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be INTEGER): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_INTEGER) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be INTEGER): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } + for (; enums; enums = enums->next) { if (enums->value == *var->val.integer) { enum_string = enums->label; @@ -1380,16 +1381,16 @@ sprint_realloc_uinteger(u_char ** buf, size_t * buf_len, size_t * out_len, { char *enum_string = NULL; - if ((var->type != ASN_UINTEGER) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be UInteger32): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_UINTEGER) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be UInteger32): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } for (; enums; enums = enums->next) { @@ -1477,17 +1478,16 @@ sprint_realloc_gauge(u_char ** buf, size_t * buf_len, size_t * out_len, { char tmp[32]; - if ((var->type != ASN_GAUGE) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = - "Wrong Type (should be Gauge32 or Unsigned32): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_GAUGE) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Gauge32 or Unsigned32): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1550,16 +1550,16 @@ sprint_realloc_counter(u_char ** buf, size_t * buf_len, size_t * out_len, { char tmp[32]; - if ((var->type != ASN_COUNTER) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be Counter32): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_COUNTER) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Counter32): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1613,16 +1613,16 @@ sprint_realloc_networkaddress(u_char ** buf, size_t * buf_len, { size_t i; - if ((var->type != ASN_IPADDRESS) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be NetworkAddress): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_IPADDRESS) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be NetworkAddress): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1679,16 +1679,16 @@ sprint_realloc_ipaddress(u_char ** buf, size_t * buf_len, size_t * out_len, { u_char *ip = var->val.string; - if ((var->type != ASN_IPADDRESS) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be IpAddress): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_IPADDRESS) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be IpAddress): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1737,20 +1737,20 @@ sprint_realloc_null(u_char ** buf, size_t * buf_len, size_t * out_len, const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_NULL) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be NULL): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_NULL) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be NULL): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } - } else { - u_char str[] = "NULL"; - return snmp_strcat(buf, buf_len, out_len, allow_realloc, str); } + + u_char str[] = "NULL"; + return snmp_strcat(buf, buf_len, out_len, allow_realloc, str); } @@ -1785,16 +1785,16 @@ sprint_realloc_bitstring(u_char ** buf, size_t * buf_len, size_t * out_len, u_char *cp; char *enum_string; - if ((var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be BITS): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be BITS): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1869,16 +1869,16 @@ sprint_realloc_nsapaddress(u_char ** buf, size_t * buf_len, const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_NSAP) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be NsapAddress): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_NSAP) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be NsapAddress): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { ++++++ net-snmp-5.7.2-net-snmp-config-headercheck.patch ++++++ Index: net-snmp-5.7.2/net-snmp-config.in =================================================================== --- net-snmp-5.7.2.orig/net-snmp-config.in +++ net-snmp-5.7.2/net-snmp-config.in @@ -41,6 +41,14 @@ count() echo $# } +check_devel_files() +{ + if [ ! -e "${NSC_INCDIR}/net-snmp/net-snmp-config.h" ] ; then + echo "Can not find \"${NSC_INCDIR}/net-snmp/net-snmp-config.h\". The net-snmp development files seems to be missing. Exiting" >&2 + # exit 2 + fi +} + prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ @@ -138,9 +146,11 @@ else ;; #################################################### compile --base-cflags) + check_devel_files echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR} ;; --cflags|--cf*) + check_devel_files echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR} ;; --srcdir) @@ -151,6 +161,7 @@ else echo $NSC_LIBDIR ;; --ldflags|--ld*) + check_devel_files echo $NSC_LDFLAGS ;; --build-lib-dirs) @@ -188,29 +199,37 @@ else #################################################### client lib --libs) # use this one == --netsnmp-libs + --external-libs + check_devel_files echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS ;; --netsnmp-libs) + check_devel_files echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS ;; --external-libs) + check_devel_files echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ ;; #################################################### agent lib --base-agent-libs) + check_devel_files echo $NSC_BASE_AGENT_LIBS ;; --base-subagent-libs) + check_devel_files echo $NSC_BASE_SUBAGENT_LIBS ;; --agent-libs) # use this one == --netsnmp-agent-libs + --external-libs + check_devel_files echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS ;; --netsnmp-agent-libs) + check_devel_files echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS ;; --external-agent-libs) + check_devel_files echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS ;; #################################################### @@ -236,6 +255,7 @@ else #################################################### --compile-subagent) + check_devel_files shift shifted=1 while test "x$done" = "x" -a "x$1" != "x" ; do ++++++ net-snmp-5.7.2-perl-tk-warning.patch ++++++ Index: net-snmp-5.7.2/local/tkmib =================================================================== --- net-snmp-5.7.2.orig/local/tkmib +++ net-snmp-5.7.2/local/tkmib @@ -27,10 +27,9 @@ instructions. if (!$havetk) { print " -ERROR: You don't have the Tk module installed. You should be able to -install this by running (as root): +ERROR: You don't have the Tk module installed. - perl -MCPAN -e 'install Tk' + Please install the perl-Tk package. "; } ++++++ net-snmp-5.7.2-pie.patch ++++++ Index: net-snmp-5.7.2/agent/Makefile.in =================================================================== --- net-snmp-5.7.2.orig/agent/Makefile.in +++ net-snmp-5.7.2/agent/Makefile.in @@ -294,7 +294,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) - $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} + $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@ Index: net-snmp-5.7.2/apps/Makefile.in =================================================================== --- net-snmp-5.7.2.orig/apps/Makefile.in +++ net-snmp-5.7.2/apps/Makefile.in @@ -170,7 +170,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) - $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} + $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++++++ net-snmp-5.7.2-socket-path.patch ++++++ Index: net-snmp-5.7.2/agent/mibgroup/agentx/protocol.h =================================================================== --- net-snmp-5.7.2.orig/agent/mibgroup/agentx/protocol.h +++ net-snmp-5.7.2/agent/mibgroup/agentx/protocol.h @@ -13,7 +13,7 @@ extern "C" { #define AGENTX_PORT 705 #ifndef NETSNMP_AGENTX_SOCKET -#define NETSNMP_AGENTX_SOCKET "/var/agentx/master" +#define NETSNMP_AGENTX_SOCKET "/var/run/agentx/master" #endif /* ++++++ net-snmp-5.7.2-testing-empty-arptable.patch ++++++ Index: net-snmp-5.7.2/testing/rfc1213/snmpfun.sh =================================================================== --- net-snmp-5.7.2.orig/testing/rfc1213/snmpfun.sh +++ net-snmp-5.7.2/testing/rfc1213/snmpfun.sh @@ -1,4 +1,3 @@ - # functions used by RFC-1213 MIB test modules myport=$SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT @@ -11,6 +10,23 @@ else TEST_AUTHPRIV_PARMS="-l authNoPriv -a MD5 -A testpass" fi +check_skip_arp_tests () +{ + # + # skip all tests relying on a filed arp table. e.g. on s390 boxes this + # does not have to be the case + # + TABLE_ENTRIES="at.atTable ip.ipNetToMediaTable" + ARP_COUNT=`/sbin/arp | grep -v incomplete | wc -l` + for entry in $TABLE_ENTRIES ; do + if [ "x$1" == "x$entry" -a $ARP_COUNT == 0 ] ; then + echo "skipping $1, because the arp table is empty." >&2 + return 0 + fi + done + return 1 +} + config() { rm -f $SNMP_CONFIG_FILE @@ -54,25 +70,35 @@ get_snmpv3_variable() get_snmp_table() { test_start "Access table $2 by SNMPv$1..." - CAPTURE "snmpgetnext -Of -v $1 -c test $myport $2" - CHECKFILE '' "\.$2\." - if [ "$snmp_last_test_result" = 0 ] ; then - test_finish FAIL + check_skip_arp_tests + if check_skip_arp_tests "$2" ; then + test_finish SKIPPED else - test_finish PASS + CAPTURE "snmpgetnext -Of -v $1 -c test $myport $2" + CHECKFILE '' "\.$2\." + if [ "$snmp_last_test_result" = 0 ] ; then + test_finish FAIL + else + test_finish PASS + fi fi } get_snmpv3_table() { - test_start "Access table $2 by SNMPv3..." - CAPTURE "snmpgetnext -Of -v 3 -u testrwuser $TEST_AUTHPRIV_PARMS $myport $2" - CHECKFILE '' "\.$2\." - if [ "$snmp_last_test_result" = 0 ] ; then - test_finish FAIL + test_start "Access table $2 by SNMPv3..." + if check_skip_arp_tests "$2" ; then + test_finish SKIPPED else - test_finish PASS + CAPTURE "snmpgetnext -Of -v 3 -u testrwuser $TEST_AUTHPRIV_PARMS $myport $2" + CHECKFILE '' "\.$2\." + if [ "$snmp_last_test_result" = 0 ] ; then + test_finish FAIL + else + test_finish PASS + fi fi } + Index: net-snmp-5.7.2/testing/rfc1213/test_fun =================================================================== --- net-snmp-5.7.2.orig/testing/rfc1213/test_fun +++ net-snmp-5.7.2/testing/rfc1213/test_fun @@ -51,6 +51,9 @@ test_finish() if [ x$1 == x"PASS" ];then pass_num=`expr $pass_num + 1` pass_info "PASS\n" + elif [ x$1 == x"SKIPPED" ];then + pass_num=`expr $pass_num + 1` + pass_info "SKIPPED\n" else fail_num=`expr $fail_num + 1` fail_info "FAIL\n" @@ -66,3 +69,4 @@ summary() fi } + ++++++ net-snmp-5.7.2-velocity-mib.patch ++++++ ++++ 3373 lines (skipped) ++++++ net-snmp-rpmlintrc ++++++ addFilter("net-snmp-devel.* files-duplicate.*man.*") addFilter("net-snmp.*incoherent-init-script-name") addFilter("perl-SNMP.* zero-length.*\.bs") ++++++ net-snmp.logrotate ++++++ /var/log/net-snmpd.log { compress dateext maxage 365 rotate 99 size=+1024k notifempty missingok create 600 root root sharedscripts postrotate /etc/init.d/snmpd reload ||: if [ -x /etc/init.d/snmptrapd ] ; then \ /etc/init.d/snmptrapd reload ||: ; \ fi endscript } ++++++ net-snmp.sysconfig ++++++ ## Path: System/Net-SNMP ## Description: Log level of the snmp server. ## Type: string(!,a,c,e,w,n,i,d,0,1,2,3,4,5,6,7) ## Default: n # # Defines the log level for snmpd. # # The default is "n" (5, LOG_NOTICE) # SNMPD_LOGLEVEL="n" ## Path: System/Net-SNMP ## Description: En-/Disables SNMP SMUX support. ## Type: yesno ## Default: yes # # Setting this to "no" prevents snmpd from binding to TCP port 199. # # The default is "yes" to provide backward compatibility. # SNMPD_USE_SMUX="yes" ## Path: System/Net-SNMP ## Description: Connection logging. ## Type: yesno ## Default: yes # # If this setting is "yes" and $SNMPD_LOGLEVEL is set to "i" (LOG_INFO) # or "d" (LOG_DEBUG), snmpd will log all successful connections. # # Setting it to "no" will prevent this kind of log regardless of the # configured log level. # # The default is "yes" to provide backward compatibility. # SNMPD_LOG_SUCCESSFUL_CONNECTIONS="yes" ++++++ rc.snmpd ++++++ #! /bin/sh # Copyright (c) 1996-2011 SuSE GmbH Nuernberg, Germany. All rights reserved. # # Author: Christopher Mahmood, Remo Behn # # /etc/init.d/snmpd # ### BEGIN INIT INFO # Provides: net-snmp snmp # Required-Start: $remote_fs # Should-Start: $syslog $network # Required-Stop: $remote_fs # Should-Stop: $syslog $network # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: Net-SNMP agent # Short-Description: Net-SNMP agent ### END INIT INFO SNMPD=/usr/sbin/snmpd AGENTDIR=/usr/lib/net-snmp/agents SNMPDCONF=/etc/snmp/snmpd.conf SNMPD_PID=/var/run/snmpd.pid test -x $SNMPD || exit 5 # Check for existence of needed config file and read it SNMPD_CONFIG=/etc/sysconfig/net-snmp test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $SNMPD_CONFIG # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. # check whether to enable agentx support and get list of installed # agents get_agents() { agents= agentargs='' for agent in $AGENTDIR/*; do test -x $agent || continue agents="$agents $agent" agentargs="-x /var/run/agentx/master" done } case "$1" in start) echo -n "Starting snmpd" # # do not even try to start if the log file is (2GB-1MB) big. # the snmpd doesnt handle LFS properly # SNMPD_LOGFILE="${SNMPD_LOGFILE:-/var/log/net-snmpd.log}" if [ -e "$SNMPD_LOGFILE" ] ; then SNMPD_SIZE_LOGFILE="$(stat -c "%s" $SNMPD_LOGFILE)" SNMPD_SIZE_MAX="1073741824" if [ $SNMPD_SIZE_LOGFILE -gt $SNMPD_SIZE_MAX ] ; then echo -e "\n\"$SNMPD_LOGFILE\" is too large. Running 'logrotate' for net-snmp." >&2 /usr/sbin/logrotate /etc/logrotate.d/net-snmp fi fi get_agents # Don't add -c /etc/snmp/snmpd.conf, as it is loaded by default. if [ $SNMPDCONF = "/etc/snmp/snmpd.conf" ]; then SNMPDCONF="" else SNMPDCONF="-c $SNMPDCONF" fi case "${SNMPD_USE_SMUX:-yes}" in [Nn][Oo]) SNMPDNOSMUX="-I -smux" ;; esac case "${SNMPD_LOG_SUCCESSFUL_CONNECTIONS:-yes}" in [Nn][Oo]) SNMPDNOTCPWRAPPERLOG="--dontLogTCPWrappersConnects" ;; esac # /var/run can now be mounted as tmpfs if [ ! -d /var/run/agentx ]; then mkdir -m 0700 /var/run/agentx fi startproc $SNMPD $SNMPDCONF -r -A -LF ${SNMPD_LOGLEVEL:-n} $SNMPD_LOGFILE -p $SNMPD_PID $agentargs $SNMPDNOSMUX $SNMPDNOTCPWRAPPERLOG rc_status -v rc_reset # start all agents if test -n "$agents"; then usleep 300000 for agent in $agents; do echo -en "\tStarting `basename $agent`" startproc -t1 $agent rc_status -v ; rc_reset done fi ;; stop) echo -n "Shutting down snmpd:" killproc -TERM $SNMPD rc_status -v ; rc_reset # we also need to make sure all agents die if test -n "$agents"; then for agent in $AGENTDIR/*; do test -x $agent || continue echo -ne "\tShutting down `basename $agent`:" killproc $agent rc_status -v ; rc_reset done fi ;; try-restart) $0 status >/dev/null && $0 restart rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) echo -n "Reload service snmpd:" killproc -HUP $SNMPD rc_status -v ;; reload) echo -n "Reload service snmpd:" killproc -HUP $SNMPD rc_status -v ;; status) echo -n "Checking for service snmpd:" checkproc $SNMPD rc_status -v get_agents if test -n "$agents"; then echo -e "Checking for agents:" for agent in $agents; do echo -en "\t`basename $agent`" checkproc $agent rc_status -v done fi ;; *) echo "Usage: $0 {start|stop|try-restart|restart|force-reload|reload|status}" exit 1 ;; esac rc_exit ++++++ rc.snmptrapd ++++++ #! /bin/sh # Copyright (c) 1996-2011 SuSE GmbH Nuernberg, Germany. All rights reserved. # # Author: Christopher Mahmood # # /etc/init.d/snmptrapd # ### BEGIN INIT INFO # Provides: snmptrapd # Required-Start: $network # Required-Stop: $network # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: Receive and log SNMP trap messages # Short-Description: Receive and log SNMP trap messages ### END INIT INFO SNMPTRAPD=/usr/sbin/snmptrapd SNMPTRAPD_CONF="/etc/snmp/snmptrapd.conf" SNMPTRAPD_LOGFILE="/var/log/net-snmpd.log" SNMPTRAPD_PID="/var/run/snmptrapd.pid" test -x $SNMPTRAPD || exit 5 # Check for existence of needed config file and read it SNMPD_CONFIG=/etc/sysconfig/net-snmp test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG doesn't exist."; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $SNMPD_CONFIG # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. if [ $SNMPTRAPD_CONF = "/etc/snmp/snmptrapd.conf" ]; then SNMPTRAPD_CONF="" else SNMPTRAPD_CONF="-c $SNMPTRAPD_CONF" fi SNMPTRAPD_LOGFILE="${SNMPTRAPD_LOGFILE:-/var/log/net-snmpd.log}" case "$1" in start) echo -n "Starting snmptrapd:" startproc $SNMPTRAPD $SNMPTRAPD_CONF -A -LF ${SNMPD_LOGLEVEL:-n} $SNMPTRAPD_LOGFILE -p $SNMPTRAPD_PID rc_status -v ;; stop) echo -n "Shutting down snmptrapd:" killproc -TERM $SNMPTRAPD rc_status -v ;; try-restart) $0 status >/dev/null && $0 restart rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) echo -n "Reload service snmptrapd:" killproc -HUP $SNMPTRAPD rc_status -v ;; reload) echo -n "Reload service snmptrapd:" killproc -HUP $SNMPTRAPD rc_status -v ;; status) echo -n "Checking for service snmptrapd:" checkproc $SNMPTRAPD rc_status -v ;; *) echo "Usage: $0 {start|stop|try-restart|restart|force-reload|reload|status}" exit 1 ;; esac rc_exit ++++++ snmpd.conf ++++++ # Please see /usr/share/doc/packages/net-snmp/EXAMPLE.conf for a # more complete example and snmpd.conf(5). # # Writing is disabled by default for security reasons. If you'd like # to enable it uncomment the rwcommunity line and change the community # name to something nominally secure (keeping in mind that this is # transmitted in clear text). # don't use ' < > in strings for syslocation or syscontact # Note that if you define the following here you won't be able to change # them with snmpset syslocation Server Room syscontact Sysadmin (root@localhost) # These really aren't meant for production use. They include all MIBS # and can use considerable resources. See snmpd.conf(5) for information # on setting up groups and limiting MIBS. rocommunity public 127.0.0.1 # rwcommunity mysecret 127.0.0.1 ++++++ test_installed ++++++ #!/bin/bash # # ckm(a)suse.com # runs the test suite on the installed package instead of in the build # tree, really only useful for QA base=/usr/share/doc/packages/net-snmp/testing export PATH="/bin:/usr/bin:/sbin:/usr/sbin:${base}" export MIBDIRS=/usr/share/snmp/mibs rcsnmpd stop &>/dev/null cd ${base} || exit 1 RUNTESTS -a -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt-python for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package libvirt-python for openSUSE:Factory checked in at 2014-09-10 07:28:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt-python (Old) and /work/SRC/openSUSE:Factory/.libvirt-python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt-python" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt-python/libvirt-python.changes 2014-08-13 17:08:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt-python.new/libvirt-python.changes 2014-09-10 10:20:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 2 09:28:25 MDT 2014 - jfehlig(a)suse.com + +- Update to 1.2.8 + - Add all new APIs and constants in libvirt 1.2.8 + +------------------------------------------------------------------- Old: ---- libvirt-python-1.2.7.tar.bz2 New: ---- libvirt-python-1.2.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-python.spec ++++++ --- /var/tmp/diff_new_pack.yWsF2F/_old 2014-09-10 10:20:02.000000000 +0200 +++ /var/tmp/diff_new_pack.yWsF2F/_new 2014-09-10 10:20:02.000000000 +0200 @@ -18,7 +18,7 @@ Name: libvirt-python Url: http://libvirt.org/ -Version: 1.2.7 +Version: 1.2.8 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ ++++++ libvirt-python-1.2.7.tar.bz2 -> libvirt-python-1.2.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/AUTHORS new/libvirt-python-1.2.8/AUTHORS --- old/libvirt-python-1.2.7/AUTHORS 2014-08-05 09:36:12.000000000 +0200 +++ new/libvirt-python-1.2.8/AUTHORS 2014-09-02 09:38:01.000000000 +0200 @@ -350,6 +350,8 @@ Eric Blake <eblake(a)redhat.com> Eric Blake <eblake(a)redhat.com> Eric Blake <eblake(a)redhat.com> + Eric Blake <eblake(a)redhat.com> + Eric Blake <eblake(a)redhat.com> Federico Simoncelli <fsimonce(a)redhat.com> Giuseppe Scrivano <gscrivan(a)redhat.com> Giuseppe Scrivano <gscrivan(a)redhat.com> @@ -477,6 +479,7 @@ Miloslav Trmač <mitr(a)redhat.com> Minoru Usui <usui(a)mxm.nes.nec.co.jp> Minoru Usui <usui(a)mxm.nes.nec.co.jp> + Mo Yuxiang <Moyuxiang(a)huawei.com> Nehal J Wani <nehaljw.kkd1(a)gmail.com> Nehal J Wani <nehaljw.kkd1(a)gmail.com> Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> @@ -510,6 +513,11 @@ Osier Yang <jyang(a)redhat.com> Osier Yang <jyang(a)redhat.com> Oskari Saarenmaa <os(a)ohmu.fi> + Pavel Hrdina <phrdina(a)redhat.com> + Pavel Hrdina <phrdina(a)redhat.com> + Pavel Hrdina <phrdina(a)redhat.com> + Peter Krempa <pkrempa(a)redhat.com> + Peter Krempa <pkrempa(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> @@ -549,3 +557,4 @@ Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + Zhou Yimin <zhouyimin(a)huawei.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/ChangeLog new/libvirt-python-1.2.8/ChangeLog --- old/libvirt-python-1.2.7/ChangeLog 2014-08-05 09:36:12.000000000 +0200 +++ new/libvirt-python-1.2.8/ChangeLog 2014-09-02 09:38:01.000000000 +0200 @@ -1,3 +1,91 @@ +2014-09-01 Pavel Hrdina <phrdina(a)redhat.com> + + Implement API bindings for virDomainBlockCopy + + +2014-09-01 Pavel Hrdina <phrdina(a)redhat.com> + + API: Implement bindings for virDomainListGetStats + Implement the function by returning a list of tuples instead the array + of virDomainStatsRecords and store the typed parameters as dict. + + + +2014-09-01 Peter Krempa <pkrempa(a)redhat.com> + + API: Implement bindings for virConnectGetAllDomainStats + Implement the function by returning a list of tuples instead the array + of virDomainStatsRecords and store the typed parameters as dict. + + + +2014-09-01 Peter Krempa <pkrempa(a)redhat.com> + + API: Skip 'virDomainStatsRecordListFree' + The new API function doesn't make sense to be exported in python. The + bindings will return native types instead of the struct array. + + + +2014-09-01 Pavel Hrdina <phrdina(a)redhat.com> + + generator: resolve one level of enum reference + In the libvirt.h we have one enum defined by references from another + enum and it leads in wrong order of definitons in python code. To + prevent this we should resolve that references before we generate the + python code. + + For now we have only one level of references so we will count with that + in the generator but we should update it in the future to be more + flexible. + + + +2014-08-19 Mo Yuxiang <Moyuxiang(a)huawei.com> + + build: Fix build warning on libvirt-python + On compiling libvirt-python, we get such a warning: + + libvirt-qemu-override.c: In function ‘libvirt_qemu_virConnectDomainQemuMonitorEventRegister’: + libvirt-qemu-override.c:304: warning: suggest explicit braces to avoid ambiguous ‘else’ + + Py_DECREF is a macro using if/else on older Python releases. + The solution is to add braces. + Python 2.7 and newer has the macro wrapped in a do { } while(0) block. + + + +2014-08-11 Zhou Yimin <zhouyimin(a)huawei.com> + + Fix libvirt_longlongWrap returning a very large value + If hypervisor is not Xen, the errs in struct _virDomainBlockStats will be -1. + But in KVM when we call domain.blockStats(), errs is 18446744073709551615. + + To fix that, this patch has two changes: + 1. Replace use of the PyLong_FromUnsignedLongLong with PyLong_FromLongLong + in function libvirt_longlongWrap + 2. If the paramemter of libvirt_longlongWrap is unsigned long long, + use libvirt_ulonglongWrap instead because of above change. + + After this patch, errs is -1 which is consistent with virDomainBlockStats api. + + + +2014-08-04 Eric Blake <eblake(a)redhat.com> + + maint: document use of libvirt's run script + Ever since libvirt commit 78c09530, it's easier to just use the + run script. + + * README: Mention run script. + + + +2014-08-04 Eric Blake <eblake(a)redhat.com> + + Bump version to 1.2.8 for new dev cycle + + 2014-07-29 Jiri Denemark <Jiri.Denemark(a)gmail.com> spec: Reorganize to satisfy buggy spectool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/PKG-INFO new/libvirt-python-1.2.8/PKG-INFO --- old/libvirt-python-1.2.7/PKG-INFO 2014-08-05 09:36:12.000000000 +0200 +++ new/libvirt-python-1.2.8/PKG-INFO 2014-09-02 09:38:02.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: libvirt-python -Version: 1.2.7 +Version: 1.2.8 Summary: The libvirt virtualization API Home-page: http://www.libvirt.org Author: Libvirt Maintainers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/README new/libvirt-python-1.2.8/README --- old/libvirt-python-1.2.7/README 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/README 2014-09-02 09:10:06.000000000 +0200 @@ -32,10 +32,11 @@ rather than directly invoking setup.py. As of libvirt 1.2.6, it is possible to develop against an uninstalled -libvirt.git checkout, by setting some environment variables: +libvirt.git checkout, by setting PKG_CONFIG_PATH and LD_LIBRARY_PATH +environment variables to point into that libvirt tree; you can even +automate this by using libvirt's run script: - export PKG_CONFIG_PATH=/path/to/libvirt/git/src/ - export LD_LIBRARY_PATH=/path/to/libvirt/git/src/.libs/ + /path/to/libvirt/run python setup.py build Patches for this code should be sent to the main libvirt development mailing list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/generator.py new/libvirt-python-1.2.8/generator.py --- old/libvirt-python-1.2.7/generator.py 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/generator.py 2014-09-02 09:10:06.000000000 +0200 @@ -464,6 +464,7 @@ 'virConnectGetCPUModelNames', 'virNodeGetFreePages', 'virNetworkGetDHCPLeases', + 'virDomainBlockCopy', ) lxc_skip_impl = ( @@ -507,6 +508,8 @@ 'virConnectListAllNodeDevices', # overridden in virConnect.py 'virConnectListAllNWFilters', # overridden in virConnect.py 'virConnectListAllSecrets', # overridden in virConnect.py + 'virConnectGetAllDomainStats', # overridden in virConnect.py + 'virDomainListGetStats', # overriden in virConnect.py 'virStreamRecvAll', # Pure python libvirt-override-virStream.py 'virStreamSendAll', # Pure python libvirt-override-virStream.py @@ -571,6 +574,7 @@ "virTypedParamsGetULLong", 'virNetworkDHCPLeaseFree', # only useful in C, python code uses list + 'virDomainStatsRecordListFree', # only useful in C, python uses dict ) lxc_skip_function = ( @@ -1785,12 +1789,26 @@ value = float('inf') return value + # Resolve only one level of reference + def resolveEnum(enum, data): + for name,val in enum.items(): + try: + int(val) + except ValueError: + enum[name] = data[val] + return enum + enumvals = list(enums.items()) + # convert list of dicts to one dict + enumData = {} + for type,enum in enumvals: + enumData.update(enum) + if enumvals is not None: enumvals.sort(key=lambda x: x[0]) for type,enum in enumvals: classes.write("# %s\n" % type) - items = list(enum.items()) + items = list(resolveEnum(enum, enumData).items()) items.sort(key=enumsSortKey) if items[-1][0].endswith('_LAST'): del items[-1] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/libvirt-override-api.xml new/libvirt-python-1.2.8/libvirt-override-api.xml --- old/libvirt-python-1.2.7/libvirt-override-api.xml 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/libvirt-override-api.xml 2014-09-02 09:10:06.000000000 +0200 @@ -640,5 +640,14 @@ <arg name='flags' type='unsigned int' info='unused, pass 0'/> <return type='char *' info="list of leases"/> </function> + <function name="virDomainBlockCopy" file="python"> + <info>Copy the guest-visible contents of a disk image to a new file described by destxml</info> + <arg name='dom' type='virDomainPtr' info='pointer to domain object'/> + <arg name='disk' type='const char *' info='path to the block device, or device shorthand'/> + <arg name='destxml' type='const char *' info='XML description of the copy destination'/> + <arg name='params' type='virTypedParameterPtr' info='optional pointer to block copy parameter object, or NULL'/> + <arg name='flags' type='unsigned int' info='bitwise-OR of virDomainBlockCopyFlags'/> + <return type='int' info='0 if the operation has started, -1 on failure'/> + </function> </symbols> </api> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/libvirt-override-virConnect.py new/libvirt-python-1.2.8/libvirt-override-virConnect.py --- old/libvirt-python-1.2.7/libvirt-override-virConnect.py 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/libvirt-override-virConnect.py 2014-09-02 09:10:06.000000000 +0200 @@ -383,3 +383,103 @@ if ret is None:raise libvirtError('virDomainCreateXMLWithFiles() failed', conn=self) __tmp = virDomain(self,_obj=ret) return __tmp + + def getAllDomainStats(self, stats = 0, flags=0): + """Query statistics for all domains on a given connection. + + Report statistics of various parameters for a running VM according to @stats + field. The statistics are returned as an array of structures for each queried + domain. The structure contains an array of typed parameters containing the + individual statistics. The typed parameter name for each statistic field + consists of a dot-separated string containing name of the requested group + followed by a group specific description of the statistic value. + + The statistic groups are enabled using the @stats parameter which is a + binary-OR of enum virDomainStatsTypes. The following groups are available + (although not necessarily implemented for each hypervisor): + + VIR_DOMAIN_STATS_STATE: Return domain state and reason for entering that + state. The typed parameter keys are in this format: + "state.state" - state of the VM, returned as int from virDomainState enum + "state.reason" - reason for entering given state, returned as int from + virDomain*Reason enum corresponding to given state. + + Using 0 for @stats returns all stats groups supported by the given + hypervisor. + + Specifying VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS as @flags makes + the function return error in case some of the stat types in @stats were + not recognized by the daemon. + + Similarly to virConnectListAllDomains, @flags can contain various flags to + filter the list of domains to provide stats for. + + VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE selects online domains while + VIR_CONNECT_GET_ALL_DOMAINS_STATS_INACTIVE selects offline ones. + + VIR_CONNECT_GET_ALL_DOMAINS_STATS_PERSISTENT and + VIR_CONNECT_GET_ALL_DOMAINS_STATS_TRANSIENT allow to filter the list + according to their persistence. + + To filter the list of VMs by domain state @flags can contain + VIR_CONNECT_GET_ALL_DOMAINS_STATS_RUNNING, + VIR_CONNECT_GET_ALL_DOMAINS_STATS_PAUSED, + VIR_CONNECT_GET_ALL_DOMAINS_STATS_SHUTOFF and/or + VIR_CONNECT_GET_ALL_DOMAINS_STATS_OTHER for all other states. """ + ret = libvirtmod.virConnectGetAllDomainStats(self._o, stats, flags) + if ret is None: + raise libvirtError("virConnectGetAllDomainStats() failed", conn=self) + + retlist = list() + for elem in ret: + record = (virDomain(self, _obj=elem[0]) , elem[1]) + retlist.append(record) + + return retlist + + def domainListGetStats(self, doms, stats=0, flags=0): + """ Query statistics for given domains. + + Report statistics of various parameters for a running VM according to @stats + field. The statistics are returned as an array of structures for each queried + domain. The structure contains an array of typed parameters containing the + individual statistics. The typed parameter name for each statistic field + consists of a dot-separated string containing name of the requested group + followed by a group specific description of the statistic value. + + The statistic groups are enabled using the @stats parameter which is a + binary-OR of enum virDomainStatsTypes. The following groups are available + (although not necessarily implemented for each hypervisor): + + VIR_DOMAIN_STATS_STATE: Return domain state and reason for entering that + state. The typed parameter keys are in this format: + "state.state" - state of the VM, returned as int from virDomainState enum + "state.reason" - reason for entering given state, returned as int from + virDomain*Reason enum corresponding to given state. + + Using 0 for @stats returns all stats groups supported by the given + hypervisor. + + Specifying VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS as @flags makes + the function return error in case some of the stat types in @stats were + not recognized by the daemon. + + Get statistics about domains provided as a list in @doms. @stats is + a bit field selecting requested statistics types.""" + domlist = list() + for dom in doms: + if not isinstance(dom, virDomain): + raise libvirtError("domain list contains non-domain elements", conn=self) + + domlist.append(dom._o) + + ret = libvirtmod.virDomainListGetStats(self._o, domlist, stats, flags) + if ret is None: + raise libvirtError("virDomainListGetStats() failed", conn=self) + + retlist = list() + for elem in ret: + record = (virDomain(self, _obj=elem[0]) , elem[1]) + retlist.append(record) + + return retlist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/libvirt-override.c new/libvirt-python-1.2.8/libvirt-override.c --- old/libvirt-python-1.2.7/libvirt-override.c 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/libvirt-override.c 2014-09-02 09:10:06.000000000 +0200 @@ -1625,7 +1625,7 @@ PyTuple_SetItem(info, 1, item) < 0) goto itemError; - if ((item = libvirt_longlongWrap((long long)cpuinfo[i].cpuTime)) == NULL || + if ((item = libvirt_ulonglongWrap(cpuinfo[i].cpuTime)) == NULL || PyTuple_SetItem(info, 2, item) < 0) goto itemError; @@ -2794,7 +2794,7 @@ PyList_SetItem(py_retval, 2, libvirt_ulongWrap(info.memory)); PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.nrVirtCpu)); PyList_SetItem(py_retval, 4, - libvirt_longlongWrap((unsigned long long) info.cpuTime)); + libvirt_ulonglongWrap(info.cpuTime)); return py_retval; } @@ -2849,7 +2849,7 @@ py_retval = PyList_New(3); PyList_SetItem(py_retval, 0, libvirt_intWrap(info.state)); PyList_SetItem(py_retval, 1, libvirt_intWrap(info.details)); - PyList_SetItem(py_retval, 2, libvirt_longlongWrap(info.stateTime)); + PyList_SetItem(py_retval, 2, libvirt_ulonglongWrap(info.stateTime)); return py_retval; } @@ -3354,7 +3354,7 @@ py_retval = PyList_New(c_retval); for (i = 0; i < c_retval; i++) { PyList_SetItem(py_retval, i, - libvirt_longlongWrap((long long) freeMems[i])); + libvirt_ulonglongWrap(freeMems[i])); } VIR_FREE(freeMems); return py_retval; @@ -3794,11 +3794,11 @@ PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state)); PyList_SetItem(py_retval, 1, - libvirt_longlongWrap((unsigned long long) info.capacity)); + libvirt_ulonglongWrap(info.capacity)); PyList_SetItem(py_retval, 2, - libvirt_longlongWrap((unsigned long long) info.allocation)); + libvirt_ulonglongWrap(info.allocation)); PyList_SetItem(py_retval, 3, - libvirt_longlongWrap((unsigned long long) info.available)); + libvirt_ulonglongWrap(info.available)); return py_retval; } @@ -3825,9 +3825,9 @@ return VIR_PY_NONE; PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.type)); PyList_SetItem(py_retval, 1, - libvirt_longlongWrap((unsigned long long) info.capacity)); + libvirt_ulonglongWrap(info.capacity)); PyList_SetItem(py_retval, 2, - libvirt_longlongWrap((unsigned long long) info.allocation)); + libvirt_ulonglongWrap(info.allocation)); return py_retval; } @@ -7955,6 +7955,183 @@ #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ +#if LIBVIR_CHECK_VERSION(1, 2, 8) + +static PyObject * +convertDomainStatsRecord(virDomainStatsRecordPtr *records, + int nrecords) +{ + PyObject *py_retval; + PyObject *py_record; + PyObject *py_record_domain; + PyObject *py_record_stats; + size_t i; + + if (!(py_retval = PyList_New(nrecords))) + return NULL; + + for (i = 0; i < nrecords; i++) { + if (!(py_record = PyTuple_New(2))) + goto error; + + /* libvirt_virDomainPtrWrap steals the object */ + virDomainRef(records[i]->dom); + if (!(py_record_domain = libvirt_virDomainPtrWrap(records[i]->dom))) { + virDomainFree(records[i]->dom); + goto error; + } + + if (!(py_record_stats = getPyVirTypedParameter(records[i]->params, + records[i]->nparams))) + goto error; + + if (PyTuple_SetItem(py_record, 0, py_record_domain) < 0) + goto error; + + py_record_domain = NULL; + + if (PyTuple_SetItem(py_record, 1, py_record_stats) < 0) + goto error; + + py_record_stats = NULL; + + if (PyList_SetItem(py_retval, i, py_record) < 0) + goto error; + + py_record = NULL; + } + + return py_retval; + + error: + Py_XDECREF(py_retval); + Py_XDECREF(py_record); + Py_XDECREF(py_record_domain); + Py_XDECREF(py_record_stats); + return NULL; +} + + +static PyObject * +libvirt_virConnectGetAllDomainStats(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_conn; + PyObject *py_retval; + virConnectPtr conn; + virDomainStatsRecordPtr *records; + int nrecords; + unsigned int flags; + unsigned int stats; + + if (!PyArg_ParseTuple(args, (char *)"Oii:virConnectGetAllDomainStats", + &pyobj_conn, &stats, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + nrecords = virConnectGetAllDomainStats(conn, stats, &records, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nrecords < 0) + return VIR_PY_NONE; + + if (!(py_retval = convertDomainStatsRecord(records, nrecords))) + py_retval = VIR_PY_NONE; + + cleanup: + virDomainStatsRecordListFree(records); + + return py_retval; +} + + +static PyObject * +libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_conn; + PyObject *py_retval; + PyObject *py_domlist; + virConnectPtr conn; + virDomainStatsRecordPtr *records = NULL; + virDomainPtr *doms = NULL; + int nrecords; + int ndoms; + size_t i; + unsigned int flags; + unsigned int stats; + + if (!PyArg_ParseTuple(args, (char *)"OOii:virDomainListGetStats", + &pyobj_conn, &py_domlist, &stats, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + if (PyList_Check(py_domlist)) { + ndoms = PyList_Size(py_domlist); + + if (VIR_ALLOC_N(doms, ndoms + 1) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < ndoms; i++) + doms[i] = PyvirDomain_Get(PyList_GetItem(py_domlist, i)); + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + nrecords = virDomainListGetStats(doms, stats, &records, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nrecords < 0) { + py_retval = VIR_PY_NONE; + goto cleanup; + } + + if (!(py_retval = convertDomainStatsRecord(records, nrecords))) + py_retval = VIR_PY_NONE; + + cleanup: + virDomainStatsRecordListFree(records); + VIR_FREE(doms); + + return py_retval; +} + + +static PyObject * +libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) +{ + PyObject *pyobj_dom = NULL; + PyObject *pyobj_dict = NULL; + + virDomainPtr dom; + char *disk = NULL; + char *destxml = NULL; + virTypedParameterPtr params = NULL; + int nparams = 0; + unsigned int flags; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *) "Ozz|Oi:virDomainBlockCopy", + &pyobj_dom, &disk, &destxml, &pyobj_dict, &params, + &flags)) + return VIR_PY_INT_FAIL; + + if (PyDict_Check(pyobj_dict)) { + if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, NULL, 0) < 0) + return VIR_PY_INT_FAIL; + } + + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainBlockCopy(dom, disk, destxml, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + return libvirt_intWrap(c_retval); +} + +#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ + /************************************************************************ * * * The registration stuff * @@ -8140,6 +8317,11 @@ {(char *) "virNodeGetFreePages", libvirt_virNodeGetFreePages, METH_VARARGS, NULL}, {(char *) "virNetworkGetDHCPLeases", libvirt_virNetworkGetDHCPLeases, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ +#if LIBVIR_CHECK_VERSION(1, 2, 8) + {(char *) "virConnectGetAllDomainStats", libvirt_virConnectGetAllDomainStats, METH_VARARGS, NULL}, + {(char *) "virDomainListGetStats", libvirt_virDomainListGetStats, METH_VARARGS, NULL}, + {(char *) "virDomainBlockCopy", libvirt_virDomainBlockCopy, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ {NULL, NULL, 0, NULL} }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/libvirt-python.spec new/libvirt-python-1.2.8/libvirt-python.spec --- old/libvirt-python-1.2.7/libvirt-python.spec 2014-08-05 09:36:12.000000000 +0200 +++ new/libvirt-python-1.2.8/libvirt-python.spec 2014-09-02 09:38:01.000000000 +0200 @@ -6,7 +6,7 @@ Summary: The libvirt virtualization API python2 binding Name: libvirt-python -Version: 1.2.7 +Version: 1.2.8 Release: 1%{?dist}%{?extra_release} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/libvirt-qemu-override.c new/libvirt-python-1.2.8/libvirt-qemu-override.c --- old/libvirt-python-1.2.7/libvirt-qemu-override.c 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/libvirt-qemu-override.c 2014-09-02 09:10:06.000000000 +0200 @@ -301,8 +301,9 @@ flags); LIBVIRT_END_ALLOW_THREADS; - if (ret < 0) + if (ret < 0) { Py_DECREF(pyobj_cbData); + } py_retval = libvirt_intWrap(ret); return py_retval; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/sanitytest.py new/libvirt-python-1.2.8/sanitytest.py --- old/libvirt-python-1.2.7/sanitytest.py 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/sanitytest.py 2014-09-02 09:10:06.000000000 +0200 @@ -81,6 +81,12 @@ if name[0:23] == "virNetworkDHCPLeaseFree": continue + if name[0:28] == "virDomainStatsRecordListFree": + continue + + if name[0:21] == "virDomainListGetStats": + name = "virConnectDomainListGetStats" + # These aren't functions, they're callback signatures if name in ["virConnectAuthCallbackPtr", "virConnectCloseFunc", "virStreamSinkFunc", "virStreamSourceFunc", "virStreamEventCallback", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/setup.py new/libvirt-python-1.2.8/setup.py --- old/libvirt-python-1.2.7/setup.py 2014-08-05 09:35:59.000000000 +0200 +++ new/libvirt-python-1.2.8/setup.py 2014-08-05 09:42:33.000000000 +0200 @@ -309,7 +309,7 @@ _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.2.7', + version = '1.2.8', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.2.7/typewrappers.c new/libvirt-python-1.2.8/typewrappers.c --- old/libvirt-python-1.2.7/typewrappers.c 2014-06-30 08:25:00.000000000 +0200 +++ new/libvirt-python-1.2.8/typewrappers.c 2014-09-02 09:10:06.000000000 +0200 @@ -79,7 +79,7 @@ libvirt_longlongWrap(long long val) { PyObject *ret; - ret = PyLong_FromUnsignedLongLong((unsigned long long) val); + ret = PyLong_FromLongLong(val); return ret; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0