June 2017 - openSUSE Commits - openSUSE Mailing Lists

commit libopenmpt for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package libopenmpt for openSUSE:Factory checked in at 2017-06-01 16:28:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libopenmpt (Old) and /work/SRC/openSUSE:Factory/.libopenmpt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libopenmpt" Thu Jun 1 16:28:34 2017 rev:2 rq:497306 version:0.2.8043~beta23 Changes: -------- --- /work/SRC/openSUSE:Factory/libopenmpt/libopenmpt.changes 2017-05-18 20:46:19.872101977 +0200 +++ /work/SRC/openSUSE:Factory/.libopenmpt.new/libopenmpt.changes 2017-06-01 16:28:34.490314826 +0200 @@ -1,0 +2,14 @@ +Mon May 22 12:38:24 UTC 2017 - tchvatal(a)suse.com + +- Add patch fixing issue bsc#1040149 wrong includedir propagation: + * libmodpulg-pcfile.patch + +------------------------------------------------------------------- +Mon May 22 12:32:32 UTC 2017 - tchvatal(a)suse.com + +- Version update to 0.2.8043-beta23 + * foo_openmpt: Interpolation filter and volume ramping settings were + confused in previous versions. This version resets both to the defaults. +- Make mpg123 on by default + +------------------------------------------------------------------- Old: ---- libopenmpt-0.2.7774-beta22-autotools.tar.gz New: ---- libmodpulg-pcfile.patch libopenmpt-0.2.8043-beta23-autotools.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenmpt.spec ++++++ --- /var/tmp/diff_new_pack.RpZEzs/_old 2017-06-01 16:28:35.238209371 +0200 +++ /var/tmp/diff_new_pack.RpZEzs/_new 2017-06-01 16:28:35.242208806 +0200 @@ -16,13 +16,13 @@ # -%define rev 0.2.7774 -%define beta beta22 +%define rev 0.2.8043 +%define beta beta23 %define realver %{rev}-%{beta} %define libplug libmodplug1 %define libopenmpt libopenmpt0 %define libopenmpt_modplug libopenmpt_modplug1 -%bcond_with mpg123 +%bcond_without mpg123 Name: libopenmpt Version: %{rev}~%{beta} Release: 0 @@ -31,6 +31,8 @@ Group: Productivity/Multimedia/Other Url: https://lib.openmpt.org/libopenmpt/ Source: https://lib.openmpt.org/files/libopenmpt/src/%{name}-%{realver}-autotools.t… +# PATCH-FIX-UPSTREAM: modplug pc file needs to have full path +Patch0: libmodpulg-pcfile.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: dos2unix @@ -116,6 +118,7 @@ %prep %setup -q -n %{name}-%{rev}-autotools +%patch0 -p1 # disable werror sed -i -e 's:-Werror ::g' configure.ac # fix encoding ++++++ libmodpulg-pcfile.patch ++++++ Index: libopenmpt-0.2.8043-autotools/libmodplug/libmodplug.pc.in =================================================================== --- libopenmpt-0.2.8043-autotools.orig/libmodplug/libmodplug.pc.in +++ libopenmpt-0.2.8043-autotools/libmodplug/libmodplug.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=${prefix}/include +includedir=${prefix}/include/libmodplug/ Name: libmodplug Description: The ModPlug mod file playing library (emulated via libopenmpt). ++++++ libopenmpt-0.2.7774-beta22-autotools.tar.gz -> libopenmpt-0.2.8043-beta23-autotools.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/Makefile.am new/libopenmpt-0.2.8043-autotools/Makefile.am --- old/libopenmpt-0.2.7774-autotools/Makefile.am 2017-03-07 11:27:56.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/Makefile.am 2017-04-23 15:20:01.000000000 +0200 @@ -105,7 +105,7 @@ pkgconfig_DATA += libopenmpt/libopenmpt.pc lib_LTLIBRARIES += libopenmpt.la -libopenmpt_la_LDFLAGS = -version-info 0:22:0 +libopenmpt_la_LDFLAGS = -version-info 0:23:0 nobase_include_HEADERS += libopenmpt/libopenmpt.h libopenmpt/libopenmpt.hpp libopenmpt/libopenmpt_version.h libopenmpt/libopenmpt_config.h libopenmpt/libopenmpt_stream_callbacks_fd.h libopenmpt/libopenmpt_stream_callbacks_file.h libopenmpt/libopenmpt_ext.hpp libopenmpt_la_CPPFLAGS = -DLIBOPENMPT_BUILD -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) $(LTDL_CPPFLAGS) $(DL_CPPFLAGS) libopenmpt_la_CXXFLAGS = $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/Makefile.in new/libopenmpt-0.2.8043-autotools/Makefile.in --- old/libopenmpt-0.2.7774-autotools/Makefile.in 2017-03-11 13:14:15.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/Makefile.in 2017-04-23 15:25:32.000000000 +0200 @@ -1184,7 +1184,7 @@ libopenmpt/libopenmpt_stream_callbacks_fd.h \ libopenmpt/libopenmpt_stream_callbacks_file.h \ libopenmpt/libopenmpt_ext.hpp $(am__append_7) -libopenmpt_la_LDFLAGS = -version-info 0:22:0 +libopenmpt_la_LDFLAGS = -version-info 0:23:0 libopenmpt_la_CPPFLAGS = -DLIBOPENMPT_BUILD -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) $(LTDL_CPPFLAGS) $(DL_CPPFLAGS) libopenmpt_la_CXXFLAGS = $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) libopenmpt_la_CFLAGS = $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) @@ -5598,8 +5598,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@DX_COND_doc_FALSE@install-data-local: @DX_COND_doc_FALSE@uninstall-local: +@DX_COND_doc_FALSE@install-data-local: @DX_COND_doc_FALSE@clean-local: clean: clean-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/common/mptCPU.cpp new/libopenmpt-0.2.8043-autotools/common/mptCPU.cpp --- old/libopenmpt-0.2.7774-autotools/common/mptCPU.cpp 2015-08-15 08:42:50.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/common/mptCPU.cpp 2017-04-04 18:12:19.000000000 +0200 @@ -18,6 +18,7 @@ #if defined(ENABLE_ASM) +uint32 RealProcSupport = 0; uint32 ProcSupport = 0; char ProcVendorID[16+1] = ""; uint16 ProcFamily = 0; @@ -114,6 +115,7 @@ //-------------------- { + RealProcSupport = 0; ProcSupport = 0; MemsetZero(ProcVendorID); ProcFamily = 0; @@ -266,6 +268,8 @@ // We do not have to check if SSE got enabled by the OS because we only do // support Windows >= 98 SE which will always enable SSE if available. + RealProcSupport = ProcSupport; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/common/mptCPU.h new/libopenmpt-0.2.8043-autotools/common/mptCPU.h --- old/libopenmpt-0.2.7774-autotools/common/mptCPU.h 2015-06-27 16:41:53.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/common/mptCPU.h 2017-04-04 18:12:19.000000000 +0200 @@ -29,16 +29,24 @@ #define PROCSUPPORT_SSSE3 0x00800 // Processor supports SSSE3 instructions #define PROCSUPPORT_SSE4_1 0x01000 // Processor supports SSE4.1 instructions #define PROCSUPPORT_SSE4_2 0x02000 // Processor supports SSE4.2 instructions +extern uint32 RealProcSupport; extern uint32 ProcSupport; extern char ProcVendorID[16+1]; extern uint16 ProcFamily; extern uint8 ProcModel; extern uint8 ProcStepping; void InitProcSupport(); +// enabled processor features for inline asm and intrinsics static inline uint32 GetProcSupport() { return ProcSupport; } +// available processor features +static inline uint32 GetRealProcSupport() +{ + return RealProcSupport; +} + #endif // ENABLE_ASM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/common/versionNumber.h new/libopenmpt-0.2.8043-autotools/common/versionNumber.h --- old/libopenmpt-0.2.7774-autotools/common/versionNumber.h 2017-02-05 18:04:19.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/common/versionNumber.h 2017-04-23 15:03:22.000000000 +0200 @@ -18,8 +18,8 @@ //Version definitions. The only thing that needs to be changed when changing version number. #define VER_MAJORMAJOR 1 #define VER_MAJOR 26 -#define VER_MINOR 08 -#define VER_MINORMINOR 01 +#define VER_MINOR 10 +#define VER_MINORMINOR 00 //Version string. For example "1.17.02.28" #define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/configure new/libopenmpt-0.2.8043-autotools/configure --- old/libopenmpt-0.2.7774-autotools/configure 2017-03-11 13:14:13.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/configure 2017-04-23 15:25:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libopenmpt 0.2.7774-autotools. +# Generated by GNU Autoconf 2.69 for libopenmpt 0.2.8043-autotools. # # Report bugs to <https://bugs.openmpt.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libopenmpt' PACKAGE_TARNAME='libopenmpt' -PACKAGE_VERSION='0.2.7774-autotools' -PACKAGE_STRING='libopenmpt 0.2.7774-autotools' +PACKAGE_VERSION='0.2.8043-autotools' +PACKAGE_STRING='libopenmpt 0.2.8043-autotools' PACKAGE_BUGREPORT='https://bugs.openmpt.org/' PACKAGE_URL='https://lib.openmpt.org/' @@ -1477,7 +1477,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libopenmpt 0.2.7774-autotools to adapt to many kinds of systems. +\`configure' configures libopenmpt 0.2.8043-autotools to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1547,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libopenmpt 0.2.7774-autotools:";; + short | recursive ) echo "Configuration of libopenmpt 0.2.8043-autotools:";; esac cat <<\_ACEOF @@ -1742,7 +1742,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libopenmpt configure 0.2.7774-autotools +libopenmpt configure 0.2.8043-autotools generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2232,7 +2232,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libopenmpt $as_me 0.2.7774-autotools, which was +It was created by libopenmpt $as_me 0.2.8043-autotools, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3103,7 +3103,7 @@ # Define the identity of the package. PACKAGE='libopenmpt' - VERSION='0.2.7774-autotools' + VERSION='0.2.8043-autotools' cat >>confdefs.h <<_ACEOF @@ -16645,10 +16645,10 @@ $as_echo "#define MPT_SVNURL \"https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.26\"" >>confdefs.h -$as_echo "#define MPT_SVNVERSION \"7774\"" >>confdefs.h +$as_echo "#define MPT_SVNVERSION \"8043\"" >>confdefs.h -$as_echo "#define MPT_SVNDATE \"2017-03-11T12:09:52.920849Z\"" >>confdefs.h +$as_echo "#define MPT_SVNDATE \"2017-04-23T13:20:01.390569Z\"" >>confdefs.h $as_echo "#define MPT_PACKAGE true" >>confdefs.h @@ -21303,7 +21303,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libopenmpt $as_me 0.2.7774-autotools, which was +This file was extended by libopenmpt $as_me 0.2.8043-autotools, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21370,7 +21370,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libopenmpt config.status 0.2.7774-autotools +libopenmpt config.status 0.2.8043-autotools configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/configure.ac new/libopenmpt-0.2.8043-autotools/configure.ac --- old/libopenmpt-0.2.7774-autotools/configure.ac 2017-03-11 13:14:03.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/configure.ac 2017-04-23 15:25:23.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([libopenmpt], [0.2.7774-autotools], [https://bugs.openmpt.org/], [libopenmpt], [https://lib.openmpt.org/]) +AC_INIT([libopenmpt], [0.2.8043-autotools], [https://bugs.openmpt.org/], [libopenmpt], [https://lib.openmpt.org/]) AC_PREREQ([2.68]) AC_CONFIG_MACRO_DIR([m4]) @@ -21,8 +21,8 @@ AC_PROG_INSTALL AC_DEFINE([MPT_SVNURL], ["https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.26"], [svn version]) -AC_DEFINE([MPT_SVNVERSION], ["7774"], [svn version]) -AC_DEFINE([MPT_SVNDATE], ["2017-03-11T12:09:52.920849Z"], [svn date]) +AC_DEFINE([MPT_SVNVERSION], ["8043"], [svn version]) +AC_DEFINE([MPT_SVNDATE], ["2017-04-23T13:20:01.390569Z"], [svn date]) AC_DEFINE([MPT_PACKAGE], [true], [is package]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/libopenmpt/dox/changelog.md new/libopenmpt-0.2.8043-autotools/libopenmpt/dox/changelog.md --- old/libopenmpt-0.2.7774-autotools/libopenmpt/dox/changelog.md 2017-03-11 13:09:52.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/libopenmpt/dox/changelog.md 2017-04-23 15:20:01.000000000 +0200 @@ -5,6 +5,15 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. +### libopenmpt 0.2-beta23 (2017-04-23) + + * [**Change**] The libmpg123 binary download script on Windows now downloads + libmpg123 1.24.0. + * [**Change**] MSVC builds of libopenmpt will now only load known DMO plugins. + + * [**Bug**] foo_openmpt: Interpolation filter and volume ramping settings were + confused in previous versions. This version resets both to the defaults. + ### libopenmpt 0.2-beta22 (2017-03-11) * [**Bug**] Possible NULL-pointer dereference read during obscure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/man/openmpt123.1 new/libopenmpt-0.2.8043-autotools/man/openmpt123.1 --- old/libopenmpt-0.2.7774-autotools/man/openmpt123.1 2017-03-11 13:14:03.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/man/openmpt123.1 2017-04-23 15:25:23.000000000 +0200 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH OPENMPT123 "1" "March 2017" "openmpt123 v0.2" "User Commands" +.TH OPENMPT123 "1" "April 2017" "openmpt123 v0.2" "User Commands" .SH NAME openmpt123 - command line module music player based on libopenmpt .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Load_it.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Load_it.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Load_it.cpp 2016-09-08 16:31:30.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Load_it.cpp 2017-04-20 00:05:56.000000000 +0200 @@ -2323,7 +2323,7 @@ uint8 b = chunk.ReadUint8(); for(uint8 i = 0; i < 8; i++, bit++) { - if((b & (1 << i)) && bit < m_playBehaviour.size()) + if((b & (1 << i)) && bit <= kFT2FinetunePrecision) { m_playBehaviour.set(bit); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Load_mo3.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Load_mo3.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Load_mo3.cpp 2017-03-10 14:12:36.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Load_mo3.cpp 2017-04-03 22:34:10.000000000 +0200 @@ -2027,10 +2027,11 @@ } } - if((GetType() == MOD_TYPE_IT && cwtv > 0x0100 && cwtv < 0x0214) - || (GetType() == MOD_TYPE_S3M && cwtv > 0x3100 && cwtv < 0x3214)) + if((GetType() == MOD_TYPE_IT && cwtv >= 0x0100 && cwtv < 0x0214) + || (GetType() == MOD_TYPE_S3M && cwtv >= 0x3100 && cwtv < 0x3214) + || (GetType() == MOD_TYPE_S3M && cwtv >= 0x1300 && cwtv < 0x1320)) { - // Ignore MIDI data in files made with IT older than version 2.14. + // Ignore MIDI data in files made with IT older than version 2.14 and old ST3 versions. MemsetZero(m_MidiCfg.szMidiSFXExt); MemsetZero(m_MidiCfg.szMidiZXXExt); m_SongFlags.set(SONG_EMBEDMIDICFG); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Load_mod.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Load_mod.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Load_mod.cpp 2017-03-10 01:02:39.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Load_mod.cpp 2017-04-03 22:34:10.000000000 +0200 @@ -439,13 +439,11 @@ // Parse the order list to determine how many patterns are used in the file. -static PATTERNINDEX GetNumPatterns(const FileReader &file, ModSequence &Order, ORDERINDEX numOrders, size_t totalSampleLen, CHANNELINDEX &numChannels, bool checkForWOW) -//---------------------------------------------------------------------------------------------------------------------------------------------------------------------- +static PATTERNINDEX GetNumPatterns(FileReader &file, ModSequence &Order, ORDERINDEX numOrders, SmpLength totalSampleLen, CHANNELINDEX &numChannels, bool checkForWOW) +//------------------------------------------------------------------------------------------------------------------------------------------------------------------- { PATTERNINDEX numPatterns = 0; // Total number of patterns in file (determined by going through the whole order list) with pattern number < 128 -#ifdef _DEBUG PATTERNINDEX officialPatterns = 0; // Number of patterns only found in the "official" part of the order list (i.e. order positions < claimed order length) -#endif PATTERNINDEX numPatternsIllegal = 0; // Total number of patterns in file, also counting in "invalid" pattern indexes >= 128 for(ORDERINDEX ord = 0; ord < 128; ord++) @@ -454,12 +452,10 @@ if(pat < 128 && numPatterns <= pat) { numPatterns = pat + 1; -#ifdef _DEBUG if(ord < numOrders) { officialPatterns = numPatterns; } -#endif } if(pat >= numPatternsIllegal) { @@ -476,11 +472,42 @@ const size_t patternStartOffset = file.GetPosition(); const size_t sizeWithoutPatterns = totalSampleLen + patternStartOffset; - // Check if this is a Mod's Grave WOW file... Never seen one of those, but apparently they *do* exist. - // Basically, WOW files seem to use the M.K. extensions, but are actually 8CHN files. if(checkForWOW && sizeWithoutPatterns + numPatterns * 8 * 256 == file.GetLength()) { + // Check if this is a Mod's Grave WOW file... Never seen one of those, but apparently they *do* exist. + // WOW files should use the M.K. magic but are actually 8CHN files. numChannels = 8; + } else if(numPatterns != officialPatterns && numChannels == 4 && !checkForWOW) + { + // Fix SoundTracker modules where "hidden" patterns should be ignored. + // razor-1911.mod (MD5 b75f0f471b0ae400185585ca05bf7fe8, SHA1 4de31af234229faec00f1e85e1e8f78f405d454b) + // and captain_fizz.mod (MD5 55bd89fe5a8e345df65438dbfc2df94e, SHA1 9e0e8b7dc67939885435ea8d3ff4be7704207a43) + // seem to have the "correct" file size when only taking the "official" patterns into account, + // but they only play correctly when also loading the inofficial patterns. + // On the other hand, the SoundTracker module + // wolf1.mod (MD5 a4983d7a432d324ce8261b019257f4ed, SHA1 aa6b399d02546bcb6baf9ec56a8081730dea3f44), + // wolf3.mod (MD5 af60840815aa9eef43820a7a04417fa6, SHA1 24d6c2e38894f78f6c5c6a4b693a016af8fa037b) + // and jean_baudlot_-_bad_dudes_vs_dragonninja-dragonf.mod (MD5 fa48e0f805b36bdc1833f6b82d22d936, SHA1 39f2f8319f4847fe928b9d88eee19d79310b9f91) + // only play correctly if we ignore the hidden patterns. + // Hence, we have a peek at the first hidden pattern and check if it contains a lot of illegal data. + // If that is the case, we assume it's part of the sample data and only consider the "official" patterns. + file.Seek(patternStartOffset + officialPatterns * 1024); + int illegalBytes = 0; + for(int i = 0; i < 256; i++) + { + uint8 data[4]; + file.ReadArray(data); + if(data[0] & 0xE0) + { + illegalBytes++; + if(illegalBytes > 64) + { + numPatterns = officialPatterns; + break; + } + } + } + file.Seek(patternStartOffset); } #ifdef _DEBUG @@ -489,15 +516,9 @@ // Interestingly, (broken) variants of the ProTracker modules // "killing butterfly" (MD5 bd676358b1dbb40d40f25435e845cf6b, SHA1 9df4ae21214ff753802756b616a0cafaeced8021), // "quartex" by Reflex (MD5 35526bef0fb21cb96394838d94c14bab, SHA1 116756c68c7b6598dcfbad75a043477fcc54c96c), - // and the SoundTracker modules - // razor-1911.mod (MD5 b75f0f471b0ae400185585ca05bf7fe8, SHA1 4de31af234229faec00f1e85e1e8f78f405d454b) - // and captain_fizz.mod (MD5 55bd89fe5a8e345df65438dbfc2df94e, SHA1 9e0e8b7dc67939885435ea8d3ff4be7704207a43) // seem to have the "correct" file size when only taking the "official" patterns into account, but they only play // correctly when also loading the inofficial patterns. - // On the other hand, the SoundTracker module - // wolf1.mod (MD5 a4983d7a432d324ce8261b019257f4ed, SHA1 aa6b399d02546bcb6baf9ec56a8081730dea3f44) - // does not play correctly with the current code. It's just a short jingle, though, so it's probably less - // important to play correctly than the aforementioned modules. + // See also the above check for ambiguities with SoundTracker modules. // Keep this assertion in the code to find potential other broken MODs. if(numPatterns != officialPatterns && sizeWithoutPatterns + officialPatterns * numChannels * 256 == file.GetLength()) { @@ -1043,8 +1064,8 @@ ReadSample(file, sampleHeader, Samples[smp], m_szNames[smp], true); invalidChars += CountInvalidChars(sampleHeader.name); - // Sanity checks - if(invalidChars > 20 + // Sanity checks - invalid character count adjusted for ata.mod (MD5 937b79b54026fa73a1a4d3597c26eace, SHA1 3322ca62258adb9e0ae8e9afe6e0c29d39add874) + if(invalidChars > 48 || sampleHeader.volume > 64 || sampleHeader.finetune != 0 || sampleHeader.length > 32768) @@ -1145,6 +1166,7 @@ // Scan patterns to identify Ultimate Soundtracker modules. uint8 emptyCmds = 0; uint8 numDxx = 0; + uint32 illegalBytes = 0; for(uint32 i = 0; i < numPatterns * 64u * 4u; i++) { uint8 data[4]; @@ -1152,6 +1174,18 @@ const ROWINDEX row = (i / 4u) % 64u; const bool firstInPattern = (i % (64u * 4u)) == 0; const uint8 eff = data[2] & 0x0F, param = data[3]; + if(data[0] & 0xF0) + { + illegalBytes++; + // Reject files that contain a lot of illegal pattern data. + // STK.the final remix (MD5 5ff13cdbd77211d1103be7051a7d89c9, SHA1 e94dba82a5da00a4758ba0c207eb17e3a89c3aa3) + // has one illegal byte, so we only reject after an arbitrary threshold has been passed. + // This also allows to play some rather damaged files like + // crockets.mod (MD5 995ed9f44cab995a0eeb19deb52e2a8b, SHA1 6c79983c3b7d55c9bc110b625eaa07ce9d75f369) + // but naturally we cannot recover the broken data. + if(illegalBytes > 1024) + return false; + } // Check for empty space between the last Dxx command and the beginning of another pattern if(emptyCmds != 0 && !firstInPattern && !memcmp(data, "\0\0\0\0", 4)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Load_stm.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Load_stm.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Load_stm.cpp 2016-07-24 02:55:40.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Load_stm.cpp 2017-04-03 22:41:04.000000000 +0200 @@ -75,9 +75,9 @@ struct PACKED STMFileHeader { char songname[20]; - char trackername[8]; // !SCREAM! for ST 2.xx - uint8 dosEof; // 0x1A - uint8 filetype; // 1=song, 2=module (only 2 is supported, of course) :) + char trackername[8]; // !Scream! for ST 2.xx + uint8 dosEof; // 0x1A + uint8 filetype; // 1=song, 2=module (only 2 is supported, of course) :) uint8 verMajor; uint8 verMinor; uint8 initTempo; // Ticks per row. Keep in mind that effects are only updated on every 16th tick. @@ -119,12 +119,21 @@ { file.Rewind(); + // NOTE: Historically the magic byte check used to be case-insensitive. + // Other libraries (mikmod, xmp, Milkyplay) don't do this. + // ScreamTracker 2 and 3 do not care about the content of the magic bytes at all. + // After reviewing all STM files on ModLand and ModArchive, it was found that the + // case-insensitive comparison is most likely not necessary for any files in the wild. STMFileHeader fileHeader; if(!file.ReadStruct(fileHeader) || fileHeader.filetype != 2 - || fileHeader.dosEof != 0x1A - || (mpt::CompareNoCaseAscii(fileHeader.trackername, "!SCREAM!", 8) - && mpt::CompareNoCaseAscii(fileHeader.trackername, "BMOD2STM", 8)) + || (fileHeader.dosEof != 0x1A && fileHeader.dosEof != 2) // ST2 ignores this, ST3 doesn't. putup10.stm / putup11.stm have dosEof = 2. + || fileHeader.verMajor != 2 + || fileHeader.verMinor > 21 // ST3 only accepts 0, 10, 20 and 21 + || fileHeader.globalVolume > 64 + || (memcmp(fileHeader.trackername, "!Scream!", 8) + && memcmp(fileHeader.trackername, "BMOD2STM", 8) + && memcmp(fileHeader.trackername, "WUZAMOD!", 8)) || !file.CanRead(31 * sizeof(STMSampleHeader) + 128)) { return false; @@ -138,7 +147,7 @@ mpt::String::Read<mpt::String::maybeNullTerminated>(m_songName, fileHeader.songname); // Read STM header - m_madeWithTracker = mpt::String::Print("Scream Tracker %1.%2", fileHeader.verMajor, mpt::fmt::hex0<2>(fileHeader.verMinor)); + m_madeWithTracker = mpt::String::Print("Scream Tracker %1.%2", fileHeader.verMajor, mpt::fmt::dec0<2>(fileHeader.verMinor)); m_nSamples = 31; m_nChannels = 4; m_nMinPeriod = 64; @@ -151,7 +160,7 @@ m_nDefaultSpeed = fileHeader.initTempo; #endif // MODPLUG_TRACKER if(m_nDefaultSpeed < 1) m_nDefaultSpeed = 1; - m_nDefaultGlobalVolume = std::min<uint8>(fileHeader.globalVolume, 64) * 4; + m_nDefaultGlobalVolume = fileHeader.globalVolume * 4u; // Setting up channels for(CHANNELINDEX chn = 0; chn < 4; chn++) @@ -166,6 +175,8 @@ { STMSampleHeader sampleHeader; file.ReadConvertEndianness(sampleHeader); + if(sampleHeader.zero != 0 && sampleHeader.zero != 46) // putup10.stm has zero = 46 + return false; sampleHeader.ConvertToMPT(Samples[smp]); mpt::String::Read<mpt::String::nullTerminated>(m_szNames[smp], sampleHeader.filename); sampleOffsets[smp - 1] = sampleHeader.offset; @@ -175,10 +186,10 @@ Order.ReadAsByte(file, 128); for(ORDERINDEX ord = 0; ord < 128; ord++) { - if(Order[ord] >= 99) - { + if(Order[ord] == 99 || Order[ord] == 255) // 99 is regular, sometimes a single 255 entry can be found too Order[ord] = Order.GetInvalidPatIndex(); - } + else if(Order[ord] > 99) + return false; } for(PATTERNINDEX pat = 0; pat < fileHeader.numPatterns; pat++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/ModSample.cpp new/libopenmpt-0.2.8043-autotools/soundlib/ModSample.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/ModSample.cpp 2017-01-11 02:08:48.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/ModSample.cpp 2017-04-03 22:39:14.000000000 +0200 @@ -89,7 +89,10 @@ { if(nVibRate != 0 && nVibDepth != 0) { - nVibSweep = 255 - nVibSweep; + if(nVibSweep != 0) + nVibSweep = mpt::saturate_cast<uint8>(Util::muldivr_unsigned(nVibDepth, 256, nVibSweep)); + else + nVibSweep = 255; } } // Convert incompatible autovibrato types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/ModSequence.cpp new/libopenmpt-0.2.8043-autotools/soundlib/ModSequence.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/ModSequence.cpp 2016-08-03 16:13:49.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/soundlib/ModSequence.cpp 2017-04-23 03:11:52.000000000 +0200 @@ -683,7 +683,7 @@ { // Oops, some other sequence uses this pattern already. const PATTERNINDEX newPat = m_sndFile.Patterns.InsertAny(m_sndFile.Patterns[nPat].GetNumRows(), true); - if(newPat != SEQUENCEINDEX_INVALID) + if(newPat != PATTERNINDEX_INVALID) { // could create new pattern - copy data over and continue from here. At(nFirstOrder + nOrd) = newPat; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/SampleFormats.cpp new/libopenmpt-0.2.8043-autotools/soundlib/SampleFormats.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/SampleFormats.cpp 2017-03-10 14:12:36.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/SampleFormats.cpp 2017-03-31 14:27:04.000000000 +0200 @@ -3353,7 +3353,7 @@ #if defined(MPT_WITH_MPG123) #elif defined(MPT_ENABLE_MPG123_DYNBIND) mpt::Library MSVCRT; - mpt::Library LIBGCC; + mpt::Library SHLWAPI; #endif // MPT_WITH_MPG123 || MPT_ENABLE_MPG123_DYNBIND #endif // MPT_OS_WINDOWS @@ -3479,18 +3479,15 @@ return false; } #endif // LIBOPENMPT_BUILD - // preload libgcc_s_sjlj-1.dll for the same reasons (32bit only, 64bit libmpg123 does not require it) - MPT_CONSTANT_IF(sizeof(void*) == 4) - { - if(!LIBGCC.IsValid()) LIBGCC = mpt::Library(mpt::LibraryPath::AppFullName(MPT_PATHSTRING("libgcc_s_sjlj-1"))); - #if defined(LIBOPENMPT_BUILD) - // require successful dependency loading for libopenmpt - if(!LIBGCC.IsValid()) - { - return false; - } - #endif // LIBOPENMPT_BUILD - } + // preload shlwapi.dll for the same reasons + if(!SHLWAPI.IsValid()) SHLWAPI = mpt::Library(mpt::LibraryPath::System(MPT_PATHSTRING("shlwapi"))); + #if defined(LIBOPENMPT_BUILD) + // require successful dependency loading for libopenmpt + if(!SHLWAPI.IsValid()) + { + return false; + } + #endif // LIBOPENMPT_BUILD #endif // MPT_OS_WINDOWS #if defined(MODPLUG_TRACKER) AddLibrary("mpg123", mpt::LibraryPath::AppFullName(MPT_PATHSTRING("libmpg123-0"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Snd_fx.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Snd_fx.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Snd_fx.cpp 2017-03-10 01:23:21.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Snd_fx.cpp 2017-03-15 15:05:44.000000000 +0100 @@ -531,7 +531,7 @@ positionJumpOnThisRow = true; memory.state.m_nNextOrder = static_cast<ORDERINDEX>(CalculateXParam(memory.state.m_nPattern, memory.state.m_nRow, nChn)); memory.state.m_nNextPatStartRow = 0; // FT2 E60 bug - // see http://forum.openmpt.org/index.php?topic=2769.0 - FastTracker resets Dxx if Bxx is called _after_ Dxx + // see https://forum.openmpt.org/index.php?topic=2769.0 - FastTracker resets Dxx if Bxx is called _after_ Dxx // Test case: PatternJump.mod if(!patternBreakOnThisRow || (GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM))) memory.state.m_nNextRow = 0; @@ -3205,15 +3205,8 @@ case CMD_POSITIONJUMP: m_PlayState.m_nNextPatStartRow = 0; // FT2 E60 bug nPosJump = static_cast<ORDERINDEX>(CalculateXParam(m_PlayState.m_nPattern, m_PlayState.m_nRow, nChn)); - if(m_SongFlags[SONG_PATTERNLOOP] && m_PlayState.m_nSeqOverride == ORDERINDEX_INVALID) - { - m_PlayState.m_nSeqOverride = nPosJump; - //Releasing pattern loop after position jump could cause - //instant jumps - modifying behavior so that now position jumps - //occurs also when pattern loop is enabled. - } - // see http://forum.openmpt.org/index.php?topic=2769.0 - FastTracker resets Dxx if Bxx is called _after_ Dxx + // see https://forum.openmpt.org/index.php?topic=2769.0 - FastTracker resets Dxx if Bxx is called _after_ Dxx // Test case: PatternJump.mod if((GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM)) && nBreakRow != ROWINDEX_INVALID) { @@ -3341,8 +3334,9 @@ } } - m_PlayState.m_nNextOrder = nPosJump; m_PlayState.m_nNextRow = nBreakRow; + if(!m_SongFlags[SONG_PATTERNLOOP]) + m_PlayState.m_nNextOrder = nPosJump; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Sndmix.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Sndmix.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Sndmix.cpp 2016-11-12 19:23:44.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Sndmix.cpp 2017-03-16 01:27:19.000000000 +0100 @@ -696,30 +696,32 @@ // IT compatibility: IT has its own, more precise tables if(m_playBehaviour[kITVibratoTremoloPanbrello]) { + position &= 0xFF; switch(type & 0x03) { - case 0: + case 0: // Sine default: return ITSinusTable[position]; - case 1: - return ITRampDownTable[position]; - case 2: + case 1: // Ramp down + return 64 - (position + 1) / 2; + case 2: // Square return position < 128 ? 64 : 0; - case 3: + case 3: // Random return mpt::random<int, 7>(AccessPRNG()) - 0x40; } } else { + position &= 0x3F; switch(type & 0x03) { - case 0: + case 0: // Sine default: return ModSinusTable[position]; - case 1: - return ModRampDownTable[position]; - case 2: + case 1: // Ramp down + return (position < 32 ? 0 : 255) - position * 4; + case 2: // Square return position < 32 ? 127 : -127; - case 3: + case 3: // Random return ModRandomTable[position]; } } @@ -1558,7 +1560,6 @@ return; } - // IT compatibility: IT has its own, more precise tables if(m_playBehaviour[kITVibratoTremoloPanbrello]) chn.nVibratoPos = (vibpos + 4 * chn.nVibratoSpeed) & 0xFF; @@ -1625,10 +1626,10 @@ vdelta = mpt::random<int, 7>(AccessPRNG()) - 0x40; break; case VIB_RAMP_DOWN: - vdelta = ITRampDownTable[vibpos]; + vdelta = 64 - (vibpos + 1) / 2; break; case VIB_RAMP_UP: - vdelta = -ITRampDownTable[vibpos]; + vdelta = ((vibpos + 1) / 2) - 64; break; case VIB_SQUARE: vdelta = vibpos < 128 ? 64 : 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Tables.cpp new/libopenmpt-0.2.8043-autotools/soundlib/Tables.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/Tables.cpp 2016-07-17 17:12:51.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Tables.cpp 2017-03-16 01:27:19.000000000 +0100 @@ -388,15 +388,6 @@ -127,-126,-125,-122,-117,-112,-106,-98,-90,-81,-71,-60,-49,-37,-25,-12 }; -// Triangle wave table (ramp down) -const int8 ModRampDownTable[64] = -{ - 0,-4,-8,-12,-16,-20,-24,-28,-32,-36,-40,-44,-48,-52,-56,-60, - -64,-68,-72,-76,-80,-84,-88,-92,-96,-100,-104,-108,-112,-116,-120,-124, - 127,123,119,115,111,107,103,99,95,91,87,83,79,75,71,67, - 63,59,55,51,47,43,39,35,31,27,23,19,15,11,7,3 -}; - // Random wave table const int8 ModRandomTable[64] = { @@ -406,9 +397,7 @@ 42,-34,89,-4,-51,-72,21,-29,112,123,84,-101,-92,98,-54,-95 }; -// Impulse Tracker tables (ITTECH.TXT) - -// Sinus table +// Impulse Tracker sinus table (ITTECH.TXT) const int8 ITSinusTable[256] = { 0, 2, 3, 5, 6, 8, 9, 11, 12, 14, 16, 17, 19, 20, 22, 23, @@ -429,27 +418,6 @@ -24,-23,-22,-20,-19,-17,-16,-14,-12,-11, -9, -8, -6, -5, -3, -2, }; -// Triangle wave table (ramp down) -const int8 ITRampDownTable[256] = -{ - 64, 63, 63, 62, 62, 61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 56, - 56, 55, 55, 54, 54, 53, 53, 52, 52, 51, 51, 50, 50, 49, 49, 48, - 48, 47, 47, 46, 46, 45, 45, 44, 44, 43, 43, 42, 42, 41, 41, 40, - 40, 39, 39, 38, 38, 37, 37, 36, 36, 35, 35, 34, 34, 33, 33, 32, - 32, 31, 31, 30, 30, 29, 29, 28, 28, 27, 27, 26, 26, 25, 25, 24, - 24, 23, 23, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16, - 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8, - 8, 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, - 0, -1, -1, -2, -2, -3, -3, -4, -4, -5, -5, -6, -6, -7, -7, -8, - -8, -9, -9,-10,-10,-11,-11,-12,-12,-13,-13,-14,-14,-15,-15,-16, - -16,-17,-17,-18,-18,-19,-19,-20,-20,-21,-21,-22,-22,-23,-23,-24, - -24,-25,-25,-26,-26,-27,-27,-28,-28,-29,-29,-30,-30,-31,-31,-32, - -32,-33,-33,-34,-34,-35,-35,-36,-36,-37,-37,-38,-38,-39,-39,-40, - -40,-41,-41,-42,-42,-43,-43,-44,-44,-45,-45,-46,-46,-47,-47,-48, - -48,-49,-49,-50,-50,-51,-51,-52,-52,-53,-53,-54,-54,-55,-55,-56, - -56,-57,-57,-58,-58,-59,-59,-60,-60,-61,-61,-62,-62,-63,-63,-64, -}; - // volume fade tables for Retrig Note: const int8 retrigTable1[16] = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/Tables.h new/libopenmpt-0.2.8043-autotools/soundlib/Tables.h --- old/libopenmpt-0.2.7774-autotools/soundlib/Tables.h 2015-11-07 03:40:09.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/soundlib/Tables.h 2017-03-16 01:27:19.000000000 +0100 @@ -23,10 +23,8 @@ extern const uint16 FreqS3MTable[16]; extern const uint16 S3MFineTuneTable[16]; extern const int8 ModSinusTable[64]; -extern const int8 ModRampDownTable[64]; extern const int8 ModRandomTable[64]; extern const int8 ITSinusTable[256]; -extern const int8 ITRampDownTable[256]; extern const int8 retrigTable1[16]; extern const int8 retrigTable2[16]; extern const uint16 XMPeriodTable[104]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/plugins/PluginManager.cpp new/libopenmpt-0.2.8043-autotools/soundlib/plugins/PluginManager.cpp --- old/libopenmpt-0.2.7774-autotools/soundlib/plugins/PluginManager.cpp 2016-07-31 17:59:59.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/soundlib/plugins/PluginManager.cpp 2017-04-14 16:27:04.000000000 +0200 @@ -146,7 +146,12 @@ #endif // DirectX Media Objects - EnumerateDirectXDMOs(); + #ifdef MODPLUG_TRACKER + EnumerateDirectXDMOs(true); + #else // !MODPLUG_TRACKER + // For security reasons, we only load known DMO plugins in libopenmpt. + EnumerateDirectXDMOs(false); + #endif // MODPLUG_TRACKER // Hard-coded "plugins" VSTPluginLib *plug; @@ -264,10 +269,38 @@ } -void CVstPluginManager::EnumerateDirectXDMOs() -//-------------------------------------------- -{ #ifndef NO_DMO + +static GUID make_GUID(uint32 d1, uint16 d2, uint16 d3, uint8 d41, uint8 d42, uint8 d43, uint8 d44, uint8 d45, uint8 d46, uint8 d47, uint8 d48) +{ + GUID guid = { d1, d2, d3, d41, d42, d43, d44, d45, d46, d47, d48 }; + return guid; +} + +static bool IsKnownDMO(const CLSID &clsid) +//---------------------------------------- +{ + if(IsEqualGUID(clsid, make_GUID(0xEFE6629C, 0x81F7, 0x4281u, 0xBD, 0x91, 0xC9, 0xD6, 0x04, 0xA9, 0x5A, 0xF6))) return true; // Chorus + if(IsEqualGUID(clsid, make_GUID(0xEF011F79, 0x4000, 0x406Du, 0x87, 0xAF, 0xBF, 0xFB, 0x3F, 0xC3, 0x9D, 0x57))) return true; // Compressor + if(IsEqualGUID(clsid, make_GUID(0xEF114C90, 0xCD1D, 0x484Eu, 0x96, 0xE5, 0x09, 0xCF, 0xAF, 0x91, 0x2A, 0x21))) return true; // Distortion + if(IsEqualGUID(clsid, make_GUID(0xEF3E932C, 0xD40B, 0x4F51u, 0x8C, 0xCF, 0x3F, 0x98, 0xF1, 0xB2, 0x9D, 0x5D))) return true; // Echo + if(IsEqualGUID(clsid, make_GUID(0xEFCA3D92, 0xDFD8, 0x4672u, 0xA6, 0x03, 0x74, 0x20, 0x89, 0x4B, 0xAD, 0x98))) return true; // Flanger + if(IsEqualGUID(clsid, make_GUID(0xDAFD8210, 0x5711, 0x4B91u, 0x9F, 0xE3, 0xF7, 0x5B, 0x7A, 0xE2, 0x79, 0xBF))) return true; // Gargle + if(IsEqualGUID(clsid, make_GUID(0xEF985E71, 0xD5C7, 0x42D4u, 0xBA, 0x4D, 0x2D, 0x07, 0x3E, 0x2E, 0x96, 0xF4))) return true; // I3DL2Reverb + if(IsEqualGUID(clsid, make_GUID(0x120CED89, 0x3BF4, 0x4173u, 0xA1, 0x32, 0x3C, 0xB4, 0x06, 0xCF, 0x32, 0x31))) return true; // ParamEq + if(IsEqualGUID(clsid, make_GUID(0x87FC0268, 0x9A55, 0x4360u, 0x95, 0xAA, 0x00, 0x4A, 0x1D, 0x9D, 0xE2, 0x6C))) return true; // WavesReverb + return false; +} + +#endif // !NO_DMO + + +void CVstPluginManager::EnumerateDirectXDMOs(bool loadDMOSystemUnknown) +//--------------------------------------------------------------------- +{ +#ifdef NO_DMO + MPT_UNREFERENCED_PARAMETER(loadDMOSystemUnknown); +#else HKEY hkEnum; WCHAR keyname[128]; @@ -281,31 +314,34 @@ std::wstring formattedKey = std::wstring(L"{") + std::wstring(keyname) + std::wstring(L"}"); if(Util::VerifyStringToCLSID(formattedKey, clsid)) { - HKEY hksub; - formattedKey = std::wstring(L"software\\classes\\DirectShow\\MediaObjects\\") + std::wstring(keyname); - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, formattedKey.c_str(), &hksub) == ERROR_SUCCESS) + if(loadDMOSystemUnknown || IsKnownDMO(clsid)) { - WCHAR name[64]; - DWORD datatype = REG_SZ; - DWORD datasize = sizeof(name); - - if(ERROR_SUCCESS == RegQueryValueExW(hksub, nullptr, 0, &datatype, (LPBYTE)name, &datasize)) + HKEY hksub; + formattedKey = std::wstring(L"software\\classes\\DirectShow\\MediaObjects\\") + std::wstring(keyname); + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, formattedKey.c_str(), &hksub) == ERROR_SUCCESS) { - mpt::String::SetNullTerminator(name); + WCHAR name[64]; + DWORD datatype = REG_SZ; + DWORD datasize = sizeof(name); - VSTPluginLib *plug = new (std::nothrow) VSTPluginLib(DMOPlugin::Create, true, mpt::PathString::FromNative(Util::GUIDToString(clsid)), mpt::PathString::FromNative(name)); - if(plug != nullptr) + if(ERROR_SUCCESS == RegQueryValueExW(hksub, nullptr, 0, &datatype, (LPBYTE)name, &datasize)) { - pluginList.push_back(plug); - plug->pluginId1 = kDmoMagic; - plug->pluginId2 = clsid.Data1; - plug->category = VSTPluginLib::catDMO; + mpt::String::SetNullTerminator(name); + + VSTPluginLib *plug = new (std::nothrow) VSTPluginLib(DMOPlugin::Create, true, mpt::PathString::FromNative(Util::GUIDToString(clsid)), mpt::PathString::FromNative(name)); + if(plug != nullptr) + { + pluginList.push_back(plug); + plug->pluginId1 = kDmoMagic; + plug->pluginId2 = clsid.Data1; + plug->category = VSTPluginLib::catDMO; #ifdef DMO_LOG - Log(mpt::String::Print(L"Found \"%1\" clsid=%2\n", plug->libraryName, plug->dllPath)); + Log(mpt::String::Print(L"Found \"%1\" clsid=%2\n", plug->libraryName, plug->dllPath)); #endif + } } + RegCloseKey(hksub); } - RegCloseKey(hksub); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/soundlib/plugins/PluginManager.h new/libopenmpt-0.2.8043-autotools/soundlib/plugins/PluginManager.h --- old/libopenmpt-0.2.7774-autotools/soundlib/plugins/PluginManager.h 2016-04-29 03:11:37.000000000 +0200 +++ new/libopenmpt-0.2.8043-autotools/soundlib/plugins/PluginManager.h 2017-04-14 16:27:04.000000000 +0200 @@ -160,7 +160,7 @@ static void ReportPlugException(const std::string &msg); protected: - void EnumerateDirectXDMOs(); + void EnumerateDirectXDMOs(bool loadDMOSystemUnknown); #else // NO_PLUGINS public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.2.7774-autotools/test/test.cpp new/libopenmpt-0.2.8043-autotools/test/test.cpp --- old/libopenmpt-0.2.7774-autotools/test/test.cpp 2017-03-10 13:26:01.000000000 +0100 +++ new/libopenmpt-0.2.8043-autotools/test/test.cpp 2017-03-11 18:52:19.000000000 +0100 @@ -1211,10 +1211,10 @@ #endif + // Path splitting -#ifdef MODPLUG_TRACKER -#if MPT_OS_WINDOWS +#if MPT_OS_WINDOWS && defined(MPT_ENABLE_DYNBIND) VERIFY_EQUAL(MPT_PATHSTRING("").GetDrive(), MPT_PATHSTRING("")); VERIFY_EQUAL(MPT_PATHSTRING("").GetDir(), MPT_PATHSTRING("")); @@ -1316,9 +1316,6 @@ VERIFY_EQUAL(MPT_PATHSTRING("\\\\?\\UNC\\server\\share\\dir1\\dir2\\name.foo.ext").GetFileName(), MPT_PATHSTRING("name.foo")); VERIFY_EQUAL(MPT_PATHSTRING("\\\\?\\UNC\\server\\share\\dir1\\dir2\\name.foo.ext").GetFileExt(), MPT_PATHSTRING(".ext")); VERIFY_EQUAL(MPT_PATHSTRING("\\\\?\\UNC\\server\\share\\dir1\\dir2\\name.foo.ext").GetFullFileName(), MPT_PATHSTRING("name.foo.ext")); - -#endif - #endif

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2017-06-01 16:28:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Thu Jun 1 16:28:29 2017 rev:240 rq:497300 version:5.0.103 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2017-05-04 08:53:34.415998534 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2017-06-01 16:28:30.926817291 +0200 @@ -1,0 +2,9 @@ +Mon May 22 11:48:48 UTC 2017 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/linuxrc#140 +- enforce linuxrc's maximum screen dimensions properly + (bsc#1027354) +- increase maximun screen size to cover at least 4k displays +- 5.0.103 + +-------------------------------------------------------------------- Old: ---- linuxrc-5.0.102.tar.xz New: ---- linuxrc-5.0.103.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.PaO4ZR/_old 2017-06-01 16:28:31.458742287 +0200 +++ /var/tmp/diff_new_pack.PaO4ZR/_new 2017-06-01 16:28:31.458742287 +0200 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 5.0.102 +Version: 5.0.103 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-5.0.102.tar.xz -> linuxrc-5.0.103.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.102/VERSION new/linuxrc-5.0.103/VERSION --- old/linuxrc-5.0.102/VERSION 2017-04-28 14:12:04.000000000 +0200 +++ new/linuxrc-5.0.103/VERSION 2017-05-22 13:48:48.000000000 +0200 @@ -1 +1 @@ -5.0.102 +5.0.103 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.102/changelog new/linuxrc-5.0.103/changelog --- old/linuxrc-5.0.102/changelog 2017-04-28 14:12:04.000000000 +0200 +++ new/linuxrc-5.0.103/changelog 2017-05-22 13:48:48.000000000 +0200 @@ -1,3 +1,7 @@ +2017-05-19: 5.0.103 + - increase maximun screen size to cover at least 4k displays + - enforce linuxrc's maximum screen dimensions properly (bsc #1027354) + 2017-04-28: 5.0.102 - some small fixes - read license.tar.gz from repomd repositories (fate #322286) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.102/global.h new/linuxrc-5.0.103/global.h --- old/linuxrc-5.0.102/global.h 2017-04-28 14:12:04.000000000 +0200 +++ new/linuxrc-5.0.103/global.h 2017-05-22 13:48:48.000000000 +0200 @@ -83,7 +83,7 @@ /* terminal sizes */ #define X_DEFAULT 80 #define Y_DEFAULT 24 -#define MAX_X 250 +#define MAX_X 500 #define MAX_Y 150 #define MIN_X 8 #define MIN_Y 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.102/keyboard.c new/linuxrc-5.0.103/keyboard.c --- old/linuxrc-5.0.102/keyboard.c 2017-04-28 14:12:04.000000000 +0200 +++ new/linuxrc-5.0.103/keyboard.c 2017-05-22 13:48:48.000000000 +0200 @@ -84,6 +84,7 @@ static void kbd_timeout (int signal_iv); static void get_screen_size(int fd); +static void adjust_screen_size(void); /* @@ -148,15 +149,7 @@ if(first && config.serial) { get_screen_size(config.kbd_fd); - if(max_x_ig > MAX_X) max_x_ig = MAX_X; - if(max_y_ig > MAX_Y) max_y_ig = MAX_Y; - - if(max_x_ig < MIN_X || max_y_ig < MIN_Y) { - max_x_ig = X_DEFAULT; - max_y_ig = Y_DEFAULT; - } - - if(!config.had_segv) log_info("Window size: %d x %d\n", max_x_ig, max_y_ig); + adjust_screen_size(); memset(&winsize_ri, 0, sizeof winsize_ri); @@ -166,6 +159,11 @@ ioctl(config.kbd_fd, TIOCSWINSZ, &winsize_ri); } + if(first) { + adjust_screen_size(); + log_info("Window size: %d x %d\n", max_x_ig, max_y_ig); + } + } @@ -529,3 +527,18 @@ if(fd >= 0) close(fd); } + +/* + * Clip screen size to maximum linuxrc can handle. + */ +void adjust_screen_size() +{ + if(max_x_ig > MAX_X) max_x_ig = MAX_X; + if(max_y_ig > MAX_Y) max_y_ig = MAX_Y; + + if(max_x_ig < MIN_X || max_y_ig < MIN_Y) { + max_x_ig = X_DEFAULT; + max_y_ig = Y_DEFAULT; + } +} +

