May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit gns3 for openSUSE:Factory
by root＠hilbert.suse.de 09 May '14

09 May '14

Hello community, here is the log from the commit of package gns3 for openSUSE:Factory checked in at 2014-05-09 06:58:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gns3 (Old) and /work/SRC/openSUSE:Factory/.gns3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gns3" Changes: -------- --- /work/SRC/openSUSE:Factory/gns3/gns3.changes 2014-05-08 12:38:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gns3.new/gns3.changes 2014-05-09 06:58:04.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 8 12:58:16 UTC 2014 - andrea(a)opensuse.org + +- Improved spec file, added fdupes and made rpmlint happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gns3.spec ++++++ --- /var/tmp/diff_new_pack.TjVlFD/_old 2014-05-09 06:58:06.000000000 +0200 +++ /var/tmp/diff_new_pack.TjVlFD/_new 2014-05-09 06:58:06.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: python-sip %if %{undefined fedora} BuildRequires: update-desktop-files +BuildRequires: fdupes Recommends: wireshark Recommends: qemu Recommends: vde2 @@ -101,6 +102,7 @@ %__cp docs/man/gns3.1 %buildroot/%_mandir/man1/ %if %{undefined fedora} %suse_update_desktop_file %{name} +%fdupes %{buildroot}/%{python_sitelib} %endif %__rm -rf %buildroot/usr/local/share/* chmod -x CHANGELOG README TODO AUTHORS @@ -108,6 +110,25 @@ chmod -x %buildroot/%_datadir/%{name}/examples/* dos2unix README +#make rpmlint happy +chmod +x %{buildroot}/%{_datadir}/%{name}/qemuwrapper/qemuwrapper.py +chmod +x %{buildroot}/%{_libexecdir}/%{name}/vboxcontroller_4_1.py +chmod +x %{buildroot}/%{_datadir}/%{name}/vboxcontroller_4_1.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/portTracker_lib.py +chmod +x %{buildroot}/%{_datadir}/%{name}/qemuwrapper/make-qemuwrapper-exe.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Export/ExportPDF.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/dynamips_lib.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/console.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/dynagen.py +chmod +x %{buildroot}/%{_libexecdir}/%{name}/vboxwrapper.py +chmod +x %{buildroot}/%{_datadir}/%{name}/vboxwrapper.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/qemu_lib.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/dynagen_vbox_lib.py +chmod +x %{buildroot}/%{_datadir}/%{name}/tcp_pipe_proxy.py +chmod +x %{buildroot}/%{_libexecdir}/%{name}/qemuwrapper.py +chmod +x %{buildroot}/%{_datadir}/%{name}/qemuwrapper.py +chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/confConsole.py + %post /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : /usr/bin/update-desktop-database -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 09 May '14

09 May '14

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-05-09 06:57:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-05-05 21:12:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-05-09 06:57:54.000000000 +0200 @@ -1,0 +2,21 @@ +Tue May 6 19:58:50 UTC 2014 - tchvatal(a)suse.com + +- Version bump to 4.2.4.2: + * another bugfix release fixing more than dozen of issues. +- Add explicit dep over libxslt +- Remove patch applied upstream: + * bluez5-support-for-impress-remote.diff + +------------------------------------------------------------------- +Mon May 5 13:35:28 UTC 2014 - tchvatal(a)suse.com + +- Generate autocorr content for various language mutations properly + (shamelessly stolen from Fedora). + +------------------------------------------------------------------- +Mon May 5 13:24:33 UTC 2014 - tchvatal(a)suse.com + +- Use patch from upstream to handle the mutexes way better. + Updated patch kde4-4.2.3.3-timer-mutex.patch. + +------------------------------------------------------------------- Old: ---- bluez5-support-for-impress-remote.diff libreoffice-4.2.3.3.tar.xz libreoffice-help-4.2.3.3.tar.xz libreoffice-translations-4.2.3.3.tar.xz New: ---- libreoffice-4.2.4.2.tar.xz libreoffice-help-4.2.4.2.tar.xz libreoffice-translations-4.2.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.XiyjPV/_old 2014-05-09 06:58:02.000000000 +0200 +++ /var/tmp/diff_new_pack.XiyjPV/_new 2014-05-09 06:58:02.000000000 +0200 @@ -29,9 +29,9 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.3/ +%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.4/ Name: libreoffice -Version: 4.2.3.3 +Version: 4.2.4.2 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -87,8 +87,6 @@ Patch13: jvmfwk-disable-gcj.diff # Fix running wizzards in py2 as the utf is not htere Patch16: wizards-create-temlates-with-python-2.6.diff -# Fix fdo#74697 add Bluez 5 support for impress remote. -Patch17: bluez5-support-for-impress-remote.diff # PATCH-FIX-UPSTREAM: fix kde hanging in 4.2.3.3 Patch18: kde4-4.2.3.3-timer-mutex.patch # try to save space by using hardlinks @@ -171,6 +169,7 @@ BuildRequires: libwpg-devel BuildRequires: libwps-devel BuildRequires: libxml2-devel +BuildRequires: libxslt-devel BuildRequires: lpsolve-devel BuildRequires: make BuildRequires: mdds-devel >= 0.8.0 @@ -627,6 +626,15 @@ - MediaWiki Publisher +# Symlink autocorr files for various conversion items +%define make_autocorr_aliases(l:) \ +%{?-l: \ +for lang in %{*}; do \ + ln -sf acor_%{-l*}.dat %{buildroot}%{_libdir}/%{name}/share/autocorr/acor_$lang.dat \ +done \ +} \ +%{!?-l:%{error:-l must be present}} + # Symlinking macro for /usr/lib64 and /usr/share packing # As argument takes name of the package %define _link_noarch_files() \ @@ -841,8 +849,7 @@ %patch12 %patch13 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -R +%patch18 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -1090,12 +1097,26 @@ echo "%{_datadir}/%{name}/program/$file" >> file-lists/branding_upstream.txt done -################ -# FIXME: fast hack to solve a customer issue, n#364523 -# we need a more generic solution -# FIXME: can be done better, see how fedora does it and imitate -ln -sf acor_fr-FR.dat %{buildroot}%{_libdir}/%{name}/share/autocorr/acor_fr-CA.dat -echo "%{_libdir}/%{name}/share/autocorr/acor_fr-CA.dat" >>file-lists/common_list.txt +# Fix autocorr names for various language mutations +%make_autocorr_aliases -l en-GB en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT +%make_autocorr_aliases -l en-US en-PH +%make_autocorr_aliases -l en-ZA en-NA en-ZW +%make_autocorr_aliases -l af-ZA af-NA +%make_autocorr_aliases -l de-DE de-AT de-BE de-CH de-LI de-LU +%make_autocorr_aliases -l es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE +%make_autocorr_aliases -l fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC +%make_autocorr_aliases -l it-IT it-CH +%make_autocorr_aliases -l nl-NL nl-AW +%make_autocorr_aliases -l sv-SE sv-FI +pushd %{buildroot}%{_libdir}/%{name}/share/autocorr +files="" +for file in acor*.dat; do + files="$files $file" +done +popd +for file in $files; do + echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt +done # Symlink uno.py and unohelper.py so that python can find them mkdir -p %{buildroot}%{python_sitelib} ++++++ kde4-4.2.3.3-timer-mutex.patch ++++++ --- /var/tmp/diff_new_pack.XiyjPV/_old 2014-05-09 06:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.XiyjPV/_new 2014-05-09 06:58:03.000000000 +0200 @@ -1,46 +1,71 @@ -From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow(a)fbihome.de> -Date: Mon, 10 Mar 2014 14:44:05 +0000 -Subject: fdo#73115: Always run timeouts as events +From 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe Mon Sep 17 00:00:00 2001 +From: Luboš Luňák <l.lunak(a)collabora.com> +Date: Tue, 25 Mar 2014 11:20:16 +0000 +Subject: prevent KDE/Qt from interfering with the session manager -Right-click popup menus run click events throught the LO main loop. -In case of KDE4 the LO main loop is run by a timer in the main thread, -with Qt::DirectConnection execution. +I occassionally get lockups in IceProcessMessages() called from QtCore, +I'm actually not exactly sure why, as theoretically two connections +from one app shouldn't be a problem, but since LO does its own +session handling, there's no need to the KDE/Qt code to be involved, +so prevent it from connecting to the session manager altogether. -If the timeout actually starts a nested event loop for a new dialog, -the timer is blocked, the nested mainloop detects it was started -from the timeout and drops the blocked timout from polling, which -blocks any further LibreOffice event loop processing. - -This changes the timers to Qt::QueuedConnection, so they always -generate an event and are processed by the Qt event loop. - -Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc -(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56) -Reviewed-on: https://gerrit.libreoffice.org/8514 -Reviewed-by: Caolán McNamara <caolanm(a)redhat.com> -Tested-by: Caolán McNamara <caolanm(a)redhat.com> +Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b --- diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx -index b4be6d6..4a9b70b 100644 +index 820d39a..e4900a7 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx -@@ -67,9 +67,13 @@ KDEXLib::KDEXLib() : - eventLoopType( LibreOfficeEventLoop ), - m_bYieldFrozen( false ) +@@ -166,8 +166,23 @@ void KDEXLib::Init() + + KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); + ++ // LO does its own session management, so prevent KDE/Qt from interfering ++ // (QApplication::disableSessionManagement(false) wouldn't quite do, ++ // since that still actually connects to the session manager, it just ++ // won't save the application data on session shutdown). ++ char* session_manager = NULL; ++ if( getenv( "SESSION_MANAGER" ) != NULL ) ++ { ++ session_manager = strdup( getenv( "SESSION_MANAGER" )); ++ unsetenv( "SESSION_MANAGER" ); ++ } + m_pApplication = new VCLKDEApplication(); +- kapp->disableSessionManagement(); ++ if( session_manager != NULL ) ++ { ++ setenv( "SESSION_MANAGER", session_manager, 1 ); ++ free( session_manager ); ++ } ++ + KApplication::setQuitOnLastWindowClosed(false); + + #if KDE_HAVE_GLIB +diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx +index 412ee34..4ce0b2c 100644 +--- a/vcl/unx/kde4/VCLKDEApplication.hxx ++++ b/vcl/unx/kde4/VCLKDEApplication.hxx +@@ -21,22 +21,14 @@ + + #define Region QtXRegion + +-#include <QSessionManager> +- + #include <kapplication.h> + + #undef Region + +-/* #i59042# override KApplications method for session management +- * since it will interfere badly with our own. +- */ + class VCLKDEApplication : public KApplication { -- // the timers created here means they belong to the main thread -- connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated())); -- connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated())); -+ // the timers created here means they belong to the main thread. -+ // As the timeoutTimer runs the LO event queue, which may block on a dialog, -+ // the timer has to use a Qt::QueuedConnection, otherwise the nested event -+ // loop will detect the blocking timer and drop it from the polling -+ // freezing LO X11 processing. -+ connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated()), Qt::QueuedConnection ); -+ connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated()), Qt::QueuedConnection ); + public: + VCLKDEApplication(); +- +- virtual void commitData(QSessionManager&) {}; +- + virtual bool x11EventFilter(XEvent* event); + }; - // QTimer::start() can be called only in its (here main) thread, so this will - // forward between threads if needed -- cgit v0.9.0.2-2-gbebe ++++++ libreoffice-4.2.3.3.tar.xz -> libreoffice-4.2.4.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.2.3.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.2.4.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-4.2.3.3.tar.xz -> libreoffice-help-4.2.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.2.3.3/ChangeLog-helpcontent2 new/libreoffice-4.2.4.2/ChangeLog-helpcontent2 --- old/libreoffice-4.2.3.3/ChangeLog-helpcontent2 2014-04-08 14:08:18.000000000 +0200 +++ new/libreoffice-4.2.4.2/ChangeLog-helpcontent2 2014-04-30 22:21:48.000000000 +0200 @@ -1,20 +1,14 @@ -2014-04-08 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [5f76c17aafe732c43ca6bd9f30569775092ea688] +2014-04-30 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [ac2b86be850316ef89ccb5ead31385a12eee9968] -Version 4.2.3.3, tag libreoffice-4.2.3.3-hotfix1 +Version 4.2.4.2, tag libreoffice-4.2.4.2 -Change-Id: If40fd7882e1f4d4ef7c0248c76442f78b854b356 +Change-Id: I26451ec33f07548a8951ea0e085340e3a3645e20 -2014-04-03 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [0f3b6e0a4438e835d10d5efec0c46afd92825d7a] +2014-04-15 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [8ae05953f699a9545ffae358ff1b81e4df3e466e] -Version 4.2.3.3, tag libreoffice-4.2.3.3 +Branch libreoffice-4-2-4 -Change-Id: I5a8673a0a1af24a7892bf97a7f01ad3adbf2d6c2 - -2014-03-12 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [9ae4bdbb7b22a33f02b9c876290b51ce623bcbda] - -Branch libreoffice-4-2-3 - -This is 'libreoffice-4-2-3' - the stable branch for the 4.2.3 release. +This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, @@ -22,7 +16,7 @@ If you want to build something cool, unstable, and risky, use master. -Change-Id: I5c3b7c5243d0e08e5b772cb4f9e61ee8ea9df108 +Change-Id: I8aa12bfac915e23cd0e1ac098cbe6354a6fca47c 2014-01-11 Zolnai Tamás <tamas.zolnai(a)collabora.com> [7d73db5cf05eb0cd0c01536667fc021367b0aa92] ++++++ libreoffice-translations-4.2.3.3.tar.xz -> libreoffice-translations-4.2.4.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.2.3.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.2.4.2.tar.xz differ: char 26, 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 kiwi for openSUSE:Factory
by root＠hilbert.suse.de 09 May '14

