September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit perl-IO-All for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-IO-All for openSUSE:Factory checked in at 2014-09-17 17:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-IO-All (Old) and /work/SRC/openSUSE:Factory/.perl-IO-All.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-IO-All" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-IO-All/perl-IO-All.changes 2014-03-25 13:25:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-IO-All.new/perl-IO-All.changes 2014-09-17 17:25:21.000000000 +0200 @@ -1,0 +2,65 @@ +Mon Sep 15 12:52:36 UTC 2014 - coolo(a)suse.com + +- updated to 0.79 + - Doc enhancement. PR/51. @nheinric++ + + 0.78 Thu Aug 28 11:56:36 PDT 2014 + - Release to steal indexing back from Alt::IO::All::new. + + 0.77 Tue Aug 26 12:37:29 PDT 2014 + - Add new overloads from PR/49 @ginzel++ + + 0.76 Tue Aug 19 16:21:05 PDT 2014 + - Relplace tabs with spaces + + 0.75 Sat Aug 16 16:41:13 PDT 2014 + - Change testdir to t + + 0.74 Sat Aug 16 16:03:33 PDT 2014 + - Fix strict/warnings + + 0.73 Sat Aug 16 15:35:55 PDT 2014 + - Remove 'use 5.x.x' from code + + 0.72 Sat Aug 16 11:19:00 PDT 2014 + - Meta 0.0.2 + + 0.71 Sat Aug 16 03:45:11 PDT 2014 + - Eliminate spurious trailing whitespace + + 0.70 Sat Aug 16 02:08:08 PDT 2014 + - Eliminate File::Basename from test/ + + 0.69 Fri Aug 15 15:55:18 PDT 2014 + - Add t/000-compile-modules.t + - CPAN Day 2014 - 21 Release Salute! + + 0.68 Sun Aug 10 08:56:08 PDT 2014 + - PR/47. Doc fixes. @ginzel++ + + 0.67 Sat Aug 2 11:58:01 PDT 2014 + - Fix Copyright years. + + 0.66 Wed Jul 16 23:39:38 PDT 2014 + - Move doc to Swim + - Fix Meta and add Contributing file + + 0.65 Sat Jun 14 12:48:31 PDT 2014 + - Support recommended modules again + + 0.64 Sat Jun 14 12:33:21 PDT 2014 + - New badge syntax + - Changed the ABSTRACT + + 0.63 Sun Jun 8 12:45:43 PDT 2014 + - Add coveralls badge + - Finish porting pod to kwim + + 0.62 Sat Jun 7 13:36:32 PDT 2014 + - Convert release to Zilla::Dist + - Start converting doc to Kwim + + 0.61 + - Fix GH#44 (Thanks Shlomi Fish!) + +------------------------------------------------------------------- Old: ---- IO-All-0.60.tar.gz New: ---- IO-All-0.79.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IO-All.spec ++++++ --- /var/tmp/diff_new_pack.k4rCoL/_old 2014-09-17 17:25:22.000000000 +0200 +++ /var/tmp/diff_new_pack.k4rCoL/_new 2014-09-17 17:25:22.000000000 +0200 @@ -17,14 +17,14 @@ Name: perl-IO-All -Version: 0.60 +Version: 0.79 Release: 0 %define cpan_name IO-All -Summary: IO::All of it to Graham and Damian! +Summary: IO::All to Larry Wall! License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/IO-All/ -Source: http://www.cpan.org/authors/id/F/FR/FREW/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/I/IN/INGY/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -34,8 +34,6 @@ %{perl_requires} %description -"Graham Barr for doing it all. Damian Conway for doing it all different." - IO::All combines all of the best Perl IO modules into a single nifty object oriented interface to greatly simplify your everyday Perl IO idioms. It exports a single function called 'io', which returns a new IO::All object. @@ -89,6 +87,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes cpanfile examples LICENSE method_list Notes pkg README README.md ToDo unit +%doc Changes CONTRIBUTING example LICENSE README %changelog ++++++ IO-All-0.60.tar.gz -> IO-All-0.79.tar.gz ++++++ ++++ 8667 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Test-File-ShareDir for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-Test-File-ShareDir for openSUSE:Factory checked in at 2014-09-17 17:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Test-File-ShareDir (Old) and /work/SRC/openSUSE:Factory/.perl-Test-File-ShareDir.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Test-File-ShareDir" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Test-File-ShareDir/perl-Test-File-ShareDir.changes 2014-06-16 21:31:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Test-File-ShareDir.new/perl-Test-File-ShareDir.changes 2014-09-17 17:25:20.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Sep 15 12:52:33 UTC 2014 - coolo(a)suse.com + +- updated to 1.000005 + [00 Trivial] + - CPANDAY! + - no code changes. + - tests augmented. + - whitespace greatly reduced. + + [Dependencies::Stats] + - Dependencies changed since 1.000004, see misc/*.deps* for details + - configure: ↓1 + - develop: +1 (suggests: ↑1) + - test: -4 (recommends: ↑1 -2) + + [Misc] + - Improve source side POD to reduce build side whitespace. + + [Tests] + - update Test::ReportPrereqs + + 1.000004 2014-07-22T19:29:27Z + [Doc Bugfix] + - Previous releases changelog was misleading. + - We're requiring a newer Path::Tiny to avoid a problem. ( As opposed to the impression that a newer Path::Tiny caused + the problem, grammar-- ) + + 1.000003 2014-07-22T19:02:06Z + [Bugfix] + - Attempt to avoid tempdir(CLEANUP => 1) being an error by requiring newer Path::Tiny + + [Dependencies::Stats] + - Dependencies changed since 1.000002, see misc/*.deps* for details + - runtime: ↑1 + + 1.000002 2014-07-18T16:33:36Z + [00 Trivial] + - Minor packaging cleanups shaving ~7k + + [Dependencies::Stats] + - Dependencies changed since 1.000001, see misc/*.deps* for details + - develop: (suggests: ↑2) + - test: +2 ↑1 (recommends: +1) + +------------------------------------------------------------------- Old: ---- Test-File-ShareDir-1.000001.tar.gz New: ---- Test-File-ShareDir-1.000005.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-File-ShareDir.spec ++++++ --- /var/tmp/diff_new_pack.WINoBw/_old 2014-09-17 17:25:21.000000000 +0200 +++ /var/tmp/diff_new_pack.WINoBw/_new 2014-09-17 17:25:21.000000000 +0200 @@ -17,10 +17,10 @@ Name: perl-Test-File-ShareDir -Version: 1.000001 +Version: 1.000005 Release: 0 %define cpan_name Test-File-ShareDir -Summary: Create a Fake ShareDir for your modules for testing +Summary: Create a Fake ShareDir for your modules for testing. License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Test-File-ShareDir/ @@ -32,16 +32,13 @@ BuildRequires: perl(Class::Tiny) BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::ShareDir) >= 1.00 -BuildRequires: perl(Module::Build) >= 0.4004 -BuildRequires: perl(Path::Tiny) +BuildRequires: perl(Path::Tiny) >= 0.018 BuildRequires: perl(Test::Fatal) -BuildRequires: perl(Test::More) >= 0.98 -#BuildRequires: perl(Example) -#BuildRequires: perl(Test::File::ShareDir) -#BuildRequires: perl(Test::File::ShareDir::TempDirObject) +BuildRequires: perl(Test::More) >= 0.96 +Requires: perl(Class::Tiny) Requires: perl(File::Copy::Recursive) Requires: perl(File::ShareDir) >= 1.00 -Requires: perl(Path::Tiny) +Requires: perl(Path::Tiny) >= 0.018 %{perl_requires} %description @@ -55,11 +52,11 @@ %setup -q -n %{cpan_name}-%{version} %build -%{__perl} Makefile.PL installdirs=vendor -make +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} %check -make test +%{__make} test %install %perl_make_install @@ -68,6 +65,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE perlcritic.rc README weaver.ini +%doc Changes dist.ini.meta LICENSE perlcritic.rc README weaver.ini %changelog ++++++ Test-File-ShareDir-1.000001.tar.gz -> Test-File-ShareDir-1.000005.tar.gz ++++++ ++++ 3647 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dmtcp for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package dmtcp for openSUSE:Factory checked in at 2014-09-17 17:25:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmtcp (Old) and /work/SRC/openSUSE:Factory/.dmtcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dmtcp" Changes: -------- --- /work/SRC/openSUSE:Factory/dmtcp/dmtcp.changes 2014-08-05 21:11:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dmtcp.new/dmtcp.changes 2014-09-17 17:25:16.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 12 07:12:31 UTC 2014 - bwiedemann(a)suse.com + +- include string.h to fix compilation (bnc#889400) + Add includes.patch + +------------------------------------------------------------------- New: ---- includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmtcp.spec ++++++ --- /var/tmp/diff_new_pack.EZ3svI/_old 2014-09-17 17:25:17.000000000 +0200 +++ /var/tmp/diff_new_pack.EZ3svI/_new 2014-09-17 17:25:17.000000000 +0200 @@ -25,6 +25,7 @@ Group: System/Packages Url: http://dmtcp.sourceforge.net Source0: %{name}-%{version}.tar.gz +Patch1: includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc BuildRequires: gcc-c++ @@ -63,6 +64,7 @@ %prep %setup -q +%patch1 -p1 sed -i -e 's,enable_option_checking=fatal,enable_option_checking=no,' configure %build ++++++ includes.patch ++++++ Index: dmtcp-2.3.1/src/dlsym_default.c =================================================================== --- dmtcp-2.3.1.orig/src/dlsym_default.c +++ dmtcp-2.3.1/src/dlsym_default.c @@ -33,6 +33,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#include <string.h> #define _GNU_SOURCE #include <dlfcn.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsamplerate for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package libsamplerate for openSUSE:Factory checked in at 2014-09-17 17:25:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsamplerate (Old) and /work/SRC/openSUSE:Factory/.libsamplerate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsamplerate" Changes: -------- --- /work/SRC/openSUSE:Factory/libsamplerate/libsamplerate.changes 2013-05-27 09:52:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsamplerate.new/libsamplerate.changes 2014-09-17 17:25:14.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 26 12:14:15 UTC 2014 - fcrozat(a)suse.com + +- Add obsoletes/provides to baselibs.conf. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsamplerate.spec ++++++ --- /var/tmp/diff_new_pack.zqkVQc/_old 2014-09-17 17:25:15.000000000 +0200 +++ /var/tmp/diff_new_pack.zqkVQc/_new 2014-09-17 17:25:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsamplerate # -# 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 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.zqkVQc/_old 2014-09-17 17:25:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zqkVQc/_new 2014-09-17 17:25:16.000000000 +0200 @@ -1 +1,4 @@ libsamplerate0 + obsoletes "libsamplerate-<targettype> < <version>" + provides "libsamplerate-<targettype> = <version>" + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hydrogen for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package hydrogen for openSUSE:Factory checked in at 2014-09-17 17:25:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hydrogen (Old) and /work/SRC/openSUSE:Factory/.hydrogen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hydrogen" Changes: -------- --- /work/SRC/openSUSE:Factory/hydrogen/hydrogen.changes 2013-11-24 12:03:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hydrogen.new/hydrogen.changes 2014-09-17 17:25:09.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Sep 5 21:18:32 UTC 2014 - wbauer(a)tmo.at + +- Update to final version 0.9.6, adapt patches +- Changed hydrogen-0.9.6-desktop.patch to not add quotes to the + german Name and GenericName entries in the .desktop file, this + doesn't really make sense and looks bad in the application menu +- Updated h2cli.1 and hydrogen.1 man pages +- Upstream changes (compared to 0.9.5): + * Release 0.9.6 + * new build system (cmake) + * add undo for song/pattern editor + * jack-session support + * jack-midi support + * several bug fixes + * tabbed interface + * several small changes to the GUI + * improve ExportSong add use of TimeLineBPM, + RubberbandBatch processor and different types of resample interpolation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ h2cli.1 ++++++ --- /var/tmp/diff_new_pack.OFxkPH/_old 2014-09-17 17:25:11.000000000 +0200 +++ /var/tmp/diff_new_pack.OFxkPH/_new 2014-09-17 17:25:11.000000000 +0200 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH H2CLI "1" "October 2011" "h2cli 0.9.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. +.TH H2CLI "1" "September 2014" "h2cli 0.9.6" "User Commands" .SH NAME h2cli \- manual page for h2cli 0.9.6 .SH SYNOPSIS .B hydrogen [\fI-v\fR] [\fI-h\fR] \fI-s file\fR .SH DESCRIPTION -Hydrogen 0.9.6 [Oct 4 2011] [http://www.hydrogen\-music.org] +Hydrogen 0.9.6 [Fri Sep 5 21:42:13 2014] [http://www.hydrogen\-music.org] Copyright 2002\-2008 Alessandro Cominu .PP Hydrogen comes with ABSOLUTELY NO WARRANTY @@ -17,9 +17,23 @@ .HP \fB\-s\fR, \fB\-\-song\fR FILE \- Load a song (*.h2song) at startup .HP +\fB\-p\fR, \fB\-\-playlist\fR FILE \- Load a playlist (*.h2playlist) at startup +.HP +\fB\-o\fR, \fB\-\-outfile\fR FILE \- Output to file (export) +.HP +\fB\-r\fR, \fB\-\-rate\fR RATE \- Set bitrate while exporting file +.HP +\fB\-b\fR, \fB\-\-bits\fR BITS \- Set bits depth while exporting file +.HP \fB\-k\fR, \fB\-\-kit\fR drumkit_name \- Load a drumkit at startup .HP \fB\-i\fR, \fB\-\-install\fR FILE \- install a drumkit (*.h2drumkit) +.HP +\fB\-I\fR, \fB\-\-interpolate\fR INT \- Interpolation +.IP +(0:linear [default],1:cosine,2:third,3:cubic,4:hermite) +.HP +\fB\-S\fR, \fB\-\-jacksessionid\fR ID \- Start a JackSessionHandler session .TP \fB\-\-lash\-no\-start\-server\fR \- If LASH server not running, don't start it (LASH 0.5.3 and later). @@ -27,8 +41,6 @@ \fB\-\-lash\-no\-autoresume\fR \- Tell LASH server not to assume I'm returning from a crash. .HP -\fB\-n\fR, \fB\-\-nosplash\fR \- Hide splash screen -.HP \fB\-V[Level]\fR, \fB\-\-verbose\fR[=\fILevel\fR] \- Print a lot of debugging info .IP Level, if present, may be None, Error, Warning, Info, Debug or 0xHHHH ++++++ hydrogen-0.9.6-desktop.patch ++++++ --- /var/tmp/diff_new_pack.OFxkPH/_old 2014-09-17 17:25:11.000000000 +0200 +++ /var/tmp/diff_new_pack.OFxkPH/_new 2014-09-17 17:25:11.000000000 +0200 @@ -2,20 +2,7 @@ =================================================================== --- linux/hydrogen.desktop.orig 2011-01-06 11:30:46.000000000 +0200 +++ linux/hydrogen.desktop 2011-10-05 16:59:45.684862755 +0200 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Name=Hydrogen Drum Machine --Name[de]=Hydrogen Drumsequencer -+Name[de]='Hydrogen Drumsequencer' - Name[ru]=Драм-машина Hydrogen - Name[hu]=Hydrogen Dobgép - Name[tr]=Hydrogen Davul Makinası -@@ -12,19 +12,17 @@ Comment[hu]=Dobszekvenciákat lehet vele - Comment[tr]=Davul partisyonu yaz - - GenericName=Drum Machine --GenericName[de]=Drumsequencer -+GenericName[de]='Drumsequencer' +@@ -16,15 +16,13 @@ Comment[hu]=Dobszekvenciákat lehet vele GenericName[ru]=Драм-машина GenericName[tr]=Davul Makinası ++++++ hydrogen-0.9.6-lib64.patch ++++++ --- /var/tmp/diff_new_pack.OFxkPH/_old 2014-09-17 17:25:11.000000000 +0200 +++ /var/tmp/diff_new_pack.OFxkPH/_new 2014-09-17 17:25:11.000000000 +0200 @@ -20,8 +20,8 @@ ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} -@@ -46,14 +46,20 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE - ${RUBBERBAND_LIBRARIES} +@@ -49,14 +49,20 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE + ${CMAKE_THREAD_LIBS_INIT} ) -#SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER "${hydrogen_INCLUDES}" ) @@ -50,7 +50,7 @@ =================================================================== --- src/gui/CMakeLists.txt.orig 2011-01-06 11:31:10.000000000 +0200 +++ src/gui/CMakeLists.txt 2011-10-08 01:15:00.448239957 +0200 -@@ -26,11 +26,11 @@ INCLUDE_DIRECTORIES( +@@ -49,11 +49,11 @@ INCLUDE_DIRECTORIES( ADD_EXECUTABLE(hydrogen WIN32 MACOSX_BUNDLE ${hydrogen_SRCS} ${hydrogen_MOC} ${hydrogen_UIS_H}) TARGET_LINK_LIBRARIES(hydrogen @@ -120,12 +120,13 @@ =================================================================== --- src/tests/CMakeLists.txt.orig 2011-01-07 22:38:10.000000000 +0200 +++ src/tests/CMakeLists.txt 2011-10-08 01:20:13.158713653 +0200 -@@ -10,7 +10,7 @@ FILE(GLOB_RECURSE TESTS_SRCS *.cpp) +@@ -11,8 +11,8 @@ FILE(GLOB_RECURSE TESTS_SRCS *.cpp) link_directories() add_executable(tests ${TESTS_SRCS}) target_link_libraries(tests - hydrogen-core-${VERSION} + hydrogen-core + ${CPPUNIT_LIBRARIES} ) -add_dependencies(tests hydrogen-core-${VERSION}) +add_dependencies(tests hydrogen-core) @@ -134,7 +135,7 @@ =================================================================== --- CMakeLists.txt.orig 2011-09-13 03:35:18.000000000 +0200 +++ CMakeLists.txt 2011-10-09 19:33:45.071516565 +0200 -@@ -83,6 +83,7 @@ ELSE() +@@ -91,6 +91,7 @@ ELSE() IF(WANT_SHARED) SET(H2CORE_LIBRARY_TYPE SHARED) ++++++ hydrogen-0.9.6.tar.bz2 ++++++ ++++ 29343 lines of diff (skipped) ++++++ hydrogen-no-current-time.patch ++++++ --- /var/tmp/diff_new_pack.OFxkPH/_old 2014-09-17 17:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.OFxkPH/_new 2014-09-17 17:25:13.000000000 +0200 @@ -2,15 +2,15 @@ =================================================================== --- src/cli/main.cpp.orig 2011-07-06 09:25:22.000000000 +0200 +++ src/cli/main.cpp 2011-10-05 17:17:58.479216067 +0200 -@@ -306,7 +306,7 @@ int main(int argc, char *argv[]) - */ +@@ -427,7 +427,7 @@ int main(int argc, char *argv[]) + /* Show some information */ void showInfo() { -- cout << "\nHydrogen " + H2Core::get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]" << endl; -+ cout << "\nHydrogen " + H2Core::get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]" << endl; - cout << "Copyright 2002-2008 Alessandro Cominu" << endl; - // _INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; +- cout << "\nHydrogen " + get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]" << endl; ++ cout << "\nHydrogen " + get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]" << endl; + cout << "Copyright 2002-2008 Alessandro Cominu" << endl; + if ( Object::count_active() ) { Index: src/gui/src/AboutDialog.cpp =================================================================== --- src/gui/src/AboutDialog.cpp.orig 2011-07-29 09:52:12.000000000 +0200 @@ -28,14 +28,14 @@ =================================================================== --- src/gui/src/main.cpp.orig 2011-07-06 09:25:45.000000000 +0200 +++ src/gui/src/main.cpp 2011-10-05 17:19:58.049676061 +0200 -@@ -474,7 +474,7 @@ int main(int argc, char *argv[]) +@@ -470,7 +470,7 @@ int main(int argc, char *argv[]) */ void showInfo() { - cout << "\nHydrogen " + H2Core::get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]" << endl; + cout << "\nHydrogen " + H2Core::get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]" << endl; cout << "Copyright 2002-2008 Alessandro Cominu" << endl; - // ___INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; + // ___INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; Index: src/gui/src/SplashScreen.cpp =================================================================== ++++++ hydrogen.1 ++++++ --- /var/tmp/diff_new_pack.OFxkPH/_old 2014-09-17 17:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.OFxkPH/_new 2014-09-17 17:25:13.000000000 +0200 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH HYDROGEN "1" "October 2011" "hydrogen 0.9.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. +.TH HYDROGEN "1" "September 2014" "hydrogen 0.9.6" "User Commands" .SH NAME hydrogen \- manual page for hydrogen 0.9.6 .SH SYNOPSIS .B hydrogen [\fI-v\fR] [\fI-h\fR] \fI-s file\fR .SH DESCRIPTION -Hydrogen 0.9.6 [Oct 4 2011] [http://www.hydrogen\-music.org] +Hydrogen 0.9.6 [Fri Sep 5 21:42:13 2014] [http://www.hydrogen\-music.org] Copyright 2002\-2008 Alessandro Cominu .PP Hydrogen comes with ABSOLUTELY NO WARRANTY -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit colorhug-client for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package colorhug-client for openSUSE:Factory checked in at 2014-09-17 17:25:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colorhug-client (Old) and /work/SRC/openSUSE:Factory/.colorhug-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "colorhug-client" Changes: -------- --- /work/SRC/openSUSE:Factory/colorhug-client/colorhug-client.changes 2014-02-19 06:53:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.colorhug-client.new/colorhug-client.changes 2014-09-17 17:25:06.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 15 06:43:48 UTC 2014 - kkaempf(a)suse.com + +- Update to version 0.2.2 + - This release requires colord >= 1.2.3 + + New Features: + - Load the colorhug-spectro-utils data file from a GResource + - Support ColorHug2 in colorhug-ccmx and colorhug-flash + - Support getting and setting the DAC value on ColorHug+ + + Bugfixes: + - Do not use deprecated widgets in the spectro tool + - Don't set the multiplier or integral on v2 hardware + - Fix autogen failure with new gettexts + - Remove suspicious usage of sizeof with a numeric constant + - Use ch_device_check_firmware() to verify the firmware + +- drop colorhug-client-colorhug_plus.patch, upstream + +------------------------------------------------------------------- Old: ---- colorhug-client-0.2.1.tar.xz colorhug-client-colorhug_plus.patch New: ---- colorhug-client-0.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colorhug-client.spec ++++++ --- /var/tmp/diff_new_pack.PtJEp2/_old 2014-09-17 17:25:07.000000000 +0200 +++ /var/tmp/diff_new_pack.PtJEp2/_new 2014-09-17 17:25:07.000000000 +0200 @@ -17,21 +17,19 @@ Name: colorhug-client -Version: 0.2.1 +Version: 0.2.2 Release: 0 Summary: Tools for the Hughski Colorimeter License: GPL-2.0+ Group: Productivity/Graphics/Other Url: http://www.hughski.com/ Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM colorhug-client-colorhug_plus.patch dimstar(a)opensuse.org -- Rename 'ColorHug Spectro' to 'ColorHug+' for trademark reasons -Patch0: colorhug-client-colorhug_plus.patch BuildRequires: docbook-utils BuildRequires: intltool BuildRequires: itstool BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(colord) >= 0.1.33 +BuildRequires: pkgconfig(colord) >= 1.2.3 BuildRequires: pkgconfig(colord-gtk) >= 0.1.24 BuildRequires: pkgconfig(gio-2.0) >= 2.25.9 BuildRequires: pkgconfig(glib-2.0) >= 2.31.10 @@ -55,7 +53,6 @@ %lang_package %prep %setup -q -%patch0 -p1 %build %configure --disable-static ++++++ colorhug-client-0.2.1.tar.xz -> colorhug-client-0.2.2.tar.xz ++++++ ++++ 16370 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ibus-table-chinese for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package ibus-table-chinese for openSUSE:Factory checked in at 2014-09-17 17:24:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-table-chinese (Old) and /work/SRC/openSUSE:Factory/.ibus-table-chinese.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-table-chinese" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-table-chinese/ibus-table-chinese.changes 2014-07-29 16:48:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-table-chinese.new/ibus-table-chinese.changes 2014-09-17 17:25:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 15 06:25:05 UTC 2014 - i(a)marguerite.su + +- fix for factory: BuildRequires: python-ibus + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-table-chinese.spec ++++++ --- /var/tmp/diff_new_pack.jodcX2/_old 2014-09-17 17:25:05.000000000 +0200 +++ /var/tmp/diff_new_pack.jodcX2/_new 2014-09-17 17:25:05.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: cmake BuildRequires: ibus-table-devel BuildRequires: pkg-config -BuildRequires: python3-ibus +BuildRequires: python-ibus BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2014-09-17 17:24:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2014-06-10 14:39:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2014-09-17 17:25:02.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 15 06:23:33 UTC 2014 - i(a)marguerite.su + +- add baselibs.conf to Source + +------------------------------------------------------------------- +Thu Sep 11 19:11:45 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Fix baselibs requires, and shlib find-requires works + also with baselibs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-qt5.spec ++++++ --- /var/tmp/diff_new_pack.cposx2/_old 2014-09-17 17:25:04.000000000 +0200 +++ /var/tmp/diff_new_pack.cposx2/_new 2014-09-17 17:25:04.000000000 +0200 @@ -24,6 +24,7 @@ Group: System/I18n/Chinese Url: https://fcitx.org Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz +Source99: baselibs.conf BuildRequires: cmake BuildRequires: fcitx-devel >= 4.2.3 BuildRequires: gcc-c++ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.cposx2/_old 2014-09-17 17:25:04.000000000 +0200 +++ /var/tmp/diff_new_pack.cposx2/_new 2014-09-17 17:25:04.000000000 +0200 @@ -1,2 +1 @@ -fcitx-qt5 - requires "libfcitx-4_2_8-<targettype> = <version>" +fcitx-qt5 \ No newline at end of file -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gperftools for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package gperftools for openSUSE:Factory checked in at 2014-09-17 17:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gperftools (Old) and /work/SRC/openSUSE:Factory/.gperftools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gperftools" Changes: -------- --- /work/SRC/openSUSE:Factory/gperftools/gperftools.changes 2014-06-16 21:26:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gperftools.new/gperftools.changes 2014-09-17 17:25:01.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 15 00:33:02 CEST 2014 - ro(a)suse.de + +- set excludearch for s390 and s390x: not ported there + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gperftools.spec ++++++ --- /var/tmp/diff_new_pack.92LPCU/_old 2014-09-17 17:25:02.000000000 +0200 +++ /var/tmp/diff_new_pack.92LPCU/_new 2014-09-17 17:25:02.000000000 +0200 @@ -38,6 +38,7 @@ Group: System/Libraries Provides: google-perftools Obsoletes: google-perftools +ExcludeArch: s390 s390x %description The gperftools package contains some utilities to improve and analyze the -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ponysay for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package ponysay for openSUSE:Factory checked in at 2014-09-17 17:24:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ponysay (Old) and /work/SRC/openSUSE:Factory/.ponysay.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ponysay" Changes: -------- --- /work/SRC/openSUSE:Factory/ponysay/ponysay.changes 2014-04-29 17:35:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ponysay.new/ponysay.changes 2014-09-17 17:24:54.000000000 +0200 @@ -1,0 +2,14 @@ + +Sat Sep 6 18:11:20 UTC 2014 - sor.alexei(a)meowr.ru + +- Update to 3.0.2 + * New ponies: auntorange, grace + * Pony symlink added: + - cookiecrumbles → raritysmom (official name) + - hondoflanks → raritysdad (official name) + * Special pony cases: + - orange was renamed to uncleorange to not conflict with + auntorange. +- Remove info-direntry.patch: fixed upstream. + +------------------------------------------------------------------- @@ -4,2 +18,2 @@ -- spec cleanup -- add source URLs +- spec cleanup. +- Add source URLs. Old: ---- info-direntry.patch ponysay-3.0.1.tar.gz New: ---- ponysay-3.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ponysay.spec ++++++ --- /var/tmp/diff_new_pack.qkyItR/_old 2014-09-17 17:24:55.000000000 +0200 +++ /var/tmp/diff_new_pack.qkyItR/_new 2014-09-17 17:24:55.000000000 +0200 @@ -17,15 +17,14 @@ Name: ponysay -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: Cowsay reimplemention for ponies License: GPL-3.0+ Group: Amusements/Toys/Other Url: https://github.com/erkin/ponysay Source: https://github.com/erkin/%{name}/archive/%{version}.tar.gz#/%{name}-%{versi… -# PATCH-FIX-OPENSUSE info-direntry.patch sor.alexei(a)meowr.ru -- Adds @direntry to ponysay.info. -Patch0: info-direntry.patch + BuildRequires: fdupes BuildRequires: python3-devel BuildRequires: texinfo @@ -41,13 +40,18 @@ %prep %setup -q -%patch0 -p1 %build # Nothing to build. %install -python3 setup.py --prefix=%{_prefix} --dest-dir=%{buildroot} --freedom=partial --with-everything --with-pdf=%{_docdir}/%{name}/ install +python3 setup.py \ + --prefix=%{_prefix} \ + --dest-dir=%{buildroot} \ + --freedom=partial \ + --with-everything \ + --with-pdf=%{_docdir}/%{name}/ \ + install rm -rf %{buildroot}%{_infodir}/dir %{buildroot}%{_datadir}/licenses/ %fdupes %{buildroot}/%{_datadir}/%{name} @@ -67,8 +71,7 @@ %{_bindir}/pony* %{_datadir}/%{name}/ %{_infodir}/*.gz -%{_mandir}/man6/* -%{_mandir}/*/man6/* +%{_mandir}/*/ %{_datadir}/bash-completion/ %{_datadir}/zsh/ %{_datadir}/fish/ ++++++ ponysay-3.0.1.tar.gz -> ponysay-3.0.2.tar.gz ++++++ ++++ 26762 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit compizconfig-settings-manager for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package compizconfig-settings-manager for openSUSE:Factory checked in at 2014-09-17 17:24:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compizconfig-settings-manager (Old) and /work/SRC/openSUSE:Factory/.compizconfig-settings-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "compizconfig-settings-manager" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.compizconfig-settings-manager.new/compizconfig-settings-manager.changes 2014-09-17 17:24:46.000000000 +0200 @@ -0,0 +1,180 @@ +------------------------------------------------------------------- +Thu May 12 12:10:00 UTC 2014 - ku.b(a)gmx.de + +- unlink from Factory + +------------------------------------------------------------------- +Thu May 12 12:00:01 UTC 2014 - ku.b(a)gmx.de + +- repair package due to broken link in Factory +- remove Obsoletes ccs-settings +- repair License +- remove outdated 1110 version section + +------------------------------------------------------------------- +Sat Nov 11 12:00:01 UTC 2010 - ku.b(a)gmx.de + +- add the requirement for a compiz version less than 0.9 +- require a version less than 0.9 of python-ccm + +------------------------------------------------------------------- +Thu May 27 20:07:41 UTC 2010 - dimstar(a)opensuse.org + +- Split the python backend out in it's own package and have ccsm + frontend require it. + +------------------------------------------------------------------- +Fri Nov 13 10:47:01 CET 2009 - dimstar(a)opensuse.org + +- Update to version 0.8.4: + + Remove obsolete icons + + Speed up startup by loading icons in the background + +------------------------------------------------------------------- +Sat Oct 3 11:10:00 UTC 2009 - aj(a)suse.de + +- Don't warn about missing sexy-python, it's not available at all + in openSUSE (unsexy.patch) +- Package is noarch for openSUSE 11.2. + +------------------------------------------------------------------- +Fri Aug 21 14:13:14 CEST 2009 - dimstar(a)opensuse.org + +- Add new python macros for openSUSE <= 11.1 + +------------------------------------------------------------------- +Sun Aug 9 12:43:26 CEST 2009 - coolo(a)novell.com + +- use new python macros + +------------------------------------------------------------------- +Thu Jan 29 14:57:07 CET 2009 - rodrigo(a)novell.com + +- Add compizconfig-settings-manager-profile-extensions.patch (bgo#458343) + +------------------------------------------------------------------- +Mon Sep 29 16:53:32 CEST 2008 - rodrigo(a)novell.com + +- Review and merge changes from X11:Compiz + +------------------------------------------------------------------- +Wed Sep 17 20:18:32 IST 2008 - cyberorg(a)opensuse.org + +- Release 0.7.8 +- l10n updates +- Add startup notification and optional dbus single-instance support +- Make use of the new tooltip system introduced in GTK 2.12 + +------------------------------------------------------------------- +Tue Jul 1 17:28:58 CEST 2008 - mhopf(a)suse.de + +- Update from buildservice. + +------------------------------------------------------------------- +Sat May 31 19:30:00 IST 2008 - cyberorg(a)opensuse.org + +- update to 0.7.6 + - Check if an action conflicts with another plugin when enabling + a plugin + - Internal action bindings will now only conflict with global + bindings; internal actions in different plugins can have the + same bindings. + - Rewrote plugin overview page + - Changed native size of category icons to 32x32 + - Internal code refactoring and bug fixes + +------------------------------------------------------------------- +Mon Apr 14 20:20:06 CEST 2008 - mhopf(a)suse.de + +- Update from buildservice. + +------------------------------------------------------------------- +Thu Apr 03 22:03:00 IST 2008 - cyberorg(a)cyberorg.info + +- 0.7.4 release +- Advance search rewrite +- Add --version/-v command line switch +- Many GUI improvements + +------------------------------------------------------------------- +Fri Mar 07 01:20:00 IST 2008 - cyberorg(a)opensuse.org + +- 0.7.2 development release +- Action settings were split into button, key, and edge settings, each using + its own widget. +- Match settings can be edited with a simple editor that supports easy + grabbing of window properties +- Advanced Search page was improved +- New icons for some plugins +- Minor adaptations and fixes + +------------------------------------------------------------------- +Sat Feb 09 00:02:00 IST 2008 - cyberorg(a)cyberorg.info + +- sync to latest git + +------------------------------------------------------------------- +Tue Dec 04 13:40:00 IST 2007 - cyberorg(a)cyberorg.info + +- sync to latest git +- many GUI improvements +- key binding improvements +- file selection improvements + +------------------------------------------------------------------- +Tue Oct 16 13:40:00 IST 2007 - cyberorg(a)cyberorg.info + +- Update to release 0.6.0 +- Translation updates +- Key binding fixes and GUI improvements +------------------------------------------------------------------- +Tue Aug 25 11:05:00 IST 2007 - cyberorg(a)cyberorg.info + +- EdgeSelector improvements +- Key grabber fixes +- Rework key actions handling +- Made plugin tabs scrollable + +------------------------------------------------------------------- +Tue Aug 24 14:25:00 IST 2007 - cyberorg(a)cyberorg.info + +- Sync to the latest git. +- new action settings rework +- New GUI improvements + +------------------------------------------------------------------- +Fri Aug 17 23:08:05 IST 2007 - cyberorg(a)cyberorg.info + +- Symlink ccsm to compiz-config-settings-manager. + +------------------------------------------------------------------- +Mon Aug 13 18:03:15 IST 2007 - cyberorg(a)cyberorg.info + +- Update to 0.5.2 release. +- Added missing icons +- Profile page fixes +- Options rearrangement - general option first +- Fixed bug with files without type extension + +------------------------------------------------------------------- +Wed Aug 8 16:16:10 CEST 2007 - schwab(a)suse.de + +- Fix specfile. + +------------------------------------------------------------------- +Tue Aug 7 09:39:15 CEST 2007 - aj(a)suse.de + +- Fix packaging problems. + +------------------------------------------------------------------- +Mon Aug 6 20:36:56 CEST 2007 - dreveman(a)suse.de + +- Install with correct prefix +- Do not require libcompizconfig-backend +- Use %suse_update_desktop_file macro + +------------------------------------------------------------------- +Mon Aug 6 17:50:43 CEST 2007 - dreveman(a)suse.de + +- Initial version of package + New: ---- ccsm-0.8.4.tar.bz2 compizconfig-settings-manager-profile-extensions.patch compizconfig-settings-manager.changes compizconfig-settings-manager.spec unsexy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compizconfig-settings-manager.spec ++++++ # # spec file for package compizconfig-settings-manager (Version 0.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: compizconfig-settings-manager Version: 0.8.4 Release: 4.1 License: GPL-2.0+ Summary: Settings Manager for Compiz (CCSM) Url: http://opencompositing.org Group: System/X11/Utilities Source: ccsm-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM compizconfig-settings-manager-profile-extensions.patch bgo#458343 rodrigo(a)novell.com Patch1: compizconfig-settings-manager-profile-extensions.patch # PATCH-FIX-OPENSUSE Don't warn about missing sexy-python Patch2: unsexy.patch BuildRequires: compiz-devel BuildRequires: compiz-gnome BuildRequires: gconf2-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libcompizconfig-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: pkg-config BuildRequires: pyrex BuildRequires: python-compizconfig BuildRequires: python-devel BuildRequires: update-desktop-files PreReq: %fillup_prereq Requires: python-ccm < 0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description Compiz Config and Settings tool (CCSM). %package -n python-ccm License: GPL-2.0+ Summary: CompizConfig Manager Backend Group: System/X11/Utilities Requires: compiz < 0.9 Requires: python-compizconfig < 0.9 Requires: python-xml %py_requires %description -n python-ccm The backend to Compiz Config Manager. %prep %setup -q -n ccsm-%{version} %patch1 -p0 %patch2 -p0 %build ./setup.py --prefix=%{_prefix} %install ./setup.py install --root=%{buildroot} --prefix=/usr find %{buildroot} $ -name \*.a -o -name \*.la $ -print0 | xargs -0 rm -f %__ln_s %{_bindir}/ccsm %{buildroot}%{_bindir}/compizconfig-settings-manager %suse_update_desktop_file ccsm DesktopSettings %find_lang ccsm %clean %__rm -rf %{buildroot} %files -f ccsm.lang %defattr(-, root, root) %{_bindir}/* %{_datadir}/applications/* %{_datadir}/icons/* %files -n python-ccm %defattr(-, root, root) %dir %{python_sitelib}/ccm %{python_sitelib}/* %{_datadir}/ccsm/ %changelog ++++++ compizconfig-settings-manager-profile-extensions.patch ++++++ Index: ccm/Pages.py =================================================================== --- ccm/Pages.py.orig +++ ccm/Pages.py @@ -840,6 +840,8 @@ class ProfileBackendPage(object): dlg.set_markup(_("Do you want to skip default option values while exporting your profile?")) ret = dlg.run() dlg.destroy() + if not path.endswith(".profile"): + path = "%s.profile" % path self.Context.Export(path, ret == gtk.RESPONSE_YES) def ImportProfileDialog (self, main): ++++++ unsexy.patch ++++++ Index: ccsm =================================================================== --- ccsm.orig +++ ccsm @@ -90,7 +90,8 @@ try: import sexy has_sexy = True except ImportError: - print "Info: No sexy-python package found, don't worry it's optional." + # openSUSE does not come with sexy-python, so don't warn + # print "Info: No sexy-python package found, don't worry it's optional." has_sexy = False if gtk.pygtk_version < (2,12,0): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit WALinuxAgent for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package WALinuxAgent for openSUSE:Factory checked in at 2014-09-17 17:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/WALinuxAgent (Old) and /work/SRC/openSUSE:Factory/.WALinuxAgent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "WALinuxAgent" Changes: -------- --- /work/SRC/openSUSE:Factory/WALinuxAgent/WALinuxAgent.changes 2014-05-29 08:44:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.WALinuxAgent.new/WALinuxAgent.changes 2014-09-17 17:24:41.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Aug 14 20:02:29 UTC 2014 - rschweikert(a)suse.com + +- Update to version 2.0.7 + + Add warning for resource disk data loss + + Multiple fixes for provisioning and extension handler + + Add support for Gentoo + + Multiple fixes for extension handler in status report and heartbeat + +------------------------------------------------------------------- @@ -4 +13 @@ -- update to version 2.0.5 +- update to version 2.0.5 (bnc#880949) Old: ---- WALinuxAgent-2.0.5.tar.bz2 New: ---- WALinuxAgent-2.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ WALinuxAgent.spec ++++++ --- /var/tmp/diff_new_pack.BYbT4n/_old 2014-09-17 17:24:42.000000000 +0200 +++ /var/tmp/diff_new_pack.BYbT4n/_new 2014-09-17 17:24:42.000000000 +0200 @@ -20,7 +20,7 @@ Summary: The Windows Azure Linux Agent License: Apache-2.0 Group: System/Daemons -Version: 2.0.5 +Version: 2.0.7 Release: 0 Url: https://github.com/WindowsAzure/WALinuxAgent Source0: WALinuxAgent-%{version}.tar.bz2 ++++++ WALinuxAgent-2.0.5.tar.bz2 -> WALinuxAgent-2.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WALinuxAgent-2.0.5/.gitignore new/WALinuxAgent-2.0.7/.gitignore --- old/WALinuxAgent-2.0.5/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/WALinuxAgent-2.0.7/.gitignore 2014-08-08 09:05:01.000000000 +0200 @@ -0,0 +1,3 @@ +waagentc +*.py[cod]* + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WALinuxAgent-2.0.5/Changelog new/WALinuxAgent-2.0.7/Changelog --- old/WALinuxAgent-2.0.5/Changelog 2014-05-19 07:33:29.000000000 +0200 +++ new/WALinuxAgent-2.0.7/Changelog 2014-08-08 09:05:01.000000000 +0200 @@ -1,5 +1,13 @@ WALinuxAgent Changelog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +08 Aug 2014, WALinuxAgent 2.0.7 + . Add warning for resource disk data loss + . Multiple fixes for provisioning and extension handler + +13 Jun 2014, WALinuxAgent 2.0.6 + . Add support for Gentoo + . Multiple fixes for extension handler in status report and heartbeat + 19 May 2014, WALinuxAgent 2.0.5 . Multiple fixes for FreeBSD provisioning . Add support for SLES 12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WALinuxAgent-2.0.5/tests/env.py new/WALinuxAgent-2.0.7/tests/env.py --- old/WALinuxAgent-2.0.5/tests/env.py 1970-01-01 01:00:00.000000000 +0100 +++ new/WALinuxAgent-2.0.7/tests/env.py 2014-08-08 09:05:01.000000000 +0200 @@ -0,0 +1,23 @@ +# Copyright 2014 Microsoft Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import imp +import os + +projet_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +waagent = imp.load_source('waagent', os.path.join(projet_root, 'waagent')) + +waagent.LoggerInit('/tmp/test.log','/dev/stdout') + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WALinuxAgent-2.0.5/tests/test_utils.py new/WALinuxAgent-2.0.7/tests/test_utils.py --- old/WALinuxAgent-2.0.5/tests/test_utils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/WALinuxAgent-2.0.7/tests/test_utils.py 2014-08-08 09:05:01.000000000 +0200 @@ -0,0 +1,47 @@ +# Copyright 2014 Microsoft Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import unittest +from env import waagent + +sample_mount_list = """\ +/dev/sda1 on / type ext4 (rw) +proc on /proc type proc (rw) +sysfs on /sys type sysfs (rw) +devpts on /dev/pts type devpts (rw,gid=5,mode=620) +tmpfs on /dev/shm type tmpfs (rw,rootcontext="system_u:object_r:tmpfs_t:s0") +none on /proc/sys/fs/binfmt_misc type binfmt_misc (rw) +/dev/sdb1 on /mnt/resource type ext4 (rw) +""" + +device_name="/dev/sdb" + +class TestWAAgentUtils(unittest.TestCase): + + def test_get_mount_point(self): + normal = sample_mount_list + mp = waagent.GetMountPoint(normal, device_name) + self.assertEqual(mp, '/mnt/resource') + + null = None + mp = waagent.GetMountPoint(null, device_name) + self.assertEqual(mp, None) + + malformed = 'asdfasdfasdfa aasdf' + mp = waagent.GetMountPoint(malformed, device_name) + self.assertEqual(mp, None) + +if __name__ == '__main__': + unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WALinuxAgent-2.0.5/waagent new/WALinuxAgent-2.0.7/waagent --- old/WALinuxAgent-2.0.5/waagent 2014-05-19 07:33:29.000000000 +0200 +++ new/WALinuxAgent-2.0.7/waagent 2014-08-08 09:05:01.000000000 +0200 @@ -78,7 +78,7 @@ GuestAgentName = "WALinuxAgent" GuestAgentLongName = "Windows Azure Linux Agent" -GuestAgentVersion = "WALinuxAgent-2.0.5" +GuestAgentVersion = "WALinuxAgent-2.0.7" ProtocolVersion = "2012-11-30" #WARNING this value is used to confirm the correct fabric protocol. Config = None @@ -100,6 +100,7 @@ provisioned=False global provisionError provisionError=None +HandlerStatusToAggStatus = {"installed":"Installing", "enabled":"Ready", "unintalled":"NotReady", "disabled":"NotReady"} WaagentConf = """\ # @@ -130,6 +131,16 @@ OS.RootDeviceScsiTimeout=300 # Root device timeout in seconds. OS.OpensslPath=None # If "None", the system default version is used. """ +README_FILENAME="DATALOSS_WARNING_README.txt" +README_FILECONTENT="""\ +WARNING: THIS IS A TEMPORARY DISK. + +Any data stored on this drive is SUBJECT TO LOSS and THERE IS NO WAY TO RECOVER IT. + +Please do not use this disk for storing any personal or application data. + +For additional details to please refer to the MSDN documentation at : http://msdn.microsoft.com/en-us/library/windowsazure/jj672979.aspx +""" ############################################################ # BEGIN DISTRO CLASS DEFS @@ -282,7 +293,7 @@ sshRestartCmd = self.service_cmd + " " + self.ssh_service_name + " " + self.ssh_service_restart_option retcode = Run(sshRestartCmd) if retcode > 0: - Error("Failed to restart SSH service with return code:" + retcode) + Error("Failed to restart SSH service with return code:" + str(retcode)) return retcode def sshDeployPublicKey(self,fprint,path): @@ -423,6 +434,9 @@ def GetInterfaceName(self): return GetFirstActiveNetworkInterfaceNonLoopback()[0] + def RestartInterface(self, iface): + Run("ifdown " + iface + " && ifup " + iface) + def CreateAccount(self,user, password, expiration, thumbprint): return CreateAccount(user, password, expiration, thumbprint) @@ -444,26 +458,33 @@ Error("ActivateResourceDisk: Unable to detect disk topology.") return device = "/dev/" + device - for entry in RunGetOutput("mount")[1].split(): - if entry.startswith(device + "1"): - Log("ActivateResourceDisk: " + device + "1 is already mounted.") - DiskActivated = True + + mountlist = RunGetOutput("mount")[1] + mountpoint = GetMountPoint(mountlist, device) + + if(mountpoint): + Log("ActivateResourceDisk: " + device + "1 is already mounted.") + else: + mountpoint = Config.get("ResourceDisk.MountPoint") + if mountpoint == None: + mountpoint = "/mnt/resource" + CreateDir(mountpoint, "root", 0755) + fs = Config.get("ResourceDisk.Filesystem") + if fs == None: + fs = "ext3" + if RunGetOutput("sfdisk -q -c " + device + " 1")[1].rstrip() == "7" and fs != "ntfs": + Run("sfdisk -c " + device + " 1 83") + Run("mkfs." + fs + " " + device + "1") + if Run("mount " + device + "1 " + mountpoint): + Error("ActivateResourceDisk: Failed to mount resource disk (" + device + "1).") return - mountpoint = Config.get("ResourceDisk.MountPoint") - if mountpoint == None: - mountpoint = "/mnt/resource" - CreateDir(mountpoint, "root", 0755) - fs = Config.get("ResourceDisk.Filesystem") - if fs == None: - fs = "ext3" - if RunGetOutput("sfdisk -q -c " + device + " 1")[1].rstrip() == "7" and fs != "ntfs": - Run("sfdisk -c " + device + " 1 83") - Run("mkfs." + fs + " " + device + "1") - if Run("mount " + device + "1 " + mountpoint): - Error("ActivateResourceDisk: Failed to mount resource disk (" + device + "1).") - return - Log("Resource disk (" + device + "1) is mounted at " + mountpoint + " with fstype " + fs) + Log("Resource disk (" + device + "1) is mounted at " + mountpoint + " with fstype " + fs) + + #Create README file under the root of resource disk + SetFileContents(os.path.join(mountpoint,README_FILENAME), README_FILECONTENT) DiskActivated = True + + #Create swap space swap = Config.get("ResourceDisk.EnableSwap") if swap == None or swap.lower().startswith("n"): return @@ -524,6 +545,90 @@ SetFileContents(filePath,timeout) Log("SetBlockDeviceTimeout: Update the device " + device + " with timeout " + timeout) + def waitForSshHostKey(self, path): + """ + Provide a dummy waiting, since by default, ssh host key is created by waagent and the key + should already been created. + """ + if(os.path.isfile(path)): + return True + else: + Error("Can't find host key: {0}".format(path)) + return False + +############################################################ +# GentooDistro +############################################################ +gentoo_init_file = """\ +#!/sbin/runscript + +command=/usr/sbin/waagent +pidfile=/var/run/waagent.pid +command_args=-daemon +command_background=true +name="Windows Azure Linux Agent" + +depend() +{ + needs localmount + use logger network + after bootmisc modules +} + +""" +class gentooDistro(AbstractDistro): + """ + Gentoo distro concrete class + """ + + def __init__(self): # + super(gentooDistro,self).__init__() + self.service_cmd='/sbin/service' + self.ssh_service_name='sshd' + self.hostname_file_path='/etc/conf.d/hostname' + self.dhcp_client_name='dhcpcd' + self.shadow_file_mode=0640 + self.init_file=gentoo_init_file + + def publishHostname(self,name): + try: + if (os.path.isfile(self.hostname_file_path)): + r=ReplaceFileContentsAtomic(self.hostname_file_path, "hostname=\"" + name + "\"\n" + + "\n".join(filter(lambda a: not a.startswith("hostname="), GetFileContents(self.hostname_file_path).split("\n")))) + except: + return 1 + return r + + def installAgentServiceScriptFiles(self): + SetFileContents(self.init_script_file, self.init_file) + os.chmod(self.init_script_file, 0755) + + def registerAgentService(self): + self.installAgentServiceScriptFiles() + return Run('rc-update add ' + self.agent_service_name + ' default') + + def uninstallAgentService(self): + return Run('rc-update del ' + self.agent_service_name + ' default') + + def unregisterAgentService(self): + self.stopAgentService() + return self.uninstallAgentService() + + def checkPackageInstalled(self,p): + if Run('eix -I ^' + p + '$',chk_err=False): + return 0 + else: + return 1 + + def checkPackageUpdateable(self,p): + if Run('eix -u ^' + p + '$',chk_err=False): + return 0 + else: + return 1 + + def RestartInterface(self, iface): + Run("/etc/init.d/net." + iface + " restart") + ############################################################ # SuSEDistro ############################################################ @@ -1082,6 +1187,18 @@ self.dhcp_client_name='dhclient' return self.dhcp_client_name + def waitForSshHostKey(self, path): + """ + Wait until the ssh host key is generated by cloud init. + """ + for retry in range(0, 10): + if(os.path.isfile(path)): + return True + time.sleep(1) + Error("Can't find host key: {0}".format(path)) + return False + + ############################################################ # LinuxMintDistro ############################################################ @@ -1305,6 +1422,9 @@ iface,inet,mac=self.GetFreeBSDEthernetInfo() return iface + def RestartInterface(self, iface): + Run("service netif restart") + def GetIpv4Address(self): """ Return the ip of the @@ -1538,8 +1658,8 @@ ovfxml = ovfxml[3:] # BOM is not stripped. First three bytes are > 128 and not unicode chars so we ignore them. ovfxml = ovfxml.strip(chr(0x00)) ovfxml = "".join(filter(lambda x: ord(x)<128, ovfxml)) - ovfxml = re.sub('>.*\Z', '', ovfxml) - ovfxml += '>' + ovfxml = re.sub(r'</Environment>.*\Z','',ovfxml,0,re.DOTALL) + ovfxml += '</Environment>' SetFileContents(location+"/ovf-env.xml", ovfxml) return retcode,out @@ -2835,7 +2955,7 @@ Log("No RuntimeSettings for " + name + " V " + version) SimpleLog(p.plugin_log,"No RuntimeSettings for " + name + " V " + version) - SetFileContents(root +"/config/" + incarnation +".settings", config ) + SetFileContents(root +"/config/" + seqNo +".settings", config ) #create HandlerEnvironment.json handler_env='[{ "name": "'+name+'", "seqNo": "'+seqNo+'", "version": 1.0, "handlerEnvironment": { "logFolder": "'+os.path.dirname(p.plugin_log)+'", "configFolder": "' + root + '/config", "statusFolder": "' + root + '/status", "heartbeatFile": "'+ root + '/heartbeat.log"}}]' SetFileContents(root+'/HandlerEnvironment.json',handler_env) @@ -2928,7 +3048,7 @@ Error("No RuntimeSettings for " + name + " V " + version) SimpleLog(p.plugin_log,"No RuntimeSettings for " + name + " V " + version) - SetFileContents(root +"/config/" + incarnation +".settings", config ) + SetFileContents(root +"/config/" + seqNo +".settings", config ) # state is still enable if (self.GetHandlerState(handler) == 'NotInstalled'): # run install first if true @@ -3013,7 +3133,7 @@ # launch pid=None try: - child = subprocess.Popen(dirpath+'/'+cmd+arg,shell=True,cwd=dirpath) + child = subprocess.Popen(dirpath+'/'+cmd+arg,shell=True,cwd=dirpath,stdout=subprocess.PIPE) except Exception as e: Error('Exception launching ' + cmd + str(e)) SimpleLog(plugin_log,'Exception launching ' + cmd + str(e)) @@ -3079,7 +3199,6 @@ return None status='' statuses='' - sent_suffix = '_sent' for p in self.Plugins: if p.getAttribute("state") == 'uninstall' or p.getAttribute("restricted") == 'true' : continue @@ -3088,27 +3207,14 @@ if p.getAttribute("isJson") != 'true': LogIfVerbose("Plugin " + name+" version: " +version+" is not a JSON Extension. Skipping.") continue - status_file=LibDir+'/'+name+'-'+version+'/status/'+incarnation+'.status' - if os.path.exists(status_file) !=True and os.path.exists(status_file+sent_suffix) != True: - if p.getAttribute("state") == 'disabled' : - LogIfVerbose(name+'-'+version+' is disabled. No status to report.') - continue - Error("Unable to locate " + status_file) - Error('Status report '+status_file+' Not sent!') - continue - elif os.path.exists(status_file) !=True and os.path.exists(status_file+sent_suffix) == True: - status_file = status_file+sent_suffix + reportHeartbeat = False + if len(p.getAttribute("manifestdata"))<1: + Error("Failed to get manifestdata.") + else: + reportHeartbeat = json.loads(p.getAttribute("manifestdata"))[0]['handlerManifest']['reportHeartbeat'] if len(statuses)>0: statuses+=',' - statuses+=GetFileContents(status_file) - if status_file.find(sent_suffix) < 0: - if os.path.exists(status_file + sent_suffix): - os.remove(status_file + sent_suffix) - os.rename(status_file,status_file+sent_suffix) - - if len(statuses)<1: - LogIfVerbose('No Handler status to report') - return None + statuses+=self.GenerateAggStatus(name, version, reportHeartbeat) tstamp=time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()) #header #agent state @@ -3131,72 +3237,85 @@ return None self.Util.Endpoint=uri.split('/')[2] self.Util.HttpPutBlockBlob(uri, status) - Log('Status report '+status+' sent to ' + uri) + LogIfVerbose('Status report '+status+' sent to ' + uri) return True - - def CheckHeartbeat(self): - try: - incarnation=self.Extensions[0].getAttribute("goalStateIncarnation") - uri=GetNodeTextData(self.Extensions[0].getElementsByTagName("StatusUploadBlob")[0]) - except: - Error('Error parsing ExtensionsConfig. Unable to check hearbeat.') - return None - for p in self.Plugins: - if p.getAttribute("state") == 'disabled' or p.getAttribute("state") == 'uninstall' or p.getAttribute("restricted") == 'true' : - continue - version=p.getAttribute("version") - name=p.getAttribute("name") - if p.getAttribute("isJson") != 'true': - Error("Plugin " + name+" version: " +version+" is not a JSON Extension. Skipping.") - continue - try: - if len(p.getAttribute("manifestdata"))<1 or json.loads(p.getAttribute("manifestdata"))[0]['handlerManifest']['reportHeartbeat']!=True : - Error("JSON error, unable to process manifestdata") - continue - except: - continue - - heartbeat_file=LibDir+'/'+name+'-'+version+'/heartbeat.log' - status_file=LibDir+'/'+name+'-'+version+'/status/'+incarnation+'.status' - if not os.path.exists(heartbeat_file): - Error('Missing '+ heartbeat_file) - continue - else: - heartbeat=GetFileContents(heartbeat_file) - try: - hb=json.loads(heartbeat) - except: - Error("JSON error, unable to process " + heartbeat_file) - try: - d=int(time.time()-os.stat(heartbeat_file).st_mtime) - except: - Error("Unable to stat " + heartbeat_file) - continue - - if d >= 700: # stop sending heartbeats - return 'NotReady' - if d < 120: # within 2 mins considered active - return 'Ready' - if d < 600: # less than 10 mins unknown - state='Unknown' - else: # more than 10 mins with no update considered notready - state='NotReady' + + def GetCurrentSequenceNumber(self, plugin_base_dir): + """ + Get the settings file with biggest file number in config folder + """ + config_dir = os.path.join(plugin_base_dir, 'config') + seq_no = 0 + for subdir, dirs, files in os.walk(config_dir): + for file in files: try: - stat_rept='{"handlerName":"' + name + '","handlerVersion":"'+version+ '","status":"' +hb[0]['heartbeat']['status'] + '","code":' + hb[0]['heartbeat']['code'] + ',"formattedMessage":{"lang":"en-US","message":"' + hb[0]['heartbeat']['Message'] + '"}}' - cur_file=status_file+'_current' - with open(cur_file,'w+') as f: - f.write(stat_rept) - # if inc.status exists, rename the inc.status to inc.status_sent - if os.path.exists(status_file) == True: - os.rename(status_file,status_file+'_sent') - # rename inc.status_current to inc.status - os.rename(cur_file,status_file) - # remove inc.status_sent - if os.path.exists(status_file+'_sent') == True: - os.unlink(status_file+'_sent') - except: - Error("Unable to create " + status_file) + cur_seq_no = int(os.path.basename(file).split('.')[0]) + if cur_seq_no > seq_no: + seq_no = cur_seq_no + except ValueError: continue + return str(seq_no) + + + def GenerateAggStatus(self, name, version, reportHeartbeat = False): + """ + Generate the status which Azure can understand by the status and heartbeat reported by extension + """ + plugin_base_dir = LibDir+'/'+name+'-'+version+'/' + current_seq_no = self.GetCurrentSequenceNumber(plugin_base_dir) + status_file=os.path.join(plugin_base_dir, 'status/', current_seq_no +'.status') + heartbeat_file = os.path.join(plugin_base_dir, 'heartbeat.log') + + handler_state_file = os.path.join(plugin_base_dir, 'config', 'HandlerState') + agg_state = 'NotReady' + handler_state = None + status_obj = None + status_code = None + formatted_message = None + localized_message = None + + if os.path.exists(handler_state_file): + handler_state = GetFileContents(handler_state_file).lower() + if HandlerStatusToAggStatus.has_key(handler_state): + agg_state = HandlerStatusToAggStatus[handler_state] + if reportHeartbeat: + if os.path.exists(heartbeat_file): + d=int(time.time()-os.stat(heartbeat_file).st_mtime) + if d > 600 : # not updated for more than 10 min + agg_state = 'Unresponsive' + else: + try: + heartbeat = json.loads(GetFileContents(heartbeat_file))[0]["heartbeat"] + agg_state = heartbeat.get("status") + status_code = heartbeat.get("code") + formatted_message = heartbeat.get("formattedMessage") + localized_message = heartbeat.get("message") + except: + Error("Incorrect heartbeat file. Ignore it. ") + else: + agg_state = 'Unresponsive' + #get status file reported by extension + if os.path.exists(status_file): + # raw status generated by extension is an array, get the first item and remove the unnecessary element + try: + status_obj = json.loads(GetFileContents(status_file))[0] + del status_obj["version"] + except: + Error("Incorrect status file. Will NOT settingsStatus in settings. ") + agg_status_obj = {"handlerName": name, "handlerVersion": version, "status": agg_state, "runtimeSettingsStatus" : + {"sequenceNumber": current_seq_no}} + if status_obj: + agg_status_obj["runtimeSettingsStatus"]["settingsStatus"] = status_obj + if status_code != None: + agg_status_obj["code"] = status_code + if formatted_message: + agg_status_obj["formattedMessage"] = formatted_message + if localized_message: + agg_status_obj["message"] = localized_message + agg_status_string = json.dumps(agg_status_obj) + LogIfVerbose("Handler Aggregated Status:" + agg_status_string) + return agg_status_string + def SetHandlerState(self, handler, state=''): zip_dir=LibDir+"/" + handler @@ -3992,7 +4111,7 @@ # http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx LogIfVerbose("Routes at offset:" + hex(i) + " with length:" + hex(length)) if length < 5: - Error("Data too small for option " + option) + Error("Data too small for option " + str(option)) j = i + 2 while j < (i + length + 2): maskLengthBits = Ord(receiveBuffer[j]) @@ -4023,7 +4142,7 @@ name = "Windows Azure wire protocol endpoint" LogIfVerbose(name + ": " + IpAddress + " at " + hex(i)) else: - Error("HandleDhcpResponse: Data too small for option " + option) + Error("HandleDhcpResponse: Data too small for option " + str(option)) else: LogIfVerbose("Skipping DHCP option " + hex(option) + " at " + hex(i) + " with length " + hex(length)) i += length + 2 @@ -4036,14 +4155,15 @@ """ ShortSleep = False # Sleep 1 second before retrying DHCP queries. ifname=None - Run("iptables -D INPUT -p udp --dport 68 -j ACCEPT",chk_err=False) # We supress error logging on error. - Run("iptables -I INPUT -p udp --dport 68 -j ACCEPT",chk_err=False) # We supress error logging on error. sleepDurations = [0, 10, 30, 60, 60] maxRetry = len(sleepDurations) lastTry = (maxRetry - 1) for retry in range(0, maxRetry): try: + #Open DHCP port if iptables is enabled. + Run("iptables -D INPUT -p udp --dport 68 -j ACCEPT",chk_err=False) # We supress error logging on error. + Run("iptables -I INPUT -p udp --dport 68 -j ACCEPT",chk_err=False) # We supress error logging on error. strRetry = str(retry) prefix = "DoDhcpWork: try=" + strRetry LogIfVerbose(prefix) @@ -4109,10 +4229,7 @@ Log("Setting host name: " + name) MyDistro.publishHostname(name) ethernetInterface = MyDistro.GetInterfaceName() - if DistInfo()[0] == 'FreeBSD': - Run("service netif restart") - else: - Run("ifdown " + ethernetInterface + " && ifup " + ethernetInterface) + MyDistro.RestartInterface(ethernetInterface) self.RestoreRoutes() def RestoreRoutes(self): @@ -4524,8 +4641,11 @@ type = Config.get("Provisioning.SshHostKeyPairType") if type == None: type = "rsa" - fingerprint = RunGetOutput("ssh-keygen -lf /etc/ssh/ssh_host_" + type + "_key.pub")[1].rstrip().split()[1].replace(':','') - self.ReportRoleProperties(fingerprint) + + host_key_path = "/etc/ssh/ssh_host_" + type + "_key.pub" + if(MyDistro.waitForSshHostKey(host_key_path)): + fingerprint = RunGetOutput("ssh-keygen -lf /etc/ssh/ssh_host_" + type + "_key.pub")[1].rstrip().split()[1].replace(':','') + self.ReportRoleProperties(fingerprint) if program != None and DiskActivated == True: try: @@ -4547,7 +4667,6 @@ # report the status/heartbeat results of extension processing if goalState.ExtensionsConfig != None : goalState.ExtensionsConfig.ReportHandlerStatus() - goalState.ExtensionsConfig.CheckHeartbeat() time.sleep(25 - sleepToReduceAccessDenied) @@ -4560,6 +4679,25 @@ } """ +def GetMountPoint(mountlist, device): + """ + Example of mountlist: + /dev/sda1 on / type ext4 (rw) + proc on /proc type proc (rw) + sysfs on /sys type sysfs (rw) + devpts on /dev/pts type devpts (rw,gid=5,mode=620) + tmpfs on /dev/shm type tmpfs (rw,rootcontext="system_u:object_r:tmpfs_t:s0") + none on /proc/sys/fs/binfmt_misc type binfmt_misc (rw) + /dev/sdb1 on /mnt/resource type ext4 (rw) + """ + if (mountlist and device): + for entry in mountlist.split('\n'): + if(re.search(device, entry)): + tokens = entry.split() + #Return the 3rd column of this line + return tokens[2] if len(tokens) > 2 else None + return None + def FindInLinuxKernelCmdline(option): """ Return match object if 'option' is present in the kernel boot options -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