1 0

commit gpg2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package gpg2 for openSUSE:Factory checked in at 2017-06-01 16:28:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpg2 (Old) and /work/SRC/openSUSE:Factory/.gpg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpg2" Thu Jun 1 16:28:24 2017 rev:117 rq:497286 version:2.1.21 Changes: -------- --- /work/SRC/openSUSE:Factory/gpg2/gpg2.changes 2017-05-20 14:29:31.494874378 +0200 +++ /work/SRC/openSUSE:Factory/.gpg2.new/gpg2.changes 2017-06-01 16:28:27.187344568 +0200 @@ -1,0 +2,7 @@ +Fri May 19 11:59:24 UTC 2017 - marco.strigl(a)suse.com + +- GnuPG 2.1.21: + * modified gnupg-2.0.18-files-are-digests.patch to work with + obs-sign again bsc#1039899 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnupg-2.0.18-files-are-digests.patch ++++++ --- /var/tmp/diff_new_pack.7m638q/_old 2017-06-01 16:28:27.995230654 +0200 +++ /var/tmp/diff_new_pack.7m638q/_new 2017-06-01 16:28:27.995230654 +0200 @@ -4,10 +4,10 @@ g10/sign.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 67 insertions(+), 6 deletions(-) -Index: gnupg-2.1.20/g10/gpg.c +Index: gnupg-2.1.21/g10/gpg.c =================================================================== ---- gnupg-2.1.20.orig/g10/gpg.c 2017-04-03 17:13:56.000000000 +0200 -+++ gnupg-2.1.20/g10/gpg.c 2017-04-04 15:59:20.823799866 +0200 +--- gnupg-2.1.21.orig/g10/gpg.c 2017-04-03 17:13:56.000000000 +0200 ++++ gnupg-2.1.21/g10/gpg.c 2017-04-04 15:59:20.823799866 +0200 @@ -374,6 +374,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, @@ -40,10 +40,10 @@ case oForceMDC: opt.force_mdc = 1; break; case oNoForceMDC: opt.force_mdc = 0; break; -Index: gnupg-2.1.20/g10/options.h +Index: gnupg-2.1.21/g10/options.h =================================================================== ---- gnupg-2.1.20.orig/g10/options.h 2017-04-03 17:13:56.000000000 +0200 -+++ gnupg-2.1.20/g10/options.h 2017-04-04 15:59:20.827799905 +0200 +--- gnupg-2.1.21.orig/g10/options.h 2017-04-03 17:13:56.000000000 +0200 ++++ gnupg-2.1.21/g10/options.h 2017-04-04 15:59:20.827799905 +0200 @@ -214,6 +214,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; @@ -52,10 +52,10 @@ struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.1.20/g10/sign.c +Index: gnupg-2.1.21/g10/sign.c =================================================================== ---- gnupg-2.1.20.orig/g10/sign.c 2017-04-03 17:13:56.000000000 +0200 -+++ gnupg-2.1.20/g10/sign.c 2017-04-04 15:59:27.515864763 +0200 +--- gnupg-2.1.21.orig/g10/sign.c 2017-04-03 17:13:56.000000000 +0200 ++++ gnupg-2.1.21/g10/sign.c 2017-04-04 15:59:27.515864763 +0200 @@ -42,6 +42,8 @@ #include "call-agent.h" #include "../common/mbox-util.h" @@ -65,6 +65,15 @@ #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" #else +@@ -695,6 +697,8 @@ write_signature_packets(ctrl_t ctrl, + if (duration || opt.sig_policy_url + || opt.sig_notations || opt.sig_keyserver_url) + sig->version = 4; ++ else if (opt.files_are_digests) ++ sig->version = 3; + else + sig->version = pk->version; + @@ -718,8 +720,12 @@ write_signature_packets (ctrl_t ctrl, mk_notation_policy_etc (sig, NULL, pk); }