09 May '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-05-09 06:57:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-05-02 09:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-05-09 06:57:39.000000000 +0200 @@ -1,0 +2,209 @@ +Thu May 8 11:33:15 CEST 2014 - ms(a)suse.de + +- v5.06.86 released + +------------------------------------------------------------------- +Thu May 8 11:32:32 CEST 2014 - ms(a)suse.de + +- fixed typo in spec file, unbalanced %if + +------------------------------------------------------------------- +Thu May 8 10:42:14 CEST 2014 - ms(a)suse.de + +- v5.06.85 released + +------------------------------------------------------------------- +Thu May 8 10:26:22 CEST 2014 - ms(a)suse.de + +- Cleanup list of authors per package in spec file + +------------------------------------------------------------------- +Thu May 8 10:09:30 CEST 2014 - ms(a)suse.de + +- Update package helper tools to auto update the kiwi-schema + provides in the spec file if the kiwi RNC schema has changed + +------------------------------------------------------------------- +Thu May 8 10:04:14 CEST 2014 - ms(a)suse.de + +- Added kiwi-schema metadata provides to spec file + This was requested by the slepos team to be able to require + the right kiwi version and schema to yast2-product-creator + +------------------------------------------------------------------- +Thu May 8 09:28:14 CEST 2014 - ms(a)suse.de + +- Added compatibility fix for fetchFile function + * Instead of matching for the exact value 'uncompressed' the + function treats all values matching the expression '^uncomp' + as a statement to indicate an uncompressed image + +------------------------------------------------------------------- +Wed May 7 21:41:33 CEST 2014 - ms(a)suse.de + +- Fixed __hasBootDescription runtime check + * the check should also work with custom user boot descriptions + +------------------------------------------------------------------- +Wed May 7 21:24:21 CEST 2014 - ms(a)suse.de + +- Follup up fix for spec file requirements: + * need virt-utils for SLE11, use qemu-tools for anything else + * add virt-utils/qemu-tools to base kiwi package only + +------------------------------------------------------------------- +Wed May 7 19:24:16 CEST 2014 - ms(a)suse.de + +- Added custom filters for kiwi --describe in KIWIAnalyse.filter + +------------------------------------------------------------------- +Wed May 7 15:43:59 CEST 2014 - ms(a)suse.de + +- DB: rebuild man pages + +------------------------------------------------------------------- +Wed May 7 15:43:13 CEST 2014 - ms(a)suse.de + +- DB: update man page + +------------------------------------------------------------------- +Wed May 7 13:39:27 CEST 2014 - ms(a)suse.de + +- v5.06.84 released + +------------------------------------------------------------------- +Wed May 7 13:37:18 CEST 2014 - ms(a)suse.de + +- Fixed spec file requirements: + Replaced virt-utils with qemu-tools, virt-utils was dropped + +------------------------------------------------------------------- +Wed May 7 08:50:19 CEST 2014 - ms(a)suse.de + +- v5.06.83 released + +------------------------------------------------------------------- +Wed May 7 08:49:14 CEST 2014 - ms(a)suse.de + +- DB: update schema documentation + +------------------------------------------------------------------- +Wed May 7 08:44:02 CEST 2014 - ms(a)suse.de + +- Follow up fix for directory check in cleanMount + use the exact same parameter for test as for umount + +------------------------------------------------------------------- +Tue May 6 23:27:09 CEST 2014 - ms(a)suse.de + +- Fixed SLE12 JeOS template + * install patterns with the namedCollection attribute + * make sure the desired release package is installed in + the bootstrap phase to avoid the installation of this + strange dummy-release package which I don't understand + what it is good for at all + +------------------------------------------------------------------- +Tue May 6 09:05:01 CEST 2014 - ms(a)suse.de + +- Fixed directory check in cleanMount + If no repo alias is set the repo uri is also used as name for + the mount point directory. In this case the name could contain + quoted characters. Perl's test operator can't deal with shell + escaped directory names. Thus we check with the shell test + built-in if the mount point directory exists + +------------------------------------------------------------------- +Mon May 5 15:14:26 CEST 2014 - ms(a)suse.de + +- v5.06.82 released + +------------------------------------------------------------------- +Mon May 5 14:44:17 CEST 2014 - ms(a)suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Mon May 5 12:57:20 CEST 2014 - tom_schr(a)suse.de + +- Added some info about Docker and KIWI + +------------------------------------------------------------------- +Mon May 5 09:41:49 CEST 2014 - ms(a)suse.de + +- Fixed check for .repo file + The repo path is stored quoted for use use with the shell + but the perl test operator can't deal with shell escaped + characters and failed. Thus shell's test built-in is used + instead + +------------------------------------------------------------------- +Fri May 2 16:26:22 CEST 2014 - ms(a)suse.de + +- v5.06.81 released + +------------------------------------------------------------------- +Fri May 2 16:15:40 CEST 2014 - ms(a)suse.de + +- Fixed suseService function + * Use of undefined variable $action where it should be $target + +------------------------------------------------------------------- +Fri May 2 15:29:56 CEST 2014 - ms(a)suse.de + +- Fixed 32bit EFI build + * if secure boot is requested, warn and switch to non + secure EFI boot. shim only exists for 64bit linux + * fixed lookup of bootloader stage files. In case of + 32bit EFI the lookup path must be 'i386-efi' + +------------------------------------------------------------------- +Fri May 2 15:27:35 CEST 2014 - ms(a)suse.de + +- Added 32bit efi modules package to boot descriptions + for openSUSE 12.3 iso | oem and vmxboot + +------------------------------------------------------------------- +Fri May 2 12:01:40 CEST 2014 - ms(a)suse.de + +- Fixed unit test Test/kiwiContainerConfigWriter.pm + * message output has changed in the container code + +------------------------------------------------------------------- +Fri May 2 10:32:15 CEST 2014 - fcastelli(a)suse.de + +- Added openSUSE 13.1 template for docker target. + +------------------------------------------------------------------- +Thu May 1 22:23:08 CEST 2014 - ms(a)suse.de + +- Fixed __populateRepos in software analyser + * The CD/DVD repos from zypper were not correctly added + as iso repo in the kiwi generated clone configuration + +------------------------------------------------------------------- +Thu May 1 20:57:44 CEST 2014 - ms(a)suse.de + +- Fixed container image name extension + * if docker is set the extension should be set to docker and not lxc + +------------------------------------------------------------------- +Wed Apr 30 12:45:39 CEST 2014 - ms(a)suse.de + +- Added support for docker image types + + kiwi supports creation of lxc images which are stored below + var/lib/lxc/<container-name>. The docker subsystem expects + the image to be packed differently. Thus we added a new type: ++++ 12 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.QwUhcv/_old 2014-05-09 06:57:41.000000000 +0200 +++ /var/tmp/diff_new_pack.QwUhcv/_new 2014-05-09 06:57:41.000000000 +0200 @@ -26,8 +26,9 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.80 +Version: 5.06.86 Release: 0 +Provides: kiwi-schema = 6.1 # requirements to build packages BuildRequires: diffutils BuildRequires: e2fsprogs @@ -81,6 +82,8 @@ Requires: rsync Requires: screen Requires: util-linux +%if 0%{?suse_version} +# SUSE specific requires %if 0%{?suse_version} >= 1210 Requires: libsolv-tools Requires: perl-solv @@ -88,6 +91,16 @@ Requires: perl-satsolver >= 0.42 Requires: satsolver-tools %endif +%if %suse_version == 1110 +Requires: virt-utils +%else +Requires: qemu-tools +%endif +%endif +%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} +# RHEL specific requires +Requires: qemu-img +%endif # recommended to run kiwi %if 0%{?suse_version} Recommends: db45-utils @@ -160,6 +173,7 @@ Authors: -------- Marcus Schaefer <ms(a)suse.com> + Robert Schweikert <rjschwei(a)suse.com> %package -n kiwi-instsource Summary: KIWI - Product media creator @@ -169,7 +183,6 @@ Requires: createrepo Requires: inst-source-utils Requires: kiwi = %{version} -Requires: virt-utils %if 0%{?suse_version} > 1120 BuildArch: noarch %endif @@ -200,8 +213,8 @@ Authors: -------- - Thomas Schraitle - Marcus Schaefer + Thomas Schraitle <toms(a)suse.com> + Marcus Schaefer <ms(a)suse.com> %package -n kiwi-tools Summary: KIWI - Collection of Boot Helper Tools @@ -264,10 +277,6 @@ Requires: dosfstools %if 0%{?suse_version} Requires: genisoimage -Requires: virt-utils -%endif -%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} -Requires: qemu-img %endif %description -n kiwi-desc-isoboot @@ -303,11 +312,9 @@ Requires: parted %if 0%{?suse_version} Requires: multipath-tools -Requires: virt-utils %endif %if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} Requires: device-mapper-multipath -Requires: qemu-img %endif %ifarch %ix86 x86_64 Requires: squashfs @@ -346,13 +353,6 @@ License: GPL-2.0+ Group: System/Management Requires: kiwi = %{version} -%ifarch ppc ppc64 ppc64le s390 s390x -Requires: virt-utils -%else -%if 0%{?suse_version} >= 1130 -Requires: virt-utils -%endif -%endif %description -n kiwi-desc-netboot kiwi boot (initrd) image for booting PXE images. @@ -387,11 +387,9 @@ %if 0%{?suse_version} Requires: genisoimage Requires: multipath-tools -Requires: virt-utils %endif %if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} Requires: device-mapper-multipath -Requires: qemu-img %endif %ifarch %ix86 x86_64 Requires: squashfs @@ -444,7 +442,7 @@ Authors: -------- - Marcus Schaefer + Marcus Schaefer <ms(a)suse.com> %endif %ifarch %ix86 x86_64 ppc ppc64 ppc64le s390 s390x %arm aarch64 @@ -482,7 +480,7 @@ Authors: -------- - Marcus Schaefer + Marcus Schaefer <ms(a)suse.com> %endif %package -n kiwi-test @@ -499,6 +497,11 @@ This package contains the unit tests executed during package build and used for development testing. +Authors: +-------- + Robert Schweikert <rjschwei(a)suse.com> + Marcus Schaefer <ms(a)suse.com> + %prep %setup -q -n %name -a2 -a3 ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.newrelease new/kiwi/.newrelease --- old/kiwi/.newrelease 2014-02-21 12:44:03.000000000 +0100 +++ new/kiwi/.newrelease 2014-05-08 10:42:56.000000000 +0200 @@ -7,4 +7,7 @@ version=$v_part1.$v_part2 -./.newversion $version +schema=$(cat modules/KIWISchema.rnc | grep "attribute schemaversion") +schema=$(echo $schema | cut -f 2 -d { | cut -f 1 -d } | tr -d \") + +./.newversion $version $schema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.newversion new/kiwi/.newversion --- old/kiwi/.newversion 2014-02-21 12:44:03.000000000 +0100 +++ new/kiwi/.newversion 2014-05-08 10:42:56.000000000 +0200 @@ -1,10 +1,19 @@ #!/bin/bash version=$1 +schema=$2 +if [ -z "$version" ] || [ -z "$schema" ];then + echo "Need a version and a schema version" + exit 1 +fi if ! echo $version | grep -q -E "^[0-9]+\.[0-9]+\.[0-9]+$";then echo "NOT A VERSION ! ... abort" exit 1 fi +if ! echo $schema | grep -q -E "^[0-9]+\.[0-9]$";then + echo "NOT A SCHEMA VERSION ! ... abort" + exit 1 +fi # code version update cat modules/KIWIGlobals.pm | sed \ @@ -13,8 +22,10 @@ # spec file version update cat rpm/kiwi.spec | sed \ - -e s"@Version: .*@Version: $version@" \ + -e "0,/Version: .*/{s/Version: .*/Version: $version/}" \ + -e s"/kiwi-schema = .*/kiwi-schema = $schema/" \ -e s"@kiwi (Version .*@kiwi (Version $version)@" \ > rpm/kiwi.spec.new && mv rpm/kiwi.spec.new rpm/kiwi.spec -echo "update to version: $version... done" +echo "update to version: ${version}... done" +echo "update to schema: ${schema}... done" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/.revision 2014-05-08 10:42:52.000000000 +0200 @@ -1 +1 @@ -b8a815445395991bc9b75931807bd6193550d920 +9102d6cf4a38f556c62960cac9cffe4ab04b2bc1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIAnalyse.filter new/kiwi/metadata/KIWIAnalyse.filter --- old/kiwi/metadata/KIWIAnalyse.filter 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/metadata/KIWIAnalyse.filter 2014-05-08 10:42:56.000000000 +0200 @@ -0,0 +1,8 @@ +# /.../ +# The following rules are embedded into a 'grep -E' call of the +# format '^/(\$|rule1|rule2|rule[n]' +# ---- +boot +var\/lib\/rpm +var\/lib\/ntp +var\/cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIAnalyseCustomData.sh new/kiwi/modules/KIWIAnalyseCustomData.sh --- old/kiwi/modules/KIWIAnalyseCustomData.sh 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIAnalyseCustomData.sh 2014-05-08 10:42:56.000000000 +0200 @@ -44,9 +44,14 @@ sort -u $1 -o $1 } +function custom_filter { + local filter=/usr/share/kiwi/metadata/KIWIAnalyse.filter + grep -v '^#' $filter | tr '\n' '|' +} + function filter_items { # files and directories matching here are filtered out - echo -n "^/(\$|tmp|dev|proc|sys|run|lost\+found|var\/run)" + echo -n "^/(\$|$(custom_filter)tmp|dev|proc|sys|run|lost\+found|var\/run)" } function filter_filesystem { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIAnalyseSoftware.pm new/kiwi/modules/KIWIAnalyseSoftware.pm --- old/kiwi/modules/KIWIAnalyseSoftware.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIAnalyseSoftware.pm 2014-05-08 10:42:52.000000000 +0200 @@ -365,6 +365,7 @@ $source = "dir://".$mpoint; push @{$mounts},$mpoint; $osc{$product}{$source}{flag} = "local"; + $origsrc = "iso://$iso"; } #========================================== # handle source type http|https|ftp:// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-05-08 10:42:52.000000000 +0200 @@ -483,8 +483,11 @@ $kiwi -> warning ( "UEFI Secure boot is only supported on x86_64" ); - $kiwi -> skipped (); - $firmware = 'bios'; + $kiwi -> skipped(); + $kiwi -> warning ( + "--> switching to non secure EFI boot\n" + ); + $firmware = 'efi'; } } #========================================== @@ -3618,6 +3621,9 @@ my $grub_efi = 'grub2'; my $grub_share = 'grub2'; my $lib = 'lib'; + if ($arch ne 'x86_64') { + $efipc = 'i386-efi'; + } if ($zipped) { $test = $unzip; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2014-05-08 10:42:52.000000000 +0200 @@ -144,10 +144,10 @@ echo "suseService: no service name specified" return fi - if [ $action = off ];then + if [ $target = off ];then suseRemoveService $service else - suseInsertService $service $action + suseInsertService $service $target fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfigWriter.pm new/kiwi/modules/KIWIConfigWriter.pm --- old/kiwi/modules/KIWIConfigWriter.pm 2014-03-04 11:48:57.000000000 +0100 +++ new/kiwi/modules/KIWIConfigWriter.pm 2014-05-08 10:42:52.000000000 +0200 @@ -100,6 +100,27 @@ } #========================================== +# setConfigFileName +#------------------------------------------ +sub setConfigFileName { + # ... + # Set the configuration file name + # --- + my $this = shift; + my $name = shift; + my $kiwi = $this->{kiwi}; + if (! $name) { + my $msg = 'setConfigFileName: no filename argument ' + . 'provided, retaining current data.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return; + } + $this->{name} = $name; + return $this; +} + +#========================================== # setConfigDir #------------------------------------------ sub setConfigDir { @@ -126,4 +147,5 @@ $this->{confDir} = $confDir; return $this; } + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfigWriterFactory.pm new/kiwi/modules/KIWIConfigWriterFactory.pm --- old/kiwi/modules/KIWIConfigWriterFactory.pm 2014-03-04 11:48:57.000000000 +0100 +++ new/kiwi/modules/KIWIConfigWriterFactory.pm 2014-05-08 10:42:52.000000000 +0200 @@ -90,8 +90,11 @@ my $xml = $this->{xml}; my $typeName = $xml -> getImageType() -> getTypeName(); SWITCH: for ($typeName) { - /^lxc/smx && do { + /^lxc|^docker/smx && do { my $writer = KIWIContainerConfigWriter -> new($xml, $confDir); + if (($writer) && ($typeName eq 'docker')) { + $writer -> setConfigFileName('default.conf'); + } return $writer; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerBuilder.pm new/kiwi/modules/KIWIContainerBuilder.pm --- old/kiwi/modules/KIWIContainerBuilder.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIContainerBuilder.pm 2014-05-08 10:42:52.000000000 +0200 @@ -318,18 +318,48 @@ my $kiwi = $this->{kiwi}; my $locator = $this->{locator}; my $xml = $this->{xml}; + my $type = $xml -> getImageType(); + my $imageType = $type -> getTypeName(); + my $extension = '-lxc'; $kiwi -> info('Creating container tarball...'); + if ($imageType eq 'docker') { + $extension = '-docker'; + } my $baseBuildDir = $this -> getBaseBuildDirectory(); my $origin = $baseBuildDir . '/' . $this -> p_getBaseWorkingDir(); my $globals = KIWIGlobals -> instance(); - my $imgFlName = $globals -> generateBuildImageName($xml, '-', '-lxc'); + my $imgFlName = $globals -> generateBuildImageName( + $xml, '-', $extension + ); $imgFlName .= '.tbz'; my $tar = $locator -> getExecPath('tar'); - my $cmd = "cd $origin; " - . "$tar -cjf $baseBuildDir/$imgFlName etc var 2>&1"; - my $data = KIWIQX::qxx ($cmd); + if (! $tar) { + $kiwi -> failed(); + $kiwi -> error("Could not find tar utility"); + $kiwi -> failed(); + return; + } + my @dirlist; + if (opendir my($dh), $origin) { + @dirlist = grep { !/^\.\.?$/x } readdir $dh; + closedir $dh; + } else { + $kiwi -> failed(); + $kiwi -> error("Couldn't open dir $origin: $!"); + $kiwi -> failed(); + return; + } + if (! @dirlist) { + $kiwi -> failed(); + $kiwi -> error("Got empty dirlist"); + $kiwi -> failed(); + return; + } + my $data = KIWIQX::qxx ( + "$tar -C $origin -cjf $baseBuildDir/$imgFlName @dirlist 2>&1" + ); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed(); @@ -350,25 +380,30 @@ # ... # Create the directory for the container configuration file # --- - my $this = shift; + my $this = shift; my $cmdL = $this->{cmdL}; my $kiwi = $this->{kiwi}; my $locator = $this->{locator}; - my $xml = $this->{xml}; - $kiwi -> info('Creating container configuration directory'); + my $xml = $this->{xml}; + my $msg; + $kiwi -> info("Creating container configuration directory\n"); # Build the directory name - my $dirPath = '/etc/lxc/'; - my $name = $xml -> getImageType() -> getContainerName(); - if (! $name) { - $kiwi -> failed(); - my $msg = 'KIWIContainerBuilder:__createContainerConfigDir ' - . 'internal error no container name found. Please file a bug.'; - $kiwi -> error($msg); - $kiwi -> failed(); - return; + my $dirPath = 'etc/lxc'; + my $type = $xml -> getImageType(); + my $containerName = $type -> getContainerName(); + my $imageType = $type -> getTypeName(); + if ($imageType eq "lxc") { + if (! $containerName) { + $msg = 'KIWIContainerBuilder:__createContainerConfigDir ' + . 'internal error no container name found. Please file a bug.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return; + } + $dirPath .= '/'.$containerName; } - $dirPath .= $name; my $path = $this -> __createWorkingDir($dirPath); + $kiwi -> info ("--> $dirPath"); if (! $path) { $kiwi -> failed(); return; @@ -584,19 +619,25 @@ my $kiwi = $this->{kiwi}; my $locator = $this->{locator}; my $xml = $this->{xml}; + my $dirPath; + my $msg; $kiwi -> info('Creating rootfs target directory'); # Build the directory name - my $dirPath = 'var/lib/lxc/'; - my $name = $xml -> getImageType() -> getContainerName(); - if (! $name) { - $kiwi -> failed(); - my $msg = 'KIWIContainerBuilder:__createTargetRootTree ' - . 'internal error no container name found. Please file a bug.'; - $kiwi -> error($msg); - $kiwi -> failed(); - return; + my $type = $xml -> getImageType(); + my $imageType = $type -> getTypeName(); + if ($imageType eq 'lxc') { + $dirPath = 'var/lib/lxc/'; + my $containerName = $type -> getContainerName(); + if (! $containerName) { + $kiwi -> failed(); + $msg = 'KIWIContainerBuilder:__createTargetRootTree ' + . 'internal error no container name found. Please file a bug.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return; + } + $dirPath .= $containerName . '/rootfs'; } - $dirPath .= $name . '/rootfs'; my $path = $this -> __createWorkingDir($dirPath); if (! $path) { $kiwi -> failed(); @@ -620,10 +661,15 @@ my $locator = $this->{locator}; my $basePath = $this -> getBaseBuildDirectory(); my $baseWork = $this -> p_getBaseWorkingDir(); - if (! $path && ! $baseWork) { + my $dirPath; + if (! $baseWork) { return $basePath; } - my $dirPath = $basePath . '/' . $baseWork . '/' . $path; + if ($path) { + $dirPath = $basePath . '/' . $baseWork . '/' . $path; + } else { + $dirPath = $basePath . '/' . $baseWork; + } my $mdir = $locator -> getExecPath('mkdir'); my $data = KIWIQX::qxx ("$mdir -p $dirPath"); my $code = $? >> 8; @@ -647,7 +693,7 @@ my $kiwi = $this->{kiwi}; my $locator = $this->{locator}; $kiwi -> info('Disable unwanted services'); - my $sysctl = $locator -> getExecPath('systemct', $targetDir); + my $sysctl = $locator -> getExecPath('systemctl', $targetDir); my $croot = $locator -> getExecPath('chroot'); if ($sysctl) { my @srvs = qw ( @@ -669,6 +715,10 @@ } } for my $srvPath (@services) { + if (-l $srvPath) { + # only real service files can be disabled + next; + } my @parts = split /\//smx, $srvPath; my $name = $parts[-1]; my $cmd = "$croot $targetDir " @@ -677,7 +727,7 @@ my $code = $? >> 8; if ($code != 0) { $kiwi -> failed(); - $kiwi -> error('Could not disable service: $name'); + $kiwi -> error("Could not disable service: $name"); $kiwi -> failed(); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerConfigWriter.pm new/kiwi/modules/KIWIContainerConfigWriter.pm --- old/kiwi/modules/KIWIContainerConfigWriter.pm 2014-03-04 11:48:57.000000000 +0100 +++ new/kiwi/modules/KIWIContainerConfigWriter.pm 2014-05-08 10:42:52.000000000 +0200 @@ -61,7 +61,10 @@ my $this = shift; my $kiwi = $this->{kiwi}; my $xml = $this->{xml}; - $kiwi -> info('Write container configuration file'); + my $loc = $this -> getConfigDir(); + my $fileName = $this -> getConfigFileName(); + $kiwi -> info("Write container configuration file\n"); + $kiwi -> info ("--> $loc/$fileName"); my $vmConfig = $xml -> getVMachineConfig(); my $config = '# KIWI generated container configuration file' . "\n"; if ($vmConfig) { @@ -115,10 +118,6 @@ . 'lxc.cgroup.devices.allow = c 5:2 rwm' . "\n" . '# rtc' . "\n" . 'lxc.cgroup.devices.allow = c 254:0 rwm' . "\n"; - - my $loc = $this -> getConfigDir(); - my $fileName = $this -> getConfigFileName(); - my $status = open (my $CONF, '>', "$loc/$fileName"); if (! $status) { $kiwi -> failed(); @@ -132,6 +131,7 @@ print $CONF $config; $status = close $CONF; if (! $status) { + $kiwi -> oops(); my $msg = 'Unable to close configuration file' . "$loc/$fileName"; $kiwi -> warning($msg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2014-04-29 16:29:54.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-05-08 11:36:15.000000000 +0200 @@ -1398,7 +1398,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.80"; + $data{Version} = "5.06.86"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2014-05-08 10:42:52.000000000 +0200 @@ -1690,7 +1690,10 @@ $kiwi -> warning ( "UEFI Secure boot is only supported on x86_64" ); - $kiwi -> skipped (); + $kiwi -> skipped(); + $kiwi -> warning ( + "--> switching to non secure EFI boot\n" + ); $firmware = 'efi'; } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageBuildFactory.pm new/kiwi/modules/KIWIImageBuildFactory.pm --- old/kiwi/modules/KIWIImageBuildFactory.pm 2014-03-04 11:48:57.000000000 +0100 +++ new/kiwi/modules/KIWIImageBuildFactory.pm 2014-05-08 10:42:52.000000000 +0200 @@ -94,7 +94,7 @@ my $xml = $this->{xml}; my $typeName = $xml -> getImageType() -> getTypeName(); SWITCH: for ($typeName) { - /^lxc/smx && do { + /^lxc|^docker/smx && do { my $builder = KIWIContainerBuilder -> new($xml, $cmdL, $unPImg); return $builder; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-04-29 16:29:54.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-05-08 10:42:56.000000000 +0200 @@ -6729,7 +6729,7 @@ #====================================== # set source path + tool if compressed #-------------------------------------- - if [ ! -z "$izip" ] && [ ! "$izip" = "uncompressed" ];then + if [ ! -z "$izip" ] && [[ ! "$izip" =~ ^uncomp ]];then if [ $izip = "compressed" ] || [ "$izip" = "compressed-gzip" ]; then unzip="gzip -d" path=$(echo "$path" | sed -e s@\\.gz@@) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManagerZypper.pm new/kiwi/modules/KIWIManagerZypper.pm --- old/kiwi/modules/KIWIManagerZypper.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIManagerZypper.pm 2014-05-08 10:42:52.000000000 +0200 @@ -351,9 +351,16 @@ $alias_filename =~ s/\//_/g; my $repo = "$root/$dataDir/repos/$alias_filename.repo"; my $imgRepo = "$root/etc/zypp/repos.d/$alias_filename.repo"; + # /.../ + # test if the repo exists with a shell test built-in + # this is because the repo string could contain shell escaped + # characters which is not supported by perl's test operators + # ---- + KIWIQX::qxx ("test -f $repo"); + my $repo_exists = ($? >> 8) == 0; my $sed; if (! $chroot) { - if (! -f $repo) { + if (! $repo_exists) { $kiwi -> info ("Adding bootstrap zypper service: $alias"); $data = KIWIQX::qxx ("@zypper --root \"$root\" $sadd 2>&1"); $code = $? >> 8; @@ -379,7 +386,7 @@ $kiwi -> done (); } else { my @zypper= @{$this->{zypper_chroot}}; - if (! -f $repo) { + if (! $repo_exists) { $kiwi -> info ("Adding chroot zypper service: $alias"); $data = KIWIQX::qxx ("@kchroot @zypper $sadd 2>&1"); $code = $? >> 8; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2014-05-08 10:42:52.000000000 +0200 @@ -1534,16 +1534,27 @@ } my @newList= (); foreach my $item (reverse @mountList) { + # check for matching exclude expression if specified if (defined $expr) { if ($item !~ /$expr/) { push (@newList,$item); next; } } - $kiwi -> loginfo ("Umounting path: $item\n"); - if (! -d $item) { + # /.../ + # test if the item is a directory with a shell test built-in + # this is because the repo string could contain shell escaped + # characters which is not supported by perl's test operators + # ---- + KIWIQX::qxx ("test -d \"$item\""); + my $mountpoint_exists = ($? >> 8) == 0; + if (! $mountpoint_exists) { + $kiwi -> loginfo ( + "Warning: \"$item\" not a directory or not existing\n" + ); next; } + $kiwi -> loginfo ("Umounting path: $item\n"); my $data = KIWIQX::qxx ("umount \"$item\" 2>&1"); my $code = $? >> 8; if (($code != 0) && ($data !~ "not mounted")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRuntimeChecker.pm new/kiwi/modules/KIWIRuntimeChecker.pm --- old/kiwi/modules/KIWIRuntimeChecker.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2014-05-08 10:42:56.000000000 +0200 @@ -354,7 +354,7 @@ return 1; } my $name = $type -> getTypeName(); - if ($name =~ /^lxc/smx) { + if ($name =~ /^lxc|^docker/smx) { my $pckgs = $xml -> getPackages(); push @{$pckgs}, @{$xml -> getBootstrapPackages()}; for my $pckg (@{$pckgs}) { @@ -1171,6 +1171,7 @@ btrfs clicfs cpio + docker ext2 ext3 ext4 @@ -1273,17 +1274,10 @@ if (! $description) { return 1; } - if ($imgType !~ /iso|pxe|oem|vmx/) { - return 1; - } - if ($imgType eq 'pxe') { - $imgType = 'net'; - } - my $gdata = KIWIGlobals -> instance() -> getKiwiConfig(); - if (! -d "$gdata->{System}/${imgType}boot") { - my $msg = "The required boot image description for the "; - $msg.= "selected build type: '$imgType' does not exist. "; - $msg.= "Please install the package: kiwi-desc-${imgType}boot"; + my $bootdir = $locator -> getBootImageDescription($description); + if (! $bootdir) { + my $msg = "The required boot image description: '$description' "; + $msg.= "for the selected build type: '$imgType' does not exist. "; $kiwi -> error($msg); $kiwi -> failed(); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2014-05-08 10:42:52.000000000 +0200 @@ -1703,7 +1703,7 @@ k.type.image.attribute = ## Specifies the image type attribute image { - "btrfs" | "clicfs" | "cpio" | "ext2" | "ext3" | + "btrfs" | "clicfs" | "cpio" | "docker" | "ext2" | "ext3" | "ext4" | "iso" | "lxc" | "oem" | "product" | "pxe" | "reiserfs" | "split" | "squashfs" | "tbz" | "vmx" | "xfs" | "zfs" } @@ -2604,8 +2604,8 @@ # div { k.packages.type.attribute = attribute type { - "bootstrap" | "delete" | "image" | "iso" | "lxc" | "oem" | "pxe" | - "split" | "testsuite" | "vmx" + "bootstrap" | "delete" | "docker" | "image" | "iso" | + "lxc" | "oem" | "pxe" | "split" | "testsuite" | "vmx" } k.packages.profiles.attribute = k.profiles.attribute k.packages.patternType.attribute = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2014-05-08 10:42:52.000000000 +0200 @@ -2297,6 +2297,7 @@ <value>btrfs</value> <value>clicfs</value> <value>cpio</value> + <value>docker</value> <value>ext2</value> <value>ext3</value> <value>ext4</value> @@ -3761,6 +3762,7 @@ <choice> <value>bootstrap</value> <value>delete</value> + <value>docker</value> <value>image</value> <value>iso</value> <value>lxc</value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLTypeData.pm new/kiwi/modules/KIWIXMLTypeData.pm --- old/kiwi/modules/KIWIXMLTypeData.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIXMLTypeData.pm 2014-05-08 10:42:52.000000000 +0200 @@ -2195,6 +2195,7 @@ btrfs clicfs cpio + docker ext2 ext3 ext4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2014-05-08 10:42:52.000000000 +0200 @@ -213,9 +213,9 @@ } #========================================== -# __checkConainerSpec +# __checkContainerSpec #------------------------------------------ -sub __checkConainerSpec { +sub __checkContainerSpec { # ... # Check that the container attribute is set and has a valid name # --- @@ -1217,7 +1217,7 @@ # relevant inside the initrd # ---- my %typeChildDeps = ( - 'machine' => 'image:cpio,lxc,oem,vmx,split', + 'machine' => 'image:cpio,lxc,docker,oem,vmx,split', 'oemconfig' => 'image:cpio,oem,split', 'pxedeploy' => 'image:cpio,pxe', 'size' => ':', # generic @@ -1745,7 +1745,7 @@ if (! $this -> __checkBootSpecPresent()) { return; } - if (! $this -> __checkConainerSpec()) { + if (! $this -> __checkContainerSpec()) { return; } if (! $this -> __checkDefaultProfSetting()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2014-05-08 10:42:52.000000000 +0200 @@ -119,6 +119,8 @@ <package name="grub"/> <package name="grub2"/> <package name="grub2-efi"/> + <package name="grub2-i386-efi" arch="i686"/> + <package name="grub2-i386-efi" arch="i586"/> <package name="shim" arch="x86_64"/> <package name="hdparm"/> <package name="hwinfo"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2014-05-08 10:42:52.000000000 +0200 @@ -136,6 +136,8 @@ <package name="grub"/> <package name="grub2"/> <package name="grub2-efi"/> + <package name="grub2-i386-efi" arch="i686"/> + <package name="grub2-i386-efi" arch="i586"/> <package name="shim" arch="x86_64"/> <package name="hwinfo"/> <package name="iputils"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2014-04-29 16:29:49.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2014-05-08 10:42:52.000000000 +0200 @@ -113,6 +113,8 @@ <package name="grub"/> <package name="grub2"/> <package name="grub2-efi"/> + <package name="grub2-i386-efi" arch="i686"/> + <package name="grub2-i386-efi" arch="i586"/> <package name="shim" arch="x86_64"/> <package name="hwinfo"/> <package name="kernel-firmware"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/config.xml new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2014-04-29 16:29:50.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2014-05-08 10:42:52.000000000 +0200 @@ -68,16 +68,7 @@ <source path="http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/"/> </repository> <packages type="image"> - - - - - <package name="patterns-sles-Minimal"/> - - - - - <package name="sles-release-DVD"/> + <namedCollection name="Minimal"/> <package name="plymouth-branding-SLE" bootinclude="true"/> <package name="grub2-branding-SLE" bootinclude="true"/> <package name="ifplugd"/> @@ -128,6 +119,19 @@ <package name="glibc-locale"/> <package name="cracklib-dict-full"/> <package name="ca-certificates"/> + + <package name="sles-release"/> </packages> <packages type="delete"> <package name="kernel-debug"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm new/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm --- old/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm 2014-03-04 11:48:57.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm 2014-05-08 10:42:52.000000000 +0200 @@ -438,7 +438,7 @@ my $builder = KIWIContainerBuilder -> new($xml, $cmdL, $image); my $res = $builder -> __createContainerConfigDir(); my $msg = $kiwi -> getMessage(); - my $expected = 'Creating container configuration directory'; + my $expected = "Creating container configuration directory\n--> etc/lxc/mycontainer"; $this -> assert_str_equals($expected, $msg); my $msgT = $kiwi -> getMessageType(); $this -> assert_str_equals('info', $msgT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm new/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm --- old/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm 2014-03-04 11:48:57.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm 2014-05-08 10:42:52.000000000 +0200 @@ -307,8 +307,8 @@ my $writer = KIWIContainerConfigWriter -> new($xml, $cDir); my $res = $writer -> p_writeConfigFile(); my $msg = $kiwi -> getInfoMessage(); - my $expected = 'Write container configuration file' - . 'Write fstab for container'; + my $expected = "Write container configuration file\n" + . "--> /tmp/kiwiDevTests/configWrite fstab for container"; $this -> assert_str_equals($expected, $msg); my $msgT = $kiwi -> getMessageType(); $this -> assert_str_equals('info', $msgT); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openssl for openSUSE:Factory
by root＠hilbert.suse.de 09 May '14

