May 2016 - openSUSE Commits - openSUSE Mailing Lists

commit daps for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2016-05-02 10:44:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "daps" Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2015-12-16 17:44:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2016-05-02 10:44:07.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 17 10:35:37 UTC 2016 - bwiedemann(a)suse.com + +- Add reproducible.patch to fix build-compare + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.T4ujBq/_old 2016-05-02 10:44:08.000000000 +0200 +++ /var/tmp/diff_new_pack.T4ujBq/_new 2016-05-02 10:44:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package daps # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -48,6 +48,7 @@ Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source-svn Source3: %{name}-fetch-source-git +Patch0: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -161,6 +162,7 @@ #-------------------------------------------------------------------------- %prep %setup -q -n %{name} +%patch0 -p1 #%%patch1 -p1 #-------------------------------------------------------------------------- ++++++ reproducible.patch ++++++ Index: daps/doc/xml/common_copyright_gfdl.xml =================================================================== --- daps.orig/doc/xml/common_copyright_gfdl.xml +++ daps/doc/xml/common_copyright_gfdl.xml @@ -15,7 +15,7 @@ --> <legalnotice> <para> - Copyright © 2006–<?dbtimestamp format="Y"?> + Copyright © 2006–2015 &suse;, LLC and contributors. All rights reserved. </para> <para>

1 0

commit zile for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package zile for openSUSE:Factory checked in at 2016-05-02 10:44:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zile (Old) and /work/SRC/openSUSE:Factory/.zile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zile" Changes: -------- New Changes file: --- /dev/null 2016-04-07 01:36:33.300037506 +0200 +++ /work/SRC/openSUSE:Factory/.zile.new/zile.changes 2016-05-02 10:44:04.000000000 +0200 @@ -0,0 +1,282 @@ +------------------------------------------------------------------- +Wed Mar 19 17:24:11 UTC 2014 - avvissu(a)yandex.ru + +- update to 2.4.11 +- Add BuildRequires: pkg-config pkgconfig(bdw-gc) +- Moved package base and desktop into zile +- Spec file cleanup + +------------------------------------------------------------------- +Fri Mar 30 11:42:16 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 2.4.7: + * fix a potential crash and cosmetic bug in global-set-key when used + interactively + +------------------------------------------------------------------- +Mon Feb 20 08:36:56 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 2.4.6: + * fix a crash in non-incremental search the first time it is used + interactively + +------------------------------------------------------------------- +Sat Feb 11 17:13:56 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 2.4.5: + * fix an egregious bug resulting in a crash whenever a non-existent file was + edited + * fix other potential crash bugs in the low-level text-handling routine + estr_replace +- changes from 2.4.4: + * find-file and find-file-read-only now work non-interactively + * slight speed improvement to general editing operations + +------------------------------------------------------------------- +Thu Dec 22 01:02:18 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 2.4.3: + * fix a crash on certain terminals + * fix a recently-introduced display bug in isearch + +------------------------------------------------------------------- +Sat Oct 15 08:41:14 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 2.4.2: + * fix a long-standing bug in uniarg handling in macros + * fix display of percentage position in buffer + * fix display of search string in query-replace + * fix poor performance of fill-paragraph + * fix handling of Backspace/^H by looking at termcap kbs setting + * several old bugs have been fixed, a few more esoteric features removed, and + Emacs-compliance has been improved + +------------------------------------------------------------------- +Mon May 02 20:54:01 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 2.3.24: + * Bug fixes: + + fix kill-line with prefix argument + + fix a cosmetic problem with multiple ESC-digit combinations + + fix initial screen setup when some files are loaded on the command line + +- changes from 2.3.23: + * Bug fixes: + + {beginning,end}-of-buffer now take account of transient-mark-mode (bug + present since “forever”) + +------------------------------------------------------------------- +Fri Mar 04 22:21:46 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 2.3.22: + * fixes a bug in forward regex isearch introduced recently + +------------------------------------------------------------------- +Thu Nov 18 14:44:11 UTC 2010 - pascal.bleser(a)opensuse.org + +- restructred subpackages, similar to vim + +------------------------------------------------------------------- +Thu Nov 18 09:24:38 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.21: + * fixes a bug in backward search + +------------------------------------------------------------------- +Sat Oct 9 21:21:32 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.20: + * fixes a potential buffer overflow + * fixes search and replace with embedded NULs + * fixes a bug in the build system (the Zile-only tests now run correctly when + an EMACS environment variable is defined) + * fixes a bug introduced in 2.3.17 that caused consecutive kills not to save + the killed text + * some code was cleaned up and better use made of gnulib + * the build scripts that were previously in Lua have been rewritten in Perl; + Perl is now required to build Zile + * a cyclomatic complexity report on the C code can now be produced + +------------------------------------------------------------------- +Fri Aug 13 23:12:10 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.19: + * fixes a space leak + * fixes a small bug in reading filenames in the minibuffer introduced in + 2.3.18 + * fixessome behaviour that was not the same as Emacs + +------------------------------------------------------------------- +Mon Jul 12 06:00:44 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.18: + * fixes some minor space leaks + * fixes a read of freed memory + * fixes a bug in quoted-insert + * stops Zile from catching the user signal SIGQUIT + +------------------------------------------------------------------- +Tue May 25 05:45:59 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.17: + * fixes a crash in undo introduced in 2.3.16 + * fixes some small bugs in delete-window + +------------------------------------------------------------------- +Sun May 9 21:21:07 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.16: + * fixes a potential buffer overrun and a long-standing bug in the handling of + the key string "C-_" + +------------------------------------------------------------------- +Tue Mar 2 22:25:59 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.15: + * the default universal argument, which should be 4 but was 16, has been + fixed + * some cosmetic errors with the display of universal arguments in the + minibuffer have been fixed + +------------------------------------------------------------------- +Fri Dec 4 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 2.3.14: + * fixes a minor bug in filename tab expansion, which resulted in `/' being + expanded to `~/' + +------------------------------------------------------------------- +Thu Oct 29 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 2.3.13: + * fixes bugs in "kill-line", "scroll-up", and "scroll-down" + * some space leaks found by Valgrind were squashed + +------------------------------------------------------------------- +Tue Sep 22 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 2.3.12: + * fixes the +LINE command-line action, which was broken a few releases ago + * cosmetic fix to temporary buffers + +------------------------------------------------------------------- +Tue Sep 1 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 2.3.11 + +------------------------------------------------------------------- +Wed Apr 8 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 2.3.5: + * fixes a bug in write-file which caused the undo state to be improperly + updated, resulting in dirty states being marked clean + * a crash bug in paragraph filling was fixed + * some other minor bugs fixed + * the --funcall option was reintroduced for backwards compatibility with + Zile 2.2 + +------------------------------------------------------------------- +Fri Mar 6 00:00:00 UTC 2009 - guru(a)unixtech.be + +- fix conditionals in spec file +- update to 2.3.4: + * fixes yet another bug in filename completion, and a potential crash that + the bug exposed + +------------------------------------------------------------------- +Sun Mar 1 00:00:00 UTC 2009 - guru(a)unixtech.be + +- update to 2.3.3: + * fixes bugs in filename completion + +------------------------------------------------------------------- +Mon Feb 23 00:00:00 UTC 2009 - guru(a)unixtech.be + +- update to 2.3.1: + * rewrite of the test suite that drives Zile directly, and no longer uses + DejaGnu ++++ 85 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.zile.new/zile.changes New: ---- zile-2.4.11.tar.gz zile.changes zile.desktop zile.png zile.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zile.spec ++++++ # # spec file for package zile # # Copyright (c) 2014 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser <pascal.bleser(a)opensuse.org> # # 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: zile Version: 2.4.11 Release: 0 Summary: Lightweight Emacs Clone License: GPL-3.0 Group: Productivity/Editors/Emacs Url: http://www.gnu.org/software/zile/ Source: http://ftp.gnu.org/gnu/zile/zile-%{version}.tar.gz Source1: zile.desktop Source2: zile.png BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: help2man BuildRequires: libtool BuildRequires: make BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: pkg-config BuildRequires: termcap BuildRequires: texinfo BuildRequires: update-desktop-files BuildRequires: pkgconfig(bdw-gc) Requires: termcap Provides: %{name}-base = %{version} Provides: %{name}-desktop = %{version} Obsoletes: %{name}-base < %{version} Obsoletes: %{name}-desktop < %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Zile is another Emacs-clone. Zile is a customizable, self-documenting real-time, open-source display editor. Zile was written to be as similar as possible to Emacs; every Emacs user should feel at home with Zile. %package doc Summary: Lightweight Emacs Clone (Documentation) Group: Productivity/Editors/Emacs %description doc Zile is another Emacs-clone. Zile is a customizable, self-documenting real-time, open-source display editor. Zile was written to be as similar as possible to Emacs; every Emacs user should feel at home with Zile. This package contains the documentation and the man page for %{name}. %prep %setup -q %build LDFLAGS="-L%{_libdir}/termcap" \ %configure \ --enable-xterm-support \ --disable-debug make %{?_smp_mflags} V=1 %install make DESTDIR=%{buildroot} install %{?_smp_mflags} rm -rf "%{buildroot}%{_datadir}/doc/zile" install -d "%{buildroot}%{_docdir}/%{name}" for f in AUTHORS ChangeLog COPYING NEWS README THANKS FAQ src/dotzile.sample; do install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" done install -Dp -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" install -Dp -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" %if 0%{?suse_version} %suse_update_desktop_file "%{name}" Utility TextEditor %endif %post %desktop_database_post %postun %desktop_database_postun %files %defattr(-,root,root) %{_bindir}/zile %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/zile.1%{ext_man} %files doc %defattr(-,root,root) %{_docdir}/%{name} %changelog ++++++ zile.desktop ++++++ [Desktop Entry] Categories= Terminal=true Icon=zile Exec=zile %f Type=Application Name=Zile GenericName=Text Editor Comment=Lightweight emacs clone MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;