1 0

commit python-traceback2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package python-traceback2 for openSUSE:Factory checked in at 2017-06-01 16:28:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-traceback2 (Old) and /work/SRC/openSUSE:Factory/.python-traceback2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-traceback2" Thu Jun 1 16:28:20 2017 rev:3 rq:497145 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-traceback2/python-traceback2.changes 2017-03-09 01:41:59.929028174 +0100 +++ /work/SRC/openSUSE:Factory/.python-traceback2.new/python-traceback2.changes 2017-06-01 16:28:22.292034823 +0200 @@ -1,0 +2,5 @@ +Mon May 22 07:18:26 UTC 2017 - tbechtold(a)suse.com + +- Add missing python-linecache2 Requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-traceback2.spec ++++++ --- /var/tmp/diff_new_pack.WvO9ZP/_old 2017-06-01 16:28:23.595850980 +0200 +++ /var/tmp/diff_new_pack.WvO9ZP/_new 2017-06-01 16:28:23.599850416 +0200 @@ -21,10 +21,10 @@ Version: 1.4.0 Release: 0 Summary: Backports of the traceback module -License: Python-2.0 -Group: Development/Languages/Python # This is a backport of code taken from the Python codebase, # and such is under the same license as Python as a whole. +License: Python-2.0 +Group: Development/Languages/Python Url: https://github.com/bitprophet/traceback2 Source: https://pypi.io/packages/source/t/traceback2/traceback2-%{version}.tar.gz BuildRequires: %{python_module devel} @@ -32,6 +32,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-linecache2 Requires: python-pbr BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch

1 0

commit pcsc-lite for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at 2017-06-01 16:28:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old) and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcsc-lite" Thu Jun 1 16:28:14 2017 rev:73 rq:497142 version:1.8.21 Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2017-01-15 11:14:00.600976292 +0100 +++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2017-06-01 16:28:15.564983359 +0200 @@ -1,0 +2,19 @@ +Mon May 22 05:46:15 UTC 2017 - wr(a)rosenauer.org + +- Updated to version 1.8.21 + * SCardCancel(): + - fix a race condition bug + - fix a possible use after free + - improve Doxygen documentation + * SCardGetStatusChange(): fix a race condition when a reader is removed + * SCardDisconnect(): fix status update for SCARD_UNPOWER_CARD + * pcsc_stringify_error(): use Thread-local storage + * pcsc_stringify_error() now returns a const char * + * SCardControl() may return SCARD_E_INSUFFICIENT_BUFFER when + pbRecvBuffer is not big enough to receive the card response. + * Fix compilation error with GCC 4.9 + * UnitaryTests: add support of Python 3 + * pcsc-spy: add support of Python 3 + * Some other minor improvements + +------------------------------------------------------------------- Old: ---- pcsc-lite-1.8.20.tar.bz2 pcsc-lite-1.8.20.tar.bz2.asc New: ---- pcsc-lite-1.8.21.tar.bz2 pcsc-lite-1.8.21.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.omTo8a/_old 2017-06-01 16:28:16.304879031 +0200 +++ /var/tmp/diff_new_pack.omTo8a/_new 2017-06-01 16:28:16.308878468 +0200 @@ -21,7 +21,7 @@ %define USER scard %define GROUP scard Name: pcsc-lite -Version: 1.8.20 +Version: 1.8.21 Release: 0 Summary: PCSC Smart Cards Library License: BSD-3-Clause ++++++ pcsc-lite-1.8.20.tar.bz2 -> pcsc-lite-1.8.21.tar.bz2 ++++++ ++++ 3569 lines of diff (skipped)