09 May '14

Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at 2014-05-09 06:57:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl (Old) and /work/SRC/openSUSE:Factory/.openssl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Changes: -------- --- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2014-05-06 13:39:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssl.new/openssl.changes 2014-05-09 06:57:36.000000000 +0200 @@ -1,0 +2,30 @@ +Mon May 5 16:25:17 UTC 2014 - crrodriguez(a)opensuse.org + +- 0005-libssl-Hide-library-private-symbols.patch + Update to hide more symbols that are not part of + the public API + +- openssl-gcc-attributes.patch BUF_memdup also + needs attribute alloc_size as it returns memory + of size of the second parameter. + +- openssl-ocloexec.patch Update, accept() + also needs O_CLOEXEC. + +- 0009-Fix-double-frees.patch, 0017-Double-free-in-i2o_ECPublicKey.patch + fix various double frees (from upstream) + +- 012-Fix-eckey_priv_encode.patch eckey_priv_encode should + return an error inmediately on failure of i2d_ECPrivateKey (from upstream) + +- 0001-Axe-builtin-printf-implementation-use-glibc-instead.patch + From libressl, modified to work on linux systems that do not have + funopen() but fopencookie() instead. + Once upon a time, OS didn't have snprintf, which caused openssl to + bundle a *printf implementation. We know better nowadays, the glibc + implementation has buffer overflow checking, has sane failure modes + deal properly with threads, signals..etc.. + +- build with -fno-common as well. + +------------------------------------------------------------------- New: ---- 0001-Axe-builtin-printf-implementation-use-glibc-instead.patch 0009-Fix-double-frees.patch 0012-Fix-eckey_priv_encode.patch 0017-Double-free-in-i2o_ECPublicKey.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.KcyBJP/_old 2014-05-09 06:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.KcyBJP/_new 2014-05-09 06:57:37.000000000 +0200 @@ -68,6 +68,10 @@ Patch20: openssl-buffreelistbug-aka-CVE-2010-5298.patch Patch21: openssl-libssl-noweakciphers.patch Patch22: CVE-2014-0198.patch +Patch23: 0009-Fix-double-frees.patch +Patch24: 0012-Fix-eckey_priv_encode.patch +Patch25: 0017-Double-free-in-i2o_ECPublicKey.patch +Patch26: 0001-Axe-builtin-printf-implementation-use-glibc-instead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -177,6 +181,10 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 cp -p %{S:10} . cp -p %{S:11} . echo "adding/overwriting some entries in the 'table' hash in Configure" @@ -240,7 +248,7 @@ $RPM_OPT_FLAGS -O3 -std=gnu99 \ -Wa,--noexecstack \ -Wl,-z,relro,-z,now \ --fomit-frame-pointer \ +-fno-common \ -DTERMIO \ -DPURIFY \ -DSSL_FORBID_ENULL \ ++++++ 0001-Axe-builtin-printf-implementation-use-glibc-instead.patch ++++++ ++++ 835 lines (skipped) ++++++ 0005-libssl-Hide-library-private-symbols.patch ++++++ --- /var/tmp/diff_new_pack.KcyBJP/_old 2014-05-09 06:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.KcyBJP/_new 2014-05-09 06:57:37.000000000 +0200 @@ -1,20 +1,42 @@ -From 89d5aecbc62842651cf22e48c405eb435feb0df3 Mon Sep 17 00:00:00 2001 +From f33b5a4cb7da3947d06b74e6f6cd2f264faca170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez(a)opensuse.org> -Date: Wed, 24 Jul 2013 23:29:05 -0400 -Subject: [PATCH 5/5] libssl: Hide library private symbols - -This patch only contains the libssl part (the easy one) -patch to libcrypto will follow after it is complete and good enough. +Date: Sun, 20 Apr 2014 19:39:37 -0300 +Subject: [PATCH] libssl: Hide library private symbols It hides all the library symbols that are not part of the public API/ABI when GCC 4 or later is used. --- + ssl/d1_lib.c | 5 ++--- ssl/kssl_lcl.h | 9 +++++++++ + ssl/s23_srvr.c | 4 ++-- + ssl/s2_lib.c | 1 - + ssl/s3_lib.c | 1 - + ssl/ssl_lib.c | 1 - ssl/ssl_locl.h | 8 ++++++++ - 2 files changed, 17 insertions(+) + ssl/t1_lib.c | 6 ++---- + 8 files changed, 23 insertions(+), 12 deletions(-) -Index: openssl-1.0.1g/ssl/kssl_lcl.h -=================================================================== +--- openssl-1.0.1g.orig/ssl/d1_lib.c ++++ openssl-1.0.1g/ssl/d1_lib.c +@@ -67,8 +67,7 @@ + #endif + + static void get_current_time(struct timeval *t); +-const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT; +-int dtls1_listen(SSL *s, struct sockaddr *client); ++static int dtls1_listen(SSL *s, struct sockaddr *client); + + SSL3_ENC_METHOD DTLSv1_enc_data={ + dtls1_enc, +@@ -468,7 +467,7 @@ static void get_current_time(struct time + #endif + } + +-int dtls1_listen(SSL *s, struct sockaddr *client) ++static int dtls1_listen(SSL *s, struct sockaddr *client) + { + int ret; + --- openssl-1.0.1g.orig/ssl/kssl_lcl.h +++ openssl-1.0.1g/ssl/kssl_lcl.h @@ -61,6 +61,10 @@ @@ -38,8 +60,56 @@ +#endif + #endif /* KSSL_LCL_H */ -Index: openssl-1.0.1g/ssl/ssl_locl.h -=================================================================== +--- openssl-1.0.1g.orig/ssl/s23_srvr.c ++++ openssl-1.0.1g/ssl/s23_srvr.c +@@ -120,7 +120,7 @@ + #endif + + static const SSL_METHOD *ssl23_get_server_method(int ver); +-int ssl23_get_client_hello(SSL *s); ++static int ssl23_get_client_hello(SSL *s); + static const SSL_METHOD *ssl23_get_server_method(int ver) + { + #ifndef OPENSSL_NO_SSL2 +@@ -235,7 +235,7 @@ end: + } + + +-int ssl23_get_client_hello(SSL *s) ++static int ssl23_get_client_hello(SSL *s) + { + char buf_space[11]; /* Request this many bytes in initial read. + * We can detect SSL 3.0/TLS 1.0 Client Hellos +--- openssl-1.0.1g.orig/ssl/s2_lib.c ++++ openssl-1.0.1g/ssl/s2_lib.c +@@ -116,7 +116,6 @@ + #include <openssl/evp.h> + #include <openssl/md5.h> + +-const char ssl2_version_str[]="SSLv2" OPENSSL_VERSION_PTEXT; + + #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER)) + +--- openssl-1.0.1g.orig/ssl/s3_lib.c ++++ openssl-1.0.1g/ssl/s3_lib.c +@@ -162,7 +162,6 @@ + #include <openssl/dh.h> + #endif + +-const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT; + + #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER)) + +--- openssl-1.0.1g.orig/ssl/ssl_lib.c ++++ openssl-1.0.1g/ssl/ssl_lib.c +@@ -160,7 +160,6 @@ + #include <openssl/engine.h> + #endif + +-const char *SSL_version_str=OPENSSL_VERSION_TEXT; + + SSL3_ENC_METHOD ssl3_undef_enc_method={ + /* evil casts, but these functions are only called if there's a library bug */ --- openssl-1.0.1g.orig/ssl/ssl_locl.h +++ openssl-1.0.1g/ssl/ssl_locl.h @@ -165,6 +165,10 @@ @@ -53,12 +123,26 @@ #ifdef OPENSSL_BUILD_SHLIBSSL # undef OPENSSL_EXTERN # define OPENSSL_EXTERN OPENSSL_EXPORT -@@ -1174,4 +1178,8 @@ void tls_fips_digest_extra( +@@ -1174,4 +1178,12 @@ void tls_fips_digest_extra( const EVP_CIPHER_CTX *cipher_ctx, EVP_MD_CTX *mac_ctx, const unsigned char *data, size_t data_len, size_t orig_len); ++int private_tls1_PRF(long digest_mask, const void *seed1, int seed1_len, const void *seed2, int seed2_len, ++ const void *seed3, int seed3_len, const void *seed4, int seed4_len, const void *seed5, int seed5_len, ++ const unsigned char *sec, int slen, unsigned char *out1, unsigned char *out2, int olen); ++ +#if defined(__GNUC__) && __GNUC__ >= 4 +#pragma GCC visibility pop +#endif + #endif +--- openssl-1.0.1g.orig/ssl/t1_lib.c ++++ openssl-1.0.1g/ssl/t1_lib.c +@@ -117,7 +117,6 @@ + #include <openssl/rand.h> + #include "ssl_locl.h" + +-const char tls1_version_str[]="TLSv1" OPENSSL_VERSION_PTEXT; + + #ifndef OPENSSL_NO_TLSEXT + static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, ++++++ 0009-Fix-double-frees.patch ++++++ >From 9c8dc84ac16a2f21063ae36809d202d0284ecf82 Mon Sep 17 00:00:00 2001 From: Ben Laurie <ben(a)links.org> Date: Tue, 22 Apr 2014 13:11:56 +0100 Subject: [PATCH 09/17] Fix double frees. --- CHANGES | 3 ++- crypto/pkcs7/pk7_doit.c | 1 + crypto/ts/ts_rsp_verify.c | 1 + ssl/d1_srvr.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 77fda3b..4c12a9d 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -928,6 +928,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0) goto err; OPENSSL_free(abuf); + abuf = NULL; if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0) goto err; abuf = OPENSSL_malloc(siglen); diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index afe16af..b7d170a 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -629,6 +629,7 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info, X509_ALGOR_free(*md_alg); OPENSSL_free(*imprint); *imprint_len = 0; + *imprint = NULL; return 0; } diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 9975e20..1384ab0 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -1356,6 +1356,7 @@ int dtls1_send_server_key_exchange(SSL *s) (unsigned char *)encodedPoint, encodedlen); OPENSSL_free(encodedPoint); + encodedPoint = NULL; p += encodedlen; } #endif -- 1.8.4.5 ++++++ 0012-Fix-eckey_priv_encode.patch ++++++ >From f0816174d264b11f6f4ccb41c75883640a2416bb Mon Sep 17 00:00:00 2001 From: mancha <mancha1(a)zoho.com> Date: Thu, 24 Apr 2014 19:06:20 +0000 Subject: [PATCH 12/17] Fix eckey_priv_encode() Fix eckey_priv_encode to return an error on failure of i2d_ECPrivateKey. --- CHANGES | 4 ++++ crypto/ec/ec_ameth.c | 1 + 2 files changed, 5 insertions(+) diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 0ce4524..f715a23 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -352,6 +352,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) EC_KEY_set_enc_flags(ec_key, old_flags); OPENSSL_free(ep); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); + return 0; } /* restore old encoding flags */ EC_KEY_set_enc_flags(ec_key, old_flags); -- 1.8.4.5 ++++++ 0017-Double-free-in-i2o_ECPublicKey.patch ++++++ >From 8eb094b9460575a328ba04708147c91fc267b394 Mon Sep 17 00:00:00 2001 From: David Ramos <daramos(a)stanford.edu> Date: Sat, 3 May 2014 12:00:27 +0200 Subject: [PATCH 17/17] Double free in i2o_ECPublicKey PR: 3338 --- crypto/ec/ec_asn1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index 145807b..e94f34e 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -1435,8 +1435,11 @@ int i2o_ECPublicKey(EC_KEY *a, unsigned char **out) *out, buf_len, NULL)) { ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB); - OPENSSL_free(*out); - *out = NULL; + if (new_buffer) + { + OPENSSL_free(*out); + *out = NULL; + } return 0; } if (!new_buffer) -- 1.8.4.5 ++++++ openssl-gcc-attributes.patch ++++++ --- /var/tmp/diff_new_pack.KcyBJP/_old 2014-05-09 06:57:38.000000000 +0200 +++ /var/tmp/diff_new_pack.KcyBJP/_new 2014-05-09 06:57:38.000000000 +0200 @@ -32,3 +32,14 @@ void OPENSSL_cleanse(void *ptr, size_t len); +--- openssl-1.0.1g.orig/crypto/buffer/buffer.h ++++ openssl-1.0.1g/crypto/buffer/buffer.h +@@ -87,7 +87,7 @@ int BUF_MEM_grow(BUF_MEM *str, size_t le + int BUF_MEM_grow_clean(BUF_MEM *str, size_t len); + char * BUF_strdup(const char *str); + char * BUF_strndup(const char *str, size_t siz); +-void * BUF_memdup(const void *data, size_t siz); ++void * BUF_memdup(const void *data, size_t siz) __attribute__((alloc_size(2))); + void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz); + + /* safe string functions */ ++++++ openssl-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.KcyBJP/_old 2014-05-09 06:57:38.000000000 +0200 +++ /var/tmp/diff_new_pack.KcyBJP/_new 2014-05-09 06:57:38.000000000 +0200 @@ -1,5 +1,3 @@ -Index: crypto/bio/b_sock.c -=================================================================== --- crypto/bio/b_sock.c.orig +++ crypto/bio/b_sock.c @@ -735,7 +735,7 @@ int BIO_get_accept_socket(char *host, in @@ -20,8 +18,15 @@ if (cs != INVALID_SOCKET) { int ii; -Index: crypto/bio/bss_conn.c -=================================================================== +@@ -866,7 +866,7 @@ int BIO_accept(int sock, char **addr) + sa.len.s=0; + sa.len.i=sizeof(sa.from); + memset(&sa.from,0,sizeof(sa.from)); +- ret=accept(sock,&sa.from.sa,(void *)&sa.len); ++ ret=accept4(sock, &sa.from.sa, (void *)&sa.len, SOCK_CLOEXEC); + if (sizeof(sa.len.i)!=sizeof(sa.len.s) && sa.len.i==0) + { + OPENSSL_assert(sa.len.s<=sizeof(sa.from)); --- crypto/bio/bss_conn.c.orig +++ crypto/bio/bss_conn.c @@ -209,7 +209,7 @@ static int conn_state(BIO *b, BIO_CONNEC @@ -33,8 +38,6 @@ if (ret == INVALID_SOCKET) { SYSerr(SYS_F_SOCKET,get_last_socket_error()); -Index: crypto/bio/bss_dgram.c -=================================================================== --- crypto/bio/bss_dgram.c.orig +++ crypto/bio/bss_dgram.c @@ -1032,7 +1032,7 @@ static int dgram_sctp_read(BIO *b, char @@ -91,8 +94,6 @@ if (data->handle_notifications != NULL) data->handle_notifications(b, data->notification_context, (void*) &snp); -Index: crypto/bio/bss_file.c -=================================================================== --- crypto/bio/bss_file.c.orig +++ crypto/bio/bss_file.c @@ -120,6 +120,10 @@ BIO *BIO_new_file(const char *filename, @@ -133,8 +134,6 @@ fp=fopen(ptr,p); if (fp == NULL) { -Index: crypto/rand/rand_unix.c -=================================================================== --- crypto/rand/rand_unix.c.orig +++ crypto/rand/rand_unix.c @@ -262,7 +262,7 @@ int RAND_poll(void) @@ -146,8 +145,6 @@ #ifdef O_NONBLOCK |O_NONBLOCK #endif -Index: crypto/rand/randfile.c -=================================================================== --- crypto/rand/randfile.c.orig +++ crypto/rand/randfile.c @@ -136,7 +136,7 @@ int RAND_load_file(const char *file, lon -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xsettingsd for openSUSE:Factory
by root＠hilbert.suse.de 08 May '14

