openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
September 2019
- 1 participants
- 2151 discussions
Hello community,
here is the log from the commit of package libcontainers-common for openSUSE:Factory checked in at 2019-09-30 15:50:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Mon Sep 30 15:50:34 2019 rev:19 rq:732772 version:20190923
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes 2019-08-10 23:44:13.555633910 +0200
+++ /work/SRC/openSUSE:Factory/.libcontainers-common.new.2352/libcontainers-common.changes 2019-09-30 15:50:35.898621881 +0200
@@ -1,0 +2,16 @@
+Mon Sep 23 15:28:02 UTC 2019 - Richard Brown <rbrown(a)suse.com>
+
+- Update to image 1.4.4
+ - Hard-code the kernel keyring use to be disabled for now
+- Update to libpod 1.5.1
+ - The hostname of pods is now set to the pod's name
+ - Minor bugfixes
+- Update to storage 1.12.16
+ - Ignore ro mount options in btrfs and windows drivers
+
+-------------------------------------------------------------------
+Mon Sep 23 12:01:53 UTC 2019 - Richard Brown <rbrown(a)suse.com>
+
+- Check /var/lib/containers if possible before setting btrfs backend (bsc#1151028)
+
+-------------------------------------------------------------------
Old:
----
image-3.0.0.tar.xz
libpod-1.4.4.tar.xz
storage-1.12.16.tar.xz
New:
----
image-3.0.2.tar.xz
libpod-1.5.1.tar.xz
storage-1.13.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.YrYt3s/_old 2019-09-30 15:50:37.306618134 +0200
+++ /var/tmp/diff_new_pack.YrYt3s/_new 2019-09-30 15:50:37.310618123 +0200
@@ -16,16 +16,16 @@
#
# libpodver - version from containers/libpod
-%define libpodver 1.4.4
+%define libpodver 1.5.1
# storagever - version from containers/storage
-%define storagever 1.12.16
+%define storagever 1.13.2
# imagever - version from containers/image
-%define imagever 3.0.0
+%define imagever 3.0.2
Name: libcontainers-common
-Version: 20190802
+Version: 20190923
Release: 0
Summary: Configuration files common to github.com/containers
License: Apache-2.0 and GPL-3.0+
@@ -121,9 +121,11 @@
install -D -m 0644 libpod-%{libpodver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/
%post
-# If installing, check if /var/lib is btrfs and set driver to "btrfs" if true
+# If installing, check if /var/lib/containers (or /var/lib in its defect) is btrfs and set driver
+# to "btrfs" if true
if [ $1 -eq 1 ] ; then
- if [ "`findmnt -o FSTYPE -l --target /var/lib|grep -v FSTYPE`" = "btrfs" ]; then
+ fstype=$((findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE)
+ if [ "$fstype" = "btrfs" ]; then
sed -i 's/driver = ""/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
fi
fi
++++++ _service ++++++
--- /var/tmp/diff_new_pack.YrYt3s/_old 2019-09-30 15:50:37.358617995 +0200
+++ /var/tmp/diff_new_pack.YrYt3s/_new 2019-09-30 15:50:37.358617995 +0200
@@ -4,24 +4,24 @@
<param name="url">https://github.com/containers/storage.git</param>
<param name="scm">git</param>
<param name="filename">storage</param>
-<param name="versionformat">1.12.16</param>
-<param name="revision">v1.12.16</param>
+<param name="versionformat">1.13.2</param>
+<param name="revision">v1.13.2</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/containers/image.git</param>
<param name="scm">git</param>
<param name="filename">image</param>
-<param name="versionformat">3.0.0</param>
-<param name="revision">v3.0.0</param>
+<param name="versionformat">3.0.2</param>
+<param name="revision">v3.0.2</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/containers/libpod.git</param>
<param name="scm">git</param>
<param name="filename">libpod</param>
-<param name="versionformat">1.4.4</param>
-<param name="revision">v1.4.4</param>
+<param name="versionformat">1.5.1</param>
+<param name="revision">v1.5.1</param>
</service>
<service name="recompress" mode="disabled">
++++++ image-3.0.0.tar.xz -> image-3.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/ostree/ostree_src.go new/image-3.0.2/ostree/ostree_src.go
--- old/image-3.0.0/ostree/ostree_src.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/ostree/ostree_src.go 2019-08-08 00:54:04.000000000 +0200
@@ -59,9 +59,15 @@
return nil
}
-func (s *ostreeImageSource) getLayerSize(blob string) (int64, error) {
+func (s *ostreeImageSource) getBlobUncompressedSize(blob string, isCompressed bool) (int64, error) {
+ var metadataKey string
+ if isCompressed {
+ metadataKey = "docker.uncompressed_size"
+ } else {
+ metadataKey = "docker.size"
+ }
b := fmt.Sprintf("ociimage/%s", blob)
- found, data, err := readMetadata(s.repo, b, "docker.size")
+ found, data, err := readMetadata(s.repo, b, metadataKey)
if err != nil || !found {
return 0, err
}
@@ -275,8 +281,8 @@
}
}
- compressedBlob, found := s.compressed[info.Digest]
- if found {
+ compressedBlob, isCompressed := s.compressed[info.Digest]
+ if isCompressed {
blob = compressedBlob.Hex()
}
branch := fmt.Sprintf("ociimage/%s", blob)
@@ -289,7 +295,7 @@
s.repo = repo
}
- layerSize, err := s.getLayerSize(blob)
+ layerSize, err := s.getBlobUncompressedSize(blob, isCompressed)
if err != nil {
return nil, 0, err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/docker/config/config.go new/image-3.0.2/pkg/docker/config/config.go
--- old/image-3.0.0/pkg/docker/config/config.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/docker/config/config.go 2019-08-08 00:54:04.000000000 +0200
@@ -32,6 +32,8 @@
dockerHomePath = filepath.FromSlash(".docker/config.json")
dockerLegacyHomePath = ".dockercfg"
+ enableKeyring = false
+
// ErrNotLoggedIn is returned for users not logged into a registry
// that they are trying to logout of
ErrNotLoggedIn = errors.New("not logged in")
@@ -46,11 +48,11 @@
return false, setAuthToCredHelper(ch, registry, username, password)
}
- // Set the credentials to kernel keyring if sys.AuthFile is not specified.
+ // Set the credentials to kernel keyring if enableKeyring is true.
// The keyring might not work in all environments (e.g., missing capability) and isn't supported on all platforms.
// Hence, we want to fall-back to using the authfile in case the keyring failed.
- // However, if the sys.AuthFilePath is set, we want adhere to the user specification and not use the keyring.
- if sys.AuthFilePath == "" {
+ // However, if the enableKeyring is false, we want adhere to the user specification and not use the keyring.
+ if enableKeyring {
err := setAuthToKernelKeyring(registry, username, password)
if err == nil {
logrus.Debugf("credentials for (%s, %s) were stored in the kernel keyring\n", registry, username)
@@ -74,10 +76,12 @@
return sys.DockerAuthConfig.Username, sys.DockerAuthConfig.Password, nil
}
- username, password, err := getAuthFromKernelKeyring(registry)
- if err == nil {
- logrus.Debug("returning credentials from kernel keyring")
- return username, password, nil
+ if enableKeyring {
+ username, password, err := getAuthFromKernelKeyring(registry)
+ if err == nil {
+ logrus.Debug("returning credentials from kernel keyring")
+ return username, password, nil
+ }
}
dockerLegacyPath := filepath.Join(homedir.Get(), dockerLegacyHomePath)
@@ -117,13 +121,15 @@
return false, deleteAuthFromCredHelper(ch, registry)
}
- // Next try kernel keyring
- err := deleteAuthFromKernelKeyring(registry)
- if err == nil {
- logrus.Debugf("credentials for %s were deleted from the kernel keyring", registry)
- return false, nil
+ // Next if keyring is enabled try kernel keyring
+ if enableKeyring {
+ err := deleteAuthFromKernelKeyring(registry)
+ if err == nil {
+ logrus.Debugf("credentials for %s were deleted from the kernel keyring", registry)
+ return false, nil
+ }
+ logrus.Debugf("failed to delete credentials from the kernel keyring, falling back to authfiles")
}
- logrus.Debugf("failed to delete credentials from the kernel keyring, falling back to authfiles")
if _, ok := auths.AuthConfigs[registry]; ok {
delete(auths.AuthConfigs, registry)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/key.go new/image-3.0.2/pkg/keyctl/key.go
--- old/image-3.0.0/pkg/keyctl/key.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/key.go 2019-08-08 00:54:04.000000000 +0200
@@ -3,12 +3,11 @@
// license that can be found in the LICENSE file.
// +build linux
-// +build 386 amd64
package keyctl
import (
- "unsafe"
+ "golang.org/x/sys/unix"
)
// Key represents a single key linked to one or more kernel keyrings.
@@ -41,7 +40,7 @@
b = make([]byte, int(size))
sizeRead = size + 1
for sizeRead > size {
- r1, _, err := keyctl(keyctlRead, uintptr(k.id), uintptr(unsafe.Pointer(&b[0])), uintptr(size))
+ r1, err := unix.KeyctlBuffer(unix.KEYCTL_READ, int(k.id), b, size)
if err != nil {
return nil, err
}
@@ -60,6 +59,6 @@
// Unlink a key from the keyring it was loaded from (or added to). If the key
// is not linked to any other keyrings, it is destroyed.
func (k *Key) Unlink() error {
- _, _, err := keyctl(keyctlUnlink, uintptr(k.id), uintptr(k.ring))
+ _, err := unix.KeyctlInt(unix.KEYCTL_UNLINK, int(k.id), int(k.ring), 0, 0)
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/keyring.go new/image-3.0.2/pkg/keyctl/keyring.go
--- old/image-3.0.0/pkg/keyctl/keyring.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/keyring.go 2019-08-08 00:54:04.000000000 +0200
@@ -3,11 +3,17 @@
// license that can be found in the LICENSE file.
// +build linux
-// +build 386 amd64
// Package keyctl is a Go interface to linux kernel keyrings (keyctl interface)
+//
+// Deprecated: Most callers should use either golang.org/x/sys/unix directly,
+// or the original (and more extensive) github.com/jsipprell/keyctl .
package keyctl
+import (
+ "golang.org/x/sys/unix"
+)
+
// Keyring is the basic interface to a linux keyctl keyring.
type Keyring interface {
ID
@@ -26,7 +32,7 @@
// Add a new key to a keyring. The key can be searched for later by name.
func (kr *keyring) Add(name string, key []byte) (*Key, error) {
- r, err := addkey("user", name, key, int32(kr.id))
+ r, err := unix.AddKey("user", name, key, int(kr.id))
if err == nil {
key := &Key{Name: name, id: keyID(r), ring: kr.id}
return key, nil
@@ -38,9 +44,9 @@
// one. The key, if found, is linked to the top keyring that Search() was called
// from.
func (kr *keyring) Search(name string) (*Key, error) {
- id, err := searchKeyring(kr.id, name, "user")
+ id, err := unix.KeyctlSearch(int(kr.id), "user", name, 0)
if err == nil {
- return &Key{Name: name, id: id, ring: kr.id}, nil
+ return &Key{Name: name, id: keyID(id), ring: kr.id}, nil
}
return nil, err
}
@@ -52,22 +58,22 @@
// SessionKeyring returns the current login session keyring
func SessionKeyring() (Keyring, error) {
- return newKeyring(keySpecSessionKeyring)
+ return newKeyring(unix.KEY_SPEC_SESSION_KEYRING)
}
// UserKeyring returns the keyring specific to the current user.
func UserKeyring() (Keyring, error) {
- return newKeyring(keySpecUserKeyring)
+ return newKeyring(unix.KEY_SPEC_USER_KEYRING)
}
// Unlink an object from a keyring
func Unlink(parent Keyring, child ID) error {
- _, _, err := keyctl(keyctlUnlink, uintptr(child.ID()), uintptr(parent.ID()))
+ _, err := unix.KeyctlInt(unix.KEYCTL_UNLINK, int(child.ID()), int(parent.ID()), 0, 0)
return err
}
// Link a key into a keyring
func Link(parent Keyring, child ID) error {
- _, _, err := keyctl(keyctlLink, uintptr(child.ID()), uintptr(parent.ID()))
+ _, err := unix.KeyctlInt(unix.KEYCTL_LINK, int(child.ID()), int(parent.ID()), 0, 0)
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/keyring_test.go new/image-3.0.2/pkg/keyctl/keyring_test.go
--- old/image-3.0.0/pkg/keyctl/keyring_test.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/keyring_test.go 2019-08-08 00:54:04.000000000 +0200
@@ -1,5 +1,4 @@
// +build linux
-// +build 386 amd64
package keyctl
@@ -82,6 +81,9 @@
}
_, err = userKeyring.Search(testname)
+ if err == nil {
+ t.Fatalf("Expected error, but got key %v", testname)
+ }
ExpectedError := "required key not available"
if err.Error() != ExpectedError {
t.Fatal(err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/perm.go new/image-3.0.2/pkg/keyctl/perm.go
--- old/image-3.0.0/pkg/keyctl/perm.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/perm.go 2019-08-08 00:54:04.000000000 +0200
@@ -6,6 +6,10 @@
package keyctl
+import (
+ "golang.org/x/sys/unix"
+)
+
// KeyPerm represents in-kernel access control permission to keys and keyrings
// as a 32-bit integer broken up into four permission sets, one per byte.
// In MSB order, the perms are: Processor, User, Group, Other.
@@ -24,6 +28,6 @@
// SetPerm sets the permissions on a key or keyring.
func SetPerm(k ID, p KeyPerm) error {
- _, _, err := keyctl(keyctlSetPerm, uintptr(k.ID()), uintptr(p))
+ err := unix.KeyctlSetperm(int(k.ID()), uint32(p))
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/sys_linux.go new/image-3.0.2/pkg/keyctl/sys_linux.go
--- old/image-3.0.0/pkg/keyctl/sys_linux.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/sys_linux.go 2019-08-08 00:54:04.000000000 +0200
@@ -3,119 +3,23 @@
// license that can be found in the LICENSE file.
// +build linux
-// +build 386 amd64
package keyctl
import (
- "syscall"
- "unsafe"
+ "golang.org/x/sys/unix"
)
-type keyctlCommand int
-
type keyID int32
-const (
- keySpecSessionKeyring keyID = -3
- keySpecUserKeyring keyID = -4
-)
-
-const (
- keyctlGetKeyringID keyctlCommand = 0
- keyctlSetPerm keyctlCommand = 5
- keyctlLink keyctlCommand = 8
- keyctlUnlink keyctlCommand = 9
- keyctlSearch keyctlCommand = 10
- keyctlRead keyctlCommand = 11
-)
-
-func (id keyID) ID() int32 {
- return int32(id)
-}
-
-func keyctl(cmd keyctlCommand, args ...uintptr) (r1 int32, r2 int32, err error) {
- a := make([]uintptr, 6)
- l := len(args)
- if l > 5 {
- l = 5
- }
- a[0] = uintptr(cmd)
- for idx, v := range args[:l] {
- a[idx+1] = v
- }
- v1, v2, errno := syscall.Syscall6(syscallKeyctl, a[0], a[1], a[2], a[3], a[4], a[5])
- if errno != 0 {
- err = errno
- return
- }
-
- r1 = int32(v1)
- r2 = int32(v2)
- return
-}
-
-func addkey(keyType, keyDesc string, payload []byte, id int32) (int32, error) {
- var (
- err error
- errno syscall.Errno
- b1, b2 *byte
- r1 uintptr
- pptr unsafe.Pointer
- )
-
- if b1, err = syscall.BytePtrFromString(keyType); err != nil {
- return 0, err
- }
-
- if b2, err = syscall.BytePtrFromString(keyDesc); err != nil {
- return 0, err
- }
-
- if len(payload) > 0 {
- pptr = unsafe.Pointer(&payload[0])
- }
- r1, _, errno = syscall.Syscall6(syscallAddKey,
- uintptr(unsafe.Pointer(b1)),
- uintptr(unsafe.Pointer(b2)),
- uintptr(pptr),
- uintptr(len(payload)),
- uintptr(id),
- 0)
-
- if errno != 0 {
- err = errno
- return 0, err
- }
- return int32(r1), nil
-}
-
func newKeyring(id keyID) (*keyring, error) {
- r1, _, err := keyctl(keyctlGetKeyringID, uintptr(id), uintptr(1))
+ r1, err := unix.KeyctlGetKeyringID(int(id), true)
if err != nil {
return nil, err
}
if id < 0 {
- r1 = int32(id)
+ r1 = int(id)
}
return &keyring{id: keyID(r1)}, nil
}
-
-func searchKeyring(id keyID, name, keyType string) (keyID, error) {
- var (
- r1 int32
- b1, b2 *byte
- err error
- )
-
- if b1, err = syscall.BytePtrFromString(keyType); err != nil {
- return 0, err
- }
- if b2, err = syscall.BytePtrFromString(name); err != nil {
- return 0, err
- }
-
- r1, _, err = keyctl(keyctlSearch, uintptr(id), uintptr(unsafe.Pointer(b1)), uintptr(unsafe.Pointer(b2)))
- return keyID(r1), err
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/sys_linux_386.go new/image-3.0.2/pkg/keyctl/sys_linux_386.go
--- old/image-3.0.0/pkg/keyctl/sys_linux_386.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/sys_linux_386.go 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-// Copyright 2015 Jesse Sipprell. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-package keyctl
-
-const (
- syscallKeyctl uintptr = 288
- syscallAddKey uintptr = 286
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/pkg/keyctl/sys_linux_amd64.go new/image-3.0.2/pkg/keyctl/sys_linux_amd64.go
--- old/image-3.0.0/pkg/keyctl/sys_linux_amd64.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/pkg/keyctl/sys_linux_amd64.go 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-// Copyright 2015 Jesse Sipprell. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-package keyctl
-
-const (
- syscallKeyctl uintptr = 250
- syscallAddKey uintptr = 248
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-3.0.0/version/version.go new/image-3.0.2/version/version.go
--- old/image-3.0.0/version/version.go 2019-08-02 11:13:02.000000000 +0200
+++ new/image-3.0.2/version/version.go 2019-08-08 00:54:04.000000000 +0200
@@ -8,7 +8,7 @@
// VersionMinor is for functionality in a backwards-compatible manner
VersionMinor = 0
// VersionPatch is for backwards-compatible bug fixes
- VersionPatch = 0
+ VersionPatch = 2
// VersionDev indicates development branch. Releases will be empty string.
VersionDev = ""
++++++ libpod-1.4.4.tar.xz -> libpod-1.5.1.tar.xz ++++++
++++ 114247 lines of diff (skipped)
++++++ storage-1.12.16.tar.xz -> storage-1.13.2.tar.xz ++++++
++++ 3113 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libyui for openSUSE:Factory checked in at 2019-09-30 15:50:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui (Old)
and /work/SRC/openSUSE:Factory/.libyui.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui"
Mon Sep 30 15:50:26 2019 rev:42 rq:732749 version:3.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2019-09-23 13:16:26.937115384 +0200
+++ /work/SRC/openSUSE:Factory/.libyui.new.2352/libyui.changes 2019-09-30 15:50:28.710641011 +0200
@@ -1,0 +2,7 @@
+Mon Sep 23 12:44:47 UTC 2019 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Added CurrentItem property to new ItemSelector widget for consistency
+ (bsc#1084674)
+- 3.8.1
+
+-------------------------------------------------------------------
Old:
----
libyui-3.8.0.tar.bz2
New:
----
libyui-3.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-doc.spec ++++++
--- /var/tmp/diff_new_pack.i3nSYc/_old 2019-09-30 15:50:29.334639350 +0200
+++ /var/tmp/diff_new_pack.i3nSYc/_new 2019-09-30 15:50:29.334639350 +0200
@@ -20,7 +20,7 @@
%define so_version 10
Name: %{parent}-doc
-Version: 3.8.0
+Version: 3.8.1
Release: 0
Source: %{parent}-%{version}.tar.bz2
++++++ libyui.spec ++++++
--- /var/tmp/diff_new_pack.i3nSYc/_old 2019-09-30 15:50:29.354639296 +0200
+++ /var/tmp/diff_new_pack.i3nSYc/_new 2019-09-30 15:50:29.354639296 +0200
@@ -17,7 +17,7 @@
Name: libyui
-Version: 3.8.0
+Version: 3.8.1
Release: 0
Source: %{name}-%{version}.tar.bz2
++++++ libyui-3.8.0.tar.bz2 -> libyui-3.8.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.8.0/VERSION.cmake new/libyui-3.8.1/VERSION.cmake
--- old/libyui-3.8.0/VERSION.cmake 2019-09-19 11:58:22.000000000 +0200
+++ new/libyui-3.8.1/VERSION.cmake 2019-09-23 16:10:48.000000000 +0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "3")
SET( VERSION_MINOR "8" )
-SET( VERSION_PATCH "0" )
+SET( VERSION_PATCH "1" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.8.0/package/libyui-doc.spec new/libyui-3.8.1/package/libyui-doc.spec
--- old/libyui-3.8.0/package/libyui-doc.spec 2019-09-19 11:58:22.000000000 +0200
+++ new/libyui-3.8.1/package/libyui-doc.spec 2019-09-23 16:10:48.000000000 +0200
@@ -20,7 +20,7 @@
%define so_version 10
Name: %{parent}-doc
-Version: 3.8.0
+Version: 3.8.1
Release: 0
Source: %{parent}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.8.0/package/libyui.changes new/libyui-3.8.1/package/libyui.changes
--- old/libyui-3.8.0/package/libyui.changes 2019-09-19 11:58:22.000000000 +0200
+++ new/libyui-3.8.1/package/libyui.changes 2019-09-23 16:10:48.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Sep 23 12:44:47 UTC 2019 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Added CurrentItem property to new ItemSelector widget for consistency
+ (bsc#1084674)
+- 3.8.1
+
+-------------------------------------------------------------------
Thu Sep 19 09:34:27 UTC 2019 - Stefan Hundhammer <shundhammer(a)suse.com>
- Added ItemSelector widget (bsc#1084674)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.8.0/package/libyui.spec new/libyui-3.8.1/package/libyui.spec
--- old/libyui-3.8.0/package/libyui.spec 2019-09-19 11:58:22.000000000 +0200
+++ new/libyui-3.8.1/package/libyui.spec 2019-09-23 16:10:48.000000000 +0200
@@ -16,7 +16,7 @@
#
Name: libyui
-Version: 3.8.0
+Version: 3.8.1
Release: 0
Source: %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.8.0/src/YDialogHelpers.cc new/libyui-3.8.1/src/YDialogHelpers.cc
--- old/libyui-3.8.0/src/YDialogHelpers.cc 2019-09-19 11:58:22.000000000 +0200
+++ new/libyui-3.8.1/src/YDialogHelpers.cc 2019-09-23 16:10:48.000000000 +0200
@@ -167,7 +167,7 @@
for ( map<string,string>::const_iterator it = relnotes.begin(); it != relnotes.end(); ++it )
{
- keys.push_back(it->first);
+ keys.push_back( it->first );
}
YDialog * dialog = YUI::widgetFactory()->createPopupDialog();
@@ -175,23 +175,30 @@
YLayoutBox * vbox = YUI::widgetFactory()->createVBox( minSize );
YDumbTab * rnTab = 0;
YRichText * richtext = 0;
+ bool usePlainTextMode = YUI::app()->isTextMode();
- // both QT and NCurses do support DumbTab
+ // both Qt and NCurses do support DumbTab
if ( relnotes.size() > 1 && YUI::optionalWidgetFactory()->hasDumbTab() )
{
rnTab = YUI::optionalWidgetFactory()->createDumbTab( vbox );
int index = 0;
- for(map<string,string>::const_iterator it = relnotes.begin(); it != relnotes.end(); it++)
+
+ for ( map<string,string>::const_iterator it = relnotes.begin(); it != relnotes.end(); it++ )
{
- YItem * item = new YItem((*it).first );
+ YItem * item = new YItem( (*it).first );
item->setIndex( index++ );
rnTab->addItem( item );
}
- richtext = YUI::widgetFactory()->createRichText( rnTab, (*(relnotes.begin())).second, YUI::app()->isTextMode() );
+
+ richtext = YUI::widgetFactory()->createRichText( rnTab,
+ (*(relnotes.begin())).second,
+ usePlainTextMode );
}
else
{
- richtext = YUI::widgetFactory()->createRichText( vbox, (*(relnotes.begin())).second, YUI::app()->isTextMode() );
+ richtext = YUI::widgetFactory()->createRichText( vbox,
+ (*(relnotes.begin())).second,
+ usePlainTextMode );
}
YButtonBox * buttonBox = YUI::widgetFactory()->createButtonBox( vbox );
@@ -199,25 +206,25 @@
okButton->setRole( YOKButton );
okButton->setDefaultButton();
- while(true) {
- YEvent* event = dialog->waitForEvent();
- if ( event && event->eventType() == YEvent::MenuEvent && event->item())
- {
- YItem * item = dynamic_cast<YItem *> ( event->item());
- richtext->setValue( relnotes[keys[item->index()]] );
- }
- else if ( event && event->widget() )
- {
- YPushButton * button = dynamic_cast<YPushButton *> ( event->widget() );
- if ( button )
- {
- if ( button->role() == YOKButton)
- {
- break;
- }
- }
+ while ( true )
+ {
+ YEvent * event = dialog->waitForEvent();
+
+ if ( event )
+ {
+ if ( event->eventType() == YEvent::MenuEvent && event->item())
+ {
+ YItem * item = dynamic_cast<YItem *>( event->item() );
+ richtext->setValue( relnotes[ keys[ item->index() ] ] );
+ }
+ else if ( event->eventType() == YEvent::CancelEvent || // window manager "close window" button
+ event->widget() == okButton )
+ {
+ break;
+ }
}
}
+
dialog->destroy();
}
catch ( const YUIException & exception )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.8.0/src/YItemSelector.cc new/libyui-3.8.1/src/YItemSelector.cc
--- old/libyui-3.8.0/src/YItemSelector.cc 2019-09-19 11:58:22.000000000 +0200
+++ new/libyui-3.8.1/src/YItemSelector.cc 2019-09-23 16:10:48.000000000 +0200
@@ -94,12 +94,14 @@
{
/*
* @property itemID Value The (first) currently selected item
+ * @property itemID CurrentItem The (first) currently selected item
* @property itemList SelectedItems All currently selected items
* @property itemList Items All items
* @property integer VisibleItems Number of items that are visible without scrolling
* @property string IconPath Base path for icons
*/
propSet.add( YProperty( YUIProperty_Value, YOtherProperty ) );
+ propSet.add( YProperty( YUIProperty_CurrentItem, YOtherProperty ) );
propSet.add( YProperty( YUIProperty_SelectedItems, YOtherProperty ) );
propSet.add( YProperty( YUIProperty_Items, YOtherProperty ) );
propSet.add( YProperty( YUIProperty_VisibleItems, YIntegerProperty ) );
@@ -117,6 +119,7 @@
propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch
if ( propertyName == YUIProperty_Value ) return false; // Needs special handling
+ else if ( propertyName == YUIProperty_CurrentItem ) return false; // Needs special handling
else if ( propertyName == YUIProperty_SelectedItems ) return false; // Needs special handling
else if ( propertyName == YUIProperty_Items ) return false; // Needs special handling
else if ( propertyName == YUIProperty_VisibleItems ) setVisibleItems( val.integerVal() );
@@ -136,6 +139,7 @@
propertySet().check( propertyName ); // throws exceptions if not found
if ( propertyName == YUIProperty_Value ) return YPropertyValue( YOtherProperty );
+ else if ( propertyName == YUIProperty_CurrentItem ) return YPropertyValue( YOtherProperty );
else if ( propertyName == YUIProperty_SelectedItems ) return YPropertyValue( YOtherProperty );
else if ( propertyName == YUIProperty_Items ) return YPropertyValue( YOtherProperty );
else if ( propertyName == YUIProperty_VisibleItems ) return YPropertyValue( visibleItems() );
1
0
Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked in at 2019-09-30 15:50:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Mon Sep 30 15:50:17 2019 rev:144 rq:732746 version:049+git112.fe41ccd9
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2019-09-02 12:43:47.429764118 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new.2352/dracut.changes 2019-09-30 15:50:21.218660948 +0200
@@ -1,0 +2,9 @@
+Mon Sep 23 11:37:53 UTC 2019 - daniel.molkentin(a)suse.com
+
+- Update to version 049+git112.fe41ccd9:
+ * dracut: move /var/run and /var/lock from directory to symlink (bsc#1149103, ECO#323)
+ * 35network-legacy: signalize the setup in ifup when dhcp (bsc#1146661)
+ * 35network-legacy: fix typo
+ * 35network-legacy: install hostname required by ifup.sh (bsc#1146661)
+
+-------------------------------------------------------------------
Old:
----
dracut-049+git108.6c9d1156.obscpio
dracut-049+git108.6c9d1156.tar.xz
New:
----
dracut-049+git112.fe41ccd9.obscpio
dracut-049+git112.fe41ccd9.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.WSitYh/_old 2019-09-30 15:50:22.158658447 +0200
+++ /var/tmp/diff_new_pack.WSitYh/_new 2019-09-30 15:50:22.166658425 +0200
@@ -19,7 +19,7 @@
%define dracutlibdir %{_libexecdir}/dracut
Name: dracut
-Version: 049+git108.6c9d1156
+Version: 049+git112.fe41ccd9
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -176,6 +176,17 @@
%post
%service_add_post purge-kernels.service
+# check whether /var/run has been converted to a symlink
+[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
+[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
+add_dracutmodules+="convertfs"
+EOF
+#clean up after the conversion is done
+[ -L /var/run ] && sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/rd.convertfs//' /etc/default/grub || :
+[ -L /var/run ] && sed -i '/add_dracutmodules+="convertfs"/d' /etc/dracut.conf.d/05-convertfs.conf || :
+[ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || :
+[ -d /var/run.runmove~ ] && rm -rf /var/run.runmove~ || :
+[ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :
%{?regenerate_initrd_post}
%post fips
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WSitYh/_old 2019-09-30 15:50:22.214658298 +0200
+++ /var/tmp/diff_new_pack.WSitYh/_new 2019-09-30 15:50:22.214658298 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/opensuse/dracut.git</param>
- <param name="changesrevision">6c9d1156d1d2eea7147a76d75a06a676e0de8985</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">fe41ccd97a72ae7d072f463aed8477f32f86eb9e</param></service></servicedata>
\ No newline at end of file
++++++ dracut-049+git108.6c9d1156.obscpio -> dracut-049+git112.fe41ccd9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh
--- old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh 2019-09-23 13:28:06.000000000 +0200
@@ -19,6 +19,9 @@
ROOT=${ROOT%/}
done
+#mount /sysroot rw
+[ -w $ROOT ] || mount -o remount,rw $ROOT
+
if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
echo "Converting /var/run to symlink"
mv -f $ROOT/var/run $ROOT/var/run.runmove~
@@ -31,174 +34,7 @@
ln -sfn ../run/lock $ROOT/var/lock
fi
-needconvert() {
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
- if [[ -e "$dir" ]]; then
- [[ -L "$dir" ]] || return 0
- fi
- done
- return 1
-}
-
-if ! [ -e "$ROOT/usr/bin" ]; then
- echo "$ROOT/usr/bin does not exist!"
- echo "Make sure, the kernel command line has enough information"
- echo "to mount /usr (man dracut.cmdline)"
- exit 1
-fi
-
-
-if ! needconvert; then
- echo "Your system is already converted."
- exit 0
-fi
-
-testfile="$ROOT/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/usr/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-find_mount() {
- local dev mnt etc wanted_dev
- wanted_dev="$(readlink -e -q $1)"
- while read dev mnt etc || [ -n "$dev" ]; do
- [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
- done < /proc/mounts
- return 1
-}
-
-# usage: ismounted <mountpoint>
-# usage: ismounted /dev/<device>
-if command -v findmnt >/dev/null; then
- ismounted() {
- findmnt "$1" > /dev/null 2>&1
- }
-else
- ismounted() {
- if [ -b "$1" ]; then
- find_mount "$1" > /dev/null && return 0
- return 1
- fi
-
- while read a m a || [ -n "$m" ]; do
- [ "$m" = "$1" ] && return 0
- done < /proc/mounts
- return 1
- }
-fi
-
-# clean up after ourselves no matter how we die.
-cleanup() {
- echo "Something failed. Move back to the original state"
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
- "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
- "$ROOT/usr/lib64"; do
- [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
- if [[ -d "${dir}.usrmove-old" ]]; then
- mv "$dir" "${dir}.del~"
- mv "${dir}.usrmove-old" "$dir"
- rm -fr -- "${dir}.del~"
- fi
- done
-}
-
-trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
-trap 'exit 1;' SIGINT
-
-ismounted "$ROOT/usr" || CP_HARDLINK="-l"
-
-set -e
-
-# merge / and /usr in new dir in /usr
-for dir in bin sbin lib lib64; do
- rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Make a copy of \`$ROOT/usr/$dir'."
- [[ -d "$ROOT/usr/$dir" ]] \
- && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Merge the copy with \`$ROOT/$dir'."
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
- || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
- cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Clean up duplicates in \`$ROOT/usr/$dir'."
- # delete all symlinks that have been backed up
- find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
- # replace symlink with backed up binary
- find "$ROOT/usr/${dir}.usrmove-new" \
- -name '*.usrmove~' \
- -type f \
- -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
- [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
-done
-# switch over merged dirs in /usr
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
- echo "Switch to new \`$ROOT/usr/$dir'."
- rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
-done
-
-# replace dirs in / with links to /usr
-for dir in bin sbin lib lib64; do
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Create \`$ROOT/$dir' symlink."
- rm -fr -- "$ROOT/${dir}.usrmove-old" || :
- mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
- ln -sfn usr/$dir "$ROOT/$dir"
-done
-
-echo "Clean up backup files."
-# everything seems to work; cleanup
-for dir in bin sbin lib lib64; do
- # if we get killed in the middle of "rm -rf", ensure not to leave
- # an incomplete directory, which is moved back by cleanup()
- [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
- && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
- [[ -d "$ROOT/${dir}.usrmove-old" ]] \
- && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
-done
-
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
- [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
-done
-
-for dir in lib lib64; do
- [[ -d "$ROOT/$dir" ]] || continue
- for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
- [[ -f $lib ]] || continue
- mv $lib ${lib/.so/_so}
- done
-done
-
-set +e
-
-echo "Run ldconfig."
-ldconfig -r "$ROOT"
-
-. $ROOT/etc/selinux/config
-if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
- echo "Fixing SELinux labels"
- setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
-fi
+[ -w $ROOT ] && mount -o remount,ro $ROOT
echo "Done."
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -523,7 +523,7 @@
fi
# disable manual ifup while netroot is set for simplifying our logic
-# in netroot case we prefer netroot to bringup $netif automaticlly
+# in netroot case we prefer netroot to bringup $netif automatically
[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
if [ -n "$manualup" ]; then
@@ -616,6 +616,10 @@
case $autoconf in
dhcp|on|any|dhcp6)
+ > /tmp/net.$netif.did-setup
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
+ > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
;;
*)
if [ $ret -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -4,7 +4,7 @@
check() {
local _program
- require_binaries ip sed awk grep || return 1
+ require_binaries ip sed awk grep hostname || return 1
require_any_binary arping arping2 wicked || return 1
require_any_binary dhclient wicked || return 1
@@ -30,6 +30,7 @@
strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2"
inst_multiple -o wicked
inst_multiple -o ping ping6
+ inst_multiple -o hostname
inst_multiple -o teamd teamdctl teamnl
inst_simple /etc/libnl/classid
inst_script "$moddir/ifup.sh" "/sbin/ifup"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/suse/dracut.spec new/dracut-049+git112.fe41ccd9/suse/dracut.spec
--- old/dracut-049+git108.6c9d1156/suse/dracut.spec 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/suse/dracut.spec 2019-09-23 13:28:06.000000000 +0200
@@ -176,6 +176,17 @@
%post
%service_add_post purge-kernels.service
+# check whether /var/run has been converted to a symlink
+[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
+[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
+add_dracutmodules+="convertfs"
+EOF
+#clean up after the conversion is done
+[ -L /var/run ] && sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/rd.convertfs//' /etc/default/grub || :
+[ -L /var/run ] && sed -i '/add_dracutmodules+="convertfs"/d' /etc/dracut.conf.d/05-convertfs.conf || :
+[ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || :
+[ -d /var/run.runmove~ ] && rm -rf /var/run.runmove~ || :
+[ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :
%{?regenerate_initrd_post}
%post fips
++++++ dracut-049+git108.6c9d1156.tar.xz -> dracut-049+git112.fe41ccd9.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh
--- old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh 2019-09-23 13:28:06.000000000 +0200
@@ -19,6 +19,9 @@
ROOT=${ROOT%/}
done
+#mount /sysroot rw
+[ -w $ROOT ] || mount -o remount,rw $ROOT
+
if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
echo "Converting /var/run to symlink"
mv -f $ROOT/var/run $ROOT/var/run.runmove~
@@ -31,174 +34,7 @@
ln -sfn ../run/lock $ROOT/var/lock
fi
-needconvert() {
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
- if [[ -e "$dir" ]]; then
- [[ -L "$dir" ]] || return 0
- fi
- done
- return 1
-}
-
-if ! [ -e "$ROOT/usr/bin" ]; then
- echo "$ROOT/usr/bin does not exist!"
- echo "Make sure, the kernel command line has enough information"
- echo "to mount /usr (man dracut.cmdline)"
- exit 1
-fi
-
-
-if ! needconvert; then
- echo "Your system is already converted."
- exit 0
-fi
-
-testfile="$ROOT/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/usr/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-find_mount() {
- local dev mnt etc wanted_dev
- wanted_dev="$(readlink -e -q $1)"
- while read dev mnt etc || [ -n "$dev" ]; do
- [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
- done < /proc/mounts
- return 1
-}
-
-# usage: ismounted <mountpoint>
-# usage: ismounted /dev/<device>
-if command -v findmnt >/dev/null; then
- ismounted() {
- findmnt "$1" > /dev/null 2>&1
- }
-else
- ismounted() {
- if [ -b "$1" ]; then
- find_mount "$1" > /dev/null && return 0
- return 1
- fi
-
- while read a m a || [ -n "$m" ]; do
- [ "$m" = "$1" ] && return 0
- done < /proc/mounts
- return 1
- }
-fi
-
-# clean up after ourselves no matter how we die.
-cleanup() {
- echo "Something failed. Move back to the original state"
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
- "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
- "$ROOT/usr/lib64"; do
- [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
- if [[ -d "${dir}.usrmove-old" ]]; then
- mv "$dir" "${dir}.del~"
- mv "${dir}.usrmove-old" "$dir"
- rm -fr -- "${dir}.del~"
- fi
- done
-}
-
-trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
-trap 'exit 1;' SIGINT
-
-ismounted "$ROOT/usr" || CP_HARDLINK="-l"
-
-set -e
-
-# merge / and /usr in new dir in /usr
-for dir in bin sbin lib lib64; do
- rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Make a copy of \`$ROOT/usr/$dir'."
- [[ -d "$ROOT/usr/$dir" ]] \
- && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Merge the copy with \`$ROOT/$dir'."
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
- || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
- cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Clean up duplicates in \`$ROOT/usr/$dir'."
- # delete all symlinks that have been backed up
- find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
- # replace symlink with backed up binary
- find "$ROOT/usr/${dir}.usrmove-new" \
- -name '*.usrmove~' \
- -type f \
- -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
- [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
-done
-# switch over merged dirs in /usr
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
- echo "Switch to new \`$ROOT/usr/$dir'."
- rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
-done
-
-# replace dirs in / with links to /usr
-for dir in bin sbin lib lib64; do
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Create \`$ROOT/$dir' symlink."
- rm -fr -- "$ROOT/${dir}.usrmove-old" || :
- mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
- ln -sfn usr/$dir "$ROOT/$dir"
-done
-
-echo "Clean up backup files."
-# everything seems to work; cleanup
-for dir in bin sbin lib lib64; do
- # if we get killed in the middle of "rm -rf", ensure not to leave
- # an incomplete directory, which is moved back by cleanup()
- [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
- && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
- [[ -d "$ROOT/${dir}.usrmove-old" ]] \
- && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
-done
-
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
- [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
-done
-
-for dir in lib lib64; do
- [[ -d "$ROOT/$dir" ]] || continue
- for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
- [[ -f $lib ]] || continue
- mv $lib ${lib/.so/_so}
- done
-done
-
-set +e
-
-echo "Run ldconfig."
-ldconfig -r "$ROOT"
-
-. $ROOT/etc/selinux/config
-if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
- echo "Fixing SELinux labels"
- setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
-fi
+[ -w $ROOT ] && mount -o remount,ro $ROOT
echo "Done."
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -523,7 +523,7 @@
fi
# disable manual ifup while netroot is set for simplifying our logic
-# in netroot case we prefer netroot to bringup $netif automaticlly
+# in netroot case we prefer netroot to bringup $netif automatically
[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
if [ -n "$manualup" ]; then
@@ -616,6 +616,10 @@
case $autoconf in
dhcp|on|any|dhcp6)
+ > /tmp/net.$netif.did-setup
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
+ > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
;;
*)
if [ $ret -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -4,7 +4,7 @@
check() {
local _program
- require_binaries ip sed awk grep || return 1
+ require_binaries ip sed awk grep hostname || return 1
require_any_binary arping arping2 wicked || return 1
require_any_binary dhclient wicked || return 1
@@ -30,6 +30,7 @@
strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2"
inst_multiple -o wicked
inst_multiple -o ping ping6
+ inst_multiple -o hostname
inst_multiple -o teamd teamdctl teamnl
inst_simple /etc/libnl/classid
inst_script "$moddir/ifup.sh" "/sbin/ifup"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/suse/dracut.spec new/dracut-049+git112.fe41ccd9/suse/dracut.spec
--- old/dracut-049+git108.6c9d1156/suse/dracut.spec 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/suse/dracut.spec 2019-09-23 13:28:06.000000000 +0200
@@ -176,6 +176,17 @@
%post
%service_add_post purge-kernels.service
+# check whether /var/run has been converted to a symlink
+[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
+[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
+add_dracutmodules+="convertfs"
+EOF
+#clean up after the conversion is done
+[ -L /var/run ] && sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/rd.convertfs//' /etc/default/grub || :
+[ -L /var/run ] && sed -i '/add_dracutmodules+="convertfs"/d' /etc/dracut.conf.d/05-convertfs.conf || :
+[ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || :
+[ -d /var/run.runmove~ ] && rm -rf /var/run.runmove~ || :
+[ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :
%{?regenerate_initrd_post}
%post fips
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.WSitYh/_old 2019-09-30 15:50:22.578657329 +0200
+++ /var/tmp/diff_new_pack.WSitYh/_new 2019-09-30 15:50:22.578657329 +0200
@@ -1,5 +1,5 @@
name: dracut
-version: 049+git108.6c9d1156
-mtime: 1566830363
-commit: 6c9d1156d1d2eea7147a76d75a06a676e0de8985
+version: 049+git112.fe41ccd9
+mtime: 1569238086
+commit: fe41ccd97a72ae7d072f463aed8477f32f86eb9e
1
0
Hello community,
here is the log from the commit of package python-pytest for openSUSE:Factory checked in at 2019-09-30 15:50:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest (Old)
and /work/SRC/openSUSE:Factory/.python-pytest.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest"
Mon Sep 30 15:50:03 2019 rev:49 rq:732742 version:5.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest/python-pytest.changes 2019-09-23 12:03:17.189946224 +0200
+++ /work/SRC/openSUSE:Factory/.python-pytest.new.2352/python-pytest.changes 2019-09-30 15:50:07.586697227 +0200
@@ -1,0 +2,8 @@
+Mon Sep 23 12:30:16 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 5.1.3:
+ * #5807: Fix pypy3.6 (nightly) on windows.
+ * #5811: Handle --fulltrace correctly with pytest.raises.
+ * #5819: Windows: Fix regression with conftest whose qualified name contains uppercase characters
+
+-------------------------------------------------------------------
Old:
----
pytest-5.1.2.tar.gz
New:
----
pytest-5.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest.spec ++++++
--- /var/tmp/diff_new_pack.0s1WA0/_old 2019-09-30 15:50:09.430692320 +0200
+++ /var/tmp/diff_new_pack.0s1WA0/_new 2019-09-30 15:50:09.434692309 +0200
@@ -27,7 +27,7 @@
%endif
%define skip_python2 1
Name: python-pytest%{psuffix}
-Version: 5.1.2
+Version: 5.1.3
Release: 0
Summary: Python testing tool with autodiscovery and detailed asserts
License: MIT
@@ -53,12 +53,23 @@
Obsoletes: python-pytest-doc
BuildArch: noarch
%if %{with test}
+BuildRequires: %{python_module Jinja2}
+BuildRequires: %{python_module Twisted}
+BuildRequires: %{python_module decorator}
BuildRequires: %{python_module hypothesis}
BuildRequires: %{python_module importlib_metadata >= 0.12}
+BuildRequires: %{python_module mock}
+BuildRequires: %{python_module nose}
+BuildRequires: %{python_module numpy}
+BuildRequires: %{python_module pexpect}
BuildRequires: %{python_module pygments-pytest}
BuildRequires: %{python_module pytest >= %{version}}
+BuildRequires: %{python_module pytest-forked}
+BuildRequires: %{python_module pytest-xdist}
+BuildRequires: %{python_module requests}
BuildRequires: %{python_module setuptools_scm}
BuildRequires: %{python_module xmlschema}
+BuildRequires: lsof
%endif
%if %{python3_version_nodots} < 36
Requires: python-pathlib2 >= 2.2.0
++++++ pytest-5.1.2.tar.gz -> pytest-5.1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/.travis.yml new/pytest-5.1.3/.travis.yml
--- old/pytest-5.1.2/.travis.yml 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/.travis.yml 2019-09-21 15:49:40.000000000 +0200
@@ -42,9 +42,8 @@
- env: TOXENV=pypy3-xdist
python: 'pypy3'
- - env: TOXENV=py35
- dist: trusty
- python: '3.5.0'
+ - env: TOXENV=py35-xdist
+ python: '3.5'
# Coverage for:
# - pytester's LsofFdLeakChecker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/AUTHORS new/pytest-5.1.3/AUTHORS
--- old/pytest-5.1.2/AUTHORS 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/AUTHORS 2019-09-21 15:49:40.000000000 +0200
@@ -98,6 +98,7 @@
Florian Bruhin
Floris Bruynooghe
Gabriel Reis
+Gene Wood
George Kussumoto
Georgy Dyuldin
Graham Horler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/CHANGELOG.rst new/pytest-5.1.3/CHANGELOG.rst
--- old/pytest-5.1.2/CHANGELOG.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/CHANGELOG.rst 2019-09-21 15:49:40.000000000 +0200
@@ -18,6 +18,22 @@
.. towncrier release notes start
+pytest 5.1.3 (2019-09-18)
+=========================
+
+Bug Fixes
+---------
+
+- `#5807 <https://github.com/pytest-dev/pytest/issues/5807>`_: Fix pypy3.6 (nightly) on windows.
+
+
+- `#5811 <https://github.com/pytest-dev/pytest/issues/5811>`_: Handle ``--fulltrace`` correctly with ``pytest.raises``.
+
+
+- `#5819 <https://github.com/pytest-dev/pytest/issues/5819>`_: Windows: Fix regression with conftest whose qualified name contains uppercase
+ characters (introduced by #5792).
+
+
pytest 5.1.2 (2019-08-30)
=========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/PKG-INFO new/pytest-5.1.3/PKG-INFO
--- old/pytest-5.1.2/PKG-INFO 2019-08-30 21:02:53.000000000 +0200
+++ new/pytest-5.1.3/PKG-INFO 2019-09-21 15:49:57.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pytest
-Version: 5.1.2
+Version: 5.1.3
Summary: pytest: simple powerful testing with Python
Home-page: https://docs.pytest.org/en/latest/
Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/Makefile new/pytest-5.1.3/doc/en/Makefile
--- old/pytest-5.1.2/doc/en/Makefile 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/Makefile 2019-09-21 15:49:40.000000000 +0200
@@ -16,7 +16,7 @@
--normalize "/[ \t]+\n/\n/" \
--normalize "~\$$REGENDOC_TMPDIR~/home/sweet/project~" \
--normalize "~/path/to/example~/home/sweet/project~" \
- --normalize "/in \d+.\d+s ==/in 0.12s ==/" \
+ --normalize "/in \d.\d\ds/in 0.12s/" \
--normalize "@/tmp/pytest-of-.*/pytest-\d+@PYTEST_TMPDIR@" \
--normalize "@pytest-(\d+)\\.[^ ,]+@pytest-\1.x.y@" \
--normalize "@(This is pytest version )(\d+)\\.[^ ,]+@\1\2.x.y@" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/announce/index.rst new/pytest-5.1.3/doc/en/announce/index.rst
--- old/pytest-5.1.2/doc/en/announce/index.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/announce/index.rst 2019-09-21 15:49:40.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 2
+ release-5.1.3
release-5.1.2
release-5.1.1
release-5.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/announce/release-5.1.3.rst new/pytest-5.1.3/doc/en/announce/release-5.1.3.rst
--- old/pytest-5.1.2/doc/en/announce/release-5.1.3.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/pytest-5.1.3/doc/en/announce/release-5.1.3.rst 2019-09-21 15:49:40.000000000 +0200
@@ -0,0 +1,23 @@
+pytest-5.1.3
+=======================================
+
+pytest 5.1.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+ pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Christian Neumüller
+* Daniel Hahler
+* Gene Wood
+* Hugo
+
+
+Happy testing,
+The pytest Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/assert.rst new/pytest-5.1.3/doc/en/assert.rst
--- old/pytest-5.1.2/doc/en/assert.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/assert.rst 2019-09-21 15:49:40.000000000 +0200
@@ -279,7 +279,7 @@
E vals: 1 != 2
test_foocompare.py:12: AssertionError
- 1 failed in 0.02s
+ 1 failed in 0.12s
.. _assert-details:
.. _`assert introspection`:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/builtin.rst new/pytest-5.1.3/doc/en/builtin.rst
--- old/pytest-5.1.2/doc/en/builtin.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/builtin.rst 2019-09-21 15:49:40.000000000 +0200
@@ -160,7 +160,7 @@
in python < 3.6 this is a pathlib2.Path
- no tests ran in 0.00s
+ no tests ran in 0.12s
You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/cache.rst new/pytest-5.1.3/doc/en/cache.rst
--- old/pytest-5.1.2/doc/en/cache.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/cache.rst 2019-09-21 15:49:40.000000000 +0200
@@ -75,7 +75,7 @@
E Failed: bad luck
test_50.py:7: Failed
- 2 failed, 48 passed in 0.07s
+ 2 failed, 48 passed in 0.12s
If you then run it with ``--lf``:
@@ -230,7 +230,7 @@
test_caching.py:20: AssertionError
-------------------------- Captured stdout setup ---------------------------
running expensive computation...
- 1 failed in 0.02s
+ 1 failed in 0.12s
If you run it a second time, the value will be retrieved from
the cache and nothing will be printed:
@@ -249,7 +249,7 @@
E assert 42 == 23
test_caching.py:20: AssertionError
- 1 failed in 0.02s
+ 1 failed in 0.12s
See the :ref:`cache-api` for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/customize.rst new/pytest-5.1.3/doc/en/customize.rst
--- old/pytest-5.1.2/doc/en/customize.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/customize.rst 2019-09-21 15:49:40.000000000 +0200
@@ -107,8 +107,8 @@
# first look for pytest.ini files
path/pytest.ini
- path/setup.cfg # must also contain [tool:pytest] section to match
path/tox.ini # must also contain [pytest] section to match
+ path/setup.cfg # must also contain [tool:pytest] section to match
pytest.ini
... # all the way down to the root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/example/markers.rst new/pytest-5.1.3/doc/en/example/markers.rst
--- old/pytest-5.1.2/doc/en/example/markers.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/example/markers.rst 2019-09-21 15:49:40.000000000 +0200
@@ -499,7 +499,7 @@
$ pytest -q -s
Mark(name='my_marker', args=(<function hello_world at 0xdeadbeef>,), kwargs={})
.
- 1 passed in 0.01s
+ 1 passed in 0.12s
We can see that the custom marker has its argument set extended with the function ``hello_world``. This is the key difference between creating a custom marker as a callable, which invokes ``__call__`` behind the scenes, and using ``with_args``.
@@ -551,7 +551,7 @@
glob args=('class',) kwargs={'x': 2}
glob args=('module',) kwargs={'x': 1}
.
- 1 passed in 0.02s
+ 1 passed in 0.12s
marking platform specific tests with pytest
--------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/example/parametrize.rst new/pytest-5.1.3/doc/en/example/parametrize.rst
--- old/pytest-5.1.2/doc/en/example/parametrize.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/example/parametrize.rst 2019-09-21 15:49:40.000000000 +0200
@@ -54,7 +54,7 @@
$ pytest -q test_compute.py
.. [100%]
- 2 passed in 0.01s
+ 2 passed in 0.12s
We run only two computations, so we see two dots.
let's run the full monty:
@@ -73,7 +73,7 @@
E assert 4 < 4
test_compute.py:4: AssertionError
- 1 failed, 4 passed in 0.02s
+ 1 failed, 4 passed in 0.12s
As expected when running the full range of ``param1`` values
we'll get an error on the last one.
@@ -343,7 +343,7 @@
E Failed: deliberately failing for demo purposes
test_backends.py:8: Failed
- 1 failed, 1 passed in 0.02s
+ 1 failed, 1 passed in 0.12s
The first invocation with ``db == "DB1"`` passed while the second with ``db == "DB2"`` failed. Our ``db`` fixture function has instantiated each of the DB values during the setup phase while the ``pytest_generate_tests`` generated two according calls to the ``test_db_initialized`` during the collection phase.
@@ -454,7 +454,7 @@
E assert 1 == 2
test_parametrize.py:21: AssertionError
- 1 failed, 2 passed in 0.03s
+ 1 failed, 2 passed in 0.12s
Indirect parametrization with multiple fixtures
--------------------------------------------------------------
@@ -479,7 +479,7 @@
========================= short test summary info ==========================
SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.5' not found
SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.7' not found
- 3 passed, 24 skipped in 0.24s
+ 3 passed, 24 skipped in 0.12s
Indirect parametrization of optional implementations/imports
--------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/example/simple.rst new/pytest-5.1.3/doc/en/example/simple.rst
--- old/pytest-5.1.2/doc/en/example/simple.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/example/simple.rst 2019-09-21 15:49:40.000000000 +0200
@@ -65,7 +65,7 @@
test_sample.py:6: AssertionError
--------------------------- Captured stdout call ---------------------------
first
- 1 failed in 0.02s
+ 1 failed in 0.12s
And now with supplying a command line option:
@@ -89,7 +89,7 @@
test_sample.py:6: AssertionError
--------------------------- Captured stdout call ---------------------------
second
- 1 failed in 0.02s
+ 1 failed in 0.12s
You can see that the command line option arrived in our test. This
completes the basic pattern. However, one often rather wants to process
@@ -261,7 +261,7 @@
E Failed: not configured: 42
test_checkconfig.py:11: Failed
- 1 failed in 0.02s
+ 1 failed in 0.12s
If you only want to hide certain exceptions, you can set ``__tracebackhide__``
to a callable which gets the ``ExceptionInfo`` object. You can for example use
@@ -445,7 +445,7 @@
========================= slowest 3 test durations =========================
0.30s call test_some_are_slow.py::test_funcslow2
- 0.20s call test_some_are_slow.py::test_funcslow1
+ 0.21s call test_some_are_slow.py::test_funcslow1
0.10s call test_some_are_slow.py::test_funcfast
============================ 3 passed in 0.12s =============================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/example/special.rst new/pytest-5.1.3/doc/en/example/special.rst
--- old/pytest-5.1.2/doc/en/example/special.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/example/special.rst 2019-09-21 15:49:40.000000000 +0200
@@ -81,4 +81,4 @@
.test other
.test_unit1 method called
.
- 4 passed in 0.01s
+ 4 passed in 0.12s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/fixture.rst new/pytest-5.1.3/doc/en/fixture.rst
--- old/pytest-5.1.2/doc/en/fixture.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/fixture.rst 2019-09-21 15:49:40.000000000 +0200
@@ -361,7 +361,7 @@
$ pytest -s -q --tb=no
FFteardown smtp
- 2 failed in 0.79s
+ 2 failed in 0.12s
We see that the ``smtp_connection`` instance is finalized after the two
tests finished execution. Note that if we decorated our fixture
@@ -515,7 +515,7 @@
$ pytest -s -q --tb=no
FFfinalizing <smtplib.SMTP object at 0xdeadbeef> (smtp.gmail.com)
- 2 failed in 0.77s
+ 2 failed in 0.12s
Let's quickly create another test module that actually sets the
server URL in its module namespace:
@@ -692,7 +692,7 @@
test_module.py:13: AssertionError
------------------------- Captured stdout teardown -------------------------
finalizing <smtplib.SMTP object at 0xdeadbeef>
- 4 failed in 1.69s
+ 4 failed in 0.12s
We see that our two test functions each ran twice, against the different
``smtp_connection`` instances. Note also, that with the ``mail.python.org``
@@ -1043,7 +1043,7 @@
$ pytest -q
.. [100%]
- 2 passed in 0.01s
+ 2 passed in 0.12s
You can specify multiple fixtures like this:
@@ -1151,7 +1151,7 @@
$ pytest -q
.. [100%]
- 2 passed in 0.01s
+ 2 passed in 0.12s
Here is how autouse fixtures work in other scopes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/getting-started.rst new/pytest-5.1.3/doc/en/getting-started.rst
--- old/pytest-5.1.2/doc/en/getting-started.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/getting-started.rst 2019-09-21 15:49:40.000000000 +0200
@@ -108,7 +108,7 @@
$ pytest -q test_sysexit.py
. [100%]
- 1 passed in 0.01s
+ 1 passed in 0.12s
Group multiple tests in a class
--------------------------------------------------------------
@@ -145,7 +145,7 @@
E + where False = hasattr('hello', 'check')
test_class.py:8: AssertionError
- 1 failed, 1 passed in 0.02s
+ 1 failed, 1 passed in 0.12s
The first test passed and the second failed. You can easily see the intermediate values in the assertion to help you understand the reason for the failure.
@@ -180,7 +180,7 @@
test_tmpdir.py:3: AssertionError
--------------------------- Captured stdout call ---------------------------
PYTEST_TMPDIR/test_needsfiles0
- 1 failed in 0.02s
+ 1 failed in 0.12s
More info on tmpdir handling is available at :ref:`Temporary directories and files <tmpdir handling>`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/goodpractices.rst new/pytest-5.1.3/doc/en/goodpractices.rst
--- old/pytest-5.1.2/doc/en/goodpractices.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/goodpractices.rst 2019-09-21 15:49:40.000000000 +0200
@@ -88,7 +88,7 @@
.. note::
- See :ref:`pythonpath` for more information about the difference between calling ``pytest`` and
+ See :ref:`pytest vs python -m pytest` for more information about the difference between calling ``pytest`` and
``python -m pytest``.
Note that using this scheme your test files must have **unique names**, because
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/parametrize.rst new/pytest-5.1.3/doc/en/parametrize.rst
--- old/pytest-5.1.2/doc/en/parametrize.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/parametrize.rst 2019-09-21 15:49:40.000000000 +0200
@@ -205,7 +205,7 @@
$ pytest -q --stringinput="hello" --stringinput="world" test_strings.py
.. [100%]
- 2 passed in 0.01s
+ 2 passed in 0.12s
Let's also run with a stringinput that will lead to a failing test:
@@ -225,7 +225,7 @@
E + where <built-in method isalpha of str object at 0xdeadbeef> = '!'.isalpha
test_strings.py:4: AssertionError
- 1 failed in 0.02s
+ 1 failed in 0.12s
As expected our test function fails.
@@ -239,7 +239,7 @@
s [100%]
========================= short test summary info ==========================
SKIPPED [1] test_strings.py: got empty parameter set ['stringinput'], function test_valid_string at $REGENDOC_TMPDIR/test_strings.py:2
- 1 skipped in 0.00s
+ 1 skipped in 0.12s
Note that when calling ``metafunc.parametrize`` multiple times with different parameter sets, all parameter names across
those sets cannot be duplicated, otherwise an error will be raised.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/pythonpath.rst new/pytest-5.1.3/doc/en/pythonpath.rst
--- old/pytest-5.1.2/doc/en/pythonpath.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/pythonpath.rst 2019-09-21 15:49:40.000000000 +0200
@@ -72,6 +72,8 @@
This is also discussed in details in :ref:`test discovery`.
+.. _`pytest vs python -m pytest`:
+
Invoking ``pytest`` versus ``python -m pytest``
-----------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/reference.rst new/pytest-5.1.3/doc/en/reference.rst
--- old/pytest-5.1.2/doc/en/reference.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/reference.rst 2019-09-21 15:49:40.000000000 +0200
@@ -59,7 +59,7 @@
**Tutorial**: :ref:`assertraises`.
-.. autofunction:: pytest.raises(expected_exception: Exception, [match], [message])
+.. autofunction:: pytest.raises(expected_exception: Exception, [match])
:with: excinfo
pytest.deprecated_call
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/unittest.rst new/pytest-5.1.3/doc/en/unittest.rst
--- old/pytest-5.1.2/doc/en/unittest.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/unittest.rst 2019-09-21 15:49:40.000000000 +0200
@@ -219,7 +219,7 @@
$ pytest -q test_unittest_cleandir.py
. [100%]
- 1 passed in 0.01s
+ 1 passed in 0.12s
... gives us one passed test because the ``initdir`` fixture function
was executed ahead of the ``test_method``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/doc/en/warnings.rst new/pytest-5.1.3/doc/en/warnings.rst
--- old/pytest-5.1.2/doc/en/warnings.rst 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/doc/en/warnings.rst 2019-09-21 15:49:40.000000000 +0200
@@ -64,7 +64,7 @@
E UserWarning: api v1, should use functions from v2
test_show_warnings.py:5: UserWarning
- 1 failed in 0.02s
+ 1 failed in 0.12s
The same option can be set in the ``pytest.ini`` file using the ``filterwarnings`` ini option.
For example, the configuration below will ignore all user warnings, but will transform
@@ -407,7 +407,7 @@
class Test:
-- Docs: https://docs.pytest.org/en/latest/warnings.html
- 1 warnings in 0.00s
+ 1 warnings in 0.12s
These warnings might be filtered using the same builtin mechanisms used to filter other types of warnings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/_pytest/_version.py new/pytest-5.1.3/src/_pytest/_version.py
--- old/pytest-5.1.2/src/_pytest/_version.py 2019-08-30 21:02:52.000000000 +0200
+++ new/pytest-5.1.3/src/_pytest/_version.py 2019-09-21 15:49:56.000000000 +0200
@@ -1,4 +1,4 @@
# coding: utf-8
# file generated by setuptools_scm
# don't change, don't track in version control
-version = '5.1.2'
+version = '5.1.3'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/_pytest/capture.py new/pytest-5.1.3/src/_pytest/capture.py
--- old/pytest-5.1.2/src/_pytest/capture.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/src/_pytest/capture.py 2019-09-21 15:49:40.000000000 +0200
@@ -789,7 +789,11 @@
See https://github.com/pytest-dev/py/issues/103
"""
- if not sys.platform.startswith("win32") or sys.version_info[:2] < (3, 6):
+ if (
+ not sys.platform.startswith("win32")
+ or sys.version_info[:2] < (3, 6)
+ or hasattr(sys, "pypy_version_info")
+ ):
return
# bail out if ``stream`` doesn't seem like a proper ``io`` stream (#2666)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/_pytest/config/__init__.py new/pytest-5.1.3/src/_pytest/config/__init__.py
--- old/pytest-5.1.2/src/_pytest/config/__init__.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/src/_pytest/config/__init__.py 2019-09-21 15:49:40.000000000 +0200
@@ -30,7 +30,6 @@
from _pytest.compat import importlib_metadata
from _pytest.outcomes import fail
from _pytest.outcomes import Skipped
-from _pytest.pathlib import unique_path
from _pytest.warning_types import PytestConfigWarning
hookimpl = HookimplMarker("pytest")
@@ -367,7 +366,7 @@
"""
current = py.path.local()
self._confcutdir = (
- unique_path(current.join(namespace.confcutdir, abs=True))
+ current.join(namespace.confcutdir, abs=True)
if namespace.confcutdir
else None
)
@@ -406,13 +405,11 @@
else:
directory = path
- directory = unique_path(directory)
-
# XXX these days we may rather want to use config.rootdir
# and allow users to opt into looking into the rootdir parent
# directories instead of requiring to specify confcutdir
clist = []
- for parent in directory.parts():
+ for parent in directory.realpath().parts():
if self._confcutdir and self._confcutdir.relto(parent):
continue
conftestpath = parent.join("conftest.py")
@@ -432,12 +429,14 @@
raise KeyError(name)
def _importconftest(self, conftestpath):
- # Use realpath to avoid loading the same conftest twice
+ # Use a resolved Path object as key to avoid loading the same conftest twice
# with build systems that create build directories containing
# symlinks to actual files.
- conftestpath = unique_path(conftestpath)
+ # Using Path().resolve() is better than py.path.realpath because
+ # it resolves to the correct path/drive in case-insensitive file systems (#5792)
+ key = Path(str(conftestpath)).resolve()
try:
- return self._conftestpath2mod[conftestpath]
+ return self._conftestpath2mod[key]
except KeyError:
pkgpath = conftestpath.pypkgpath()
if pkgpath is None:
@@ -454,7 +453,7 @@
raise ConftestImportFailure(conftestpath, sys.exc_info())
self._conftest_plugins.add(mod)
- self._conftestpath2mod[conftestpath] = mod
+ self._conftestpath2mod[key] = mod
dirpath = conftestpath.dirpath()
if dirpath in self._dirpath2confmods:
for path, mods in self._dirpath2confmods.items():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/_pytest/nodes.py new/pytest-5.1.3/src/_pytest/nodes.py
--- old/pytest-5.1.2/src/_pytest/nodes.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/src/_pytest/nodes.py 2019-09-21 15:49:40.000000000 +0200
@@ -245,7 +245,6 @@
fm = self.session._fixturemanager
if excinfo.errisinstance(fm.FixtureLookupError):
return excinfo.value.formatrepr()
- tbfilter = True
if self.config.getoption("fulltrace", False):
style = "long"
else:
@@ -253,7 +252,6 @@
self._prunetraceback(excinfo)
if len(excinfo.traceback) == 0:
excinfo.traceback = tb
- tbfilter = False # prunetraceback already does it
if style == "auto":
style = "long"
# XXX should excinfo.getrepr record all data and toterminal() process it?
@@ -279,7 +277,7 @@
abspath=abspath,
showlocals=self.config.getoption("showlocals", False),
style=style,
- tbfilter=tbfilter,
+ tbfilter=False, # pruned already, or in --fulltrace mode.
truncate_locals=truncate_locals,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/_pytest/pathlib.py new/pytest-5.1.3/src/_pytest/pathlib.py
--- old/pytest-5.1.2/src/_pytest/pathlib.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/src/_pytest/pathlib.py 2019-09-21 15:49:40.000000000 +0200
@@ -11,7 +11,6 @@
from os.path import expanduser
from os.path import expandvars
from os.path import isabs
-from os.path import normcase
from os.path import sep
from posixpath import sep as posix_sep
@@ -335,12 +334,3 @@
def parts(s):
parts = s.split(sep)
return {sep.join(parts[: i + 1]) or sep for i in range(len(parts))}
-
-
-def unique_path(path):
- """Returns a unique path in case-insensitive (but case-preserving) file
- systems such as Windows.
-
- This is needed only for ``py.path.local``; ``pathlib.Path`` handles this
- natively with ``resolve()``."""
- return type(path)(normcase(str(path.realpath())))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/pytest.egg-info/PKG-INFO new/pytest-5.1.3/src/pytest.egg-info/PKG-INFO
--- old/pytest-5.1.2/src/pytest.egg-info/PKG-INFO 2019-08-30 21:02:52.000000000 +0200
+++ new/pytest-5.1.3/src/pytest.egg-info/PKG-INFO 2019-09-21 15:49:57.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pytest
-Version: 5.1.2
+Version: 5.1.3
Summary: pytest: simple powerful testing with Python
Home-page: https://docs.pytest.org/en/latest/
Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/src/pytest.egg-info/SOURCES.txt new/pytest-5.1.3/src/pytest.egg-info/SOURCES.txt
--- old/pytest-5.1.2/src/pytest.egg-info/SOURCES.txt 2019-08-30 21:02:52.000000000 +0200
+++ new/pytest-5.1.3/src/pytest.egg-info/SOURCES.txt 2019-09-21 15:49:57.000000000 +0200
@@ -208,6 +208,7 @@
doc/en/announce/release-5.1.0.rst
doc/en/announce/release-5.1.1.rst
doc/en/announce/release-5.1.2.rst
+doc/en/announce/release-5.1.3.rst
doc/en/announce/sprint2016.rst
doc/en/example/attic.rst
doc/en/example/conftest.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/testing/code/test_excinfo.py new/pytest-5.1.3/testing/code/test_excinfo.py
--- old/pytest-5.1.2/testing/code/test_excinfo.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/testing/code/test_excinfo.py 2019-09-21 15:49:40.000000000 +0200
@@ -399,6 +399,13 @@
result = testdir.runpytest()
assert result.ret != 0
result.stdout.fnmatch_lines(["*AssertionError*Pattern*[123]*not found*"])
+ assert "__tracebackhide__ = True" not in result.stdout.str()
+
+ result = testdir.runpytest("--fulltrace")
+ assert result.ret != 0
+ result.stdout.fnmatch_lines(
+ ["*__tracebackhide__ = True*", "*AssertionError*Pattern*[123]*not found*"]
+ )
class TestFormattedExcinfo:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/testing/test_conftest.py new/pytest-5.1.3/testing/test_conftest.py
--- old/pytest-5.1.2/testing/test_conftest.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/testing/test_conftest.py 2019-09-21 15:49:40.000000000 +0200
@@ -1,12 +1,12 @@
-import os.path
+import os
import textwrap
+from pathlib import Path
import py
import pytest
from _pytest.config import PytestPluginManager
from _pytest.main import ExitCode
-from _pytest.pathlib import unique_path
def ConftestWithSetinitial(path):
@@ -143,11 +143,11 @@
# but we can still import a conftest directly
conftest._importconftest(conf)
values = conftest._getconftestmodules(conf.dirpath())
- assert values[0].__file__.startswith(str(unique_path(conf)))
+ assert values[0].__file__.startswith(str(conf))
# and all sub paths get updated properly
values = conftest._getconftestmodules(p)
assert len(values) == 1
- assert values[0].__file__.startswith(str(unique_path(conf)))
+ assert values[0].__file__.startswith(str(conf))
def test_conftestcutdir_inplace_considered(testdir):
@@ -156,7 +156,7 @@
conftest_setinitial(conftest, [conf.dirpath()], confcutdir=conf.dirpath())
values = conftest._getconftestmodules(conf.dirpath())
assert len(values) == 1
- assert values[0].__file__.startswith(str(unique_path(conf)))
+ assert values[0].__file__.startswith(str(conf))
@pytest.mark.parametrize("name", "test tests whatever .dotdir".split())
@@ -165,11 +165,12 @@
subconftest = sub.ensure("conftest.py")
conftest = PytestPluginManager()
conftest_setinitial(conftest, [sub.dirpath()], confcutdir=testdir.tmpdir)
+ key = Path(str(subconftest)).resolve()
if name not in ("whatever", ".dotdir"):
- assert unique_path(subconftest) in conftest._conftestpath2mod
+ assert key in conftest._conftestpath2mod
assert len(conftest._conftestpath2mod) == 1
else:
- assert subconftest not in conftest._conftestpath2mod
+ assert key not in conftest._conftestpath2mod
assert len(conftest._conftestpath2mod) == 0
@@ -282,7 +283,7 @@
reason="only relevant for case insensitive file systems",
)
def test_conftest_badcase(testdir):
- """Check conftest.py loading when directory casing is wrong."""
+ """Check conftest.py loading when directory casing is wrong (#5792)."""
testdir.tmpdir.mkdir("JenkinsRoot").mkdir("test")
source = {"setup.py": "", "test/__init__.py": "", "test/conftest.py": ""}
testdir.makepyfile(**{"JenkinsRoot/%s" % k: v for k, v in source.items()})
@@ -291,6 +292,16 @@
result = testdir.runpytest()
assert result.ret == ExitCode.NO_TESTS_COLLECTED
+
+def test_conftest_uppercase(testdir):
+ """Check conftest.py whose qualified name contains uppercase characters (#5819)"""
+ source = {"__init__.py": "", "Foo/conftest.py": "", "Foo/__init__.py": ""}
+ testdir.makepyfile(**source)
+
+ testdir.tmpdir.chdir()
+ result = testdir.runpytest()
+ assert result.ret == ExitCode.NO_TESTS_COLLECTED
+
def test_no_conftest(testdir):
testdir.makeconftest("assert 0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-5.1.2/testing/test_pdb.py new/pytest-5.1.3/testing/test_pdb.py
--- old/pytest-5.1.2/testing/test_pdb.py 2019-08-30 21:02:33.000000000 +0200
+++ new/pytest-5.1.3/testing/test_pdb.py 2019-09-21 15:49:40.000000000 +0200
@@ -853,7 +853,7 @@
Test that supports breakpoint global marks on Python 3.7+ and not on
CPython 3.5, 2.7
"""
- if sys.version_info.major == 3 and sys.version_info.minor >= 7:
+ if sys.version_info >= (3, 7):
assert SUPPORTS_BREAKPOINT_BUILTIN is True
if sys.version_info.major == 3 and sys.version_info.minor == 5:
assert SUPPORTS_BREAKPOINT_BUILTIN is False
1
0
Hello community,
here is the log from the commit of package perl-DBI for openSUSE:Factory checked in at 2019-09-30 15:49:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-DBI (Old)
and /work/SRC/openSUSE:Factory/.perl-DBI.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-DBI"
Mon Sep 30 15:49:37 2019 rev:48 rq:732740 version:1.642
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-DBI/perl-DBI.changes 2018-11-13 16:26:04.182625213 +0100
+++ /work/SRC/openSUSE:Factory/.perl-DBI.new.2352/perl-DBI.changes 2019-09-30 15:49:48.762747323 +0200
@@ -1,0 +2,5 @@
+Mon Sep 23 11:12:59 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com>
+
+- Fix invalid utf-8 encoding in Changelogtext
+
+-------------------------------------------------------------------
@@ -196 +201 @@
- [Dagfinn Ilmari Manns�ker]
+ [Dagfinn Ilmari]
@@ -232 +237 @@
- Fixed use of \Q vs in t/70callbacks.t
+ Fixed use of \Q vs \E in t/70callbacks.t
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-DBI.spec ++++++
--- /var/tmp/diff_new_pack.OpJMsW/_old 2019-09-30 15:49:52.734736752 +0200
+++ /var/tmp/diff_new_pack.OpJMsW/_new 2019-09-30 15:49:52.738736741 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-DBI
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,6 @@
Source0: https://cpan.metacpan.org/authors/id/T/TI/TIMB/%{cpan_name}-%{version}.tar.…
Source1: perl-DBI.rpmlintrc
Source2: cpanspec.yml
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(Test::Simple) >= 0.90
@@ -56,10 +55,10 @@
%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
%check
-%{__make} test
+make test
%install
%perl_make_install
1
0
Hello community,
here is the log from the commit of package build for openSUSE:Factory checked in at 2019-09-30 15:49:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Mon Sep 30 15:49:25 2019 rev:125 rq:732735 version:20190923
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2019-07-21 11:29:39.524824795 +0200
+++ /work/SRC/openSUSE:Factory/.build.new.2352/build.changes 2019-09-30 15:49:29.550798451 +0200
@@ -1,0 +2,11 @@
+Mon Sep 23 11:57:05 UTC 2019 - Adrian Schröter <adrian(a)suse.de>
+
+- build-recipe-dsc: Move all build results, not just *.deb and *.changes
+- Mount /sys in chroot build
+- vc: Do not open the editor if content is set
+- adding leap 15.2 and SLE 15 SP2 configs
+- Fix some rpmlint warnings
+- return exit status 9 in the genbuildreqs case
+- Export SYSTEMD_OFFLINE=1 to avoid failures from systemctl
+
+-------------------------------------------------------------------
Old:
----
obs-build-20190709.tar.gz
New:
----
obs-build-20190923.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.Mbw1SI/_old 2019-09-30 15:49:31.906792181 +0200
+++ /var/tmp/diff_new_pack.Mbw1SI/_new 2019-09-30 15:49:31.910792170 +0200
@@ -22,7 +22,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0-only OR GPL-3.0-only
Group: Development/Tools/Building
-Version: 20190709
+Version: 20190923
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.Mbw1SI/_old 2019-09-30 15:49:31.938792096 +0200
+++ /var/tmp/diff_new_pack.Mbw1SI/_new 2019-09-30 15:49:31.942792085 +0200
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20190709
+pkgver=20190923
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.Mbw1SI/_old 2019-09-30 15:49:31.966792021 +0200
+++ /var/tmp/diff_new_pack.Mbw1SI/_new 2019-09-30 15:49:31.970792011 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20190709
+Version: 20190923
Binary: build
Maintainer: Adrian Schroeter <adrian(a)suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.Mbw1SI/_old 2019-09-30 15:49:31.986791968 +0200
+++ /var/tmp/diff_new_pack.Mbw1SI/_new 2019-09-30 15:49:31.990791957 +0200
@@ -1,4 +1,4 @@
-build (20190709) unstable; urgency=low
+build (20190923) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20190709.tar.gz -> obs-build-20190923.tar.gz ++++++
++++ 2496 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package less for openSUSE:Factory checked in at 2019-09-30 15:49:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/less (Old)
and /work/SRC/openSUSE:Factory/.less.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "less"
Mon Sep 30 15:49:14 2019 rev:55 rq:732670 version:551
Changes:
--------
--- /work/SRC/openSUSE:Factory/less/less.changes 2018-05-06 14:55:59.213095356 +0200
+++ /work/SRC/openSUSE:Factory/.less.new.2352/less.changes 2019-09-30 15:49:21.142820833 +0200
@@ -1,0 +2,18 @@
+Sat Sep 21 18:59:37 UTC 2019 - Andreas Stieger <andreas.stieger(a)gmx.de>
+
+- less 551:
+ * Add --mouse option
+ * Add --wheel-lines option
+ * Add --no-histdups option
+ * Add --save-marks option
+ * Support PCRE2 regular expression library
+ * Redraw screen on SIGWINCH even if screen size doesn't change
+ * Shell-escape filenames in history so they can be used again
+ * Ring bell if user enters invalid long option name
+ * Use PCRE_UTF8 flag for pcre regular expressions when in UTF-8 mode
+ * Don't count lines in initial screen if using -X with -F
+ * Fix bug in v command on empty file
+ * Fix bug in v command when filename contains shell metacharacters
+- refresh less-429-shell.patch
+
+-------------------------------------------------------------------
Old:
----
less-530.sig
less-530.tar.gz
New:
----
less-551.sig
less-551.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ less.spec ++++++
--- /var/tmp/diff_new_pack.eJLnll/_old 2019-09-30 15:49:21.706819332 +0200
+++ /var/tmp/diff_new_pack.eJLnll/_new 2019-09-30 15:49:21.706819332 +0200
@@ -1,7 +1,7 @@
#
# spec file for package less
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,17 @@
# 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/
#
Name: less
-Version: 530
+Version: 551
Release: 0
Summary: Text File Browser and Pager Similar to more
License: GPL-3.0-or-later OR BSD-2-Clause
Group: Productivity/Text/Utilities
-Url: http://www.greenwoodsoftware.com/less/
+URL: http://www.greenwoodsoftware.com/less/
Source: http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz
Source1: README.SUSE
Source2: lessopen.sh
@@ -35,8 +35,8 @@
Patch2: less-429-more.patch
BuildRequires: automake
BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
Requires: file
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
less is a text file browser and pager similar to more. It allows
@@ -81,7 +81,6 @@
chmod -x LICENSE COPYING NEWS README.SUSE
%files
-%defattr(-, root, root)
%license LICENSE COPYING
%doc NEWS README.SUSE
%{_mandir}/*/*
++++++ less-429-shell.patch ++++++
--- /var/tmp/diff_new_pack.eJLnll/_old 2019-09-30 15:49:21.746819225 +0200
+++ /var/tmp/diff_new_pack.eJLnll/_new 2019-09-30 15:49:21.746819225 +0200
@@ -2,20 +2,20 @@
===================================================================
--- filename.c.orig
+++ filename.c
-@@ -585,7 +585,7 @@ shellcmd(cmd)
+@@ -574,7 +574,7 @@ shellcmd(cmd)
#if HAVE_SHELL
char *shell;
- shell = lgetenv("SHELL");
+ shell = lgetenv("LESSSHELL");
- if (shell != NULL && *shell != '\0')
+ if (!isnullenv(shell))
{
char *scmd;
Index: less.hlp
===================================================================
--- less.hlp.orig
+++ less.hlp
-@@ -99,7 +99,7 @@
+@@ -101,7 +101,7 @@
___<_n_a_m_e_> Display the setting of an option, by name.
+_c_m_d Execute the less cmd each time a new file is examined.
@@ -28,7 +28,7 @@
===================================================================
--- less.nro.orig
+++ less.nro
-@@ -411,7 +411,7 @@ current file.
+@@ -419,7 +419,7 @@ current file.
A pound sign (#) is replaced by the name of the previously examined file.
"!!" repeats the last shell command.
"!" with no shell command simply invokes a shell.
@@ -37,7 +37,7 @@
or defaults to "sh".
On MS-DOS and OS/2 systems, the shell is the normal command processor.
.IP "| <m> shell-command"
-@@ -1732,7 +1732,7 @@ compatible mode.
+@@ -1790,7 +1790,7 @@ compatible mode.
.IP PATH
User's search path (used to find a lesskey file
on MS-DOS and OS/2 systems).
@@ -50,7 +50,7 @@
===================================================================
--- lsystem.c.orig
+++ lsystem.c
-@@ -128,7 +128,7 @@ lsystem(cmd, donemsg)
+@@ -133,7 +133,7 @@ lsystem(cmd, donemsg)
*/
#if HAVE_SHELL
p = NULL;
++++++ less-530.tar.gz -> less-551.tar.gz ++++++
++++ 5993 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package guile for openSUSE:Factory checked in at 2019-09-30 15:49:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/guile (Old)
and /work/SRC/openSUSE:Factory/.guile.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile"
Mon Sep 30 15:49:04 2019 rev:59 rq:732646 version:2.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/guile/guile.changes 2019-07-22 12:15:18.659745724 +0200
+++ /work/SRC/openSUSE:Factory/.guile.new.2352/guile.changes 2019-09-30 15:49:08.158855396 +0200
@@ -1,0 +2,5 @@
+Mon Sep 23 09:17:47 UTC 2019 - Bernhard Wiedemann <bwiedemann(a)suse.com>
+
+- Do sequential build for reproducible .go files (boo#1102408)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guile.spec ++++++
--- /var/tmp/diff_new_pack.NKAfOe/_old 2019-09-30 15:49:08.946853299 +0200
+++ /var/tmp/diff_new_pack.NKAfOe/_new 2019-09-30 15:49:08.950853288 +0200
@@ -112,7 +112,8 @@
--with-pic \
--with-threads \
--disable-silent-rules
-make %{?_smp_mflags}
+# do sequential build for reproducible .go files = https://issues.guix.gnu.org/issue/20272 - boo#1102408
+make
%check
LD_LIBRARY_PATH="." make %{?_smp_mflags} check
1
0
Hello community,
here is the log from the commit of package coredns for openSUSE:Factory checked in at 2019-09-30 15:48:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/coredns (Old)
and /work/SRC/openSUSE:Factory/.coredns.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coredns"
Mon Sep 30 15:48:51 2019 rev:6 rq:732642 version:1.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/coredns/coredns.changes 2019-09-19 15:46:41.963343849 +0200
+++ /work/SRC/openSUSE:Factory/.coredns.new.2352/coredns.changes 2019-09-30 15:48:55.866888117 +0200
@@ -6,0 +7,56 @@
+Mon Sep 2 10:19:48 UTC 2019 - Marco Vedovati <mvedovati(a)suse.com>
+
+- Update to version 1.6.3:
+ * Spelling corrections and other minor improvements and polish.
+ * Two new plugins: clouddns and sign.
+
+- Changed included from version 1.6.1:
+ * Fix a panic in the hosts plugin.
+ * The reload now detects changes in files imported from the main Corefile.
+ * route53 increases the paging size when talking to the AWS API, this
+ decreases the chances of getting throttled.
+
+- Changed included from version 1.6.0:
+ * The -cpu flag is removed from this version.
+ * This release sports changes in the file plugin.
+ A speed up in the log plugin and fixes in the cache and hosts plugins.
+ * Upcoming deprecation: the kubernetes federation plugin will be moved to
+ github.com/coredns/federation. This is likely to happen in CoreDNS 1.7.0.
+
+- Changed included from version 1.5.2:
+ * Small bugfixes and a change to Caddy’s import path
+ (mholt/caddy -> caddyserver/caddy).
+ * Doing a release helps plugins deal with the change better.
+
+- Changed included from version 1.5.1:
+ * Various bugfixes, better documentation and cleanups.
+ * The -cpu flag is somewhat redundant (cgroups/systemd/GOMAXPROCS are better
+ ways to deal with this) and we want to remove it; if you depend on it in
+ some way please voice that in this PR otherwise we’ll remove it in the next
+ release.
+
+- Changed included from version 1.5.0:
+ * Two new plugins in this release: grpc, and ready. And some polish and
+ simplifications in the core server code.
+ * The use of TIMEOUT and no_reload in file and auto have been fully deprecated.
+ As is the proxy plugin.
+ * And a update on two important and active bugs:
+ - 2593 seems to hone in on Docker and/or the container environment being a
+ contributing factor.
+ - 2624 is because of TLS session negotiating in the forward plugin.
+
+- Changed included from version 1.4.0:
+ * Our first release after we became a graduated project in CNCF.
+ * Deprecation notice for the next release:
+ - auto will deprecate TIMEOUT and recommends the use of RELOAD (2516).
+ - auto and file will deprecate NO_RELOAD and recommends the use of RELOAD
+ set to 0 (2536).
+ - health will revert back to report process level health without plugin status.
+ A new ready plugin will make sure plugins have at least completed their
+ startup sequence.
+ - The proxy will be moved to an external repository and as such be
+ deprecated from the default set of plugin; use the forward as a replacement.
+ - The previous announced deprecations have been enacted.
+ - The (unused) gRPC watch functionally was removed from the server.
+
+-------------------------------------------------------------------
Old:
----
beorn7-perks.tar.xz
coredns-1.3.1.tar.xz
golang-protobuf.tar.xz
matttproud-golang_protobuf_extensions.tar.xz
mholt-caddy.tar.xz
miekg-dns.tar.xz
prometheus-client_golang.tar.xz
prometheus-client_model.tar.xz
prometheus-common.tar.xz
prometheus-procfs.tar.xz
New:
----
coredns-1.6.3.tar.xz
vendor.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ coredns.spec ++++++
--- /var/tmp/diff_new_pack.0VTyYD/_old 2019-09-30 15:48:58.918879993 +0200
+++ /var/tmp/diff_new_pack.0VTyYD/_new 2019-09-30 15:48:58.918879993 +0200
@@ -18,7 +18,7 @@
%define project github.com/coredns/coredns
Name: coredns
-Version: 1.3.1
+Version: 1.6.3
Release: 0
Summary: DNS server written in Go
License: Apache-2.0
@@ -26,15 +26,7 @@
URL: https://coredns.io
Provides: dns_daemon
Source0: %{name}-%{version}.tar.xz
-Source1: golang-protobuf.tar.xz
-Source2: matttproud-golang_protobuf_extensions.tar.xz
-Source3: mholt-caddy.tar.xz
-Source4: miekg-dns.tar.xz
-Source5: prometheus-client_golang.tar.xz
-Source6: prometheus-client_model.tar.xz
-Source7: prometheus-common.tar.xz
-Source8: prometheus-procfs.tar.xz
-Source9: beorn7-perks.tar.xz
+Source1: vendor.tar.xz
Source10: Corefile
Source11: coredns.service
BuildRequires: fdupes
@@ -60,7 +52,7 @@
non-containerized environment (man pages, configuration, unit file).
%prep
-%setup -q -b1 -b2 -b3 -b4 -b5 -b6 -b7 -b8 -b9
+%setup -q -a1
%build
@@ -69,34 +61,11 @@
export GOPATH=$HOME/go
export PATH=$PATH:$GOPATH/bin
rm -rf $HOME/go/src
-
-declare -A sources2Path=( \
-[%{SOURCE0}]=%{project} \
-[%{SOURCE1}]=github.com/golang/protobuf \
-[%{SOURCE2}]=github.com/matttproud/golang_protobuf_extensions \
-[%{SOURCE3}]=github.com/mholt/caddy \
-[%{SOURCE4}]=github.com/miekg/dns \
-[%{SOURCE5}]=github.com/prometheus/client_golang \
-[%{SOURCE6}]=github.com/prometheus/client_model \
-[%{SOURCE7}]=github.com/prometheus/common \
-[%{SOURCE8}]=github.com/prometheus/procfs \
-[%{SOURCE9}]=github.com/beorn7/perks \
-)
-for s in "${!sources2Path[@]}"; do
- dest="$HOME/go/src/${sources2Path[$s]}"
- mkdir -pv "$dest"
- dir=$(basename "$s")
- dir=${dir%.tar.xz}
- cp -a "%{_builddir}/$dir"/* "$dest"
-done
-
-# code.google.com redirects to github.com/golang/protobuf, but code is still
-# referencing to the code.google.com package
-mkdir -pv $HOME/go/src/code.google.com/p
-ln -s $HOME/go/src/github.com/golang/protobuf $HOME/go/src/code.google.com/p/goprotobuf
+mkdir -pv $HOME/go/src/%{project}
+find . -mindepth 1 -maxdepth 1 -exec cp -r {} $HOME/go/src/%{project} \;
cd $HOME/go/src/%{project}
-make %{?_smp_mflags} coredns CHECKS= BUILDOPTS="-v -buildmode=pie"
+go build -v -buildmode=pie -o coredns
%check
# Too many tests fail due to the restricted permissions in the build enviroment.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.0VTyYD/_old 2019-09-30 15:48:58.950879908 +0200
+++ /var/tmp/diff_new_pack.0VTyYD/_new 2019-09-30 15:48:58.954879897 +0200
@@ -1,90 +1,22 @@
<services>
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/coredns/coredns</param>
-<param name="scm">git</param>
-<param name="filename">coredns</param>
-<param name="versionformat">1.3.1</param>
-<param name="revision">v1.3.1</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/mholt/caddy</param>
-<param name="scm">git</param>
-<param name="filename">mholt-caddy</param>
-<param name="versionformat"></param>
-<param name="revision">v0.11.1</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/miekg/dns</param>
-<param name="scm">git</param>
-<param name="filename">miekg-dns</param>
-<param name="versionformat"></param>
-<param name="revision">v1.1.3</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/prometheus/client_golang</param>
-<param name="scm">git</param>
-<param name="filename">prometheus-client_golang</param>
-<param name="versionformat"></param>
-<param name="revision">v0.9.1</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/beorn7/perks</param>
-<param name="scm">git</param>
-<param name="filename">beorn7-perks</param>
-<param name="versionformat"></param>
-<param name="revision">3a771d9</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/golang/protobuf</param>
-<param name="scm">git</param>
-<param name="filename">golang-protobuf</param>
-<param name="versionformat"></param>
-<param name="revision">v1.1.0</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/prometheus/procfs</param>
-<param name="scm">git</param>
-<param name="filename">prometheus-procfs</param>
-<param name="versionformat"></param>
-<param name="revision">1dc9a6c</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/prometheus/common</param>
-<param name="scm">git</param>
-<param name="filename">prometheus-common</param>
-<param name="versionformat"></param>
-<param name="revision">7600349</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/prometheus/client_model</param>
-<param name="scm">git</param>
-<param name="filename">prometheus-client_model</param>
-<param name="versionformat"></param>
-<param name="revision">99fa1f4</param>
-</service>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/matttproud/golang_protobuf_extensions</param>
-<param name="scm">git</param>
-<param name="filename">matttproud-golang_protobuf_extensions</param>
-<param name="versionformat"></param>
-<param name="revision">v1.0.1</param>
-</service>
-
-<service name="set_version" mode="disabled">
-<param name="basename">coredns</param>
-</service>
-
-<service name="recompress" mode="disabled">
-<param name="file">*.tar</param>
-<param name="compression">xz</param>
-</service>
+ <service name="tar_scm" mode="disabled">
+ <param name="url">https://github.com/coredns/coredns</param>
+ <param name="scm">git</param>
+ <param name="filename">coredns</param>
+ <param name="versionformat">1.6.3</param>
+ <param name="revision">v1.6.3</param>
+ </service>
+
+ <service name="set_version" mode="disabled">
+ <param name="basename">coredns</param>
+ </service>
+
+ <service name="recompress" mode="disabled">
+ <param name="file">*.tar</param>
+ <param name="compression">xz</param>
+ </service>
+
+ <service name="go_modules" mode="disabled">
+ <param name="compression">xz</param>
+ </service>
</services>
++++++ coredns-1.3.1.tar.xz -> coredns-1.6.3.tar.xz ++++++
++++ 945602 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2019-09-30 15:48:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old)
and /work/SRC/openSUSE:Factory/.ImageMagick.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick"
Mon Sep 30 15:48:44 2019 rev:187 rq:732627 version:7.0.8.66
Changes:
--------
--- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2019-09-07 12:32:44.977678079 +0200
+++ /work/SRC/openSUSE:Factory/.ImageMagick.new.2352/ImageMagick.changes 2019-09-30 15:48:50.154903323 +0200
@@ -1,0 +2,14 @@
+Mon Sep 23 08:05:14 UTC 2019 - pgajdos(a)suse.com
+
+- version update to 7.0.8.66
+ * Support compound statements in FX while() (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1701).
+ * Eliminate fault when trace delegate is not available.
+ * Properly distinquish linear and non-linear gray colorspaces (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1680).
+ * Support XPM symbolic (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1684).
+ * DilateIntensity is channel independent (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36641).
+
+-------------------------------------------------------------------
Old:
----
ImageMagick-7.0.8-63.tar.bz2
ImageMagick-7.0.8-63.tar.bz2.asc
New:
----
ImageMagick-7.0.8-66.tar.bz2
ImageMagick-7.0.8-66.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ImageMagick.spec ++++++
--- /var/tmp/diff_new_pack.K7mGC1/_old 2019-09-30 15:48:51.390900033 +0200
+++ /var/tmp/diff_new_pack.K7mGC1/_new 2019-09-30 15:48:51.390900033 +0200
@@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.0.8
-%define mfr_revision 63
+%define mfr_revision 66
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 6
++++++ ImageMagick-7.0.8-63.tar.bz2 -> ImageMagick-7.0.8-66.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-7.0.8-63.tar.bz2 /work/SRC/openSUSE:Factory/.ImageMagick.new.2352/ImageMagick-7.0.8-66.tar.bz2 differ: char 11, line 1
1
0