1 0

commit rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2017-06-01 16:28:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog" Thu Jun 1 16:28:08 2017 rev:126 rq:497140 version:8.27.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2017-04-11 12:42:29.893186794 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2017-06-01 16:28:10.169744107 +0200 @@ -1,0 +2,53 @@ +Thu May 18 12:38:04 UTC 2017 - dziolkowski(a)suse.com + +Version 8.27.0 [v8-stable] 2017-05-16 +- imkafka: add module +- imptcp enhancements: + * optionally emit an error message if incoming messages are truncated + * optionally emit connection tracking message (on connection create and + close) + * add "maxFrameSize" parameter to specify the maximum size permitted + in octet-counted mode + * add parameter "discardTruncatedMsg" to permit truncation of + oversize messages + * improve octect-counted mode detection: if the octet count is larger + then the set frame size (or overly large in general), it is now + assumed that octet-stuffing mode is used. This probably solves a + number of issues seen in real deployments. +- imtcp enhancements: + * add parameter "discardTruncatedMsg" to permit truncation of + oversize messages + * add "maxFrameSize" parameter to specify the maximum size permitted + in octet-counted mode +- imfile bugfix: "file not found error" repeatedly being reported + for configured non-existing file. In polling mode, this message + appeared once in each polling cycle, causing a potentially very large + amout of error messages. Note that they were usually emitted too + infrequently to trigger the error message rate limiter, albeit often + enough to be a major annoance. +- imfile: in inotify mode, add error message if configured file cannot + be found +- imfile: add parameter "fileNotFoundError" to optinally disable + "file not found" error messages +- core: replaced gethostbyname() with getaddrinfo() call + Gethostbyname() is generally considered obsolete, is not reentrant and + cannot really work with IPv6. Changed the only place in rsyslog where + this call remained. + Thanks to github user jvymazal for the patch +- omkafka: add "origin" field to stats output + See also https://github.com/rsyslog/rsyslog/issues/1508 + Thanks to Yury Bushmelev for providing the patch. +- imuxsock: rate-limiting also uses process name + both for the actual limit procesing as well as warning messages emitted + see also https://github.com/rsyslog/rsyslog/pull/1520 + Thanks to github user jvymazal for the patch +- Added new module: KSI log signing ver. 1.2 (lmsig_ksi_ls12) +- rsylsog base functionality now builds on osx (Mac) + Thanks to github user hdatma for his help in getting this done. +- build now works on solaris again +- imfile: fix cross-platform build issue + see also https://github.com/rsyslog/rsyslog/issues/1494 + Thanks to Felix Janda for bug report and solution suggestion. +- bugfix core: segfault when no parser could parse message + +------------------------------------------------------------------- Old: ---- rsyslog-8.26.0.tar.gz rsyslog-doc-8.26.0.tar.gz New: ---- rsyslog-8.27.0.tar.gz rsyslog-doc-8.27.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.s7SZAO/_old 2017-06-01 16:28:11.029622861 +0200 +++ /var/tmp/diff_new_pack.s7SZAO/_new 2017-06-01 16:28:11.029622861 +0200 @@ -20,7 +20,7 @@ Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 8.26.0 +Version: 8.27.0 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd ++++++ rsyslog-8.26.0.tar.gz -> rsyslog-8.27.0.tar.gz ++++++ ++++ 11064 lines of diff (skipped) ++++++ rsyslog-doc-8.26.0.tar.gz -> rsyslog-doc-8.27.0.tar.gz ++++++ ++++ 11895 lines of diff (skipped)