08 May '14

Hello community, here is the log from the commit of package xsettingsd for openSUSE:Factory checked in at 2014-05-08 12:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsettingsd (Old) and /work/SRC/openSUSE:Factory/.xsettingsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xsettingsd" Changes: -------- --- /work/SRC/openSUSE:Factory/xsettingsd/xsettingsd.changes 2014-05-01 07:53:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xsettingsd.new/xsettingsd.changes 2014-05-08 12:39:41.000000000 +0200 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Wed Apr 30 20:25:03 UTC 2014 - andreas.stieger(a)gmx.de + +- fix warning standard-dir-owned-by-package /usr/share/man/man1 + +------------------------------------------------------------------- + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsettingsd.spec ++++++ --- /var/tmp/diff_new_pack.GCVADe/_old 2014-05-08 12:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.GCVADe/_new 2014-05-08 12:39:42.000000000 +0200 @@ -11,22 +11,21 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xsettingsd Version: 0.0~git20121210 Release: 0 -License: BSD-3-Clause Summary: Provides settings to X11 applications -Url: https://github.com/derat/xsettingsd +License: BSD-3-Clause Group: System/X11 +Url: https://github.com/derat/xsettingsd Source: %{name}-%{version}.tar.gz - -BuildRequires: pkg-config BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: scons BuildRequires: pkgconfig(x11) @@ -42,7 +41,7 @@ %setup -q %build -scons CC="$(which %{__cc})" CXX="$(which %{__cxx})" %{?_smp_mflags} +scons CC="$(which gcc)" CXX="$(which g++)" %{?_smp_mflags} %install for file in %{name} dump_xsettings; do @@ -55,6 +54,7 @@ %doc COPYING README %{_bindir}/%{name} %{_bindir}/dump_xsettings -%{_mandir}/man1/ +%{_mandir}/man1/%{name}.1.* +%{_mandir}/man1/dump_xsettings.1.* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit translation-update for openSUSE:Factory
by root＠hilbert.suse.de 08 May '14