17 Sep '14

Hello community, here is the log from the commit of package python-hgtools for openSUSE:Factory checked in at 2014-09-17 17:24:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-hgtools (Old) and /work/SRC/openSUSE:Factory/.python-hgtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-hgtools" Changes: -------- --- /work/SRC/openSUSE:Factory/python-hgtools/python-hgtools.changes 2013-12-10 20:06:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-hgtools.new/python-hgtools.changes 2014-09-17 17:24:38.000000000 +0200 @@ -1,0 +2,37 @@ +Tue Sep 16 00:59:09 CEST 2014 - ro(a)suse.de + +- add LICENSE to documentation + +------------------------------------------------------------------- +Mon Sep 15 13:53:21 UTC 2014 - tbechtold(a)suse.com + +- update to version 6.0 + * Issue #23: hgtools no longer imports Mercurial and thus does not link to + it. Applications that wish to use the in-process Mercurial manager must + first `import mercurial.dispatch` in their application. + * Issue #23: hgtools is now licensed under the MIT license. + * Issue #19: Add file finder support for git. Credit to Berry Phillips. + * Issue #20: Added support for listing all git tags. Credit to Berry Phillips. + * In version inference, always fallback to increment (or None) when an + Exception occurs in the calculation. + * Issue #17: Fix regression on older versions of setuptools where unspecified + distribution attributes would cause use_vcs_version of None to supersede + a supplied use_hg_version. + * Added new ``use_vcs_version`` distutils parameter to supersede + ``use_hg_version``. Clients should update to use this new parameter as soon + as hgtools 5.0 is generally available. + * Initial git support. The tool now nominally supports eliciting the project + version from a git tag. Many of the hg features are not yet implemented, + such as auto-incrementing versions when the current revision is not on a + tag and file discovery from repo metadata. + This new Git support provides experimental support for dual-hosted + repositories (such as those found on Kiln). Since file discovery is not yet + tested or implemented, there are likely to be yet undiscovered issues. + * Refactored the Manager models to better support the two repositories. + Clients that use hgtools to programmatically manipulate repositories will + need to update to use the new names. In particular, HGRepoManager was + renamed to RepoManager. SubprocessManager renamed to MercurialManager and + a new GitManager was created. The LibraryManager was renamed to + MercurialInProcManager. + +------------------------------------------------------------------- Old: ---- hgtools-4.0.zip New: ---- hgtools-6.0.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-hgtools.spec ++++++ --- /var/tmp/diff_new_pack.hpxspK/_old 2014-09-17 17:24:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hpxspK/_new 2014-09-17 17:24:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-hgtools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-hgtools -Version: 4.0 +Version: 6.0 Release: 0 Summary: Mercurial support for setup tools License: GPL-2.0 @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) -%doc README +%doc README.txt LICENSE %{python_sitelib}/* %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 perl-Capture-Tiny for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-Capture-Tiny for openSUSE:Factory checked in at 2014-09-17 17:24:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Capture-Tiny (Old) and /work/SRC/openSUSE:Factory/.perl-Capture-Tiny.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Capture-Tiny" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Capture-Tiny/perl-Capture-Tiny.changes 2014-02-12 17:22:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Capture-Tiny.new/perl-Capture-Tiny.changes 2014-09-17 17:24:36.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 15 16:01:08 UTC 2014 - coolo(a)suse.com + +- updated to 0.25 + Prereqs: + - Amended recommended modules to list Inline::C rather than Inline + +------------------------------------------------------------------- Old: ---- Capture-Tiny-0.24.tar.gz New: ---- Capture-Tiny-0.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Capture-Tiny.spec ++++++ --- /var/tmp/diff_new_pack.IvvLpJ/_old 2014-09-17 17:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.IvvLpJ/_new 2014-09-17 17:24:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Capture-Tiny -Version: 0.24 +Version: 0.25 Release: 0 %define cpan_name Capture-Tiny Summary: Capture STDOUT and STDERR from Perl, XS or external programs @@ -29,7 +29,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(version) %{perl_requires} %description ++++++ Capture-Tiny-0.24.tar.gz -> Capture-Tiny-0.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/Changes new/Capture-Tiny-0.25/Changes --- old/Capture-Tiny-0.24/Changes 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/Changes 2014-08-16 16:08:48.000000000 +0200 @@ -1,11 +1,17 @@ Revision history for Capture-Tiny +0.25 2014-08-16 10:08:42-04:00 America/New_York + + Prereqs: + + - Amended recommended modules to list Inline::C rather than Inline + 0.24 2014-02-06 17:15:37-05:00 America/New_York Fixed: - - Closed security hole in use of semaphore flag in /tmp; - now opens semaphore the using O_CREAT|O_EXCL + - Closed security hole in use of semaphore file in /tmp; + now opens the semaphore file using O_CREAT|O_EXCL 0.23 2013-10-20 11:25:34 America/New_York diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/MANIFEST new/Capture-Tiny-0.25/MANIFEST --- old/Capture-Tiny-0.24/MANIFEST 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/MANIFEST 2014-08-16 16:08:48.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.012. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020. CONTRIBUTING Changes LICENSE @@ -14,6 +14,7 @@ examples/tee.pl lib/Capture/Tiny.pm perlcritic.rc +t/00-report-prereqs.dd t/00-report-prereqs.t t/01-Capture-Tiny.t t/02-capture.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/META.json new/Capture-Tiny-0.25/META.json --- old/Capture-Tiny-0.24/META.json 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/META.json 2014-08-16 16:08:48.000000000 +0200 @@ -4,7 +4,7 @@ "David Golden <dagolden(a)cpan.org>" ], "dynamic_config" : 1, - "generated_by" : "Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.133380", + "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.140640", "license" : [ "apache_2_0" ], @@ -32,7 +32,7 @@ }, "develop" : { "requires" : { - "Dist::Zilla" : "5.012", + "Dist::Zilla" : "5", "Dist::Zilla::Plugin::OSPrereqs" : "0", "Dist::Zilla::Plugin::Prereqs" : "0", "Dist::Zilla::Plugin::RemovePrereqs" : "0", @@ -45,7 +45,8 @@ "Test::CPAN::Meta" : "0", "Test::More" : "0", "Test::Pod" : "1.41", - "Test::Pod::Coverage" : "1.08" + "Test::Pod::Coverage" : "1.08", + "Test::Spelling" : "0.12" } }, "runtime" : { @@ -63,25 +64,22 @@ }, "test" : { "recommends" : { - "CPAN::Meta" : "0", - "CPAN::Meta::Requirements" : "2.120900", - "Inline" : "0.50" + "CPAN::Meta" : "2.120900", + "Inline::C" : "0.50" }, "requires" : { "ExtUtils::MakeMaker" : "0", - "File::Spec::Functions" : "0", + "File::Spec" : "0", "IO::File" : "0", - "List::Util" : "0", "Test::More" : "0.62", - "lib" : "0", - "version" : "0" + "lib" : "0" } } }, "provides" : { "Capture::Tiny" : { "file" : "lib/Capture/Tiny.pm", - "version" : "0.24" + "version" : "0.25" } }, "release_status" : "stable", @@ -96,10 +94,11 @@ "web" : "https://github.com/dagolden/Capture-Tiny" } }, - "version" : "0.24", + "version" : "0.25", "x_authority" : "cpan:DAGOLDEN", "x_contributors" : [ - "Dagfinn Ilmari Manns\u00e5ker <ilmari(a)ilmari.org>" + "Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org>", + "David E. Wheeler <david(a)justatheory.com>" ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/META.yml new/Capture-Tiny-0.25/META.yml --- old/Capture-Tiny-0.24/META.yml 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/META.yml 2014-08-16 16:08:48.000000000 +0200 @@ -4,16 +4,14 @@ - 'David Golden <dagolden(a)cpan.org>' build_requires: ExtUtils::MakeMaker: '0' - File::Spec::Functions: '0' + File::Spec: '0' IO::File: '0' - List::Util: '0' Test::More: '0.62' lib: '0' - version: '0' configure_requires: ExtUtils::MakeMaker: '6.17' dynamic_config: 1 -generated_by: 'Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.133380' +generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.140640' license: apache meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -30,7 +28,7 @@ provides: Capture::Tiny: file: lib/Capture/Tiny.pm - version: '0.24' + version: '0.25' requires: Carp: '0' Exporter: '0' @@ -45,7 +43,8 @@ bugtracker: https://github.com/dagolden/Capture-Tiny/issues homepage: https://github.com/dagolden/Capture-Tiny repository: https://github.com/dagolden/Capture-Tiny.git -version: '0.24' +version: '0.25' x_authority: cpan:DAGOLDEN x_contributors: - 'Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org>' + - 'David E. Wheeler <david(a)justatheory.com>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/Makefile.PL new/Capture-Tiny-0.25/Makefile.PL --- old/Capture-Tiny-0.24/Makefile.PL 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/Makefile.PL 2014-08-16 16:08:48.000000000 +0200 @@ -1,5 +1,5 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.012. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.020. use strict; use warnings; @@ -12,7 +12,6 @@ my %WriteMakefileArgs = ( "ABSTRACT" => "Capture STDOUT and STDERR from Perl, XS or external programs", "AUTHOR" => "David Golden <dagolden\(a)cpan.org>", - "BUILD_REQUIRES" => {}, "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => "6.17" }, @@ -32,14 +31,12 @@ }, "TEST_REQUIRES" => { "ExtUtils::MakeMaker" => 0, - "File::Spec::Functions" => 0, + "File::Spec" => 0, "IO::File" => 0, - "List::Util" => 0, "Test::More" => "0.62", - "lib" => 0, - "version" => 0 + "lib" => 0 }, - "VERSION" => "0.24", + "VERSION" => "0.25", "test" => { "TESTS" => "t/*.t" } @@ -51,16 +48,13 @@ "Exporter" => 0, "ExtUtils::MakeMaker" => 0, "File::Spec" => 0, - "File::Spec::Functions" => 0, "File::Temp" => 0, "IO::File" => 0, "IO::Handle" => 0, - "List::Util" => 0, "Scalar::Util" => 0, "Test::More" => "0.62", "lib" => 0, "strict" => 0, - "version" => 0, "warnings" => 0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/README new/Capture-Tiny-0.25/README --- old/Capture-Tiny-0.24/README 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/README 2014-08-16 16:08:48.000000000 +0200 @@ -3,7 +3,7 @@ programs VERSION - version 0.24 + version 0.25 SYNOPSIS use Capture::Tiny ':all'; @@ -341,8 +341,10 @@ AUTHOR David Golden <dagolden(a)cpan.org> -CONTRIBUTOR - Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org> +CONTRIBUTORS + * Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org> + + * David E. Wheeler <david(a)justatheory.com> COPYRIGHT AND LICENSE This software is Copyright (c) 2009 by David Golden. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/cpanfile new/Capture-Tiny-0.25/cpanfile --- old/Capture-Tiny-0.24/cpanfile 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/cpanfile 2014-08-16 16:08:48.000000000 +0200 @@ -10,18 +10,15 @@ on 'test' => sub { requires "ExtUtils::MakeMaker" => "0"; - requires "File::Spec::Functions" => "0"; + requires "File::Spec" => "0"; requires "IO::File" => "0"; - requires "List::Util" => "0"; requires "Test::More" => "0.62"; requires "lib" => "0"; - requires "version" => "0"; }; on 'test' => sub { - recommends "CPAN::Meta" => "0"; - recommends "CPAN::Meta::Requirements" => "2.120900"; - recommends "Inline" => "0.50"; + recommends "CPAN::Meta" => "2.120900"; + recommends "Inline::C" => "0.50"; }; on 'configure' => sub { @@ -29,7 +26,7 @@ }; on 'develop' => sub { - requires "Dist::Zilla" => "5.012"; + requires "Dist::Zilla" => "5"; requires "Dist::Zilla::Plugin::OSPrereqs" => "0"; requires "Dist::Zilla::Plugin::Prereqs" => "0"; requires "Dist::Zilla::Plugin::RemovePrereqs" => "0"; @@ -43,4 +40,5 @@ requires "Test::More" => "0"; requires "Test::Pod" => "1.41"; requires "Test::Pod::Coverage" => "1.08"; + requires "Test::Spelling" => "0.12"; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/dist.ini new/Capture-Tiny-0.25/dist.ini --- old/Capture-Tiny-0.24/dist.ini 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/dist.ini 2014-08-16 16:08:48.000000000 +0200 @@ -24,7 +24,7 @@ remove = perl [Prereqs / TestRecommends] -Inline = 0.50 +Inline::C = 0.50 [Prereqs] perl = 5.006 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/lib/Capture/Tiny.pm new/Capture-Tiny-0.25/lib/Capture/Tiny.pm --- old/Capture-Tiny-0.24/lib/Capture/Tiny.pm 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/lib/Capture/Tiny.pm 2014-08-16 16:08:48.000000000 +0200 @@ -3,7 +3,7 @@ use warnings; package Capture::Tiny; # ABSTRACT: Capture STDOUT and STDERR from Perl, XS or external programs -our $VERSION = '0.24'; # VERSION +our $VERSION = '0.25'; # VERSION use Carp (); use Exporter (); use IO::Handle (); @@ -420,7 +420,7 @@ =head1 VERSION -version 0.24 +version 0.25 =head1 SYNOPSIS @@ -824,10 +824,22 @@ David Golden <dagolden(a)cpan.org> -=head1 CONTRIBUTOR +=head1 CONTRIBUTORS + +=for stopwords Dagfinn Ilmari Mannsåker David E. Wheeler + +=over 4 + +=item * Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org> +=item * + +David E. Wheeler <david(a)justatheory.com> + +=back + =head1 COPYRIGHT AND LICENSE This software is Copyright (c) 2009 by David Golden. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/t/00-report-prereqs.dd new/Capture-Tiny-0.25/t/00-report-prereqs.dd --- old/Capture-Tiny-0.24/t/00-report-prereqs.dd 1970-01-01 01:00:00.000000000 +0100 +++ new/Capture-Tiny-0.25/t/00-report-prereqs.dd 2014-08-16 16:08:48.000000000 +0200 @@ -0,0 +1,54 @@ +do { my $x = { + 'configure' => { + 'requires' => { + 'ExtUtils::MakeMaker' => '6.17' + } + }, + 'develop' => { + 'requires' => { + 'Dist::Zilla' => '5', + 'Dist::Zilla::Plugin::OSPrereqs' => '0', + 'Dist::Zilla::Plugin::Prereqs' => '0', + 'Dist::Zilla::Plugin::RemovePrereqs' => '0', + 'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.060', + 'File::Spec' => '0', + 'File::Temp' => '0', + 'IO::Handle' => '0', + 'IPC::Open3' => '0', + 'Pod::Coverage::TrustPod' => '0', + 'Test::CPAN::Meta' => '0', + 'Test::More' => '0', + 'Test::Pod' => '1.41', + 'Test::Pod::Coverage' => '1.08', + 'Test::Spelling' => '0.12' + } + }, + 'runtime' => { + 'requires' => { + 'Carp' => '0', + 'Exporter' => '0', + 'File::Spec' => '0', + 'File::Temp' => '0', + 'IO::Handle' => '0', + 'Scalar::Util' => '0', + 'perl' => '5.006', + 'strict' => '0', + 'warnings' => '0' + } + }, + 'test' => { + 'recommends' => { + 'CPAN::Meta' => '2.120900', + 'Inline::C' => '0.50' + }, + 'requires' => { + 'ExtUtils::MakeMaker' => '0', + 'File::Spec' => '0', + 'IO::File' => '0', + 'Test::More' => '0.62', + 'lib' => '0' + } + } + }; + $x; + } \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/t/00-report-prereqs.t new/Capture-Tiny-0.25/t/00-report-prereqs.t --- old/Capture-Tiny-0.24/t/00-report-prereqs.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/t/00-report-prereqs.t 2014-08-16 16:08:48.000000000 +0200 @@ -3,186 +3,172 @@ use strict; use warnings; -# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.013 +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.019 use Test::More tests => 1; use ExtUtils::MakeMaker; -use File::Spec::Functions; -use List::Util qw/max/; -use version; +use File::Spec; + +# from $version::LAX +my $lax_version_re = + qr/(?: undef | (?: (?:[0-9]+) (?: \. | (?:\.[0-9]+) (?:_[0-9]+)? )? + | + (?:\.[0-9]+) (?:_[0-9]+)? + ) | (?: + v (?:[0-9]+) (?: (?:\.[0-9]+)+ (?:_[0-9]+)? )? + | + (?:[0-9]+)? (?:\.[0-9]+){2,} (?:_[0-9]+)? + ) + )/x; # hide optional CPAN::Meta modules from prereq scanner # and check if they are available my $cpan_meta = "CPAN::Meta"; -my $cpan_meta_req = "CPAN::Meta::Requirements"; -my $HAS_CPAN_META = eval "require $cpan_meta"; ## no critic -my $HAS_CPAN_META_REQ = eval "require $cpan_meta_req; $cpan_meta_req->VERSION('2.120900')"; +my $cpan_meta_pre = "CPAN::Meta::Prereqs"; +my $HAS_CPAN_META = eval "require $cpan_meta; $cpan_meta->VERSION('2.120900')" && eval "require $cpan_meta_pre"; ## no critic # Verify requirements? my $DO_VERIFY_PREREQS = 1; -sub _merge_requires { +sub _max { + my $max = shift; + $max = ( $_ > $max ) ? $_ : $max for @_; + return $max; +} + +sub _merge_prereqs { my ($collector, $prereqs) = @_; - for my $phase ( qw/configure build test runtime develop/ ) { - next unless exists $prereqs->{$phase}; - if ( my $req = $prereqs->{$phase}{'requires'} ) { - my $cmr = CPAN::Meta::Requirements->from_string_hash( $req ); - $collector->add_requirements( $cmr ); + + # CPAN::Meta::Prereqs object + if (ref $collector eq $cpan_meta_pre) { + return $collector->with_merged_prereqs( + CPAN::Meta::Prereqs->new( $prereqs ) + ); + } + + # Raw hashrefs + for my $phase ( keys %$prereqs ) { + for my $type ( keys %{ $prereqs->{$phase} } ) { + for my $module ( keys %{ $prereqs->{$phase}{$type} } ) { + $collector->{$phase}{$type}{$module} = $prereqs->{$phase}{$type}{$module}; + } } } + + return $collector; } -my %include = map {; $_ => 1 } qw( +my @include = qw( ); -my %exclude = map {; $_ => 1 } qw( +my @exclude = qw( ); # Add static prereqs to the included modules list -my $static_prereqs = do { my $x = { - 'configure' => { - 'requires' => { - 'ExtUtils::MakeMaker' => '6.17' - } - }, - 'develop' => { - 'requires' => { - 'Dist::Zilla' => '5.012', - 'Dist::Zilla::Plugin::OSPrereqs' => '0', - 'Dist::Zilla::Plugin::Prereqs' => '0', - 'Dist::Zilla::Plugin::RemovePrereqs' => '0', - 'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.060', - 'File::Spec' => '0', - 'File::Temp' => '0', - 'IO::Handle' => '0', - 'IPC::Open3' => '0', - 'Pod::Coverage::TrustPod' => '0', - 'Test::CPAN::Meta' => '0', - 'Test::More' => '0', - 'Test::Pod' => '1.41', - 'Test::Pod::Coverage' => '1.08' - } - }, - 'runtime' => { - 'requires' => { - 'Carp' => '0', - 'Exporter' => '0', - 'File::Spec' => '0', - 'File::Temp' => '0', - 'IO::Handle' => '0', - 'Scalar::Util' => '0', - 'perl' => '5.006', - 'strict' => '0', - 'warnings' => '0' - } - }, - 'test' => { - 'recommends' => { - 'CPAN::Meta' => '0', - 'CPAN::Meta::Requirements' => '2.120900', - 'Inline' => '0.50' - }, - 'requires' => { - 'ExtUtils::MakeMaker' => '0', - 'File::Spec::Functions' => '0', - 'IO::File' => '0', - 'List::Util' => '0', - 'Test::More' => '0.62', - 'lib' => '0', - 'version' => '0' - } - } - }; - $x; - }; - -delete $static_prereqs->{develop} if not $ENV{AUTHOR_TESTING}; -$include{$_} = 1 for map { keys %$_ } map { values %$_ } values %$static_prereqs; - -# Merge requirements for major phases (if we can) -my $all_requires; -if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META_REQ ) { - $all_requires = $cpan_meta_req->new; - _merge_requires($all_requires, $static_prereqs); -} +my $static_prereqs = do 't/00-report-prereqs.dd'; +# Merge all prereqs (either with ::Prereqs or a hashref) +my $full_prereqs = _merge_prereqs( + ( $HAS_CPAN_META ? $cpan_meta_pre->new : {} ), + $static_prereqs +); # Add dynamic prereqs to the included modules list (if we can) my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml'; if ( $source && $HAS_CPAN_META ) { - if ( my $meta = eval { CPAN::Meta->load_file($source) } ) { - my $dynamic_prereqs = $meta->prereqs; - delete $dynamic_prereqs->{develop} if not $ENV{AUTHOR_TESTING}; - $include{$_} = 1 for map { keys %$_ } map { values %$_ } values %$dynamic_prereqs; - - if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META_REQ ) { - _merge_requires($all_requires, $dynamic_prereqs); + if ( my $meta = eval { CPAN::Meta->load_file($source) } ) { + $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); } - } } else { - $source = 'static metadata'; + $source = 'static metadata'; } -my @modules = sort grep { ! $exclude{$_} } keys %include; -my @reports = [qw/Version Module/]; +my @full_reports; my @dep_errors; -my $req_hash = defined($all_requires) ? $all_requires->as_string_hash : {}; +my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs; -for my $mod ( @modules ) { - next if $mod eq 'perl'; - my $file = $mod; - $file =~ s{::}{/}g; - $file .= ".pm"; - my ($prefix) = grep { -e catfile($_, $file) } @INC; - if ( $prefix ) { - my $ver = MM->parse_version( catfile($prefix, $file) ); - $ver = "undef" unless defined $ver; # Newer MM should do this anyway - push @reports, [$ver, $mod]; - - if ( $DO_VERIFY_PREREQS && $all_requires ) { - my $req = $req_hash->{$mod}; - if ( defined $req && length $req ) { - if ( ! defined eval { version->parse($ver) } ) { - push @dep_errors, "$mod version '$ver' cannot be parsed (version '$req' required)"; +# Add static includes into a fake section +for my $mod (@include) { + $req_hash->{other}{modules}{$mod} = 0; +} + +for my $phase ( qw(configure build test runtime develop other) ) { + next unless $req_hash->{$phase}; + next if ($phase eq 'develop' and not $ENV{AUTHOR_TESTING}); + + for my $type ( qw(requires recommends suggests conflicts modules) ) { + next unless $req_hash->{$phase}{$type}; + + my $title = ucfirst($phase).' '.ucfirst($type); + my @reports = [qw/Module Want Have/]; + + for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) { + next if $mod eq 'perl'; + next if grep { $_ eq $mod } @exclude; + + my $file = $mod; + $file =~ s{::}{/}g; + $file .= ".pm"; + my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC; + + my $want = $req_hash->{$phase}{$type}{$mod}; + $want = "undef" unless defined $want; + $want = "any" if !$want && $want == 0; + + my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required"; + + if ($prefix) { + my $have = MM->parse_version( File::Spec->catfile($prefix, $file) ); + $have = "undef" unless defined $have; + push @reports, [$mod, $want, $have]; + + if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META && $type eq 'requires' ) { + if ( $have !~ /\A$lax_version_re\z/ ) { + push @dep_errors, "$mod version '$have' cannot be parsed ($req_string)"; + } + elsif ( ! $full_prereqs->requirements_for( $phase, $type )->accepts_module( $mod => $have ) ) { + push @dep_errors, "$mod version '$have' is not in required range '$want'"; + } + } + } + else { + push @reports, [$mod, $want, "missing"]; + + if ( $DO_VERIFY_PREREQS && $type eq 'requires' ) { + push @dep_errors, "$mod is not installed ($req_string)"; + } + } } - elsif ( ! $all_requires->accepts_module( $mod => $ver ) ) { - push @dep_errors, "$mod version '$ver' is not in required range '$req'"; - } - } - } - } - else { - push @reports, ["missing", $mod]; - - if ( $DO_VERIFY_PREREQS && $all_requires ) { - my $req = $req_hash->{$mod}; - if ( defined $req && length $req ) { - push @dep_errors, "$mod is not installed (version '$req' required)"; - } + if ( @reports ) { + push @full_reports, "=== $title ===\n\n"; + + my $ml = _max( map { length $_->[0] } @reports ); + my $wl = _max( map { length $_->[1] } @reports ); + my $hl = _max( map { length $_->[2] } @reports ); + splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl]; + + push @full_reports, map { sprintf(" %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports; + push @full_reports, "\n"; + } } - } } -if ( @reports ) { - my $vl = max map { length $_->[0] } @reports; - my $ml = max map { length $_->[1] } @reports; - splice @reports, 1, 0, ["-" x $vl, "-" x $ml]; - diag "\nVersions for all modules listed in $source (including optional ones):\n", - map {sprintf(" %*s %*s\n",$vl,$_->[0],-$ml,$_->[1])} @reports; +if ( @full_reports ) { + diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports; } if ( @dep_errors ) { - diag join("\n", - "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n", - "The following REQUIRED prerequisites were not satisfied:\n", - @dep_errors, - "\n" - ); + diag join("\n", + "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n", + "The following REQUIRED prerequisites were not satisfied:\n", + @dep_errors, + "\n" + ); } pass; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/author/00-compile.t new/Capture-Tiny-0.25/xt/author/00-compile.t --- old/Capture-Tiny-0.24/xt/author/00-compile.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/author/00-compile.t 2014-08-16 16:08:48.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use warnings; -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.039 +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.045 use Test::More tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/author/pod-spell.t new/Capture-Tiny-0.25/xt/author/pod-spell.t --- old/Capture-Tiny-0.24/xt/author/pod-spell.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/author/pod-spell.t 2014-08-16 16:08:48.000000000 +0200 @@ -2,7 +2,7 @@ use warnings; use Test::More; -# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006002 +# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006008 use Test::Spelling 0.12; use Pod::Wordlist; @@ -22,6 +22,8 @@ Ilmari Mannsåker ilmari +Wheeler +david lib Capture Tiny diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/release/distmeta.t new/Capture-Tiny-0.25/xt/release/distmeta.t --- old/Capture-Tiny-0.24/xt/release/distmeta.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/release/distmeta.t 2014-08-16 16:08:48.000000000 +0200 @@ -1,8 +1,6 @@ #!perl # This file was automatically generated by Dist::Zilla::Plugin::MetaTests. -use Test::More; +use Test::CPAN::Meta; -eval "use Test::CPAN::Meta"; -plan skip_all => "Test::CPAN::Meta required for testing META.yml" if $@; meta_yaml_ok(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/release/pod-coverage.t new/Capture-Tiny-0.25/xt/release/pod-coverage.t --- old/Capture-Tiny-0.24/xt/release/pod-coverage.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/release/pod-coverage.t 2014-08-16 16:08:48.000000000 +0200 @@ -1,14 +1,7 @@ #!perl # This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests. -use Test::More; - -eval "use Test::Pod::Coverage 1.08"; -plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" - if $@; - -eval "use Pod::Coverage::TrustPod"; -plan skip_all => "Pod::Coverage::TrustPod required for testing POD coverage" - if $@; +use Test::Pod::Coverage 1.08; +use Pod::Coverage::TrustPod; all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/release/pod-syntax.t new/Capture-Tiny-0.25/xt/release/pod-syntax.t --- old/Capture-Tiny-0.24/xt/release/pod-syntax.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/release/pod-syntax.t 2014-08-16 16:08:48.000000000 +0200 @@ -1,8 +1,6 @@ #!perl # This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. use Test::More; - -eval "use Test::Pod 1.41"; -plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; +use Test::Pod 1.41; all_pod_files_ok(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Switch for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-Switch for openSUSE:Factory checked in at 2014-09-17 17:24:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Switch (Old) and /work/SRC/openSUSE:Factory/.perl-Switch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Switch" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Switch/perl-Switch.changes 2011-09-23 12:38:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Switch.new/perl-Switch.changes 2014-09-17 17:24:35.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 15 15:44:32 UTC 2014 - coolo(a)suse.com + +- updated to 2.17 + - tests fixed + - patch by Father Chrysostomos + - many warnings + - recommendation to use given/when +- removed upstreamed Switch-2.16-perl514.patch + +------------------------------------------------------------------- Old: ---- Switch-2.16-perl514.patch Switch-2.16.tar.gz New: ---- Switch-2.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Switch.spec ++++++ --- /var/tmp/diff_new_pack.xrVZyn/_old 2014-09-17 17:24:36.000000000 +0200 +++ /var/tmp/diff_new_pack.xrVZyn/_new 2014-09-17 17:24:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Switch # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,21 @@ # - Name: perl-Switch -Version: 2.16 -Release: 4 -License: GPL-1.0+ or Artistic-1.0 +Version: 2.17 +Release: 0 %define cpan_name Switch -Summary: A switch statement for Perl -Url: http://search.cpan.org/dist/Switch/ +Summary: A switch statement for Perl, do not use if you can use given/when +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -Source: http://www.cpan.org/authors/id/R/RG/RGARCIA/%{cpan_name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Switch-2.16-perl514.patch idoenmez(a)suse.de -- Fix test failures with Perl 5.14, RT #60380 -Patch1: Switch-2.16-perl514.patch +Url: http://search.cpan.org/dist/Switch/ +Source: http://www.cpan.org/authors/id/C/CH/CHORNY/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(Text::Balanced) >= 2 +Requires: perl(Text::Balanced) >= 2 %{perl_requires} %description @@ -47,9 +46,63 @@ (including the 'case' statement described below). The block is unconditionally executed once the switch value has been cached. +A 'case' statement takes a single scalar argument (in mandatory parentheses +if it's a variable; otherwise the parens are optional) and selects the +appropriate type of matching between that argument and the current switch +value. The type of matching used is determined by the respective types of +the switch value and the 'case' argument, as specified in Table 1. If the +match is successful, the mandatory block associated with the 'case' +statement is executed. + +In most other respects, the 'case' statement is semantically identical to +an 'if' statement. For example, it can be followed by an 'else' clause, and +can be used as a postfix statement qualifier. + +However, when a 'case' block has been executed control is automatically +transferred to the statement after the immediately enclosing 'switch' +block, rather than to the next statement within the block. In other words, +the success of any 'case' statement prevents other cases in the same scope +from executing. But see the "Allowing fall-through" manpage below. + +Together these two new statements provide a fully generalized case +mechanism: + + use Switch; + + # AND LATER... + + %special = ( woohoo => 1, d'oh => 1 ); + + while (<>) { + chomp; + switch ($_) { + case (%special) { print "homer\n"; } # if $special{$_} + case /[a-z]/i { print "alpha\n"; } # if $_ =~ /a-z/i + case [1..9] { print "small num\n"; } # if $_ in [1..9] + case { $_[0] >= 10 } { print "big num\n"; } # if $_ >= 10 + print "must be punctuation\n" case /\W/; # if $_ ~= /\W/ + } + } + +Note that 'switch'es can be nested within 'case' (or any other) blocks, and +a series of 'case' statements can try different types of matches -- hash +membership, pattern match, array intersection, simple equality, etc. -- +against the same switch value. + +The use of intersection tests against an array reference is particularly +useful for aggregating integral cases: + + sub classify_digit + { + switch ($_[0]) { case 0 { return 'zero' } + case [2,4,6,8] { return 'even' } + case [1,3,5,7,9] { return 'odd' } + case /[A-F]/i { return 'hex' } + } + } + %prep %setup -q -n %{cpan_name}-%{version} -%patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -63,9 +116,6 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Changes README ++++++ Switch-2.16.tar.gz -> Switch-2.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/Changes new/Switch-2.17/Changes --- old/Switch-2.16/Changes 2009-10-23 09:52:51.000000000 +0200 +++ new/Switch-2.17/Changes 2014-03-18 13:21:21.000000000 +0100 @@ -119,3 +119,8 @@ 2.16 Fri Oct 23 2009 - For Perl 5.11+, install into 'site', not 'perl' +2.17 2014-03-18 + - tests fixed + - patch by Father Chrysostomos + - many warnings + - recommendation to use given/when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/MANIFEST new/Switch-2.17/MANIFEST --- old/Switch-2.16/MANIFEST 2009-10-23 09:52:51.000000000 +0200 +++ new/Switch-2.17/MANIFEST 2014-03-18 13:28:27.000000000 +0100 @@ -7,3 +7,4 @@ t/nested.t t/switch.t META.yml Module meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/META.json new/Switch-2.17/META.json --- old/Switch-2.16/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Switch-2.17/META.json 2014-03-18 13:28:27.000000000 +0100 @@ -0,0 +1,51 @@ +{ + "abstract" : "A switch statement for Perl, do not use if you can use given/when", + "author" : [ + "Damian Conway", + "Rafael Garcia-Suarez", + "Alexandr Ciornii" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.78, CPAN::Meta::Converter version 2.131490", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Switch", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : { + "Filter::Util::Call" : "0", + "Text::Balanced" : "2", + "if" : "0", + "perl" : "5.005" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "http://github.com/chorny/Switch" + } + }, + "version" : "2.17" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/META.yml new/Switch-2.17/META.yml --- old/Switch-2.16/META.yml 2009-10-23 09:53:25.000000000 +0200 +++ new/Switch-2.17/META.yml 2014-03-18 13:28:25.000000000 +0100 @@ -1,14 +1,29 @@ ---- #YAML:1.0 -name: Switch -version: 2.16 -abstract: ~ -license: ~ -author: ~ -generated_by: ExtUtils::MakeMaker version 6.42 -distribution_type: module -requires: - Filter::Util::Call: 0 - Text::Balanced: 0 -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.3.html - version: 1.3 +--- +abstract: 'A switch statement for Perl, do not use if you can use given/when' +author: + - Damian Conway + - Rafael Garcia-Suarez + - Alexandr Ciornii +build_requires: + ExtUtils::MakeMaker: 0 +configure_requires: + ExtUtils::MakeMaker: 0 +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.78, CPAN::Meta::Converter version 2.131490' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Switch +no_index: + directory: + - t + - inc +requires: + Filter::Util::Call: 0 + Text::Balanced: 2 + if: 0 + perl: 5.005 +resources: + repository: http://github.com/chorny/Switch +version: 2.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/Makefile.PL new/Switch-2.17/Makefile.PL --- old/Switch-2.16/Makefile.PL 2009-10-23 09:52:51.000000000 +0200 +++ new/Switch-2.17/Makefile.PL 2014-03-18 13:28:17.000000000 +0100 @@ -1,7 +1,54 @@ -use ExtUtils::MakeMaker; -WriteMakefile( - NAME => q[Switch], - VERSION_FROM => q[Switch.pm], - PREREQ_PM => { 'Filter::Util::Call' => 0, 'Text::Balanced' => 0 }, - INSTALLDIRS => ($] >= 5.00703 && $] < 5.011) ? 'perl' : 'site', -); +use ExtUtils::MakeMaker; +WriteMakefile1( + LICENSE => 'perl', + MIN_PERL_VERSION => '5.005', + META_MERGE => { + resources => { + repository => 'http://github.com/chorny/Switch', + }, + }, + #BUILD_REQUIRES => { + #}, + + NAME => q[Switch], + VERSION_FROM => q[Switch.pm], + ABSTRACT_FROM => => q[Switch.pm], + AUTHOR => ['Damian Conway', 'Rafael Garcia-Suarez', 'Alexandr Ciornii'], + PREREQ_PM => { 'Filter::Util::Call' => 0, 'Text::Balanced' => 2, 'if' => 0, }, + INSTALLDIRS => ($] >= 5.00703 && $] < 5.011) ? 'perl' : 'site', + $^O =~/win/i ? ( + dist => { + TAR => 'ptar', + TARFLAGS => '-c -C -f', + }, + ) : (), +); + +sub WriteMakefile1 { #Compatibility code for old versions of EU::MM. Written by Alexandr Ciornii, version 0.23. Added by eumm-upgrade. + my %params=@_; + my $eumm_version=$ExtUtils::MakeMaker::VERSION; + $eumm_version=eval $eumm_version; + die "EXTRA_META is deprecated" if exists $params{EXTRA_META}; + die "License not specified" if not exists $params{LICENSE}; + if ($params{AUTHOR} and ref($params{AUTHOR}) eq 'ARRAY' and $eumm_version < 6.5705) { + $params{META_ADD}->{author}=$params{AUTHOR}; + $params{AUTHOR}=join(', ',@{$params{AUTHOR}}); + } + if ($params{TEST_REQUIRES} and $eumm_version < 6.64) { + $params{BUILD_REQUIRES}={ %{$params{BUILD_REQUIRES} || {}} , %{$params{TEST_REQUIRES}} }; + delete $params{TEST_REQUIRES}; + } + if ($params{BUILD_REQUIRES} and $eumm_version < 6.5503) { + #EUMM 6.5502 has problems with BUILD_REQUIRES + $params{PREREQ_PM}={ %{$params{PREREQ_PM} || {}} , %{$params{BUILD_REQUIRES}} }; + delete $params{BUILD_REQUIRES}; + } + delete $params{CONFIGURE_REQUIRES} if $eumm_version < 6.52; + delete $params{MIN_PERL_VERSION} if $eumm_version < 6.48; + delete $params{META_MERGE} if $eumm_version < 6.46; + delete $params{META_ADD} if $eumm_version < 6.46; + delete $params{LICENSE} if $eumm_version < 6.31; + + WriteMakefile(%params); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/README new/Switch-2.17/README --- old/Switch-2.16/README 2009-10-23 09:52:51.000000000 +0200 +++ new/Switch-2.17/README 2014-03-18 13:23:01.000000000 +0100 @@ -1,10 +1,10 @@ ============================================================================== - Release of version 2.16 of Switch + Release of version 2.17 of Switch ============================================================================== NAME - Switch - A switch statement for Perl + Switch - A switch statement for Perl, do not use if you can use given/when DESCRIPTION @@ -17,8 +17,8 @@ AUTHOR Damian Conway (damian(a)conway.org) - Maintained by Rafael Garcia-Suarez (rgarciasuarez(a)gmail.com) - and the Perl 5 porters (perl5-porters(a)gmail.com) + Maintained by Alexandr Ciornii (alexchorny(a)gmail.com) + Previously was maintained by Rafael Garcia-Suarez and perl5 porters. COPYRIGHT Copyright (c) 1997-2008, Damian Conway. All Rights Reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/Switch.pm new/Switch-2.17/Switch.pm --- old/Switch-2.16/Switch.pm 2009-10-23 09:52:51.000000000 +0200 +++ new/Switch-2.17/Switch.pm 2014-03-18 13:24:00.000000000 +0100 @@ -1,12 +1,13 @@ package Switch; +use 5.005; use strict; use vars qw($VERSION); use Carp; use if $] >= 5.011, 'deprecate'; -$VERSION = '2.16'; +$VERSION = '2.17'; # LOAD FILTERING MODULE... @@ -146,7 +147,7 @@ die "Bad $keyword statement (problem in the code block?) near $Switch::file line ", line(substr($source,0, pos $source), $line), "\n"; }; my $code = filter_blocks(substr($source,$pos[0],$pos[4]-$pos[0]),line(substr($source,0,$pos[0]),$line)); - $code =~ s/{/{ local \$::_S_W_I_T_C_H; Switch::switch $arg;/; + $code =~ s/{/{ local \$::_S_W_I_T_C_H; Switch::switch($arg);/; $text .= $code . 'continue {last}'; next component; } @@ -506,7 +507,7 @@ =head1 NAME -Switch - A switch statement for Perl +Switch - A switch statement for Perl, do not use if you can use given/when =head1 SYNOPSIS @@ -841,15 +842,22 @@ =head1 AUTHOR -Damian Conway (damian(a)conway.org) This module is now maintained by Rafael -Garcia-Suarez (rgarciasuarez(a)gmail.com) and more generally by the Perl 5 -Porters (perl5-porters(a)perl.org) as part of the Perl core. +Damian Conway (damian(a)conway.org) This module is now maintained by +Alexandr Ciornii (alexchorny(a)gmail.com) Previously was maintained by +Rafael Garcia-Suarez and perl5 porters. =head1 BUGS There are undoubtedly serious bugs lurking somewhere in code this funky :-) Bug reports and other feedback are most welcome. +May create syntax errors in other parts of code. + +On perl 5.10.x may cause syntax error if "case" is present inside heredoc. + +In general, use given/when instead. It were introduced in perl 5.10.0. +Perl 5.10.0 was released in 2007. + =head1 LIMITATIONS Due to the heuristic nature of Switch.pm's source parsing, the presence of @@ -863,6 +871,10 @@ Due to the way source filters work in Perl, you can't use Switch inside an string C<eval>. +May not work if sub prototypes are used (RT#33988). + +Regex captures in when are not available to code. + If your source file is longer then 1 million characters and you have a switch statement that crosses the 1 million (or 2 million, etc.) character boundary you will get mysterious errors. The workaround is to @@ -873,3 +885,4 @@ Copyright (c) 1997-2008, Damian Conway. All Rights Reserved. This module is free software. It may be used, redistributed and/or modified under the same terms as Perl itself. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Switch-2.16/t/given.t new/Switch-2.17/t/given.t --- old/Switch-2.16/t/given.t 2009-10-23 09:52:51.000000000 +0200 +++ new/Switch-2.17/t/given.t 2014-03-17 13:52:30.000000000 +0100 @@ -16,11 +16,11 @@ # H.O. FUNCS -given __ > 2 { +given 2 { - when 1 { ok(0) } else { ok(1) } - when 2 { ok(0) } else { ok(1) } - when 3 { ok(1) } else { ok(0) } + when __ < 1 { ok(0) } else { ok(1) } + when __ < 2 { ok(0) } else { ok(1) } + when __ < 3 { ok(1) } else { ok(0) } } given (3) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-XML-Twig for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-XML-Twig for openSUSE:Factory checked in at 2014-09-17 17:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-XML-Twig (Old) and /work/SRC/openSUSE:Factory/.perl-XML-Twig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-XML-Twig" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-XML-Twig/perl-XML-Twig.changes 2014-03-22 18:02:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-XML-Twig.new/perl-XML-Twig.changes 2014-09-17 17:24:33.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 15 15:15:20 UTC 2014 - coolo(a)suse.com + +- updated to 3.48 + - fixed: missing entities when parsing HTML + RT #93604 https://rt.cpan.org/Public/Bug/Display.html?id=93604 + + - fixed: tests failed when using a version of HTML::TreeBuilder with a non-numeric version + + - fixed in twig_handlers, '=' in regexps on attributes are turned into 'eq' + RT #94295 https://rt.cpan.org/Public/Bug/Display.html?id=94295 + + - fixed: test failed on Windows + +------------------------------------------------------------------- Old: ---- XML-Twig-3.46.tar.gz New: ---- XML-Twig-3.48.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-XML-Twig.spec ++++++ --- /var/tmp/diff_new_pack.X6fJn4/_old 2014-09-17 17:24:34.000000000 +0200 +++ /var/tmp/diff_new_pack.X6fJn4/_new 2014-09-17 17:24:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-XML-Twig -Version: 3.46 +Version: 3.48 Release: 0 %define cpan_name XML-Twig Summary: A perl module for processing huge XML documents in tree mode. ++++++ XML-Twig-3.46.tar.gz -> XML-Twig-3.48.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/Changes new/XML-Twig-3.48/Changes --- old/XML-Twig-3.46/Changes 2014-03-03 15:08:40.000000000 +0100 +++ new/XML-Twig-3.48/Changes 2014-03-30 08:22:48.000000000 +0200 @@ -1,5 +1,23 @@ CHANGES +3.48 - 2014-03-30 - minor maintenance release + +- fixed tests + +3.47 - 2014-03-27 - minor maintenance release + +- fixed: missing entities when parsing HTML + RT #93604 https://rt.cpan.org/Public/Bug/Display.html?id=93604 + +- fixed: tests failed when using a version of HTML::TreeBuilder with a non-numeric version + +- fixed in twig_handlers, '=' in regexps on attributes are turned into 'eq' + RT #94295 https://rt.cpan.org/Public/Bug/Display.html?id=94295 + +3.46 - 2014-03-05 - minor maintenance release + +- fixed: test failed on Windows + 3.45 - 2014-02-27 - minor maintenance release - fixed: link to idented_a format description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/MANIFEST new/XML-Twig-3.48/MANIFEST --- old/XML-Twig-3.46/MANIFEST 2014-03-05 11:27:46.000000000 +0100 +++ new/XML-Twig-3.48/MANIFEST 2014-03-30 10:54:19.000000000 +0200 @@ -128,6 +128,7 @@ t/test_3_42.t t/test_3_44.t t/test_3_45.t +t/test_3_47.t t/test_changes.t t/test_memory.t t/test_wrapped.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/META.json new/XML-Twig-3.48/META.json --- old/XML-Twig-3.46/META.json 2014-03-05 11:27:46.000000000 +0100 +++ new/XML-Twig-3.48/META.json 2014-03-30 10:54:19.000000000 +0200 @@ -42,5 +42,5 @@ "url" : "http://github.com/mirod/xmltwig" } }, - "version" : "3.46" + "version" : "3.48" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/META.yml new/XML-Twig-3.48/META.yml --- old/XML-Twig-3.46/META.yml 2014-03-05 11:27:46.000000000 +0100 +++ new/XML-Twig-3.48/META.yml 2014-03-30 10:54:19.000000000 +0200 @@ -21,4 +21,4 @@ XML::Parser: 2.23 resources: repository: http://github.com/mirod/xmltwig -version: 3.46 +version: 3.48 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/Twig.pm new/XML-Twig-3.48/Twig.pm --- old/XML-Twig-3.46/Twig.pm 2014-03-03 17:10:25.000000000 +0100 +++ new/XML-Twig-3.48/Twig.pm 2014-03-30 10:54:15.000000000 +0200 @@ -144,7 +144,7 @@ BEGIN { -$VERSION = '3.46'; +$VERSION = '3.48'; use XML::Parser; my $needVersion = '2.23'; @@ -154,7 +154,7 @@ ($perl_version= $])=~ s{_\d+}{}; if( $perl_version >= 5.008) - { eval "use Encode qw( :all)"; + { eval "use Encode qw( :all)"; ## no critic ProhibitStringyEval $FB_XMLCREF = 0x0400; # Encode::FB_XMLCREF; $FB_HTMLCREF = 0x0200; # Encode::FB_HTMLCREF; } @@ -996,6 +996,7 @@ $xml.= _as_XML( $tree); + _fix_xml( $tree, \$xml); if( $options->{indent}) { _indent_xhtml( \$xml); } @@ -1142,7 +1143,7 @@ if( $new_att ne $att) { $node->{$new_att}= delete $node->{$att}; } } - if ( $empty_element_map->{$tag} and !@{ $node->{'_content'} || []} ) + if ( $empty_element_map->{$tag} && (!@{ $node->{'_content'} || []}) ) { $xml.= $node->starttag_XML( undef, 1 ); } else { $xml.= $node->starttag_XML(undef); } @@ -1175,7 +1176,9 @@ ) ) } - {&}gx; # Needs to be escaped to amp + {&}gx if 0; # Needs to be escaped to amp + + $html=~ s{&}{&}g; # in old versions of HTML::TreeBuilder & can come out as &Amp; if( $HTML::TreeBuilder::VERSION && $HTML::TreeBuilder::VERSION <= 3.23) { $html=~ s{&Amp;}{&}g; } @@ -1299,7 +1302,7 @@ $version ||= 0; if( $disallowed{$module}) { return 0; } if( $used{$module}) { return 1; } - if( eval "require $module") { import $module; $used{$module}= 1; + if( eval "require $module") { import $module; $used{$module}= 1; # no critic ProhibitStringyEval if( $version) { ## no critic (TestingAndDebugging::ProhibitNoStrict); @@ -1316,7 +1319,7 @@ # used to solve the [n] predicates while avoiding getting the entire list # needs a prototype to accept passing bare blocks -sub _first_n(&$@) ## nocritic (Subroutines::ProhibitSubroutinePrototypes); +sub _first_n(&$@) ## no critic (Subroutines::ProhibitSubroutinePrototypes); { my $coderef= shift; my $n= shift; my $i=0; @@ -1762,7 +1765,8 @@ sub _parse_predicate_in_handler { my( $flag, $score)= @_[1..2]; $_[0]=~ s{( ($REG_STRING) # strings - |\@($REG_TAG_NAME)(?=\s*(?:[><=!]|!~|=~)) # @att (followed by a comparison operator) + |\@($REG_TAG_NAME)(\s* $REG_MATCH \s* $REG_REGEXP) # @att and regexp + |\@($REG_TAG_NAME)(?=\s*(?:[><=!])) # @att followed by a comparison operator |\@($REG_TAG_NAME) # @att (not followed by a comparison operator) |=~|!~ # matching operators |([><]=?|=|!=)(?=\s*[\d+-]) # test before a number @@ -1777,8 +1781,8 @@ |($REG_TAG_IN_PREDICATE) # nested tag name (needs to be after all other unquoted strings) )} - { my( $token, $str, $att, $bare_att, $num_test, $alpha_test, $func, $str_regexp, $str_test_alpha, $str_test_num, $and_or, $tag) - = ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12); + { my( $token, $str, $att_re_name, $att_re_regexp, $att, $bare_att, $num_test, $alpha_test, $func, $str_regexp, $str_test_alpha, $str_test_num, $and_or, $tag) + = ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14); $score->{predicates}++; @@ -1790,6 +1794,9 @@ elsif( $att) { $att=~ m{^#} ? qq{ (\$elt->{'$ST_ELT'} && \$elt->{'$ST_ELT'}->{att}->{'$att'})} : qq{\$elt->{'$att'}} } + elsif( $att_re_name) { $att_re_name=~ m{^#} ? qq{ (\$elt->{'$ST_ELT'} && \$elt->{'$ST_ELT'}->{att}->{'$att_re_name'}$att_re_regexp)} + : qq{\$elt->{'$att_re_name'}$att_re_regexp} + } # for some reason Devel::Cover flags the following lines as not tested. They are though. elsif( $bare_att) { $bare_att=~ m{^#} ? qq{(\$elt->{'$ST_ELT'} && defined(\$elt->{'$ST_ELT'}->{att}->{'$bare_att'}))} : qq{defined( \$elt->{'$bare_att'})} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/Twig_pm.slow new/XML-Twig-3.48/Twig_pm.slow --- old/XML-Twig-3.46/Twig_pm.slow 2014-03-03 15:18:33.000000000 +0100 +++ new/XML-Twig-3.48/Twig_pm.slow 2014-03-30 10:50:04.000000000 +0200 @@ -144,7 +144,7 @@ BEGIN { -$VERSION = '3.46'; +$VERSION = '3.48'; use XML::Parser; my $needVersion = '2.23'; @@ -154,7 +154,7 @@ ($perl_version= $])=~ s{_\d+}{}; if( $perl_version >= 5.008) - { eval "use Encode qw( :all)"; + { eval "use Encode qw( :all)"; ## no critic ProhibitStringyEval $FB_XMLCREF = 0x0400; # Encode::FB_XMLCREF; $FB_HTMLCREF = 0x0200; # Encode::FB_HTMLCREF; } @@ -996,6 +996,7 @@ $xml.= _as_XML( $tree); + _fix_xml( $tree, \$xml); if( $options->{indent}) { _indent_xhtml( \$xml); } @@ -1142,7 +1143,7 @@ if( $new_att ne $att) { $node->{$new_att}= delete $node->{$att}; } } - if ( $empty_element_map->{$tag} and !@{ $node->{'_content'} || []} ) + if ( $empty_element_map->{$tag} && (!@{ $node->{'_content'} || []}) ) { $xml.= $node->starttag_XML( undef, 1 ); } else { $xml.= $node->starttag_XML(undef); } @@ -1175,7 +1176,9 @@ ) ) } - {&}gx; # Needs to be escaped to amp + {&}gx if 0; # Needs to be escaped to amp + + $html=~ s{&}{&}g; # in old versions of HTML::TreeBuilder & can come out as &Amp; if( $HTML::TreeBuilder::VERSION && $HTML::TreeBuilder::VERSION <= 3.23) { $html=~ s{&Amp;}{&}g; } @@ -1299,7 +1302,7 @@ $version ||= 0; if( $disallowed{$module}) { return 0; } if( $used{$module}) { return 1; } - if( eval "require $module") { import $module; $used{$module}= 1; + if( eval "require $module") { import $module; $used{$module}= 1; # no critic ProhibitStringyEval if( $version) { ## no critic (TestingAndDebugging::ProhibitNoStrict); @@ -1316,7 +1319,7 @@ # used to solve the [n] predicates while avoiding getting the entire list # needs a prototype to accept passing bare blocks -sub _first_n(&$@) ## nocritic (Subroutines::ProhibitSubroutinePrototypes); +sub _first_n(&$@) ## no critic (Subroutines::ProhibitSubroutinePrototypes); { my $coderef= shift; my $n= shift; my $i=0; @@ -1762,7 +1765,8 @@ sub _parse_predicate_in_handler { my( $flag, $score)= @_[1..2]; $_[0]=~ s{( ($REG_STRING) # strings - |\@($REG_TAG_NAME)(?=\s*(?:[><=!]|!~|=~)) # @att (followed by a comparison operator) + |\@($REG_TAG_NAME)(\s* $REG_MATCH \s* $REG_REGEXP) # @att and regexp + |\@($REG_TAG_NAME)(?=\s*(?:[><=!])) # @att followed by a comparison operator |\@($REG_TAG_NAME) # @att (not followed by a comparison operator) |=~|!~ # matching operators |([><]=?|=|!=)(?=\s*[\d+-]) # test before a number @@ -1777,8 +1781,8 @@ |($REG_TAG_IN_PREDICATE) # nested tag name (needs to be after all other unquoted strings) )} - { my( $token, $str, $att, $bare_att, $num_test, $alpha_test, $func, $str_regexp, $str_test_alpha, $str_test_num, $and_or, $tag) - = ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12); + { my( $token, $str, $att_re_name, $att_re_regexp, $att, $bare_att, $num_test, $alpha_test, $func, $str_regexp, $str_test_alpha, $str_test_num, $and_or, $tag) + = ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14); $score->{predicates}++; @@ -1790,6 +1794,9 @@ elsif( $att) { $att=~ m{^#} ? qq{ (\$elt->{'$ST_ELT'} && \$elt->{'$ST_ELT'}->{att}->{'$att'})} : qq{\$elt->{'$att'}} } + elsif( $att_re_name) { $att_re_name=~ m{^#} ? qq{ (\$elt->{'$ST_ELT'} && \$elt->{'$ST_ELT'}->{att}->{'$att_re_name'}$att_re_regexp)} + : qq{\$elt->{'$att_re_name'}$att_re_regexp} + } # for some reason Devel::Cover flags the following lines as not tested. They are though. elsif( $bare_att) { $bare_att=~ m{^#} ? qq{(\$elt->{'$ST_ELT'} && defined(\$elt->{'$ST_ELT'}->{att}->{'$bare_att'}))} : qq{defined( \$elt->{'$bare_att'})} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/t/test_3_47.t new/XML-Twig-3.48/t/test_3_47.t --- old/XML-Twig-3.46/t/test_3_47.t 1970-01-01 01:00:00.000000000 +0100 +++ new/XML-Twig-3.48/t/test_3_47.t 2014-03-30 08:20:18.000000000 +0200 @@ -0,0 +1,45 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use XML::Twig; +use Test::More tests => 3; + +use utf8; + +# test CDATA sections in HTML escaping https://rt.cpan.org/Ticket/Display.html?id=86773 + + # module => XML::Twig->new options +my %html_conv= ( 'HTML::TreeBuilder' => {}, + 'HTML::Tidy' => { use_tidy => 1 }, + ); +foreach my $module ( sort keys %html_conv) + { SKIP: + { eval "use $module"; + skip "$module not available", 1 if 1 ; + + my $in = q{<h1>Here&there v&r;</h1><p>marco&company; and marco&company £ £ £ £</p>}; + my $expected= q{<h1>Here&there v&r;</h1><p>marco&company; and marco&company £ £ £ £</p>}; + + my $parser= XML::Twig->new( %{$html_conv{$module}}); + my $t = $parser->safe_parse_html($in); + print $@ if $@; + + like $t->sprint, qr{\Q$expected\E}, "In and out are the same ($module)"; + + } + } + +{ # test RT #94295 https://rt.cpan.org/Public/Bug/Display.html?id=94295 + # in twig_handlers, '=' in regexps on attributes are turned into 'eq' + my $xml= '<doc><e dn="foo=1 host=0">e1</e><e dn="foo=1 host=2">e2</e></doc>'; + my $r; + my $t= XML::Twig->new( twig_handlers => { 'e[@dn =~ /host=0/]' => sub { $r.= $_->text } }) + ->parse( $xml); + is( $r, 'e1', 'regexp on attribute, including an = sign'); +} +exit; + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/t/test_changes.t new/XML-Twig-3.48/t/test_changes.t --- old/XML-Twig-3.46/t/test_changes.t 2014-03-03 15:12:48.000000000 +0100 +++ new/XML-Twig-3.48/t/test_changes.t 2014-03-29 11:11:40.000000000 +0100 @@ -3,5 +3,5 @@ use Test::More; eval 'use Test::CPAN::Changes'; plan skip_all => 'Test::CPAN::Changes required for this test' if $@; -plan skip_all => 'uthor test. Set $ENV{TEST_AUTHOR} to a true value to run.' if ! $ENV{TEST_AUTHOR}; +plan skip_all => 'Author test. Set $ENV{TEST_AUTHOR} to a true value to run.' if ! $ENV{TEST_AUTHOR}; changes_ok(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/t/test_xml_split.t new/XML-Twig-3.48/t/test_xml_split.t --- old/XML-Twig-3.46/t/test_xml_split.t 2012-05-17 12:24:59.000000000 +0200 +++ new/XML-Twig-3.48/t/test_xml_split.t 2014-03-27 16:17:12.000000000 +0100 @@ -91,7 +91,7 @@ sub test_error { my( $command, $options, $expected)= @_; my( $stdout, $stderr, $success, $exit_code) = IO::CaptureOutput::capture_exec( "$perl $command $options test_xml_split.xml"); - matches( $stderr, qr/^$expected/, "$command $options"); + matches( $stderr, qr/$expected/, "$command $options"); } sub test_out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-Twig-3.46/tools/xml_grep/xml_grep new/XML-Twig-3.48/tools/xml_grep/xml_grep --- old/XML-Twig-3.46/tools/xml_grep/xml_grep 2012-05-17 12:24:59.000000000 +0200 +++ new/XML-Twig-3.48/tools/xml_grep/xml_grep 2014-03-28 12:21:29.000000000 +0100 @@ -12,7 +12,8 @@ $count, $nb_results, $nb_results_per_file, $encoding, @exclude, $wrap, $nowrap, $descr, $group, $pretty_print, $version, $text_only, $date, - $html, $tidy, + $html, $tidy, + $add_ns, $verbose, $strict ); @@ -46,6 +47,7 @@ 'strict' => \$strict, 'html' => \$html, 'tidy' => \$tidy, + 'add_ns' => \$add_ns, 'verbose' => \$verbose, ) or pod2usage(2); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgdiplus0 for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package libgdiplus0 for openSUSE:Factory checked in at 2014-09-17 17:24:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgdiplus0 (Old) and /work/SRC/openSUSE:Factory/.libgdiplus0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgdiplus0" Changes: -------- --- /work/SRC/openSUSE:Factory/libgdiplus0/libgdiplus0.changes 2014-09-09 06:21:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgdiplus0.new/libgdiplus0.changes 2014-09-17 17:24:29.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Sep 6 14:45:49 UTC 2014 - mailaender(a)opensuse.org + +- Update to version 3.8 +- Removed upstreamed patch libgdiplus0-libpng15.patch +- Removed upstreamed patch use-recommended-freetype-include.patch +- Use pkgconfig build dependencies where possible +- Always use system cairo +- Fixed rpmlint error: devel-file-in-non-devel-package + +------------------------------------------------------------------- Old: ---- libgdiplus-2.10.9.tar.bz2 libgdiplus0-libpng15.patch use-recommended-freetype-include.patch New: ---- libgdiplus-3.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgdiplus0.spec ++++++ --- /var/tmp/diff_new_pack.Eg7KD4/_old 2014-09-17 17:24:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Eg7KD4/_new 2014-09-17 17:24:30.000000000 +0200 @@ -17,20 +17,14 @@ %define real_name libgdiplus -# There may be strange bugs when using the system cairo -%define system_cairo 0 Name: libgdiplus0 -Version: 2.10.9 +Version: 3.8 Release: 0 -Url: http://go-mono.org/ -Source0: http://download.mono-project.com/sources/%{real_name}/%{real_name}-%{versio… -# link to libpng15.patch content sent to mono(a)xamarin.com -Patch0: %{name}-libpng15.patch +Url: https://github.com/mono/libgdiplus +Source: http://download.mono-project.com/sources/%{real_name}/%{real_name}-%{versio… +# PATCH-FIX-UPSTREAM libgdiplus0-giflib5.patch https://github.com/mono/libgdiplus/pull/26 Patch1: libgdiplus0-giflib5.patch -# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with -# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions -Patch2: use-recommended-freetype-include.patch Summary: Open Source Implementation of the GDI+ API License: (LGPL-2.1+ or MPL-1.1) and MIT Group: Development/Libraries/Other @@ -38,21 +32,19 @@ Provides: libgdiplus BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkg-config -%if %system_cairo -BuildRequires: cairo-devel >= 1.6.4 -%endif -BuildRequires: fontconfig-devel -BuildRequires: freetype2-devel BuildRequires: giflib-devel -BuildRequires: glib2-devel -BuildRequires: libexif-devel BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libXrender-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrender) %description Mono library that provide a GDI+ comptible API on non-Windows @@ -70,10 +62,7 @@ %prep %setup -q -n %{real_name}-%{version} -%patch0 %patch1 -p1 -%patch2 -p1 -sed -i -e 's/LT_/LTT_/g' cairo/configure.in sed -i -e 's:ungif:gif:g' configure || die %build @@ -95,11 +84,12 @@ %files %defattr(-, root, root) -%{_libdir}/libgdiplus.so* +%{_libdir}/libgdiplus.so.* %doc AUTHORS COPYING ChangeLog* NEWS README %files -n libgdiplus-devel %defattr(-, root, root) +%{_libdir}/libgdiplus.so %{_libdir}/pkgconfig/libgdiplus.pc %{_libdir}/libgdiplus.a # Unwanted statically linked files: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

17 Sep '14

Hello community, here is the log from the commit of package python-httplib2 for openSUSE:Factory checked in at 2014-09-17 17:24:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-httplib2 (Old) and /work/SRC/openSUSE:Factory/.python-httplib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-httplib2" Changes: -------- --- /work/SRC/openSUSE:Factory/python-httplib2/python-httplib2.changes 2014-03-07 07:06:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-httplib2.new/python-httplib2.changes 2014-09-17 17:24:26.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Sep 15 09:28:56 UTC 2014 - tbechtold(a)suse.com + +- update to version 0.9 + * Release 0.9. The heartbleed release. + * Add an updated cacerts.txt file and fix some tests. Turns out nginx doesn't support etags on gzip'd content. + * Merge pull request #259 from snarfed/master + * use socket.getdefaulttimeout() on App Engine as well as off, take 2 + * Merge pull request #258 from snarfed/master + * use socket.getdefaulttimeout() on App Engine as well as off + * Update README.md + * whitespace fix + * Remove redundant README + * Remove unused files. + * Update README.md + * Merge ../httplib2.current + * Update README.md + * Last fixed for markdown. + * Update README.md + * Markdown fixes. + * Moving README over to README.md + * Pass method by name, not positionally. Fixes issue #252. Reviewed in https://codereview.appspot.com/7987046/. + * Fix handling of BadStatusLine. Fixes issue #250. Review in https://codereview.appspot.com/7529045/. + * Clean up tags + * Added tag 0.8 for changeset 427a4ff7b7e4 + +------------------------------------------------------------------- Old: ---- httplib2-0.8.tar.gz New: ---- httplib2-0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-httplib2.spec ++++++ --- /var/tmp/diff_new_pack.Drj0O8/_old 2014-09-17 17:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Drj0O8/_new 2014-09-17 17:24:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-httplib2 -Version: 0.8 +Version: 0.9 Release: 0 Url: http://code.google.com/p/httplib2/ Summary: A Python HTTP client library @@ -63,7 +63,6 @@ %files %defattr(-,root,root) -%doc README %{python_sitelib}/httplib2-%{version}-py%{py_ver}.egg-info %{python_sitelib}/httplib2 ++++++ httplib2-0.8.tar.gz -> httplib2-0.9.tar.gz ++++++ ++++ 5641 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net-snmp for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package net-snmp for openSUSE:Factory checked in at 2014-09-17 17:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/net-snmp (Old) and /work/SRC/openSUSE:Factory/.net-snmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "net-snmp" Changes: -------- --- /work/SRC/openSUSE:Factory/net-snmp/net-snmp.changes 2014-07-10 08:16:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.net-snmp.new/net-snmp.changes 2014-09-17 17:24:24.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 3 19:35:54 UTC 2014 - abergmann(a)suse.com + +- added net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch: + fix remote denial of service problem inside snmptrapd when started + with the "-OQ" option (CVE-2014-3565)(bnc#894361) +- added net-snmp-5.7.2-fix-perl-trap-handler.patch: fix potential + remote denial of service problem inside the snmptrapd Perl trap + handler (CVE-2014-2285)(bnc#866942) + +------------------------------------------------------------------- New: ---- net-snmp-5.7.2-fix-perl-trap-handler.patch net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ --- /var/tmp/diff_new_pack.3kRZMY/_old 2014-09-17 17:24:26.000000000 +0200 +++ /var/tmp/diff_new_pack.3kRZMY/_new 2014-09-17 17:24:26.000000000 +0200 @@ -69,6 +69,8 @@ Patch8: net-snmp-5.7.2-build-fix-for-strlcat.patch Patch9: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch Patch10: net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch +Patch11: net-snmp-5.7.2-fix-perl-trap-handler.patch +Patch12: net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch # Summary: SNMP Daemon License: BSD-3-Clause and MIT @@ -203,6 +205,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ ++++++ net-snmp-5.7.2-fix-perl-trap-handler.patch ++++++ diff -Nur net-snmp-5.7.2.1-orig/perl/TrapReceiver/TrapReceiver.xs net-snmp-5.7.2.1/perl/TrapReceiver/TrapReceiver.xs --- net-snmp-5.7.2.1-orig/perl/TrapReceiver/TrapReceiver.xs 2014-02-20 01:36:42.000000000 +0100 +++ net-snmp-5.7.2.1/perl/TrapReceiver/TrapReceiver.xs 2014-09-02 12:06:50.070037000 +0200 @@ -81,18 +81,18 @@ STOREPDUi("securitymodel", pdu->securityModel); STOREPDUi("securitylevel", pdu->securityLevel); STOREPDU("contextName", - newSVpv(pdu->contextName, pdu->contextNameLen)); + newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen)); STOREPDU("contextEngineID", - newSVpv((char *) pdu->contextEngineID, + newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "", pdu->contextEngineIDLen)); STOREPDU("securityEngineID", - newSVpv((char *) pdu->securityEngineID, + newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "", pdu->securityEngineIDLen)); STOREPDU("securityName", - newSVpv((char *) pdu->securityName, pdu->securityNameLen)); + newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen)); } else { STOREPDU("community", - newSVpv((char *) pdu->community, pdu->community_len)); + newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len)); } if (transport && transport->f_fmtaddr) { ++++++ net-snmp-5.7.2-fix-snmptrapd-remote-denial-of-service.patch ++++++ --- net-snmp-5.7.2.1-orig/snmplib/mib.c 2014-02-20 01:36:42.000000000 +0100 +++ net-snmp-5.7.2.1-patched/snmplib/mib.c 2014-09-02 15:07:17.902832000 +0200 @@ -464,17 +464,16 @@ u_char *cp; int output_format, cnt; - if ((var->type != ASN_OCTET_STR) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - const char str[] = "Wrong Type (should be OCTET STRING): "; - if (snmp_cstrcat - (buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OCTET_STR) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + const char str[] = "Wrong Type (should be OCTET STRING): "; + if (!snmp_cstrcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } @@ -742,16 +741,16 @@ const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_OPAQUE_FLOAT) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Float): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OPAQUE_FLOAT) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Float): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -812,17 +811,16 @@ const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_OPAQUE_DOUBLE) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat - (buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Double): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OPAQUE_DOUBLE) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Double): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -887,20 +885,21 @@ { char a64buf[I64CHARSZ + 1]; - if ((var->type != ASN_COUNTER64 + if (var->type != ASN_COUNTER64 #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES && var->type != ASN_OPAQUE_COUNTER64 && var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_U64 #endif - ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Counter64): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + ) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Counter64): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -988,23 +987,25 @@ const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_OPAQUE + if (var->type != ASN_OPAQUE #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES && var->type != ASN_OPAQUE_COUNTER64 && var->type != ASN_OPAQUE_U64 && var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_FLOAT && var->type != ASN_OPAQUE_DOUBLE #endif /* NETSNMP_WITH_OPAQUE_SPECIAL_TYPES */ - ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, - "Wrong Type (should be Opaque): ")) { - return sprint_realloc_by_type(buf, buf_len, out_len, + ) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Opaque): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } + #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES switch (var->type) { case ASN_OPAQUE_COUNTER64: @@ -1080,17 +1081,16 @@ { int buf_overflow = 0; - if ((var->type != ASN_OBJECT_ID) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = - "Wrong Type (should be OBJECT IDENTIFIER): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_OBJECT_ID) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be OBJECT IDENTIFIER): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1150,16 +1150,16 @@ { char timebuf[40]; - if ((var->type != ASN_TIMETICKS) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be Timeticks): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_TIMETICKS) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Timeticks): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_NUMERIC_TIMETICKS)) { @@ -1298,17 +1298,18 @@ { char *enum_string = NULL; - if ((var->type != ASN_INTEGER) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be INTEGER): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_INTEGER) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be INTEGER): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } + for (; enums; enums = enums->next) { if (enums->value == *var->val.integer) { enum_string = enums->label; @@ -1401,16 +1402,16 @@ { char *enum_string = NULL; - if ((var->type != ASN_UINTEGER) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be UInteger32): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_UINTEGER) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be UInteger32): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } for (; enums; enums = enums->next) { @@ -1498,17 +1499,16 @@ { char tmp[32]; - if ((var->type != ASN_GAUGE) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = - "Wrong Type (should be Gauge32 or Unsigned32): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_GAUGE) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Gauge32 or Unsigned32): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1571,16 +1571,16 @@ { char tmp[32]; - if ((var->type != ASN_COUNTER) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be Counter32): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_COUNTER) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be Counter32): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1634,16 +1634,16 @@ { size_t i; - if ((var->type != ASN_IPADDRESS) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be NetworkAddress): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_IPADDRESS) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be NetworkAddress): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1700,16 +1700,16 @@ { u_char *ip = var->val.string; - if ((var->type != ASN_IPADDRESS) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be IpAddress): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_IPADDRESS) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be IpAddress): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1758,20 +1758,20 @@ const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_NULL) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be NULL): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_NULL) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be NULL): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } - } else { - u_char str[] = "NULL"; - return snmp_strcat(buf, buf_len, out_len, allow_realloc, str); } + + u_char str[] = "NULL"; + return snmp_strcat(buf, buf_len, out_len, allow_realloc, str); } @@ -1806,16 +1806,16 @@ u_char *cp; char *enum_string; - if ((var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be BITS): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be BITS): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { @@ -1890,16 +1890,16 @@ const struct enum_list *enums, const char *hint, const char *units) { - if ((var->type != ASN_NSAP) && - (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { - u_char str[] = "Wrong Type (should be NsapAddress): "; - if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { - return sprint_realloc_by_type(buf, buf_len, out_len, + if (var->type != ASN_NSAP) { + if (!netsnmp_ds_get_boolean( + NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { + u_char str[] = "Wrong Type (should be NsapAddress): "; + if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) + return 0; + } + return sprint_realloc_by_type(buf, buf_len, out_len, allow_realloc, var, NULL, NULL, NULL); - } else { - return 0; - } } if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Data-Compare for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-Data-Compare for openSUSE:Factory checked in at 2014-09-17 17:24:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-Compare (Old) and /work/SRC/openSUSE:Factory/.perl-Data-Compare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-Compare" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-Compare/perl-Data-Compare.changes 2013-10-06 14:31:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Data-Compare.new/perl-Data-Compare.changes 2014-09-17 17:24:20.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 15 12:52:32 UTC 2014 - coolo(a)suse.com + +- updated to 1.24 + Bump the required JSON.pm version for + tests - something's a bit broken around + about v 2.53 + +------------------------------------------------------------------- Old: ---- Data-Compare-1.23.tar.gz New: ---- Data-Compare-1.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-Compare.spec ++++++ --- /var/tmp/diff_new_pack.zS257M/_old 2014-09-17 17:24:21.000000000 +0200 +++ /var/tmp/diff_new_pack.zS257M/_new 2014-09-17 17:24:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Data-Compare # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-Data-Compare -Version: 1.23 +Version: 1.24 Release: 0 %define cpan_name Data-Compare Summary: Compare perl data structures @@ -30,8 +30,6 @@ BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(File::Find::Rule) >= 0.1 -#BuildRequires: perl(Data::Compare) -#BuildRequires: perl(the) Requires: perl(File::Find::Rule) >= 0.1 %{perl_requires} ++++++ Data-Compare-1.23.tar.gz -> Data-Compare-1.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Compare-1.23/CHANGELOG new/Data-Compare-1.24/CHANGELOG --- old/Data-Compare-1.23/CHANGELOG 2013-09-26 15:38:14.000000000 +0200 +++ new/Data-Compare-1.24/CHANGELOG 2014-04-05 19:32:44.000000000 +0200 @@ -1,3 +1,7 @@ +1.24 2014-04-05 DCANTRELL Bump the required JSON.pm version for + tests - something's a bit broken around + about v 2.53 + 1.23 2013-09-26 DCANTRELL Add David Muir Sharnoff's tests for really big data structures (but not yet working); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Compare-1.23/META.json new/Data-Compare-1.24/META.json --- old/Data-Compare-1.23/META.json 2013-09-26 15:45:43.000000000 +0200 +++ new/Data-Compare-1.24/META.json 2014-04-05 19:32:54.000000000 +0200 @@ -4,7 +4,7 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921", "license" : [ "unknown" ], @@ -22,18 +22,18 @@ "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { "requires" : { "File::Find::Rule" : "0.1", - "Scalar::Util" : 0 + "Scalar::Util" : "0" } } }, @@ -46,5 +46,5 @@ "url" : "https://github.com/DrHyde/perl-modules-Data-Compare" } }, - "version" : "1.23" + "version" : "1.24" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Compare-1.23/META.yml new/Data-Compare-1.24/META.yml --- old/Data-Compare-1.23/META.yml 2013-09-26 15:45:42.000000000 +0200 +++ new/Data-Compare-1.24/META.yml 2014-04-05 19:32:54.000000000 +0200 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150' +generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -23,4 +23,4 @@ resources: bugtracker: https://github.com/DrHyde/perl-modules-Data-Compare/issues/new repository: https://github.com/DrHyde/perl-modules-Data-Compare -version: 1.23 +version: 1.24 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Compare-1.23/lib/Data/Compare.pm new/Data-Compare-1.24/lib/Data/Compare.pm --- old/Data-Compare-1.23/lib/Data/Compare.pm 2013-09-26 15:32:03.000000000 +0200 +++ new/Data-Compare-1.24/lib/Data/Compare.pm 2014-04-05 19:29:12.000000000 +0200 @@ -17,7 +17,7 @@ @ISA = qw(Exporter); @EXPORT = qw(Compare); -$VERSION = 1.23; +$VERSION = 1.24; $DEBUG = $ENV{PERL_DATA_COMPARE_DEBUG} || 0; my %handler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Compare-1.23/t/saritha-nalagandla-bug.t new/Data-Compare-1.24/t/saritha-nalagandla-bug.t --- old/Data-Compare-1.23/t/saritha-nalagandla-bug.t 2011-07-23 15:45:21.000000000 +0200 +++ new/Data-Compare-1.24/t/saritha-nalagandla-bug.t 2014-04-05 19:29:01.000000000 +0200 @@ -6,7 +6,7 @@ eval "use JSON"; if($@) { eval 'use Test::More skip_all => "no JSON support";exit 0'; -} elsif($JSON::VERSION < 2) { +} elsif($JSON::VERSION < 2.9) { eval 'use Test::More skip_all => "JSON module too old";exit 0'; } else { eval 'use Test::More tests => 2'; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Net-HTTP for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-Net-HTTP for openSUSE:Factory checked in at 2014-09-17 17:24:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Net-HTTP (Old) and /work/SRC/openSUSE:Factory/.perl-Net-HTTP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Net-HTTP" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Net-HTTP/perl-Net-HTTP.changes 2013-06-14 16:47:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Net-HTTP.new/perl-Net-HTTP.changes 2014-09-17 17:24:18.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 15 12:52:31 UTC 2014 - coolo(a)suse.com + +- updated to 6.07 + Jason Fesler (1): + Opportunistically use IO::Socket::IP or IO::Socket::INET6. + Properly parse IPv6 literal addreses with optional port numbers. [RT#75618] + +------------------------------------------------------------------- Old: ---- Net-HTTP-6.06.tar.gz New: ---- Net-HTTP-6.07.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-HTTP.spec ++++++ --- /var/tmp/diff_new_pack.ySikA9/_old 2014-09-17 17:24:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ySikA9/_new 2014-09-17 17:24:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Net-HTTP # -# 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,29 +17,24 @@ Name: perl-Net-HTTP -Version: 6.06 +Version: 6.07 Release: 0 %define cpan_name Net-HTTP Summary: Low-level HTTP connection (client) License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Net-HTTP/ -Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/M/MS/MSCHILLI/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Compress::Raw::Zlib) BuildRequires: perl(IO::Compress::Gzip) -#BuildRequires: perl(IO::Socket::SSL) -#BuildRequires: perl(IO::Uncompress::Gunzip) -#BuildRequires: perl(Net::HTTP) -#BuildRequires: perl(Net::HTTP::Methods) -#BuildRequires: perl(Net::HTTP::NB) -#BuildRequires: perl(Net::HTTPS) -#BuildRequires: perl(Net::SSL) +BuildRequires: perl(URI) Requires: perl(Compress::Raw::Zlib) Requires: perl(IO::Compress::Gzip) +Requires: perl(URI) Recommends: perl(IO::Socket::SSL) >= 1.38 %{perl_requires} @@ -49,9 +44,11 @@ protocol is described in RFC 2616. The 'Net::HTTP' class supports 'HTTP/1.0' and 'HTTP/1.1'. -'Net::HTTP' is a sub-class of 'IO::Socket::INET'. You can mix the methods -described below with reading and writing from the socket directly. This is -not necessary a good idea, unless you know what you are doing. +'Net::HTTP' is a sub-class of one of 'IO::Socket::IP' (IPv6+IPv4), +'IO::Socket::INET6' (IPv6+IPv4), or 'IO::Socket::INET' (IPv4 only). You can +mix the methods described below with reading and writing from the socket +directly. This is not necessary a good idea, unless you know what you are +doing. %prep %setup -q -n %{cpan_name}-%{version} ++++++ Net-HTTP-6.06.tar.gz -> Net-HTTP-6.07.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/Changes new/Net-HTTP-6.07/Changes --- old/Net-HTTP-6.06/Changes 2013-03-10 23:37:09.000000000 +0100 +++ new/Net-HTTP-6.07/Changes 2014-07-24 05:25:51.000000000 +0200 @@ -1,3 +1,9 @@ +2014-07-23 Net-HTTP 6.07 + +Jason Fesler (1): + Opportunistically use IO::Socket::IP or IO::Socket::INET6. + Properly parse IPv6 literal addreses with optional port numbers. [RT#75618] + _______________________________________________________________________________ 2013-03-10 Net-HTTP 6.06 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/MANIFEST new/Net-HTTP-6.07/MANIFEST --- old/Net-HTTP-6.06/MANIFEST 2013-03-10 23:38:46.000000000 +0100 +++ new/Net-HTTP-6.07/MANIFEST 2014-07-24 05:31:19.000000000 +0200 @@ -10,4 +10,5 @@ t/http-nb.t t/apache.t t/apache-https.t -META.yml Module meta-data (added by MakeMaker) +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/META.json new/Net-HTTP-6.07/META.json --- old/Net-HTTP-6.06/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Net-HTTP-6.07/META.json 2014-07-24 05:31:19.000000000 +0200 @@ -0,0 +1,55 @@ +{ + "abstract" : "Low-level HTTP connection (client)", + "author" : [ + "Gisle Aas <gisle(a)activestate.com>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141170", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Net-HTTP", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "recommends" : { + "IO::Socket::SSL" : "1.38" + }, + "requires" : { + "Compress::Raw::Zlib" : "0", + "IO::Compress::Gzip" : "0", + "IO::Select" : "0", + "IO::Socket::INET" : "0", + "URI" : "0", + "perl" : "5.006002" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "http://github.com/libwww-perl/net-http" + }, + "x_MailingList" : "mailto:libwww@perl.org" + }, + "version" : "6.07" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/META.yml new/Net-HTTP-6.07/META.yml --- old/Net-HTTP-6.06/META.yml 2013-03-10 23:38:46.000000000 +0100 +++ new/Net-HTTP-6.07/META.yml 2014-07-24 05:31:19.000000000 +0200 @@ -1,31 +1,32 @@ ---- #YAML:1.0 -name: Net-HTTP -version: 6.06 -abstract: Low-level HTTP connection (client) +--- +abstract: 'Low-level HTTP connection (client)' author: - - Gisle Aas <gisle(a)activestate.com> -license: perl -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 + - 'Gisle Aas <gisle(a)activestate.com>' build_requires: - ExtUtils::MakeMaker: 0 -requires: - Compress::Raw::Zlib: 0 - IO::Compress::Gzip: 0 - IO::Select: 0 - IO::Socket::INET: 0 - perl: 5.006002 -resources: - MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/net-http -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.57_05 + ExtUtils::MakeMaker: '0' +configure_requires: + ExtUtils::MakeMaker: '0' +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141170' +license: perl meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: Net-HTTP +no_index: + directory: + - t + - inc recommends: - IO::Socket::SSL: 1.38 + IO::Socket::SSL: '1.38' +requires: + Compress::Raw::Zlib: '0' + IO::Compress::Gzip: '0' + IO::Select: '0' + IO::Socket::INET: '0' + URI: '0' + perl: '5.006002' +resources: + MailingList: mailto:libwww@perl.org + repository: http://github.com/libwww-perl/net-http +version: '6.07' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/Makefile.PL new/Net-HTTP-6.07/Makefile.PL --- old/Net-HTTP-6.06/Makefile.PL 2012-02-15 23:22:14.000000000 +0100 +++ new/Net-HTTP-6.07/Makefile.PL 2014-07-24 05:21:30.000000000 +0200 @@ -26,13 +26,14 @@ 'IO::Select' => 0, 'Compress::Raw::Zlib' => 0, 'IO::Compress::Gzip' => 0, + 'URI' => 0, }, META_MERGE => { recommends => { 'IO::Socket::SSL' => "1.38", }, resources => { - repository => 'http://github.com/gisle/net-http', + repository => 'http://github.com/libwww-perl/net-http', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/lib/Net/HTTP/Methods.pm new/Net-HTTP-6.07/lib/Net/HTTP/Methods.pm --- old/Net-HTTP-6.06/lib/Net/HTTP/Methods.pm 2013-03-10 23:35:43.000000000 +0100 +++ new/Net-HTTP-6.07/lib/Net/HTTP/Methods.pm 2014-07-24 05:27:26.000000000 +0200 @@ -4,8 +4,9 @@ use strict; use vars qw($VERSION); +use URI; -$VERSION = "6.06"; +$VERSION = "6.07"; my $CRLF = "\015\012"; # "\r\n" is not portable @@ -44,20 +45,30 @@ $cnf->{PeerAddr} = $peer = $host; } - if ($peer =~ s,:(\d+)$,,) { - $cnf->{PeerPort} = int($1); # always override - } - if (!$cnf->{PeerPort}) { - $cnf->{PeerPort} = $self->http_default_port; - } - - if (!$explict_host) { - $host = $peer; - $host =~ s/:.*//; - } - if ($host && $host !~ /:/) { - my $p = $cnf->{PeerPort}; - $host .= ":$p" if $p != $self->http_default_port; + # CONNECTIONS + # PREFER: port number from PeerAddr, then PeerPort, then http_default_port + my $peer_uri = URI->new("http://$peer"); + $cnf->{"PeerPort"} = $peer_uri->_port || $cnf->{PeerPort} || $self->http_default_port; + $cnf->{"PeerAddr"} = $peer_uri->host; + + # HOST header: + # If specified but blank, ignore. + # If specified with a value, add the port number + # If not specified, set to PeerAddr and port number + # ALWAYS: If IPv6 address, use [brackets] (thanks to the URI package) + # ALWAYS: omit port number if http_default_port + if (($host) || (! $explict_host)) { + my $uri = ($explict_host) ? URI->new("http://$host") : $peer_uri->clone; + if (!$uri->_port) { + # Always use *our* $self->http_default_port instead of URI's (Covers HTTP, HTTPS) + $uri->port( $cnf->{PeerPort} || $self->http_default_port); + } + my $host_port = $uri->host_port; # Returns host:port or [ipv6]:port + my $remove = ":" . $self->http_default_port; # we want to remove the default port number + if (substr($host_port,0-length($remove)) eq $remove) { + substr($host_port,0-length($remove)) = ""; + } + $host = $host_port; } $cnf->{Proto} = 'tcp'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-HTTP-6.06/lib/Net/HTTP.pm new/Net-HTTP-6.07/lib/Net/HTTP.pm --- old/Net-HTTP-6.06/lib/Net/HTTP.pm 2013-03-10 23:35:20.000000000 +0100 +++ new/Net-HTTP-6.07/lib/Net/HTTP.pm 2014-07-24 05:26:04.000000000 +0200 @@ -3,10 +3,19 @@ use strict; use vars qw($VERSION @ISA $SOCKET_CLASS); -$VERSION = "6.06"; +$VERSION = "6.07"; unless ($SOCKET_CLASS) { - eval { require IO::Socket::INET } || require IO::Socket; - $SOCKET_CLASS = "IO::Socket::INET"; + # Try several, in order of capability and preference + if (eval { require IO::Socket::IP }) { + $SOCKET_CLASS = "IO::Socket::IP"; # IPv4+IPv6 + } elsif (eval { require IO::Socket::INET6 }) { + $SOCKET_CLASS = "IO::Socket::INET6"; # IPv4+IPv6 + } elsif (eval { require IO::Socket::INET }) { + $SOCKET_CLASS = "IO::Socket::INET"; # IPv4 only + } else { + require IO::Socket; + $SOCKET_CLASS = "IO::Socket::INET"; + } } require Net::HTTP::Methods; require Carp; @@ -59,10 +68,11 @@ HTTP protocol is described in RFC 2616. The C<Net::HTTP> class supports C<HTTP/1.0> and C<HTTP/1.1>. -C<Net::HTTP> is a sub-class of C<IO::Socket::INET>. You can mix the -methods described below with reading and writing from the socket -directly. This is not necessary a good idea, unless you know what you -are doing. +C<Net::HTTP> is a sub-class of one of C<IO::Socket::IP> (IPv6+IPv4), +C<IO::Socket::INET6> (IPv6+IPv4), or C<IO::Socket::INET> (IPv4 only). +You can mix the methods described below with reading and writing from the +socket directly. This is not necessary a good idea, unless you know what +you are doing. The following methods are provided (in addition to those of C<IO::Socket::INET>): @@ -84,6 +94,9 @@ The C<Host> option is also the default for C<IO::Socket::INET>'s C<PeerAddr>. The C<PeerPort> defaults to 80 if not provided. +The C<PeerPort> specification can also be embedded in the C<PeerAddr> +by preceding it with a ":", and closing the IPv6 address on bracktes "[]" if +necessary: "192.0.2.1:80","[2001:db8::1]:80","any.example.com:80". The C<Listen> option provided by C<IO::Socket::INET>'s constructor method is not allowed. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