1 0

commit libseccomp for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package libseccomp for openSUSE:Factory checked in at 2017-06-01 16:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libseccomp (Old) and /work/SRC/openSUSE:Factory/.libseccomp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libseccomp" Thu Jun 1 16:28:03 2017 rev:18 rq:497126 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libseccomp/libseccomp.changes 2016-05-24 09:33:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libseccomp.new/libseccomp.changes 2017-06-01 16:28:04.466548277 +0200 @@ -1,0 +2,20 @@ +Sun May 21 22:31:41 UTC 2017 - jengelh(a)inai.de + +- Unconditionally rerun autoreconf because of patches + +------------------------------------------------------------------- +Sun May 21 18:07:04 UTC 2017 - tchvatal(a)suse.com + +- Update to release 2.3.2: + * Achieved full compliance with the CII Best Practices program + * Added Travis CI builds to the GitHub repository + * Added code coverage reporting with the "--enable-code-coverage" configure + flag and added Coveralls to the GitHub repository + * Updated the syscall tables to match Linux v4.10-rc6+ + * Support for building with Python v3.x + * Allow rules with the -1 syscall if the SCMP\_FLTATR\_API\_TSKIP attribute is + set to true + * Several small documentation fixes +- Remove service file as we are not based on git + +------------------------------------------------------------------- Old: ---- _service libseccomp-2.3.1.tar.gz libseccomp-2.3.1.tar.gz.SHA256SUM.asc New: ---- libseccomp-2.3.2.tar.gz libseccomp-2.3.2.tar.gz.SHA256SUM.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libseccomp.spec ++++++ --- /var/tmp/diff_new_pack.iBMK4O/_old 2017-06-01 16:28:05.070463123 +0200 +++ /var/tmp/diff_new_pack.iBMK4O/_new 2017-06-01 16:28:05.074462559 +0200 @@ -1,7 +1,7 @@ # # spec file for package libseccomp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,26 +16,25 @@ # -Name: libseccomp %define lname libseccomp2 -Version: 2.3.1 +Name: libseccomp +Version: 2.3.2 Release: 0 Summary: An enhanced Seccomp (mode 2) helper library License: LGPL-2.1 Group: Development/Libraries/C and C++ Url: http://github.com/seccomp - #Git-Clone: git://github.com/seccomp/libseccomp Source: https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%ve… Source2: https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%ve… Source99: baselibs.conf Patch1: no-static.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.11 BuildRequires: fdupes BuildRequires: libtool >= 2 BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The libseccomp library provides and easy to use, platform @@ -101,10 +100,13 @@ %build if [ ! -f configure ]; then - perl -i -pe 's{AC_INIT$\[libseccomp\], \[0\.0\.0\]$}{AC_INIT([libseccomp], [2.3.0])}' configure.ac + perl -i -pe 's{\QAC_INIT([libseccomp], [0.0.0])\E}{AC_INIT([libseccomp], [%version])}' configure.ac fi -autoreconf -fi -%configure --includedir="%_includedir/%name" --disable-static +autoreconf -fiv +%configure \ + --includedir="%_includedir/%name" \ + --disable-static \ + --disable-silent-rules make %{?_smp_mflags} %install ++++++ libseccomp-2.3.1.tar.gz -> libseccomp-2.3.2.tar.gz ++++++ ++++ 6006 lines of diff (skipped) ++++++ libseccomp-2.3.1.tar.gz.SHA256SUM.asc -> libseccomp-2.3.2.tar.gz.SHA256SUM.asc ++++++ --- /work/SRC/openSUSE:Factory/libseccomp/libseccomp-2.3.1.tar.gz.SHA256SUM.asc 2016-05-24 09:33:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libseccomp.new/libseccomp-2.3.2.tar.gz.SHA256SUM.asc 2017-06-01 16:28:04.450550533 +0200 @@ -1,21 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -ff5bdd2168790f1979e24eaa498f8606c2f2d96f08a8dc4006a2e88affa4562b libseccomp-2.3.1.tar.gz +3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1 libseccomp-2.3.2.tar.gz -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 -iQIcBAEBCAAGBQJXF+KwAAoJEFXkWlroynyKcUcP/18AlU1aohqM1V3KkUQgLv6P -Ka6ZPddIdS3BqcXxScPhNUQuSK2QuxcxZb+RBXGS9Cx/zYrlcXrv6M0Uzgc5q9jB -IS4fYHj8yB4odmjMWb1wohrwXHrt5+lmTsGmw7apKkuqeOjwFdKqaR10eWd7DaSq -tJAQ7evImCRM3rsIXk0hvtkDCon5K5LZieHjejJ59D2z9Nrghp2Urf8dXwT1uFPq -bFZ4AngMzs41K5052iWVZGAskcyi4tc8f11gd2Ao34rP6hmW0VaJCKszyvC0gOqV -jBtHMwf3OwjuU9xUKHEqEB1uoF1AxZnwS3mkXBeli414XXXI8rKLtJUylyjJ+3b0 -CT6puXmoscBJaDxe6oVm6yRZrHOp3TtQzTVV0uAABiQcDbbIlmjRMvOTYcjispH8 -73CRupEb3eTl5Kwx/yB/0Z+ml0FI9pnB8UtaiBGJIfqL/uIEPcio4UxR4YJR0NiN -Euc2pBVUHdK6bVIcc4ntLc9aaqxVvGj5Nvsy+ptfnUTWJ0MvzyX6mYsp5/iUNAL2 -lLux66+rUqr+GU2o+USNXIQ+CIb1mLZizYtgxYrEjE+fyVJWb9hoEHRIzuzdLI4d -ZMJcCxe2QdHzl1CNtGalC0q4XDXJf9swxW4WjGFODkrdt5tG2zyjJ0WkscgduWCZ -1BBGwp05jg84FtP5DzNE -=JDAl +iQIzBAEBCAAdFiEEcQCq365ubpQNLgrWVeRaWujKfIoFAli0tTAACgkQVeRaWujK +fIqYmg//SfsNKhEp39s3TeTX0pO8yUxileseW8zUGWQi9RJhI9f37DRacCWeafEi +3HetRH0ZOuTu+iI9RfpnqJrETX3ZUXyPpK/7in8kXjpKxV3zpGm1CSMqWEQfiIJp +JcuQiyJDWinub0KDBxhPlBFfry9sF34x/gD5Vp+xD/XPw9nPwGM1LcS3wx3olObK +osFqS0Rdx4dMeH1dMS841WDJobo4PSaOYerleEwGkCpvjWLEveyRlzzSq/4ZW7Wc +kq67cA34uKv3Le7AdG3Soq3DWpFFfN7Jy7PiYXy3FISNYXCQ7dRHGzUYqi9r3L9/ +sKhKutWOx/YupAlaxI9kNPiURkXp04c3NeaueylZ5wWmKAQKGo2Z6F4qgaPrqOQp +Nhru/XgXUsIb95/UGOYbioTiVIaXjgpC8MdTCXmuGkXFVcyG2XZbSoXxN6Xmdld9 +dOQeJitgPibBzmM+qseJDox4fCSRI2fbBtf2WZmBlr2SHLWxWvdgjFyaKwWmngLc +v/NcN7imXYFv/0semx91UHxbKaG9UtPybejCbtheNm/ZpS7rB+LbwSdCMI389xlZ +lTU73MIU6Q+fOByrxMg2gAgLdD3SjO37BZmsEFmbJu5Ow0bmPIYA5JHYFkqsJRwy +pJ273jGG29+aCneM/Yq64yGbNSvVSBBYUoKb4hRqBoaDTqCmtCo= +=nLJ/ -----END PGP SIGNATURE-----

1 0

commit libcryptopp for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package libcryptopp for openSUSE:Factory checked in at 2017-06-01 16:27:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcryptopp (Old) and /work/SRC/openSUSE:Factory/.libcryptopp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcryptopp" Thu Jun 1 16:27:59 2017 rev:29 rq:497073 version:5.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libcryptopp/libcryptopp.changes 2017-03-10 20:47:49.827634068 +0100 +++ /work/SRC/openSUSE:Factory/.libcryptopp.new/libcryptopp.changes 2017-06-01 16:28:01.035032133 +0200 @@ -1,0 +2,5 @@ +Sat May 20 19:45:06 UTC 2017 - bwiedemann(a)suse.com + +- Add reproducible.patch to sort input files to make build fully reproducible + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptopp.spec ++++++ --- /var/tmp/diff_new_pack.KMr8hC/_old 2017-06-01 16:28:01.742932317 +0200 +++ /var/tmp/diff_new_pack.KMr8hC/_new 2017-06-01 16:28:01.742932317 +0200 @@ -40,6 +40,8 @@ Patch1: libcryptopp-shared.patch # PATCH-BUILDFIX-OPENSUSE 0001-disable_os_rng_test.patch sfalken(a)opensuse.org -- disable OS Random Number Generator test Patch4: 0001-disable_os_rng_test.patch +# PATCH-FIX-UPSTREAM reproducible.patch bmwiedemann https://github.com/weidai11/cryptopp +Patch5: reproducible.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: unzip @@ -79,6 +81,7 @@ %setup -q -c "%{name}-%{version}" %patch1 -p0 %patch4 -p1 +%patch5 -p1 echo %{major}.%{minor}.%{patch} echo %{pkg_version} #mv config.recommend config.h ++++++ reproducible.patch ++++++ Index: libcryptopp-5.6.5/GNUmakefile =================================================================== --- libcryptopp-5.6.5.orig/GNUmakefile +++ libcryptopp-5.6.5/GNUmakefile @@ -413,7 +413,7 @@ endif # HAS_SOLIB_VERSION ########################################################### # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems. -SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integer.cpp pch.cpp simple.cpp winpipes.cpp cryptlib_bds.cpp,$(wildcard *.cpp)) +SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integer.cpp pch.cpp simple.cpp winpipes.cpp cryptlib_bds.cpp,$(sort $(wildcard *.cpp))) # Need CPU for X86/X64/X32 and ARM ifeq ($(IS_X86)$(IS_X64)$(IS_ARM32)$(IS_ARM64),0000)

1 0