08 May '14

Hello community, here is the log from the commit of package translation-update for openSUSE:Factory checked in at 2014-05-08 12:39:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/translation-update (Old) and /work/SRC/openSUSE:Factory/.translation-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "translation-update" Changes: -------- --- /work/SRC/openSUSE:Factory/translation-update/translation-update.changes 2014-05-02 15:11:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.translation-update.new/translation-update.changes 2014-05-08 12:39:23.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 7 21:33:42 CEST 2014 - sbrabec(a)suse.cz + +- Fix for empty tarballs. +- Fix translation-update-generate-lang-list.sh for "@" in locale + names. +- Rename translation-update-spec-reset-lang-list.sh and + translation-update-spec-generate-lang-list.sh to make visible its + relation to the spec file. + +------------------------------------------------------------------- Old: ---- translation-update-generate-lang-list.sh translation-update-reset-lang-list.sh New: ---- translation-update-spec-generate-lang-list.sh translation-update-spec-reset-lang-list.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translation-update.spec ++++++ --- /var/tmp/diff_new_pack.xcWMmi/_old 2014-05-08 12:39:24.000000000 +0200 +++ /var/tmp/diff_new_pack.xcWMmi/_new 2014-05-08 12:39:24.000000000 +0200 @@ -44,9 +44,9 @@ # Reset ranslation-update.tar.bz2. Source100: reset-translation-update.sh # Strip all sub-packages from the spec file. -Source101: translation-update-reset-lang-list.sh -# Generate needed sub-packages from .build.log from "osc build". -Source102: translation-update-generate-lang-list.sh +Source101: translation-update-spec-reset-lang-list.sh +# Generate spec file with needed sub-packages from .build.log from "osc build". +Source102: translation-update-spec-generate-lang-list.sh BuildArch: noarch Summary: Translation Updates License: GPL-2.0+ @@ -913,6 +913,7 @@ done %install +mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale-langpack # First process translation-update tarball. shopt -s nullglob for PACKAGE in * ; do ++++++ translation-update-spec-generate-lang-list.sh ++++++ #!/bin/bash # Generate lang list for spec file. # Usage: # 1. sh ./translation-update-reset-lang-list.sh # 2. osc build # it will fail # 3. sh ./translation-update-generate-lang-list.sh BUILD_ROOT=/var/tmp/build-root/standard-x86_64 BUILDROOT=/home/abuild/rpmbuild/BUILDROOT LNG_LIST=$(sed -n '/Installed (but unpackaged) file(s) found:/,$s:.* */usr/share/locale-langpack/$.*$/LC_MESSAGES/.*:\1:p' $BUILD_ROOT/.build.log | sort -u) LNG_COUNT=0 for LNG in $LNG_LIST ; do LNG_NAME= # Handle special cases manually: case $LNG in zh_CN ) LNG_NAME="Simplified Chinese" ;; zh_TW ) LNG_NAME="Traditional Chinese" ;; esac if test -n "$LNG_NAME" ; then LNG_NAMES[LNG_COUNT++]=$LNG_NAME continue fi # Guess language name from Language-Team catalog file keyword for FILE in $BUILD_ROOT$BUILDROOT/translation-update*/usr/share/locale-langpack/$LNG/LC_MESSAGES/*.mo ; do LNG_NAME=$(msgunfmt $FILE 2>/dev/null | sed -n 's/^"Language-Team: *$[^<\]*$ *.*"$/\1/p') LNG_NAME=${LNG_NAME%% } LNG_NAME=${LNG_NAME% (http*} LNG_NAME=${LNG_NAME% Team} LNG_NAME=${LNG_NAME% Translation} LNG_NAME=${LNG_NAME#GNOME } LNG_NAME=${LNG_NAME% GNOME} # for ug: LNG_NAME=${LNG_NAME% Computer Science Association} # for ml: LNG_NAME=${LNG_NAME#Swathanthra } LNG_NAME=${LNG_NAME% Computing} LNG_NAME=${LNG_NAME%, Modern*} # Do not accept the default value "American English" for anything else than en_US. if test "$LNG_NAME" = "American English" -a "$LNG" != en_US ; then continue fi # Do not accept national names. We search for English name. if ! echo "$LNG_NAME" | iconv -f UTF-8 -t ASCII >/dev/null 2>&1 ; then continue fi # Errorneous cases. case "$LNG_NAME" in # nb # Do not accept "Novell Language" generated by Novell translation tools. # Do not accept underbar. It means that translator filled LANG variable name. # Do not accept e-mails. "Kjartan Maraas" | "Novell Language" | linux* | *_* | *@* | */* ) continue ;; esac if test -n "$LNG_NAME" ; then break fi done LNG_NAMES[LNG_COUNT++]=$LNG_NAME done echo echo "Please review following language names and fix them, if needed:" LNG_COUNT=0 for LNG in $LNG_LIST ; do echo "$LNG: ${LNG_NAMES[LNG_COUNT++]}" done LNG_COUNT=0 for LNG in $LNG_LIST ; do LNG_PKG=${LNG//@/-} cat <<EOF %package -n translation-update-$LNG_PKG Summary: Translation Updates for ${LNG_NAMES[LNG_COUNT]} Group: System/Localization Provides: locale(translation-update:$LNG) Requires: translation-update %description -n translation-update-$LNG_PKG This is a set of translation updates that are installed into the preferred directory, /usr/share/locale-langpack/<locale>/LC_MESSAGES/. Applications that use gettext correctly can then pick up overridden or updated translations from this location. EOF let LNG_COUNT++ done >translation-update.spec.preamble.tmp for LNG in $LNG_LIST ; do LNG_PKG=${LNG//@/-} cat <<EOF %files -n translation-update-$LNG_PKG %defattr(-,root,root) %dir %{_datadir}/locale-langpack %lang($LNG) %{_datadir}/locale-langpack/$LNG %doc COPYING EOF done >translation-update.spec.files.tmp bash ./translation-update-reset-lang-list.sh sed -i ' /^%prep$/{ r translation-update.spec.preamble.tmp a %prep /^%prep$/d } /^%changelog$/{ r translation-update.spec.files.tmp a %changelog /^%changelog$/d } ' translation-update.spec rm translation-update.spec.preamble.tmp translation-update.spec.files.tmp ++++++ translation-update-spec-reset-lang-list.sh ++++++ #!/bin/bash # Reset lang list for spec file. # Usage: # When build fails on missing on superfluous language packages, call: # 1. sh ./translation-update-reset-lang-list.sh # 2. osc build # it will fail # 3. sh ./translation-update-generate-lang-list.sh sed -i ' /^%package -n/,/^%prep$/c \ %prep /^%files -n/,/^%changelog$/c \ %changelog ' translation-update.spec -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ocrad for openSUSE:Factory
by root＠hilbert.suse.de 08 May '14