1 0

commit krb5 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2016-05-02 10:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krb5" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2016-04-06 11:50:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes 2016-05-02 10:43:56.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 28 20:27:37 UTC 2016 - michael(a)stroeder.com + +- removed obsolete patches: + * 0107-Fix-LDAP-null-deref-on-empty-arg-CVE-2016-3119.patch + * krb5-mechglue_inqure_attrs.patch +- Upgrade from 1.14.1 to 1.14.2: + * Fix a moderate-severity vulnerability in the LDAP KDC back end that + could be exploited by a privileged kadmin user [CVE-2016-3119] + * Improve documentation + * Fix some interactions with GSSAPI interposer mechanisms + +------------------------------------------------------------------- krb5.changes: same change Old: ---- 0107-Fix-LDAP-null-deref-on-empty-arg-CVE-2016-3119.patch krb5-1.14.1.tar.gz krb5-1.14.1.tar.gz.asc krb5-mechglue_inqure_attrs.patch New: ---- krb5-1.14.2.tar.gz krb5-1.14.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.l8c72Z/_old 2016-05-02 10:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l8c72Z/_new 2016-05-02 10:43:58.000000000 +0200 @@ -16,7 +16,7 @@ # -%define srcRoot krb5-1.14.1 +%define srcRoot krb5-1.14.2 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ %define krb5docdir %{_defaultdocdir}/krb5 @@ -29,7 +29,7 @@ BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Version: 1.14.1 +Version: 1.14.2 Release: 0 Summary: MIT Kerberos5 implementation and libraries with minimal dependencies License: MIT @@ -65,7 +65,6 @@ Patch12: krb5-1.12-selinux-label.patch Patch13: krb5-1.9-debuginfo.patch Patch15: krb5-fix_interposer.patch -Patch16: krb5-mechglue_inqure_attrs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %fillup_prereq @@ -111,7 +110,6 @@ %patch12 -p1 %patch13 -p0 %patch15 -p1 -%patch16 -p1 %build # needs to be re-generated ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.l8c72Z/_old 2016-05-02 10:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l8c72Z/_new 2016-05-02 10:43:58.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Version: 1.14.1 +Version: 1.14.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries License: MIT @@ -65,8 +65,6 @@ Patch12: krb5-1.12-selinux-label.patch Patch13: krb5-1.9-debuginfo.patch Patch15: krb5-fix_interposer.patch -Patch16: krb5-mechglue_inqure_attrs.patch -Patch107: 0107-Fix-LDAP-null-deref-on-empty-arg-CVE-2016-3119.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %fillup_prereq @@ -179,8 +177,6 @@ %patch12 -p1 %patch13 -p0 %patch15 -p1 -%patch16 -p1 -%patch107 -p1 %build # needs to be re-generated ++++++ krb5-1.14.1.tar.gz -> krb5-1.14.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/krb5/krb5-1.14.1.tar.gz /work/SRC/openSUSE:Factory/.krb5.new/krb5-1.14.2.tar.gz differ: char 5, line 1

1 0

commit python3 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2016-05-02 10:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3" Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2016-03-14 09:57:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes 2016-05-02 10:43:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 22 17:20:29 UTC 2016 - jmatejek(a)suse.com + +- move _hashlib and _ssl modules and tests to python3-base +- recommend python3 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3.changes 2016-03-29 09:54:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3.changes 2016-05-02 10:43:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 22 17:20:29 UTC 2016 - jmatejek(a)suse.com + +- move _hashlib and _ssl modules and tests to python3-base +- change Suggests to Recommends on supplemental modules + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.rNhdJr/_old 2016-05-02 10:43:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rNhdJr/_new 2016-05-02 10:43:50.000000000 +0200 @@ -28,6 +28,7 @@ BuildRequires: fdupes BuildRequires: libbz2-devel BuildRequires: lzma-devel +BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: timezone BuildRequires: xz @@ -49,6 +50,9 @@ Provides: python3-asyncio = %{version} Obsoletes: python3-asyncio < %{version} +Recommends: python3 = %{version} +#Recommends: python3-ensurepip + Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz Source1: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz.asc Source2: python.keyring @@ -143,7 +147,7 @@ (HTML) or python-doc-pdf (PDF) packages. If you want to install third party modules using distutils, you need to -install python-devel package. +install python3-devel package. %package -n python3-tools @@ -316,9 +320,6 @@ # done have any such interface breaking teh uuid module. EXCLUDE="$EXCLUDE test_uuid" -# Exclude test_tools, test_venv and test_ensurepip which indirectly require ssl -EXCLUDE="$EXCLUDE test_tools test_venv test_ensurepip" - # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : @@ -509,6 +510,7 @@ %{dynlib _elementtree} %{dynlib fcntl} %{dynlib grp} +%{dynlib _hashlib} %{dynlib _heapq} %{dynlib _json} %{dynlib _lsprof} @@ -527,6 +529,7 @@ %{dynlib resource} %{dynlib select} %{dynlib _socket} +%{dynlib _ssl} %{dynlib spwd} %{dynlib _struct} %{dynlib syslog} ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.rNhdJr/_old 2016-05-02 10:43:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rNhdJr/_new 2016-05-02 10:43:50.000000000 +0200 @@ -28,9 +28,9 @@ BuildRequires: libbz2-devel BuildRequires: libexpat-devel BuildRequires: libffi-devel -BuildRequires: libopenssl-devel BuildRequires: lzma-devel BuildRequires: ncurses-devel +BuildRequires: openssl-devel BuildRequires: readline-devel BuildRequires: sqlite-devel BuildRequires: tk-devel @@ -47,10 +47,10 @@ Requires: python3-base = %{version} Recommends: python3-pip -Suggests: python3-curses -Suggests: python3-dbm -Suggests: python3-idlelib -Suggests: python3-tk +Recommends: python3-curses +Recommends: python3-dbm +Recommends: python3-idle +Recommends: python3-tk Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz Source1: baselibs.conf @@ -150,7 +150,7 @@ (HTML) or python-doc-pdf (PDF) packages. If you want to install third party modules using distutils, you need to -install python-devel package. +install python3-devel package. @@ -252,17 +252,12 @@ # only test the parts skipped in python3-base TESTS="test_curses test_dbm_gnu test_dbm_ndbm test_idle \ - test_readline test_sqlite test_ssl test_tcl \ + test_readline test_sqlite test_tcl test_tix test_tk \ test_ttk_textonly" # redo tests with SSL parts %if !0%{?qemu_user_space_build} TESTS="$TESTS test_asyncio" %endif -TESTS="$TESTS test_hashlib test_urllib test_httplib \ - test_imaplib test_ftplib test_urllib2_localnet test_nntplib" - -# ensurepip-based tests -TESTS="$TESTS test_venv test_ensurepip test_tools" make test TESTOPTS="-u curses $TESTS" @@ -297,9 +292,9 @@ for library in \ array audioop binascii _bisect _bz2 cmath _codecs_* _crypt _csv \ - _ctypes _datetime _decimal _elementtree fcntl grp _heapq _json _lsprof \ + _ctypes _datetime _decimal _elementtree fcntl grp _hashlib _heapq _json _lsprof \ _lzma math mmap _multibytecodec _multiprocessing nis _opcode ossaudiodev \ - parser _pickle _posixsubprocess _random resource select _socket spwd \ + parser _pickle _posixsubprocess _random resource select _ssl _socket spwd \ _struct syslog termios _testbuffer _testimportmultiple _testmultiphase \ unicodedata zlib _ctypes_test _testcapi xxlimited \ _md5 _sha1 _sha256 _sha512 @@ -336,10 +331,8 @@ %exclude %{sitedir}/sqlite3/test %{sitedir}/xml %{sitedir}/xmlrpc -%{dynlib _hashlib} %{dynlib pyexpat} %{dynlib readline} %{dynlib _sqlite3} -%{dynlib _ssl} %changelog

1 0