commit openmpi for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package openmpi for openSUSE:Factory checked in at 2017-06-01 16:27:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi (Old) and /work/SRC/openSUSE:Factory/.openmpi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openmpi" Thu Jun 1 16:27:54 2017 rev:60 rq:496616 version:1.10.7 Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi/openmpi-testsuite.changes 2017-05-18 20:44:19.273121535 +0200 +++ /work/SRC/openSUSE:Factory/.openmpi.new/openmpi-testsuite.changes 2017-06-01 16:27:57.091588174 +0200 @@ -1,0 +2,43 @@ +Thu May 18 15:40:25 UTC 2017 - nmoreychaisemartin(a)suse.com + +- Update to openmpi 1.10.7 + * Fix bug in TCP BTL that impacted performance on 10GbE (and faster) + networks by not adjusting the TCP send/recv buffer sizes and using + system default values + * Add missing MPI_AINT_ADD and MPI_AINT_DIFF function delcarations in + mpif.h + * Fixed time reported by MPI_WTIME; it was previously reported as + dependent upon the CPU frequency. + * Fix platform detection on FreeBSD + * Fix a bug in the handling of MPI_TYPE_CREATE_DARRAY in + MPI_(R)(GET_)ACCUMULATE + * Fix openib memory registration limit calculation + * Add missing MPI_T_PVAR_SESSION_NULL in mpi.h + * Fix "make distcheck" when using external hwloc and/or libevent packages + * Add latest ConnectX-5 vendor part id to OpenIB device params + * Fix race condition in the UCX PML + * Fix signal handling for rsh launcher + * Fix Fortran compilation errors by removing MPI_SIZEOF in the Fortran + interfaces when the compiler does not support it + * Fixes for the pre-ignore-TKR "mpi" Fortran module implementation + (i.e., for older Fortran compilers - * these problems did not exist + in the "mpi" module implementation for modern Fortran compilers): + * Add PMPI_* interfaces + * Fix typo in MPI_FILE_WRITE_AT_ALL_BEGIN interface name + * Fix typo in MPI_FILE_READ_ORDERED_BEGIN interface name + * Fixed the type of MPI_DISPLACEMENT_CURRENT in all Fortran interfaces + to be an INTEGER(KIND=MPI_OFFSET_KIND). + * Fixed typos in MPI_INFO_GET_* man pages. + * Fix typo bugs in wrapper compiler script + +------------------------------------------------------------------- +Thu May 18 12:53:35 UTC 2017 - nmoreychaisemartin(a)suse.com + +- spec file cleanup +- Replace openmpi-no_date_and_time.patch by + openmpi-avoid-a-date-string-in-compiled-code.patch to use + --with-package-string for custom names. +- Disable static build by default +- When static build is enabled, use --enable-static + +------------------------------------------------------------------- openmpi.changes: same change Old: ---- openmpi-1.10.6.tar.bz2 openmpi-no_date_and_time.patch New: ---- openmpi-1.10.7.tar.bz2 openmpi-avoid-a-date-string-in-compiled-code.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.ea2sAo/_old 2017-06-01 16:27:58.131441550 +0200 +++ /var/tmp/diff_new_pack.ea2sAo/_new 2017-06-01 16:27:58.131441550 +0200 @@ -22,16 +22,12 @@ # This will create the -testsuite spec and changes. # ########################################################################## -%if 0%{suse_version} > 1310 -%define with_openib 1 -%else -%define with_openib 0 -%endif - -%define build_static_devel 1 +# Static libraries are disabled by default +# To enable them, simply uncomment: +# % define build_static_devel 1 Name: openmpi-testsuite -Version: 1.10.6 +Version: 1.10.7 Release: 0 Summary: A powerful implementaion of MPI License: BSD-3-Clause @@ -42,7 +38,7 @@ Source2: mpivars.csh Source3: baselibs.conf Source4: openmpi-rpmlintrc -Patch1: openmpi-no_date_and_time.patch +Patch1: openmpi-avoid-a-date-string-in-compiled-code.patch Patch2: openmpi-no_network_in_build.patch Patch3: openmpi-1.8.3-fix-bashisms.patch Patch4: openmpi-etc-files.patch @@ -54,29 +50,20 @@ BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran +BuildRequires: libibumad-devel +BuildRequires: libibverbs-devel BuildRequires: libtool BuildRequires: mpi-selector BuildRequires: zlib-devel -%if %{with_openib} -# For transition to rdma-core make sure the new packages are selected -# Once the transition is made the version check can be removed -BuildRequires: libibumad-devel >= 12 -BuildRequires: libibverbs-devel >= 12 -%endif - -%ifarch x86_64 -BuildRequires: numactl -%endif - %ifarch %{ix86} x86_64 -%if %{with_openib} BuildRequires: infinipath-psm-devel +%endif + %ifarch x86_64 BuildRequires: libfabric-devel BuildRequires: libpsm2-devel -%endif -%endif +BuildRequires: numactl %endif %if "%{name}" == "openmpi-testsuite" @@ -122,12 +109,10 @@ %package devel Summary: SDK for openMPI Group: Development/Libraries/Parallel -Requires: libstdc++-devel -Requires: openmpi = %{version} -%if %{with_openib} Requires: libibumad-devel Requires: libibverbs-devel -%endif +Requires: libstdc++-devel +Requires: openmpi = %{version} %description devel OpenMPI is an implementation of the Message Passing Interface, a @@ -139,7 +124,7 @@ This RPM contains all the wrappers necessary to compile, link, and run Open MPI jobs. -%if %{build_static_devel} +%if 0%{?build_static_devel} %package devel-static Summary: Static openMPI libraries Group: Development/Libraries/Parallel @@ -160,18 +145,15 @@ %prep %setup -q -n openmpi-%{version} -%patch1 +%patch1 -p1 %patch2 %patch3 -p1 %patch4 %build -%if 0%{suse_version} >= 1315 # To force rebuilding Makefile.in rm -f ompi/debuggers/Makefile.in - ./autogen.sh -%endif %configure --prefix="%{mpi_prefix}" \ --exec-prefix="%{mpi_prefix}" \ @@ -180,26 +162,24 @@ --includedir="%{mpi_includedir}" \ --libdir="%{mpi_libdir}" \ --mandir="%{mpi_mandir}" \ - --disable-static \ - --enable-builtin-atomics \ + %{?build_static_devel:--enable-static} \ + %{!?build_static_devel:--disable-static} \ --with-libltdl=%{_prefix} \ -%if %{with_openib} --with-verbs \ -%endif - --enable-mpi-thread-multiple \ - --with-threads \ %ifarch %{ix86} x86_64 -%if %with_openib --with-psm \ +%endif %ifarch x86_64 --with-psm2 \ %endif -%endif -%endif + --enable-mpi-thread-multiple \ + --with-threads \ --with-package-string="Open MPI Distribution for SUSE" \ --enable-mpi-fortran=usempi \ --disable-silent-rules \ + --with-package-string="Open MPI Distribution for %{?is_opensuse:openSUSE}%{!?is_opensuse:SLE}" \ --enable-builtin-atomics + make %{?_smp_mflags} %if "%{name}" == "openmpi-testsuite" @@ -234,11 +214,11 @@ done pushd %{buildroot}%{mpi_libdir} -rm libopen-trace-format.la -rm libotfaux.la - -%if !%{build_static_devel} +%if !0%{?build_static_devel} find -name '*.la' -print0 | xargs -0 rm -f +#even with disable static this one gets generated +rm -f libvt-pomp.a + %else for f in libvt\*.la; do sed -i 's%%-L.*.libs %%%%g' $f @@ -325,9 +305,7 @@ %if 0%{?suse_version} <= 1320 %dir %{mpi_datadir}/openmpi/doc %endif -%if %with_openib %{mpi_datadir}/openmpi/amca-param-sets/btl-openib-benchmark -%endif %{mpi_datadir}/openmpi/amca-param-sets/example.conf %if 0%{?suse_version} <= 1320 %{mpi_datadir}/openmpi/doc/COPYRIGHT-ptmalloc2.txt @@ -407,7 +385,6 @@ %{mpi_helpdir}/help-oshmem-memheap.txt %{mpi_helpdir}/help-oshmem-spml-yoda.txt %{mpi_helpdir}/help-oshmem-sshmem.txt -%if %with_openib %ifarch %ix86 x86_64 %{mpi_helpdir}/help-mtl-psm.txt %endif @@ -416,10 +393,7 @@ %{mpi_helpdir}/help-mpi-btl-usnic.txt %{mpi_helpdir}/help-mtl-ofi.txt %endif -%endif -%if %with_openib %{mpi_datadir}/openmpi/help-ompi-common-verbs.txt -%endif %{mpi_helpdir}/help-ompi-crcp-base.txt %{mpi_helpdir}/help-ompi-dpm-base.txt %{mpi_helpdir}/help-ompi-dpm-orte.txt @@ -476,15 +450,13 @@ %ifarch %ix86 x86_64 ppc64 %{mpi_helpdir}/help-opal-timer-linux.txt %endif -# Opal memory linux does not work on glibc > 2.25 -%if 0%{suse_version} < 1330 + +%if 0%{?suse_version} <= 1320 %{mpi_datadir}/openmpi/doc/COPYRIGHT-ptmalloc2.txt %{mpi_helpdir}/help-opal-memory-linux.txt %endif -%if %with_openib %{mpi_datadir}/openmpi/mca-btl-openib-device-params.ini -%endif %{mpi_datadir}/openmpi/mca-coll-ml.config %files libs @@ -595,12 +567,13 @@ %{mpi_libdir}/*.so %{mpi_libdir}/pkgconfig/*.pc -%if %{build_static_devel} +%if 0%{?build_static_devel} %files devel-static %defattr(-, root, root) %{mpi_libdir}/*.la %{mpi_libdir}/openmpi/*.la %{mpi_libdir}/*.a +%{mpi_libdir}/openmpi/*.a %endif %else ++++++ openmpi.spec ++++++ --- /var/tmp/diff_new_pack.ea2sAo/_old 2017-06-01 16:27:58.155438166 +0200 +++ /var/tmp/diff_new_pack.ea2sAo/_new 2017-06-01 16:27:58.155438166 +0200 @@ -22,16 +22,12 @@ # This will create the -testsuite spec and changes. # ########################################################################## -%if 0%{suse_version} > 1310 -%define with_openib 1 -%else -%define with_openib 0 -%endif - -%define build_static_devel 1 +# Static libraries are disabled by default +# To enable them, simply uncomment: +# % define build_static_devel 1 Name: openmpi -Version: 1.10.6 +Version: 1.10.7 Release: 0 Summary: A powerful implementaion of MPI License: BSD-3-Clause @@ -42,7 +38,7 @@ Source2: mpivars.csh Source3: baselibs.conf Source4: openmpi-rpmlintrc -Patch1: openmpi-no_date_and_time.patch +Patch1: openmpi-avoid-a-date-string-in-compiled-code.patch Patch2: openmpi-no_network_in_build.patch Patch3: openmpi-1.8.3-fix-bashisms.patch Patch4: openmpi-etc-files.patch @@ -54,29 +50,20 @@ BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran +BuildRequires: libibumad-devel +BuildRequires: libibverbs-devel BuildRequires: libtool BuildRequires: mpi-selector BuildRequires: zlib-devel -%if %{with_openib} -# For transition to rdma-core make sure the new packages are selected -# Once the transition is made the version check can be removed -BuildRequires: libibumad-devel >= 12 -BuildRequires: libibverbs-devel >= 12 -%endif - -%ifarch x86_64 -BuildRequires: numactl -%endif - %ifarch %{ix86} x86_64 -%if %{with_openib} BuildRequires: infinipath-psm-devel +%endif + %ifarch x86_64 BuildRequires: libfabric-devel BuildRequires: libpsm2-devel -%endif -%endif +BuildRequires: numactl %endif %if "%{name}" == "openmpi-testsuite" @@ -122,12 +109,10 @@ %package devel Summary: SDK for openMPI Group: Development/Libraries/Parallel -Requires: libstdc++-devel -Requires: openmpi = %{version} -%if %{with_openib} Requires: libibumad-devel Requires: libibverbs-devel -%endif +Requires: libstdc++-devel +Requires: openmpi = %{version} %description devel OpenMPI is an implementation of the Message Passing Interface, a @@ -139,7 +124,7 @@ This RPM contains all the wrappers necessary to compile, link, and run Open MPI jobs. -%if %{build_static_devel} +%if 0%{?build_static_devel} %package devel-static Summary: Static openMPI libraries Group: Development/Libraries/Parallel @@ -160,18 +145,15 @@ %prep %setup -q -n openmpi-%{version} -%patch1 +%patch1 -p1 %patch2 %patch3 -p1 %patch4 %build -%if 0%{suse_version} >= 1315 # To force rebuilding Makefile.in rm -f ompi/debuggers/Makefile.in - ./autogen.sh -%endif %configure --prefix="%{mpi_prefix}" \ --exec-prefix="%{mpi_prefix}" \ @@ -180,26 +162,24 @@ --includedir="%{mpi_includedir}" \ --libdir="%{mpi_libdir}" \ --mandir="%{mpi_mandir}" \ - --disable-static \ - --enable-builtin-atomics \ + %{?build_static_devel:--enable-static} \ + %{!?build_static_devel:--disable-static} \ --with-libltdl=%{_prefix} \ -%if %{with_openib} --with-verbs \ -%endif - --enable-mpi-thread-multiple \ - --with-threads \ %ifarch %{ix86} x86_64 -%if %with_openib --with-psm \ +%endif %ifarch x86_64 --with-psm2 \ %endif -%endif -%endif + --enable-mpi-thread-multiple \ + --with-threads \ --with-package-string="Open MPI Distribution for SUSE" \ --enable-mpi-fortran=usempi \ --disable-silent-rules \ + --with-package-string="Open MPI Distribution for %{?is_opensuse:openSUSE}%{!?is_opensuse:SLE}" \ --enable-builtin-atomics + make %{?_smp_mflags} %if "%{name}" == "openmpi-testsuite" @@ -234,11 +214,11 @@ done pushd %{buildroot}%{mpi_libdir} -rm libopen-trace-format.la -rm libotfaux.la - -%if !%{build_static_devel} +%if !0%{?build_static_devel} find -name '*.la' -print0 | xargs -0 rm -f +#even with disable static this one gets generated +rm -f libvt-pomp.a + %else for f in libvt\*.la; do sed -i 's%%-L.*.libs %%%%g' $f @@ -325,9 +305,7 @@ %if 0%{?suse_version} <= 1320 %dir %{mpi_datadir}/openmpi/doc %endif -%if %with_openib %{mpi_datadir}/openmpi/amca-param-sets/btl-openib-benchmark -%endif %{mpi_datadir}/openmpi/amca-param-sets/example.conf %if 0%{?suse_version} <= 1320 %{mpi_datadir}/openmpi/doc/COPYRIGHT-ptmalloc2.txt @@ -407,7 +385,6 @@ %{mpi_helpdir}/help-oshmem-memheap.txt %{mpi_helpdir}/help-oshmem-spml-yoda.txt %{mpi_helpdir}/help-oshmem-sshmem.txt -%if %with_openib %ifarch %ix86 x86_64 %{mpi_helpdir}/help-mtl-psm.txt %endif @@ -416,10 +393,7 @@ %{mpi_helpdir}/help-mpi-btl-usnic.txt %{mpi_helpdir}/help-mtl-ofi.txt %endif -%endif -%if %with_openib %{mpi_datadir}/openmpi/help-ompi-common-verbs.txt -%endif %{mpi_helpdir}/help-ompi-crcp-base.txt %{mpi_helpdir}/help-ompi-dpm-base.txt %{mpi_helpdir}/help-ompi-dpm-orte.txt @@ -476,15 +450,13 @@ %ifarch %ix86 x86_64 ppc64 %{mpi_helpdir}/help-opal-timer-linux.txt %endif -# Opal memory linux does not work on glibc > 2.25 -%if 0%{suse_version} < 1330 + +%if 0%{?suse_version} <= 1320 %{mpi_datadir}/openmpi/doc/COPYRIGHT-ptmalloc2.txt %{mpi_helpdir}/help-opal-memory-linux.txt %endif -%if %with_openib %{mpi_datadir}/openmpi/mca-btl-openib-device-params.ini -%endif %{mpi_datadir}/openmpi/mca-coll-ml.config %files libs @@ -595,12 +567,13 @@ %{mpi_libdir}/*.so %{mpi_libdir}/pkgconfig/*.pc -%if %{build_static_devel} +%if 0%{?build_static_devel} %files devel-static %defattr(-, root, root) %{mpi_libdir}/*.la %{mpi_libdir}/openmpi/*.la %{mpi_libdir}/*.a +%{mpi_libdir}/openmpi/*.a %endif %else ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ea2sAo/_old 2017-06-01 16:27:58.191433091 +0200 +++ /var/tmp/diff_new_pack.ea2sAo/_new 2017-06-01 16:27:58.191433091 +0200 @@ -5,8 +5,8 @@ <param name="package-meta">no</param> <param name="exclude">.git</param> <param name="filename">openmpi</param> - <param name="version">1.10.6</param> - <param name="revision">9f72c7c465f4dff8feec4bf9212294306dbb74f7</param> + <param name="version">1.10.7</param> + <param name="revision">5e373bf1fdc02114aed5f3cb4da1137e99d9ad9c</param> </service> <service name="recompress" mode="disabled"> <param name="file">*openmpi*.tar</param> ++++++ openmpi-1.10.6.tar.bz2 -> openmpi-1.10.7.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/openmpi/openmpi-1.10.6.tar.bz2 /work/SRC/openSUSE:Factory/.openmpi.new/openmpi-1.10.7.tar.bz2 differ: char 11, line 1 ++++++ openmpi-avoid-a-date-string-in-compiled-code.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Wed May 17 10:46:11 2017 +0200 Subject: Avoid a date string in compiled code. Patch-mainline: never Git-commit: bb0446da315743fe3b6e393641accf8747ee0923 References: A DATE string in a binary will cause the package to be marked updated whenever it changes. Signed-off-by: Egbert Eich <eich(a)suse.com> --- ompi/debuggers/ompi_msgq_dll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ompi/debuggers/ompi_msgq_dll.c b/ompi/debuggers/ompi_msgq_dll.c index a89e5f1..350b0e0 100644 --- a/ompi/debuggers/ompi_msgq_dll.c +++ b/ompi/debuggers/ompi_msgq_dll.c @@ -194,7 +194,11 @@ static char mqs_version_str[OMPI_MAX_VER_SIZE]; char *mqs_version_string (void) { return "Open MPI message queue support for parallel" +#ifndef OPAL_PACKAGE_STRING " debuggers compiled on " __DATE__; +#else + " debuggers compiled for " OPAL_PACKAGE_STRING; +#endif int offset; offset = snprintf(mqs_version_str, OMPI_MAX_VER_SIZE-1, "Open MPI message queue support for parallel debuggers ");