08 May '14

Hello community, here is the log from the commit of package ocrad for openSUSE:Factory checked in at 2014-05-08 12:39:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocrad (Old) and /work/SRC/openSUSE:Factory/.ocrad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocrad" Changes: -------- --- /work/SRC/openSUSE:Factory/ocrad/ocrad.changes 2013-07-24 17:29:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocrad.new/ocrad.changes 2014-05-08 12:39:18.000000000 +0200 @@ -1,0 +2,13 @@ +Sun May 4 22:36:24 UTC 2014 - asterios.dramis(a)gmail.com + +- Update to 0.23: + * Improvements in character recognition. + * Filters of type '*_only' now remove leading whitespace. + * ocradlib.h: Changed 'uint8_t' to 'unsigned char'. + * Added some missing inclusions of 'cstdlib'. + * ocrad.texinfo: Renamed to ocrad.texi. +- Added lzip build requirement in order to extract the package. +- Removed ocrad-build-with-optflags.patch and instead added a fix inside the + spec file. + +------------------------------------------------------------------- Old: ---- ocrad-0.22.tar.bz2 ocrad-build-with-optflags.patch New: ---- ocrad-0.23.tar.lz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocrad.spec ++++++ --- /var/tmp/diff_new_pack.9kgsJK/_old 2014-05-08 12:39:19.000000000 +0200 +++ /var/tmp/diff_new_pack.9kgsJK/_new 2014-05-08 12:39:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocrad # -# 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,21 +17,18 @@ Name: ocrad -Version: 0.22 +Version: 0.23 Release: 0 Summary: Optical Character Recognition Program License: GPL-3.0+ Group: Productivity/Graphics/Other - -Url: https://savannah.gnu.org/projects/ocrad/ -Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE ocrad-build-with-optflags.patch masterpatricko(a)gmail.com -- Make the package compile with optflags -Patch0: ocrad-build-with-optflags.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Url: http://www.gnu.org/software/ocrad/ +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.lz BuildRequires: gcc-c++ +BuildRequires: lzip Requires(post): info Requires(preun): info +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature @@ -53,24 +50,20 @@ %prep %setup -q -%patch0 %build %configure -%{__make} %{?_smp_mflags} +make CXXFLAGS="%{optflags}" %{?_smp_mflags} %install -%make_install install-man -%{__rm} -f %{buildroot}%{_libdir}/libocrad.a - -%clean -%{__rm} -rf %{buildroot} +make DESTDIR=%{buildroot} install +rm -f %{buildroot}%{_libdir}/libocrad.a %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit motif for openSUSE:Factory
by root＠hilbert.suse.de 08 May '14

08 May '14

Hello community, here is the log from the commit of package motif for openSUSE:Factory checked in at 2014-05-08 12:39:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/motif (Old) and /work/SRC/openSUSE:Factory/.motif.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "motif" Changes: -------- --- /work/SRC/openSUSE:Factory/motif/motif.changes 2014-03-07 07:04:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.motif.new/motif.changes 2014-05-08 12:39:11.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 6 10:39:24 UTC 2014 - sndirsch(a)suse.com + +- add pkgconfig(printproto) as requires to motif-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ motif.spec ++++++ --- /var/tmp/diff_new_pack.tDhn6U/_old 2014-05-08 12:39:12.000000000 +0200 +++ /var/tmp/diff_new_pack.tDhn6U/_new 2014-05-08 12:39:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package motif # -# 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 @@ -101,6 +101,7 @@ Requires: libMrm4 = %version Requires: libUil4 = %version Requires: libXm4 = %version +Requires: pkgconfig(printproto) Requires: pkgconfig(x11) Requires: pkgconfig(xft) Requires: pkgconfig(xproto) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt for openSUSE:Factory
by root＠hilbert.suse.de 08 May '14