commit libyui-qt for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2016-05-02 10:43:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2015-10-14 16:41:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2016-05-02 10:43:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 5 17:29:56 CEST 2016 - shundhammer(a)suse.de + +- Show help in wizard widget upon F1 and Alt-H (bnc#973389) +- 2.46.22 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.46.21.tar.bz2 New: ---- libyui-qt-2.46.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.p7IDxS/_old 2016-05-02 10:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.p7IDxS/_new 2016-05-02 10:43:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-doc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,7 +20,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.p7IDxS/_old 2016-05-02 10:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.p7IDxS/_new 2016-05-02 10:43:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-qt-2.46.21.tar.bz2 -> libyui-qt-2.46.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/Rakefile new/libyui-qt-2.46.22/Rakefile --- old/libyui-qt-2.46.21/Rakefile 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.46.22/Rakefile 2016-04-05 17:59:11.000000000 +0200 @@ -0,0 +1,8 @@ +#-- +# Copyright (C) 2015 SUSE LLC +# +# make continuous integration using rubygem-libyui-rake. +# +# MIT license +#++ +require "libyui/rake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/VERSION.cmake new/libyui-qt-2.46.22/VERSION.cmake --- old/libyui-qt-2.46.21/VERSION.cmake 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/VERSION.cmake 2016-04-05 17:59:11.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "46") -SET(VERSION_PATCH "21") +SET(VERSION_PATCH "22") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/package/libyui-qt-doc.spec new/libyui-qt-2.46.22/package/libyui-qt-doc.spec --- old/libyui-qt-2.46.21/package/libyui-qt-doc.spec 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/package/libyui-qt-doc.spec 2016-04-06 16:49:09.000000000 +0200 @@ -20,7 +20,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/package/libyui-qt.changes new/libyui-qt-2.46.22/package/libyui-qt.changes --- old/libyui-qt-2.46.21/package/libyui-qt.changes 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/package/libyui-qt.changes 2016-04-05 17:59:11.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 5 17:29:56 CEST 2016 - shundhammer(a)suse.de + +- Show help in wizard widget upon F1 and Alt-H (bnc#973389) +- 2.46.22 + +------------------------------------------------------------------- Fri Oct 2 14:55:08 UTC 2015 - lslezak(a)suse.cz - fixed styling for the release notes dialog content (bsc#947167) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/package/libyui-qt.spec new/libyui-qt-2.46.22/package/libyui-qt.spec --- old/libyui-qt-2.46.21/package/libyui-qt.spec 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/package/libyui-qt.spec 2016-04-06 16:49:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/src/YQWizard.cc new/libyui-qt-2.46.22/src/YQWizard.cc --- old/libyui-qt-2.46.21/src/YQWizard.cc 2015-09-21 11:47:56.000000000 +0200 +++ new/libyui-qt-2.46.22/src/YQWizard.cc 2016-04-06 16:49:09.000000000 +0200 @@ -853,16 +853,24 @@ hbox->setMargin( 0 ); // Help button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _helpButton = new YQWizardButton( this, parent, _( "&Help" ).toStdString()); YUI_CHECK_NEW( _helpButton ); - _helpButton->setShortcut( Qt::Key_F1 ); connect( _helpButton, &pclass(_helpButton)::clicked, this, &pclass(this)::showHelp ); hbox->addWidget( (QWidget *) _helpButton->widgetRep() ); + // Help action to be able to react to F1 and Alt-H (bnc#973389) + _helpAction = new QAction( this ); + _helpAction->setShortcut( Qt::Key_F1 ); + addAction( _helpAction ); + + connect( _helpAction, &pclass( _helpAction )::triggered, + this, &pclass( this )::showHelp ); + + hbox->addSpacing( 10 ); // @@ -870,7 +878,7 @@ // // Release Notes button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _releaseNotesButton = new YQWizardButton( this, parent, _( "&Release Notes" ).toStdString ()); YUI_CHECK_NEW( _releaseNotesButton ); hbox->addWidget( (QWidget *) _releaseNotesButton->widgetRep() ); @@ -1072,7 +1080,6 @@ void YQWizard::showHelp() { - if (!_helpDlg) _helpDlg = new QY2HelpDialog ( _qHelpText, NULL ); else @@ -1310,7 +1317,7 @@ return; } - // QT handles duplicate shortcuts, it can be kept + // Qt handles duplicate shortcuts, it can be kept _releaseNotesButton->setLabel( fromUTF8( label ) ); _releaseNotesButtonId = id; _releaseNotesButtonLabel = label; @@ -1336,22 +1343,22 @@ if ( _helpButton ) // "Help" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _helpButton->setLabel( _( "&Help" ) ); if ( _stepsButton ) // "Steps" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _stepsButton->setText( _( "&Steps" ) ); if ( _treeButton ) // "Tree" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _treeButton->setText( _( "&Tree" ) ); if ( _releaseNotesButton ) // "Release Notes" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _releaseNotesButton->setLabel( _( "&Release Notes" ) ); if ( _helpDlg ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/src/YQWizard.h new/libyui-qt-2.46.22/src/YQWizard.h --- old/libyui-qt-2.46.21/src/YQWizard.h 2015-09-21 11:47:56.000000000 +0200 +++ new/libyui-qt-2.46.22/src/YQWizard.h 2016-04-05 17:59:12.000000000 +0200 @@ -36,6 +36,7 @@ #include <QSplitter> #include <qlabel.h> #include <QMenu> +#include <QAction> #include <qevent.h> #include <yui/YWizard.h> #include "YQWizardButton.h" @@ -579,6 +580,7 @@ static std::string _releaseNotesButtonId; static std::string _releaseNotesButtonLabel; YQWizardButton * _helpButton; + QAction * _helpAction; QPushButton * _stepsButton; QPushButton * _treeButton; QFrame * _treePanel;

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2016-05-02 10:43:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2016-04-05 10:41:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2016-05-02 10:43:37.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 25 14:15:24 UTC 2016 - snwint(a)suse.com + +- remove O_TMPFILE workaround needed for bsc#964709 and bsc#965068 +- 5.0.77 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.76.tar.xz New: ---- linuxrc-5.0.77.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.cDeBIk/_old 2016-05-02 10:43:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cDeBIk/_new 2016-05-02 10:43:38.000000000 +0200 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.76 +Version: 5.0.77 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.76.tar.xz -> linuxrc-5.0.77.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.76/VERSION new/linuxrc-5.0.77/VERSION --- old/linuxrc-5.0.76/VERSION 2016-03-31 10:27:44.000000000 +0200 +++ new/linuxrc-5.0.77/VERSION 2016-04-25 16:14:36.000000000 +0200 @@ -1 +1 @@ -5.0.76 +5.0.77 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.76/changelog new/linuxrc-5.0.77/changelog --- old/linuxrc-5.0.76/changelog 2016-03-31 10:27:44.000000000 +0200 +++ new/linuxrc-5.0.77/changelog 2016-04-25 16:14:36.000000000 +0200 @@ -1,3 +1,6 @@ +2016-04-25: 5.0.77 + - remove O_TMPFILE workaround needed for bsc #964709 and bsc #965068 + 2015-10-15: 5.0.76 - Do not limit number of inodes in tmpfs overlay (bsc #951015) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.76/util.c new/linuxrc-5.0.77/util.c --- old/linuxrc-5.0.76/util.c 2016-03-31 10:27:44.000000000 +0200 +++ new/linuxrc-5.0.77/util.c 2016-04-25 16:14:36.000000000 +0200 @@ -5353,14 +5353,7 @@ if(!cmd) return err; -#ifdef __aarch64__ -#warning "ugly workaround activated - please remove as soon as glibc is fixed" - // O_TMPFILE definition is broken - see (bsc#965068) - fd = open("/tmp", 0x404000 | O_RDWR, S_IRUSR | S_IWUSR); -#else - // workaround: include O_DIRECTORY so it works on ppc64 (bsc #964709) - fd = open("/tmp", O_TMPFILE | O_DIRECTORY | O_RDWR, S_IRUSR | S_IWUSR); -#endif + fd = open("/tmp", O_TMPFILE | O_RDWR, S_IRUSR | S_IWUSR); if(fd == -1) { perror_debug("failed to create tmp file");

1 0

commit xcb-util-cursor for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package xcb-util-cursor for openSUSE:Factory checked in at 2016-05-02 10:43:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcb-util-cursor (Old) and /work/SRC/openSUSE:Factory/.xcb-util-cursor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xcb-util-cursor" Changes: -------- --- /work/SRC/openSUSE:Factory/xcb-util-cursor/xcb-util-cursor.changes 2015-03-30 19:34:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xcb-util-cursor.new/xcb-util-cursor.changes 2016-05-02 10:43:32.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 25 11:40:51 UTC 2016 - sndirsch(a)suse.com + +- removed u_fix-issue-with-gcc.patch + * patch was only necessary with gcc in 2013, when building + 'awesome' against the static library; we do not ship the static + libary (did we ever?) + https://lists.freedesktop.org/archives/xcb/2016-April/010737.html + +------------------------------------------------------------------- Old: ---- u_fix-issue-with-gcc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcb-util-cursor.spec ++++++ --- /var/tmp/diff_new_pack.HFjvMV/_old 2016-05-02 10:43:33.000000000 +0200 +++ /var/tmp/diff_new_pack.HFjvMV/_new 2016-05-02 10:43:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcb-util-cursor # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -29,7 +29,6 @@ #Git-Web: http://cgit.freedesktop.org/xcb/util-cursor/ Source: http://xcb.freedesktop.org/dist/%name-%version.tar.bz2 Source1: baselibs.conf -Patch11: u_fix-issue-with-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -80,7 +79,6 @@ %prep %setup -q -%patch11 -p1 %build ./autogen.sh

1 0

commit kernel-firmware for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at 2016-05-02 10:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old) and /work/SRC/openSUSE:Factory/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes 2016-04-22 16:16:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-firmware.new/kernel-firmware.changes 2016-05-02 10:43:27.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 22 18:47:05 UTC 2016 - mpluskal(a)suse.com + +- Update to version 20160421: + * amdgpu: update CZ to new UVD fw that supports 40 sessions + * linux-firmware: Update firmware file for Intel Bluetooth 8265 + +------------------------------------------------------------------- Old: ---- kernel-firmware-20160412.tar.xz New: ---- kernel-firmware-20160421.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.IiN9Ao/_old 2016-05-02 10:43:28.000000000 +0200 +++ /var/tmp/diff_new_pack.IiN9Ao/_new 2016-05-02 10:43:28.000000000 +0200 @@ -19,10 +19,10 @@ %define __find_supplements bash %{_sourcedir}/firmware.sh --find-supplements %define __ksyms_supplements bash %{_sourcedir}/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements %define __ksyms_path ^/lib/firmware -%define version_unconverted 20160412 +%define version_unconverted 20160421 Name: kernel-firmware -Version: 20160412 +Version: 20160421 Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware and GPL-2.0 and GPL-2.0+ and MIT ++++++ kernel-firmware-20160412.tar.xz -> kernel-firmware-20160421.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware-20160412.tar.xz /work/SRC/openSUSE:Factory/.kernel-firmware.new/kernel-firmware-20160421.tar.xz differ: char 26, line 1