1 0

commit plasma5-workspace for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '17

01 Jun '17

Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2017-06-01 16:27:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-workspace" Thu Jun 1 16:27:39 2017 rev:64 rq:499835 version:5.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2017-04-30 21:15:05.815153860 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2017-06-01 16:27:39.974001820 +0200 @@ -1,0 +2,41 @@ +Tue May 30 17:21:05 UTC 2017 - fabian(a)ritter-vogt.de + +- Add patch to fix crash with active-window-control plasmoid: + * 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch + +------------------------------------------------------------------- +Fri May 26 14:10:32 CEST 2017 - fabian(a)ritter-vogt.de + +- Update to 5.10.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.10.0.php +- Changes since 5.9.95: + * Always add data sources in SystemMonitorEngine::sourceRequestEvent() (kde#380209) + * Fix co-installability with other DBus activated notification services + * We should not forget the launchers that are not currently shown + * remove useless debug + * don't check for panel visible during startup + * [Weather] Fix term used for thunderstorm in bbcukmet data db + * [Weather] Add missing strings from bbcukmet data db + * [Weather] Remove duplicated/bad strings from bbcukmet data db + * [Weather] Fix lookup of bbcukmet translations strings, stored in lowercase + * [Weather] Fix term used for thunderstorm in bbcukmet data db + * [Weather] Add missing strings from bbcukmet data db + * [Weather] Remove duplicated/bad strings from bbcukmet data db + * [Weather] Fix lookup of bbcukmet translations strings, stored in lowercase + +------------------------------------------------------------------- +Thu May 11 20:26:32 CEST 2017 - fabian(a)ritter-vogt.de + +- Update to 5.9.95 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.95.php +- Too many changes to list here +- Remove patches, now upstream: + * change-kioremote-severity.patch + * 0001-Some-UI-fixes-for-logout-dialog.patch + * revert-autostart-krun.patch + +------------------------------------------------------------------- Old: ---- 0001-Some-UI-fixes-for-logout-dialog.patch change-kioremote-severity.patch plasma-workspace-5.9.5.tar.xz revert-autostart-krun.patch New: ---- 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch plasma-workspace-5.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.izRhv1/_old 2017-06-01 16:27:40.801885084 +0200 +++ /var/tmp/diff_new_pack.izRhv1/_new 2017-06-01 16:27:40.805884521 +0200 @@ -16,34 +16,30 @@ # -%define kf5_version 5.29.0 +%define kf5_version 5.34.0 %bcond_without lang Name: plasma5-workspace -Version: 5.9.5 +Version: 5.10.0 Release: 0 -# Full Plasma 5 version (e.g. 5.9.4) +# Full Plasma 5 version (e.g. 5.9.1) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} -# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.4 in KUF) +# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: The KDE Plasma Workspace Components License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version… +Source: plasma-workspace-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux(a)gmx.com -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch -# PATCH-FIX-OPENSUSE change-kioremote-severity.patch boo#997173 fabian(a)ritter-vogt.de -- Change default log severity for log_kioremote -Patch1: change-kioremote-severity.patch # PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian(a)ritter-vogt.de -- Ignore default sddm face icons -Patch2: 0001-Ignore-default-sddm-face-icons.patch -# PATCHES 100-200 and above are from upstream 5.9 branch +Patch1: 0001-Ignore-default-sddm-face-icons.patch +# PATCHES 100-200 and above are from upstream 5.10 branch # PATCH-FIX-UPSTREAM -Patch100: revert-autostart-krun.patch -# PATCHES 201-300 and above are from upstream master/5.10 branch -# PATCH-FIX-UPSTREAM -Patch201: 0001-Some-UI-fixes-for-logout-dialog.patch +Patch100: 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch +# PATCHES 201-300 and above are from upstream master/5.11 branch BuildRequires: breeze5-icons BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -215,9 +211,7 @@ %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch100 -p1 -%patch201 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -276,6 +270,7 @@ %{_kf5_bindir}/startkde %{_kf5_bindir}/startplasmacompositor %{_kf5_bindir}/systemmonitor +%{_kf5_bindir}/plasma_waitforname %{_kf5_configdir}/autostart/plasmashell.desktop %{_kf5_configdir}/autostart/klipper.desktop %{_kf5_configdir}/autostart/krunner.desktop @@ -301,6 +296,7 @@ %{_kf5_configkcfgdir}/freespacenotifier.kcfg %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service +%{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service %{_kf5_sharedir}/desktop-directories/ %{_kf5_sharedir}/kconf_update/ %dir %{_kf5_htmldir} ++++++ 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch ++++++ >From 3d506f00979bedbc68d5253db22e7fa0bfdbb45e Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Tue, 30 May 2017 16:31:50 +0100 Subject: [PATCH] dont' crash if we don't have a launcherTasksModel If we don't have a launcher tasks model it's obvious no item can match an item in the launcher tasks model. --- libtaskmanager/tasksmodel.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp index 3d791ae5..83ef8b5b 100644 --- a/libtaskmanager/tasksmodel.cpp +++ b/libtaskmanager/tasksmodel.cpp @@ -921,6 +921,9 @@ QVariant TasksModel::data(const QModelIndex &proxyIndex, int role) const if (proxyIndex.data(AbstractTasksModel::IsLauncher).toBool()) { return true; } else { + if (!d->launcherTasksModel) { + return false; + } for (int i = 0; i < d->launcherTasksModel->rowCount(); ++i) { const QModelIndex &launcherIndex = d->launcherTasksModel->index(i, 0); -- 2.13.0 ++++++ plasma-workspace-5.9.5.tar.xz -> plasma-workspace-5.10.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-workspace/plasma-workspace-5.9.5.tar.xz /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma-workspace-5.10.0.tar.xz differ: char 26, line 1

1 0