08 May '14

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-05-08 12:39:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-04-16 07:27:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-05-08 12:39:06.000000000 +0200 @@ -1,0 +2,23 @@ +Tue May 6 11:53:14 MDT 2014 - jfehlig(a)suse.com + +- Update to libvirt 1.2.4 + - Primarily a bug-fix release. See http://libvirt.org/news.html + for a detailed list of bug fixes and improvements + - Drop upstream patches: + 0e0c1a74-domid-fix.patch, 7a1452f5-libxl-empty-cdrom.patch +- libxl: Support ACPI shutdown event + b98bf811-add-paravirt-shutdown-flag.patch, + c4fe29f8-use-shutdown-flag.patch, da744120-use-reboot-flag.patch + bnc#872777 +- libx: Support migration + libxl-migration-support.patch + bnc#875193 + +------------------------------------------------------------------- +Mon May 5 16:47:43 MDT 2014 - jfehlig(a)suse.com + +- CVE-2014-0179: Don't expand entities when parsing XML + d6b27d3e-CVE-2014-0179.patch + bnc#873705 + +------------------------------------------------------------------- Old: ---- libvirt-1.2.3.tar.bz2 New: ---- b98bf811-add-paravirt-shutdown-flag.patch c4fe29f8-use-shutdown-flag.patch d6b27d3e-CVE-2014-0179.patch da744120-use-reboot-flag.patch libvirt-1.2.4.tar.bz2 libxl-migration-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:07.000000000 +0200 @@ -235,7 +235,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -428,13 +428,17 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 0e0c1a74-domid-fix.patch -Patch1: 7a1452f5-libxl-empty-cdrom.patch +Patch0: b98bf811-add-paravirt-shutdown-flag.patch +Patch1: c4fe29f8-use-shutdown-flag.patch +Patch2: da744120-use-reboot-flag.patch +Patch3: d6b27d3e-CVE-2014-0179.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: ia64-clone.patch Patch102: xen-pv-cdrom.patch Patch103: add-nocow-to-vol-xml.patch +# pending review upstream patches +Patch150: libxl-migration-support.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -948,10 +952,13 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch150 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -1319,8 +1326,7 @@ cd tests make # These tests don't current work in a mock build root -# qemuargv2xmltest: needs qemu user/group to be setup -for i in nodeinfotest seclabeltest qemuxml2argvtest +for i in nodeinfotest seclabeltest do rm -f $i printf 'int main(void) { return 0; }' > $i.c @@ -1748,8 +1754,7 @@ %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nwfilter.rng %{_datadir}/libvirt/schemas/secret.rng -%{_datadir}/libvirt/schemas/storageencryption.rng -%{_datadir}/libvirt/schemas/storagefilefeatures.rng +%{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/cpu_map.xml ++++++ add-nocow-to-vol-xml.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:07.000000000 +0200 @@ -1,8 +1,18 @@ -Index: libvirt-1.2.3/docs/schemas/storagevol.rng +commit ccc0b45917fa76a77ff83f1ddfd30836c8c3805e +Author: Chunyan Liu <cyliu(a)suse.com> +Date: Wed May 7 12:45:40 2014 +0800 + + add nocow to vol xml + + Updated patch. Rebase to git master. + + Signed-off-by: Chunyan Liu <cyliu(a)suse.com> + +Index: libvirt-1.2.4/docs/schemas/storagevol.rng =================================================================== ---- libvirt-1.2.3.orig/docs/schemas/storagevol.rng -+++ libvirt-1.2.3/docs/schemas/storagevol.rng -@@ -139,6 +139,11 @@ +--- libvirt-1.2.4.orig/docs/schemas/storagevol.rng ++++ libvirt-1.2.4/docs/schemas/storagevol.rng +@@ -138,6 +138,11 @@ <ref name='compat'/> </optional> <optional> @@ -14,11 +24,11 @@ <ref name='fileFormatFeatures'/> </optional> </interleave> -Index: libvirt-1.2.3/src/conf/storage_conf.c +Index: libvirt-1.2.4/src/conf/storage_conf.c =================================================================== ---- libvirt-1.2.3.orig/src/conf/storage_conf.c -+++ libvirt-1.2.3/src/conf/storage_conf.c -@@ -1401,6 +1401,9 @@ virStorageVolDefParseXML(virStoragePoolD +--- libvirt-1.2.4.orig/src/conf/storage_conf.c ++++ libvirt-1.2.4/src/conf/storage_conf.c +@@ -1395,6 +1395,9 @@ virStorageVolDefParseXML(virStoragePoolD virStringFreeList(version); } @@ -28,22 +38,10 @@ if (options->featureFromString && virXPathNode("./target/features", ctxt)) { if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0) goto error; -Index: libvirt-1.2.3/src/conf/storage_conf.h +Index: libvirt-1.2.4/src/storage/storage_backend.c =================================================================== ---- libvirt-1.2.3.orig/src/conf/storage_conf.h -+++ libvirt-1.2.3/src/conf/storage_conf.h -@@ -90,6 +90,7 @@ struct _virStorageVolTarget { - virStorageEncryptionPtr encryption; - virBitmapPtr features; - char *compat; -+ bool nocow; - }; - - typedef struct _virStorageVolDef virStorageVolDef; -Index: libvirt-1.2.3/src/storage/storage_backend.c -=================================================================== ---- libvirt-1.2.3.orig/src/storage/storage_backend.c -+++ libvirt-1.2.3/src/storage/storage_backend.c +--- libvirt-1.2.4.orig/src/storage/storage_backend.c ++++ libvirt-1.2.4/src/storage/storage_backend.c @@ -37,6 +37,9 @@ #ifdef __linux__ # include <sys/ioctl.h> @@ -54,7 +52,7 @@ #endif #if WITH_SELINUX -@@ -449,6 +452,21 @@ virStorageBackendCreateRaw(virConnectPtr +@@ -452,6 +455,21 @@ virStorageBackendCreateRaw(virConnectPtr goto cleanup; } @@ -76,7 +74,7 @@ if ((ret = createRawFile(fd, vol, inputvol)) < 0) /* createRawFile already reported the exact error. */ ret = -1; -@@ -712,6 +730,7 @@ virStorageBackendCreateQemuImgOpts(char +@@ -717,6 +735,7 @@ virStorageBackendCreateQemuImgOpts(char bool preallocate, int format, const char *compat, @@ -84,7 +82,7 @@ virBitmapPtr features) { virBuffer buf = VIR_BUFFER_INITIALIZER; -@@ -724,6 +743,8 @@ virStorageBackendCreateQemuImgOpts(char +@@ -729,6 +748,8 @@ virStorageBackendCreateQemuImgOpts(char virBufferAddLit(&buf, "encryption=on,"); if (preallocate) virBufferAddLit(&buf, "preallocation=metadata,"); @@ -93,7 +91,7 @@ if (compat) virBufferAsprintf(&buf, "compat=%s,", compat); -@@ -945,6 +966,7 @@ virStorageBackendCreateQemuImgCmd(virCon +@@ -950,6 +971,7 @@ virStorageBackendCreateQemuImgCmd(virCon do_encryption, preallocate, vol->target.format, compat, @@ -101,3 +99,15 @@ vol->target.features) < 0) { virCommandFree(cmd); return NULL; +Index: libvirt-1.2.4/src/util/virstoragefile.h +=================================================================== +--- libvirt-1.2.4.orig/src/util/virstoragefile.h ++++ libvirt-1.2.4/src/util/virstoragefile.h +@@ -228,6 +228,7 @@ struct _virStorageSource { + int format; /* enum virStorageFileFormat */ + virBitmapPtr features; + char *compat; ++ bool nocow; + + virStoragePermsPtr perms; + virStorageTimestampsPtr timestamps; ++++++ b98bf811-add-paravirt-shutdown-flag.patch ++++++ commit b98bf81151446b34dde59217dec19f93981c8047 Author: Jim Fehlig <jfehlig(a)suse.com> Date: Thu May 1 11:42:54 2014 -0600 Introduce a new flag for controlling shutdown/reboot Add a new flag to virDomain{Reboot,Shutdown}FlagValues to allow shutting down and rebooting a domain via the Xen paravirt control interface. Index: libvirt-1.2.4/include/libvirt/libvirt.h.in =================================================================== --- libvirt-1.2.4.orig/include/libvirt/libvirt.h.in +++ libvirt-1.2.4/include/libvirt/libvirt.h.in @@ -1652,6 +1652,7 @@ typedef enum { VIR_DOMAIN_SHUTDOWN_GUEST_AGENT = (1 << 1), /* Use guest agent */ VIR_DOMAIN_SHUTDOWN_INITCTL = (1 << 2), /* Use initctl */ VIR_DOMAIN_SHUTDOWN_SIGNAL = (1 << 3), /* Send a signal */ + VIR_DOMAIN_SHUTDOWN_PARAVIRT = (1 << 4), /* Use paravirt guest control */ } virDomainShutdownFlagValues; int virDomainShutdown (virDomainPtr domain); @@ -1664,6 +1665,7 @@ typedef enum { VIR_DOMAIN_REBOOT_GUEST_AGENT = (1 << 1), /* Use guest agent */ VIR_DOMAIN_REBOOT_INITCTL = (1 << 2), /* Use initctl */ VIR_DOMAIN_REBOOT_SIGNAL = (1 << 3), /* Send a signal */ + VIR_DOMAIN_REBOOT_PARAVIRT = (1 << 4), /* Use paravirt guest control */ } virDomainRebootFlagValues; int virDomainReboot (virDomainPtr domain, Index: libvirt-1.2.4/tools/virsh-domain.c =================================================================== --- libvirt-1.2.4.orig/tools/virsh-domain.c +++ libvirt-1.2.4/tools/virsh-domain.c @@ -4837,7 +4837,7 @@ static const vshCmdOptDef opts_shutdown[ }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("shutdown mode: acpi|agent|initctl|signal") + .help = N_("shutdown mode: acpi|agent|initctl|signal|paravirt") }, {.name = NULL} }; @@ -4872,9 +4872,12 @@ cmdShutdown(vshControl *ctl, const vshCm flags |= VIR_DOMAIN_SHUTDOWN_INITCTL; } else if (STREQ(mode, "signal")) { flags |= VIR_DOMAIN_SHUTDOWN_SIGNAL; + } else if (STREQ(mode, "paravirt")) { + flags |= VIR_DOMAIN_SHUTDOWN_PARAVIRT; } else { vshError(ctl, _("Unknown mode %s value, expecting " - "'acpi', 'agent', 'initctl' or 'signal'"), mode); + "'acpi', 'agent', 'initctl', 'signal', " + "or 'paravirt'"), mode); goto cleanup; } tmp++; @@ -4923,7 +4926,7 @@ static const vshCmdOptDef opts_reboot[] }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("shutdown mode: acpi|agent|initctl|signal") + .help = N_("shutdown mode: acpi|agent|initctl|signal|paravirt") }, {.name = NULL} }; @@ -4957,9 +4960,12 @@ cmdReboot(vshControl *ctl, const vshCmd flags |= VIR_DOMAIN_REBOOT_INITCTL; } else if (STREQ(mode, "signal")) { flags |= VIR_DOMAIN_REBOOT_SIGNAL; + } else if (STREQ(mode, "paravirt")) { + flags |= VIR_DOMAIN_REBOOT_PARAVIRT; } else { vshError(ctl, _("Unknown mode %s value, expecting " - "'acpi', 'agent', 'initctl' or 'signal'"), mode); + "'acpi', 'agent', 'initctl', 'signal' " + "or 'paravirt'"), mode); goto cleanup; } tmp++; Index: libvirt-1.2.4/tools/virsh.pod =================================================================== --- libvirt-1.2.4.orig/tools/virsh.pod +++ libvirt-1.2.4/tools/virsh.pod @@ -1302,8 +1302,8 @@ I<on_reboot> parameter in the domain's X By default the hypervisor will try to pick a suitable shutdown method. To specify an alternative method, the I<--mode> parameter can specify a comma separated list which includes C<acpi>, C<agent>, -C<initctl> and C<signal>. The order in which drivers will try each -mode is undefined, and not related to the order specified to virsh. +C<initctl>, C<signal> and C<paravirt>. The order in which drivers will +try each mode is undefined, and not related to the order specified to virsh. For strict control over ordering, use a single mode at a time and repeat the command. @@ -1781,8 +1781,8 @@ snapshot metadata with B<snapshot-create By default the hypervisor will try to pick a suitable shutdown method. To specify an alternative method, the I<--mode> parameter can specify a comma separated list which includes C<acpi>, C<agent>, -C<initctl> and C<signal>. The order in which drivers will try each -mode is undefined, and not related to the order specified to virsh. +C<initctl>, C<signal> and C<paravirt>. The order in which drivers will +try each mode is undefined, and not related to the order specified to virsh. For strict control over ordering, use a single mode at a time and repeat the command. ++++++ c4fe29f8-use-shutdown-flag.patch ++++++ commit c4fe29f88c4c1d5f571941e95c26246c8c84ce45 Author: Jim Fehlig <jfehlig(a)suse.com> Date: Thu May 1 12:11:51 2014 -0600 libxl: support PARAVIRT and ACPI shutdown flags Add support for VIR_DOMAIN_SHUTDOWN_PARAVIRT and VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN flags in libxlDomainShutdownFlags(). Index: libvirt-1.2.4/src/libxl/libxl_driver.c =================================================================== --- libvirt-1.2.4.orig/src/libxl/libxl_driver.c +++ libvirt-1.2.4/src/libxl/libxl_driver.c @@ -873,7 +873,11 @@ libxlDomainShutdownFlags(virDomainPtr do int ret = -1; libxlDomainObjPrivatePtr priv; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN | + VIR_DOMAIN_SHUTDOWN_PARAVIRT, -1); + if (flags == 0) + flags = VIR_DOMAIN_SHUTDOWN_PARAVIRT | + VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN; if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -888,18 +892,33 @@ libxlDomainShutdownFlags(virDomainPtr do } priv = vm->privateData; - if (libxl_domain_shutdown(priv->ctx, vm->def->id) != 0) { + if (flags & VIR_DOMAIN_SHUTDOWN_PARAVIRT) { + ret = libxl_domain_shutdown(priv->ctx, vm->def->id); + if (ret == 0) + goto cleanup; + + if (ret != ERROR_NOPARAVIRT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to shutdown domain '%d' with libxenlight"), + vm->def->id); + ret = -1; + goto cleanup; + } + ret = -1; + } + + if (flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) { + ret = libxl_send_trigger(priv->ctx, vm->def->id, + LIBXL_TRIGGER_POWER, 0); + if (ret == 0) + goto cleanup; + virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to shutdown domain '%d' with libxenlight"), vm->def->id); - goto cleanup; + ret = -1; } - /* vm is marked shutoff (or removed from domains list if not persistent) - * in shutdown event handler. - */ - ret = 0; - cleanup: if (vm) virObjectUnlock(vm); ++++++ d6b27d3e-CVE-2014-0179.patch ++++++ commit d6b27d3e4c40946efa79e91d134616b41b1666c4 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Tue Apr 15 11:20:29 2014 +0100 LSN-2014-0003: Don't expand entities when parsing XML If the XML_PARSE_NOENT flag is passed to libxml2, then any entities in the input document will be fully expanded. This allows the user to read arbitrary files on the host machine by creating an entity pointing to a local file. Removing the XML_PARSE_NOENT flag means that any entities are left unchanged by the parser, or expanded to "" by the XPath APIs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Index: libvirt-1.2.4/src/util/virxml.c =================================================================== --- libvirt-1.2.4.orig/src/util/virxml.c +++ libvirt-1.2.4/src/util/virxml.c @@ -746,11 +746,11 @@ virXMLParseHelper(int domcode, if (filename) { xml = xmlCtxtReadFile(pctxt, filename, NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NONET | XML_PARSE_NOWARNING); } else { xml = xmlCtxtReadDoc(pctxt, BAD_CAST xmlStr, url, NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NONET | XML_PARSE_NOWARNING); } if (!xml) ++++++ da744120-use-reboot-flag.patch ++++++ commit da7441204635f4692c729af089ad455365f37b2f Author: Jim Fehlig <jfehlig(a)suse.com> Date: Thu May 1 15:00:47 2014 -0600 libxl: support PARAVIRT reboot flag Add support for the VIR_DOMAIN_REBOOT_PARAVIRT flag in libxlDomainReboot(). Index: libvirt-1.2.4/src/libxl/libxl_driver.c =================================================================== --- libvirt-1.2.4.orig/src/libxl/libxl_driver.c +++ libvirt-1.2.4/src/libxl/libxl_driver.c @@ -939,7 +939,9 @@ libxlDomainReboot(virDomainPtr dom, unsi int ret = -1; libxlDomainObjPrivatePtr priv; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_REBOOT_PARAVIRT, -1); + if (flags == 0) + flags = VIR_DOMAIN_REBOOT_PARAVIRT; if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -954,13 +956,16 @@ libxlDomainReboot(virDomainPtr dom, unsi } priv = vm->privateData; - if (libxl_domain_reboot(priv->ctx, vm->def->id) != 0) { + if (flags & VIR_DOMAIN_REBOOT_PARAVIRT) { + ret = libxl_domain_reboot(priv->ctx, vm->def->id); + if (ret == 0) + goto cleanup; + virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to reboot domain '%d' with libxenlight"), vm->def->id); - goto cleanup; + ret = -1; } - ret = 0; cleanup: if (vm) ++++++ disable-virCgroupGetPercpuStats-test.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/tests/vircgrouptest.c +Index: libvirt-1.2.4/tests/vircgrouptest.c =================================================================== ---- libvirt-1.2.3.orig/tests/vircgrouptest.c -+++ libvirt-1.2.3/tests/vircgrouptest.c +--- libvirt-1.2.4.orig/tests/vircgrouptest.c ++++ libvirt-1.2.4/tests/vircgrouptest.c @@ -33,7 +33,6 @@ # include "virlog.h" # include "virfile.h" @@ -41,7 +41,7 @@ - - if ((rv = virCgroupGetPercpuStats(cgroup, - params, -- 2, 0, 1)) < 0) { +- 2, 0, 1, 0)) < 0) { - fprintf(stderr, "Failed call to virCgroupGetPercpuStats for /virtualmachines cgroup: %d\n", -rv); - goto cleanup; - } ++++++ fix-pci-attach-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:07.000000000 +0200 @@ -8,10 +8,10 @@ This patch changes the xend driver to always call 'device_configure' for PCI devices to be consistent with the usage in the xen tools. -Index: libvirt-1.2.3/src/xen/xend_internal.c +Index: libvirt-1.2.4/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.3.orig/src/xen/xend_internal.c -+++ libvirt-1.2.3/src/xen/xend_internal.c +--- libvirt-1.2.4.orig/src/xen/xend_internal.c ++++ libvirt-1.2.4/src/xen/xend_internal.c @@ -2219,6 +2219,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; ++++++ ia64-clone.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/src/lxc/lxc_container.c +Index: libvirt-1.2.4/src/lxc/lxc_container.c =================================================================== ---- libvirt-1.2.3.orig/src/lxc/lxc_container.c -+++ libvirt-1.2.3/src/lxc/lxc_container.c +--- libvirt-1.2.4.orig/src/lxc/lxc_container.c ++++ libvirt-1.2.4/src/lxc/lxc_container.c @@ -164,12 +164,19 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/examples/apparmor/Makefile.am +Index: libvirt-1.2.4/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.2.3.orig/examples/apparmor/Makefile.am -+++ libvirt-1.2.3/examples/apparmor/Makefile.am +--- libvirt-1.2.4.orig/examples/apparmor/Makefile.am ++++ libvirt-1.2.4/examples/apparmor/Makefile.am @@ -18,10 +18,22 @@ EXTRA_DIST= \ TEMPLATE \ libvirt-qemu \ @@ -27,10 +27,10 @@ apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ usr.lib.libvirt.virt-aa-helper \ -Index: libvirt-1.2.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.2.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -0,0 +1,48 @@ +# Last Modified: Mon Apr 5 15:10:27 2010 +#include <tunables/global> @@ -80,10 +80,10 @@ + /**.[iI][sS][oO] r, + /**/disk{,.*} r, +} -Index: libvirt-1.2.3/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.2.3/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,67 @@ +# Last Modified: Mon Apr 5 15:03:58 2010 +#include <tunables/global> @@ -152,9 +152,9 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.2.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.2.3.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.2.4.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,48 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -205,9 +205,9 @@ - /**.[iI][sS][oO] r, - /**/disk{,.*} r, -} -Index: libvirt-1.2.3/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.2.3.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.2.4.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,63 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 ++++++ libvirt-1.2.3.tar.bz2 -> libvirt-1.2.4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-1.2.3.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.2.4.tar.bz2 differ: char 11, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.2.3/tools/libvirt-guests.init.in +Index: libvirt-1.2.4/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.3.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.3/tools/libvirt-guests.init.in +--- libvirt-1.2.4.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.4/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.3/tools/libvirt-guests.sh.in +Index: libvirt-1.2.4/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.3.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.3/tools/libvirt-guests.sh.in +--- libvirt-1.2.4.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.4/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -100,7 +100,7 @@ # test_connect URI # check if URI is reachable test_connect() -@@ -114,7 +134,7 @@ list_guests() { +@@ -116,7 +136,7 @@ list_guests() { list=$(run_virsh_c "$uri" list --uuid $persistent) if [ $? -ne 0 ]; then @@ -109,7 +109,7 @@ return 1 fi -@@ -140,7 +160,7 @@ guest_is_on() { +@@ -142,7 +162,7 @@ guest_is_on() { guest_running=false id=$(run_virsh "$uri" domid "$uuid") if [ $? -ne 0 ]; then @@ -118,7 +118,7 @@ return 1 fi -@@ -188,6 +208,12 @@ start() { +@@ -190,6 +210,12 @@ start() { test_connect "$uri" || continue @@ -131,7 +131,7 @@ eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") -@@ -401,7 +427,7 @@ shutdown_guests_parallel() +@@ -403,7 +429,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -140,7 +140,7 @@ return fi else -@@ -429,7 +455,7 @@ stop() { +@@ -431,7 +457,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -149,7 +149,7 @@ return fi fi -@@ -477,14 +503,14 @@ stop() { +@@ -479,14 +505,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -166,7 +166,7 @@ set +f return fi -@@ -543,14 +569,13 @@ gueststatus() { +@@ -545,14 +571,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -183,16 +183,16 @@ fi fi } -@@ -595,4 +620,4 @@ case "$1" in +@@ -597,4 +622,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.3/tools/libvirt-guests.sysconf +Index: libvirt-1.2.4/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.3.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.3/tools/libvirt-guests.sysconf +--- libvirt-1.2.4.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.4/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.2.3/configure.ac +Index: libvirt-1.2.4/configure.ac =================================================================== ---- libvirt-1.2.3.orig/configure.ac -+++ libvirt-1.2.3/configure.ac -@@ -231,6 +231,7 @@ LIBVIRT_CHECK_FUSE +--- libvirt-1.2.4.orig/configure.ac ++++ libvirt-1.2.4/configure.ac +@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL LIBVIRT_CHECK_NETCF @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2374,11 +2375,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2409,11 +2410,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2772,6 +2774,7 @@ LIBVIRT_RESULT_FUSE +@@ -2808,6 +2810,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.3/src/Makefile.am +Index: libvirt-1.2.4/src/Makefile.am =================================================================== ---- libvirt-1.2.3.orig/src/Makefile.am -+++ libvirt-1.2.3/src/Makefile.am -@@ -807,6 +807,10 @@ if WITH_NETCF +--- libvirt-1.2.4.orig/src/Makefile.am ++++ libvirt-1.2.4/src/Makefile.am +@@ -812,6 +812,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1396,10 +1400,15 @@ if WITH_NETCF +@@ -1402,10 +1406,15 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else ! WITH_NETCF @@ -65,11 +65,11 @@ endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la -Index: libvirt-1.2.3/tools/virsh.c +Index: libvirt-1.2.4/tools/virsh.c =================================================================== ---- libvirt-1.2.3.orig/tools/virsh.c -+++ libvirt-1.2.3/tools/virsh.c -@@ -3251,6 +3251,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.2.4.orig/tools/virsh.c ++++ libvirt-1.2.4/tools/virsh.c +@@ -3252,6 +3252,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -78,10 +78,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.3/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.4/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.3.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.3/src/interface/interface_backend_netcf.c +--- libvirt-1.2.4.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.4/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -165,10 +165,10 @@ return 0; } -Index: libvirt-1.2.3/src/interface/interface_driver.c +Index: libvirt-1.2.4/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.3.orig/src/interface/interface_driver.c -+++ libvirt-1.2.3/src/interface/interface_driver.c +--- libvirt-1.2.4.orig/src/interface/interface_driver.c ++++ libvirt-1.2.4/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -186,10 +186,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.3/m4/virt-netcontrol.m4 +Index: libvirt-1.2.4/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.3/m4/virt-netcontrol.m4 ++++ libvirt-1.2.4/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/daemon/libvirtd.conf +Index: libvirt-1.2.4/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.3.orig/daemon/libvirtd.conf -+++ libvirt-1.2.3/daemon/libvirtd.conf +--- libvirt-1.2.4.orig/daemon/libvirtd.conf ++++ libvirt-1.2.4/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-1.2.3/daemon/libvirtd-config.c +Index: libvirt-1.2.4/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.3.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.3/daemon/libvirtd-config.c +--- libvirt-1.2.4.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.4/daemon/libvirtd-config.c @@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.2.3/daemon/test_libvirtd.aug.in +Index: libvirt-1.2.4/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.2.3.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.2.3/daemon/test_libvirtd.aug.in +--- libvirt-1.2.4.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.4/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.2.3/daemon/libvirtd.sysconf +Index: libvirt-1.2.4/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.3.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.3/daemon/libvirtd.sysconf +--- libvirt-1.2.4.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.4/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libxl-migration-support.patch ++++++ ++++ 1028 lines (skipped) ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.2.3/src/xenxs/xen_sxpr.c +Index: libvirt-1.2.4/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.2.3.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.2.3/src/xenxs/xen_sxpr.c +--- libvirt-1.2.4.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.2.4/src/xenxs/xen_sxpr.c @@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; @@ -78,10 +78,10 @@ xenFormatSxprPCI(def->hostdevs[i], buf); } } -Index: libvirt-1.2.3/src/xenxs/xen_xm.c +Index: libvirt-1.2.4/src/xenxs/xen_xm.c =================================================================== ---- libvirt-1.2.3.orig/src/xenxs/xen_xm.c -+++ libvirt-1.2.3/src/xenxs/xen_xm.c +--- libvirt-1.2.4.orig/src/xenxs/xen_xm.c ++++ libvirt-1.2.4/src/xenxs/xen_xm.c @@ -807,6 +807,8 @@ xenParseXM(virConfPtr conf, int xendConf int busID; int slotID; ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/src/qemu/qemu.conf +Index: libvirt-1.2.4/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.3.orig/src/qemu/qemu.conf -+++ libvirt-1.2.3/src/qemu/qemu.conf +--- libvirt-1.2.4.orig/src/qemu/qemu.conf ++++ libvirt-1.2.4/src/qemu/qemu.conf @@ -200,7 +200,16 @@ # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. ++++++ systemd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/daemon/libvirtd.service.in +Index: libvirt-1.2.4/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.3.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.3/daemon/libvirtd.service.in +--- libvirt-1.2.4.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.4/daemon/libvirtd.service.in @@ -10,6 +10,8 @@ After=network.target After=dbus.service After=iscsid.service ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.2.3/src/locking/virtlockd.sysconf +Index: libvirt-1.2.4/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.3.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.3/src/locking/virtlockd.sysconf +--- libvirt-1.2.4.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.4/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.3/src/locking/virtlockd.init.in +Index: libvirt-1.2.4/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.3.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.3/src/locking/virtlockd.init.in +--- libvirt-1.2.4.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.4/src/locking/virtlockd.init.in @@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-ge… # ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -14,10 +14,10 @@ is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.2.3/src/xen/xend_internal.c +Index: libvirt-1.2.4/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.3.orig/src/xen/xend_internal.c -+++ libvirt-1.2.3/src/xen/xend_internal.c +--- libvirt-1.2.4.orig/src/xen/xend_internal.c ++++ libvirt-1.2.4/src/xen/xend_internal.c @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal"); #define XEND_RCV_BUF_MAX_LEN (256 * 1024) ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.4wNJZK/_old 2014-05-08 12:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4wNJZK/_new 2014-05-08 12:39:08.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.3/src/xenxs/xen_sxpr.c +Index: libvirt-1.2.4/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.2.3.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.2.3/src/xenxs/xen_sxpr.c +--- libvirt-1.2.4.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.2.4/src/xenxs/xen_sxpr.c @@ -332,7 +332,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsodium for openSUSE:Factory
by root＠hilbert.suse.de 08 May '14

