September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit kcodecs for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package kcodecs for openSUSE:Factory checked in at 2014-09-12 17:02:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcodecs (Old) and /work/SRC/openSUSE:Factory/.kcodecs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcodecs" Changes: -------- --- /work/SRC/openSUSE:Factory/kcodecs/kcodecs.changes 2014-08-16 15:41:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcodecs.new/kcodecs.changes 2014-09-12 17:03:13.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 9 09:49:11 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php + +------------------------------------------------------------------- Old: ---- kcodecs-5.1.0.tar.xz New: ---- kcodecs-5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcodecs.spec ++++++ --- /var/tmp/diff_new_pack.WUTPfC/_old 2014-09-12 17:03:14.000000000 +0200 +++ /var/tmp/diff_new_pack.WUTPfC/_new 2014-09-12 17:03:14.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Codecs5 Name: kcodecs -Version: 5.1.0 +Version: 5.2.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 ++++++ kcodecs-5.1.0.tar.xz -> kcodecs-5.2.0.tar.xz ++++++ ++++ 922850 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 attica-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2014-09-12 17:02:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "attica-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2014-08-16 15:41:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2014-09-12 17:03:11.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 9 09:49:11 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php + +------------------------------------------------------------------- Old: ---- attica-5.1.0.tar.xz New: ---- attica-5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.eUrAvG/_old 2014-09-12 17:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.eUrAvG/_new 2014-09-12 17:03:13.000000000 +0200 @@ -21,7 +21,7 @@ %define _libname KF5Attica Name: attica-qt5 -Version: 5.1.0 +Version: 5.2.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1+ @@ -30,7 +30,7 @@ Source: %{rname}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ attica-5.1.0.tar.xz -> attica-5.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.1.0/CMakeLists.txt new/attica-5.2.0/CMakeLists.txt --- old/attica-5.1.0/CMakeLists.txt 2014-08-02 10:11:03.000000000 +0200 +++ new/attica-5.2.0/CMakeLists.txt 2014-09-08 01:23:00.000000000 +0200 @@ -3,7 +3,7 @@ project(Attica) # ECM setup -find_package(ECM 1.1.0 REQUIRED NO_MODULE) +find_package(ECM 1.2.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,7 +15,7 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.1.0") # handled by release scripts +set(KF5_VERSION "5.2.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX ATTICA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.1.0/Mainpage.dox new/attica-5.2.0/Mainpage.dox --- old/attica-5.1.0/Mainpage.dox 2014-08-02 10:11:03.000000000 +0200 +++ new/attica-5.2.0/Mainpage.dox 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -/** @mainpage The LibAttica API Reference - -Attica is a Qt library that implements the Open Collaboration Services API version 1.6. -The REST API is defined here: -http://freedesktop.org/wiki/Specifications/open-collaboration-services-draft/ - -*/ -// DOXYGEN_VERSION=4.0 -// DOXYGEN_NAME=attica -// DOXYGEN_ENABLE=YES -// DOXYGEN_SET_RECURSIVE = YES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.1.0/README.md new/attica-5.2.0/README.md --- old/attica-5.1.0/README.md 2014-08-02 10:11:03.000000000 +0200 +++ new/attica-5.2.0/README.md 2014-09-08 01:23:00.000000000 +0200 @@ -10,8 +10,3 @@ The library is used in KNewStuff3 as content provider. In order to integrate with KDE's Plasma Desktop, a platform plugin exists in kdebase. -## Links - -- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel> -- IRC channel: #kde-devel on Freenode -- Git repository: <https://projects.kde.org/projects/frameworks/attica/repository> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.1.0/metainfo.yaml new/attica-5.2.0/metainfo.yaml --- old/attica-5.1.0/metainfo.yaml 2014-08-02 10:11:03.000000000 +0200 +++ new/attica-5.2.0/metainfo.yaml 2014-09-08 01:23:00.000000000 +0200 @@ -1,5 +1,5 @@ maintainer: -description: Attica is a Qt library that implements the Open Collaboration Services API version 1.6. +description: Open Collaboration Services API tier: 1 type: functional platforms: @@ -7,3 +7,7 @@ portingAid: false deprecated: false release: true +libraries: + - qmake: Attica + cmake: "KF5::Attica" +cmakename: KF5Attica -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit extra-cmake-modules for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package extra-cmake-modules for openSUSE:Factory checked in at 2014-09-12 17:02:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old) and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "extra-cmake-modules" Changes: -------- --- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes 2014-08-16 15:41:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes 2014-09-12 17:03:09.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 9 09:49:34 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 1.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php +- Drop 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch, + merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch extra-cmake-modules-1.1.0.tar.xz New: ---- extra-cmake-modules-1.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extra-cmake-modules.spec ++++++ --- /var/tmp/diff_new_pack.Xc3n99/_old 2014-09-12 17:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Xc3n99/_new 2014-09-12 17:03:10.000000000 +0200 @@ -21,11 +21,9 @@ License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 1.1.0 +Version: 1.2.0 Release: 0 -Source: http://download.kde.org/stable/frameworks/5.1.0/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch -Patch0: 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch +Source: http://download.kde.org/stable/frameworks/5.2.0/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ @@ -57,7 +55,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build ++++++ extra-cmake-modules-1.1.0.tar.xz -> extra-cmake-modules-1.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.1.0/CMakeLists.txt new/extra-cmake-modules-1.2.0/CMakeLists.txt --- old/extra-cmake-modules-1.1.0/CMakeLists.txt 2014-08-01 19:07:16.000000000 +0200 +++ new/extra-cmake-modules-1.2.0/CMakeLists.txt 2014-09-06 00:20:45.000000000 +0200 @@ -3,7 +3,7 @@ project(extra-cmake-modules NONE) set(ECM_MAJOR_VERSION 1) -set(ECM_MINOR_VERSION 1) +set(ECM_MINOR_VERSION 2) set(ECM_PATCH_VERSION 0) set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.1.0/ECMConfig.cmake.in new/extra-cmake-modules-1.2.0/ECMConfig.cmake.in --- old/extra-cmake-modules-1.1.0/ECMConfig.cmake.in 2014-08-01 19:07:16.000000000 +0200 +++ new/extra-cmake-modules-1.2.0/ECMConfig.cmake.in 2014-09-06 00:20:45.000000000 +0200 @@ -16,10 +16,3 @@ set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}" "${ECM_KDE_MODULE_DIR}") include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake") - -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.13) - find_package(Qt5Core 5.2.0 REQUIRED) - set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_CORE_LIB $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:DebugFull>>>:QT_NO_DEBUG>) -else() - message(FATAL_ERROR \"Remove this hack. Set CMAKE_MAP_IMPORTED_TARGET_DEBUGFULL to DEBUG instead.\") -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.1.0/kde-modules/KDECompilerSettings.cmake new/extra-cmake-modules-1.2.0/kde-modules/KDECompilerSettings.cmake --- old/extra-cmake-modules-1.1.0/kde-modules/KDECompilerSettings.cmake 2014-08-01 19:07:16.000000000 +0200 +++ new/extra-cmake-modules-1.2.0/kde-modules/KDECompilerSettings.cmake 2014-09-06 00:20:45.000000000 +0200 @@ -102,13 +102,9 @@ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${ARGV}) endmacro() -if (UNIX) - # Enable basically everything portable across modern UNIX systems. - # See http://www.delorie.com/gnu/docs/glibc/libc_13.html, although - # this define is for the benefit of other libc implementations - # (since _GNU_SOURCE is defined below). - _kde_add_platform_definitions(-D_XOPEN_SOURCE=500) - +include(CheckSymbolExists) +check_symbol_exists("__GLIBC__" "stdlib.h" LIBC_IS_GLIBC) +if (LIBC_IS_GLIBC) # Enable everything in GNU libc. Any code using non-portable features # needs to perform feature tests, but this ensures that any such features # will be found if they exist. @@ -118,7 +114,9 @@ # functions). This, however, means that strlcat and strlcpy are not # provided by glibc. _kde_add_platform_definitions(-D_GNU_SOURCE) +endif () +if (UNIX) # Enable extra API for using 64-bit file offsets on 32-bit systems. # FIXME: this is included in _GNU_SOURCE in glibc; do other libc # implementation recognize it? @@ -157,7 +155,7 @@ # Use the Unicode versions of Windows API by default # See http://msdn.microsoft.com/en-us/library/windows/desktop/dd317766%28v=vs.85%… - _kde_add_platform_definitions(-DUNICODE) + _kde_add_platform_definitions(-DUNICODE -D_UNICODE) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.1.0/kde-modules/KDEInstallDirs.cmake new/extra-cmake-modules-1.2.0/kde-modules/KDEInstallDirs.cmake --- old/extra-cmake-modules-1.1.0/kde-modules/KDEInstallDirs.cmake 2014-08-01 19:07:16.000000000 +0200 +++ new/extra-cmake-modules-1.2.0/kde-modules/KDEInstallDirs.cmake 2014-09-06 00:20:45.000000000 +0200 @@ -162,11 +162,6 @@ # (To distribute this file outside of extra-cmake-modules, substitute the full # License text for the above reference.) - -# TODO: -# - Try to figure out proper Qt-related dirs when installing to the same -# prefix as Qt (look for qtpaths) - # Figure out what the default install directory for libraries should be. # This is based on the logic in GNUInstallDirs, but simplified (the # GNUInstallDirs code deals with re-configuring, but that is dealt with @@ -199,7 +194,6 @@ endif() endif() - # Macro for variables that are relative to another variable. We store an empty # value in the cache (for documentation/GUI cache editor purposes), and store # the default value in a local variable. If the cache variable is ever set to @@ -287,7 +281,6 @@ _define_relative("${varname}" "" "${dir}" "${docstring}" ${ARGN}) endmacro() - if(APPLE) _define_absolute(BUNDLEDIR "/Applications/KDE" "application bundles" @@ -328,22 +321,41 @@ "CMake packages, including config files" CMAKECONFIG_INSTALL_PREFIX) +option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, Plugins and Imports to the Qt 5 install dir") +if(KDE_INSTALL_USE_QT_SYS_PATHS) # Qt-specific vars -_define_relative(QTPLUGINDIR LIBDIR "plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) + include(ECMQueryQmake) + + query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS) + + _define_absolute(QTPLUGINDIR ${qt_plugins_dir} + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + + query_qmake(qt_imports_dir QT_INSTALL_IMPORTS) + + _define_absolute(QTQUICKIMPORTSDIR QTPLUGINDIR ${qt_imports_dir} + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +else() + _define_relative(QTPLUGINDIR LIBDIR "plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + + _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) +endif() + _define_relative(PLUGINDIR QTPLUGINDIR "" "Plugins" PLUGIN_INSTALL_DIR) -_define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) + _define_relative(QMLDIR LIBDIR "qml" "QtQuick2 imports" QML_INSTALL_DIR) - - _define_absolute(INCLUDEDIR "include" "C and C++ header files" INCLUDE_INSTALL_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.1.0/modules/ECMGeneratePriFile.cmake new/extra-cmake-modules-1.2.0/modules/ECMGeneratePriFile.cmake --- old/extra-cmake-modules-1.1.0/modules/ECMGeneratePriFile.cmake 2014-08-01 19:07:16.000000000 +0200 +++ new/extra-cmake-modules-1.2.0/modules/ECMGeneratePriFile.cmake 2014-09-06 00:20:45.000000000 +0200 @@ -82,7 +82,13 @@ # (To distribute this file outside of extra-cmake-modules, substitute the full # License text for the above reference.) -set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") +if(KDE_INSTALL_USE_QT_SYS_PATHS) + include(ECMQueryQmake) + query_qmake(qt_host_data_dir QT_HOST_DATA) + set(ECM_MKSPECS_INSTALL_DIR ${qt_host_data_dir}/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") +else () + set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") +endif() function(ECM_GENERATE_PRI_FILE) set(options ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.1.0/modules/ECMQueryQmake.cmake new/extra-cmake-modules-1.2.0/modules/ECMQueryQmake.cmake --- old/extra-cmake-modules-1.1.0/modules/ECMQueryQmake.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.2.0/modules/ECMQueryQmake.cmake 2014-09-06 00:20:45.000000000 +0200 @@ -0,0 +1,15 @@ +find_package(Qt5Core QUIET) + +if (TARGET Qt5::qmake) + get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) +else() + set(QMAKE_EXECUTABLE "qmake-qt5" CACHE) +endif() + +function(QUERY_QMAKE RESULT VAR) + exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output ) + if(NOT return_code) + file(TO_CMAKE_PATH "${output}" output) + set(${RESULT} ${output} PARENT_SCOPE) + endif() +endfunction(QUERY_QMAKE) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kf5-filesystem for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package kf5-filesystem for openSUSE:Factory checked in at 2014-09-12 17:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf5-filesystem (Old) and /work/SRC/openSUSE:Factory/.kf5-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kf5-filesystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kf5-filesystem/kf5-filesystem.changes 2014-08-16 15:41:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kf5-filesystem.new/kf5-filesystem.changes 2014-09-12 17:03:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 8 01:04:14 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Bump to 5.2.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf5-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.p5V0vR/_old 2014-09-12 17:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.p5V0vR/_new 2014-09-12 17:03:08.000000000 +0200 @@ -18,7 +18,7 @@ Name: kf5-filesystem Url: http://www.kde.org -Version: 5.1.0 +Version: 5.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KF5 Directory Layout ++++++ macros.kf5 ++++++ --- /var/tmp/diff_new_pack.p5V0vR/_old 2014-09-12 17:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.p5V0vR/_new 2014-09-12 17:03:08.000000000 +0200 @@ -26,7 +26,7 @@ %_kf5_servicetypesdir %{_kf5_sharedir}/kservicetypes5 %_kf5_htmldir %{_kf5_sharedir}/doc/HTML -%_kf5_version 5.1.0 +%_kf5_version 5.2.0 %_plasma5_branding_version 5.0.0 %_kf5_build_type None -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfixadmin for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package postfixadmin for openSUSE:Factory checked in at 2014-09-12 15:25:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfixadmin (Old) and /work/SRC/openSUSE:Factory/.postfixadmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfixadmin" Changes: -------- --- /work/SRC/openSUSE:Factory/postfixadmin/postfixadmin.changes 2014-02-22 18:14:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfixadmin.new/postfixadmin.changes 2014-09-12 17:03:05.000000000 +0200 @@ -1,0 +2,25 @@ +Fri Sep 12 11:16:16 UTC 2014 - opensuse(a)cboltz.de + +- add postfixadmin-svn.diff with changes from upstream SVN (r1689): + - AliasHandler: don't clean goto field when making alias inactive (bug#316) + - list-virtual: display quota even if $CONF[used_quotas] == NO (bug#307) + - vacation.pl: fix postgresql queries in vacation.pl (bug#315) + - fix query in AliasHandler getList which caused an empty list on some + systems (bug#313) + - fetchmail.pl: fix ssl extra options (cert check, cert path, fingerprint) + - fix logging (run setup.php to fix old log entries) (bug#317) + - fetchmail.php: change error_reporting() to exclude E_NOTICE (bug#322) + - fr.lang translation update (patch#123) +- make postfixadmin-cli executable + +------------------------------------------------------------------- +Tue May 6 21:47:01 UTC 2014 - opensuse(a)cboltz.de + +- update to PostfixAdmin 2.91 aka 3.0 beta1 + - new commandline client postfixadmin-cli + - vacation start and end date + - (nearly) complete rewrite to *Handler classes + - smarty templates + - and much more, see upstream CHANGELOG.TXT + +------------------------------------------------------------------- @@ -6 +31 @@ - - SECURITY: fix SQL injection in show_gen_status() + - SECURITY: fix SQL injection in show_gen_status() (CVE-2014-2655, bnc#870434) Old: ---- postfixadmin-2.3.7.tar.gz New: ---- postfixadmin-2.91.tar.gz postfixadmin-svn.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfixadmin.spec ++++++ --- /var/tmp/diff_new_pack.5zGcIu/_old 2014-09-12 17:03:06.000000000 +0200 +++ /var/tmp/diff_new_pack.5zGcIu/_new 2014-09-12 17:03:06.000000000 +0200 @@ -17,14 +17,14 @@ Name: postfixadmin -Version: 2.3.7 +Version: 2.91 Release: 0 Url: http://postfixadmin.sourceforge.net/ Source0: %{name}-%{version}.tar.gz -# changes from SVN 2.3 branch since the 2.3.7 release +# changes from SVN since the release # (currently none) -# Patch0: postfixadmin-2.3-branch.diff +Patch0: postfixadmin-svn.diff BuildArch: noarch @@ -107,7 +107,7 @@ %prep %setup -q -#patch0 +%patch0 -p1 %build echo "*** serverroot: %{serverroot} ***" @@ -124,21 +124,24 @@ #ln -s ../../../..%{_sysconfdir}/%{name}/config.inc.php \ # %{buildroot}%{_datadir}/%{name}/config.inc.php -install -m 0644 *.php motd*.txt %{buildroot}%{serverroot}/%{name}/ +install -m 0644 *.php *.js %{buildroot}%{serverroot}/%{name}/ mv VIRTUAL_VACATION/vacation.pl %{buildroot}%{_prefix}/lib/%{name}/ # compatibility symlink to match documentation ( cd %{buildroot}%{_localstatedir}/spool/vacation/ && ln -s ../../../usr/lib/%{name}/vacation.pl ) # copy over the rest -for d in admin images languages model templates users css; do +for d in configs css images languages model scripts smarty templates users ; do cp -rp $d %{buildroot}%{serverroot}/%{name}/ done +chmod 755 %{buildroot}%{serverroot}/%{name}/scripts/postfixadmin-cli + +install -d %{buildroot}%{serverroot}/%{name}/templates_c # remove files related to debian packaging (to avoid it's copied as %doc) rm -r ADDITIONS/squirrelmail-plugin/debian/ cp -rp ADDITIONS %{buildroot}%{_prefix}/lib//%{name}/ -chmod 755 %{buildroot}%{_prefix}/lib/%{name}/ADDITIONS/*.{pl,sh,py} +chmod 755 %{buildroot}%{_prefix}/lib/%{name}/ADDITIONS/*.{pl,sh,py} %{buildroot}%{_prefix}/lib/%{name}/ADDITIONS/squirrelmail-plugin/locale/build.sh # install the config file #mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d @@ -171,6 +174,7 @@ #%config(noreplace) %{_sysconfdir}/apache2/conf.d/*.conf %doc DOCUMENTS/* *.TXT VIRTUAL_VACATION %{serverroot}/%{name}/ +%attr(770,root,www) %dir %{serverroot}/%{name}/templates_c/ %dir %{_prefix}/lib/%{name}/ %{_prefix}/lib/%{name}/ADDITIONS/ %attr( 750,root,vacation) %{_prefix}/lib/%{name}/vacation.pl ++++++ postfixadmin-2.3.7.tar.gz -> postfixadmin-2.91.tar.gz ++++++ ++++ 176362 lines of diff (skipped) ++++++ postfixadmin-svn.diff ++++++ ++++ 1085 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-09-12 15:25:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-09-04 07:56:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-09-12 17:03:02.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 11 08:27:16 UTC 2014 - kgronlund(a)suse.com + +- Drop patch since pacemaker now has correct version + - Removed patch: crmsh-cibadmin_can_patch.patch + +------------------------------------------------------------------- Old: ---- crmsh-cibadmin_can_patch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.tsUYt4/_old 2014-09-12 17:03:04.000000000 +0200 +++ /var/tmp/diff_new_pack.tsUYt4/_new 2014-09-12 17:03:04.000000000 +0200 @@ -45,10 +45,6 @@ Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 -# PATCH-FEATURE-OPENSUSE crmsh-cibadmin_can_patch.patch -# dejan(a)suse.de -- enable atomic CIB updates here, because our -# pacemaker version has been fixed in the meantime -Patch11: crmsh-cibadmin_can_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): pacemaker Requires: pssh @@ -122,7 +118,6 @@ %prep %setup -q -n %{upstream_prefix} -%patch11 -p1 # Force the local time # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mxml for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package mxml for openSUSE:Factory checked in at 2014-09-12 15:25:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mxml (Old) and /work/SRC/openSUSE:Factory/.mxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mxml" Changes: -------- --- /work/SRC/openSUSE:Factory/mxml/mxml.changes 2014-09-12 11:19:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mxml.new/mxml.changes 2014-09-12 15:25:35.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 12 08:29:09 UTC 2014 - jengelh(a)inai.de + +- Improve on RPM group classification + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mxml.spec ++++++ --- /var/tmp/diff_new_pack.9OLen4/_old 2014-09-12 15:25:37.000000000 +0200 +++ /var/tmp/diff_new_pack.9OLen4/_new 2014-09-12 15:25:37.000000000 +0200 @@ -22,7 +22,8 @@ Release: 0 Summary: Small XML Parsing Library License: LGPL-2.1+ -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ + Source: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch: mxml-2.3-nobinstrip.patch @@ -48,7 +49,7 @@ # Summary: Shared library for mxml License: LGPL-2.1+ -Group: Development/Libraries/Other +Group: System/Libraries %description -n %library_name Mini-XML is a small XML parsing library that you can use to read XML @@ -68,7 +69,7 @@ # Summary: Development files for mxml License: GPL-2.0+ -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ %description devel Mini-XML is a small XML parsing library that you can use to read XML -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit coccinelle for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package coccinelle for openSUSE:Factory checked in at 2014-09-12 15:25:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coccinelle (Old) and /work/SRC/openSUSE:Factory/.coccinelle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "coccinelle" Changes: -------- --- /work/SRC/openSUSE:Factory/coccinelle/coccinelle.changes 2013-05-13 14:43:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.coccinelle.new/coccinelle.changes 2014-09-12 15:25:33.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Sep 9 14:25:25 UTC 2013 - mcgrof(a)suse.com + +- Update to new upstream release 1.0.0~rc21 +* Support decimal type with the --ibm option +* Support some matching on pragmas +* Initialize and finalize rules contain a metavariable declaration + region. +* Allow some parameters of a function not to have names. +* Eliminate the reliance on grep in most cases for worth trying, + to improve performance. +* Allow multidecls when removing variable names or when modifying + type. +* Take fresh declarations into account when computing + get_constants to create dependencies +* Leave ifdefs-like directives in unparsed code, if they don't have + beginning or ending counterparts. +* Improve type inference performance when many files included by + using maps. +- Add fix-no_prepare_ocamlcocci-arguments.patch: fix incorrect + call to two functions + +------------------------------------------------------------------- Old: ---- coccinelle-1.0.0-rc17.tar.xz New: ---- coccinelle-1.0.0-rc21.tgz fix-no_prepare_ocamlcocci-arguments.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coccinelle.spec ++++++ --- /var/tmp/diff_new_pack.ukZuvI/_old 2014-09-12 15:25:34.000000000 +0200 +++ /var/tmp/diff_new_pack.ukZuvI/_new 2014-09-12 15:25:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package coccinelle # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,24 @@ Name: coccinelle -Version: 1.0.0~rc17 +Version: 1.0.0~rc21 Release: 0 Summary: Semantic patch utility License: GPL-2.0 Group: Productivity/Text/Utilities Url: http://coccinelle.lip6.fr/ -%define rversion 1.0.0-rc17 +%define rversion 1.0.0-rc21 #Git-Clone: git://github.com/coccinelle/coccinelle -Source: %name-%rversion.tar.xz +Source: http://coccinelle.lip6.fr/distrib/%name-%rversion.tgz +Patch1: fix-no_prepare_ocamlcocci-arguments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.11 BuildRequires: ocaml-camlp4-devel >= 3.11 +BuildRequires: ocaml-findlib BuildRequires: ocaml-ocamldoc >= 3.11 BuildRequires: pkg-config -BuildRequires: xz # Fails to link with PCRE #BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(python) @@ -53,6 +54,7 @@ %prep %setup -qn %name-%rversion +%patch -P 1 -p1 %build %configure ++++++ fix-no_prepare_ocamlcocci-arguments.patch ++++++ From: Luis R. Rodriguez <mcgrof(a)do-not-panic.com> Date: Tue, 9 Sep 2014 15:10:42 -0700 X-Upstream: should appear in 1.0.0~rc22 The functions do take five arguments, but these two call sites erroneously just passed four. --- a/ocaml/no_prepare_ocamlcocci.ml +++ b/ocaml/no_prepare_ocamlcocci.ml @@ -9,9 +9,9 @@ function Ast_cocci.ScriptRule (name,"ocaml",deps,mv,script_vars,code) -> code :: prev - | Ast_cocci.InitialScriptRule (name,"ocaml",deps,code) -> + | Ast_cocci.InitialScriptRule (name,"ocaml",deps,mvs,code) -> code :: prev - | Ast_cocci.FinalScriptRule (name,"ocaml",deps,code) -> + | Ast_cocci.FinalScriptRule (name,"ocaml",deps,mvs,code) -> code :: prev | _ -> prev) [] code in -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libaal for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package libaal for openSUSE:Factory checked in at 2014-09-12 15:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libaal (Old) and /work/SRC/openSUSE:Factory/.libaal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libaal" Changes: -------- --- /work/SRC/openSUSE:Factory/libaal/libaal.changes 2013-04-14 10:18:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libaal.new/libaal.changes 2014-09-12 15:25:32.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 29 02:50:28 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 1.0.6 +* Implement device discard functionality in libaal to be used by + mkfs and friends. + +------------------------------------------------------------------- Old: ---- libaal-1.0.5.tar.xz New: ---- libaal-1.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libaal.spec ++++++ --- /var/tmp/diff_new_pack.JnPhRQ/_old 2014-09-12 15:25:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JnPhRQ/_new 2014-09-12 15:25:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libaal # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,25 +20,26 @@ Summary: A library providing application abstraction mechanisms used by reiser4progs License: GPL-2.0 Group: System/Filesystems -Version: 1.0.5 -Release: 95 +Version: 1.0.6 +Release: 0 Url: http://sf.net/projects/reiser4/ -Source: libaal-%version.tar.xz -Patch1: libaal-%version-rpmoptflags.patch +Source: http://downloads.sf.net/reiser4/libaal-%version.tar.gz +Patch1: libaal-1.0.5-rpmoptflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake BuildRequires: libtool -BuildRequires: xz %description libaal includes device abstraction, libc independence code, and more. -%package -n libaal-1_0-5 +%package -n libaal-1_0-6 Summary: A library providing application abstraction mechanisms used by reiser4progs License: GPL-2.0 Group: System/Libraries -%description -n libaal-1_0-5 +%description -n libaal-1_0-6 libaal includes device abstraction, libc independence code, and more. %package -n libaal-minimal0 @@ -53,7 +54,7 @@ Summary: A library providing application abstraction mechanisms used by reiser4progs License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libaal-1_0-5 = %version +Requires: libaal-1_0-6 = %version Requires: libaal-minimal0 = %version %description devel @@ -84,15 +85,15 @@ make %{?_smp_mflags} install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la -%post -n libaal-1_0-5 -p /sbin/ldconfig -%postun -n libaal-1_0-5 -p /sbin/ldconfig +%post -n libaal-1_0-6 -p /sbin/ldconfig +%postun -n libaal-1_0-6 -p /sbin/ldconfig %post -n libaal-minimal0 -p /sbin/ldconfig %postun -n libaal-minimal0 -p /sbin/ldconfig -%files -n libaal-1_0-5 +%files -n libaal-1_0-6 %defattr(-,root,root) -%doc AUTHORS BUGS COPYING CREDITS ChangeLog README THANKS TODO -%_libdir/libaal-1.0.so.5* +%doc COPYING +%_libdir/libaal-1.0.so.6* %files -n libaal-minimal0 %defattr(-,root,root) @@ -100,6 +101,7 @@ %files devel %defattr(-,root,root) +%doc AUTHORS BUGS CREDITS ChangeLog README THANKS TODO %_libdir/libaal*.so %_includedir/aal %_datadir/aclocal -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_7_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2014-09-12 15:25:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2014-09-12 15:25:28.000000000 +0200 @@ -0,0 +1,2042 @@ +------------------------------------------------------------------- +Wed Sep 10 05:48:11 UTC 2014 - coolo(a)suse.com + +- add an explicit 2nd spec file - I liked the beauty of the topadd + _link but our tools just don't expect beauty ;( + +------------------------------------------------------------------- +Tue Sep 9 06:31:47 UTC 2014 - coolo(a)suse.com + +- conflict bootstrap with non-bootstrap versions to avoid file + conflicts + +------------------------------------------------------------------- +Mon Sep 8 07:45:46 UTC 2014 - fstrba(a)suse.com + +- Add provides jre-64 on x86_64. bnc#895191 + +------------------------------------------------------------------- +Fri Sep 5 09:15:34 UTC 2014 - coolo(a)suse.com + +- ignore ecj's java require - we already have java-bootstrap + +------------------------------------------------------------------- +Thu Aug 28 08:09:49 UTC 2014 - coolo(a)suse.com + +- build a bootstrap version when bootstrap conditional set and buildrequire + this in the version when bootstrap conditional is not set + +To make this work, we need in every prj with jdk a _link in jdk-bootstrap with +this content: + +<link package="java-1_7_0-openjdk" cicount="copy"> +<patches> + <topadd>%global _with_bootstrap 1</topadd> +</patches> +</link> + +This makes sure the build dependencies of jdk are clear and you don't need tricks +(other than the _link) + +------------------------------------------------------------------- +Thu Aug 21 08:39:32 UTC 2014 - fstrba(a)suse.com + +- Removed patches unused patches: + * java-1.7.0-openjdk-debugdocs.patch + * java-1.7.0-openjdk-debuginfo.patch + +------------------------------------------------------------------- +Mon Jul 28 07:26:31 UTC 2014 - tchvatal(a)suse.com + +- Use SUSE in names, not SuSE. bnc#889006 + +------------------------------------------------------------------- +Thu Jul 24 11:49:20 UTC 2014 - fstrba(a)suse.com + +- Don't try to run multiprocess on aarch64 where we are normally + using qemu. Qemu cannot guarantee that in user emulation mode + signals will be delivered to the correct thread + +------------------------------------------------------------------- +Wed Jul 23 17:05:15 UTC 2014 - fstrba(a)suse.com + +- Added patch: file-contains-date-and-time.patch + * fix rpmlint warning and diminish number of rebuilds +- Make sample/rmi/java-rmi.cgi + * fix rpmlint warning about no-executable file with shebang +- Run "osc service localrun clean_spec_file" on the package + * fix manually some shortcomings + +------------------------------------------------------------------- +Wed Jul 23 08:23:09 UTC 2014 - fstrba(a)suse.com + +- Use released icedtea-sound-1.0.1 tarball + * rename libpulse-java.so -> libicedtea-sound.so + * rename pulse-java.jar -> icedtea-sound.jar +- Remove dependencies on autoconf and automake + * no need to re-autogenerate any more + +------------------------------------------------------------------- +Tue Jul 22 23:22:26 UTC 2014 - fstrba(a)suse.com + +- Make zero build usable also on aarch64 (--with zero option) +- Run osc service localrun clean_spec_file on the package + +------------------------------------------------------------------- +Tue Jul 22 15:18:16 UTC 2014 - fstrba(a)suse.com + +- Modified patch: + * java-1_7_0-openjdk-suse-desktop-files.patch + - change categories for policytool.desktop + +------------------------------------------------------------------- +Fri Jul 18 07:29:10 UTC 2014 - fstrba(a)suse.com + +- Modify pulseaudio conditional, since the required dependencies + can be satisfied in SLE11 SP3 +- Modify accessibility post script to actually create the + corresponding symlinks + +------------------------------------------------------------------- +Wed Jul 16 11:00:00 UTC 2014 - fstrba(a)suse.com + +- update to 2.5.1 - OpenJDK 7u65 + * Security fixes + - S8029755, CVE-2014-4209: Enhance subject class + - S8030763: Validate global memory allocation + - S8031340, CVE-2014-4264: Better TLS/EC management + - S8031346, CVE-2014-4244: Enhance RSA key handling + - S8031540: Introduce document horizon + - S8032536: JVM resolves wrong method in some unusual cases + - S8033055: Issues in 2d + - S8033301, CVE-2014-4266: Build more informative InfoBuilder + - S8034267: Probabilistic native crash + - S8034272: Do not cram data into CRAM arrays + - S8034985, CVE-2014-2483: Better form for Lambda Forms + - S8035004, CVE-2014-4252: Provider provides less service + - S8035009, CVE-2014-4218: Make Proxy representations consistent + - S8035119, CVE-2014-4219: Fix exceptions to bytecode verification + - S8035699, CVE-2014-4268: File choosers should be choosier + - S8035788. CVE-2014-4221: Provide more consistency for lookups + - S8035793, CVE-2014-4223: Maximum arity maxed out + - S8036571: (process) Process process arguments carefully + - S8036800: Attribute OOM to correct part of code + - S8037046: Validate libraries to be loaded + - S8037076, CVE-2014-2490: Check constant pool constants + - S8037157: Verify <init> call + - S8037162, CVE-2014-4263: More robust DH exchanges + - S8037167, CVE-2014-4216: Better method signature resolution + - S8039520, CVE-2014-4262: More atomicity of atomic updates + * Backports + - S8001108: an attempt to use "<init>" as a method name should elicit NoSuchMethodException + - S8001109: arity mismatch on a call to spreader method handle should elicit IllegalArgumentException + - S8013611: Modal dialog fails to obtain keyboard focus + - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale + - S8019990: IM candidate window appears on the South-East corner of the display. + - S8023990: Regression: postscript size increase from 6u18 + - S8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError + - S8024616: JSR292: lazily initialize core NamedFunctions used for bootstrapping + - S8025030: Enhance stream handling + - S8026188: Enhance envelope factory + - S8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently + - S8028285: RMI Thread can no longer call out to AWT + - S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending + - S8031075: [Regression] focus disappears with shift+tab on dialog having one focus component + - S8032585: JSR292: IllegalAccessError when attempting to invoke protected method from different package + - S8032686: Issues with method invoke + - S8033278: Missed access checks for Lookup.unreflect* after 8032585 + - S8033618: Correct logging output + - S8034926: Attribute classes properly + - S8035613: With active Securitymanager JAXBContext.newInstance fails + - S8035834: InetAddress.getLocalHost() can hang after JDK-8030731 was fixed + - S8035923: Set minor version for hotspot in 7u65 to 65 and build number to b01 + - S8036786: Update jdk7 testlibrary to match jdk8 + - S8036794: Manage JavaScript instances + - S8039324: Increment hsx 24.65 build to b02 for 7u65-b07 + - S8040156: Increment hsx 24.65 build to b03 for 7u65-b08 + - S8041264: Increment hsx 24.65 build to b04 for 7u65-b09 + - S8042264: 7u65 l10n resource file translation update 1 + - S8042582: Test java/awt/KeyboardFocusmanager/ChangeKFMTest/ChangeKFMTest.html fails on Windows x64 + - S8042590: Running form URL throws NPE + - S8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader + - S8043012: (tz) Support tzdata2014c + * Bug fixes + - PR1853: Revert PR729 from minor release + - PR1864: PCSC + OpenJDK 1.7 crash on Fedora 20 + - PR1867: Turn the infinality patch off by default + - PR1868: Avoid x86 workaround when running Zero rather than a JIT + * AArch64 port + - Common frame handling for C1/C2 which correctly handle all frame sizes + - Fix register misuse in verify_method_data_pointer + - Fix register usage in generate_verify_oop(). + - Restrict default ReservedCodeCacheSize to 128M + - Use explicit barrier instructions in C1. + +------------------------------------------------------------------- +Sat Jul 12 20:09:16 UTC 2014 - fstrba(a)suse.com + +- Add back the pulseaudio provider using the new icedtea-sound + module. + +------------------------------------------------------------------- +Thu Jul 10 17:45:22 UTC 2014 - fstrba(a)suse.com + +- Remove bootstrap build for %{arm} + +------------------------------------------------------------------- +Thu Jul 10 15:54:45 UTC 2014 - fstrba(a)suse.com + +- Don't build with fontconfig font rendering + * Fix some font problem regressions (see PR1839) +- Clean up the spec file a bit + +------------------------------------------------------------------- +Fri Jul 4 14:27:25 UTC 2014 - fstrba(a)suse.com + +- Remove some stale dependencies + ++++ 1845 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2014-09-01 07:56:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2014-09-12 15:25:28.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Sep 10 05:48:11 UTC 2014 - coolo(a)suse.com + +- add an explicit 2nd spec file - I liked the beauty of the topadd + _link but our tools just don't expect beauty ;( + +------------------------------------------------------------------- +Tue Sep 9 06:31:47 UTC 2014 - coolo(a)suse.com + +- conflict bootstrap with non-bootstrap versions to avoid file + conflicts + +------------------------------------------------------------------- +Mon Sep 8 07:45:46 UTC 2014 - fstrba(a)suse.com + +- Add provides jre-64 on x86_64. bnc#895191 + +------------------------------------------------------------------- +Fri Sep 5 09:15:34 UTC 2014 - coolo(a)suse.com + +- ignore ecj's java require - we already have java-bootstrap + +------------------------------------------------------------------- New: ---- java-1_7_0-openjdk-bootstrap.changes java-1_7_0-openjdk-bootstrap.spec pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ ++++ 1247 lines (skipped) ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.ndEHQn/_old 2014-09-12 15:25:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ndEHQn/_new 2014-09-12 15:25:31.000000000 +0200 @@ -116,11 +116,7 @@ %endif %endif -%if ! %{with bootstrap} Name: java-1_7_0-openjdk -%else -Name: java-1_7_0-openjdk-bootstrap -%endif Version: %{javaver}.%{buildver} Release: 0 Summary: Java runtime environment based on OpenJDK 7 and IcedTea 7 @@ -147,6 +143,7 @@ Source2000: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar… Source2001: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_… Source2002: java-1_7_0-openjdk.keyring +Source2500: pre_checkin.sh # RPM/distribution specific patches # Remove the use of __DATE__ and __TIME__ in order to diminish unnecessary rebuilds Patch2: file-contains-date-and-time.patch @@ -233,6 +230,9 @@ Provides: java-%{javaver}-openjdk = %{version}-%{release} Provides: java-openjdk = %{version}-%{release} Provides: jre = %{javaver} +%ifarch x86_64 +Provides: jre-64 = %{javaver} +%endif Provides: jre-%{javaver} = %{version}-%{release} Provides: jre-%{javaver}-openjdk = %{version}-%{release} Provides: jre-openjdk = %{version}-%{release} @@ -287,10 +287,12 @@ %if %{with bootstrap} BuildRequires: ecj-bootstrap BuildRequires: java-1_5_0-gcj-compat-devel +Conflicts: java-1_7_0-openjdk +%define _unpackaged_files_terminate_build 0 %else BuildRequires: %{name}-bootstrap >= 1.7.0 BuildRequires: %{name}-bootstrap-devel >= 1.7.0 -#!BuildIgnore: %{name} %{name}-devel %{name}-headless +#!BuildIgnore: %{name} %{name}-devel %{name}-headless java BuildRequires: ecj %endif # Mauve build requirements. @@ -364,6 +366,8 @@ # from http://en.opensuse.org/openSUSE:Package_dependencies#Splitting_off_a_sub-pa… # provides a libjvm.so to ensure update is working well Provides: %{name}:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so +%else +Conflicts: java-1_7_0-openjdk-headless %endif %if %{with_system_lcms} # older lcms2 is known to have security issues, let's depends on fixed version @@ -395,6 +399,8 @@ Provides: java-sdk-%{javaver} = %{version} Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-openjdk = %{version} +%else +Conflicts: java-1_7_0-openjdk-devel %endif %description devel @@ -1215,6 +1221,7 @@ %{_mandir}/man1/wsimport-%{sdklnk}.1* %{_mandir}/man1/xjc-%{sdklnk}.1* +%if ! %{with bootstrap} %files demo %defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/demo @@ -1235,4 +1242,6 @@ %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so %ghost %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar +%endif + %changelog ++++++ pre_checkin.sh ++++++ #! /bin/sh sed -e 's,^Name:.*,Name: java-1_7_0-openjdk-bootstrap,; s,bcond_with bootstrap,bcond_without bootstrap,' java-1_7_0-openjdk.spec > java-1_7_0-openjdk-bootstrap.spec cp java-1_7_0-openjdk.changes java-1_7_0-openjdk-bootstrap.changes -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virtualbox for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2014-09-12 15:25:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2014-08-11 10:07:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2014-09-12 15:25:24.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 8 10:16:53 UTC 2014 - mseben(a)gmail.com + +- modify hint message in virtualbox-60-vboxdrv.rules, so udev rules + will stay enabled also after package update + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-60-vboxdrv.rules ++++++ --- /var/tmp/diff_new_pack.zHK8Zq/_old 2014-09-12 15:25:26.000000000 +0200 +++ /var/tmp/diff_new_pack.zHK8Zq/_new 2014-09-12 15:25:26.000000000 +0200 @@ -1,6 +1,8 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" +# #these lines below give access permission to vboxusers to properly work with usb nodes, but enabling them could be security risk (bnc#664520) !! -#SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -#SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -#SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" -#SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" +#if you can live with this security problem put these lines below in to the new file /etc/udev/rules.d/60-vboxdrv.rules so they will stay enabled also after package update +#SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +#SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +#SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor" +#SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-09-12 15:25:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-08-28 21:05:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-09-12 15:25:22.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 3 12:26:08 UTC 2014 - kstreitova(a)novell.com + +- bnc#894479: fix URL (changed from "http://www.mariab.org" to + "https://www.mariadb.org") +- README.SuSE renamed to README.SUSE + +------------------------------------------------------------------- Old: ---- README.SuSE New: ---- README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.7XWx4c/_old 2014-09-12 15:25:23.000000000 +0200 +++ /var/tmp/diff_new_pack.7XWx4c/_new 2014-09-12 15:25:23.000000000 +0200 @@ -43,14 +43,14 @@ Version: 10.0.13 Release: 0 %define srv_vers 5.6.17 -Url: http://www.mariab.org +Url: https://www.mariadb.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf Source3: README.debug Source4: suse-test-run Source5: mysql.SuSEfirewall2 Source7: README.install -Source8: README.SuSE +Source8: README.SUSE Source9: mysql-patches.tar.bz2 Source10: build.inc Source11: install.inc @@ -388,7 +388,7 @@ %prep %setup -q -n mariadb-%{version} -D -a 9 -cp %_sourcedir/README.SuSE . +cp %_sourcedir/README.SUSE . cp %_sourcedir/suse-test-run . # apply patches from series mysql-patches/tools/quilt-setup.sh "%{S:12}" ++++++ README.SUSE ++++++ Notes about MySQL 5.1 package: ============================== With MySQL 5.1 package we introduced some changes you may like to know. Most of them will affect you only if you are upgrading from previous version and you did some changes to your configuration. 1) Plugins: =========== One of the new features in MySQL 5.1 is support for plugins. So some of the storage engines are now shipped like that. You can use following plugins: - archive - blackhole - federated - example InnoDB is still compiled as internal part of MySQL. If you are upgrading from version 5.0 or if this is your first installation of MySQL 5.1, all plugins will be enabled by default and you can disable them manually later (see http://dev.mysql.com/doc/refman/5.1/en/uninstall-plugin.html). With this change you need to remove skip-federated option from your my.cnf file if you have changed it manually. This option was there by default in previous versions of MySQL. 2) File locations: ================== There were some changes in files locations. Most of them were made in the default configuration file so if you are experiencing problems and you have made some manual adjustments to your /etc/my.cnf, try to merge this file with /etc/my.cnf.rpmnew. File locations changes: - MySQL socket file and pid file were moved from /var/lib/mysql to more reasonable location ( /var/run/mysql ) by default. - MySQL log files are in /var/log/mysql. 3) BerkeleyDB: ============== MySQL no longer contains BerkeleyDB as storage engine. There is no fix for that and if you used it before, you have to migrate your data to different storage engine BEFORE updating. This can be done for example using following command: ALTER TABLE foo ENGINE = INNODB; 4) MySQL Upgrade Log ==================== If you missed messages displayed during automatic MySQL database upgrade, you can find them from now on in /var/log/mysql/mysqld-upgrade.log -- 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-theme for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2014-09-12 15:25:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme.changes 2014-09-03 12:50:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme.changes 2014-09-12 15:25:20.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 10 11:52:33 UTC 2014 - coolo(a)suse.com + +- workaround for rpm's inability to update from symlink to directory +- 3.1.31 + +------------------------------------------------------------------- Old: ---- yast2-theme-3.1.30.tar.bz2 New: ---- yast2-theme-3.1.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme-SLE.spec ++++++ --- /var/tmp/diff_new_pack.TrbOSP/_old 2014-09-12 15:25:21.000000000 +0200 +++ /var/tmp/diff_new_pack.TrbOSP/_new 2014-09-12 15:25:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme-SLE -Version: 3.1.30 +Version: 3.1.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.TrbOSP/_old 2014-09-12 15:25:21.000000000 +0200 +++ /var/tmp/diff_new_pack.TrbOSP/_new 2014-09-12 15:25:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme -Version: 3.1.30 +Version: 3.1.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +82,12 @@ %fdupes $RPM_BUILD_ROOT%{yast_themedir} %fdupes $RPM_BUILD_ROOT/usr/share/icons +%pre -n yast2-branding-openSUSE +# used to be a symlink, we need to remove it so rpm can update to the directory +if test -L %{yast_themedir}/current ; then + rm %{yast_themedir}/current +fi + %files -n yast2-branding-openSUSE %defattr(-,root,root) %dir %{yast_themedir} ++++++ yast2-theme-3.1.30.tar.bz2 -> yast2-theme-3.1.31.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-3.1.30.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-3.1.31.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 curl for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package curl for openSUSE:Factory checked in at 2014-09-12 15:25:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/curl (Old) and /work/SRC/openSUSE:Factory/.curl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "curl" Changes: -------- --- /work/SRC/openSUSE:Factory/curl/curl.changes 2014-09-01 16:59:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.curl.new/curl.changes 2014-09-12 15:25:18.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Sep 10 09:07:59 UTC 2014 - vcizek(a)suse.com + +- update to 7.38.0 + * fixes CVE-2014-3613 (bnc#894575) and CVE-2014-3620 (bnc#895991) + * cookie leaks with IP address as domain and TLDs respectively + Changes: + supports HTTP/2 draft-14 + CURLE_HTTP2 is a new error code + CURLAUTH_NEGOTIATE is a new auth define + CURL_VERSION_GSSAPI is a new capability bit + no longer use fbopenssl for anything + schannel: use CryptGenRandom for random numbers + axtls: define curlssl_random using axTLS's PRNG + cyassl: use RNG_GenerateBlock to generate a good random number + findprotocol: show unsupported protocol within quotes + version: detect and show LibreSSL + version: detect and show BoringSSL + imap/pop3/smtp: Kerberos (SASL GSSAPI) authentication via Windows SSPI + http2: requires nghttp2 0.6.0 or later + Bugfixes: + SECURITY ADVISORY: cookie leak with IP address as domain + SECURITY ADVISORY: cookie leak for TLDs + And many other fixes + +------------------------------------------------------------------- Old: ---- curl-7.37.1.tar.lzma curl-7.37.1.tar.lzma.asc New: ---- curl-7.38.0.tar.lzma curl-7.38.0.tar.lzma.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.fieuSN/_old 2014-09-12 15:25:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fieuSN/_new 2014-09-12 15:25:19.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_without testsuite Name: curl -Version: 7.37.1 +Version: 7.38.0 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wicked for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package wicked for openSUSE:Factory checked in at 2014-09-12 15:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wicked (Old) and /work/SRC/openSUSE:Factory/.wicked.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wicked" Changes: -------- --- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2014-09-06 12:17:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wicked.new/wicked.changes 2014-09-12 15:25:15.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Sep 10 09:34:53 UTC 2014 - pwieczorkiewicz(a)suse.com + +- version 0.6.7 +- config: fixed optional include attribute parsing bug introduced + in version 0.6.6 and causing wicked to fail while config parsing. +- util: install signal handlers only once + +------------------------------------------------------------------- +Tue Sep 9 15:20:02 UTC 2014 - pwieczorkiewicz(a)suse.com + +- version 0.6.6 +- Add wake-on-lan support (bnc#869114) +- ifconfig: delete address first if address differs (bnc#890406) +- config: support a local.xml file, clean-up of config file syntax +- man page wicked-config.5 update +- Clean-up and removing unused functions + +------------------------------------------------------------------- Old: ---- wicked-0.6.5.tar.bz2 New: ---- wicked-0.6.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wicked.spec ++++++ --- /var/tmp/diff_new_pack.WAcWMQ/_old 2014-09-12 15:25:16.000000000 +0200 +++ /var/tmp/diff_new_pack.WAcWMQ/_new 2014-09-12 15:25:16.000000000 +0200 @@ -18,7 +18,7 @@ %define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0} Name: wicked -Version: 0.6.5 +Version: 0.6.7 Release: %{release_prefix}.0.0 Summary: Network configuration infrastructure License: GPL-2.0 ++++++ wicked-0.6.5.tar.bz2 -> wicked-0.6.7.tar.bz2 ++++++ ++++ 1956 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-intel for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package xf86-video-intel for openSUSE:Factory checked in at 2014-09-12 15:24:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old) and /work/SRC/openSUSE:Factory/.xf86-video-intel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-intel" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes 2014-09-01 16:59:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-intel.new/xf86-video-intel.changes 2014-09-12 15:25:12.000000000 +0200 @@ -1,0 +2,41 @@ +Tue Sep 9 13:43:07 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to 3.0 prerelease 2.99.916: + A Quick update for MST in UXA - we need to hook up the RandR outputs + for dynamicaly added connectors. + +------------------------------------------------------------------- +Tue Sep 9 13:40:55 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to 3.0 prerelease 2.99.915: + A significant change to UXA to enable MST and to keep it working on + recent kernels needs some soaking before a major release, and the + usual plethora of bugfixes. One other feature is the support for + hardware rotations on very recent kernels. + + Handle rotated scanouts that are all clear correctly. The region to + update was not being computed correctly, overdrawing the wrong CRTC. + https://bugs.freedesktop.org/show_bug.cgi?id=81820 + + Reset cursor images after rotation and size changes + https://bugs.freedesktop.org/show_bug.cgi?id=81886 + https://bugs.freedesktop.org/show_bug.cgi?id=82273 + https://bugs.freedesktop.org/show_bug.cgi?id=82337 + + Handle stale DRI2 buffers and Client errors more gracefully + + Fallback if we fail to render a glyph onto a too-large surface, e.g. + direct rendering of glyphs onto extended desktops with gen2/gen3. + https://bugs.archlinux.org/task/40949 + + Further work to enable tiled rendering onto large surfaces in + severely aperture and memory constrained devices (e.g. gen2/gen3) + + Honour the Primary option from xorg.conf and mark that as the RandR + primary. + https://bugs.freedesktop.org/show_bug.cgi?id=82193 + https://bugs.freedesktop.org/show_bug.cgi?id=82205 + + Fix another Client-Window DRI2 close race + https://bugs.freedesktop.org/show_bug.cgi?id=82979 + + Fix incorrect discarding of GPU damage when copying over the TearFree + scanout - which caused a flicker in rapidly updated elements (like + simple video panes). + https://bugs.freedesktop.org/show_bug.cgi?id=81973 +- Remove upstreamed patch: + Patch1: U_Erase-cursor-image-when-changing-rotation.patch + +------------------------------------------------------------------- Old: ---- U_Erase-cursor-image-when-changing-rotation.patch xf86-video-intel-2.99.914.tar.bz2 New: ---- xf86-video-intel-2.99.916.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-intel.spec ++++++ --- /var/tmp/diff_new_pack.okD0Cb/_old 2014-09-12 15:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.okD0Cb/_new 2014-09-12 15:25:13.000000000 +0200 @@ -20,7 +20,7 @@ %define backlighthelper 0 Name: xf86-video-intel -Version: 2.99.914 +Version: 2.99.916 Release: 0 Summary: Intel video driver for the Xorg X server License: MIT @@ -88,7 +88,6 @@ ExclusiveArch: %ix86 x86_64 Patch0: U_sna_dri3_mesa_relies_upon_implicit_fences.patch -Patch1: U_Erase-cursor-image-when-changing-rotation.patch %x11_abi_videodrv_req @@ -107,7 +106,6 @@ %setup -q %patch0 -p1 -%patch1 -p1 %build autoreconf -fi ++++++ xf86-video-intel-2.99.914.tar.bz2 -> xf86-video-intel-2.99.916.tar.bz2 ++++++ ++++ 6566 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 kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-09-12 15:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2014-09-07 11:08:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-09-12 15:25:05.000000000 +0200 @@ -1,0 +2,24 @@ +Sun Sep 7 06:40:17 CEST 2014 - jslaby(a)suse.cz + +- Linux 3.16.2 (bko#81111 bnc#887046 bnc#889790). +- Update config files. +- Refresh patches.xen/xen-x86-EFI. +- Refresh patches.xen/xen-x86-bzImage. +- Refresh patches.xen/xen3-auto-common.diff. +- Refresh patches.xen/xen3-patch-2.6.37. +- Delete + patches.fixes/Btrfs-Fix-memory-corruption-by-ulist_add_merge-on-32. +- Delete patches.fixes/drm-omapdrm-fix-compiler-errors. +- Delete + patches.fixes/nfs-nfs3_list_one_acl-check-get_acl-result-with-is_err_or_null. +- Delete + patches.suse/btrfs-0003-read-lock-extent-buffer-while-walking-backrefs.patch. +- Delete + patches.suse/btrfs-0006-fix-compressed-write-corruption-on-enospc.patch. +- Delete + patches.suse/btrfs-0008-fix-csum-tree-corruption-duplicate-and-outdate.patch. +- Delete + patches.suse/btrfs-0033-fix-task-hang-under-heavy-compressed-write.patch. +- commit dcee397 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,11 +25,11 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif BuildRequires: docbook-toys BuildRequires: docbook-utils ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -45,11 +45,11 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif %description ++++++ kernel-obs-qa-xen.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,11 +36,11 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif %description kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif Url: http://www.kernel.org/ BuildRequires: bc ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -18,7 +18,7 @@ %define srcversion 3.16 -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %define vanilla_only 0 @@ -30,11 +30,11 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif Url: http://www.kernel.org/ AutoReqProv: off ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -24,12 +24,12 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 3.16.1 +Version: 3.16.2 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.1 +%define patchversion 3.16.2 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 3.16.1 +Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %else -Release: <RELEASE>.g2ab6585 +Release: <RELEASE>.gdcee397 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2014-08-20 13:07:13.000000000 +0200 +++ new/config/i386/xen 2014-09-07 06:40:17.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -453,6 +453,9 @@ CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y CONFIG_PHYSICAL_START=0x2000 +CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x2000 CONFIG_XEN_BZIMAGE=y CONFIG_HOTPLUG_CPU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2014-08-20 13:07:13.000000000 +0200 +++ new/config/x86_64/xen 2014-09-07 06:40:17.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.0 Kernel Configuration +# Linux/x86_64 3.16.2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -439,6 +439,8 @@ CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y CONFIG_PHYSICAL_START=0x4000 +CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_PHYSICAL_ALIGN=0x4000 CONFIG_XEN_BZIMAGE=y CONFIG_HOTPLUG_CPU=y ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/Btrfs-Fix-memory-corruption-by-ulist_add_merge-on-32 new/patches.fixes/Btrfs-Fix-memory-corruption-by-ulist_add_merge-on-32 --- old/patches.fixes/Btrfs-Fix-memory-corruption-by-ulist_add_merge-on-32 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.fixes/Btrfs-Fix-memory-corruption-by-ulist_add_merge-on-32 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -From 4eb1f66dce6c4dc28dd90a7ffbe6b2b1cb08aa4e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Mon, 28 Jul 2014 10:57:04 +0200 -Subject: [PATCH] Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch -Git-commit: 4eb1f66dce6c4dc28dd90a7ffbe6b2b1cb08aa4e -Patch-mainline: 3.17-rc1 -References: bnc#887046 - -We've got bug reports that btrfs crashes when quota is enabled on -32bit kernel, typically with the Oops like below: - BUG: unable to handle kernel NULL pointer dereference at 00000004 - IP: [<f9234590>] find_parent_nodes+0x360/0x1380 [btrfs] - *pde = 00000000 - Oops: 0000 [#1] SMP - CPU: 0 PID: 151 Comm: kworker/u8:2 Tainted: G S W 3.15.2-1.gd43d97e-default #1 - Workqueue: btrfs-qgroup-rescan normal_work_helper [btrfs] - task: f1478130 ti: f147c000 task.ti: f147c000 - EIP: 0060:[<f9234590>] EFLAGS: 00010213 CPU: 0 - EIP is at find_parent_nodes+0x360/0x1380 [btrfs] - EAX: f147dda8 EBX: f147ddb0 ECX: 00000011 EDX: 00000000 - ESI: 00000000 EDI: f147dda4 EBP: f147ddf8 ESP: f147dd38 - DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 - CR0: 8005003b CR2: 00000004 CR3: 00bf3000 CR4: 00000690 - Stack: - 00000000 00000000 f147dda4 00000050 00000001 00000000 00000001 00000050 - 00000001 00000000 d3059000 00000001 00000022 000000a8 00000000 00000000 - 00000000 000000a1 00000000 00000000 00000001 00000000 00000000 11800000 - Call Trace: - [<f923564d>] __btrfs_find_all_roots+0x9d/0xf0 [btrfs] - [<f9237bb1>] btrfs_qgroup_rescan_worker+0x401/0x760 [btrfs] - [<f9206148>] normal_work_helper+0xc8/0x270 [btrfs] - [<c025e38b>] process_one_work+0x11b/0x390 - [<c025eea1>] worker_thread+0x101/0x340 - [<c026432b>] kthread+0x9b/0xb0 - [<c0712a71>] ret_from_kernel_thread+0x21/0x30 - [<c0264290>] kthread_create_on_node+0x110/0x110 - -This indicates a NULL corruption in prefs_delayed list. The further -investigation and bisection pointed that the call of ulist_add_merge() -results in the corruption. - -ulist_add_merge() takes u64 as aux and writes a 64bit value into -old_aux. The callers of this function in backref.c, however, pass a -pointer of a pointer to old_aux. That is, the function overwrites -64bit value on 32bit pointer. This caused a NULL in the adjacent -variable, in this case, prefs_delayed. - -Here is a quick attempt to band-aid over this: a new function, -ulist_add_merge_ptr() is introduced to pass/store properly a pointer -value instead of u64. There are still ugly void ** cast remaining -in the callers because void ** cannot be taken implicitly. But, it's -safer than explicit cast to u64, anyway. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=887046 -Cc: <stable(a)vger.kernel.org> [v3.11+] -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> -Signed-off-by: Chris Mason <clm(a)fb.com> - ---- - fs/btrfs/backref.c | 11 +++++------ - fs/btrfs/ulist.h | 15 +++++++++++++++ - 2 files changed, 20 insertions(+), 6 deletions(-) - ---- a/fs/btrfs/backref.c -+++ b/fs/btrfs/backref.c -@@ -276,9 +276,8 @@ static int add_all_parents(struct btrfs_ - } - if (ret > 0) - goto next; -- ret = ulist_add_merge(parents, eb->start, -- (uintptr_t)eie, -- (u64 *)&old, GFP_NOFS); -+ ret = ulist_add_merge_ptr(parents, eb->start, -+ eie, (void **)&old, GFP_NOFS); - if (ret < 0) - break; - if (!ret && extent_item_pos) { -@@ -1011,9 +1010,9 @@ again: - goto out; - ref->inode_list = eie; - } -- ret = ulist_add_merge(refs, ref->parent, -- (uintptr_t)ref->inode_list, -- (u64 *)&eie, GFP_NOFS); -+ ret = ulist_add_merge_ptr(refs, ref->parent, -+ ref->inode_list, -+ (void **)&eie, GFP_NOFS); - if (ret < 0) - goto out; - if (!ret && extent_item_pos) { ---- a/fs/btrfs/ulist.h -+++ b/fs/btrfs/ulist.h -@@ -57,6 +57,21 @@ void ulist_free(struct ulist *ulist); - int ulist_add(struct ulist *ulist, u64 val, u64 aux, gfp_t gfp_mask); - int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux, - u64 *old_aux, gfp_t gfp_mask); -+ -+/* just like ulist_add_merge() but take a pointer for the aux data */ -+static inline int ulist_add_merge_ptr(struct ulist *ulist, u64 val, void *aux, -+ void **old_aux, gfp_t gfp_mask) -+{ -+#if BITS_PER_LONG == 32 -+ u64 old64 = (uintptr_t)*old_aux; -+ int ret = ulist_add_merge(ulist, val, (uintptr_t)aux, &old64, gfp_mask); -+ *old_aux = (void *)((uintptr_t)old64); -+ return ret; -+#else -+ return ulist_add_merge(ulist, val, (u64)aux, (u64 *)old_aux, gfp_mask); -+#endif -+} -+ - struct ulist_node *ulist_next(struct ulist *ulist, - struct ulist_iterator *uiter); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-omapdrm-fix-compiler-errors new/patches.fixes/drm-omapdrm-fix-compiler-errors --- old/patches.fixes/drm-omapdrm-fix-compiler-errors 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.fixes/drm-omapdrm-fix-compiler-errors 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -From 2d31ca3ad7d5d44c8adc7f253c96ce33f3a2e931 Mon Sep 17 00:00:00 2001 -From: Russell King <rmk+kernel(a)arm.linux.org.uk> -Date: Sat, 12 Jul 2014 10:53:41 +0100 -Subject: [PATCH] drm: omapdrm: fix compiler errors -Git-commit: 2d31ca3ad7d5d44c8adc7f253c96ce33f3a2e931 -Patch-mainline: 3.17-rc1 - -Regular randconfig nightly testing has detected problems with omapdrm. - -omapdrm fails to build when the kernel is built to support 64-bit DMA -addresses and/or 64-bit physical addresses due to an assumption about -the width of these types. - -Use %pad to print DMA addresses, rather than %x or %Zx (which is even -more wrong than %x). Avoid passing a uint32_t pointer into a function -which expects dma_addr_t pointer. - -Drivers/gpu/drm/omapdrm/omap_plane.c: In function 'omap_plane_pre_apply': -drivers/gpu/drm/omapdrm/omap_plane.c:145:2: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Werror=format] -drivers/gpu/drm/omapdrm/omap_plane.c:145:2: error: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Werror=format] -Make[5]: *** [drivers/gpu/drm/omapdrm/omap_plane.o] Error 1 -Drivers/gpu/drm/omapdrm/omap_gem.c: In function 'omap_gem_get_paddr': -drivers/gpu/drm/omapdrm/omap_gem.c:794:4: error: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'dma_addr_t' [-Werror=format] -Drivers/gpu/drm/omapdrm/omap_gem.c: In function 'omap_gem_describe': -drivers/gpu/drm/omapdrm/omap_gem.c:991:4: error: format '%Zx' expects argument of type 'size_t', but argument 7 has type 'dma_addr_t' [-Werror=format] -Drivers/gpu/drm/omapdrm/omap_gem.c: In function 'omap_gem_init': -drivers/gpu/drm/omapdrm/omap_gem.c:1470:4: error: format '%x' expects argument of type 'unsigned int', but argument 7 has type 'dma_addr_t' [-Werror=format] -Make[5]: *** [drivers/gpu/drm/omapdrm/omap_gem.o] Error 1 -Drivers/gpu/drm/omapdrm/omap_dmm_tiler.c: In function 'dmm_txn_append': -drivers/gpu/drm/omapdrm/omap_dmm_tiler.c:226:2: error: passing argument 3 of 'alloc_dma' from incompatible pointer type [-Werror] -Make[5]: *** [drivers/gpu/drm/omapdrm/omap_dmm_tiler.o] Error 1 -Make[5]: Target `__build' not remade because of errors. -Make[4]: *** [drivers/gpu/drm/omapdrm] Error 2 - -Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> -Signed-off-by: Dave Airlie <airlied(a)redhat.com> -Acked-by: Takashi Iwai <tiwai(a)suse.de> - ---- - drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 ++++-- - drivers/gpu/drm/omapdrm/omap_gem.c | 10 +++++----- - drivers/gpu/drm/omapdrm/omap_plane.c | 4 ++-- - 3 files changed, 11 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c -+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c -@@ -199,7 +199,7 @@ static struct dmm_txn *dmm_txn_init(stru - static void dmm_txn_append(struct dmm_txn *txn, struct pat_area *area, - struct page **pages, uint32_t npages, uint32_t roll) - { -- dma_addr_t pat_pa = 0; -+ dma_addr_t pat_pa = 0, data_pa = 0; - uint32_t *data; - struct pat *pat; - struct refill_engine *engine = txn->engine_handle; -@@ -223,7 +223,9 @@ static void dmm_txn_append(struct dmm_tx - .lut_id = engine->tcm->lut_id, - }; - -- data = alloc_dma(txn, 4*i, &pat->data_pa); -+ data = alloc_dma(txn, 4*i, &data_pa); -+ /* FIXME: what if data_pa is more than 32-bit ? */ -+ pat->data_pa = data_pa; - - while (i--) { - int n = i + roll; ---- a/drivers/gpu/drm/omapdrm/omap_gem.c -+++ b/drivers/gpu/drm/omapdrm/omap_gem.c -@@ -791,7 +791,7 @@ int omap_gem_get_paddr(struct drm_gem_ob - omap_obj->paddr = tiler_ssptr(block); - omap_obj->block = block; - -- DBG("got paddr: %08x", omap_obj->paddr); -+ DBG("got paddr: %pad", &omap_obj->paddr); - } - - omap_obj->paddr_cnt++; -@@ -985,9 +985,9 @@ void omap_gem_describe(struct drm_gem_ob - - off = drm_vma_node_start(&obj->vma_node); - -- seq_printf(m, "%08x: %2d (%2d) %08llx %08Zx (%2d) %p %4d", -+ seq_printf(m, "%08x: %2d (%2d) %08llx %pad (%2d) %p %4d", - omap_obj->flags, obj->name, obj->refcount.refcount.counter, -- off, omap_obj->paddr, omap_obj->paddr_cnt, -+ off, &omap_obj->paddr, omap_obj->paddr_cnt, - omap_obj->vaddr, omap_obj->roll); - - if (omap_obj->flags & OMAP_BO_TILED) { -@@ -1467,8 +1467,8 @@ void omap_gem_init(struct drm_device *de - entry->paddr = tiler_ssptr(block); - entry->block = block; - -- DBG("%d:%d: %dx%d: paddr=%08x stride=%d", i, j, w, h, -- entry->paddr, -+ DBG("%d:%d: %dx%d: paddr=%pad stride=%d", i, j, w, h, -+ &entry->paddr, - usergart[i].stride_pfn << PAGE_SHIFT); - } - } ---- a/drivers/gpu/drm/omapdrm/omap_plane.c -+++ b/drivers/gpu/drm/omapdrm/omap_plane.c -@@ -142,8 +142,8 @@ static void omap_plane_pre_apply(struct - DBG("%dx%d -> %dx%d (%d)", info->width, info->height, - info->out_width, info->out_height, - info->screen_width); -- DBG("%d,%d %08x %08x", info->pos_x, info->pos_y, -- info->paddr, info->p_uv_addr); -+ DBG("%d,%d %pad %pad", info->pos_x, info->pos_y, -+ &info->paddr, &info->p_uv_addr); - - /* TODO: */ - ilace = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/nfs-nfs3_list_one_acl-check-get_acl-result-with-is_err_or_null new/patches.fixes/nfs-nfs3_list_one_acl-check-get_acl-result-with-is_err_or_null --- old/patches.fixes/nfs-nfs3_list_one_acl-check-get_acl-result-with-is_err_or_null 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.fixes/nfs-nfs3_list_one_acl-check-get_acl-result-with-is_err_or_null 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -From: Andrey Utkin <andrey.krieger.utkin(a)gmail.com> -Subject: nfs: nfs3_list_one_acl(): check get_acl() result with IS_ERR_OR_NULL -Patch-mainline: Submitted to LKML 24 Jul 2014, reviewed by Trond and HCH -References: bko#81111 bnc#889790 - -There was a check for result being not NULL. But get_acl() may return -NULL, or ERR_PTR, or actual pointer. -The purpose of the function where current change is done is to "list -ACLs only when they are available", so any error condition of get_acl() -mustn't be elevated, and returning 0 there is still valid. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81111 -Signed-off-by: Andrey Utkin <andrey.krieger.utkin(a)gmail.com> -Acked-by: Jeff Mahoney <jeffm(a)suse.com> ---- - fs/nfs/nfs3acl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c -index 8f854dd..d0fec26 100644 ---- a/fs/nfs/nfs3acl.c -+++ b/fs/nfs/nfs3acl.c -@@ -256,7 +256,7 @@ nfs3_list_one_acl(struct inode *inode, int type, const char *name, void *data, - char *p = data + *result; - - acl = get_acl(inode, type); -- if (!acl) -+ if (IS_ERR_OR_NULL(acl)) - return 0; - - posix_acl_release(acl); - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 6080 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-0003-read-lock-extent-buffer-while-walking-backrefs.patch new/patches.suse/btrfs-0003-read-lock-extent-buffer-while-walking-backrefs.patch --- old/patches.suse/btrfs-0003-read-lock-extent-buffer-while-walking-backrefs.patch 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.suse/btrfs-0003-read-lock-extent-buffer-while-walking-backrefs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Filipe Manana <fdmanana(a)suse.com> -Date: Wed, 2 Jul 2014 20:07:54 +0100 -Patch-mainline: 3.17 -Git-commit: 6f7ff6d7832c6be13e8c95598884dbc40ad69fb7 -Subject: [PATCH] Btrfs: read lock extent buffer while walking backrefs - -Before processing the extent buffer, acquire a read lock on it, so -that we're safe against concurrent updates on the extent buffer. - -Signed-off-by: Filipe Manana <fdmanana(a)suse.com> -Signed-off-by: Chris Mason <clm(a)fb.com> -Signed-off-by: David Sterba <dsterba(a)suse.cz> ---- - fs/btrfs/backref.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/fs/btrfs/backref.c -+++ b/fs/btrfs/backref.c -@@ -1001,8 +1001,11 @@ again: - ret = -EIO; - goto out; - } -+ btrfs_tree_read_lock(eb); -+ btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK); - ret = find_extent_in_eb(eb, bytenr, - *extent_item_pos, &eie); -+ btrfs_tree_read_unlock_blocking(eb); - free_extent_buffer(eb); - if (ret < 0) - goto out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-0006-fix-compressed-write-corruption-on-enospc.patch new/patches.suse/btrfs-0006-fix-compressed-write-corruption-on-enospc.patch --- old/patches.suse/btrfs-0006-fix-compressed-write-corruption-on-enospc.patch 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.suse/btrfs-0006-fix-compressed-write-corruption-on-enospc.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -From: Liu Bo <bo.li.liu(a)oracle.com> -Date: Thu, 24 Jul 2014 22:48:05 +0800 -Patch-mainline: 3.17 -Git-commit: ce62003f690dff38d3164a632ec69efa15c32cbf -Subject: [PATCH] Btrfs: fix compressed write corruption on enospc - -When failing to allocate space for the whole compressed extent, we'll -fallback to uncompressed IO, but we've forgotten to redirty the pages -which belong to this compressed extent, and these 'clean' pages will -simply skip 'submit' part and go to endio directly, at last we got data -corruption as we write nothing. - -Signed-off-by: Liu Bo <bo.li.liu(a)oracle.com> -Tested-By: Martin Steigerwald <martin(a)lichtvoll.de> -Signed-off-by: Chris Mason <clm(a)fb.com> -Signed-off-by: David Sterba <dsterba(a)suse.cz> ---- - fs/btrfs/inode.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/fs/btrfs/inode.c -+++ b/fs/btrfs/inode.c -@@ -709,6 +709,18 @@ retry: - unlock_extent(io_tree, async_extent->start, - async_extent->start + - async_extent->ram_size - 1); -+ -+ /* -+ * we need to redirty the pages if we decide to -+ * fallback to uncompressed IO, otherwise we -+ * will not submit these pages down to lower -+ * layers. -+ */ -+ extent_range_redirty_for_io(inode, -+ async_extent->start, -+ async_extent->start + -+ async_extent->ram_size - 1); -+ - goto retry; - } - goto out_free; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-0008-fix-csum-tree-corruption-duplicate-and-outdate.patch new/patches.suse/btrfs-0008-fix-csum-tree-corruption-duplicate-and-outdate.patch --- old/patches.suse/btrfs-0008-fix-csum-tree-corruption-duplicate-and-outdate.patch 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.suse/btrfs-0008-fix-csum-tree-corruption-duplicate-and-outdate.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -From: Filipe Manana <fdmanana(a)suse.com> -Date: Sat, 9 Aug 2014 21:22:27 +0100 -Patch-mainline: 3.17 -Git-commit: 27b9a8122ff71a8cadfbffb9c4f0694300464f3b -Subject: [PATCH] Btrfs: fix csum tree corruption, duplicate and outdated - checksums - -Under rare circumstances we can end up leaving 2 versions of a checksum -for the same file extent range. - -The reason for this is that after calling btrfs_next_leaf we process -slot 0 of the leaf it returns, instead of processing the slot set in -path->slots[0]. Most of the time (by far) path->slots[0] is 0, but after -btrfs_next_leaf() releases the path and before it searches for the next -leaf, another task might cause a split of the next leaf, which migrates -some of its keys to the leaf we were processing before calling -btrfs_next_leaf(). In this case btrfs_next_leaf() returns again the -same leaf but with path->slots[0] having a slot number corresponding -to the first new key it got, that is, a slot number that didn't exist -before calling btrfs_next_leaf(), as the leaf now has more keys than -it had before. So we must really process the returned leaf starting at -path->slots[0] always, as it isn't always 0, and the key at slot 0 can -have an offset much lower than our search offset/bytenr. - -For example, consider the following scenario, where we have: - -sums->bytenr: 40157184, sums->len: 16384, sums end: 40173568 -four 4kb file data blocks with offsets 40157184, 40161280, 40165376, 40169472 - - Leaf N: - - slot = 0 slot = btrfs_header_nritems() - 1 - |-------------------------------------------------------------------| - | [(CSUM CSUM 39239680), size 8] ... [(CSUM CSUM 40116224), size 4] | - |-------------------------------------------------------------------| - - Leaf N + 1: - - slot = 0 slot = btrfs_header_nritems() - 1 - |--------------------------------------------------------------------| - | [(CSUM CSUM 40161280), size 32] ... [((CSUM CSUM 40615936), size 8 | - |--------------------------------------------------------------------| - -Because we are at the last slot of leaf N, we call btrfs_next_leaf() to -find the next highest key, which releases the current path and then searches -for that next key. However after releasing the path and before finding that -next key, the item at slot 0 of leaf N + 1 gets moved to leaf N, due to a call -to ctree.c:push_leaf_left() (via ctree.c:split_leaf()), and therefore -btrfs_next_leaf() will returns us a path again with leaf N but with the slot -pointing to its new last key (CSUM CSUM 40161280). This new version of leaf N -is then: - - slot = 0 slot = btrfs_header_nritems() - 2 slot = btrfs_header_nritems() - 1 - |----------------------------------------------------------------------------------------------------| - | [(CSUM CSUM 39239680), size 8] ... [(CSUM CSUM 40116224), size 4] [(CSUM CSUM 40161280), size 32] | - |----------------------------------------------------------------------------------------------------| - -And incorrecly using slot 0, makes us set next_offset to 39239680 and we jump -into the "insert:" label, which will set tmp to: - - tmp = min((sums->len - total_bytes) >> blocksize_bits, - (next_offset - file_key.offset) >> blocksize_bits) = - min((16384 - 0) >> 12, (39239680 - 40157184) >> 12) = - min(4, (u64)-917504 = 18446744073708634112 >> 12) = 4 - -and - - ins_size = csum_size * tmp = 4 * 4 = 16 bytes. - -In other words, we insert a new csum item in the tree with key -(CSUM_OBJECTID CSUM_KEY 40157184 = sums->bytenr) that contains the checksums -for all the data (4 blocks of 4096 bytes each = sums->len). Which is wrong, -because the item with key (CSUM CSUM 40161280) (the one that was moved from -leaf N + 1 to the end of leaf N) contains the old checksums of the last 12288 -bytes of our data and won't get those old checksums removed. - -So this leaves us 2 different checksums for 3 4kb blocks of data in the tree, -and breaks the logical rule: - - Key_N+1.offset >= Key_N.offset + length_of_data_its_checksums_cover - -An obvious bad effect of this is that a subsequent csum tree lookup to get -the checksum of any of the blocks with logical offset of 40161280, 40165376 -or 40169472 (the last 3 4kb blocks of file data), will get the old checksums. - -Cc: stable(a)vger.kernel.org -Signed-off-by: Filipe Manana <fdmanana(a)suse.com> -Signed-off-by: Chris Mason <clm(a)fb.com> -Signed-off-by: David Sterba <dsterba(a)suse.cz> ---- - fs/btrfs/file-item.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/fs/btrfs/file-item.c -+++ b/fs/btrfs/file-item.c -@@ -756,7 +756,7 @@ again: - found_next = 1; - if (ret != 0) - goto insert; -- slot = 0; -+ slot = path->slots[0]; - } - btrfs_item_key_to_cpu(path->nodes[0], &found_key, slot); - if (found_key.objectid != BTRFS_EXTENT_CSUM_OBJECTID || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-0033-fix-task-hang-under-heavy-compressed-write.patch new/patches.suse/btrfs-0033-fix-task-hang-under-heavy-compressed-write.patch --- old/patches.suse/btrfs-0033-fix-task-hang-under-heavy-compressed-write.patch 2014-08-26 13:57:20.000000000 +0200 +++ new/patches.suse/btrfs-0033-fix-task-hang-under-heavy-compressed-write.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,567 +0,0 @@ -From: Liu Bo <bo.li.liu(a)oracle.com> -Date: Fri, 15 Aug 2014 23:36:53 +0800 -Patch-mainline: 3.17 -Git-commit: 9e0af23764344f7f1b68e4eefbe7dc865018b63d -Subject: [PATCH] Btrfs: fix task hang under heavy compressed write - -This has been reported and discussed for a long time, and this hang occurs in -both 3.15 and 3.16. - -Btrfs now migrates to use kernel workqueue, but it introduces this hang problem. - -Btrfs has a kind of work queued as an ordered way, which means that its -ordered_func() must be processed in the way of FIFO, so it usually looks like -- - -normal_work_helper(arg) - work = container_of(arg, struct btrfs_work, normal_work); - - work->func() <---- (we name it work X) - for ordered_work in wq->ordered_list - ordered_work->ordered_func() - ordered_work->ordered_free() - -The hang is a rare case, first when we find free space, we get an uncached block -group, then we go to read its free space cache inode for free space information, -so it will - -file a readahead request - btrfs_readpages() - for page that is not in page cache - __do_readpage() - submit_extent_page() - btrfs_submit_bio_hook() - btrfs_bio_wq_end_io() - submit_bio() - end_workqueue_bio() <--(ret by the 1st endio) - queue a work(named work Y) for the 2nd - also the real endio() - -So the hang occurs when work Y's work_struct and work X's work_struct happens -to share the same address. - -A bit more explanation, - -A,B,C -- struct btrfs_work -arg -- struct work_struct - -kthread: -worker_thread() - pick up a work_struct from @worklist - process_one_work(arg) - worker->current_work = arg; <-- arg is A->normal_work - worker->current_func(arg) - normal_work_helper(arg) - A = container_of(arg, struct btrfs_work, normal_work); - - A->func() - A->ordered_func() - A->ordered_free() <-- A gets freed - - B->ordered_func() - submit_compressed_extents() - find_free_extent() - load_free_space_inode() - ... <-- (the above readhead stack) - end_workqueue_bio() - btrfs_queue_work(work C) - B->ordered_free() - -As if work A has a high priority in wq->ordered_list and there are more ordered -works queued after it, such as B->ordered_func(), its memory could have been -freed before normal_work_helper() returns, which means that kernel workqueue -code worker_thread() still has worker->current_work pointer to be work -A->normal_work's, ie. arg's address. - -Meanwhile, work C is allocated after work A is freed, work C->normal_work -and work A->normal_work are likely to share the same address(I confirmed this -with ftrace output, so I'm not just guessing, it's rare though). - -When another kthread picks up work C->normal_work to process, and finds our -kthread is processing it(see find_worker_executing_work()), it'll think -work C as a collision and skip then, which ends up nobody processing work C. - -So the situation is that our kthread is waiting forever on work C. - -Besides, there're other cases that can lead to deadlock, but the real problem -is that all btrfs workqueue shares one work->func, -- normal_work_helper, -so this makes each workqueue to have its own helper function, but only a -wraper pf normal_work_helper. - -With this patch, I no long hit the above hang. - -Signed-off-by: Liu Bo <bo.li.liu(a)oracle.com> -Signed-off-by: Chris Mason <clm(a)fb.com> -Signed-off-by: David Sterba <dsterba(a)suse.cz> ---- - fs/btrfs/async-thread.c | 44 +++++++++++++++++++++++++++++++-------- - fs/btrfs/async-thread.h | 28 +++++++++++++++++++++++- - fs/btrfs/delayed-inode.c | 4 +-- - fs/btrfs/disk-io.c | 53 +++++++++++++++++++++++++---------------------- - fs/btrfs/extent-tree.c | 7 +++--- - fs/btrfs/inode.c | 35 ++++++++++++++++++++----------- - fs/btrfs/ordered-data.c | 1 - fs/btrfs/qgroup.c | 1 - fs/btrfs/raid56.c | 9 +++++-- - fs/btrfs/reada.c | 3 +- - fs/btrfs/scrub.c | 14 +++++++----- - fs/btrfs/volumes.c | 3 +- - 12 files changed, 141 insertions(+), 61 deletions(-) - ---- a/fs/btrfs/async-thread.c -+++ b/fs/btrfs/async-thread.c -@@ -22,7 +22,6 @@ - #include <linux/list.h> - #include <linux/spinlock.h> - #include <linux/freezer.h> --#include <linux/workqueue.h> - #include "async-thread.h" - #include "ctree.h" - -@@ -55,8 +54,39 @@ struct btrfs_workqueue { - struct __btrfs_workqueue *high; - }; - --static inline struct __btrfs_workqueue --*__btrfs_alloc_workqueue(const char *name, int flags, int max_active, -+static void normal_work_helper(struct btrfs_work *work); -+ -+#define BTRFS_WORK_HELPER(name) \ -+void btrfs_##name(struct work_struct *arg) \ -+{ \ -+ struct btrfs_work *work = container_of(arg, struct btrfs_work, \ -+ normal_work); \ -+ normal_work_helper(work); \ -+} -+ -+BTRFS_WORK_HELPER(worker_helper); -+BTRFS_WORK_HELPER(delalloc_helper); -+BTRFS_WORK_HELPER(flush_delalloc_helper); -+BTRFS_WORK_HELPER(cache_helper); -+BTRFS_WORK_HELPER(submit_helper); -+BTRFS_WORK_HELPER(fixup_helper); -+BTRFS_WORK_HELPER(endio_helper); -+BTRFS_WORK_HELPER(endio_meta_helper); -+BTRFS_WORK_HELPER(endio_meta_write_helper); -+BTRFS_WORK_HELPER(endio_raid56_helper); -+BTRFS_WORK_HELPER(rmw_helper); -+BTRFS_WORK_HELPER(endio_write_helper); -+BTRFS_WORK_HELPER(freespace_write_helper); -+BTRFS_WORK_HELPER(delayed_meta_helper); -+BTRFS_WORK_HELPER(readahead_helper); -+BTRFS_WORK_HELPER(qgroup_rescan_helper); -+BTRFS_WORK_HELPER(extent_refs_helper); -+BTRFS_WORK_HELPER(scrub_helper); -+BTRFS_WORK_HELPER(scrubwrc_helper); -+BTRFS_WORK_HELPER(scrubnc_helper); -+ -+static struct __btrfs_workqueue * -+__btrfs_alloc_workqueue(const char *name, int flags, int max_active, - int thresh) - { - struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); -@@ -232,13 +262,11 @@ static void run_ordered_work(struct __bt - spin_unlock_irqrestore(lock, flags); - } - --static void normal_work_helper(struct work_struct *arg) -+static void normal_work_helper(struct btrfs_work *work) - { -- struct btrfs_work *work; - struct __btrfs_workqueue *wq; - int need_order = 0; - -- work = container_of(arg, struct btrfs_work, normal_work); - /* - * We should not touch things inside work in the following cases: - * 1) after work->func() if it has no ordered_free -@@ -262,7 +290,7 @@ static void normal_work_helper(struct wo - trace_btrfs_all_work_done(work); - } - --void btrfs_init_work(struct btrfs_work *work, -+void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func, - btrfs_func_t func, - btrfs_func_t ordered_func, - btrfs_func_t ordered_free) -@@ -270,7 +298,7 @@ void btrfs_init_work(struct btrfs_work * - work->func = func; - work->ordered_func = ordered_func; - work->ordered_free = ordered_free; -- INIT_WORK(&work->normal_work, normal_work_helper); -+ INIT_WORK(&work->normal_work, uniq_func); - INIT_LIST_HEAD(&work->ordered_list); - work->flags = 0; - } ---- a/fs/btrfs/async-thread.h -+++ b/fs/btrfs/async-thread.h -@@ -19,12 +19,14 @@ - - #ifndef __BTRFS_ASYNC_THREAD_ - #define __BTRFS_ASYNC_THREAD_ -+#include <linux/workqueue.h> - - struct btrfs_workqueue; - /* Internal use only */ - struct __btrfs_workqueue; - struct btrfs_work; - typedef void (*btrfs_func_t)(struct btrfs_work *arg); -+typedef void (*btrfs_work_func_t)(struct work_struct *arg); - - struct btrfs_work { - btrfs_func_t func; -@@ -38,11 +40,35 @@ struct btrfs_work { - unsigned long flags; - }; - -+#define BTRFS_WORK_HELPER_PROTO(name) \ -+void btrfs_##name(struct work_struct *arg) -+ -+BTRFS_WORK_HELPER_PROTO(worker_helper); -+BTRFS_WORK_HELPER_PROTO(delalloc_helper); -+BTRFS_WORK_HELPER_PROTO(flush_delalloc_helper); -+BTRFS_WORK_HELPER_PROTO(cache_helper); -+BTRFS_WORK_HELPER_PROTO(submit_helper); -+BTRFS_WORK_HELPER_PROTO(fixup_helper); -+BTRFS_WORK_HELPER_PROTO(endio_helper); -+BTRFS_WORK_HELPER_PROTO(endio_meta_helper); -+BTRFS_WORK_HELPER_PROTO(endio_meta_write_helper); -+BTRFS_WORK_HELPER_PROTO(endio_raid56_helper); -+BTRFS_WORK_HELPER_PROTO(rmw_helper); -+BTRFS_WORK_HELPER_PROTO(endio_write_helper); -+BTRFS_WORK_HELPER_PROTO(freespace_write_helper); -+BTRFS_WORK_HELPER_PROTO(delayed_meta_helper); -+BTRFS_WORK_HELPER_PROTO(readahead_helper); -+BTRFS_WORK_HELPER_PROTO(qgroup_rescan_helper); -+BTRFS_WORK_HELPER_PROTO(extent_refs_helper); -+BTRFS_WORK_HELPER_PROTO(scrub_helper); -+BTRFS_WORK_HELPER_PROTO(scrubwrc_helper); -+BTRFS_WORK_HELPER_PROTO(scrubnc_helper); -+ - struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, - int flags, - int max_active, - int thresh); --void btrfs_init_work(struct btrfs_work *work, -+void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper, - btrfs_func_t func, - btrfs_func_t ordered_func, - btrfs_func_t ordered_free); ---- a/fs/btrfs/delayed-inode.c -+++ b/fs/btrfs/delayed-inode.c -@@ -1395,8 +1395,8 @@ static int btrfs_wq_run_delayed_node(str - return -ENOMEM; - - async_work->delayed_root = delayed_root; -- btrfs_init_work(&async_work->work, btrfs_async_run_delayed_root, -- NULL, NULL); -+ btrfs_init_work(&async_work->work, btrfs_delayed_meta_helper, -+ btrfs_async_run_delayed_root, NULL, NULL); - async_work->nr = nr; - - btrfs_queue_work(root->fs_info->delayed_workers, &async_work->work); ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -39,7 +39,6 @@ - #include "btrfs_inode.h" - #include "volumes.h" - #include "print-tree.h" --#include "async-thread.h" - #include "locking.h" - #include "tree-log.h" - #include "free-space-cache.h" -@@ -695,35 +694,41 @@ static void end_workqueue_bio(struct bio - { - struct end_io_wq *end_io_wq = bio->bi_private; - struct btrfs_fs_info *fs_info; -+ struct btrfs_workqueue *wq; -+ btrfs_work_func_t func; - - fs_info = end_io_wq->info; - end_io_wq->error = err; -- btrfs_init_work(&end_io_wq->work, end_workqueue_fn, NULL, NULL); - - if (bio->bi_rw & REQ_WRITE) { -- if (end_io_wq->metadata == BTRFS_WQ_ENDIO_METADATA) -- btrfs_queue_work(fs_info->endio_meta_write_workers, -- &end_io_wq->work); -- else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_FREE_SPACE) -- btrfs_queue_work(fs_info->endio_freespace_worker, -- &end_io_wq->work); -- else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56) -- btrfs_queue_work(fs_info->endio_raid56_workers, -- &end_io_wq->work); -- else -- btrfs_queue_work(fs_info->endio_write_workers, -- &end_io_wq->work); -+ if (end_io_wq->metadata == BTRFS_WQ_ENDIO_METADATA) { -+ wq = fs_info->endio_meta_write_workers; -+ func = btrfs_endio_meta_write_helper; -+ } else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_FREE_SPACE) { -+ wq = fs_info->endio_freespace_worker; -+ func = btrfs_freespace_write_helper; -+ } else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56) { -+ wq = fs_info->endio_raid56_workers; -+ func = btrfs_endio_raid56_helper; -+ } else { -+ wq = fs_info->endio_write_workers; -+ func = btrfs_endio_write_helper; -+ } - } else { -- if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56) -- btrfs_queue_work(fs_info->endio_raid56_workers, -- &end_io_wq->work); -- else if (end_io_wq->metadata) -- btrfs_queue_work(fs_info->endio_meta_workers, -- &end_io_wq->work); -- else -- btrfs_queue_work(fs_info->endio_workers, -- &end_io_wq->work); -+ if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56) { -+ wq = fs_info->endio_raid56_workers; -+ func = btrfs_endio_raid56_helper; -+ } else if (end_io_wq->metadata) { -+ wq = fs_info->endio_meta_workers; -+ func = btrfs_endio_meta_helper; -+ } else { -+ wq = fs_info->endio_workers; -+ func = btrfs_endio_helper; -+ } - } -+ -+ btrfs_init_work(&end_io_wq->work, func, end_workqueue_fn, NULL, NULL); -+ btrfs_queue_work(wq, &end_io_wq->work); - } - - /* -@@ -830,7 +835,7 @@ int btrfs_wq_submit_bio(struct btrfs_fs_ - async->submit_bio_start = submit_bio_start; - async->submit_bio_done = submit_bio_done; - -- btrfs_init_work(&async->work, run_one_async_start, -+ btrfs_init_work(&async->work, btrfs_worker_helper, run_one_async_start, - run_one_async_done, run_one_async_free); - - async->bio_flags = bio_flags; ---- a/fs/btrfs/extent-tree.c -+++ b/fs/btrfs/extent-tree.c -@@ -552,7 +552,8 @@ static int cache_block_group(struct btrf - caching_ctl->block_group = cache; - caching_ctl->progress = cache->key.objectid; - atomic_set(&caching_ctl->count, 1); -- btrfs_init_work(&caching_ctl->work, caching_thread, NULL, NULL); -+ btrfs_init_work(&caching_ctl->work, btrfs_cache_helper, -+ caching_thread, NULL, NULL); - - spin_lock(&cache->lock); - /* -@@ -2749,8 +2750,8 @@ int btrfs_async_run_delayed_refs(struct - async->sync = 0; - init_completion(&async->wait); - -- btrfs_init_work(&async->work, delayed_ref_async_start, -- NULL, NULL); -+ btrfs_init_work(&async->work, btrfs_extent_refs_helper, -+ delayed_ref_async_start, NULL, NULL); - - btrfs_queue_work(root->fs_info->extent_workers, &async->work); - ---- a/fs/btrfs/inode.c -+++ b/fs/btrfs/inode.c -@@ -1096,8 +1096,10 @@ static int cow_file_range_async(struct i - async_cow->end = cur_end; - INIT_LIST_HEAD(&async_cow->extents); - -- btrfs_init_work(&async_cow->work, async_cow_start, -- async_cow_submit, async_cow_free); -+ btrfs_init_work(&async_cow->work, -+ btrfs_delalloc_helper, -+ async_cow_start, async_cow_submit, -+ async_cow_free); - - nr_pages = (cur_end - start + PAGE_CACHE_SIZE) >> - PAGE_CACHE_SHIFT; -@@ -1881,7 +1883,8 @@ static int btrfs_writepage_start_hook(st - - SetPageChecked(page); - page_cache_get(page); -- btrfs_init_work(&fixup->work, btrfs_writepage_fixup_worker, NULL, NULL); -+ btrfs_init_work(&fixup->work, btrfs_fixup_helper, -+ btrfs_writepage_fixup_worker, NULL, NULL); - fixup->page = page; - btrfs_queue_work(root->fs_info->fixup_workers, &fixup->work); - return -EBUSY; -@@ -2822,7 +2825,8 @@ static int btrfs_writepage_end_io_hook(s - struct inode *inode = page->mapping->host; - struct btrfs_root *root = BTRFS_I(inode)->root; - struct btrfs_ordered_extent *ordered_extent = NULL; -- struct btrfs_workqueue *workers; -+ struct btrfs_workqueue *wq; -+ btrfs_work_func_t func; - - trace_btrfs_writepage_end_io_hook(page, start, end, uptodate); - -@@ -2831,13 +2835,17 @@ static int btrfs_writepage_end_io_hook(s - end - start + 1, uptodate)) - return 0; - -- btrfs_init_work(&ordered_extent->work, finish_ordered_fn, NULL, NULL); -+ if (btrfs_is_free_space_inode(inode)) { -+ wq = root->fs_info->endio_freespace_worker; -+ func = btrfs_freespace_write_helper; -+ } else { -+ wq = root->fs_info->endio_write_workers; -+ func = btrfs_endio_write_helper; -+ } - -- if (btrfs_is_free_space_inode(inode)) -- workers = root->fs_info->endio_freespace_worker; -- else -- workers = root->fs_info->endio_write_workers; -- btrfs_queue_work(workers, &ordered_extent->work); -+ btrfs_init_work(&ordered_extent->work, func, finish_ordered_fn, NULL, -+ NULL); -+ btrfs_queue_work(wq, &ordered_extent->work); - - return 0; - } -@@ -7173,7 +7181,8 @@ again: - if (!ret) - goto out_test; - -- btrfs_init_work(&ordered->work, finish_ordered_fn, NULL, NULL); -+ btrfs_init_work(&ordered->work, btrfs_endio_write_helper, -+ finish_ordered_fn, NULL, NULL); - btrfs_queue_work(root->fs_info->endio_write_workers, - &ordered->work); - out_test: -@@ -8542,7 +8551,9 @@ struct btrfs_delalloc_work *btrfs_alloc_ - work->inode = inode; - work->wait = wait; - work->delay_iput = delay_iput; -- btrfs_init_work(&work->work, btrfs_run_delalloc_work, NULL, NULL); -+ WARN_ON_ONCE(!inode); -+ btrfs_init_work(&work->work, btrfs_flush_delalloc_helper, -+ btrfs_run_delalloc_work, NULL, NULL); - - return work; - } ---- a/fs/btrfs/ordered-data.c -+++ b/fs/btrfs/ordered-data.c -@@ -627,6 +627,7 @@ int btrfs_wait_ordered_extents(struct bt - spin_unlock(&root->ordered_extent_lock); - - btrfs_init_work(&ordered->flush_work, -+ btrfs_flush_delalloc_helper, - btrfs_run_ordered_extent_work, NULL, NULL); - list_add_tail(&ordered->work_list, &works); - btrfs_queue_work(root->fs_info->flush_workers, ---- a/fs/btrfs/qgroup.c -+++ b/fs/btrfs/qgroup.c -@@ -2551,6 +2551,7 @@ qgroup_rescan_init(struct btrfs_fs_info - memset(&fs_info->qgroup_rescan_work, 0, - sizeof(fs_info->qgroup_rescan_work)); - btrfs_init_work(&fs_info->qgroup_rescan_work, -+ btrfs_qgroup_rescan_helper, - btrfs_qgroup_rescan_worker, NULL, NULL); - - if (ret) { ---- a/fs/btrfs/raid56.c -+++ b/fs/btrfs/raid56.c -@@ -1416,7 +1416,8 @@ cleanup: - - static void async_rmw_stripe(struct btrfs_raid_bio *rbio) - { -- btrfs_init_work(&rbio->work, rmw_work, NULL, NULL); -+ btrfs_init_work(&rbio->work, btrfs_rmw_helper, -+ rmw_work, NULL, NULL); - - btrfs_queue_work(rbio->fs_info->rmw_workers, - &rbio->work); -@@ -1424,7 +1425,8 @@ static void async_rmw_stripe(struct btrf - - static void async_read_rebuild(struct btrfs_raid_bio *rbio) - { -- btrfs_init_work(&rbio->work, read_rebuild_work, NULL, NULL); -+ btrfs_init_work(&rbio->work, btrfs_rmw_helper, -+ read_rebuild_work, NULL, NULL); - - btrfs_queue_work(rbio->fs_info->rmw_workers, - &rbio->work); -@@ -1665,7 +1667,8 @@ static void btrfs_raid_unplug(struct blk - plug = container_of(cb, struct btrfs_plug_cb, cb); - - if (from_schedule) { -- btrfs_init_work(&plug->work, unplug_work, NULL, NULL); -+ btrfs_init_work(&plug->work, btrfs_rmw_helper, -+ unplug_work, NULL, NULL); - btrfs_queue_work(plug->info->rmw_workers, - &plug->work); - return; ---- a/fs/btrfs/reada.c -+++ b/fs/btrfs/reada.c -@@ -798,7 +798,8 @@ static void reada_start_machine(struct b - /* FIXME we cannot handle this properly right now */ - BUG(); - } -- btrfs_init_work(&rmw->work, reada_start_machine_worker, NULL, NULL); -+ btrfs_init_work(&rmw->work, btrfs_readahead_helper, -+ reada_start_machine_worker, NULL, NULL); - rmw->fs_info = fs_info; - - btrfs_queue_work(fs_info->readahead_workers, &rmw->work); ---- a/fs/btrfs/scrub.c -+++ b/fs/btrfs/scrub.c -@@ -428,8 +428,8 @@ struct scrub_ctx *scrub_setup_ctx(struct - sbio->index = i; - sbio->sctx = sctx; - sbio->page_count = 0; -- btrfs_init_work(&sbio->work, scrub_bio_end_io_worker, -- NULL, NULL); -+ btrfs_init_work(&sbio->work, btrfs_scrub_helper, -+ scrub_bio_end_io_worker, NULL, NULL); - - if (i != SCRUB_BIOS_PER_SCTX - 1) - sctx->bios[i]->next_free = i + 1; -@@ -999,8 +999,8 @@ nodatasum_case: - fixup_nodatasum->root = fs_info->extent_root; - fixup_nodatasum->mirror_num = failed_mirror_index + 1; - scrub_pending_trans_workers_inc(sctx); -- btrfs_init_work(&fixup_nodatasum->work, scrub_fixup_nodatasum, -- NULL, NULL); -+ btrfs_init_work(&fixup_nodatasum->work, btrfs_scrub_helper, -+ scrub_fixup_nodatasum, NULL, NULL); - btrfs_queue_work(fs_info->scrub_workers, - &fixup_nodatasum->work); - goto out; -@@ -1616,7 +1616,8 @@ static void scrub_wr_bio_end_io(struct b - sbio->err = err; - sbio->bio = bio; - -- btrfs_init_work(&sbio->work, scrub_wr_bio_end_io_worker, NULL, NULL); -+ btrfs_init_work(&sbio->work, btrfs_scrubwrc_helper, -+ scrub_wr_bio_end_io_worker, NULL, NULL); - btrfs_queue_work(fs_info->scrub_wr_completion_workers, &sbio->work); - } - -@@ -3203,7 +3204,8 @@ static int copy_nocow_pages(struct scrub - nocow_ctx->len = len; - nocow_ctx->mirror_num = mirror_num; - nocow_ctx->physical_for_dev_replace = physical_for_dev_replace; -- btrfs_init_work(&nocow_ctx->work, copy_nocow_pages_worker, NULL, NULL); -+ btrfs_init_work(&nocow_ctx->work, btrfs_scrubnc_helper, -+ copy_nocow_pages_worker, NULL, NULL); - INIT_LIST_HEAD(&nocow_ctx->inodes); - btrfs_queue_work(fs_info->scrub_nocow_workers, - &nocow_ctx->work); ---- a/fs/btrfs/volumes.c -+++ b/fs/btrfs/volumes.c -@@ -5800,7 +5800,8 @@ struct btrfs_device *btrfs_alloc_device( - else - generate_random_uuid(dev->uuid); - -- btrfs_init_work(&dev->work, pending_bios_fn, NULL, NULL); -+ btrfs_init_work(&dev->work, btrfs_submit_helper, -+ pending_bios_fn, NULL, NULL); - - return dev; - } ++++++ patches.xen.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen-x86-EFI new/patches.xen/xen-x86-EFI --- old/patches.xen/xen-x86-EFI 2014-08-06 15:37:49.000000000 +0200 +++ new/patches.xen/xen-x86-EFI 2014-09-07 06:40:17.000000000 +0200 @@ -20,9 +20,9 @@ bool "EFI stub support" - depends on EFI + depends on EFI && !XEN + select RELOCATABLE ---help--- This kernel feature allows a bzImage to be loaded directly - by EFI firmware without the use of a bootloader. --- head.orig/arch/x86/include/mach-xen/asm/setup.h 2011-02-01 14:54:13.000000000 +0100 +++ head/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200 @@ -3,6 +3,12 @@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen-x86-bzImage new/patches.xen/xen-x86-bzImage --- old/patches.xen/xen-x86-bzImage 2014-08-06 15:37:49.000000000 +0200 +++ new/patches.xen/xen-x86-bzImage 2014-09-07 06:40:17.000000000 +0200 @@ -16,9 +16,9 @@ bool "EFI stub support" - depends on EFI && !XEN + depends on EFI && (!XEN || XEN_BZIMAGE) + select RELOCATABLE ---help--- This kernel feature allows a bzImage to be loaded directly - by EFI firmware without the use of a bootloader. @@ -1809,6 +1809,34 @@ config PHYSICAL_ALIGN Don't change this unless you know what you are doing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-auto-common.diff new/patches.xen/xen3-auto-common.diff --- old/patches.xen/xen3-auto-common.diff 2014-08-06 15:37:49.000000000 +0200 +++ new/patches.xen/xen3-auto-common.diff 2014-09-07 06:40:17.000000000 +0200 @@ -3799,10 +3799,10 @@ +#endif + if (HAVE_PTE_SPECIAL) { - if (likely(!pte_special(pte) || pte_numa(pte))) + if (likely(!pte_special(pte))) goto check_pfn; @@ -779,6 +785,9 @@ struct page *vm_normal_page(struct vm_ar - + return NULL; check_pfn: if (unlikely(pfn > highest_memmap_pfn)) { +#ifdef CONFIG_XEN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-2.6.37 new/patches.xen/xen3-patch-2.6.37 --- old/patches.xen/xen3-patch-2.6.37 2014-08-06 15:37:49.000000000 +0200 +++ new/patches.xen/xen3-patch-2.6.37 2014-09-07 06:40:17.000000000 +0200 @@ -3955,9 +3955,9 @@ + if (!is_initial_xendomain()) + return; +#endif - /* Trim out BIOS areas (low 1MB and high 2MB) and E820 regions */ - if (avail->flags & IORESOURCE_MEM) { - if (avail->start < BIOS_END) + /* + * Trim out BIOS area (high 2MB) and E820 regions. We do not remove + * the low 1MB unconditionally, as this area is needed for some ISA --- head.orig/arch/x86/kernel/setup-xen.c 2013-12-06 15:07:45.000000000 +0100 +++ head/arch/x86/kernel/setup-xen.c 2013-12-06 15:07:53.000000000 +0100 @@ -31,6 +31,7 @@ ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:12.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:12.000000000 +0200 @@ -28,6 +28,7 @@ # Send separate patches upstream if you find a problem... ######################################################## patches.kernel.org/patch-3.16.1 + patches.kernel.org/patch-3.16.1-2 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -226,8 +227,6 @@ ######################################################## # NFS ######################################################## - patches.fixes/nfs-nfs3_list_one_acl-check-get_acl-result-with-is_err_or_null - ######################################################## # lockd + statd @@ -251,17 +250,12 @@ ######################################################## patches.suse/btrfs-use-correct-device-for-maps.patch patches.suse/btrfs-check-index-in-extent_buffer_page - patches.suse/btrfs-0003-read-lock-extent-buffer-while-walking-backrefs.patch - patches.suse/btrfs-0006-fix-compressed-write-corruption-on-enospc.patch - patches.fixes/Btrfs-Fix-memory-corruption-by-ulist_add_merge-on-32 - patches.suse/btrfs-0008-fix-csum-tree-corruption-duplicate-and-outdate.patch patches.suse/btrfs-0011-fill_holes-Fix-slot-number-passed-to-hole_merg.patch patches.suse/btrfs-0016-fix-wrong-write-range-for-filemap_fdatawrite_r.patch patches.suse/btrfs-0017-fix-wrong-extent-mapping-for-DirectIO.patch patches.suse/btrfs-0018-Return-right-extent-when-fiemap-gives-unaligne.patch patches.suse/btrfs-0025-ensure-tmpfile-inode-is-always-persisted-with-.patch patches.suse/btrfs-0027-don-t-monopolize-a-core-when-evicting-inode.patch - patches.suse/btrfs-0033-fix-task-hang-under-heavy-compressed-write.patch ######################################################## # Reiserfs Patches @@ -371,7 +365,6 @@ # DRM/Video ######################################################## patches.fixes/nouveau-fix-race-with-fence-signaling - patches.fixes/drm-omapdrm-fix-compiler-errors ######################################################## # video4linux ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.moXrcX/_old 2014-09-12 15:25:12.000000000 +0200 +++ /var/tmp/diff_new_pack.moXrcX/_new 2014-09-12 15:25:12.000000000 +0200 @@ -1,3 +1,3 @@ -2014-09-03 16:16:22 +0200 -GIT Revision: 2ab65856e31615961771d3a3f9ec60b3ef0e6eec +2014-09-07 06:40:17 +0200 +GIT Revision: dcee3975936b33996dd656617da8e1879ef4dcbd GIT Branch: stable -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package telepathy-qt4 for openSUSE:Factory checked in at 2014-09-12 15:24:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt4 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt4/telepathy-qt4.changes 2014-08-27 22:18:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes 2014-09-12 15:25:00.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 9 22:31:08 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.9.5: + * Added more service side bindings + * Service bindings now enabled by default + * Bump Farstream version + * Allow subclass of Tp::ReceivedMessage + * Workaround invalid channelRequests when delegating, fdo#77986 +- Rebase, reorder and apply search-for-farstream0.2.diff, + search-for-gstreamer1.0.diff and + search-for-telepathy-farstream-0.4.diff only for + openSUSE 13.1 and older +- Provide telepathy-qt4-service-devel-static, due to newly enabled + service library + +------------------------------------------------------------------- Old: ---- telepathy-qt-0.9.4.tar.gz New: ---- telepathy-qt-0.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt4.spec ++++++ --- /var/tmp/diff_new_pack.LCxn1E/_old 2014-09-12 15:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.LCxn1E/_new 2014-09-12 15:25:01.000000000 +0200 @@ -26,17 +26,17 @@ %endif Name: telepathy-qt4 -Version: 0.9.4 +Version: 0.9.5 Release: 0 Summary: Qt4 bindings for the Telepathy Library License: LGPL-2.1+ Group: Development/Tools/Other Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{versi… -# PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for farstream0.2, instead of deprecated 0.1 -Patch0: search-for-farstream0.2.diff # PATCH-FIX-UPSTREAM search-for-gstreamer1.0.diff -- searches for gstreamer1.0, which is only required for includes -Patch1: search-for-gstreamer1.0.diff +Patch0: search-for-gstreamer1.0.diff +# PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for farstream0.2, instead of deprecated 0.1 +Patch1: search-for-farstream0.2.diff # PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for telepathy-farstream-0.4 Patch2: search-for-telepathy-farstream-0.4.diff BuildRequires: cmake @@ -47,8 +47,8 @@ BuildRequires: libxml2-devel BuildRequires: python-xml BuildRequires: pkgconfig(telepathy-glib) -%if %farstream -%if %gstreamer1 +%if 0%{?farstream} +%if 0%{?gstreamer1} BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) @@ -78,7 +78,7 @@ %description -n %{libname}-%{major} Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. -%if %farstream +%if 0%{?farstream} %package -n %{libname}-farstream%{major} Summary: Library for performing syntax highlighting in Qt documents Group: Development/Tools/Other @@ -92,9 +92,10 @@ Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: %{libname}-%{major} = %{version} -%if %farstream +Provides: %{name}-service-devel-static = %{version} +%if 0%{?farstream} Requires: %{libname}-farstream%{major} = %{version} -%if %gstreamer1 +%if 0%{?gstreamer1} Requires: pkgconfig(gstreamer-1.0) Requires: pkgconfig(gstreamer-plugins-base-1.0) %else @@ -108,16 +109,11 @@ %prep %setup -q -n telepathy-qt-%{version} -%if 0%{?suse_version} >= 1230 -%if %farstream -%if %gstreamer1 -%patch0 -p1 +%if 0%{?suse_version} <= 1310 +%patch0 -Rp1 %patch1 -p1 -%else %patch2 -p1 %endif -%endif -%endif %build export CXXFLAGS="%{optflags}" @@ -141,7 +137,7 @@ %postun -n %{libname}-%{major} -p /sbin/ldconfig -%if %farstream +%if 0%{?farstream} %post -n %{libname}-farstream%{major} -p /sbin/ldconfig %postun -n %{libname}-farstream%{major} -p /sbin/ldconfig @@ -151,7 +147,7 @@ %defattr(-,root,root) %{_libdir}/libtelepathy-qt4.so.* -%if %farstream +%if 0%{?farstream} %files -n %{libname}-farstream%{major} %defattr(-,root,root) %{_libdir}/libtelepathy-qt4-farstream.so.* @@ -162,9 +158,12 @@ %doc AUTHORS ChangeLog README COPYING HACKING NEWS %{_includedir}/telepathy-qt4/ %{_libdir}/libtelepathy-qt4.so +%{_libdir}/libtelepathy-qt4-service.a %{_libdir}/pkgconfig/TelepathyQt4.pc %{_libdir}/cmake/TelepathyQt4/ -%if %farstream +%{_libdir}/cmake/TelepathyQt4Service/ +%{_libdir}/pkgconfig/TelepathyQt4Service.pc +%if 0%{?farstream} %{_libdir}/cmake/TelepathyQt4Farstream/ %{_libdir}/libtelepathy-qt4-farstream.so %{_libdir}/pkgconfig/TelepathyQt4Farstream.pc ++++++ search-for-farstream0.2.diff ++++++ --- /var/tmp/diff_new_pack.LCxn1E/_old 2014-09-12 15:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.LCxn1E/_new 2014-09-12 15:25:01.000000000 +0200 @@ -1,28 +1,51 @@ diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake -index de42c29..abc311b 100644 +index de42c29..33139c3 100644 --- a/cmake/modules/FindFarstream.cmake +++ b/cmake/modules/FindFarstream.cmake -@@ -25,7 +25,7 @@ if (NOT WIN32) +@@ -23,9 +23,9 @@ if (NOT WIN32) + # in the find_path() and find_library() calls + find_package(PkgConfig) if (FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION}) +- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION}) ++ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION}) else (FARSTREAM_MIN_VERSION) -- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1) -+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2) +- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2) ++ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1) endif (FARSTREAM_MIN_VERSION) set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER}) endif (NOT WIN32) -@@ -34,10 +34,10 @@ find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h +@@ -34,10 +34,10 @@ find_path(FARSTREAM_INCLUDE_DIR farstrea PATHS ${PC_FARSTREAM_INCLUDEDIR} ${PC_FARSTREAM_INCLUDE_DIRS} -- PATH_SUFFIXES farstream-0.1 -+ PATH_SUFFIXES farstream-0.2 +- PATH_SUFFIXES farstream-0.2 ++ PATH_SUFFIXES farstream-0.1 ) --find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1 -+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2 +-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2 ++find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1 PATHS ${PC_FARSTREAM_LIBDIR} ${PC_FARSTREAM_LIBRARY_DIRS} - - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f112892..2e9aabb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,7 +206,7 @@ endif() + + if(ENABLE_FARSTREAM) + # Find tp-farstream +- set(FARSTREAM_MIN_VERSION "0.2.0") ++ set(FARSTREAM_MIN_VERSION "0.1.0") + find_package(Farstream) + macro_log_feature(FARSTREAM_FOUND "Farstream" + "A Framework for dealing with audio/video conferencing protocols" +@@ -214,7 +214,7 @@ if(ENABLE_FARSTREAM) + "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream") + + # Find tp-farstream +- set(TELEPATHY_FARSTREAM_MIN_VERSION "0.6.0") ++ set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2") + find_package(TelepathyFarstream) + macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream" + "A Framework for dealing with audio/video conferencing protocols" ++++++ search-for-gstreamer1.0.diff ++++++ --- /var/tmp/diff_new_pack.LCxn1E/_old 2014-09-12 15:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.LCxn1E/_new 2014-09-12 15:25:01.000000000 +0200 @@ -1,91 +1,47 @@ -diff -urNB telepathy-qt4-0.9.3.orig/cmake/modules/FindGStreamer.cmake telepathy-qt4-0.9.3/cmake/modules/FindGStreamer.cmake ---- telepathy-qt4-0.9.3.orig/cmake/modules/FindGStreamer.cmake 2012-07-13 19:40:23.000000000 +0200 -+++ telepathy-qt4-0.9.3/cmake/modules/FindGStreamer.cmake 2013-07-20 21:09:05.023740233 +0200 -@@ -5,76 +5,58 @@ - # GSTREAMER_INCLUDE_DIR - the GStreamer include directory - # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer - # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer -+# GSTREAMER_VERSION - the version of GStreamer - --# Copyright (c) 2006, Tim Beaulen <tbscope(a)gmail.com> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+# Copyright (c) 2008 Helio Chissini de Castro, <helio(a)kde.org> -+# (c)2006, Tim Beaulen <tbscope(a)gmail.com> - --# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) -+# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_1.0_FOUND etc) - --IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) -+ -+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) - # in cache already -- SET(GSTREAMER_FIND_QUIETLY TRUE) --ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) -- SET(GSTREAMER_FIND_QUIETLY FALSE) --ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) -+ SET(GStreamer_FIND_QUIETLY TRUE) -+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) -+ SET(GStreamer_FIND_QUIETLY FALSE) -+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) - - IF (NOT WIN32) -+ FIND_PACKAGE(PkgConfig REQUIRED) +diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index f6c5681..63fb41c 100644 +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -24,7 +24,7 @@ IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls -- FIND_PACKAGE(PkgConfig) + FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10) -- #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}") -- #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}") -- #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}") -- SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER}) -+ # don't make this check required - otherwise you can't use macro_optional_find_package on this one -+ PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0) -+ SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION}) -+ SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) - ENDIF (NOT WIN32) - - FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h ++ PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-1.0) + #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}") + #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}") + #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}") +@@ -35,26 +35,21 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h PATHS -- ${PC_GSTREAMER_INCLUDEDIR} -- ${PC_GSTREAMER_INCLUDE_DIRS} + ${PC_GSTREAMER_INCLUDEDIR} + ${PC_GSTREAMER_INCLUDE_DIRS} - PATH_SUFFIXES gstreamer-0.10 -+ ${PKG_GSTREAMER_INCLUDE_DIRS} + PATH_SUFFIXES gstreamer-1.0 ) -FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 +FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 PATHS -- ${PC_GSTREAMER_LIBDIR} -- ${PC_GSTREAMER_LIBRARY_DIRS} -+ ${PKG_GSTREAMER_LIBRARY_DIRS} + ${PC_GSTREAMER_LIBDIR} + ${PC_GSTREAMER_LIBRARY_DIRS} ) -FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10 +FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0 PATHS -- ${PC_GSTREAMER_LIBDIR} -- ${PC_GSTREAMER_LIBRARY_DIRS} -- ) -- + ${PC_GSTREAMER_LIBDIR} + ${PC_GSTREAMER_LIBRARY_DIRS} + ) + -FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 - PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} -+ ${PKG_GSTREAMER_LIBRARY_DIRS} - ) +- ) IF (GSTREAMER_INCLUDE_DIR) -- #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}") - ELSE (GSTREAMER_INCLUDE_DIR) - MESSAGE(STATUS "GStreamer: WARNING: include dir not found") - ENDIF (GSTREAMER_INCLUDE_DIR) - - IF (GSTREAMER_LIBRARIES) -- #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") - ELSE (GSTREAMER_LIBRARIES) + #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}") +@@ -68,13 +63,8 @@ ELSE (GSTREAMER_LIBRARIES) MESSAGE(STATUS "GStreamer: WARNING: library not found") ENDIF (GSTREAMER_LIBRARIES) @@ -94,7 +50,7 @@ -ELSE (GSTREAMER_INTERFACE_LIBRARY) - MESSAGE(STATUS "GStreamer: WARNING: interface library not found") -ENDIF (GSTREAMER_INTERFACE_LIBRARY) -- + INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) ++++++ search-for-telepathy-farstream-0.4.diff ++++++ --- /var/tmp/diff_new_pack.LCxn1E/_old 2014-09-12 15:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.LCxn1E/_new 2014-09-12 15:25:01.000000000 +0200 @@ -6,20 +6,20 @@ Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy) Description: Qt Telepathy Farstream utility library for the Telepathy framework Version: ${PACKAGE_VERSION} --Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} -+Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +-Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} ++Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in index 1a66d6d..a8ac174 100644 --- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in +++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in -@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} +@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INC Name: TelepathyQt${QT_VERSION_MAJOR}Farstream Description: Qt Telepathy Farstream utility library for the Telepathy framework Version: ${PACKAGE_VERSION} --Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} -+Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +-Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} ++Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake ++++++ telepathy-qt-0.9.4.tar.gz -> telepathy-qt-0.9.5.tar.gz ++++++ ++++ 622423 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 librest for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package librest for openSUSE:Factory checked in at 2014-09-12 15:24:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librest (Old) and /work/SRC/openSUSE:Factory/.librest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librest" Changes: -------- --- /work/SRC/openSUSE:Factory/librest/librest.changes 2014-04-04 16:36:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librest.new/librest.changes 2014-09-12 15:24:58.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 8 08:50:54 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.7.92: + + Bugs fixed: bgo#665716, bgo#708358, bgo#708359, bgo#728340, + bgo#728952, bgo#728953, bgo#735919, bgo#735920, bgo#735921, + bgo#735922. +- Add librest-missing-include.patch: Add missing includes. + +------------------------------------------------------------------- Old: ---- rest-0.7.91.tar.xz New: ---- librest-missing-include.patch rest-0.7.92.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librest.spec ++++++ --- /var/tmp/diff_new_pack.KQAdCJ/_old 2014-09-12 15:24:59.000000000 +0200 +++ /var/tmp/diff_new_pack.KQAdCJ/_new 2014-09-12 15:24:59.000000000 +0200 @@ -21,7 +21,7 @@ %define soname 0 %define abi 0.7 %define abi_pkg 0_7 -Version: 0.7.91 +Version: 0.7.92 Release: 0 Summary: Library to access RESTful web services License: LGPL-2.1 @@ -29,6 +29,8 @@ Url: http://git.gnome.org/browse/librest/ Source0: http://download.gnome.org/sources/rest/0.7/%{_name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM librest-missing-include.patch dimstar(a)opensuse.org -- Add missing includes +Patch0: librest-missing-include.patch BuildRequires: pkgconfig(glib-2.0) >= 2.24 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libsoup-2.4) @@ -91,6 +93,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build %configure \ ++++++ librest-missing-include.patch ++++++ commit b50ace7738ea03817acdad87fb2b338a86018329 Author: Christophe Fergeau <cfergeau(a)redhat.com> Date: Wed Sep 3 11:31:49 2014 +0200 oauth: Add missing include This fixes a compilation warning about a missing prototype. diff --git a/rest/oauth-proxy-call.c b/rest/oauth-proxy-call.c index dce2c66..ab77b1a 100644 --- a/rest/oauth-proxy-call.c +++ b/rest/oauth-proxy-call.c @@ -25,6 +25,7 @@ #include <rest/rest-proxy-call.h> #include "oauth-proxy-call.h" #include "oauth-proxy-private.h" +#include "rest-proxy-call-private.h" #include "sha1.h" G_DEFINE_TYPE (OAuthProxyCall, oauth_proxy_call, REST_TYPE_PROXY_CALL) ++++++ rest-0.7.91.tar.xz -> rest-0.7.92.tar.xz ++++++ ++++ 24447 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 poppler for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2014-09-12 15:24:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2014-08-06 15:31:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2014-09-12 15:24:55.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 9 16:41:22 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 0.26.4: + + core: + - CairoOutputDev: Make sure we always push a transparency group + in setSoftMaskFromImageMask() (fdo#81624). + - Fix a crash when adding Annotation without contents. + - Improve non-latin characters in inline notes (fdo#65956). + - Don't check for inlineImg twice (fdo#82059). + - printf() -> error(). + + glib: + - Return NULL in poppler_annot_get_contents also for empty + strings. + - Fix a memory leak when getting text layout and attributes. + +------------------------------------------------------------------- poppler-qt5.changes: same change poppler.changes: same change Old: ---- poppler-0.26.3.tar.xz New: ---- poppler-0.26.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.NMKLq5/_old 2014-09-12 15:24:57.000000000 +0200 +++ /var/tmp/diff_new_pack.NMKLq5/_new 2014-09-12 15:24:57.000000000 +0200 @@ -21,7 +21,7 @@ Name: poppler-qt %define _name poppler -Version: 0.26.3 +Version: 0.26.4 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 poppler-qt5.spec: same change ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.NMKLq5/_old 2014-09-12 15:24:57.000000000 +0200 +++ /var/tmp/diff_new_pack.NMKLq5/_new 2014-09-12 15:24:57.000000000 +0200 @@ -21,7 +21,7 @@ Name: poppler %define _name poppler -Version: 0.26.3 +Version: 0.26.4 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 ++++++ poppler-0.26.3.tar.xz -> poppler-0.26.4.tar.xz ++++++ ++++ 2302 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 libjansson for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package libjansson for openSUSE:Factory checked in at 2014-09-12 11:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjansson (Old) and /work/SRC/openSUSE:Factory/.libjansson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjansson" Changes: -------- --- /work/SRC/openSUSE:Factory/libjansson/libjansson.changes 2014-07-21 22:34:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libjansson.new/libjansson.changes 2014-09-12 12:22:58.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 18:59:04 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjansson.spec ++++++ --- /var/tmp/diff_new_pack.XGQLlw/_old 2014-09-12 12:22:59.000000000 +0200 +++ /var/tmp/diff_new_pack.XGQLlw/_new 2014-09-12 12:22:59.000000000 +0200 @@ -27,6 +27,7 @@ #Git-Clone: git://github.com/akheron/jansson Source: http://www.digip.org/jansson/releases/jansson-%version.tar.bz2 +Source1: baselibs.conf Source2: http://www.digip.org/jansson/releases/jansson-%version.tar.bz2.asc Source3: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ baselibs.conf ++++++ libjansson4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cobbler for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2014-09-12 11:28:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cobbler" Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2014-08-03 15:37:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2014-09-12 12:22:57.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 4 09:43:01 UTC 2014 - fcastelli(a)suse.com + +- Added do_not_use_grubby_compat_when_grub2_is_in_use.diff: prevents + usage of grubby-compat when grub2 is active. Use grub2 features + do modify the boot loader. + +------------------------------------------------------------------- +Tue Sep 2 15:08:40 UTC 2014 - fcastelli(a)suse.com + +- Moved grubby-compat inside of the koan sub-package. The scrit was accidentally + moved into the cobbler package. + +------------------------------------------------------------------- New: ---- do_not_use_grubby_compat_when_grub2_is_in_use.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.9wzB3p/_old 2014-09-12 12:22:58.000000000 +0200 +++ /var/tmp/diff_new_pack.9wzB3p/_new 2014-09-12 12:22:58.000000000 +0200 @@ -58,6 +58,7 @@ Patch11: fix-powermanagement-status.dif Patch12: bnc_877009.patch Patch13: fix_sle_detection.patch +Patch14: do_not_use_grubby_compat_when_grub2_is_in_use.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -67,10 +68,10 @@ BuildRequires: git BuildRequires: python-cheetah %if 0%{?suse_version} -BuildRequires: python-PyYAML -BuildRequires: distribution-release -BuildRequires: atftp BuildRequires: apache2 +BuildRequires: atftp +BuildRequires: distribution-release +BuildRequires: python-PyYAML Requires: apache2-mod_wsgi Requires: ipmitool %else @@ -163,6 +164,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 mv vendor-files/cobbler.1.gz docs @@ -404,7 +406,6 @@ %config /etc/apache2/vhosts.d/cobbler_web.conf %config /etc/sysconfig/SuSEfirewall2.d/cobbler /usr/sbin/fence_ipmitool -/usr/sbin/grubby-compat /usr/sbin/rccobblerd %endif @@ -434,6 +435,9 @@ %{_bindir}/ovz-install %{_bindir}/cobbler-register %{python_sitelib}/koan +%if 0%{?suse_version} +%attr(0755,root,root) /usr/sbin/grubby-compat +%endif %if 0%{?fedora} >= 9 || 0%{?rhel} >= 5 || 0%{?suse_version} %exclude %{python_sitelib}/koan/sub_process.py* ++++++ do_not_use_grubby_compat_when_grub2_is_in_use.diff ++++++ diff --git a/koan/app.py b/koan/app.py index a732309..4a125f8 100644 --- a/koan/app.py +++ b/koan/app.py @@ -1042,9 +1042,12 @@ class Koan: raise InfoException, "grub2 is not installed" use_grub2 = True elif (make == "suse"): - if not os.path.exists("/usr/sbin/grubby-compat"): - raise InfoException, "grub2 is not installed" - use_grubby_compat = True + if os.path.exists("/usr/sbin/grub2-install"): + use_grub2 = True + else: + if not os.path.exists("/usr/sbin/grubby-compat"): + raise InfoException, "grubby-compat is not installed" + use_grubby_compat = True else: if not os.path.exists("/sbin/grubby"): raise InfoException, "grubby is not installed" @@ -1175,10 +1178,13 @@ class Koan: # Set paths for Ubuntu/Debian # TODO: Add support for other distros when they ship grub2 - if make in ['ubuntu', 'debian']: + if make in ['ubuntu', 'debian', 'suse']: grub_file = "/etc/grub.d/42_koan" grub_default_file = "/etc/default/grub" - cmd = ["update-grub"] + if make in ['suse']: + cmd = ['/sbin/update-bootloader', '--refresh'] + else: + cmd = ["update-grub"] default_cmd = ['sed', '-i', 's/^GRUB_DEFAULT\=.*$/GRUB_DEFAULT="%s"/g' % name, grub_default_file] # Create grub2 menuentry -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-mini_portile for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-mini_portile for openSUSE:Factory checked in at 2014-09-12 11:28:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-mini_portile (Old) and /work/SRC/openSUSE:Factory/.rubygem-mini_portile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-mini_portile" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-mini_portile/rubygem-mini_portile.changes 2014-05-22 09:04:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-mini_portile.new/rubygem-mini_portile.changes 2014-09-12 12:22:56.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 11 11:03:18 UTC 2014 - coolo(a)suse.com + +- back to 0.6.0 - nokogiri (even HEAD) requires it + +------------------------------------------------------------------- +Thu Sep 11 10:57:10 UTC 2014 - coolo(a)suse.com + +- update to 0.6.1 + * Enhancements: + * Expand path to logfile to easier debugging on failures. + Pull #33 [marvin2k] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ruby for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package ruby for openSUSE:Factory checked in at 2014-09-12 11:28:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby (Old) and /work/SRC/openSUSE:Factory/.ruby.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby/ruby.changes 2014-05-18 06:50:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby.new/ruby.changes 2014-09-12 12:22:54.000000000 +0200 @@ -1,0 +2,31 @@ +Wed Sep 10 15:25:10 UTC 2014 - mrueckert(a)suse.de + +- to make it easier to migrate from the old scheme to the new + scheme BuildIgnore: ruby aswell + +------------------------------------------------------------------- +Tue Sep 9 17:44:06 UTC 2014 - mrueckert(a)suse.de + +- cleaned up buildrequires/requires and added buildignore for rubygem-gem2rpm + +------------------------------------------------------------------- +Mon Jun 23 10:02:27 UTC 2014 - mrueckert(a)suse.de + +- remove obsolete expand line + +------------------------------------------------------------------- +Fri Jun 20 13:35:53 UTC 2014 - mrueckert(a)suse.de + +- remove the provides to avoid have choice + +------------------------------------------------------------------- +Sat Jun 14 14:55:22 UTC 2014 - mrueckert(a)suse.de + +- migrated to just plain wrapper packages +- patches moved to ruby2.1 package: + rubygems-1.5.0_buildroot.patch + ruby-1.9.2p290_tcl_no_stupid_rpaths.patch + drop_content_size_check_in_xmlrpc.patch + ruby19-export_init_prelude.patch + +------------------------------------------------------------------- Old: ---- drop_content_size_check_in_xmlrpc.patch gem_build_cleanup gem_install.sh generate_buildrequires.sh generate_rubygemprovides.awk ruby-1.9.2p290_tcl_no_stupid_rpaths.patch ruby-2.1.2.tar.bz2 ruby-rpmlintrc ruby.macros ruby.rpm-macros ruby19-export_init_prelude.patch rubygems-1.5.0_buildroot.patch rubygems.attr rubygemsdeps.rb New: ---- README ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby.spec ++++++ --- /var/tmp/diff_new_pack.cO0EW2/_old 2014-09-12 12:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.cO0EW2/_new 2014-09-12 12:22:56.000000000 +0200 @@ -17,104 +17,19 @@ Name: ruby - -#### -#!!! -#!!! when updating, check versions of embedded rubygems in package stdlib below -#!!! -#### - -%define patch_level p0 -Version: 2.1.2 +Version: 2.1 Release: 0 -# make the exported API version explicit -%define api_version 2.1.0 - -# ruby-macros and ruby-common version -%define rpm_macros_version 3 - -# -%define pkg_version %{version} -%define libname lib%{name}2_1 -# keep in sync with macro file! -%define rb_ver %{api_version} -%define rb_arch %(echo %{_target_cpu}-linux-gnu | sed -e "s/ppc/powerpc/") -%define rb_libdir %{_libdir}/ruby/%{rb_ver}/ -%define rb_archdir %{_libdir}/ruby/%{rb_ver}/%{rb_arch} -# keep in sync with macro file! -# -# from valgrind.spec -%ifarch %ix86 x86_64 ppc ppc64 -%define use_valgrind 1 -%endif -# see https://bugs.ruby-lang.org/issues/8000 - might come back -%if %suse_version < 1230 -%define tk_version_supported 1 -%endif -# the tests are unfortunately rather fishy -%define run_tests 0 - -# BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: awk -BuildRequires: gdbm-devel -BuildRequires: libffi-devel -BuildRequires: libyaml-devel -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: pkg-config -BuildRequires: readline-devel -BuildRequires: tk-devel -BuildRequires: zlib-devel -# this requires is needed as distros older than 11.3 have a buildignore on freetype2, without this the detection of the tk extension fails -BuildRequires: freetype2-devel -%if 0%{?suse_version} > 1010 -BuildRequires: xorg-x11-libX11-devel -%else -BuildRequires: xorg-x11-devel -%endif -%if 0%{?use_valgrind} -%if 0%{?suse_version} > 1021 -BuildRequires: valgrind-devel -%else -BuildRequires: valgrind -%endif -%endif -Provides: rubygem-rake = 10.1.0 -Provides: ruby(abi) = %{rb_ver} - -Provides: ruby-common = %{rpm_macros_version} -Obsoletes: ruby-common < %{rpm_macros_version} -Provides: ruby21 -Conflicts: ruby18 -Conflicts: ruby19 -Conflicts: ruby20 -Requires: ruby-stdlib -PreReq: update-alternatives -BuildRequires: update-alternatives - -Provides: ruby-macros = %{rpm_macros_version} - -# +Source: README Url: http://www.ruby-lang.org/ -Source: http://cache.ruby-lang.org/pub/ruby/2.1/ruby-%{pkg_version}.tar.bz2 -# sources from former ruby-common -Source1: gem_build_cleanup -Source2: ruby.macros -Source3: ruby.rpm-macros -Source4: rubygems.attr -Source5: rubygemsdeps.rb -Source6: gem_install.sh -Source7: generate_buildrequires.sh -Source8: generate_rubygemprovides.awk - -Patch0: rubygems-1.5.0_buildroot.patch -Patch1: ruby-1.9.2p290_tcl_no_stupid_rpaths.patch -Patch2: drop_content_size_check_in_xmlrpc.patch -# Summary: An Interpreted Object-Oriented Scripting Language -License: BSD-2-Clause or Ruby -Group: Development/Languages/Ruby +License: MIT +BuildRequires: ruby%{version}-devel +#!BuildIgnore: ruby +#!BuildIgnore: rubygem-gem2rpm +%requires_ge ruby%{version} +Provides: rubygems = 1.8.15 +Obsoletes: rubygems < 1.8.15 %description Ruby is an interpreted scripting language for quick and easy @@ -145,321 +60,29 @@ - Highly Portable (works on many UNIX machines; DOS, Windows, Mac, BeOS, and more) -%package -n %{libname} -Summary: Dynamic runtime library for Ruby -Group: System/Libraries - -%description -n %{libname} -Dynamic runtime library libruby2.1.so.2.0.0 for Ruby - -%package doc -Summary: Documentation and samples for Ruby -Group: Development/Languages/Ruby - -%description doc -Documentation and samples for Ruby - -%package stdlib -Summary: The Ruby standard library -Group: Development/Languages/Ruby - -################################ -# generate provides for embedded rubygems -# must be 'manually' generated since -# - the final .gemspec files are created during %build and %install -# - the usual means to generate provides for rubygems is using ruby -# and ruby is not available while building ruby :-/ - -%define gen_embedded_provides4() %(awk -f %{S:8} -- %api_version %arch %1 %2 %3 %4) -%define gen_embedded_provides5() %(awk -f %{S:8} -- %api_version %arch %1 %2 %3 %4 %5) -%gen_embedded_provides4 io-console 0 4 2 -%gen_embedded_provides4 json 1 8 1 -%gen_embedded_provides4 minitest 4 7 5 -%gen_embedded_provides4 psych 2 0 3 -%gen_embedded_provides4 rake 10 1 0 -%gen_embedded_provides4 rdoc 4 1 0 -%gen_embedded_provides5 test-unit 2 1 1 0 - -################################ - -%description stdlib -The Ruby standard library - %package devel Summary: Development files to link against Ruby Group: Development/Languages/Ruby -Requires: %{name} = %{version} -Provides: rubygems = 1.3.7 -Provides: rubygems_with_buildroot_patch -Requires: ruby-common +Requires: %{name} +%requires_ge ruby%{version}-devel %description devel Development files to link against Ruby. -%package devel-extra -Summary: Special development files of ruby, normally not installed -Group: Development/Languages/Ruby -Requires: %{name}-devel = %{version} - -%description devel-extra -Development files to link against Ruby. - -%if 0%{?tk_version_supported} > 0 -%package tk -Summary: TCL/TK bindings for Ruby -Group: Development/Languages/Ruby -Requires: %{name} = %{version} - -%description tk -TCL/TK bindings for Ruby -%endif - -%package doc-ri -Summary: Ruby Interactive Documentation -Group: Development/Languages/Ruby -Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1121 -BuildArch: noarch -%endif - -%description doc-ri -This package contains the RI docs for ruby - -%package doc-html -Summary: This package contains the HTML docs for ruby -Group: Development/Languages/Ruby -Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1121 -BuildArch: noarch -%endif - -%description doc-html -This package contains the HTML docs for ruby - -%package examples -Summary: Example scripts for ruby -Group: Development/Languages/Ruby -Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1121 -BuildArch: noarch -%endif - -%description examples -Example scripts for ruby - -%package test-suite -Requires: %{name} = %{version} -Summary: An Interpreted Object-Oriented Scripting Language -Group: Development/Languages/Ruby -%if 0%{?suse_version} >= 1121 -BuildArch: noarch -%endif - -%description test-suite -Ruby is an interpreted scripting language for quick and easy -object-oriented programming. It has many features for processing text -files and performing system management tasks (as in Perl). It is -simple, straight-forward, and extensible. - -* Ruby features: - -- Simple Syntax - -- *Normal* Object-Oriented features (class, method calls, for - example) - -- *Advanced* Object-Oriented features(Mix-in, Singleton-method, for - example) - -- Operator Overloading - -- Exception Handling - -- Iterators and Closures - -- Garbage Collection - -- Dynamic Loading of Object Files (on some architectures) - -- Highly Portable (works on many UNIX machines; DOS, Windows, Mac, -BeOS, and more) - %prep -%setup -q -n ruby-%{pkg_version} -%patch0 -%patch1 -%patch2 -find sample -type f -print0 | xargs -r0 chmod a-x -grep -Erl '^#! */' benchmark bootstraptest ext lib sample test \ - | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby2.1$1|' %build -%configure \ - --with-soname=ruby \ - --target=%{_target_platform} \ - %if 0%{?use_valgrind} - --with-valgrind \ - %endif - --with-mantype=man \ - --enable-shared \ - --disable-static \ - --disable-rpath -%{__make} all V=1 %install -%makeinstall V=1 -%{__install} -D -m 0644 %{S:2} %{buildroot}/etc/rpm/macros.ruby -echo "%defattr(-,root,root,-)" > devel-extra-excludes -echo "%defattr(-,root,root,-)" > devel-extra-list -for i in iseq.h insns.inc insns_info.inc revision.h version.h thread_pthread.h \ - ruby_atomic.h method.h internal.h id.h vm_core.h vm_opts.h node.h eval_intern.h vm_debug.h; do - install -m 644 $i %{buildroot}%{_includedir}/ruby-%{rb_ver}/ - echo "%exclude %{_includedir}/ruby-%{rb_ver}/$i" >> devel-extra-excludes - echo "%{_includedir}/ruby-%{rb_ver}/$i" >> devel-extra-list -done - -# Create gem native extensions dir -# use shell scripting here as we're executing the just installed binary -%define rb_binary %{buildroot}/usr/bin/ruby -I %{buildroot}%{rb_libdir} -I %{buildroot}%{rb_archdir} -export LD_LIBRARY_PATH=%{buildroot}%{_libdir} -export GEM_EXTENSIONS=`%{rb_binary} -rrubygems -e 'print Gem::BasicSpecification.new.extensions_dir'` -export GEM_PLATFORM=`%{rb_binary} -r rubygems -r rbconfig -e 'print Gem::Platform.new(RbConfig::CONFIG["arch"]).to_s'` -# mkdir -p %{buildroot}$GEM_EXTENSIONS/$GEM_PLATFORM/%{rb_ver} -mkdir -p %{buildroot}$GEM_EXTENSIONS - -# formerly ruby-common -# we need to make sure it overwrites older macro versions and rpm sorts alphabetically -install -D -m 0644 %{S:3} $RPM_BUILD_ROOT/etc/rpm/macros.suse-ruby -install -D -m 0644 %{S:4} $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs/rubygems.attr -install -D -m 0755 %{S:5} $RPM_BUILD_ROOT/usr/lib/rpm/rubygemsdeps.rb -install -D -m 0755 %{S:6} $RPM_BUILD_ROOT/usr/lib/rpm/gem_install.sh -install -D -m 0755 %{S:1} $RPM_BUILD_ROOT/usr/lib/rpm/gem_build_cleanup.sh -install -D -m 0755 %{S:7} $RPM_BUILD_ROOT/usr/lib/rpm/generate_buildrequires.sh - -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -for bin in rake rdoc ri; do - # dummy - touch %{buildroot}%{_sysconfdir}/alternatives/$bin - mv %{buildroot}%_bindir/$bin %{buildroot}%_bindir/$bin.ruby - ln -s %{_sysconfdir}/alternatives/$bin %{buildroot}%_bindir/$bin -done - -%post -for bin in rake rdoc ri; do - /usr/sbin/update-alternatives --install \ - %{_bindir}/$bin $bin %{_bindir}/$bin.ruby 2 -done - -%preun -if [ "$1" = 0 ] ; then - for bin in rake rdoc ri; do - /usr/sbin/update-alternatives --remove $bin %{_bindir}/$bin.ruby - done -fi - -%if 0%{?run_tests} - -%check -export LD_LIBRARY_PATH="$PWD" -# we know some tests will fail when they do not find a /usr/bin/ruby -make check V=1 ||: -%endif - -%post -n %{libname} -/sbin/ldconfig - -%postun -n %{libname} -/sbin/ldconfig +install -D -m 0644 %{S:0} %{buildroot}/usr/share/doc/packages/ruby/README +install -D -m 0644 %{S:0} %{buildroot}/usr/share/doc/packages/ruby-devel/README %files -%defattr(-,root,root,-) -%config(noreplace) /etc/rpm/macros.ruby -%ghost %{_sysconfdir}/alternatives/rake -%ghost %{_sysconfdir}/alternatives/rdoc -%ghost %{_sysconfdir}/alternatives/ri -%{_bindir}/erb -%{_bindir}/gem -%{_bindir}/irb -%{_bindir}/rake -%{_bindir}/rdoc -%{_bindir}/ri -%{_bindir}/ruby -%{_bindir}/testrb -%{_bindir}/rake.ruby -%{_bindir}/rdoc.ruby -%{_bindir}/ri.ruby -%if 0%{?tk_version_supported} > 0 -%exclude %{rb_libdir}/multi-tk.rb -%exclude %{rb_libdir}/remote-tk.rb -%exclude %{rb_libdir}/tcltk.rb -%exclude %{rb_libdir}/tk*.rb -%exclude %{rb_libdir}/tk/ -%exclude %{rb_libdir}/tkextlib/ -%exclude %{rb_archdir}/tcltklib.so -%exclude %{rb_archdir}/tkutil.so -%endif -%{_mandir}/man1/ri.1* -%{_mandir}/man1/irb.1* -%{_mandir}/man1/erb.1* -%{_mandir}/man1/rake.1* -%{_mandir}/man1/ruby.1* -%doc ChangeLog COPYING COPYING.ja GPL KNOWNBUGS.rb LEGAL NEWS README README.EXT README.EXT.ja README.ja -# former ruby-common files -/etc/rpm/macros.suse-ruby -%dir /usr/lib/rpm/fileattrs -/usr/lib/rpm/fileattrs/rubygems.attr -/usr/lib/rpm/rubygemsdeps.rb -/usr/lib/rpm/gem_install.sh -/usr/lib/rpm/gem_build_cleanup.sh -/usr/lib/rpm/generate_buildrequires.sh - -%files -n %{libname} -%defattr(-,root,root,-) -%{_libdir}/libruby.so.2.1* - -%files doc -%defattr(-,root,root,-) -%doc doc/* sample/ - -%files stdlib -%defattr(-,root,root,-) -%{_libdir}/ruby/ -%if 0%{?tk_version_supported} > 0 -%exclude %{rb_libdir}/multi-tk.rb -%exclude %{rb_libdir}/remote-tk.rb -%exclude %{rb_libdir}/tcltk.rb -%exclude %{rb_libdir}/tk*.rb -%exclude %{rb_libdir}/tk/ -%exclude %{rb_libdir}/tkextlib/ -%exclude %{rb_archdir}/tcltklib.so -%exclude %{rb_archdir}/tkutil.so -%endif - -%files devel -f devel-extra-excludes -%defattr(-,root,root,-) -%{_includedir}/ruby-%{rb_ver} -%{_libdir}/libruby.so -%{_libdir}/libruby-static.a -%{_libdir}/pkgconfig/ruby-2.1.pc - -%files devel-extra -f devel-extra-list - -%if 0%{?tk_version_supported} > 0 -%files tk -%defattr(-,root,root,-) -%{rb_libdir}/multi-tk.rb -%{rb_libdir}/remote-tk.rb -%{rb_libdir}/tcltk.rb -%{rb_libdir}/tk*.rb -%{rb_libdir}/tk/ -%{rb_libdir}/tkextlib/ -%{rb_archdir}/tcltklib.so -%{rb_archdir}/tkutil.so -%endif - -%files doc-ri -%defattr(-,root,root,-) -%dir %{_datadir}/ri/ -%{_datadir}/ri/%{rb_ver}/ +%defattr(-,root,root) +%doc /usr/share/doc/packages/ruby/ + +%files devel +%defattr(-,root,root) +%doc /usr/share/doc/packages/ruby-devel/ %changelog ++++++ README ++++++ This is just a dummy package to pull the default ruby for the current distribution. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-sexp_processor-3_2 for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-sexp_processor-3_2 for openSUSE:Factory checked in at 2014-09-12 11:28:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-sexp_processor-3_2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-sexp_processor-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-sexp_processor-3_2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-sexp_processor-3_2/rubygem-sexp_processor-3_2.changes 2012-08-05 00:06:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-sexp_processor-3_2.new/rubygem-sexp_processor-3_2.changes 2014-09-12 12:22:53.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 10 13:59:10 UTC 2014 - mrueckert(a)suse.de + +- added gem2rpm.yml as source + +------------------------------------------------------------------- +Wed Sep 10 09:50:27 UTC 2014 - mrueckert(a)suse.de + +- added a small scriptlet to fix the shebang line of the test + scripts. +- also added a gem2rpm.yml for later, but did not regenerate the + specfile just yet. + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-sexp_processor-3_2.spec ++++++ --- /var/tmp/diff_new_pack.NWb2zc/_old 2014-09-12 12:22:54.000000000 +0200 +++ /var/tmp/diff_new_pack.NWb2zc/_new 2014-09-12 12:22:54.000000000 +0200 @@ -26,6 +26,7 @@ BuildRequires: ruby-macros >= 1 Url: https://github.com/seattlerb/sexp_processor Source: %{mod_full_name}.gem +Source1: gem2rpm.yml Summary: sexp_processor branches from ParseTree bringing all the generic sexp processing tools with it License: MIT Group: Development/Languages/Ruby @@ -61,6 +62,10 @@ %install %gem_install -f +# MANUAL +perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/test/* +# /MANUAL + %files %defattr(-,root,root,-) ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :post_install: |- perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/test/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0