17 Sep '14

Hello community, here is the log from the commit of package rubygem-nokogiri for openSUSE:Factory checked in at 2014-09-17 17:24:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-nokogiri (Old) and /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-nokogiri" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-nokogiri/rubygem-nokogiri.changes 2014-09-12 11:28:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new/rubygem-nokogiri.changes 2014-09-17 17:24:17.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Sep 11 15:08:47 UTC 2014 - mrueckert(a)suse.de + +- update to version 1.6.3.1 + * Addressing an Apple Macintosh installation problem for GCC + users. #1130 (Thanks, @zenspider!) +- channges in 1.6.3 + * Added Node#document? and Node#processing_instruction? + * [JRuby] Fix Ruby memory exhaustion vulnerability. #1087 + (Thanks, @ocher) + * [MRI] Fix segfault during GC when using `libxml-ruby` and + `nokogiri` together in multi-threaded environment. #895 + (Thanks, @ender672!) + * Building on OSX 10.9 stock ruby 2.0.0 now works. #1101 (Thanks, + @zenspider!) + * Node#parse now works again for HTML document nodes (broken in + 1.6.2+). + * Processing instructions can now be added via + Node#add_next_sibling. + +------------------------------------------------------------------- Old: ---- nokogiri-1.6.2.1.gem New: ---- nokogiri-1.6.3.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-nokogiri.spec ++++++ --- /var/tmp/diff_new_pack.VQHbm6/_old 2014-09-17 17:24:18.000000000 +0200 +++ /var/tmp/diff_new_pack.VQHbm6/_new 2014-09-17 17:24:18.000000000 +0200 @@ -17,12 +17,12 @@ Name: rubygem-nokogiri -Version: 1.6.2.1 +Version: 1.6.3.1 Release: 0 %define mod_name nokogiri %define mod_full_name %{mod_name}-%{version} %define mod_branch -%{version} -%define mod_weight 10601 +%define mod_weight 10631 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby-macros >= 3 ++++++ nokogiri-1.6.2.1.gem -> nokogiri-1.6.3.1.gem ++++++ /work/SRC/openSUSE:Factory/rubygem-nokogiri/nokogiri-1.6.2.1.gem /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new/nokogiri-1.6.3.1.gem differ: char 135, 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 efl for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package efl for openSUSE:Factory checked in at 2014-09-17 10:11:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efl (Old) and /work/SRC/openSUSE:Factory/.efl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "efl" Changes: -------- --- /work/SRC/openSUSE:Factory/efl/efl.changes 2014-08-07 12:38:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efl.new/efl.changes 2014-09-17 10:11:27.000000000 +0200 @@ -1,0 +2,55 @@ +Tue Sep 16 06:53:25 UTC 2014 - simon(a)simotek.net + +- Disable but keep the neon-cflags.patch, will confirm with the author + that this was fixed properly upstream before removing the patch entirely + +- Temporarly disable generating docs as factory is complaining of a missing epstopdf. + +------------------------------------------------------------------- +Tue Sep 16 04:43:05 UTC 2014 - simon(a)simotek.net + +- Bump to 1.11.2 bugfix release + * shutup ecore-x vsync stupid log domain failures + * emotion - fix calling pos update cb for gst1 module in frame new + * emotion - audio volume - leave as-is on file open/init + * edje_cc now throws an error during link combination when the +current part has no name + * evas: fix build on armv7l. (T1620) + * edje embryo stop_program() should stop pending actions + * evas: let's freeze the canvas, shall we ? + +------------------------------------------------------------------- +Thu Sep 11 01:37:25 UTC 2014 - simon(a)simotek.net + +- Try and fix fedora build + +------------------------------------------------------------------- +Mon Sep 1 13:59:56 UTC 2014 - schwab(a)suse.de + +- eolian.patch: remove unused patch +- neon-cflags.patch: use NEON_CFLAGS for all users of <arm_neon.h> +- Disable elua subpackage if there is no luajit + +------------------------------------------------------------------- +Fri Aug 29 13:09:15 UTC 2014 - simon(a)simotek.net + +- Update to 1.11.1 + * Major packaging changes: + * Added elua package (efl luajit bindings) + * Setup efreet and ethumb systemd user daemons properly + * Major upstream changes + * Eolian passer rewrite + * ETC2 image decode support and etc2 texture format support + * New loader for the DDS image file format. + * elua (lua wrapper and bindings) + * Many coverty and other bugs fixed + + +- Include un approved Request 244211 (if i knew it existed i would have approved + It first + Mon Aug 11 11:48:25 UTC 2014 - schwab(a)suse.de + - Require luajit only for supported architectures + - eolian.patch: fix type mismatch + + +------------------------------------------------------------------- Old: ---- efl-1.10.2.tar.bz2 New: ---- efl-1.11.2.tar.xz neon-cflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efl.spec ++++++ --- /var/tmp/diff_new_pack.OyxrnB/_old 2014-09-17 10:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.OyxrnB/_new 2014-09-17 10:11:29.000000000 +0200 @@ -16,7 +16,7 @@ # -%define build_doc 1 +%define build_doc 0 # Build doc needs to be defined for build doc man to work %define build_doc_man 0 %define egueb_present 0 @@ -39,10 +39,10 @@ %define gstreamer_present 1 %endif -%if 0%{?suse_version} < 1230 -%define gstreamer1_present 0 -%else +%if 0%{?suse_version} > 1230 || 0%{?fedora} %define gstreamer1_present 1 +%else +%define gstreamer1_present 0 %endif %if 0%{?mandriva_version} || 0%{?suse_version} < 1220 || 0%{?centos_version} @@ -52,7 +52,7 @@ %endif # always require systemd for now -#%if 0%{?suse_version} && 0%{?suse_version} >= 1230 +#%if (0%{?suse_version} && 0%{?suse_version} >= 1230) || 0%{?fedora} %define systemd_present 1 #%else #%define systemd_present 0 @@ -67,15 +67,22 @@ %define physics_present 1 +%ifarch %ix86 x86_64 %arml ppc +%define luajit_present 1 +%else +%define luajit_present 0 +%endif + Name: efl -Version: 1.10.2 +Version: 1.11.2 Release: 0 # TODO: split package to separate packages and specify licenses correctly -Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17 +Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by Enlightenment (e17 e19) License: BSD-2-Clause and LGPL-2.1 and Zlib Group: Development/Libraries/C and C++ Url: http://enlightenment.org -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.xz +Patch: neon-cflags.patch BuildRequires: autoconf >= 2.5 BuildRequires: automake %if %build_doc @@ -117,7 +124,9 @@ BuildRequires: pkgconfig(libxine) %endif BuildRequires: pkgconfig(lua) +%if %luajit_present BuildRequires: pkgconfig(luajit) +%endif BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(sdl) @@ -189,7 +198,9 @@ Obsoletes: evas < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %systemd_present %{?systemd_requires} +%endif %description EFL is library collection providing various functionality used (not onyl) by Enlightenment 17, Terminology, Tizen mobile platform and much more. @@ -224,7 +235,9 @@ Requires: pkgconfig(libxine) %endif Requires: pkgconfig(lua) +%if %luajit_present Requires: pkgconfig(luajit) +%endif Requires: pkgconfig(openssl) Requires: pkgconfig(pixman-1) Requires: pkgconfig(sdl) @@ -512,6 +525,15 @@ %description -n edje Abstract GUI layout and animation object library. Part of Enlightenment Foundation Libraries. +%package -n elua +Summary: LuaJIT bindings for the efl +License: LGPL-2.1 +Group: Development/Libraries +Requires: efl = %{version} + +%description -n elua +A set of efl bindings for the LuaJIT environment + %package -n embryo Summary: Abstract GUI layout and animation object library License: BSD-2-Clause @@ -563,6 +585,7 @@ %prep %setup -q +#%patch -p1 %build # remove __DATE__ and __TIME__ @@ -597,17 +620,24 @@ %endif %if ! %physics_present --disable-physics \ - --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa \ + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \ %endif %if !%gstreamer1_present --disable-gstreamer1 \ --enable-gstreamer \ + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \ %endif %if %harfbuzz_present --enable-harfbuzz \ %else --disable-harfbuzz \ %endif +%if !%luajit_present + --enable-lua-old \ +%if %physics_present + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \ +%endif +%endif %if %xinput22_present --enable-xinput22 \ %endif @@ -687,8 +717,27 @@ find %{buildroot}%{_libdir} -name '*.la' -exec rm -v {} \; %find_lang efl -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%if %systemd_present +%pre +%service_add_pre efreet.service ethumb.service +%endif + +%post +%if %systemd_present +%service_add_post efreet.service ethumb.service +%endif +/sbin/ldconfig + +%if %systemd_present +%preun +%service_del_preun efreet.service ethumb.service +%endif + +%postun +%if %systemd_present +%service_del_postun efreet.service ethumb.service +%endif +/sbin/ldconfig %post -n libecore1 -p /sbin/ldconfig %postun -n libecore1 -p /sbin/ldconfig @@ -751,11 +800,13 @@ %{_bindir}/* %exclude %{_bindir}/edje_* %exclude %{_bindir}/embryo_* +%exclude %{_datadir}/ecore_x/checkme %exclude %{_datadir}/evas/checkme %doc README COPYING AUTHORS %{_libdir}/ecore_evas %{_libdir}/ecore_imf %{_libdir}/ecore +%{_libdir}/ecore_x %{_libdir}/eeze %{_libdir}/efreet %{_libdir}/emotion @@ -764,9 +815,9 @@ %{_libdir}/evas %{_datadir}/dbus-1 %{_datadir}/ecore +%{_datadir}/ecore_x %{_datadir}/emotion %{_datadir}/eo -%{_datadir}/eolian %{_datadir}/ethumb %{_datadir}/evas %if %systemd_present @@ -883,6 +934,7 @@ %{_includedir}/edje-cxx-1 %{_includedir}/eet-cxx-1 %{_includedir}/eina-cxx-1 +%{_includedir}/eldbus_cxx-1 %{_includedir}/eo-cxx-1 %{_includedir}/eolian-cxx-1 %{_includedir}/evas-cxx-1 @@ -893,8 +945,10 @@ %{_includedir}/ethumb-1/ %{_includedir}/ethumb-client-1/ %{_includedir}/evas-1/ -%{_datadir}/gdb/ +%{_datadir}/eolian/ +%{_datadir}/ecore_x/checkme %{_datadir}/evas/checkme +%{_datadir}/gdb/ %files -n edje %defattr(-, root, root) @@ -903,6 +957,12 @@ %{_libdir}/edje %{_datadir}/mime/packages/edje.xml +%if %luajit_present +%files -n elua +%defattr(-, root, root) +%{_datadir}/elua +%endif + %files -n embryo %defattr(-, root, root) %{_bindir}/embryo_* ++++++ neon-cflags.patch ++++++ Index: efl-1.11.1/src/Makefile.in =================================================================== --- efl-1.11.1.orig/src/Makefile.in +++ efl-1.11.1/src/Makefile.in @@ -1041,6 +1041,7 @@ efreetinternal_bin_PROGRAMS = \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@am__append_205 = \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@-I$(top_srcdir)/src/static_libs/lz4 \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@-I$(top_srcdir)/src/static_libs/rg_etc \ +@BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@@NEON_CFLAGS@ \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@@evas_image_loader_tgv_cflags@ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@am__append_206 = @evas_image_loader_tgv_libs@ @@ -1057,6 +1058,7 @@ efreetinternal_bin_PROGRAMS = \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_CSERVE2_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@-I$(top_srcdir)/src/static_libs/lz4 \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_CSERVE2_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@-I$(top_srcdir)/src/static_libs/rg_etc \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_CSERVE2_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@-I$(top_srcdir)/src/lib/evas/ \ +@BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_CSERVE2_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@@NEON_CFLAGS@ \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_CSERVE2_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@@evas_image_loader_tgv_cflags@ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_CSERVE2_TRUE@@EVAS_STATIC_BUILD_TGV_TRUE@am__append_209 = @evas_image_loader_tgv_libs@ @@ -7689,7 +7691,8 @@ lib_eet_libeet_la_CPPFLAGS = -I$(top_bui -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ -@EET_CFLAGS@ +@EET_CFLAGS@ \ +@NEON_CFLAGS@ lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@ lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@ @@ -9718,6 +9721,7 @@ bin_efreet_efreet_icon_cache_create_SOUR @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_FALSE@-I$(top_srcdir)/src/static_libs/rg_etc \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_FALSE@-I$(top_srcdir)/src/lib/evas/ \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_FALSE@@EVAS_CFLAGS@ \ +@BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_FALSE@@NEON_CFLAGS@ \ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_FALSE@@evas_image_loader_tgv_cflags@ @BUILD_GUI_TRUE@@BUILD_LOADER_TGV_TRUE@@EVAS_STATIC_BUILD_TGV_FALSE@modules_evas_loaders_tgv_module_la_LIBADD = \ Index: efl-1.11.1/src/Makefile_Eet.am =================================================================== --- efl-1.11.1.orig/src/Makefile_Eet.am +++ efl-1.11.1/src/Makefile_Eet.am @@ -32,7 +32,8 @@ lib_eet_libeet_la_CPPFLAGS = -I$(top_bui -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ -@EET_CFLAGS@ +@EET_CFLAGS@ \ +@NEON_CFLAGS@ lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@ lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@ lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Index: efl-1.11.1/src/Makefile_Evas.am =================================================================== --- efl-1.11.1.orig/src/Makefile_Evas.am +++ efl-1.11.1/src/Makefile_Evas.am @@ -1876,6 +1876,7 @@ static_libs/lz4/lz4hc.h lib_evas_libevas_la_CPPFLAGS += \ -I$(top_srcdir)/src/static_libs/lz4 \ -I$(top_srcdir)/src/static_libs/rg_etc \ +@NEON_CFLAGS@ \ @evas_image_loader_tgv_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_tgv_libs@ if EVAS_CSERVE2 @@ -1891,6 +1892,7 @@ bin_evas_evas_cserve2_slave_CPPFLAGS += -I$(top_srcdir)/src/static_libs/lz4 \ -I$(top_srcdir)/src/static_libs/rg_etc \ -I$(top_srcdir)/src/lib/evas/ \ +@NEON_CFLAGS@ \ @evas_image_loader_tgv_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tgv_libs@ endif @@ -1910,6 +1912,7 @@ modules_evas_loaders_tgv_module_la_CPPFL -I$(top_srcdir)/src/static_libs/rg_etc \ -I$(top_srcdir)/src/lib/evas/ \ @EVAS_CFLAGS@ \ +@NEON_CFLAGS@ \ @evas_image_loader_tgv_cflags@ modules_evas_loaders_tgv_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hdjmod for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2014-09-17 10:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdjmod" Changes: -------- --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes 2012-12-28 15:01:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2014-09-17 10:11:07.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 25 20:47:24 UTC 2014 - marix(a)marix.org + +- Fixed build on kernel 3.16 + The required patch is hdjmod_kernel_3.16.patch + +------------------------------------------------------------------- New: ---- hdjmod_kernel_3.16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdjmod.spec ++++++ --- /var/tmp/diff_new_pack.xOtFFQ/_old 2014-09-17 10:11:08.000000000 +0200 +++ /var/tmp/diff_new_pack.xOtFFQ/_new 2014-09-17 10:11:08.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package hdjmod # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright 2008 Matthias Bach <marix(a)marix.org> +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008-2014 Matthias Bach <marix(a)marix.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,10 +49,8 @@ Patch6: hdjmod_kernel_3.6.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_3.7.patch marix(a)marix.org -- Fix build on kernel 3.7 and newer Patch7: hdjmod_kernel_3.7.patch - -# The package triggers RPM-Lint warning because it misses requires to the proper kernel packages -# These requires should be added by the kernel_module_package macro, so, therefore the are not -# fixed in this package. See also https://bugzilla.novell.com/show_bug.cgi?id=479141. +# PATCH-FIX-UPSTREAM hdjmod_kernel_3.16.patch marix(a)marix.org -- Fix build on kernel 3.16 and newer +Patch8: hdjmod_kernel_3.16.patch %suse_kernel_module_package -p%_sourcedir/preamble @@ -74,6 +72,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 set -- * mkdir source mv "$@" source/ ++++++ hdjmod_kernel_3.16.patch ++++++ From: Matthias Bach <marix(a)marix.org> Date: 2014-07-26 23:30:00 +0200 Subject: Fix compile on kernel 3.16 Upstream: to be done The module no longer compiled on 3.16 due to API changes in ALSA. diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2014-07-25 22:38:52.985186212 +0200 +++ hdjmod-1.28/device.c 2014-07-25 22:44:05.297761993 +0200 @@ -1660,7 +1660,13 @@ /* let the kernel option override custom id */ strncpy(card_id,id[idx],sizeof(card_id)-1); } -#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) ) +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) ) + err = snd_card_new(&dev->dev, index[idx], card_id/*id[idx]*/, THIS_MODULE, 0, &card ); + if (err) { + snd_printk(KERN_WARNING "snd_hdj_chip_create(): cannot create card instance %d\n", idx); + return err; + } +#elif ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) ) err = snd_card_create(index[idx], card_id/*id[idx]*/, THIS_MODULE, 0, &card ); if (err) { snd_printk(KERN_WARNING "snd_hdj_chip_create(): cannot create card instance %d\n", idx); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-MooseX-App-Cmd for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-MooseX-App-Cmd for openSUSE:Factory checked in at 2014-09-17 10:10:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MooseX-App-Cmd (Old) and /work/SRC/openSUSE:Factory/.perl-MooseX-App-Cmd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MooseX-App-Cmd" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MooseX-App-Cmd/perl-MooseX-App-Cmd.changes 2014-03-21 12:15:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-MooseX-App-Cmd.new/perl-MooseX-App-Cmd.changes 2014-09-17 10:10:58.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 15 14:38:31 UTC 2014 - coolo(a)suse.com + +- add https://github.com/mjgardner/moosex-app-cmd/commit/61f086b1fe03fab5a96a999f… + as 61f086b1fe03fab5a96a999f7b21768504d7089c.patch to fix build + +------------------------------------------------------------------- New: ---- 61f086b1fe03fab5a96a999f7b21768504d7089c.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MooseX-App-Cmd.spec ++++++ --- /var/tmp/diff_new_pack.5uUieC/_old 2014-09-17 10:10:59.000000000 +0200 +++ /var/tmp/diff_new_pack.5uUieC/_new 2014-09-17 10:10:59.000000000 +0200 @@ -25,6 +25,7 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/MooseX-App-Cmd/ Source: http://www.cpan.org/authors/id/M/MJ/MJGARDNER/%{cpan_name}-%{version}.tar.gz +Patch0: 61f086b1fe03fab5a96a999f7b21768504d7089c.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -46,10 +47,6 @@ Requires: perl(MouseX::Getopt) Requires: perl(Test::use::ok) Requires: perl(namespace::clean) -BuildRequires: perl(Moose) >= 0.86 -BuildRequires: perl(MooseX::ConfigFromFile) >= 0.08 -BuildRequires: perl(MooseX::Getopt) >= 0.18 -BuildRequires: perl(MouseX::ConfigFromFile) Recommends: perl(Moose) >= 0.86 Recommends: perl(MooseX::ConfigFromFile) >= 0.08 Recommends: perl(MooseX::Getopt) >= 0.18 @@ -68,6 +65,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ 61f086b1fe03fab5a96a999f7b21768504d7089c.patch ++++++ diff --git a/dist.ini b/dist.ini index 5fa73d5..d77ee54 100644 --- a/dist.ini +++ b/dist.ini @@ -16,6 +16,8 @@ copyright_holder = Infinity Interactive, Yuval Kogman [@Filter] -bundle = @Basic -remove = Readme +-remove = MakeMaker +[=inc::MooseMouseMakeMaker / MooseMouseMakeMaker] [AutoPrereqs] skip = ^Moose skip = ^Mouse @@ -23,8 +25,6 @@ skip = ^Mouse perl = 5.006 App::Cmd = 0.321 Getopt::Long::Descriptive = 0.091 -Test::use::ok = 0 -MouseX::Getopt = 0 [OptionalFeature / ConfigFromFile] -description = Command line options can be set from a configuration file -always_recommend = 1 @@ -35,7 +35,12 @@ MouseX::ConfigFromFile = 0 Moose = 0.86 MooseX::ConfigFromFile = 0.08 MooseX::Getopt = 0.18 +[OptionalFeature / Mouse] +-description = Support for the Mouse lightweight object system +-always_recommend = 1 +MouseX::Getopt = 0 [MetaProvides::Package] +[Meta::Dynamic::Config] [Prereqs / ConfigureRequires] ExtUtils::MakeMaker = 0 [Prereqs / BuildRequires] @@ -81,7 +86,6 @@ location = root [ReportVersions] [Test::LocalBrew] brews = perl-latest-TEST -[InstallGuide] [MetaJSON] [@Git] allow_dirty = README.pod @@ -101,3 +105,4 @@ fork = 0 ;authordep Perl::Critic::StricterSubs ;authordep MooseX::SimpleConfig ;authordep Test::Pod::Coverage +;authordep Dist::Zilla::Plugin::MakeMaker::Awesome diff --git a/inc/MooseMouseMakeMaker.pm b/inc/MooseMouseMakeMaker.pm new file mode 100644 index 0000000..f0ecab5 --- /dev/null +++ b/inc/MooseMouseMakeMaker.pm @@ -0,0 +1,28 @@ +package inc::MooseMouseMakeMaker; +use Moose; +use MooseX::AttributeShortcuts; +use MooseX::Types::Moose 'Bool'; + +extends 'Dist::Zilla::Plugin::MakeMaker::Awesome'; + +override _build_WriteMakefile_dump => sub { + my $self = shift; + + my $args = super(); + $args .= <<'END_WRITEMAKEFILE'; +if (eval {require Mouse; 1}) { + $WriteMakefileArgs{PREREQ_PM}{'MouseX::Getopt'} = 0; +} +if (eval {require Moose; 1}) { + $WriteMakefileArgs{PREREQ_PM}{'MooseX::Getopt'} = '0.18'; +} +if (not grep {/^Mo(?:o|u)seX::Getopt$/} keys %{$WriteMakefileArgs{PREREQ_PM}}) { + $WriteMakefileArgs{PREREQ_PM}{'MouseX::Getopt'} = 0; +} +END_WRITEMAKEFILE + + return $args; +}; + +__PACKAGE__->meta->make_immutable; +1; diff --git a/t/basic.t b/t/basic.t index b64f658..6c175e8 100644 --- a/t/basic.t +++ b/t/basic.t @@ -70,7 +70,7 @@ is_deeply( like( $@, - qr/Mandatory parameter 'wow' missing in call to $eval$/, + qr/Mandatory parameter 'wow' missing in call to ["(]eval[)"]/, 'required option field is missing', ); } diff --git a/t/configfile.t b/t/configfile.t index 6c88e79..481e4dd 100644 --- a/t/configfile.t +++ b/t/configfile.t @@ -27,7 +27,7 @@ my $cmd = Test::ConfigFromFile->new; like( $@, - qr/Mandatory parameter 'moo' missing in call to $eval$/, + qr/Mandatory parameter 'moo' missing in call to ["(]eval[)"]/, 'command died with the correct string', ); } diff --git a/t/lib/Test/ConfigFromFile.pm b/t/lib/Test/ConfigFromFile.pm index 55a5e68..9195c05 100644 --- a/t/lib/Test/ConfigFromFile.pm +++ b/t/lib/Test/ConfigFromFile.pm @@ -1,6 +1,6 @@ package Test::ConfigFromFile; use Any::Moose; -extends qw(MooseX::App::Cmd); +extends any_moose('X::App::Cmd'); 1; diff --git a/t/lib/Test/ConfigFromFile/Command/boo.pm b/t/lib/Test/ConfigFromFile/Command/boo.pm index 1ee0342..a1214a7 100644 --- a/t/lib/Test/ConfigFromFile/Command/boo.pm +++ b/t/lib/Test/ConfigFromFile/Command/boo.pm @@ -2,7 +2,7 @@ package Test::ConfigFromFile::Command::boo; use Any::Moose; use YAML(); -extends qw(MooseX::App::Cmd::Command); +extends any_moose('X::App::Cmd::Command'); with any_moose('X::ConfigFromFile'); =head1 NAME diff --git a/t/lib/Test/ConfigFromFile/Command/moo.pm b/t/lib/Test/ConfigFromFile/Command/moo.pm index 34fef52..4aeab79 100644 --- a/t/lib/Test/ConfigFromFile/Command/moo.pm +++ b/t/lib/Test/ConfigFromFile/Command/moo.pm @@ -2,7 +2,7 @@ package Test::ConfigFromFile::Command::moo; use Any::Moose; use YAML(); -extends 'MooseX::App::Cmd::Command'; +extends any_moose('X::App::Cmd::Command'); with any_moose('X::ConfigFromFile'); =head1 NAME diff --git a/t/lib/Test/MyCmd.pm b/t/lib/Test/MyCmd.pm index 4f6baea..e9de904 100644 --- a/t/lib/Test/MyCmd.pm +++ b/t/lib/Test/MyCmd.pm @@ -1,6 +1,6 @@ package Test::MyCmd; use Any::Moose; -extends qw(MooseX::App::Cmd); +extends any_moose('X::App::Cmd'); 1; diff --git a/t/lib/Test/MyCmd/Command/bark.pm b/t/lib/Test/MyCmd/Command/bark.pm index 22631b8..76b1fcb 100644 --- a/t/lib/Test/MyCmd/Command/bark.pm +++ b/t/lib/Test/MyCmd/Command/bark.pm @@ -1,7 +1,7 @@ package Test::MyCmd::Command::bark; use Any::Moose; -extends qw(MooseX::App::Cmd::Command); +extends any_moose('X::App::Cmd::Command'); =head1 NAME diff --git a/t/lib/Test/MyCmd/Command/frobulate.pm b/t/lib/Test/MyCmd/Command/frobulate.pm index 7e111d5..bafec1e 100644 --- a/t/lib/Test/MyCmd/Command/frobulate.pm +++ b/t/lib/Test/MyCmd/Command/frobulate.pm @@ -1,7 +1,7 @@ package Test::MyCmd::Command::frobulate; use Any::Moose; -extends qw(MooseX::App::Cmd::Command); +extends any_moose('X::App::Cmd::Command'); sub command_names { return qw(frobulate frob); diff --git a/t/lib/Test/MyCmd/Command/justusage.pm b/t/lib/Test/MyCmd/Command/justusage.pm index 0847509..27a92d7 100644 --- a/t/lib/Test/MyCmd/Command/justusage.pm +++ b/t/lib/Test/MyCmd/Command/justusage.pm @@ -1,7 +1,7 @@ package Test::MyCmd::Command::justusage; use Any::Moose; -extends qw(MooseX::App::Cmd::Command); +extends any_moose('X::App::Cmd::Command'); =head1 NAME diff --git a/t/lib/Test/MyCmd/Command/stock.pm b/t/lib/Test/MyCmd/Command/stock.pm index 45d985a..34f64b8 100644 --- a/t/lib/Test/MyCmd/Command/stock.pm +++ b/t/lib/Test/MyCmd/Command/stock.pm @@ -1,7 +1,7 @@ package Test::MyCmd::Command::stock; use Any::Moose; -extends qw(MooseX::App::Cmd::Command); +extends any_moose('X::App::Cmd::Command'); =head1 NAME -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0