08 May '14

Hello community, here is the log from the commit of package libsodium for openSUSE:Factory checked in at 2014-05-08 12:38:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsodium (Old) and /work/SRC/openSUSE:Factory/.libsodium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsodium" Changes: -------- --- /work/SRC/openSUSE:Factory/libsodium/libsodium.changes 2013-10-22 14:52:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsodium.new/libsodium.changes 2014-05-08 12:38:51.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 2 11:44:43 UTC 2014 - i(a)marguerite.su + +- initial version 0.4.5 + * Restore compatibility with OSX <= 10.6 + +------------------------------------------------------------------- Old: ---- libsodium-0.4.4.tar.gz New: ---- libsodium-0.4.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsodium.spec ++++++ --- /var/tmp/diff_new_pack.XVU9ul/_old 2014-05-08 12:38:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XVU9ul/_new 2014-05-08 12:38:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsodium # -# 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 @@ -18,7 +18,7 @@ %define lname libsodium4 Name: libsodium -Version: 0.4.4 +Version: 0.4.5 Release: 0 Summary: Portable NaCl-based crypto library License: ISC @@ -81,7 +81,7 @@ %files devel %defattr(-,root,root) -%doc AUTHORS ChangeLog LICENSE README +%doc AUTHORS ChangeLog LICENSE README.markdown THANKS %{_includedir}/sodium.h %{_includedir}/sodium %{_libdir}/lib*.so ++++++ libsodium-0.4.4.tar.gz -> libsodium-0.4.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-0.4.4/ChangeLog new/libsodium-0.4.5/ChangeLog --- old/libsodium-0.4.4/ChangeLog 2013-10-22 07:03:35.000000000 +0200 +++ new/libsodium-0.4.5/ChangeLog 2013-10-22 11:57:23.000000000 +0200 @@ -1,4 +1,7 @@ +* Version 0.4.5 + - Restore compatibility with OSX <= 10.6 + * Version 0.4.4 - Visual Studio is officially supported (VC 2010 & VC 2013) - mingw64 is now supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-0.4.4/README.markdown new/libsodium-0.4.5/README.markdown --- old/libsodium-0.4.4/README.markdown 2013-10-15 02:27:41.000000000 +0200 +++ new/libsodium-0.4.5/README.markdown 2013-10-22 07:25:28.000000000 +0200 @@ -49,7 +49,7 @@ still run everywhere. Sodium is tested on a variety of compilers and operating systems, -including Windows (with MingW or Visual Studio), iOS and Android. +including Windows (with MingW or Visual Studio, x86 and x64), iOS and Android. ## Installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-0.4.4/configure new/libsodium-0.4.5/configure --- old/libsodium-0.4.4/configure 2013-10-22 07:10:32.000000000 +0200 +++ new/libsodium-0.4.5/configure 2013-10-22 12:01:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libsodium 0.4.4. +# Generated by GNU Autoconf 2.69 for libsodium 0.4.5. # # Report bugs to <https://github.com/jedisct1/libsodium/issues>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libsodium' PACKAGE_TARNAME='libsodium' -PACKAGE_VERSION='0.4.4' -PACKAGE_STRING='libsodium 0.4.4' +PACKAGE_VERSION='0.4.5' +PACKAGE_STRING='libsodium 0.4.5' PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues' PACKAGE_URL='https://github.com/jedisct1/libsodium' @@ -1360,7 +1360,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libsodium 0.4.4 to adapt to many kinds of systems. +\`configure' configures libsodium 0.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsodium 0.4.4:";; + short | recursive ) echo "Configuration of libsodium 0.4.5:";; esac cat <<\_ACEOF @@ -1557,7 +1557,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsodium configure 0.4.4 +libsodium configure 0.4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1926,7 +1926,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libsodium $as_me 0.4.4, which was +It was created by libsodium $as_me 0.4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2862,7 +2862,7 @@ # Define the identity of the package. PACKAGE='libsodium' - VERSION='0.4.4' + VERSION='0.4.5' cat >>confdefs.h <<_ACEOF @@ -14782,7 +14782,7 @@ fi -for ac_func in SecureZeroMemory arc4random +for ac_func in SecureZeroMemory arc4random arc4random_buf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -15746,7 +15746,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libsodium $as_me 0.4.4, which was +This file was extended by libsodium $as_me 0.4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15804,7 +15804,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libsodium config.status 0.4.4 +libsodium config.status 0.4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-0.4.4/configure.ac new/libsodium-0.4.5/configure.ac --- old/libsodium-0.4.4/configure.ac 2013-10-22 05:43:41.000000000 +0200 +++ new/libsodium-0.4.5/configure.ac 2013-10-22 11:56:30.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.65]) -AC_INIT([libsodium],[0.4.4], +AC_INIT([libsodium],[0.4.5], [https://github.com/jedisct1/libsodium/issues] [libsodium], [https://github.com/jedisct1/libsodium] @@ -371,7 +371,7 @@ AC_CHECK_FUNC(clock_gettime, , [AC_CHECK_LIB(rt, clock_gettime)]) AC_CHECK_FUNC(fegetenv, , [AC_CHECK_LIB(m, fegetenv)]) -AC_CHECK_FUNCS([SecureZeroMemory arc4random]) +AC_CHECK_FUNCS([SecureZeroMemory arc4random arc4random_buf]) AC_SUBST([LIBTOOL_EXTRA_FLAGS]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-0.4.4/msvc-scripts/process.bat new/libsodium-0.4.5/msvc-scripts/process.bat --- old/libsodium-0.4.4/msvc-scripts/process.bat 2013-09-30 22:29:57.000000000 +0200 +++ new/libsodium-0.4.5/msvc-scripts/process.bat 2013-10-22 15:12:17.000000000 +0200 @@ -2,7 +2,7 @@ cscript msvc-scripts/rep.vbs //Nologo s/@HAVE_AMD64_ASM_V@/0/ < src\libsodium\include\sodium\crypto_stream_salsa20.h.in > src\libsodium\include\sodium\crypto_stream_salsa20.h -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.4.3/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.4.5/ < src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/4/ < tmp > tmp2 -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/3/ < tmp2 > src\libsodium\include\sodium\version.h +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/4/ < tmp2 > src\libsodium\include\sodium\version.h del tmp tmp2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-0.4.4/src/libsodium/sodium/utils.c new/libsodium-0.4.5/src/libsodium/sodium/utils.c --- old/libsodium-0.4.4/src/libsodium/sodium/utils.c 2013-10-22 06:07:20.000000000 +0200 +++ new/libsodium-0.4.5/src/libsodium/sodium/utils.c 2013-10-22 11:49:03.000000000 +0200 @@ -54,7 +54,7 @@ return NULL; } *unaligned_p = unaligned; -#ifdef HAVE_ARC4RANDOM +#ifdef HAVE_ARC4RANDOM_BUF (void) i; arc4random_buf(unaligned, len + (size_t) 256U); #else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0