1 0

commit infinipath-psm for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package infinipath-psm for openSUSE:Factory checked in at 2016-05-02 10:43:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/infinipath-psm (Old) and /work/SRC/openSUSE:Factory/.infinipath-psm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "infinipath-psm" Changes: -------- --- /work/SRC/openSUSE:Factory/infinipath-psm/infinipath-psm.changes 2015-09-03 18:03:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.infinipath-psm.new/infinipath-psm.changes 2016-05-02 10:43:16.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Apr 25 07:41:38 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 3.3-19 + * No Changelog available +- Build against system libuuid +- Split libraries into two separate subpackages +- Remove infinipath-non_executable_stack.patch; fixed on upstream + release + +------------------------------------------------------------------- Old: ---- infinipath-non_executable_stack.patch infinipath-psm-3.3-2_g6f42cdb_open.tar.gz New: ---- infinipath-psm-3.3-19_g67c0807_open.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ infinipath-psm.spec ++++++ --- /var/tmp/diff_new_pack.HrkSXJ/_old 2016-05-02 10:43:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HrkSXJ/_new 2016-05-02 10:43:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package infinipath-psm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +16,7 @@ # -%define my_release -2_g6f42cdb +%define my_release -19_g67c0807 Name: infinipath-psm Version: 3.3 @@ -32,14 +32,14 @@ Patch1: infinipath-psm-no_werror.patch # PATCH-FIX-UPSTREAM infinipath-psm-executable_headers.patch pth(a)suse.de Patch3: infinipath-psm-executable_headers.patch -# PATCH-FIX-UPSTREAM infinipath-non_executable_stack.patch pth(a)suse.de -Patch4: infinipath-non_executable_stack.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libuuid-devel Conflicts: infinipath-libs ExclusiveArch: %ix86 x86_64 -%define so_major 1 -%define lname libpsm_infinipath%{so_major} +%define so_major 4 +%define psm_so_major 1 +%define lname libinfinipath%{so_major} +%define lnamepsm libpsm_infinipath%{psm_so_major} %description The PSM Messaging API, or PSM API, is QLogic's low-level @@ -52,17 +52,30 @@ Summary: Development files for QLogic PSM Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} +Requires: %{lnamepsm} = %{version} +Requires: libuuid-devel Conflicts: infinipath-devel %description devel Development files for the libpsm_infinipath library -%package -n %{lname} +%package -n %{lnamepsm} Summary: Development files for QLogic PSM Group: System/Libraries Obsoletes: infinipath-psm < %{version} Provides: infinipath-psm = %{version} +%description -n %{lnamepsm} +The PSM Messaging API, or PSM API, is QLogic's low-level +user-level communications interface for the Truescale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%package -n %{lname} +Summary: Development files for QLogic PSM +Group: System/Libraries + %description -n %{lname} The PSM Messaging API, or PSM API, is QLogic's low-level user-level communications interface for the Truescale @@ -75,25 +88,28 @@ %patch0 %patch1 %patch3 -%patch4 %build -%if 0%{?suse_version} >= 1150 export RPM_OPT_FLAGS="%{optflags} -Wno-unused-but-set-variable" -%endif -make USE_PSM_UUID=1 libdir=%{_libdir} %{?_smp_mflags} +#make USE_PSM_UUID=1 libdir=%{_libdir} %{?_smp_mflags} +make libdir=%{_libdir} %{?_smp_mflags} %install -make USE_PSM_UUID=1 libdir=%{_libdir} DESTDIR=%{buildroot} install +make libdir=%{_libdir} DESTDIR=%{buildroot} install %post -n %{lname} -p /sbin/ldconfig +%post -n %{lnamepsm} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig +%postun -n %{lnamepsm} -p /sbin/ldconfig %files -n %{lname} %defattr(-,root,root,-) -%{_libdir}/libpsm_infinipath.so.* %{_libdir}/libinfinipath.so.* +%files -n %{lnamepsm} +%defattr(-,root,root,-) +%{_libdir}/libpsm_infinipath.so.* + %files devel %defattr(-,root,root,-) %{_libdir}/libpsm_infinipath.so ++++++ infinipath-psm-3.3-2_g6f42cdb_open.tar.gz -> infinipath-psm-3.3-19_g67c0807_open.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/COMMIT new/infinipath-psm-3.3-19_g67c0807_open/COMMIT --- old/infinipath-psm-3.3-2_g6f42cdb_open/COMMIT 2014-10-10 23:07:06.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/COMMIT 2016-03-16 18:16:48.000000000 +0100 @@ -1 +1 @@ -6f42cdb1bb8cc4f15149589ab5fa39775fa5470a \ No newline at end of file +67c0807c74e9d445900d5541358f0f575f22a630 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/Makefile.rej new/infinipath-psm-3.3-19_g67c0807_open/Makefile.rej --- old/infinipath-psm-3.3-2_g6f42cdb_open/Makefile.rej 2014-10-10 23:07:06.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/Makefile.rej 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ ---- Makefile -+++ Makefile -@@ -44,3 +44,6 @@ - - clean: - rm -f *.o -+ -+install: -+ @echo "Nothing to do for install." ---- Makefile -+++ Makefile -@@ -54,3 +54,5 @@ - clean: - rm -f *.o - -+install: -+ @echo "Nothing to do for install." ---- Makefile -+++ Makefile -@@ -44,3 +44,5 @@ - clean: - rm -f *.o - -+install: -+ @echo "Nothing to do for install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/README new/infinipath-psm-3.3-19_g67c0807_open/README --- old/infinipath-psm-3.3-2_g6f42cdb_open/README 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/README 2016-03-16 18:16:47.000000000 +0100 @@ -1,5 +1,5 @@ - Copyright (c) 2013 Intel Corporation. All rights reserved. + Copyright (c) 2013-2014, Intel Corporation. All rights reserved. Copyright (c) 2006-2011. QLogic Corporation. All rights reserved. Copyright (c) 2003-2006, PathScale, Inc. All rights reserved. @@ -42,24 +42,16 @@ Building PSM ------------ Build requires that GNU GCC compiler is installed on the machine doing the -build, if compiling code to mic card, the cross compiler x86_64-k1om-linux-gcc -must also installed. If compiling mic version or mic card version, scif must -installed on the system. Root privileges are required to install the runtime -libraries and development header files into standard system location. - -There are two mechanisms for building PSM: - 1. Use provided Makefiles to build and install - 2. Generate a tarball that can be used to build source and binary RPMs +build. If compiling code for MIC, SCIF must be present. Root privileges +are required to install the runtime libraries and development header files +into the standard system location. -The instructions below use $PRODUCT and $RELEASE to refer to the product -and release identifiers of the infinipath-psm RPM. - -Building from Makefiles +Building from Makefile ----------------------- 1. Untar the tarball: - $ tar zxvf intel-psm-$PRODUCT-$RELEASE.tar.gz + $ tar zxvf infinipath-psm-$PRODUCT-$RELEASE.tar.gz 2. Change directory into the untarred location: - $ cd intel-psm-$PRODUCT-$RELEASE + $ cd infinipath-psm-$PRODUCT-$RELEASE 3. Run make on the command line. This will build the libraries. By default, the Makefile will auto-detect whether libuuid and the uuid.h header file are installed. If so, it will use the system's libuuid. Otherwise, PSM @@ -70,9 +62,9 @@ build the SCIF enabled variant by default. Auto-detection of SCIF can be disabled by passing the PSM_HAVE_SCIF variable. - To compile the SCIF-enabled version, set the PSM_HAVE_SCIF variable: + To specify the SCIF-enabled version, set the PSM_HAVE_SCIF variable: $ make PSM_HAVE_SCIF=1 - To compile the non-SCIF version, even if SCIF is present, clear the variable: + To specify the non-SCIF version, even if SCIF is present, clear the variable: $ make PSM_HAVE_SCIF=0 To force compiling with the included libuuid, use the USE_PSM_UUID variable: @@ -96,43 +88,6 @@ "/tmp/psm-install/usr/include", and "make LIBDIR=/tmp/libs install" will install the libraries in "/tmp/libs" and the headers in "/usr/include". -Generating PSM source and binary RPMs --------------------------------------- -This is a two step process: Generate a PSM distribution tarball which can then -be used to generate source and binary RPMs using the rpmbuild command with the --ta option. -1. Untar the tarball: - $ tar zxvf intel-psm-$PRODUCT-$RELEASE.tar.gz -2. Change directory into the untarred location: - $ cd intel-psm-$PRODUCT-$RELEASE -3. Generate distribution tarball - $ make dist - To force compiling with the included libuuid, use the USE_PSM_UUID variable: - $ make dist USE_PSM_UUID=1 - Note: It is recommended if you are planning on doing cross distribution -builds to use the included libuuid i.e. If you are generating the distribution -tarball on a RHEL machine but may use rpmbuild on a SuSE SLES machine. This -minimized any cross distribution dependencies for the package. -4. Generate source and binary packages. - To generate a non-SCIF RPM: - $ rpmbuild -ta intel-psm-$PRODUCT-$RELEASE.tar.gz - This produces the infinipath-psm-$PRODUCT-$RELEASE set of RPMs. - To generate a SCIF-enabled RPM: - $ rpmbuild -ta intel-psm-$PRODUCT-$RELEASE.tar.gz -D 'PSM_HAVE_SCIF 1' - This produces the intel-psm-$PRODUCT-$RELEASE set of RPMs. - - Please refere to the man page of rpmbuild for other options in generating -RPMs. The generated RPMs are relocatable so one can provide the prefix option -to retarget the installation location. - -Please note, in any case, you can build debugging version of the code by -adding PSM_DEBUG=1 on make command line. - -If you run into any issues during build please post any questions with as much -information as possible to the psm-devel mailing list. Please include the -distribution you are building on, the compiler type and version as well as any -relevant error messages. - MPI Libraries supported ----------------------- A large number of open source (OpenMPI, MVAPICH, MVAPICH2) and Vendor MPI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/dfaace420c1f3fdd646630122c5ae601aef6e4a0.patch new/infinipath-psm-3.3-19_g67c0807_open/dfaace420c1f3fdd646630122c5ae601aef6e4a0.patch --- old/infinipath-psm-3.3-2_g6f42cdb_open/dfaace420c1f3fdd646630122c5ae601aef6e4a0.patch 2014-10-10 23:07:06.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/dfaace420c1f3fdd646630122c5ae601aef6e4a0.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -commit dfaace420c1f3fdd646630122c5ae601aef6e4a0 -Author: John Fleck <john.fleck(a)intel.com> -Date: Fri Apr 4 10:54:25 2014 -0400 - - Add make install action. - - INTERNAL: PR 124157 - hfi-psm has errors on make install - - Change-Id: I4ae51dd3a06d7150c3d422fe72886d89eb1d2ce0 - -diff --git a/libuuid/Makefile b/libuuid/Makefile -index fb62602..71fa643 100644 ---- a/libuuid/Makefile -+++ b/libuuid/Makefile -@@ -44,3 +44,6 @@ all: ${${TARGLIB}-objs} - - clean: - rm -f *.o -+ -+install: -+ @echo "Nothing to do for install." -diff --git a/ptl_am/Makefile b/ptl_am/Makefile -index 292feaf..95faf09 100644 ---- a/ptl_am/Makefile -+++ b/ptl_am/Makefile -@@ -44,3 +44,5 @@ all: ${${TARGLIB}-objs} - clean: - rm -f *.o - -+install: -+ @echo "Nothing to do for install." -diff --git a/ptl_ips/Makefile b/ptl_ips/Makefile -index fcd5313..1b845f4 100644 ---- a/ptl_ips/Makefile -+++ b/ptl_ips/Makefile -@@ -54,3 +54,5 @@ all: ${${TARGLIB}-objs} - clean: - rm -f *.o - -+install: -+ @echo "Nothing to do for install." -diff --git a/ptl_self/Makefile b/ptl_self/Makefile -index 9e6826d..7b16674 100644 ---- a/ptl_self/Makefile -+++ b/ptl_self/Makefile -@@ -44,3 +44,5 @@ all: ${${TARGLIB}-objs} - clean: - rm -f *.o - -+install: -+ @echo "Nothing to do for install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/include/ipath_common.h new/infinipath-psm-3.3-19_g67c0807_open/include/ipath_common.h --- old/infinipath-psm-3.3-2_g6f42cdb_open/include/ipath_common.h 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/include/ipath_common.h 2016-03-16 18:16:47.000000000 +0100 @@ -673,6 +673,12 @@ /* K_PktFlags bits */ #define INFINIPATH_KPF_INTR 0x1 #define INFINIPATH_KPF_HDRSUPP 0x2 +#define INFINIPATH_KPF_INTR_HDRSUPP_MASK 0x3 +#define INFINIPATH_KPF_COMMIDX_MASK 0x003C +#define INFINIPATH_KPF_COMMIDX_SHIFT 2 +#define INFINIPATH_KPF_RESERVED_BITS(pktflags) \ + ((__le16_to_cpu(pktflags) & INFINIPATH_KPF_COMMIDX_MASK) \ + << IPS_EPSTATE_COMMIDX_SHIFT) \ #define INFINIPATH_MAX_SUBCONTEXT 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/infinipath-psm.spec new/infinipath-psm-3.3-19_g67c0807_open/infinipath-psm.spec --- old/infinipath-psm-3.3-2_g6f42cdb_open/infinipath-psm.spec 2014-10-10 23:07:06.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/infinipath-psm.spec 2016-03-16 18:16:48.000000000 +0100 @@ -33,7 +33,7 @@ Summary: Intel PSM Libraries Name: infinipath-psm Version: 3.3 -Release: 2_g6f42cdb_open +Release: 19_g67c0807_open Epoch: 4 License: GPL Group: System Environment/Libraries @@ -42,8 +42,11 @@ Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Provides: infinipath-psm = %{version} +%if "%{PSM_HAVE_SCIF}" == "1" +Provides: intel-mic-psm = %{version} +%endif # MIC package -Conflicts: intel-mic-psm +Obsoletes: intel-mic-psm # OFED package Obsoletes: infinipath-libs <= %{version}-%{release} Conflicts: infinipath-libs <= %{version}-%{release} @@ -58,41 +61,11 @@ Group: System Environment/Development Requires: infinipath-psm = %{version}-%{release} Provides: infinipath-psm-devel = %{version} -# MIC package -Conflicts: intel-mic-devel -# OFED package -Obsoletes: infinipath-devel <= %{version}-%{release} -Conflicts: infinipath-devel <= %{version}-%{release} -# mpss package -Obsoletes: mpss-psm-dev <= %{version}-%{release} -Conflicts: mpss-psm-dev <= %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%package -n intel-mic-psm -Summary: Intel PSM Libraries -License: GPL -Group: System Environment/Libraries -Prefix: /usr -Provides: intel-mic-psm = %{version} -# non-MIC package -Conflicts: infinipath-psm -# OFED package -Obsoletes: infinipath-libs <= %{version}-%{release} -Conflicts: infinipath-libs <= %{version}-%{release} -# mpss package -Obsoletes: mpss-psm <= %{version}-%{release} -Conflicts: mpss-psm <= %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%package -n intel-mic-psm-devel -Summary: Development files for Intel PSM -Group: System Environment/Development -Requires: intel-mic-psm = %{version}-%{release} +%if "%{PSM_HAVE_SCIF}" == "1" Provides: intel-mic-psm-devel = %{version} -# non-MIC package -Conflicts: infinipath-psm-devel +%endif +# MIC package +Obsoletes: intel-mic-psm-devel # OFED package Obsoletes: infinipath-devel <= %{version}-%{release} Conflicts: infinipath-devel <= %{version}-%{release} @@ -141,16 +114,6 @@ %description -n infinipath-psm-devel Development files for the libpsm_infinipath library -%description -n intel-mic-psm -The PSM Messaging API, or PSM API, is Intel's low-level -user-level communications interface for the True Scale -family of products. PSM users are enabled with mechanisms -necessary to implement higher level communications -interfaces in parallel environments. - -%description -n intel-mic-psm-devel -Development files for the libpsm_infinipath library - %prep %setup -q -n %{name}-%{version}-%{release} @@ -171,39 +134,26 @@ %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig -%if "%{PSM_HAVE_SCIF}" == "1" -%files -n intel-mic-psm +%files %defattr(-,root,root,-) /usr/lib64/libpsm_infinipath.so.* /usr/lib64/libinfinipath.so.* +%if "%{PSM_HAVE_SCIF}" == "1" /usr/sbin/psmd - -%files -n intel-mic-psm-devel -%defattr(-,root,root,-) -/usr/lib64/libpsm_infinipath.so -/usr/lib64/libinfinipath.so -/usr/include/psm.h -/usr/include/psm_mq.h %endif - -%if "%{PSM_HAVE_SCIF}" == "0" -%files -%defattr(-,root,root,-) -/usr/lib64/libpsm_infinipath.so.* -/usr/lib64/libinfinipath.so.* - %files -n infinipath-psm-devel %defattr(-,root,root,-) /usr/lib64/libpsm_infinipath.so /usr/lib64/libinfinipath.so /usr/include/psm.h /usr/include/psm_mq.h -%endif %changelog +* Fri Sep 25 2015 Henry Estela <henry.r.estela(a)intel.com> - 3.3-1 +- Always build infinipath-psm with different Provides names. * Tue Nov 6 2012 Mitko Haralanov <mitko.haralanov(a)intel.com> - 3.3-1 - Add Intel Xeon Phi related changes * Tue May 11 2010 Mitko Haralanov <mitko(a)qlogic.com> - 3.3-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_debug.c new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_debug.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_debug.c 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_debug.c 2016-03-16 18:16:47.000000000 +0100 @@ -52,6 +52,7 @@ static void init_ipath_mylabel(void) __attribute__ ((constructor)); static void init_ipath_backtrace(void) __attribute__ ((constructor)); static void init_ipath_dbgfile(void) __attribute__ ((constructor)); +static void fini_ipath_backtrace(void) __attribute__ ((destructor)); static void init_ipath_mylabel(void) { @@ -140,6 +141,13 @@ exit(1); // not _exit(), want atexit handlers to get run } +static struct sigaction sigsegv_act; +static struct sigaction sigbus_act; +static struct sigaction sigill_act; +static struct sigaction sigabrt_act; +static struct sigaction sigint_act; +static struct sigaction sigterm_act; + // we do this as a constructor so any user program that sets signal // handlers for these will override our settings, but we still // get backtraces if they don't @@ -152,12 +160,24 @@ if(!getenv("IPATH_NO_BACKTRACE")) {// permanent, although probably // undocumented way to disable backtraces. - (void)sigaction(SIGSEGV, &act, NULL); - (void)sigaction(SIGBUS, &act, NULL); - (void)sigaction(SIGILL, &act, NULL); - (void)sigaction(SIGABRT, &act, NULL); - (void)sigaction(SIGINT, &act, NULL); - (void)sigaction(SIGTERM, &act, NULL); + (void)sigaction(SIGSEGV, &act, &sigsegv_act); + (void)sigaction(SIGBUS, &act, &sigbus_act); + (void)sigaction(SIGILL, &act, &sigill_act); + (void)sigaction(SIGABRT, &act, &sigabrt_act); + (void)sigaction(SIGINT, &act, &sigint_act); + (void)sigaction(SIGTERM, &act, &sigterm_act); + } +} + +static void fini_ipath_backtrace(void) +{ + if(!getenv("IPATH_NO_BACKTRACE")) { + (void)sigaction(SIGSEGV, &sigsegv_act, NULL); + (void)sigaction(SIGBUS, &sigbus_act, NULL); + (void)sigaction(SIGILL, &sigill_act, NULL); + (void)sigaction(SIGABRT, &sigabrt_act, NULL); + (void)sigaction(SIGINT, &sigint_act, NULL); + (void)sigaction(SIGTERM, &sigterm_act, NULL); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_dwordcpy-i386.S new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_dwordcpy-i386.S --- old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_dwordcpy-i386.S 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_dwordcpy-i386.S 2016-03-16 18:16:47.000000000 +0100 @@ -56,3 +56,7 @@ mov %eax,%edi mov %edx,%esi ret + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_dwordcpy-x86_64-fast.S new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_dwordcpy-x86_64-fast.S --- old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_dwordcpy-x86_64-fast.S 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_dwordcpy-x86_64-fast.S 2016-03-16 18:16:47.000000000 +0100 @@ -49,3 +49,7 @@ rep movsd ret + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_proto.c new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_proto.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_proto.c 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_proto.c 2016-03-16 18:16:47.000000000 +0100 @@ -460,7 +460,7 @@ _IPATH_DBG("chipstatus=0x%llx\n", (unsigned long long)*spctrl->__ipath_spi_status); - if(u->spu_subcontext_cnt) { + if(u->spu_subcontext_cnt > 0) { unsigned num_subcontexts = u->spu_subcontext_cnt; size_t size; int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_service.c new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_service.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ipath/ipath_service.c 2014-10-10 23:07:04.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ipath/ipath_service.c 2016-03-16 18:16:47.000000000 +0100 @@ -718,7 +718,7 @@ unit, port, strerror(errno)); } else { - int gid[8]; + unsigned int gid[8]; if (sscanf(gid_str, "%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x", &gid[0], &gid[1], &gid[2], &gid[3], &gid[4], &gid[5], &gid[6], &gid[7]) != 8) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/msg.txt new/infinipath-psm-3.3-19_g67c0807_open/msg.txt --- old/infinipath-psm-3.3-2_g6f42cdb_open/msg.txt 2014-10-10 23:07:06.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/msg.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Add make install action. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm.c new/infinipath-psm-3.3-19_g67c0807_open/psm.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm.c 2016-03-16 18:16:47.000000000 +0100 @@ -84,6 +84,7 @@ int iscompat = -1; switch (psmi_verno) { + case 0x0110: case 0x010f: /* Multi-rail is supported in this version, since the packet header * sequence number is shrunk from 24bits to 16bits, old version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm.h new/infinipath-psm-3.3-19_g67c0807_open/psm.h --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm.h 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm.h 2016-03-16 18:16:47.000000000 +0100 @@ -67,9 +67,9 @@ * psm_mq_init). */ typedef struct psm_mq *psm_mq_t; -#define PSM_VERNO 0x010f -#define PSM_VERNO_MAJOR 0x01 -#define PSM_VERNO_MINOR 0x0f +#define PSM_VERNO 0x0110 +#define PSM_VERNO_MAJOR 0x01 +#define PSM_VERNO_MINOR 0x10 enum psm_error { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_context.c new/infinipath-psm-3.3-19_g67c0807_open/psm_context.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_context.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_context.c 2016-03-16 18:16:47.000000000 +0100 @@ -43,7 +43,6 @@ #endif #define PSMI_SHARED_CONTEXTS_ENABLED_BY_DEFAULT 1 -static int psmi_sharedcontext_params(int *nranks, int *rankid); static int psmi_get_hca_selection_algorithm(void); static psm_error_t psmi_init_userinfo_params(psm_ep_t ep, int unit_id, int port, @@ -381,7 +380,7 @@ else errmsg = "Hardware not found"; - psmi_handle_error(context->ep, err, errmsg); + psmi_handle_error(context->ep, err, errmsg, "%s"); } } } @@ -593,7 +592,6 @@ return err; } -static int psmi_sharedcontext_params(int *nranks, int *rankid) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_context.h new/infinipath-psm-3.3-19_g67c0807_open/psm_context.h --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_context.h 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_context.h 2016-03-16 18:16:47.000000000 +0100 @@ -67,6 +67,7 @@ psm_error_t psmi_context_interrupt_set(psmi_context_t *context, int enable); int psmi_context_interrupt_isenabled(psmi_context_t *context); +int psmi_sharedcontext_params(int *nranks, int *rankid); /* Runtime flags describe what features are enabled in hw/sw and which * corresponding PSM features are being used. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_diags.c new/infinipath-psm-3.3-19_g67c0807_open/psm_diags.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_diags.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_diags.c 2016-03-16 18:16:47.000000000 +0100 @@ -244,6 +244,7 @@ ((uintptr_t) dst ^ (uintptr_t) src ^ (uintptr_t) n); unsigned int state; size_t i; + psmi_assert_always(n > 0); memset(src, 0x55, n); memset(dst, 0xaa, n); srand(seed); @@ -288,8 +289,11 @@ else { void *src_p, *dst_p; if (posix_memalign(&src_p, 64, size) != 0 || - posix_memalign(&dst_p, 64, size) != 0) + posix_memalign(&dst_p, 64, size) != 0) { + if (src_p) psmi_free(src_p); + if (dst_p) psmi_free(dst_p); return -1; + } else { src = (uint8_t *) src_p; dst = (uint8_t *) dst_p; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_ep.c new/infinipath-psm-3.3-19_g67c0807_open/psm_ep.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_ep.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_ep.c 2016-03-16 18:16:47.000000000 +0100 @@ -1394,7 +1394,7 @@ } } if (b_new != devstr) /* we parsed something, remove trailing comma */ - *(b_new - 1) = '\0'; + b_new[strlen(b_new) - 1] = '\0'; _IPATH_PRDBG("PSM Device allocation order: %s\n", devstr); fail: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_ep_connect.c new/infinipath-psm-3.3-19_g67c0807_open/psm_ep_connect.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_ep_connect.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_ep_connect.c 2016-03-16 18:16:47.000000000 +0100 @@ -275,7 +275,7 @@ } } errbuf[sizeof errbuf - 1] = '\0'; - err = psmi_handle_error(ep, err, errbuf); + err = psmi_handle_error(ep, err, errbuf, "%s"); } fail: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_stats.c new/infinipath-psm-3.3-19_g67c0807_open/psm_stats.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_stats.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_stats.c 2016-03-16 18:16:48.000000000 +0100 @@ -566,15 +566,15 @@ entries, nc+npc, ep); - return; bail: if (cnames != NULL) - infinipath_release_names(cnames); + psmi_free(cnames); if (pcnames != NULL) - infinipath_release_names(pcnames); + psmi_free(pcnames); if (entries != NULL) psmi_free(entries); + return; } static @@ -604,13 +604,13 @@ entries, ns, ep); - return; bail: if (snames != NULL) - infinipath_release_names(snames); + psmi_free(snames); if (entries != NULL) psmi_free(entries); + return; } #undef _SDECL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/psm_utils.c new/infinipath-psm-3.3-19_g67c0807_open/psm_utils.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/psm_utils.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/psm_utils.c 2016-03-16 18:16:48.000000000 +0100 @@ -1202,7 +1202,7 @@ fail: /* Unrecognized/unknown option */ - return psmi_handle_error(NULL, PSM_PARAM_ERR, err_string); + return psmi_handle_error(NULL, PSM_PARAM_ERR, err_string, "%s"); } psm_error_t psmi_core_setopt(const void *core_obj, int optname, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_am/am_reqrep.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_am/am_reqrep.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_am/am_reqrep.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_am/am_reqrep.c 2016-03-16 18:16:48.000000000 +0100 @@ -44,7 +44,7 @@ psm_am_completion_fn_t completion_fn, void *completion_ctxt) { - psm_amarg_t req_args[NSHORT_ARGS]; + psm_amarg_t req_args[NSHORT_ARGS] = {}; /* All sends are synchronous. Ignore PSM_AM_FLAG_ASYNC. * TODO: Treat PSM_AM_FLAG_NOREPLY as "advisory". This was mainly @@ -76,7 +76,7 @@ psm_am_completion_fn_t completion_fn, void *completion_ctxt) { - psm_amarg_t rep_args[NSHORT_ARGS]; + psm_amarg_t rep_args[NSHORT_ARGS] = {}; /* For now less than NSHORT_ARGS-1. We use the first arg to carry the handler * index. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_am/am_reqrep_shmem.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_am/am_reqrep_shmem.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_am/am_reqrep_shmem.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_am/am_reqrep_shmem.c 2016-03-16 18:16:48.000000000 +0100 @@ -389,8 +389,20 @@ amsh_init_segment(), and physical memory is only allocated by the OS accordingly. So, it looks like this is consumes a lot of memory, but really it consumes as much as necessary for each active process. */ +#ifdef PSM_HAVE_SCIF segsz = psmi_amsh_segsize(PTL_AMSH_MAX_LOCAL_PROCS, PTL_AMSH_MAX_LOCAL_NODES); +#else + /* In the non-SCIF case we should be able to get away with just allocating + * enough shm for the number of mpi ranks, if the number of ranks is + * unavailable, then we will fallback to the number of online cpu cores. + * This will help cut back on virtual memory usage. + */ + int nranks, rankid, nprocs; + psmi_sharedcontext_params(&nranks, &rankid); + nprocs = (nranks <= 0) ? sysconf(_SC_NPROCESSORS_ONLN) : nranks; + segsz = psmi_amsh_segsize(nprocs, PTL_AMSH_MAX_LOCAL_NODES); +#endif ep->amsh_shmfd = shm_open(ep->amsh_keyname, O_RDWR | O_CREAT | O_EXCL | O_TRUNC, S_IRWXU); @@ -820,14 +832,23 @@ pthread_mutex_unlock((pthread_mutex_t *) &(ep->amsh_dirpage->lock)); /* Instead of dynamically shrinking the shared memory region, we always - leave it allocated for up to PTL_AMSH_MAX_LOCAL_PROCS processes. + leave it allocated for up to PTL_AMSH_MAX_LOCAL_PROCS or number + of processors online. Thus mremap() is never necessary, nor is ftruncate() here. However when the attached process count does go to 0, we should fully munmap() the entire region. */ +#ifdef PSM_HAVE_SCIF if (munmap((void *) ep->amsh_shmbase, psmi_amsh_segsize(PTL_AMSH_MAX_LOCAL_PROCS, PTL_AMSH_MAX_LOCAL_NODES))) { +#else + int nranks, rankid, nprocs; + psmi_sharedcontext_params(&nranks, &rankid); + nprocs = (nranks <= 0) ? sysconf(_SC_NPROCESSORS_ONLN) : nranks; + if (munmap((void *) ep->amsh_shmbase, + psmi_amsh_segsize(nprocs, PTL_AMSH_MAX_LOCAL_NODES))) { +#endif err = psmi_handle_error(NULL, PSM_SHMEM_SEGMENT_ERR, "Error with munamp of shared segment: %s", strerror(errno)); goto fail; @@ -2658,7 +2679,7 @@ amsh_mq_rndv(ptl_t *ptl, psm_mq_t mq, psm_mq_req_t req, psm_epaddr_t epaddr, uint64_t tag, const void *buf, uint32_t len) { - psm_amarg_t args[5]; + psm_amarg_t args[5] = {}; psm_error_t err = PSM_OK; args[0].u32w0 = MQ_MSG_RTS; @@ -2723,7 +2744,7 @@ amsh_mq_send_inner(psm_mq_t mq, psm_mq_req_t req, psm_epaddr_t epaddr, uint32_t flags, uint64_t tag, const void *ubuf, uint32_t len)) { - psm_amarg_t args[3]; + psm_amarg_t args[3] = {}; psm_error_t err = PSM_OK; int is_blocking = (req == NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_am/ptl.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_am/ptl.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_am/ptl.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_am/ptl.c 2016-03-16 18:16:48.000000000 +0100 @@ -43,7 +43,7 @@ psm_error_t ptl_handle_rtsmatch_request(psm_mq_req_t req, int was_posted, amsh_am_token_t *tok) { - psm_amarg_t args[5]; + psm_amarg_t args[5] = {}; psm_epaddr_t epaddr = req->rts_peer; ptl_t *ptl = epaddr->ptl; int pid = 0; @@ -232,7 +232,7 @@ void *dest = (void *)(uintptr_t) args[2].u64w0; uint32_t msglen = args[3].u32w0; int pid = 0; - psm_amarg_t rarg[1]; + psm_amarg_t rarg[1] = {}; _IPATH_VDBG("[rndv][send] req=%p dest_req=%p src=%p dest=%p len=%d\n", sreq, (void*)(uintptr_t)args[1].u64w0, sreq->buf, dest, msglen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_epstate.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_epstate.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_epstate.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_epstate.c 2016-03-16 18:16:48.000000000 +0100 @@ -49,7 +49,8 @@ { memset(eps, 0, sizeof(*eps)); eps->context = context; - eps->eps_base_idx = (ips_epstate_idx) get_cycles(); + eps->eps_base_idx = ((ips_epstate_idx)get_cycles()) & + (IPS_EPSTATE_COMMIDX_MAX-1); return PSM_OK; } @@ -102,8 +103,7 @@ } } psmi_assert_always(i != eps->eps_tabsize); - commidx = j; - commidx -= eps->eps_base_idx; + commidx = (j - eps->eps_base_idx) & (IPS_EPSTATE_COMMIDX_MAX-1); _IPATH_VDBG("node %s gets commidx=%d (table idx %d)\n", psmi_epaddr_get_name(ipsaddr->epaddr->epid), commidx, j); eps->eps_tab[j].epid = @@ -123,8 +123,9 @@ psm_error_t ips_epstate_del(struct ips_epstate *eps, ips_epstate_idx commidx) { - ips_epstate_idx idx = commidx; - idx += eps->eps_base_idx; /* actual table index */ + ips_epstate_idx idx; + /* actual table index */ + idx = (commidx + eps->eps_base_idx) & (IPS_EPSTATE_COMMIDX_MAX-1); psmi_assert_always(idx < eps->eps_tabsize); _IPATH_VDBG("commidx=%d, table_idx=%d\n", commidx, idx); eps->eps_tab[idx].epid = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_epstate.h new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_epstate.h --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_epstate.h 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_epstate.h 2016-03-16 18:16:48.000000000 +0100 @@ -36,8 +36,13 @@ #include "psm_user.h" -typedef uint16_t ips_epstate_idx; -#define IPS_EPSTATE_COMMIDX_MAX 65535 +typedef uint32_t ips_epstate_idx; +#define IPS_EPSTATE_COMMIDX_MAX (1<<20) +#define IPS_EPSTATE_COMMIDX_MASK 0xF0000 +#define IPS_EPSTATE_COMMIDX_SHIFT 14 +#define IPS_EPSTATE_COMMIDX_PACK(ipscommidx) \ + ((ipscommidx & IPS_EPSTATE_COMMIDX_MASK) \ + >> IPS_EPSTATE_COMMIDX_SHIFT) struct ptl_epaddr; @@ -68,7 +73,7 @@ struct ips_epstate_entry * ips_epstate_lookup(const struct ips_epstate *eps, ips_epstate_idx idx)) { - idx += eps->eps_base_idx; + idx = (idx + eps->eps_base_idx) & (IPS_EPSTATE_COMMIDX_MAX-1); if (idx < eps->eps_tabsize) return &eps->eps_tab[idx]; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto.c 2016-03-16 18:16:48.000000000 +0100 @@ -633,7 +633,8 @@ (union psmi_envvar_val) defval, &env_sdma); - proto->flags |= env_sdma.e_uint & IPS_PROTO_FLAGS_ALL_SDMA; + if(env_sdma.e_uint != 1) + proto->flags |= env_sdma.e_uint & IPS_PROTO_FLAGS_ALL_SDMA; /* If anything uses send dma, figure out our max packet threshold to call * send dma with */ @@ -761,7 +762,7 @@ uint32_t tot_paywords = sizeof(struct ips_message_header) >> 2; struct ips_epinfo *epinfo = &proto->epinfo; struct ips_epinfo_remote *epr = &ipsaddr->epr; - uint16_t pkt_flags = 0; + uint16_t pkt_flags = IPS_EPSTATE_COMMIDX_PACK(epr->epr_commidx_to); struct ips_message_header *p_hdr = &msg->pbc_hdr.hdr; ips_path_rec_t *ctrl_path = ipsaddr->epr.epr_path[IPS_PATH_HIGH_PRIORITY][ipsaddr->epr.epr_hpp_index]; int paylen = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto.h new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto.h --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto.h 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto.h 2016-03-16 18:16:48.000000000 +0100 @@ -423,7 +423,7 @@ (((uint16_t)flowindex)&0x7) ) #define IPS_FLOWID_GET_PROTO(flow) (((flow)>>3)&0x7) -#define IPS_FLOWID_GET_INDEX(flow) ((flow)&0x7) +#define IPS_FLOWID_GET_INDEX(flow) ((flow) % 4) #define IPS_FLOWID2INDEX(flow) \ ((flow)&0x7) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_am.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_am.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_am.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_am.c 2016-03-16 18:16:48.000000000 +0100 @@ -298,7 +298,7 @@ else { /* Arguments and payload may split across header/eager_payload * boundaries. */ - psm_amarg_t args[8]; + psm_amarg_t args[8] = {}; int i; uint64_t *payload = (uint64_t *) ips_recvhdrq_event_payload(rcv_ev); uint32_t paylen = ips_recvhdrq_event_paylen(rcv_ev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_dump.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_dump.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_dump.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_dump.c 2016-03-16 18:16:48.000000000 +0100 @@ -36,6 +36,7 @@ #include "ips_proto_internal.h" #include "ips_proto_header.h" #include "ips_proto_help.h" +#include "ips_epstate.h" void ips_proto_dump_frame(void *frame, int lenght, char *message) { @@ -99,7 +100,8 @@ printf("BTH: R8-DestQP24 %x\n", __be32_to_cpu(p_hdr->bth[1])); printf("BTH: AR1-Res7-PSN24 %x\n", __be32_to_cpu(p_hdr->bth[2])); printf("IPH: chksum %x\n", __le16_to_cpu(p_hdr->iph.chksum)); - printf("IPH: pkt_flags %x\n", __le16_to_cpu(p_hdr->iph.pkt_flags)); + printf("IPH: pkt_flags %x\n", __le16_to_cpu( + p_hdr->iph.pkt_flags) & INFINIPATH_KPF_INTR_HDRSUPP_MASK); printf("IPH: ver %i\n", (__le32_to_cpu(p_hdr->iph.ver_context_tid_offset) >> INFINIPATH_I_VERS_SHIFT) & INFINIPATH_I_VERS_MASK); @@ -126,7 +128,8 @@ printf("context %d (src_context %d src_context_ext %d) src_subcontext %d\n", IPS_HEADER_SRCCONTEXT_GET(p_hdr), p_hdr->src_context, p_hdr->src_context_ext, p_hdr->src_subcontext); - printf("src_rank/commidx %i\n", p_hdr->commidx); + printf("src_rank/commidx %i\n", p_hdr->commidx | + INFINIPATH_KPF_RESERVED_BITS(p_hdr->iph.pkt_flags)); if (tid != IPATH_EAGER_TID_ID) printf("expected_tid_session_id %i\n", p_hdr->data[0].u32w0); printf("flags %x\n", p_hdr->flags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_expected.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_expected.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_expected.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_expected.c 2016-03-16 18:16:48.000000000 +0100 @@ -1035,7 +1035,7 @@ psm_error_t err; struct ips_protoexp *protoexp = tidsendc->protoexp; psm_mq_req_t req = tidsendc->mqreq; - ptl_arg_t desc_id[3]; + ptl_arg_t desc_id[3] = {}; uint64_t t_cyc; desc_id[0] = tidsendc->tid_list.tsess_descid; @@ -1117,7 +1117,7 @@ struct ips_protoexp *protoexp = tidsendc->protoexp; uint64_t t_cyc; psm_error_t err; - ptl_arg_t desc_id[3]; + ptl_arg_t desc_id[3] = {}; /* 0 contain's the receiver's desc_id, 1 contains the sender's desc_id */ desc_id[0] = tidsendc->tid_list.tsess_descid; @@ -2354,11 +2354,11 @@ struct ips_protoexp *protoexp = rcv_ev->proto->protoexp; struct ips_message_header *p_hdr = rcv_ev->p_hdr; struct ips_tid_recv_desc *tidrecvc; - ptl_arg_t desc_id = rcv_ev->p_hdr->data[0]; - ptl_arg_t send_descid = rcv_ev->p_hdr->data[1]; + ptl_arg_t desc_id = rcv_ev->p_hdr->hdr_data[0]; + ptl_arg_t send_descid = rcv_ev->p_hdr->hdr_data[1]; ptl_arg_t desc_tidrecvc; psmi_seqnum_t sequence_num; - ptl_arg_t args[3]; + ptl_arg_t args[3] = {}; psm_error_t err; psmi_assert_always(protoexp != NULL); @@ -2453,6 +2453,7 @@ struct ips_message_header *p_hdr = rcv_ev->p_hdr; int tid = IPS_HDR_TID(p_hdr); struct ips_tid_recv_desc *tidrecvc; + psmi_assert(rcv_ev->p_hdr->data != NULL); ptl_arg_t desc_id = rcv_ev->p_hdr->data[0]; ptl_arg_t desc_tidrecvc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_help.h new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_help.h --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_help.h 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_help.h 2016-03-16 18:16:48.000000000 +0100 @@ -40,6 +40,7 @@ #include "ipserror.h" #include "psm_mq_internal.h" // psmi_mq_handle_tiny_envelope #include "ptl_ips.h" +#include "ips_epstate.h" /* Some tunable compile-time options */ #define IPS_TINY_PROCESS_MQTINY 1 /* whether mq processing of tiny pkts is @@ -78,7 +79,7 @@ PSMI_ALWAYS_INLINE( ptl_epaddr_flow_t ips_proto_flowid(struct ips_message_header *p_hdr)) { - ptl_epaddr_flow_t flowidx = IPS_FLOWID_GET_INDEX(p_hdr->flowid); + ptl_epaddr_flow_t flowidx = IPS_FLOWID2INDEX(p_hdr->flowid); psmi_assert(flowidx < EP_FLOW_LAST); return flowidx; } @@ -383,7 +384,7 @@ { uint32_t extra_bytes; uint32_t tot_paywords; - uint16_t pkt_flags = 0; + uint16_t pkt_flags = IPS_EPSTATE_COMMIDX_PACK(epr->epr_commidx_to); extra_bytes = scb->payload_size & 3; if (extra_bytes) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_mq.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_mq.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_mq.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_mq.c 2016-03-16 18:16:48.000000000 +0100 @@ -167,6 +167,8 @@ if (do_flush) err = ips_recv_progress_if_busy(ipsaddr->ptl, err); + PSMI_BLOCKUNTIL(proto->ep,err, (scb->flags&IPS_SEND_FLAG_PENDING) == 0); + /* As per the PSM error model (or lack thereof), PSM clients expect to see * only PSM_OK as a recoverable error */ if (err == PSM_EP_NO_RESOURCES || err == PSM_OK_NO_PROGRESS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_recv.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_recv.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_proto_recv.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_proto_recv.c 2016-03-16 18:16:48.000000000 +0100 @@ -789,7 +789,7 @@ ptl_arg_t desc_id = p_hdr->data[0]; ptl_arg_t send_desc_id = p_hdr->data[1]; ptl_arg_t desc_tidrecvc; - ptl_arg_t args[3]; + ptl_arg_t args[3] = {}; int16_t seq_off; uint8_t ack_type; @@ -1263,7 +1263,8 @@ /* Obtain ipsaddr for packet */ epstaddr = ips_epstate_lookup(rcv_ev->recvq->epstate, - rcv_ev->p_hdr->commidx); + rcv_ev->p_hdr->commidx + + INFINIPATH_KPF_RESERVED_BITS(p_hdr->iph.pkt_flags)); if_pf (epstaddr == NULL || epstaddr->epid != rcv_ev->epid) return 0; /* Unknown packet - drop */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_recvhdrq.c new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_recvhdrq.c --- old/infinipath-psm-3.3-2_g6f42cdb_open/ptl_ips/ips_recvhdrq.c 2014-10-10 23:07:05.000000000 +0200 +++ new/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_recvhdrq.c 2016-03-16 18:16:48.000000000 +0100 @@ -367,7 +367,8 @@ uint32_t hd, tl; epstaddr = - ips_epstate_lookup(rcv_ev->recvq->epstate, rcv_ev->p_hdr->commidx); + ips_epstate_lookup(rcv_ev->recvq->epstate, rcv_ev->p_hdr->commidx + + INFINIPATH_KPF_RESERVED_BITS(rcv_ev->p_hdr->iph.pkt_flags)); epstaddr = (epstaddr && epstaddr->ipsaddr) ? epstaddr : NULL; lcontext = @@ -580,7 +581,9 @@ /* Classify packet from a known or unknown endpoint */ struct ips_epstate_entry *epstaddr; - epstaddr = ips_epstate_lookup(recvq->epstate, rcv_ev.p_hdr->commidx); + epstaddr = + ips_epstate_lookup(recvq->epstate, rcv_ev.p_hdr->commidx + + INFINIPATH_KPF_RESERVED_BITS(rcv_ev.p_hdr->iph.pkt_flags)); if_pf (epstaddr == NULL || epstaddr->epid != rcv_ev.epid) { rcv_ev.ipsaddr = NULL; recvq->recvq_callbacks.callback_packet_unknown(&rcv_ev);

1 0

commit python-enum34 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package python-enum34 for openSUSE:Factory checked in at 2016-05-02 10:43:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-enum34 (Old) and /work/SRC/openSUSE:Factory/.python-enum34.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-enum34" Changes: -------- --- /work/SRC/openSUSE:Factory/python-enum34/python-enum34.changes 2015-05-10 10:52:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-enum34.new/python-enum34.changes 2016-05-02 10:43:10.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 4 09:55:13 UTC 2016 - gutaper(a)gmail.com + +- Update to version 1.1.3 + +------------------------------------------------------------------- Old: ---- enum34-1.0.4.tar.gz New: ---- enum34-1.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-enum34.spec ++++++ --- /var/tmp/diff_new_pack.7n4zCi/_old 2016-05-02 10:43:11.000000000 +0200 +++ /var/tmp/diff_new_pack.7n4zCi/_new 2016-05-02 10:43:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-enum34 -Version: 1.0.4 +Version: 1.1.3 Release: 0 Url: https://pypi.python.org/pypi/enum34 Summary: Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4 ++++++ enum34-1.0.4.tar.gz -> enum34-1.1.3.tar.gz ++++++ ++++ 7744 lines of diff (skipped)

1 0