openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2018
- 1 participants
- 2073 discussions
Hello community,
here is the log from the commit of package runc for openSUSE:Factory checked in at 2018-12-27 00:25:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/runc (Old)
and /work/SRC/openSUSE:Factory/.runc.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "runc"
Thu Dec 27 00:25:07 2018 rev:21 rq:660263 version:1.0.0~rc6
Changes:
--------
--- /work/SRC/openSUSE:Factory/runc/runc.changes 2018-12-05 09:37:10.401113581 +0100
+++ /work/SRC/openSUSE:Factory/.runc.new.28833/runc.changes 2018-12-27 00:25:20.139862053 +0100
@@ -1,0 +2,15 @@
+Wed Dec 19 19:55:11 UTC 2018 - clee(a)suse.com
+
+- Update go requirements to >= go1.10 to fix
+ * bsc#1118897 CVE-2018-16873
+ go#29230 cmd/go: remote command execution during "go get -u"
+ * bsc#1118898 CVE-2018-16874
+ go#29231 cmd/go: directory traversal in "go get" via curly braces in import paths
+ * bsc#1118899 CVE-2018-16875
+ go#29233 crypto/x509: CPU denial of service
+-------------------------------------------------------------------
+Thu Dec 13 04:34:25 UTC 2018 - dorf(a)suse.com
+
+- Require golang = 1.10.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ runc.spec ++++++
--- /var/tmp/diff_new_pack.5NCDL8/_old 2018-12-27 00:25:20.623861658 +0100
+++ /var/tmp/diff_new_pack.5NCDL8/_new 2018-12-27 00:25:20.623861658 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# nodebuginfo
@@ -21,6 +21,8 @@
# only package released versions (unlike docker-runc).
%define git_version %{nil}
+# Package-wide golang version
+%define go_version 1.10
%define go_tool go
%define _version 1.0.0-rc6
%define project github.com/opencontainers/runc
@@ -50,7 +52,7 @@
Source2: runc.keyring
BuildRequires: fdupes
BuildRequires: go-go-md2man
-BuildRequires: golang(API) = 1.10
+BuildRequires: golang(API) = %{go_version}
%if 0%{?with_libseccomp}
BuildRequires: libseccomp-devel
%endif
@@ -68,7 +70,7 @@
Summary: Test package for runc
# Make sure we require go 1.7
Group: System/Management
-BuildRequires: golang(API) = 1.7
+BuildRequires: golang(API) = %{go_version}
Requires: go-go-md2man
Requires: libapparmor-devel
%if 0%{?with_libseccomp}
1
0
Hello community,
here is the log from the commit of package go1.11 for openSUSE:Factory checked in at 2018-12-27 00:25:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/go1.11 (Old)
and /work/SRC/openSUSE:Factory/.go1.11.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go1.11"
Thu Dec 27 00:25:01 2018 rev:4 rq:658901 version:1.11.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/go1.11/go1.11.changes 2018-12-10 12:26:02.430664671 +0100
+++ /work/SRC/openSUSE:Factory/.go1.11.new.28833/go1.11.changes 2018-12-27 00:25:18.895863069 +0100
@@ -1,0 +2,67 @@
+Sat Dec 15 12:45:31 UTC 2018 - Aleksa Sarai <asarai(a)suse.com>
+
+- Make our profile.d/go.sh no longer set GOROOT=, in order to make switching
+ between versions no longer break. This ends up removing the need for go.sh
+ entirely (because GOPATH is also set automatically). boo#1119634
+
+-------------------------------------------------------------------
+Sat Dec 15 06:01:39 UTC 2018 - Jeff Kowalczyk <jkowalczyk(a)suse.com>
+
+- go1.11.4 (released 2018/12/14) includes fixes to cgo, the compiler, linker,
+ runtime, documentation, go command, and the net/http and go/types packages.
+ It includes a fix to a bug introduced in Go 1.11.3 that broke go get for
+ import path patterns containing "..." (boo#1119706). See the Go 1.11.4 milestone on our
+ issue tracker for details.
+ https://github.com/golang/go/issues?q=milestone%3AGo1.11.4+label%3ACherryPi…
+ * go#29272 misc/cgo/test: issue24161 tests broken on Darwin
+ * go#29248 cmd/go: "go get" fails on import path patterns with wildcards ("...")
+ * go#29191 cmd/go: symbolic links not dropped from repo
+ * go#29112 cmd/link: too many open files on high object-count dependencies
+ * go#28974 cmd/go: need to backport relaxing of go.mod go verb constraints to 1.11 series
+ * go#28972 go/types: problem with alias type
+ * go#28916 cmd/cgo: nested structure has too much alignment padding
+ * go#28799 runtime: fatal error: out of memory on reslice with negative index
+ * go#28752 reflect: scanning invalid return slots during a makeFunc call
+ * go#28725 cmd/go: panic when argument doesn't match any packages
+ * go#28694 cmd/compile: inline multiplication corrupts an argument on arm
+ * go#28690 runtime: ThreadSanitizer CHECK failed
+ * go#28673 x/net/http2: Transport is leaking streams on broken Body
+ * go#28617 cmd/compile: panic during fuse with if true block containing a goto and a return
+ * go#28586 cmd/compile: go binaries not working on exynos 64 bit CPUs
+ * go#27395 cmd/cgo: typedef pointer arguments regression
+ * go#27383 cmd/compile: failure on a function type alias
+
+-------------------------------------------------------------------
+Thu Dec 13 23:26:59 UTC 2018 - Jeff Kowalczyk <jkowalczyk(a)suse.com>
+
+- Update to Go 1.11.3 (released 2018/12/13). This includes fixes to
+ the crypto/x509 and cmd/go packages. See the Go 1.11.3 milestone
+ on upstream tracker for details:
+ https://github.com/golang/go/issues?q=milestone%3AGo1.11.3
+ * bsc#1118897 CVE-2018-16873
+ go#29230 cmd/go: remote command execution during "go get -u"
+ * bsc#1118898 CVE-2018-16874
+ go#29231 cmd/go: directory traversal in "go get" via curly braces in import paths
+ * bsc#1118899 CVE-2018-16875
+ go#29233 crypto/x509: CPU denial of service
+ * Upstream is aware of a functionality regression in "go get" when
+ executed in GOPATH mode on an import path pattern containing "..."
+ (e.g., "go get github.com/golang/pkg/..."), when downloading
+ packages not already present in the GOPATH workspace. This is go#29241
+ and will be resolved in the next minor patch release go-1.11.4
+
+-------------------------------------------------------------------
+Mon Dec 10 19:07:53 UTC 2018 - Jeff Kowalczyk <jkowalczyk(a)suse.com>
+
+- Fix build error with PIE linker flags on ppc64le. bsc#1113978 boo#1098017
+ * gccgo on ppc64le with default PIE enabled fails with:
+ error while loading shared libraries:
+ R_PPC64_ADDR16_HA re10143fb0c for symbol `' out of range
+ * linuxppc-dev discussion:
+ "PIE binaries are no longer mapped below 4 GiB on ppc64le"
+ https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-November/180862.html
+ * Add for ppc64le only: #!BuildIgnore: gcc-PIE
+ * OBS environment defaults to PIE
+ * Upstream fix for go buildmode PIE desired, track upstream go#28531
+
+-------------------------------------------------------------------
Old:
----
go.sh
go1.11.2.src.tar.gz
New:
----
go1.11.4.src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ go1.11.spec ++++++
--- /var/tmp/diff_new_pack.7Lnnhp/_old 2018-12-27 00:25:19.775862350 +0100
+++ /var/tmp/diff_new_pack.7Lnnhp/_new 2018-12-27 00:25:19.779862347 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# nodebuginfo
@@ -46,6 +46,17 @@
%define with_gccgo 1
%endif
+# gccgo on ppc64le with default PIE enabled fails with:
+# error while loading shared libraries:
+# R_PPC64_ADDR16_HA re10143fb0c for symbol `' out of range
+# track https://github.com/golang/go/issues/28531
+# linuxppc-dev discussion:
+# "PIE binaries are no longer mapped below 4 GiB on ppc64le"
+# https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-November/180862.html
+%ifarch ppc64le
+#!BuildIgnore: gcc-PIE
+%endif
+
# By default we don't include tsan. It's only supported on amd64.
%define tsan_arch x86_64
@@ -78,7 +89,7 @@
%endif
Name: go1.11
-Version: 1.11.2
+Version: 1.11.4
Release: 0
Summary: A compiled, garbage-collected, concurrent programming language
License: BSD-3-Clause
@@ -86,7 +97,6 @@
Url: http://golang.org
Source: http://golang.org/dl/go%{version}.src.tar.gz
Source1: go-rpmlintrc
-Source2: go.sh
Source4: README.SUSE
Source6: go.gdbinit
# We have to compile TSAN ourselves. boo#1052528
@@ -275,8 +285,6 @@
%install
export GOROOT="%{buildroot}%{_libdir}/go/%{go_api}"
-install -Dm644 %{SOURCE2} $GOROOT/bin/profile.d/go.sh
-sed -i "s/\$go_api/%{go_api}/" $GOROOT/bin/profile.d/go.sh
# locations for third party libraries, see README-openSUSE for info about locations.
install -d %{buildroot}%{_datadir}/go/%{go_api}/contrib
@@ -323,10 +331,9 @@
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_sysconfdir}/gdbinit.d
- touch %{buildroot}%{_sysconfdir}/alternatives/{go,gofmt,go.sh,go.gdb}
+ touch %{buildroot}%{_sysconfdir}/alternatives/{go,gofmt,go.gdb}
ln -sf %{_sysconfdir}/alternatives/go %{buildroot}%{_bindir}/go
ln -sf %{_sysconfdir}/alternatives/gofmt %{buildroot}%{_bindir}/gofmt
- ln -sf %{_sysconfdir}/alternatives/go.sh %{buildroot}%{_sysconfdir}/profile.d/go.sh
ln -sf %{_sysconfdir}/alternatives/go.gdb %{buildroot}%{_sysconfdir}/gdbinit.d/go.gdb
# documentation and examples
@@ -347,7 +354,6 @@
--install %{_bindir}/go go %{_libdir}/go/%{go_api}/bin/go 30 \
--slave %{_bindir}/gofmt gofmt %{_libdir}/go/%{go_api}/bin/gofmt \
--slave %{_sysconfdir}/gdbinit.d/go.gdb go.gdb %{_libdir}/go/%{go_api}/bin/gdbinit.d/go.gdb \
- --slave %{_sysconfdir}/profile.d/go.sh go.sh %{_libdir}/go/%{go_api}/bin/profile.d/go.sh
%postun
if [ $1 -eq 0 ] ; then
@@ -362,11 +368,9 @@
%{_libdir}/go/%{go_api}
%dir %{_datadir}/go
%{_datadir}/go/%{go_api}
-%config %{_sysconfdir}/profile.d/go.sh
%config %{_sysconfdir}/gdbinit.d/go.gdb
%ghost %{_sysconfdir}/alternatives/go
%ghost %{_sysconfdir}/alternatives/gofmt
-%ghost %{_sysconfdir}/alternatives/go.sh
%ghost %{_sysconfdir}/alternatives/go.gdb
%dir %{_docdir}/go
%dir %{_docdir}/go/%{go_api}
++++++ go1.11.2.src.tar.gz -> go1.11.4.src.tar.gz ++++++
/work/SRC/openSUSE:Factory/go1.11/go1.11.2.src.tar.gz /work/SRC/openSUSE:Factory/.go1.11.new.28833/go1.11.4.src.tar.gz differ: char 29, line 1
1
0
Hello community,
here is the log from the commit of package go for openSUSE:Factory checked in at 2018-12-27 00:24:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/go (Old)
and /work/SRC/openSUSE:Factory/.go.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go"
Thu Dec 27 00:24:56 2018 rev:94 rq:658809 version:1.11.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/go/go.changes 2018-11-18 23:21:00.606289012 +0100
+++ /work/SRC/openSUSE:Factory/.go.new.28833/go.changes 2018-12-27 00:24:57.739880332 +0100
@@ -1,0 +2,46 @@
+Sat Dec 15 17:58:49 UTC 2018 - Jeff Kowalczyk <jkowalczyk(a)suse.com>
+
+- go1.11.4 (released 2018/12/14) includes fixes to cgo, the compiler, linker,
+ runtime, documentation, go command, and the net/http and go/types packages.
+ It includes a fix to a bug introduced in Go 1.11.3 that broke go get for
+ import path patterns containing "...". See the Go 1.11.4 milestone on our
+ issue tracker for details.
+ https://github.com/golang/go/issues?q=milestone%3AGo1.11.4+label%3ACherryPi…
+ * go#29272 misc/cgo/test: issue24161 tests broken on Darwin
+ * go#29248 cmd/go: "go get" fails on import path patterns with wildcards ("...")
+ * go#29191 cmd/go: symbolic links not dropped from repo
+ * go#29112 cmd/link: too many open files on high object-count dependencies
+ * go#28974 cmd/go: need to backport relaxing of go.mod go verb constraints to 1.11 series
+ * go#28972 go/types: problem with alias type
+ * go#28916 cmd/cgo: nested structure has too much alignment padding
+ * go#28799 runtime: fatal error: out of memory on reslice with negative index
+ * go#28752 reflect: scanning invalid return slots during a makeFunc call
+ * go#28725 cmd/go: panic when argument doesn't match any packages
+ * go#28694 cmd/compile: inline multiplication corrupts an argument on arm
+ * go#28690 runtime: ThreadSanitizer CHECK failed
+ * go#28673 x/net/http2: Transport is leaking streams on broken Body
+ * go#28617 cmd/compile: panic during fuse with if true block containing a goto and a return
+ * go#28586 cmd/compile: go binaries not working on exynos 64 bit CPUs
+ * go#27395 cmd/cgo: typedef pointer arguments regression
+ * go#27383 cmd/compile: failure on a function type alias
+
+-------------------------------------------------------------------
+Thu Dec 13 23:57:46 UTC 2018 - Jeff Kowalczyk <jkowalczyk(a)suse.com>
+
+- Update to Go 1.11.3 (released 2018/12/13). This includes fixes to
+ the crypto/x509 and cmd/go packages. See the Go 1.11.3 milestone
+ on upstream tracker for details:
+ https://github.com/golang/go/issues?q=milestone%3AGo1.11.3
+ * bsc#1118897 CVE-2018-16873
+ go#29230 cmd/go: remote command execution during "go get -u"
+ * bsc#1118898 CVE-2018-16874
+ go#29231 cmd/go: directory traversal in "go get" via curly braces in import paths
+ * bsc#1118899 CVE-2018-16875
+ go#29233 crypto/x509: CPU denial of service
+ * Upstream is aware of a functionality regression in "go get" when
+ executed in GOPATH mode on an import path pattern containing "..."
+ (e.g., "go get github.com/golang/pkg/..."), when downloading
+ packages not already present in the GOPATH workspace. This is go#29241
+ and will be resolved in the next minor patch release go-1.11.4
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ go.spec ++++++
--- /var/tmp/diff_new_pack.IwYZvT/_old 2018-12-27 00:24:58.395879797 +0100
+++ /var/tmp/diff_new_pack.IwYZvT/_new 2018-12-27 00:24:58.399879794 +0100
@@ -22,7 +22,7 @@
%define short_version 1.11
Name: go
-Version: 1.11.1
+Version: 1.11.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A compiled, garbage-collected, concurrent programming language
1
0
Hello community,
here is the log from the commit of package spirv-headers for openSUSE:Factory checked in at 2018-12-27 00:24:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spirv-headers (Old)
and /work/SRC/openSUSE:Factory/.spirv-headers.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spirv-headers"
Thu Dec 27 00:24:52 2018 rev:11 rq:658216 version:1.3.g50
Changes:
--------
--- /work/SRC/openSUSE:Factory/spirv-headers/spirv-headers.changes 2018-11-12 09:35:20.465706044 +0100
+++ /work/SRC/openSUSE:Factory/.spirv-headers.new.28833/spirv-headers.changes 2018-12-27 00:24:53.787883557 +0100
@@ -1,0 +2,7 @@
+Fri Dec 14 23:33:12 UTC 2018 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to new snapshot 1.3.g50
+ * Reserve tokens for float controls and no integer wrapping
+ * Add JSON support for SPV_EXT_fragment_invocation_density
+
+-------------------------------------------------------------------
Old:
----
spirv-headers-1.3.g44.tar.xz
New:
----
spirv-headers-1.3.g50.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spirv-headers.spec ++++++
--- /var/tmp/diff_new_pack.vnui8L/_old 2018-12-27 00:24:54.427883035 +0100
+++ /var/tmp/diff_new_pack.vnui8L/_new 2018-12-27 00:24:54.427883035 +0100
@@ -16,10 +16,10 @@
#
-%define version_unconverted 1.3.g44
+%define version_unconverted 1.3.g50
Name: spirv-headers
-Version: 1.3.g44
+Version: 1.3.g50
Release: 0
Summary: Machine-readable files from the SPIR-V registry
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.vnui8L/_old 2018-12-27 00:24:54.451883015 +0100
+++ /var/tmp/diff_new_pack.vnui8L/_new 2018-12-27 00:24:54.451883015 +0100
@@ -3,6 +3,7 @@
<param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/SPIRV-Headers</param>
<param name="filename">spirv-headers</param>
+ <param name="revision">17da9f8231f78cf519b4958c2229463a63ead9e2</param>
<param name="parent-tag">02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea</param>
<param name="versionformat">1.3.g@TAG_OFFSET@</param>
</service>
++++++ spirv-headers-1.3.g44.tar.xz -> spirv-headers-1.3.g50.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/CMakeLists.txt new/spirv-headers-1.3.g50/CMakeLists.txt
--- old/spirv-headers-1.3.g44/CMakeLists.txt 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/CMakeLists.txt 2018-11-30 15:32:53.000000000 +0100
@@ -57,4 +57,12 @@
COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv
$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/include/spirv)
-add_subdirectory(example)
+option(SPIRV_HEADERS_SKIP_EXAMPLES "Skip building examples"
+ ${SPIRV_HEADERS_SKIP_EXAMPLES})
+if(NOT ${SPIRV_HEADERS_SKIP_EXAMPLES})
+ set(SPIRV_HEADERS_ENABLE_EXAMPLES ON)
+endif()
+if (SPIRV_HEADERS_ENABLE_EXAMPLES)
+ message(STATUS "Building SPIRV-Header examples")
+ add_subdirectory(example)
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/spir-v.xml new/spirv-headers-1.3.g50/include/spirv/spir-v.xml
--- old/spirv-headers-1.3.g44/include/spirv/spir-v.xml 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/spir-v.xml 2018-11-30 15:32:53.000000000 +0100
@@ -69,7 +69,8 @@
<id value="17" vendor="Khronos" tool="SPIR-V Tools Linker" comment="Contact David Neto, dneto(a)google.com"/>
<id value="18" vendor="Wine" tool="VKD3D Shader Compiler" comment="Contact wine-devel(a)winehq.org"/>
<id value="19" vendor="Clay" tool="Clay Shader Compiler" comment="Contact info(a)clayengine.com"/>
- <unused start="20" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+ <id value="20" vendor="W3C WebGPU Group" tool="WHLSL Shader Translator" comment="https://github.com/gpuweb/WHLSL"/>
+ <unused start="21" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
</ids>
<!-- SECTION: SPIR-V Opcodes and Enumerants -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.core.grammar.json new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.core.grammar.json
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.core.grammar.json 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.core.grammar.json 2018-11-30 15:32:53.000000000 +0100
@@ -4773,6 +4773,56 @@
"extensions" : [ "SPV_KHR_post_depth_coverage" ],
"version" : "None"
},
+{
+ "enumerant" : "DenormPreserve",
+ "value" : 4459,
+ "capabilities" : [ "DenormPreserve"],
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "parameters" : [
+ { "kind" : "LiteralInteger", "name" : "'Target Width'" }
+ ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "DenormFlushToZero",
+ "value" : 4460,
+ "capabilities" : [ "DenormFlushToZero"],
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "parameters" : [
+ { "kind" : "LiteralInteger", "name" : "'Target Width'" }
+ ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "SignedZeroInfNanPreserve",
+ "value" : 4461,
+ "capabilities" : [ "SignedZeroInfNanPreserve"],
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "parameters" : [
+ { "kind" : "LiteralInteger", "name" : "'Target Width'" }
+ ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "RoundingModeRTE",
+ "value" : 4462,
+ "capabilities" : [ "RoundingModeRTE"],
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "parameters" : [
+ { "kind" : "LiteralInteger", "name" : "'Target Width'" }
+ ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "RoundingModeRTZ",
+ "value" : 4463,
+ "capabilities" : [ "RoundingModeRTZ"],
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "parameters" : [
+ { "kind" : "LiteralInteger", "name" : "'Target Width'" }
+ ],
+ "version" : "None"
+ },
{
"enumerant" : "StencilRefReplacingEXT",
"value" : 5027,
@@ -5817,6 +5867,18 @@
"version" : "1.2"
},
{
+ "enumerant" : "NoSignedWrap",
+ "value" : 4469,
+ "extensions" : [ "SPV_KHR_no_integer_wrap_decoration" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "NoUnsignedWrap",
+ "value" : 4470,
+ "extensions" : [ "SPV_KHR_no_integer_wrap_decoration" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "ExplicitInterpAMD",
"value" : 4999,
"extensions" : [ "SPV_AMD_shader_explicit_vertex_parameter" ],
@@ -6370,17 +6432,31 @@
"version" : "None"
},
{
+ "enumerant" : "FragSizeEXT",
+ "value" : 5292 ,
+ "capabilities" : [ "FragmentDensityEXT", "ShadingRateNV" ],
+ "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "FragmentSizeNV",
"value" : 5292 ,
- "capabilities" : [ "ShadingRateNV" ],
- "extensions" : [ "SPV_NV_shading_rate" ],
+ "capabilities" : [ "ShadingRateNV", "FragmentDensityEXT" ],
+ "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "FragInvocationCountEXT",
+ "value" : 5293,
+ "capabilities" : [ "FragmentDensityEXT", "ShadingRateNV" ],
+ "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ],
"version" : "None"
},
{
"enumerant" : "InvocationsPerPixelNV",
"value" : 5293,
- "capabilities" : [ "ShadingRateNV" ],
- "extensions" : [ "SPV_NV_shading_rate" ],
+ "capabilities" : [ "ShadingRateNV", "FragmentDensityEXT" ],
+ "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ],
"version" : "None"
},
{
@@ -7028,6 +7104,36 @@
"version" : "None"
},
{
+ "enumerant" : "DenormPreserve",
+ "value" : 4464,
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "DenormFlushToZero",
+ "value" : 4465,
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "SignedZeroInfNanPreserve",
+ "value" : 4466,
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "RoundingModeRTE",
+ "value" : 4467,
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "RoundingModeRTZ",
+ "value" : 4468,
+ "extensions" : [ "SPV_KHR_float_controls" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "Float16ImageAMD",
"value" : 5008,
"capabilities" : [ "Shader" ],
@@ -7277,10 +7383,17 @@
"version" : "None"
},
{
+ "enumerant" : "FragmentDensityEXT",
+ "value" : 5291,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "ShadingRateNV",
"value" : 5291,
"capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_NV_shading_rate" ],
+ "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ],
"version" : "None"
}
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.cs new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.cs
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.cs 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.cs 2018-11-30 15:32:53.000000000 +0100
@@ -47,7 +47,7 @@
{
public const uint MagicNumber = 0x07230203;
public const uint Version = 0x00010300;
- public const uint Revision = 1;
+ public const uint Revision = 6;
public const uint OpCodeMask = 0xffff;
public const uint WordCountShift = 16;
@@ -136,6 +136,11 @@
LocalSizeId = 38,
LocalSizeHintId = 39,
PostDepthCoverage = 4446,
+ DenormPreserve = 4459,
+ DenormFlushToZero = 4460,
+ SignedZeroInfNanPreserve = 4461,
+ RoundingModeRTE = 4462,
+ RoundingModeRTZ = 4463,
StencilRefReplacingEXT = 5027,
OutputLinesNV = 5269,
OutputPrimitivesNV = 5270,
@@ -415,6 +420,8 @@
MaxByteOffset = 45,
AlignmentId = 46,
MaxByteOffsetId = 47,
+ NoSignedWrap = 4469,
+ NoUnsignedWrap = 4470,
ExplicitInterpAMD = 4999,
OverrideCoverageNV = 5248,
PassthroughNV = 5250,
@@ -511,7 +518,9 @@
MeshViewIndicesNV = 5281,
BaryCoordNV = 5286,
BaryCoordNoPerspNV = 5287,
+ FragSizeEXT = 5292,
FragmentSizeNV = 5292,
+ FragInvocationCountEXT = 5293,
InvocationsPerPixelNV = 5293,
LaunchIdNV = 5319,
LaunchSizeNV = 5320,
@@ -758,6 +767,11 @@
StorageBuffer8BitAccess = 4448,
UniformAndStorageBuffer8BitAccess = 4449,
StoragePushConstant8 = 4450,
+ DenormPreserve = 4464,
+ DenormFlushToZero = 4465,
+ SignedZeroInfNanPreserve = 4466,
+ RoundingModeRTE = 4467,
+ RoundingModeRTZ = 4468,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
@@ -775,6 +789,7 @@
ImageFootprintNV = 5282,
FragmentBarycentricNV = 5284,
ComputeDerivativeGroupQuadsNV = 5288,
+ FragmentDensityEXT = 5291,
ShadingRateNV = 5291,
GroupNonUniformPartitionedNV = 5297,
ShaderNonUniformEXT = 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.h new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.h
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.h 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.h 2018-11-30 15:32:53.000000000 +0100
@@ -52,11 +52,11 @@
typedef unsigned int SpvId;
#define SPV_VERSION 0x10300
-#define SPV_REVISION 1
+#define SPV_REVISION 6
static const unsigned int SpvMagicNumber = 0x07230203;
static const unsigned int SpvVersion = 0x00010300;
-static const unsigned int SpvRevision = 1;
+static const unsigned int SpvRevision = 6;
static const unsigned int SpvOpCodeMask = 0xffff;
static const unsigned int SpvWordCountShift = 16;
@@ -144,6 +144,11 @@
SpvExecutionModeLocalSizeId = 38,
SpvExecutionModeLocalSizeHintId = 39,
SpvExecutionModePostDepthCoverage = 4446,
+ SpvExecutionModeDenormPreserve = 4459,
+ SpvExecutionModeDenormFlushToZero = 4460,
+ SpvExecutionModeSignedZeroInfNanPreserve = 4461,
+ SpvExecutionModeRoundingModeRTE = 4462,
+ SpvExecutionModeRoundingModeRTZ = 4463,
SpvExecutionModeStencilRefReplacingEXT = 5027,
SpvExecutionModeOutputLinesNV = 5269,
SpvExecutionModeOutputPrimitivesNV = 5270,
@@ -421,6 +426,8 @@
SpvDecorationMaxByteOffset = 45,
SpvDecorationAlignmentId = 46,
SpvDecorationMaxByteOffsetId = 47,
+ SpvDecorationNoSignedWrap = 4469,
+ SpvDecorationNoUnsignedWrap = 4470,
SpvDecorationExplicitInterpAMD = 4999,
SpvDecorationOverrideCoverageNV = 5248,
SpvDecorationPassthroughNV = 5250,
@@ -517,7 +524,9 @@
SpvBuiltInMeshViewIndicesNV = 5281,
SpvBuiltInBaryCoordNV = 5286,
SpvBuiltInBaryCoordNoPerspNV = 5287,
+ SpvBuiltInFragSizeEXT = 5292,
SpvBuiltInFragmentSizeNV = 5292,
+ SpvBuiltInFragInvocationCountEXT = 5293,
SpvBuiltInInvocationsPerPixelNV = 5293,
SpvBuiltInLaunchIdNV = 5319,
SpvBuiltInLaunchSizeNV = 5320,
@@ -758,6 +767,11 @@
SpvCapabilityStorageBuffer8BitAccess = 4448,
SpvCapabilityUniformAndStorageBuffer8BitAccess = 4449,
SpvCapabilityStoragePushConstant8 = 4450,
+ SpvCapabilityDenormPreserve = 4464,
+ SpvCapabilityDenormFlushToZero = 4465,
+ SpvCapabilitySignedZeroInfNanPreserve = 4466,
+ SpvCapabilityRoundingModeRTE = 4467,
+ SpvCapabilityRoundingModeRTZ = 4468,
SpvCapabilityFloat16ImageAMD = 5008,
SpvCapabilityImageGatherBiasLodAMD = 5009,
SpvCapabilityFragmentMaskAMD = 5010,
@@ -775,6 +789,7 @@
SpvCapabilityImageFootprintNV = 5282,
SpvCapabilityFragmentBarycentricNV = 5284,
SpvCapabilityComputeDerivativeGroupQuadsNV = 5288,
+ SpvCapabilityFragmentDensityEXT = 5291,
SpvCapabilityShadingRateNV = 5291,
SpvCapabilityGroupNonUniformPartitionedNV = 5297,
SpvCapabilityShaderNonUniformEXT = 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.hpp new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.hpp
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.hpp 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.hpp 2018-11-30 15:32:53.000000000 +0100
@@ -48,11 +48,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10300
-#define SPV_REVISION 1
+#define SPV_REVISION 6
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010300;
-static const unsigned int Revision = 1;
+static const unsigned int Revision = 6;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -140,6 +140,11 @@
ExecutionModeLocalSizeId = 38,
ExecutionModeLocalSizeHintId = 39,
ExecutionModePostDepthCoverage = 4446,
+ ExecutionModeDenormPreserve = 4459,
+ ExecutionModeDenormFlushToZero = 4460,
+ ExecutionModeSignedZeroInfNanPreserve = 4461,
+ ExecutionModeRoundingModeRTE = 4462,
+ ExecutionModeRoundingModeRTZ = 4463,
ExecutionModeStencilRefReplacingEXT = 5027,
ExecutionModeOutputLinesNV = 5269,
ExecutionModeOutputPrimitivesNV = 5270,
@@ -417,6 +422,8 @@
DecorationMaxByteOffset = 45,
DecorationAlignmentId = 46,
DecorationMaxByteOffsetId = 47,
+ DecorationNoSignedWrap = 4469,
+ DecorationNoUnsignedWrap = 4470,
DecorationExplicitInterpAMD = 4999,
DecorationOverrideCoverageNV = 5248,
DecorationPassthroughNV = 5250,
@@ -513,7 +520,9 @@
BuiltInMeshViewIndicesNV = 5281,
BuiltInBaryCoordNV = 5286,
BuiltInBaryCoordNoPerspNV = 5287,
+ BuiltInFragSizeEXT = 5292,
BuiltInFragmentSizeNV = 5292,
+ BuiltInFragInvocationCountEXT = 5293,
BuiltInInvocationsPerPixelNV = 5293,
BuiltInLaunchIdNV = 5319,
BuiltInLaunchSizeNV = 5320,
@@ -754,6 +763,11 @@
CapabilityStorageBuffer8BitAccess = 4448,
CapabilityUniformAndStorageBuffer8BitAccess = 4449,
CapabilityStoragePushConstant8 = 4450,
+ CapabilityDenormPreserve = 4464,
+ CapabilityDenormFlushToZero = 4465,
+ CapabilitySignedZeroInfNanPreserve = 4466,
+ CapabilityRoundingModeRTE = 4467,
+ CapabilityRoundingModeRTZ = 4468,
CapabilityFloat16ImageAMD = 5008,
CapabilityImageGatherBiasLodAMD = 5009,
CapabilityFragmentMaskAMD = 5010,
@@ -771,6 +785,7 @@
CapabilityImageFootprintNV = 5282,
CapabilityFragmentBarycentricNV = 5284,
CapabilityComputeDerivativeGroupQuadsNV = 5288,
+ CapabilityFragmentDensityEXT = 5291,
CapabilityShadingRateNV = 5291,
CapabilityGroupNonUniformPartitionedNV = 5297,
CapabilityShaderNonUniformEXT = 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.hpp11 new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.hpp11
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.hpp11 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.hpp11 2018-11-30 15:32:53.000000000 +0100
@@ -48,11 +48,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10300
-#define SPV_REVISION 1
+#define SPV_REVISION 6
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010300;
-static const unsigned int Revision = 1;
+static const unsigned int Revision = 6;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -140,6 +140,11 @@
LocalSizeId = 38,
LocalSizeHintId = 39,
PostDepthCoverage = 4446,
+ DenormPreserve = 4459,
+ DenormFlushToZero = 4460,
+ SignedZeroInfNanPreserve = 4461,
+ RoundingModeRTE = 4462,
+ RoundingModeRTZ = 4463,
StencilRefReplacingEXT = 5027,
OutputLinesNV = 5269,
OutputPrimitivesNV = 5270,
@@ -417,6 +422,8 @@
MaxByteOffset = 45,
AlignmentId = 46,
MaxByteOffsetId = 47,
+ NoSignedWrap = 4469,
+ NoUnsignedWrap = 4470,
ExplicitInterpAMD = 4999,
OverrideCoverageNV = 5248,
PassthroughNV = 5250,
@@ -513,7 +520,9 @@
MeshViewIndicesNV = 5281,
BaryCoordNV = 5286,
BaryCoordNoPerspNV = 5287,
+ FragSizeEXT = 5292,
FragmentSizeNV = 5292,
+ FragInvocationCountEXT = 5293,
InvocationsPerPixelNV = 5293,
LaunchIdNV = 5319,
LaunchSizeNV = 5320,
@@ -754,6 +763,11 @@
StorageBuffer8BitAccess = 4448,
UniformAndStorageBuffer8BitAccess = 4449,
StoragePushConstant8 = 4450,
+ DenormPreserve = 4464,
+ DenormFlushToZero = 4465,
+ SignedZeroInfNanPreserve = 4466,
+ RoundingModeRTE = 4467,
+ RoundingModeRTZ = 4468,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
@@ -771,6 +785,7 @@
ImageFootprintNV = 5282,
FragmentBarycentricNV = 5284,
ComputeDerivativeGroupQuadsNV = 5288,
+ FragmentDensityEXT = 5291,
ShadingRateNV = 5291,
GroupNonUniformPartitionedNV = 5297,
ShaderNonUniformEXT = 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.json new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.json
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.json 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.json 2018-11-30 15:32:53.000000000 +0100
@@ -53,7 +53,7 @@
],
"MagicNumber": 119734787,
"Version": 66304,
- "Revision": 1,
+ "Revision": 6,
"OpCodeMask": 65535,
"WordCountShift": 16
},
@@ -159,6 +159,11 @@
"LocalSizeId": 38,
"LocalSizeHintId": 39,
"PostDepthCoverage": 4446,
+ "DenormPreserve": 4459,
+ "DenormFlushToZero": 4460,
+ "SignedZeroInfNanPreserve": 4461,
+ "RoundingModeRTE": 4462,
+ "RoundingModeRTZ": 4463,
"StencilRefReplacingEXT": 5027,
"OutputLinesNV": 5269,
"OutputPrimitivesNV": 5270,
@@ -453,6 +458,8 @@
"MaxByteOffset": 45,
"AlignmentId": 46,
"MaxByteOffsetId": 47,
+ "NoSignedWrap": 4469,
+ "NoUnsignedWrap": 4470,
"ExplicitInterpAMD": 4999,
"OverrideCoverageNV": 5248,
"PassthroughNV": 5250,
@@ -552,7 +559,9 @@
"MeshViewIndicesNV": 5281,
"BaryCoordNV": 5286,
"BaryCoordNoPerspNV": 5287,
+ "FragSizeEXT": 5292,
"FragmentSizeNV": 5292,
+ "FragInvocationCountEXT": 5293,
"InvocationsPerPixelNV": 5293,
"LaunchIdNV": 5319,
"LaunchSizeNV": 5320,
@@ -769,6 +778,11 @@
"StorageBuffer8BitAccess": 4448,
"UniformAndStorageBuffer8BitAccess": 4449,
"StoragePushConstant8": 4450,
+ "DenormPreserve": 4464,
+ "DenormFlushToZero": 4465,
+ "SignedZeroInfNanPreserve": 4466,
+ "RoundingModeRTE": 4467,
+ "RoundingModeRTZ": 4468,
"Float16ImageAMD": 5008,
"ImageGatherBiasLodAMD": 5009,
"FragmentMaskAMD": 5010,
@@ -786,6 +800,7 @@
"ImageFootprintNV": 5282,
"FragmentBarycentricNV": 5284,
"ComputeDerivativeGroupQuadsNV": 5288,
+ "FragmentDensityEXT": 5291,
"ShadingRateNV": 5291,
"GroupNonUniformPartitionedNV": 5297,
"ShaderNonUniformEXT": 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.lua new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.lua
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.lua 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.lua 2018-11-30 15:32:53.000000000 +0100
@@ -43,7 +43,7 @@
spv = {
MagicNumber = 0x07230203,
Version = 0x00010300,
- Revision = 1,
+ Revision = 6,
OpCodeMask = 0xffff,
WordCountShift = 16,
@@ -127,6 +127,11 @@
LocalSizeId = 38,
LocalSizeHintId = 39,
PostDepthCoverage = 4446,
+ DenormPreserve = 4459,
+ DenormFlushToZero = 4460,
+ SignedZeroInfNanPreserve = 4461,
+ RoundingModeRTE = 4462,
+ RoundingModeRTZ = 4463,
StencilRefReplacingEXT = 5027,
OutputLinesNV = 5269,
OutputPrimitivesNV = 5270,
@@ -390,6 +395,8 @@
MaxByteOffset = 45,
AlignmentId = 46,
MaxByteOffsetId = 47,
+ NoSignedWrap = 4469,
+ NoUnsignedWrap = 4470,
ExplicitInterpAMD = 4999,
OverrideCoverageNV = 5248,
PassthroughNV = 5250,
@@ -485,7 +492,9 @@
MeshViewIndicesNV = 5281,
BaryCoordNV = 5286,
BaryCoordNoPerspNV = 5287,
+ FragSizeEXT = 5292,
FragmentSizeNV = 5292,
+ FragInvocationCountEXT = 5293,
InvocationsPerPixelNV = 5293,
LaunchIdNV = 5319,
LaunchSizeNV = 5320,
@@ -716,6 +725,11 @@
StorageBuffer8BitAccess = 4448,
UniformAndStorageBuffer8BitAccess = 4449,
StoragePushConstant8 = 4450,
+ DenormPreserve = 4464,
+ DenormFlushToZero = 4465,
+ SignedZeroInfNanPreserve = 4466,
+ RoundingModeRTE = 4467,
+ RoundingModeRTZ = 4468,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
@@ -733,6 +747,7 @@
ImageFootprintNV = 5282,
FragmentBarycentricNV = 5284,
ComputeDerivativeGroupQuadsNV = 5288,
+ FragmentDensityEXT = 5291,
ShadingRateNV = 5291,
GroupNonUniformPartitionedNV = 5297,
ShaderNonUniformEXT = 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.py new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.py
--- old/spirv-headers-1.3.g44/include/spirv/unified1/spirv.py 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/include/spirv/unified1/spirv.py 2018-11-30 15:32:53.000000000 +0100
@@ -43,7 +43,7 @@
spv = {
'MagicNumber' : 0x07230203,
'Version' : 0x00010300,
- 'Revision' : 1,
+ 'Revision' : 6,
'OpCodeMask' : 0xffff,
'WordCountShift' : 16,
@@ -127,6 +127,11 @@
'LocalSizeId' : 38,
'LocalSizeHintId' : 39,
'PostDepthCoverage' : 4446,
+ 'DenormPreserve' : 4459,
+ 'DenormFlushToZero' : 4460,
+ 'SignedZeroInfNanPreserve' : 4461,
+ 'RoundingModeRTE' : 4462,
+ 'RoundingModeRTZ' : 4463,
'StencilRefReplacingEXT' : 5027,
'OutputLinesNV' : 5269,
'OutputPrimitivesNV' : 5270,
@@ -390,6 +395,8 @@
'MaxByteOffset' : 45,
'AlignmentId' : 46,
'MaxByteOffsetId' : 47,
+ 'NoSignedWrap' : 4469,
+ 'NoUnsignedWrap' : 4470,
'ExplicitInterpAMD' : 4999,
'OverrideCoverageNV' : 5248,
'PassthroughNV' : 5250,
@@ -485,7 +492,9 @@
'MeshViewIndicesNV' : 5281,
'BaryCoordNV' : 5286,
'BaryCoordNoPerspNV' : 5287,
+ 'FragSizeEXT' : 5292,
'FragmentSizeNV' : 5292,
+ 'FragInvocationCountEXT' : 5293,
'InvocationsPerPixelNV' : 5293,
'LaunchIdNV' : 5319,
'LaunchSizeNV' : 5320,
@@ -716,6 +725,11 @@
'StorageBuffer8BitAccess' : 4448,
'UniformAndStorageBuffer8BitAccess' : 4449,
'StoragePushConstant8' : 4450,
+ 'DenormPreserve' : 4464,
+ 'DenormFlushToZero' : 4465,
+ 'SignedZeroInfNanPreserve' : 4466,
+ 'RoundingModeRTE' : 4467,
+ 'RoundingModeRTZ' : 4468,
'Float16ImageAMD' : 5008,
'ImageGatherBiasLodAMD' : 5009,
'FragmentMaskAMD' : 5010,
@@ -733,6 +747,7 @@
'ImageFootprintNV' : 5282,
'FragmentBarycentricNV' : 5284,
'ComputeDerivativeGroupQuadsNV' : 5288,
+ 'FragmentDensityEXT' : 5291,
'ShadingRateNV' : 5291,
'GroupNonUniformPartitionedNV' : 5297,
'ShaderNonUniformEXT' : 5301,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spirv-headers-1.3.g44/tools/buildHeaders/header.cpp new/spirv-headers-1.3.g50/tools/buildHeaders/header.cpp
--- old/spirv-headers-1.3.g44/tools/buildHeaders/header.cpp 2018-10-25 01:21:57.000000000 +0200
+++ new/spirv-headers-1.3.g50/tools/buildHeaders/header.cpp 2018-11-30 15:32:53.000000000 +0100
@@ -69,8 +69,8 @@
static const int DocMagicNumber = 0x07230203;
static const int DocVersion = 0x00010300;
- static const int DocRevision = 1;
- #define DocRevisionString "1"
+ static const int DocRevision = 6;
+ #define DocRevisionString "6"
static const std::string DocCopyright;
static const std::string DocComment1;
static const std::string DocComment2;
1
0
Hello community,
here is the log from the commit of package vulkan-loader for openSUSE:Factory checked in at 2018-12-27 00:24:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vulkan-loader (Old)
and /work/SRC/openSUSE:Factory/.vulkan-loader.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-loader"
Thu Dec 27 00:24:47 2018 rev:3 rq:658213 version:1.1.95
Changes:
--------
--- /work/SRC/openSUSE:Factory/vulkan-loader/vulkan-loader.changes 2018-12-10 12:26:30.874636276 +0100
+++ /work/SRC/openSUSE:Factory/.vulkan-loader.new.28833/vulkan-loader.changes 2018-12-27 00:24:49.211887290 +0100
@@ -1,0 +2,6 @@
+Fri Dec 14 23:25:51 UTC 2018 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to new upstream release 1.1.95
+ * docs: Use "ICD" instead of "layer" in ICD info
+
+-------------------------------------------------------------------
Old:
----
Vulkan-Loader-1.1.94.tar.xz
New:
----
Vulkan-Loader-1.1.95.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vulkan-loader.spec ++++++
--- /var/tmp/diff_new_pack.VNJ183/_old 2018-12-27 00:24:49.635886944 +0100
+++ /var/tmp/diff_new_pack.VNJ183/_new 2018-12-27 00:24:49.635886944 +0100
@@ -16,11 +16,11 @@
#
-%define version_unconverted 1.1.94
+%define version_unconverted 1.1.95
Name: vulkan-loader
%define lname libvulkan1
-Version: 1.1.94
+Version: 1.1.95
Release: 0
Summary: Reference ICD loader for Vulkan
License: Apache-2.0
++++++ Vulkan-Loader-1.1.94.tar.xz -> Vulkan-Loader-1.1.95.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.94/.travis.yml new/Vulkan-Loader-1.1.95/.travis.yml
--- old/Vulkan-Loader-1.1.94/.travis.yml 2018-11-29 00:52:59.000000000 +0100
+++ new/Vulkan-Loader-1.1.95/.travis.yml 2018-12-11 17:13:38.000000000 +0100
@@ -1,7 +1,7 @@
# Build Configuration for Travis CI
# https://travis-ci.org
-dist: trusty
+dist: xenial
sudo: required
language: cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.94/loader/CMakeLists.txt new/Vulkan-Loader-1.1.95/loader/CMakeLists.txt
--- old/Vulkan-Loader-1.1.94/loader/CMakeLists.txt 2018-11-29 00:52:59.000000000 +0100
+++ new/Vulkan-Loader-1.1.95/loader/CMakeLists.txt 2018-12-11 17:13:38.000000000 +0100
@@ -153,7 +153,12 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm
".intel_syntax noprefix\n.text\n.global sample\nsample:\nmov ecx, [eax + 16]\n")
+ # try_compile uses the C/C++ linker flags even for ASM,
+ # while they're not valid for ASM and making linking fail.
+ set(TMP_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+ set(CMAKE_EXE_LINKER_FLAGS "")
try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm)
+ set(CMAKE_EXE_LINKER_FLAGS ${TMP_EXE_LINKER_FLAGS})
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm)
if(ASSEMBLER_WORKS)
set(CMAKE_ASM-ATT_FLAGS "$ENV{ASFLAGS} -I\"${CMAKE_CURRENT_BINARY_DIR}\"")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.94/loader/LoaderAndLayerInterface.md new/Vulkan-Loader-1.1.95/loader/LoaderAndLayerInterface.md
--- old/Vulkan-Loader-1.1.94/loader/LoaderAndLayerInterface.md 2018-11-29 00:52:59.000000000 +0100
+++ new/Vulkan-Loader-1.1.95/loader/LoaderAndLayerInterface.md 2018-12-11 17:13:38.000000000 +0100
@@ -2256,7 +2256,7 @@
|----------------|--------------------|
| "file\_format\_version" | The JSON format major.minor.patch version number of this file. Currently supported version is 1.0.0. |
| "ICD" | The identifier used to group all ICD information together. |
-| "library_path" | The "library\_path" specifies either a filename, a relative pathname, or a full pathname to a layer shared library file. If "library\_path" specifies a relative pathname, it is relative to the path of the JSON manifest file. If "library\_path" specifies a filename, the library must live in the system's shared object search path. There are no rules about the name of the ICD shared library files other than it should end with the appropriate suffix (".DLL" on Windows, ".so" on Linux and "*.dylib" on MacOS). | N/A |
+| "library_path" | The "library\_path" specifies either a filename, a relative pathname, or a full pathname to an ICD shared library file. If "library\_path" specifies a relative pathname, it is relative to the path of the JSON manifest file. If "library\_path" specifies a filename, the library must live in the system's shared object search path. There are no rules about the name of the ICD shared library files other than it should end with the appropriate suffix (".DLL" on Windows, ".so" on Linux and "*.dylib" on MacOS). | N/A |
| "api_version" | The major.minor.patch version number of the Vulkan API that the shared library files for the ICD was built against. For example: 1.0.33. |
**NOTE:** If the same ICD shared library supports multiple, incompatible
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.94/scripts/known_good.json new/Vulkan-Loader-1.1.95/scripts/known_good.json
--- old/Vulkan-Loader-1.1.94/scripts/known_good.json 2018-11-29 00:52:59.000000000 +0100
+++ new/Vulkan-Loader-1.1.95/scripts/known_good.json 2018-12-11 17:13:38.000000000 +0100
@@ -6,7 +6,7 @@
"sub_dir" : "Vulkan-Headers",
"build_dir" : "Vulkan-Headers/build",
"install_dir" : "Vulkan-Headers/build/install",
- "commit" : "4ca8ea36379b1be079d7f4b80c942af4c3172534"
+ "commit" : "add65b83415824f59041486d4903ee1909dc6ee2"
}
],
"install_names" : {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.94/tests/layers/vk_layer_logging.h new/Vulkan-Loader-1.1.95/tests/layers/vk_layer_logging.h
--- old/Vulkan-Loader-1.1.94/tests/layers/vk_layer_logging.h 2018-11-29 00:52:59.000000000 +0100
+++ new/Vulkan-Loader-1.1.95/tests/layers/vk_layer_logging.h 2018-12-11 17:13:38.000000000 +0100
@@ -298,18 +298,18 @@
}
}
// Look for any debug utils or marker names to use for this object
- callback_data.pObjects[0].pObjectName = NULL;
+ object_name_info.pObjectName = NULL;
auto utils_name_iter = debug_data->debugUtilsObjectNameMap->find(src_object);
if (utils_name_iter != debug_data->debugUtilsObjectNameMap->end()) {
- callback_data.pObjects[0].pObjectName = utils_name_iter->second.c_str();
+ object_name_info.pObjectName = utils_name_iter->second.c_str();
} else {
auto marker_name_iter = debug_data->debugObjectNameMap->find(src_object);
if (marker_name_iter != debug_data->debugObjectNameMap->end()) {
- callback_data.pObjects[0].pObjectName = marker_name_iter->second.c_str();
+ object_name_info.pObjectName = marker_name_iter->second.c_str();
}
}
- if (NULL != callback_data.pObjects[0].pObjectName) {
- oss << " (Name = " << callback_data.pObjects[0].pObjectName << " : Type = ";
+ if (NULL != object_name_info.pObjectName) {
+ oss << " (Name = " << object_name_info.pObjectName << " : Type = ";
} else {
oss << " (Type = ";
}
@@ -378,7 +378,8 @@
static inline bool debug_messenger_log_msg(const debug_report_data *debug_data,
VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
VkDebugUtilsMessageTypeFlagsEXT message_type,
- VkDebugUtilsMessengerCallbackDataEXT *callback_data) {
+ VkDebugUtilsMessengerCallbackDataEXT *callback_data,
+ const VkDebugUtilsMessengerEXT *messenger) {
bool bail = false;
VkLayerDbgFunctionNode *layer_dbg_node = NULL;
@@ -392,16 +393,21 @@
DebugAnnotFlagsToReportFlags(message_severity, message_type, &object_flags);
+ VkDebugUtilsObjectNameInfoEXT object_name_info;
+ object_name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
+ object_name_info.pNext = NULL;
+ object_name_info.objectType = VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT;
+ object_name_info.objectHandle = HandleToUint64(*messenger);
+ object_name_info.pObjectName = NULL;
+ callback_data->pObjects = &object_name_info;
+ callback_data->objectCount = 1;
+
while (layer_dbg_node) {
if (layer_dbg_node->is_messenger && (layer_dbg_node->messenger.messageSeverity & message_severity) &&
(layer_dbg_node->messenger.messageType & message_type)) {
- // Loop through each object and give it the proper name if it was set.
- for (uint32_t obj = 0; obj < callback_data->objectCount; obj++) {
- auto it = debug_data->debugUtilsObjectNameMap->find(callback_data->pObjects[obj].objectHandle);
- if (it == debug_data->debugUtilsObjectNameMap->end()) {
- continue;
- }
- callback_data->pObjects[obj].pObjectName = it->second.c_str();
+ auto it = debug_data->debugUtilsObjectNameMap->find(object_name_info.objectHandle);
+ if (it != debug_data->debugUtilsObjectNameMap->end()) {
+ object_name_info.pObjectName = it->second.c_str();
}
if (layer_dbg_node->messenger.pfnUserCallback(message_severity, message_type, callback_data,
layer_dbg_node->pUserData)) {
@@ -513,7 +519,6 @@
}
VkDebugUtilsMessengerCallbackDataEXT callback_data = {};
- VkDebugUtilsObjectNameInfoEXT blank_object = {};
callback_data.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT;
callback_data.pNext = NULL;
callback_data.flags = 0;
@@ -524,15 +529,10 @@
callback_data.pQueueLabels = NULL;
callback_data.cmdBufLabelCount = 0;
callback_data.pCmdBufLabels = NULL;
- callback_data.objectCount = 1;
- callback_data.pObjects = &blank_object;
- blank_object.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
- blank_object.pNext = NULL;
- blank_object.objectType = VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT;
- blank_object.objectHandle = HandleToUint64(*messenger);
- blank_object.pObjectName = NULL;
+ callback_data.objectCount = 0;
+ callback_data.pObjects = NULL;
debug_messenger_log_msg(debug_data, VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT,
- VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT, &callback_data);
+ VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT, &callback_data, messenger);
return VK_SUCCESS;
}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.VNJ183/_old 2018-12-27 00:24:49.911886718 +0100
+++ /var/tmp/diff_new_pack.VNJ183/_new 2018-12-27 00:24:49.911886718 +0100
@@ -2,9 +2,9 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/Vulkan-Loader</param>
- <param name="revision">b9b384a6747a7b82fae30cfa356e36f49897502c</param>
- <param name="parent-tag">b9b384a6747a7b82fae30cfa356e36f49897502c</param>
- <param name="versionformat">1.1.94</param>
+ <param name="revision">171f2a6b44546c8d89273233ac771f8c05f11f62</param>
+ <param name="parent-tag">171f2a6b44546c8d89273233ac771f8c05f11f62</param>
+ <param name="versionformat">1.1.95</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
1
0
Hello community,
here is the log from the commit of package highlight for openSUSE:Factory checked in at 2018-12-27 00:24:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/highlight (Old)
and /work/SRC/openSUSE:Factory/.highlight.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "highlight"
Thu Dec 27 00:24:42 2018 rev:20 rq:658089 version:3.48
Changes:
--------
--- /work/SRC/openSUSE:Factory/highlight/highlight.changes 2018-10-15 10:06:45.325838565 +0200
+++ /work/SRC/openSUSE:Factory/.highlight.new.28833/highlight.changes 2018-12-27 00:24:44.819890873 +0100
@@ -1,0 +2,12 @@
+Fri Dec 14 16:25:18 UTC 2018 - antoine.belvire(a)opensuse.org
+
+- Update to version 3.48:
+ * Fixed --list-scripts abortion with Fedora default compilation
+ options (gl#saalen/highlight#84).
+ * Fixed a problem with syntax test indicators reporting wrong
+ states after comments.
+ * Improved Verilog syntax.
+ * Improved quoted string highlighting for Perl and Ruby.
+ * Detection of pkg-config's Lua version in src/makefile.
+
+-------------------------------------------------------------------
Old:
----
highlight-3.47.tar.bz2
highlight-3.47.tar.bz2.asc
New:
----
highlight-3.48.tar.bz2
highlight-3.48.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ highlight.spec ++++++
--- /var/tmp/diff_new_pack.Ea3Hno/_old 2018-12-27 00:24:45.263890510 +0100
+++ /var/tmp/diff_new_pack.Ea3Hno/_new 2018-12-27 00:24:45.263890510 +0100
@@ -18,7 +18,7 @@
%bcond_without gui
Name: highlight
-Version: 3.47
+Version: 3.48
Release: 0
Summary: Universal Source Code to Formatted Text Converter
License: GPL-3.0-or-later
++++++ highlight-3.47.tar.bz2 -> highlight-3.48.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/.gitlab-ci.yml new/highlight-3.48/.gitlab-ci.yml
--- old/highlight-3.47/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/highlight-3.48/.gitlab-ci.yml 2018-12-14 11:49:21.000000000 +0100
@@ -0,0 +1,20 @@
+# Specify the docker image to use (only used if using docker runners)
+# See: http://doc.gitlab.com/ee/ci/docker/using_docker_images.html
+image: debian:stable-slim
+
+# Define commands that run before each job's script
+before_script:
+ - apt-get update
+ - apt-get install -y make gcc g++ libboost-dev liblua5.3-dev
+
+compile:
+ script:
+ - make
+ - make install
+ # Verify that our compiled app works properly with a custom "test" script
+ - bash ./src/ci_test.sh
+
+ # Save the compiled output from the above for downloading via GitLab and in Gitlab 8.6 to use in future build steps
+ #artifacts:
+ # paths:
+ # - ansifilter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/ChangeLog.adoc new/highlight-3.48/ChangeLog.adoc
--- old/highlight-3.47/ChangeLog.adoc 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/ChangeLog.adoc 2018-12-14 11:49:21.000000000 +0100
@@ -1,5 +1,15 @@
= Highlight CHANGELOG
+=== highlight 3.48
+
+14.12.2018
+
+ - fixed --list-scripts abortion with Fedora default compilation options
+ (https://gitlab.com/saalen/highlight/issues/84)
+ - fixed a problem with syntax test indicators reporting wrong states after comments
+ - improved Verilog syntax
+ - improved quoted string highlighting for Perl and Ruby
+ - detection of pkg-config's Lua version in src/makefile
=== highlight 3.47
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/README_TESTCASES.adoc new/highlight-3.48/README_TESTCASES.adoc
--- old/highlight-3.47/README_TESTCASES.adoc 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/README_TESTCASES.adoc 2018-12-14 11:49:21.000000000 +0100
@@ -69,36 +69,36 @@
--------------------------------------------------------------------------------
#include <iostream>
#include "myheader"
-// ^ ppc ^^^^^^^^^^ pps <1>
+// ^ ppc ^^^^^^^^^^ pps 1)
int main() {
-// ^^^^ kwd <2>
+// ^^^^ kwd 2)
/* comment comment comment
- * < com ^ ws ^ com <3>
+ * < com ^ ws ^ com 3)
*/
int var = 0x1234;
/* ^^^ std ^ ^ num */
-// ^ opt <4>
+// ^ opt 4)
std::cout << "whatever: " << var << "\n";
// ^^^^^^^^^^^^ str ^^opt ^^ esc
return 0;
- // < kwa <5>
+ // < kwa 5)
}
--------------------------------------------------------------------------------
-<1> This line contains a test for preprocessor and a preprocessor string.
- The `^` indicators point at the tested string sections of the previous line.
+1) This line contains a test for preprocessor and a preprocessor string.
+ The `^` indicators point at the tested string sections of the previous line.
-<2> The keyword group `kwd` is checked (functions are highlighted as `kwd` in C syntax)
+2) The keyword group `kwd` is checked (functions are highlighted as `kwd` in C syntax)
-<3> The `<` points to column 0 as the comment starts there.
- `ws` tests for whitespace.
+3) The `<` points to column 0 as the comment starts there.
+ `ws` tests for whitespace.
-<4> A source code line can be tested with various test comments.
- Here the `opt` test looks for the operator two lines before.
+4) A source code line can be tested with various test comments.
+ Here the `opt` test looks for the operator two lines before.
-<5> `<` points at column 4, the beginning of the comment.
+5) `<` points at column 4, the beginning of the comment.
Running highlight with this file will not produce any additional output, as all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/bat.lang new/highlight-3.48/langDefs/bat.lang
--- old/highlight-3.47/langDefs/bat.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/bat.lang 2018-12-14 11:49:21.000000000 +0100
@@ -1,6 +1,5 @@
--- Language definition generated by lang2to3
-Description="DOS Batch"
+Description="MS DOS Batch"
Keywords={
{ Id=1,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/diff.lang new/highlight-3.48/langDefs/diff.lang
--- old/highlight-3.47/langDefs/diff.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/diff.lang 2018-12-14 11:49:21.000000000 +0100
@@ -1,15 +1,14 @@
-
Description="Diff"
Digits=[[ ^[\d,]*[ac]\d* ]]
Keywords={
{ Id=1,
- Regex=[[^[+<].*]],
+ Regex=[[^[-<].*]],
},
{ Id=2,
- Regex=[[^[->].*]],
+ Regex=[[^[+>].*]],
},
{ Id=3,
Regex=[[^\.$]],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/lua.lang new/highlight-3.48/langDefs/lua.lang
--- old/highlight-3.47/langDefs/lua.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/lua.lang 2018-12-14 11:49:21.000000000 +0100
@@ -58,4 +58,4 @@
end
return newState
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/perl.lang new/highlight-3.48/langDefs/perl.lang
--- old/highlight-3.47/langDefs/perl.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/perl.lang 2018-12-14 11:49:21.000000000 +0100
@@ -53,7 +53,7 @@
"getprotobyname", "getprotobynumber", "getservbyname",
"getservbyport", "getpwuid", "getpwnam", "getgrgid", "getgrnam", "getlogin",
"getpwent", "getgrent", "gmtime", "localtime", "time", "warn", "formline",
- "reset", "scalar", "prototype", "lock", "tied", "untie", "qq", "qx", "eval", "try", "constant" },
+ "reset", "scalar", "prototype", "lock", "tied", "untie", "eval", "try", "constant" },
},
{ Id=4,
Regex=[[->([a-zA-Z0-9_]+)]],
@@ -68,7 +68,7 @@
},
{ Id=4,
- Regex=[[q[qxwr]?\{|qw\(]]
+ Regex=[=[ q[qxwr]?[\[\{\(] ]=]
},
}
@@ -120,21 +120,26 @@
end
-- fix issue in CGI.pm testcase (line 1060 ff)
- if oldState~=HL_STRING then
+ if oldState~=HL_STRING and oldState~=HL_INTERPOLATION and oldState~=HL_ESC_SEQ then
qString=0
end
- if newState==HL_KEYWORD and token=="q{" then
+ if newState==HL_KEYWORD and (token=="q{" or token=="qq{" or token=="qw{" or token=="qx{") then
qString=1
return HL_STRING
end
-
- if newState==HL_KEYWORD and token=="qw(" then
+
+ if newState==HL_KEYWORD and (token=="q(" or token=="qq(" or token=="qw(" or token=="qx(") then
qString=2
return HL_STRING
end
-
- if oldState==HL_STRING and qString==1 and token=="}" then
+
+ if newState==HL_KEYWORD and (token=="q[" or token=="qq[" or token=="qw[" or token=="qx[") then
+ qString=3
+ return HL_STRING
+ end
+
+ if oldState==HL_STRING and qString==1 and token=="}" then
qString=0
return HL_STRING_END
end
@@ -143,6 +148,11 @@
qString=0
return HL_STRING_END
end
+
+ if oldState==HL_STRING and qString==3 and token=="]" then
+ qString=0
+ return HL_STRING_END
+ end
return newState
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/ruby.lang new/highlight-3.48/langDefs/ruby.lang
--- old/highlight-3.47/langDefs/ruby.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/ruby.lang 2018-12-14 11:49:21.000000000 +0100
@@ -50,6 +50,12 @@
DelimiterPairs= {
{ Open=[[%q\(]], Close=[[\)]] },
{ Open=[[%Q\(]], Close=[[\)]] },
+
+ { Open=[[%Q\!]], Close=[[\!]] },
+ { Open=[[%Q\+]], Close=[[\+]] },
+ { Open=[[%Q\[]], Close=[=[ \] ]=] },
+
+
{ Open=[[%\(]], Close=[[\)]] },
{ Open=[[%x\(]], Close=[[\)]] },
{ Open=[[%q\{]], Close=[[\}]] },
@@ -77,11 +83,7 @@
-- resolve issue with # which starts comments and extrapolation sequences in strings
function OnStateChange(oldState, newState, token, groupID)
- -- https://fossies.org/linux/misc/puppet-5.3.2.tar.gz/puppet-5.3.2/lib/puppet/…
- if token==")" or token=="}" or token=="{" and oldState~=HL_STRING then
- return HL_OPERATOR
- end
if oldState~=HL_STRING and newState==HL_INTERPOLATION then
return HL_REJECT
@@ -114,9 +116,9 @@
end
-- fix quoted string termination
- if oldState~=HL_STRING then
- qString=0
- end
+ --if oldState~=HL_STRING then
+ -- qString=0
+ -- end
if newState==HL_STRING and (token=="%q(" or token=="%Q(" or token=="%(" or token=="%x(" ) then
qString=1
@@ -128,6 +130,20 @@
return HL_STRING
end
+ if newState==HL_STRING and token=="%Q!" then
+ qString=3
+ return HL_STRING
+ end
+
+ if newState==HL_STRING and token=="%Q[" then
+ qString=4
+ return HL_STRING
+ end
+ if newState==HL_STRING and token=="%Q+" then
+ qString=5
+ return HL_STRING
+ end
+
if oldState==HL_STRING and qString==1 and token==")" then
qString=0
return HL_STRING_END
@@ -137,6 +153,27 @@
qString=0
return HL_STRING_END
end
-
+
+ if oldState==HL_STRING and qString==3 and token=="!" then
+ qString=0
+ return HL_STRING_END
+ end
+
+ if oldState==HL_STRING and qString==4 and token=="]" then
+ qString=0
+ return HL_STRING_END
+ end
+
+ if oldState==HL_STRING and qString==5 and token=="+" then
+ qString=0
+ return HL_STRING_END
+ end
+
+ -- https://fossies.org/linux/misc/puppet-5.3.2.tar.gz/puppet-5.3.2/lib/puppet/…
+
+ if token==")" or token=="}" or token=="{" and oldState~=HL_STRING then
+ return HL_OPERATOR
+ end
+
return newState
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/sh.lang new/highlight-3.48/langDefs/sh.lang
--- old/highlight-3.47/langDefs/sh.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/sh.lang 2018-12-14 11:49:21.000000000 +0100
@@ -49,7 +49,7 @@
-- hereDoc opening delimiter, see OnStateChange to handle end of string
Strings={
- Delimiter=[["|'|`|<<[\-]?["']?\s*[-\w_]+["']?]],
+ Delimiter=[[<<[\-]?\s*["']?\s*[A-Za-z_]+["']?|"|`|']],
}
IgnoreCase=false
@@ -78,8 +78,8 @@
end
--recognize hereDoc multine strings
- if oldState==HL_STANDARD and newState==HL_STRING and not string.find("\"'`", token) then
- hereDoc = string.match(token, "<<%-?'?%s*([%-%a%d_]+)" )
+ if oldState==HL_STANDARD and newState==HL_STRING then
+ hereDoc = string.match(token, "<<%-?%s*%'?([%-%a%d_]+)" )
end
return newState
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/verilog.lang new/highlight-3.48/langDefs/verilog.lang
--- old/highlight-3.47/langDefs/verilog.lang 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/langDefs/verilog.lang 2018-12-14 11:49:21.000000000 +0100
@@ -2,7 +2,7 @@
Description="Verilog"
-- recognize stuff like 5'b0 as number
-Digits=[[ (?:0x|0X)[0-9a-fA-F]+|\d*[\.\_]?[\d+\'](?:[eE][\-\+]\d+)?[lLuUbfdm]* ]]
+Digits=[[ (?:0x|0X)[0-9a-fA-F]+|\d*[\.\_]?[\d+\'](?:[eE][\-\+]\d+)?h?[0-9a-fA-F]* ]]
Keywords={
{ Id=1,
@@ -33,9 +33,13 @@
}
Strings={
- Delimiter=[["|']],
+ Delimiter=[["]],
+ Interpolation = [[ %\w ]],
+
}
+Escape=[[ \\[ntvbrfa\\\?'"]|\\\d{3} ]]
+
IgnoreCase=false
Comments={
@@ -53,12 +57,3 @@
}
Operators=[[\(|\)|\[|\]|\{|\}|\,|\;|\:|\&|<|>|\!|\=|\/|\*|\%|\+|\-|\~|\@]]
-
--- resolve issue with ]] close delimiter which ends comments and strings
-function OnStateChange(oldState, newState, token)
-
- if token=="'" and oldState==HL_NUMBER and newState==HL_STRING then
- return HL_NUMBER
- end
- return newState
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/ci_test.sh new/highlight-3.48/src/ci_test.sh
--- old/highlight-3.47/src/ci_test.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/highlight-3.48/src/ci_test.sh 2018-12-14 11:49:21.000000000 +0100
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "Starting CI verification script"
+
+#OUTPUT=`./src/highlight --list-scripts=langs`
+./src/highlight --list-scripts=langs
+
+RETVAL=$?
+
+if [ $RETVAL -eq 0 ]; then
+ echo "Retval is 0, OK"
+else
+ echo "Retval is not 0, FAIL"
+ exit 1
+fi
+
+#if [ "$OUTPUT" == "BEGIN ... END" ]; then
+# echo "Output is correct, OK"
+#else
+# echo "Output is not right, FAIL"
+# exit 1
+#fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/core/codegenerator.cpp new/highlight-3.48/src/core/codegenerator.cpp
--- old/highlight-3.47/src/core/codegenerator.cpp 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/src/core/codegenerator.cpp 2018-12-14 11:49:21.000000000 +0100
@@ -700,13 +700,15 @@
params.push_back(Diluculum::LuaValue(currentState));
params.push_back(Diluculum::LuaValue(currentKeywordClass));
string trace(";");
- string trace2(";");
if (stateTrace.size()>1){
for (size_t i=0; i<stateTrace.size()-1;i++){
trace += std::to_string (stateTrace[i]);
trace += ";";
}
}
+
+ //std::cerr <<"TRC1: "<<trace<<"\n";
+
params.push_back(Diluculum::LuaValue(trace));
return currentSyntax->getLuaState()->call ( *currentSyntax->getDecorateFct(),
@@ -1844,7 +1846,7 @@
int commentCount=1;
int openDelimID=currentSyntax->getOpenDelimiterID ( token, ML_COMMENT);
State newState=STANDARD;
- bool eof=false, exitState=false;
+ bool eof=false, exitState=false, containedTestCase=false;
unsigned int startColumn=lineIndex - token.size() ;
openTag ( ML_COMMENT );
do {
@@ -1867,7 +1869,7 @@
case _TESTPOS:
runSyntaxTestcases(token=="<" ? startColumn : lineIndex-1 );
printMaskedToken();
-
+ containedTestCase=true;
break;
case ML_COMMENT:
@@ -1895,9 +1897,10 @@
} while ( !exitState && !eof );
closeTag ( ML_COMMENT );
-
- stateTraceCurrent.clear();
-
+
+ if (containedTestCase){
+ stateTraceCurrent.clear();
+ }
return eof;
}
@@ -1909,7 +1912,7 @@
}
State newState=STANDARD;
- bool eof=false, exitState=false;
+ bool eof=false, exitState=false, containedTestCase=false;
unsigned int startColumn = lineIndex - token.size() ;
openTag ( SL_COMMENT );
@@ -1939,6 +1942,7 @@
case _TESTPOS:
runSyntaxTestcases(token=="<" ? startColumn : lineIndex-1 );
printMaskedToken();
+ containedTestCase=true;
break;
default:
@@ -1948,7 +1952,9 @@
closeTag ( SL_COMMENT );
- stateTraceCurrent.clear();
+ if (containedTestCase) {
+ stateTraceCurrent.clear();
+ }
return eof;
}
@@ -2288,12 +2294,17 @@
}
}
+void CodeGenerator::printTrace(const string &s){
+ std::cout<<"\n"<<lineNumber<<" "<<s<<": ";
+ for (unsigned int i=0; i< stateTraceCurrent.size(); i++) {
+ std::cout<<" "<<stateTraceCurrent[i].state;
+ }
+ std::cout<<"\n";
+}
+
void CodeGenerator::runSyntaxTestcases(unsigned int column){
-
- if (!stateTraceCurrent.size() /*|| lineIndex>stateTraceCurrent.size()*/)
- return;
-
+
unsigned int assertGroup=0;
size_t typeDescPos=line.find_first_not_of("\t ^", lineIndex);
State assertState=_UNKNOWN;
@@ -2301,6 +2312,11 @@
if (!lineContainedTestCase){
stateTraceCurrent=stateTraceTest;
}
+
+ if (column>stateTraceCurrent.size())
+ return;
+
+ //printTrace("runSyntaxTestcases");
if (typeDescPos!=string::npos) {
@@ -2333,11 +2349,12 @@
assertGroup=line[typeDescPos+2] - 'a' +1;
}
- if ( (assertState!=_WS && stateTraceCurrent[column].state != assertState )
+ if ( (assertState!=_WS && stateTraceCurrent[column].state != assertState && !stateTraceCurrent[column].isWhiteSpace )
|| (assertState==_WS && !stateTraceCurrent[column].isWhiteSpace)
|| assertGroup != stateTraceCurrent[column].kwClass) {
ostringstream err;
- err << inFile << " line " << lineNumber << ", column "<< column << ": got " << getTestcaseName(stateTraceCurrent[column].state, stateTraceCurrent[column].kwClass)
+ err << inFile << " line " << lineNumber << ", column "<< column
+ << ": got " << getTestcaseName(stateTraceCurrent[column].state, stateTraceCurrent[column].kwClass)
<< " instead of " << getTestcaseName(assertState, assertGroup) ;
failedPosTests.push_back(err.str());
}
@@ -2378,7 +2395,6 @@
wsBuffer += getNewLine();
}
-
if (currentSyntax->getDecorateLineBeginFct()) {
Diluculum::LuaValueList res=callDecorateLineFct(true);
if (res.size()==1) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/core/platform_fs.cpp new/highlight-3.48/src/core/platform_fs.cpp
--- old/highlight-3.47/src/core/platform_fs.cpp 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/src/core/platform_fs.cpp 2018-12-14 11:49:21.000000000 +0100
@@ -222,7 +222,7 @@
if ( errno ) return;
// save the first fileName entry for this recursion
- const unsigned firstEntry = fileName.size();
+ //const unsigned firstEntry = fileName.size();
// save files and sub directories
while ( ( entry = readdir ( dp ) ) != NULL ) {
@@ -256,8 +256,10 @@
if ( errno ) return;
// sort the current entries for fileName
- if ( firstEntry < fileName.size() )
- sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
+ // https://gitlab.com/saalen/highlight/issues/84
+ // coredump with GLIBCXX_ASSERTIONS compiler option, use iterators if sort is needed
+ //if ( firstEntry < fileName.size() )
+ // sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
// recurse into sub directories
// if not doing recursive, subDirectory is empty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/include/codegenerator.h new/highlight-3.48/src/include/codegenerator.h
--- old/highlight-3.47/src/include/codegenerator.h 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/src/include/codegenerator.h 2018-12-14 11:49:21.000000000 +0100
@@ -667,6 +667,8 @@
private:
+ void printTrace(const string &s);
+
CodeGenerator ( const CodeGenerator& ) {}
CodeGenerator& operator= ( CodeGenerator& )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/include/version.h new/highlight-3.48/src/include/version.h
--- old/highlight-3.47/src/include/version.h 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/src/include/version.h 2018-12-14 11:49:21.000000000 +0100
@@ -28,7 +28,7 @@
#ifndef VERSION_H
#define VERSION_H
-#define HIGHLIGHT_VERSION "3.47"
+#define HIGHLIGHT_VERSION "3.48"
#define HIGHLIGHT_URL "http://www.andre-simon.de/"
#define HIGHLIGHT_EMAIL "andre.simon1(a)gmx.de"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/makefile new/highlight-3.48/src/makefile
--- old/highlight-3.47/src/makefile 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/src/makefile 2018-12-14 11:49:21.000000000 +0100
@@ -24,8 +24,7 @@
CFLAGS_DILU=-fno-strict-aliasing
-SO_VERSION=3.47
-
+SO_VERSION=3.48
# Source paths
CORE_DIR=./core/
@@ -35,14 +34,16 @@
# Include path
INCLUDE_DIR=./include/
+# try to detect Lua versioning scheme
+LUA_PKG_NAME=lua5.3
+LUA_TEST=$(shell pkg-config --exists ${LUA_PKG_NAME}; echo $$?)
+
+ifeq (${LUA_TEST},1)
+LUA_PKG_NAME=lua
+endif
-# If Lua 5.2 is not default on your system yet you have to
-# use lua5.1 in the pkg-config calls
-
-LUA_CFLAGS=$(shell pkg-config --cflags lua)
-
-# default lua lib
-LUA_LIBS=$(shell pkg-config --libs lua)
+LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME})
+LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME})
# luajit lib
# LUA_LIBS=$(shell pkg-config --libs luajit)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/themes/darkplus.theme new/highlight-3.48/themes/darkplus.theme
--- old/highlight-3.47/themes/darkplus.theme 2018-10-13 21:26:45.000000000 +0200
+++ new/highlight-3.48/themes/darkplus.theme 2018-12-14 11:49:21.000000000 +0100
@@ -1,17 +1,17 @@
Description = "vscode darkplus"
-Default = { Colour="#d4d4d4" }
+Default = { Colour="#9cdcfe" }
Canvas = { Colour="#1e1e1e" }
Number = { Colour="#b5cea8" }
Escape = { Colour="#fd7ba7" }
-String = { Colour="#ce9718" }
-BlockComment = { Colour="#608b4e" }
+String = { Colour="#d7ba7d" }
+BlockComment = { Colour="#6a9955" }
StringPreProc = String
LineComment = BlockComment
-Operator = Default
+Operator = { Colour="#d4d4d4" }
LineNum = { Colour="#808080" }
-PreProcessor = { Colour="#c586c0" }
-Interpolation = String
+PreProcessor = { Colour="#007acc" }
+Interpolation = { Colour="#569cd6" }
Keywords = {
{ Colour="#c58ec0"},
1
0
Hello community,
here is the log from the commit of package libmd for openSUSE:Factory checked in at 2018-12-27 00:24:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmd (Old)
and /work/SRC/openSUSE:Factory/.libmd.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmd"
Thu Dec 27 00:24:38 2018 rev:4 rq:658069 version:1.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmd/libmd.changes 2018-02-03 15:40:22.867316234 +0100
+++ /work/SRC/openSUSE:Factory/.libmd.new.28833/libmd.changes 2018-12-27 00:24:39.827894944 +0100
@@ -1,0 +2,10 @@
+Fri Dec 14 14:53:10 UTC 2018 - Martin Pluskal <mpluskal(a)suse.com>
+
+- Update to version 1.0.1:
+ * Add missing compatibility macros for SHA384
+ * Fix compatibility macros for SHA512
+ * test: Refactor and extend message digest testing
+ * Add compatibility with Aladdin Enterprises MD5 implementation
+ * build: Invoke sed with portable regex
+
+-------------------------------------------------------------------
Old:
----
libmd-1.0.0.tar.xz
libmd-1.0.0.tar.xz.asc
New:
----
libmd-1.0.1.tar.xz
libmd-1.0.1.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmd.spec ++++++
--- /var/tmp/diff_new_pack.74iF1C/_old 2018-12-27 00:24:40.359894511 +0100
+++ /var/tmp/diff_new_pack.74iF1C/_new 2018-12-27 00:24:40.359894511 +0100
@@ -12,13 +12,13 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define sover 0
Name: libmd
-Version: 1.0.0
+Version: 1.0.1
Release: 0
Summary: Message digest functions from BSD systems
License: BSD-2-Clause OR BSD-3-Clause OR ISC OR SUSE-Public-Domain
@@ -77,11 +77,12 @@
%postun -n %{name}%{sover} -p /sbin/ldconfig
%files -n %{name}%{sover}
-%doc COPYING
+%license COPYING
%{_libdir}/%{name}.so.%{sover}*
%files devel
-%doc ChangeLog COPYING README
+%license COPYING
+%doc ChangeLog README
%{_includedir}/*
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/libmd.pc
++++++ libmd-1.0.0.tar.xz -> libmd-1.0.1.tar.xz ++++++
++++ 4476 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/.dist-version new/libmd-1.0.1/.dist-version
--- old/libmd-1.0.0/.dist-version 2018-01-13 23:03:14.000000000 +0100
+++ new/libmd-1.0.1/.dist-version 2018-10-22 12:49:23.000000000 +0200
@@ -1 +1 @@
-1.0.0
+1.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/ChangeLog new/libmd-1.0.1/ChangeLog
--- old/libmd-1.0.0/ChangeLog 2018-01-13 23:03:14.000000000 +0100
+++ new/libmd-1.0.1/ChangeLog 2018-10-22 12:49:23.000000000 +0200
@@ -1,3 +1,84 @@
+commit 9c330aa8e5085c57249550c0596154ac0e3ab0f4
+Author: Guillem Jover <guillem(a)hadrons.org>
+Date: Mon Oct 22 12:43:15 2018 +0200
+
+ Release libmd 1.0.1
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f23a2145a019776f827c11c03474761ba0b44e48
+Author: Guillem Jover <guillem(a)hadrons.org>
+Date: Sat Oct 6 03:46:51 2018 +0200
+
+ Add compatibility with Aladdin Enterprises MD5 implementation
+
+ This will be guarded by a LIBMD_MD5_ALADDIN macro check, to avoid
+ polluting the namespace by unsuspecting code. The macro can always
+ be defined unconditionally, and the guard could even potentially
+ be removed in the future if required.
+
+ Prompted-by: Yangfl <mmyangfl(a)gmail.com>
+ Ref: https://bugs.debian.org/909116
+
+ include/md5.h | 20 ++++++++++++++++++++
+ test/md5.c | 30 +++++++++++++++++++++++++++---
+ 2 files changed, 47 insertions(+), 3 deletions(-)
+
+commit cf9ac1507f62899d92718fdc216689c2fc98e1fe
+Author: Guillem Jover <guillem(a)hadrons.org>
+Date: Sat Oct 6 04:33:02 2018 +0200
+
+ test: Refactor and extend message digest testing
+
+ Generate the base test function with a maro, because all of them follow
+ the same pattern. And extend it by covering more of the API.
+
+ test/Makefile.am | 4 ++++
+ test/md2.c | 16 +++++---------
+ test/md4.c | 16 +++++---------
+ test/md5.c | 14 +++++-------
+ test/rmd160.c | 16 +++++---------
+ test/sha1.c | 16 +++++---------
+ test/sha2.c | 46 ++++++++++++----------------------------
+ test/{rmd160.c => test.h} | 54 +++++++++++++++++++++++++++++++++++------------
+ 8 files changed, 83 insertions(+), 99 deletions(-)
+
+commit b6b3402e4a4b53cedff228a75339f08d23e6411d
+Author: Guillem Jover <guillem(a)hadrons.org>
+Date: Sat Oct 6 04:30:59 2018 +0200
+
+ Fix compatibility macros for SHA512
+
+ These have swapped names in their macro values.
+
+ include/sha512.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit ff52516cedbdd94dcba2ab2c3e5bddbd6a6d65e2
+Author: Guillem Jover <guillem(a)hadrons.org>
+Date: Sat Oct 6 04:30:11 2018 +0200
+
+ Add missing compatibility macros for SHA384
+
+ include/sha512.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit bf04c4110f8028bbb4d6682b5eb93a3dc1a2f895
+Author: Rainer Müller <raimue(a)codingfarm.de>
+Date: Fri Sep 29 17:02:33 2017 +0200
+
+ build: Invoke sed with portable regex
+
+ The previous sed expression only worked with GNU sed, as the '\+'
+ literal is an extension to basic regex. Use portable syntax instead that
+ also works with other implementations of sed(1), for example on macOS.
+
+ Signed-off-by: Guillem Jover <guillem(a)hadrons.org>
+
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit c657abc165177183f453437e578832d146103d61
Author: Guillem Jover <guillem(a)hadrons.org>
Date: Sat Jan 13 16:29:02 2018 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/build-aux/ar-lib new/libmd-1.0.1/build-aux/ar-lib
--- old/libmd-1.0.0/build-aux/ar-lib 2018-01-13 19:52:49.000000000 +0100
+++ new/libmd-1.0.1/build-aux/ar-lib 2018-10-22 12:49:18.000000000 +0200
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
-# Copyright (C) 2010-2017 Free Software Foundation, Inc.
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
# Written by Peter Rosin <peda(a)lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/build-aux/compile new/libmd-1.0.1/build-aux/compile
--- old/libmd-1.0.0/build-aux/compile 2018-01-13 19:52:49.000000000 +0100
+++ new/libmd-1.0.1/build-aux/compile 2018-10-22 12:49:18.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey(a)cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/build-aux/missing new/libmd-1.0.1/build-aux/missing
--- old/libmd-1.0.0/build-aux/missing 2018-01-13 19:52:49.000000000 +0100
+++ new/libmd-1.0.1/build-aux/missing 2018-10-22 12:49:18.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/build-aux/test-driver new/libmd-1.0.1/build-aux/test-driver
--- old/libmd-1.0.0/build-aux/test-driver 2018-01-13 19:52:49.000000000 +0100
+++ new/libmd-1.0.1/build-aux/test-driver 2018-10-22 12:49:18.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -140,9 +140,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/configure.ac new/libmd-1.0.1/configure.ac
--- old/libmd-1.0.0/configure.ac 2018-01-13 19:42:59.000000000 +0100
+++ new/libmd-1.0.1/configure.ac 2018-10-22 12:47:02.000000000 +0200
@@ -13,7 +13,7 @@
LIBMD_ABI_MAJOR=0
LIBMD_ABI_MINOR=0
-LIBMD_ABI_PATCH=1
+LIBMD_ABI_PATCH=2
LIBMD_ABI="$LIBMD_ABI_MAJOR:$LIBMD_ABI_MINOR:$LIBMD_ABI_PATCH"
AC_SUBST([LIBMD_ABI])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/include/md5.h new/libmd-1.0.1/include/md5.h
--- old/libmd-1.0.0/include/md5.h 2017-06-05 04:51:37.000000000 +0200
+++ new/libmd-1.0.1/include/md5.h 2018-10-22 12:47:02.000000000 +0200
@@ -47,4 +47,24 @@
}
#endif
+/* Avoid polluting the namespace. Even though this makes this usage
+ * implementation-specific, defining it unconditionally should not be
+ * a problem, and better than possibly breaking unexpecting code. */
+#ifdef LIBMD_MD5_ALADDIN
+
+/*
+ * Interface compatibility with Aladdin Enterprises independent
+ * implementation from RFC 1321.
+ */
+
+typedef uint8_t md5_byte_t;
+typedef uint32_t md5_word_t;
+typedef MD5_CTX md5_state_t;
+
+#define md5_init(pms) MD5Init(pms)
+#define md5_append(pms, data, nbytes) MD5Update(pms, data, nbytes)
+#define md5_finish(pms, digest) MD5Final(digest, pms)
+
+#endif /* LIBMD_MD5_ALADDIN */
+
#endif /* _MD5_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/include/sha512.h new/libmd-1.0.1/include/sha512.h
--- old/libmd-1.0.0/include/sha512.h 2016-02-10 01:04:20.000000000 +0100
+++ new/libmd-1.0.1/include/sha512.h 2018-10-22 12:46:31.000000000 +0200
@@ -37,13 +37,17 @@
#define SHA384_Init SHA384Init
#define SHA384_Update SHA384Update
#define SHA384_Final SHA384Final
+#define SHA384_End SHA384End
+#define SHA384_Data SHA384Data
+#define SHA384_File SHA384File
+#define SHA384_FileChunk SHA384FileChunk
#define SHA512_Init SHA512Init
#define SHA512_Update SHA512Update
#define SHA512_Final SHA512Final
#define SHA512_End SHA512End
-#define SHA512_Data SHA512File
-#define SHA512_File SHA512FileChunk
-#define SHA512_FileChunk SHA512Data
+#define SHA512_Data SHA512Data
+#define SHA512_File SHA512File
+#define SHA512_FileChunk SHA512FileChunk
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/m4/libtool.m4 new/libmd-1.0.1/m4/libtool.m4
--- old/libmd-1.0.0/m4/libtool.m4 2018-01-13 19:52:44.000000000 +0100
+++ new/libmd-1.0.1/m4/libtool.m4 2018-10-22 12:49:13.000000000 +0200
@@ -4063,7 +4063,8 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -6438,7 +6439,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
GXX=no
@@ -6813,7 +6814,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -6878,7 +6879,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -7217,7 +7218,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# FIXME: insert proper C++ library support
@@ -7301,7 +7302,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
@@ -7312,7 +7313,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/src/Makefile.am new/libmd-1.0.1/src/Makefile.am
--- old/libmd-1.0.0/src/Makefile.am 2017-06-05 05:01:25.000000000 +0200
+++ new/libmd-1.0.1/src/Makefile.am 2018-04-21 23:29:38.000000000 +0200
@@ -69,7 +69,7 @@
# Generate a simple libtool symbol export list to be used as a fallback if
# there is no version script support.
libmd.sym: libmd.map
- $(AM_V_GEN) sed -ne 's/^[[:space:]]\+\([A-Za-z0-9]\+\);/\1/p' $< > $@
+ $(AM_V_GEN) sed -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9]\{1,\}\);/\1/p' $< > $@
md2hl.c: helper.c
$(AM_V_GEN) sed -e 's/hashinc/md2.h/g' -e 's/HASH/MD2/g' $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/Makefile.am new/libmd-1.0.1/test/Makefile.am
--- old/libmd-1.0.0/test/Makefile.am 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/Makefile.am 2018-10-22 12:47:01.000000000 +0200
@@ -7,6 +7,10 @@
LDADD = $(top_builddir)/src/libmd.la
+check_HEADERS = \
+ test.h \
+ $(nil)
+
check_PROGRAMS = \
md2 \
md4 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/md2.c new/libmd-1.0.1/test/md2.c
--- old/libmd-1.0.0/test/md2.c 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/md2.c 2018-10-22 12:47:01.000000000 +0200
@@ -26,24 +26,18 @@
#include <config.h>
-#include <assert.h>
#include <md2.h>
-#include <string.h>
-void
-test_md2(const char *digest, const char *string)
-{
- char result[MD2_DIGEST_STRING_LENGTH];
+#include "test.h"
- assert(strcmp(digest, MD2Data(string, strlen(string), result)) == 0);
-}
+DEF_TEST_DIGEST(MD2, MD2)
int
main()
{
- test_md2("8350e5a3e24c153df2275c9f80692773", "");
- test_md2("da853b0d3f88d99b30283a69e6ded6bb", "abc");
- test_md2("2fe3cb9e21922819e79a2781af74e36d", "12345");
+ test_MD2("8350e5a3e24c153df2275c9f80692773", "");
+ test_MD2("da853b0d3f88d99b30283a69e6ded6bb", "abc");
+ test_MD2("2fe3cb9e21922819e79a2781af74e36d", "12345");
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/md4.c new/libmd-1.0.1/test/md4.c
--- old/libmd-1.0.0/test/md4.c 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/md4.c 2018-10-22 12:47:01.000000000 +0200
@@ -26,24 +26,18 @@
#include <config.h>
-#include <assert.h>
#include <md4.h>
-#include <string.h>
-void
-test_md4(const char *digest, const char *string)
-{
- char result[MD4_DIGEST_STRING_LENGTH];
+#include "test.h"
- assert(strcmp(digest, MD4Data(string, strlen(string), result)) == 0);
-}
+DEF_TEST_DIGEST(MD4, MD4)
int
main()
{
- test_md4("31d6cfe0d16ae931b73c59d7e0c089c0", "");
- test_md4("a448017aaf21d8525fc10ae87aa6729d", "abc");
- test_md4("23580e2a459f7ea40f9efa148b63cafb", "12345");
+ test_MD4("31d6cfe0d16ae931b73c59d7e0c089c0", "");
+ test_MD4("a448017aaf21d8525fc10ae87aa6729d", "abc");
+ test_MD4("23580e2a459f7ea40f9efa148b63cafb", "12345");
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/md5.c new/libmd-1.0.1/test/md5.c
--- old/libmd-1.0.0/test/md5.c 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/md5.c 2018-10-22 12:47:02.000000000 +0200
@@ -24,26 +24,46 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#define LIBMD_MD5_ALADDIN 1
+
#include <config.h>
#include <assert.h>
#include <md5.h>
#include <string.h>
+#include "test.h"
+
+DEF_TEST_DIGEST(MD5, MD5)
+
void
-test_md5(const char *digest, const char *string)
+test_MD5_aladdin(const char *hash_str_ref, const char *data)
{
- char result[MD5_DIGEST_STRING_LENGTH];
+ uint8_t hash_bin_ref[MD5_DIGEST_LENGTH];
+ uint8_t hash_bin_got[MD5_DIGEST_LENGTH];
+ md5_state_t pms;
+
+ hex2bin(hash_bin_ref, hash_str_ref, MD5_DIGEST_LENGTH);
+
+ md5_init(&pms);
+ md5_append(&pms, data, strlen(data));
+ md5_finish(&pms, hash_bin_got);
+ assert(memcmp(hash_bin_ref, hash_bin_got, MD5_DIGEST_LENGTH) == 0);
+}
- assert(strcmp(digest, MD5Data(string, strlen(string), result)) == 0);
+void
+test_MD5_all(const char *hash_str_ref, const char *data)
+{
+ test_MD5(hash_str_ref, data);
+ test_MD5_aladdin(hash_str_ref, data);
}
int
main()
{
- test_md5("d41d8cd98f00b204e9800998ecf8427e", "");
- test_md5("900150983cd24fb0d6963f7d28e17f72", "abc");
- test_md5("827ccb0eea8a706c4c34a16891f84e7b", "12345");
+ test_MD5_all("d41d8cd98f00b204e9800998ecf8427e", "");
+ test_MD5_all("900150983cd24fb0d6963f7d28e17f72", "abc");
+ test_MD5_all("827ccb0eea8a706c4c34a16891f84e7b", "12345");
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/rmd160.c new/libmd-1.0.1/test/rmd160.c
--- old/libmd-1.0.0/test/rmd160.c 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/rmd160.c 2018-10-22 12:47:01.000000000 +0200
@@ -26,24 +26,18 @@
#include <config.h>
-#include <assert.h>
#include <rmd160.h>
-#include <string.h>
-void
-test_rmd160(const char *digest, const char *string)
-{
- char result[RMD160_DIGEST_STRING_LENGTH];
+#include "test.h"
- assert(strcmp(digest, RMD160Data(string, strlen(string), result)) == 0);
-}
+DEF_TEST_DIGEST(RMD160, RMD160)
int
main()
{
- test_rmd160("9c1185a5c5e9fc54612808977ee8f548b2258d31", "");
- test_rmd160("8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", "abc");
- test_rmd160("e9cbd2ea8015a084ce9cf83a3c65b51f8fa10a39", "12345");
+ test_RMD160("9c1185a5c5e9fc54612808977ee8f548b2258d31", "");
+ test_RMD160("8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", "abc");
+ test_RMD160("e9cbd2ea8015a084ce9cf83a3c65b51f8fa10a39", "12345");
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/sha1.c new/libmd-1.0.1/test/sha1.c
--- old/libmd-1.0.0/test/sha1.c 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/sha1.c 2018-10-22 12:47:01.000000000 +0200
@@ -26,24 +26,18 @@
#include <config.h>
-#include <assert.h>
#include <sha1.h>
-#include <string.h>
-void
-test_sha1(const char *digest, const char *string)
-{
- char result[SHA1_DIGEST_STRING_LENGTH];
+#include "test.h"
- assert(strcmp(digest, SHA1Data(string, strlen(string), result)) == 0);
-}
+DEF_TEST_DIGEST(SHA1, SHA1)
int
main()
{
- test_sha1("da39a3ee5e6b4b0d3255bfef95601890afd80709", "");
- test_sha1("a9993e364706816aba3e25717850c26c9cd0d89d", "abc");
- test_sha1("8cb2237d0679ca88db6464eac60da96345513964", "12345");
+ test_SHA1("da39a3ee5e6b4b0d3255bfef95601890afd80709", "");
+ test_SHA1("a9993e364706816aba3e25717850c26c9cd0d89d", "abc");
+ test_SHA1("8cb2237d0679ca88db6464eac60da96345513964", "12345");
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/sha2.c new/libmd-1.0.1/test/sha2.c
--- old/libmd-1.0.0/test/sha2.c 2017-06-05 04:56:03.000000000 +0200
+++ new/libmd-1.0.1/test/sha2.c 2018-10-22 12:47:01.000000000 +0200
@@ -26,56 +26,36 @@
#include <config.h>
-#include <assert.h>
#include <sha2.h>
-#include <string.h>
-void
-test_sha256(const char *digest, const char *string)
-{
- char result[SHA256_DIGEST_STRING_LENGTH];
-
- assert(strcmp(digest, SHA256Data(string, strlen(string), result)) == 0);
-}
-
-void
-test_sha384(const char *digest, const char *string)
-{
- char result[SHA384_DIGEST_STRING_LENGTH];
-
- assert(strcmp(digest, SHA384Data(string, strlen(string), result)) == 0);
-}
-
-void
-test_sha512(const char *digest, const char *string)
-{
- char result[SHA512_DIGEST_STRING_LENGTH];
+#include "test.h"
- assert(strcmp(digest, SHA512Data(string, strlen(string), result)) == 0);
-}
+DEF_TEST_DIGEST(SHA256, SHA2)
+DEF_TEST_DIGEST(SHA384, SHA2)
+DEF_TEST_DIGEST(SHA512, SHA2)
int
main()
{
- test_sha256("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+ test_SHA256("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"");
- test_sha256("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+ test_SHA256("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
"abc");
- test_sha256("5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5",
+ test_SHA256("5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5",
"12345");
- test_sha384("38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b",
+ test_SHA384("38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b",
"");
- test_sha384("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
+ test_SHA384("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
"abc");
- test_sha384("0fa76955abfa9dafd83facca8343a92aa09497f98101086611b0bfa95dbc0dcc661d62e9568a5a032ba81960f3e55d4a",
+ test_SHA384("0fa76955abfa9dafd83facca8343a92aa09497f98101086611b0bfa95dbc0dcc661d62e9568a5a032ba81960f3e55d4a",
"12345");
- test_sha512("cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
+ test_SHA512("cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
"");
- test_sha512("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
+ test_SHA512("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
"abc");
- test_sha512("3627909a29c31381a071ec27f7c9ca97726182aed29a7ddd2e54353322cfb30abb9e3a6df2ac2c20fe23436311d678564d0c8d305930575f60e2d3d048184d79",
+ test_SHA512("3627909a29c31381a071ec27f7c9ca97726182aed29a7ddd2e54353322cfb30abb9e3a6df2ac2c20fe23436311d678564d0c8d305930575f60e2d3d048184d79",
"12345");
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmd-1.0.0/test/test.h new/libmd-1.0.1/test/test.h
--- old/libmd-1.0.0/test/test.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libmd-1.0.1/test/test.h 2018-10-22 12:47:01.000000000 +0200
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2018 Guillem Jover <guillem(a)hadrons.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <config.h>
+
+#include <assert.h>
+#include <string.h>
+
+static int
+hexchar2bin(int c)
+{
+ if (c >= '0' && c <= '9')
+ return c - '0';
+ else if (c >= 'a' && c <= 'f')
+ return c - 'a' + 10;
+ else if (c >= 'A' && c <= 'F')
+ return c - 'A' + 10;
+ assert(!"invalid hexadecimal input");
+}
+
+static void
+hex2bin(uint8_t *bin, const char *str, size_t bin_len)
+{
+ int i;
+
+ for (i = 0; i < bin_len; i++)
+ bin[i] = hexchar2bin(str[i * 2]) << 4 |
+ hexchar2bin(str[i * 2 + 1]);
+}
+
+#define DEF_TEST_DIGEST(name, type) \
+void \
+test_##name(const char *hash_str_ref, const char *data) \
+{ \
+ uint8_t hash_bin_ref[name##_DIGEST_LENGTH]; \
+ uint8_t hash_bin_got[name##_DIGEST_LENGTH]; \
+ char hash_str_got[name##_DIGEST_STRING_LENGTH]; \
+ type##_CTX ctx; \
+\
+ hex2bin(hash_bin_ref, hash_str_ref, name##_DIGEST_LENGTH); \
+\
+ name##Data(data, strlen(data), hash_str_got); \
+ assert(strcmp(hash_str_ref, hash_str_got) == 0); \
+\
+ name##Init(&ctx); \
+ name##Update(&ctx, data, strlen(data)); \
+ name##End(&ctx, hash_str_got); \
+ assert(strcmp(hash_str_ref, hash_str_got) == 0); \
+\
+ name##Init(&ctx); \
+ name##Update(&ctx, data, strlen(data)); \
+ name##Final(hash_bin_got, &ctx); \
+ assert(memcmp(hash_bin_ref, hash_bin_got, sizeof(hash_bin_ref)) == 0); \
+}
1
0
Hello community,
here is the log from the commit of package hwdata for openSUSE:Factory checked in at 2018-12-27 00:24:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hwdata (Old)
and /work/SRC/openSUSE:Factory/.hwdata.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwdata"
Thu Dec 27 00:24:33 2018 rev:16 rq:658067 version:0.318
Changes:
--------
--- /work/SRC/openSUSE:Factory/hwdata/hwdata.changes 2018-09-04 22:47:31.731222872 +0200
+++ /work/SRC/openSUSE:Factory/.hwdata.new.28833/hwdata.changes 2018-12-27 00:24:35.675898331 +0100
@@ -1,0 +2,12 @@
+Fri Dec 14 14:47:45 UTC 2018 - Martin Pluskal <mpluskal(a)suse.com>
+
+- Update to version 0.318:
+ * Updated pci, usb and vendor ids.
+
+-------------------------------------------------------------------
+Wed Sep 26 14:03:20 UTC 2018 - Martin Pluskal <mpluskal(a)suse.com>
+
+- Update to version 0.315:
+ * Updated pci, usb and vendor ids.
+
+-------------------------------------------------------------------
Old:
----
hwdata-0.314.tar.gz
New:
----
hwdata-0.318.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hwdata.spec ++++++
--- /var/tmp/diff_new_pack.qhT6ot/_old 2018-12-27 00:24:36.123897966 +0100
+++ /var/tmp/diff_new_pack.qhT6ot/_new 2018-12-27 00:24:36.127897962 +0100
@@ -17,7 +17,7 @@
Name: hwdata
-Version: 0.314
+Version: 0.318
Release: 0
Summary: Hardware identification and configuration data
License: GPL-2.0-or-later
++++++ hwdata-0.314.tar.gz -> hwdata-0.318.tar.gz ++++++
++++ 9235 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package geronimo-specs for openSUSE:Factory checked in at 2018-12-27 00:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geronimo-specs (Old)
and /work/SRC/openSUSE:Factory/.geronimo-specs.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geronimo-specs"
Thu Dec 27 00:24:29 2018 rev:29 rq:658039 version:1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/geronimo-specs/geronimo-specs.changes 2018-12-07 14:30:54.495405524 +0100
+++ /work/SRC/openSUSE:Factory/.geronimo-specs.new.28833/geronimo-specs.changes 2018-12-27 00:24:30.395902638 +0100
@@ -1,0 +2,5 @@
+Thu Dec 13 17:26:30 UTC 2018 - Fridrich Strba <fstrba(a)suse.com>
+
+- Add alias javax.jms:jms to geronimo-jms-1_1-api
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geronimo-specs.spec ++++++
--- /var/tmp/diff_new_pack.PkDFyo/_old 2018-12-27 00:24:30.991902151 +0100
+++ /var/tmp/diff_new_pack.PkDFyo/_new 2018-12-27 00:24:30.991902151 +0100
@@ -1071,7 +1071,7 @@
popd
install -m 0644 geronimo-jms_1.1_spec-1.1/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-jms-1.1-api.pom
-%add_maven_depmap JPP-geronimo-jms-1.1-api.pom geronimo-jms-1.1-api.jar -f jms-1.1-api
+%add_maven_depmap JPP-geronimo-jms-1.1-api.pom geronimo-jms-1.1-api.jar -f jms-1.1-api -a javax.jms:jms
install -m 0644 \
geronimo-jpa_3.0_spec-1.1.0/target/geronimo-jpa_3.0_spec-1.1.jar \
1
0
Hello community,
here is the log from the commit of package apache-commons-pool2 for openSUSE:Factory checked in at 2018-12-27 00:24:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-pool2 (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-pool2.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-pool2"
Thu Dec 27 00:24:24 2018 rev:4 rq:658035 version:2.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-commons-pool2/apache-commons-pool2.changes 2018-07-24 17:30:47.551941263 +0200
+++ /work/SRC/openSUSE:Factory/.apache-commons-pool2.new.28833/apache-commons-pool2.changes 2018-12-27 00:24:25.599906549 +0100
@@ -1,0 +2,5 @@
+Thu Dec 13 11:27:43 UTC 2018 - Fridrich Strba <fstrba(a)suse.com>
+
+- Add maven pom file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-pool2.spec ++++++
--- /var/tmp/diff_new_pack.vPw0zI/_old 2018-12-27 00:24:26.095906144 +0100
+++ /var/tmp/diff_new_pack.vPw0zI/_new 2018-12-27 00:24:26.099906141 +0100
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,14 +24,15 @@
Summary: Apache Commons Pool 2.x series
License: Apache-2.0
Group: Development/Libraries/Java
-Url: https://commons.apache.org/proper/commons-pool/
+URL: https://commons.apache.org/proper/commons-pool/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{vers…
Patch0: jakarta-commons-pool-build.patch
BuildRequires: ant
+BuildRequires: apache-commons-parent
BuildRequires: cglib
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-tools
+BuildRequires: javapackages-local
BuildRequires: junit
Requires: cglib
Provides: %{short_name} = %{version}
@@ -76,17 +77,29 @@
install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
+%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
+
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
-%doc README.txt LICENSE.txt
+%license LICENSE.txt
+%doc README.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_javadir}/%{short_name}-%{version}.jar
+%{_mavenpomdir}/%{name}-%{version}.pom
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
%files javadoc
%doc %{_javadocdir}/%{name}
1
0