openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2015
- 1 participants
- 1349 discussions
31 Aug '15
Hello community,
here is the log from the commit of package golang-org-x-text.3912 for openSUSE:13.2:Update checked in at 2015-08-31 15:09:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/golang-org-x-text.3912 (Old)
and /work/SRC/openSUSE:13.2:Update/.golang-org-x-text.3912.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-org-x-text.3912"
Changes:
--------
New Changes file:
--- /dev/null 2015-08-24 19:43:32.284261900 +0200
+++ /work/SRC/openSUSE:13.2:Update/.golang-org-x-text.3912.new/golang-org-x-text.changes 2015-08-31 15:09:03.000000000 +0200
@@ -0,0 +1,17 @@
+-------------------------------------------------------------------
+Tue Jul 7 15:43:08 UTC 2015 - i(a)marguerite.su
+
+- rename golang-org-x-text
+- update version 1.4.2+git20150710.7c0e16d
+- use golang-packaging for packaging
+
+-------------------------------------------------------------------
+Sat Mar 21 06:39:16 UTC 2015 - i(a)marguerite.su
+
+- add xz as BuildRequires
+
+-------------------------------------------------------------------
+Sun Mar 8 05:25:30 UTC 2015 - i(a)marguerite.su
+
+- initial version 1.4.2+git20150306.f3f2426
+
New:
----
_service
golang-org-x-text.changes
golang-org-x-text.spec
text-1.4.2+git20150710.7c0e16d.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-org-x-text.spec ++++++
#
# spec file for package golang-org-x-text
#
# Copyright (c) 2015 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: golang-org-x-text
Version: 1.4.2+git20150710.7c0e16d
Release: 0
Summary: Go text processing support
License: BSD-3-Clause
Group: Development/Languages/Other
Url: https://github.com/golang/text
Source: text-%{version}.tar.xz
BuildRequires: golang-packaging
BuildRequires: xz
Provides: go-text = %{version}
Obsoletes: go-text < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{go_provides}
%description
This repository holds supplementary Go libraries for text processing,
many involving Unicode.
%gosrc_package
%prep
%setup -q -n text-%{version}
%build
%goprep golang.org/x/text
%gobuild ...
%install
%goinstall
%gosrc
%files
%defattr(-,root,root)
%doc LICENSE
%{_bindir}/colcmp
%{go_contribdir}/*
%files source
%defattr(-,root,root)
%{go_contribsrcdir}/*
%changelog
++++++ _service ++++++
<services>
<service name="tar_scm" mode="localonly">
<param name="url">https://github.com/golang/text/</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">1.4.2+git%cd.%h</param>
<param name="revision">master</param>
</service>
<service name="recompress" mode="localonly">
<param name="file">text-*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="localonly">
<param name="basename">text</param>
</service>
</services>
1
0
Hello community,
here is the log from the commit of package golang-org-x-net.3912 for openSUSE:13.2:Update checked in at 2015-08-31 15:09:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/golang-org-x-net.3912 (Old)
and /work/SRC/openSUSE:13.2:Update/.golang-org-x-net.3912.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-org-x-net.3912"
Changes:
--------
New Changes file:
--- /dev/null 2015-08-24 19:43:32.284261900 +0200
+++ /work/SRC/openSUSE:13.2:Update/.golang-org-x-net.3912.new/golang-org-x-net.changes 2015-08-31 15:09:01.000000000 +0200
@@ -0,0 +1,119 @@
+-------------------------------------------------------------------
+Tue Jul 7 15:40:40 UTC 2015 - i(a)marguerite.su
+
+- rename to golang-org-x-net
+- update version 1.4.2+git20150629.d9558e5
+- use golang-packaging for packaging
+
+-------------------------------------------------------------------
+Sat Mar 21 08:09:41 UTC 2015 - i(a)marguerite.su
+
+- add xz as BuildRequires
+
+-------------------------------------------------------------------
+Sun Mar 8 05:11:11 UTC 2015 - i(a)marguerite.su
+
+- update version 1.4.2+git20150304.6dc0abc
+- package name changed: go-net
+
+-------------------------------------------------------------------
+Fri Oct 18 13:07:54 UTC 2013 - speilicke(a)suse.com
+
+- Set version to 1.2rc2 after go update
+
+-------------------------------------------------------------------
+Fri Oct 18 12:17:45 UTC 2013 - speilicke(a)suse.com
+
+- Update to version 1.1.2+hg20131014.85.355ff0aa1b2e:
+ + No changelog
+
+-------------------------------------------------------------------
+Fri Oct 18 12:08:04 UTC 2013 - speilicke(a)suse.com
+
+- Renamed to go-go.net (from go-net)
+- Add _service file
+
+-------------------------------------------------------------------
+Tue May 14 09:29:51 UTC 2013 - graham(a)andtech.eu
+
+- go.net/ipv4: use testing.Skip{,f}
+- go.net/websocket: update package comment to refer RFC 6455
+- go.net/websocket: optimize frame masking code
+- go.net/websocket: allow server configurable
+- publicsuffix: update table to latest list from publicsuffix.org
+- go.net/websocket: fix handshake error.
+
+-------------------------------------------------------------------
+Sun Mar 10 13:03:25 UTC 2013 - graham(a)andtech.eu
+
+- publicsuffix: rename exp/cookiejar as net/http/cookiejar.
+- publicsuffix: build the full table from publicsuffix.org's
+- html: don't use Go tip io.ByteWriter
+- spdy: make use of MaxDataLength
+- ipv4: fix sprious lookahead on IPConn-based PacketConn
+- ipv4: simplify, drop unnecessary parentheses and slice indices
+- html: move exp/html and exp/html/atom here to the go.net
+- proxy: make proxy tests able to run with host protocol stack
+- proxy: make use of constants
+- proxy: fix typo
+- spdy: update SPDY/2 to SPDY/3
+- proxy: fix desired destination address in SOCKS5 CONNECT
+- publicsuffix: add an EffectiveTLDPlus1 function.
+- publicsuffix: distinguish ICANN domains from private domains;
+- publicsuffix: tighten the encoding from 8 bytes per node to 4.
+- ipv4: update doc
+- ipv4: change I/O method signatures on PacketConn and RawConn
+- publicsuffix: use IDNA.
+- idna: new package.
+- publicsuffix: new package.
+- ipv4: remove arguments from example functions
+- proxy: fix IP address determination
+- go.net: gofmt -w -s
+- ipv4: make supportsNewIPInput const
+- spdy: disallow stream id 0
+- net/spdy: handle corrupted zlib data on read
+- ipv4: make variable names clear
+- go.net: apply gofmt -w -s
+- websocket: Use protocol parameter in websocket.Dial.
+- ipv4: make RFC numbers in doc clickable on GoPkgDoc
+- spdy: fix typo
+- spdy: add package description
+
+-------------------------------------------------------------------
+Mon Nov 19 19:28:57 UTC 2012 - graham(a)andtech.eu
+
+- Update to hg6a42774d38e5
+- Update websockets to hybi17 & hixie76/hybi00
+- New ipv4 package
+
+-------------------------------------------------------------------
+Mon May 7 08:32:44 UTC 2012 - graham(a)andtech.eu
+
+- LICENSE now in tarball, add AUTHORS, README etc to docs
+
+-------------------------------------------------------------------
+Tue Mar 13 11:11:12 UTC 2012 - graham(a)andtech.eu
+
+- Update to weekly.2012-03-13
+
+-------------------------------------------------------------------
+Thu Mar 8 05:11:27 UTC 2012 - graham(a)andtech.eu
+
+- update spec file with addition go rpm macros
+
+-------------------------------------------------------------------
+Fri Feb 24 01:18:44 UTC 2012 - graham(a)andtech.eu
+
+- Update for weekly.2012-02-22
+ go.net: gofix for net/url API changes.
+
+-------------------------------------------------------------------
+Thu Feb 16 18:09:06 UTC 2012 - graham(a)andtech.eu
+
+- spdy: use zlib.NewWriterLevelDict
+
+-------------------------------------------------------------------
+Mon Jan 30 01:58:10 UTC 2012 - graham(a)andtech.eu
+
+- Initial package
+
New:
----
_service
golang-org-x-net.changes
golang-org-x-net.spec
net-1.4.2+git20150629.d9558e5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-org-x-net.spec ++++++
#
# spec file for package golang-org-x-net
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Graham Anderson <graham.anderson(a)gmail.com>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: golang-org-x-net
Version: 1.4.2+git20150629.d9558e5
Release: 0
Summary: Additional go.networking libraries
License: BSD-3-Clause
Group: Development/Languages/Other
Url: https://github.com/golang/net
Source: net-%{version}.tar.xz
BuildRequires: golang-packaging
BuildRequires: golang(golang.org/x/text)
BuildRequires: xz
Provides: go-go.net = %{version}
Obsoletes: go-go.net < %{version}
Provides: go-net = %{version}
Obsoletes: go-net < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{go_provides}
%description
This package contains additional go.network libraries such as
the websocket and SPDY protocols that are developed by the Go
team but outside of the main source tree.
%gosrc_package
%prep
%setup -q -n net-%{version}
%build
%goprep golang.org/x/net
%gobuild ...
%install
%goinstall
%gosrc
%files
%defattr(-,root,root,-)
%doc LICENSE
%{go_contribdir}/*
%files source
%defattr(-,root,root,-)
%{go_contribsrcdir}/*
%changelog
++++++ _service ++++++
<services>
<service name="tar_scm" mode="localonly">
<param name="url">https://github.com/golang/net/</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">1.4.2+git%cd.%h</param>
<param name="revision">master</param>
</service>
<service name="recompress" mode="localonly">
<param name="file">net-*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="localonly">
<param name="basename">net</param>
</service>
</services>
1
0
Hello community,
here is the log from the commit of package go for openSUSE:13.2:Update checked in at 2015-08-31 15:08:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/go (Old)
and /work/SRC/openSUSE:13.2:Update/.go.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.P92rBW/_old 2015-08-31 15:08:56.000000000 +0200
+++ /var/tmp/diff_new_pack.P92rBW/_new 2015-08-31 15:08:56.000000000 +0200
@@ -1 +1 @@
-<link package='go.3146' cicount='copy' />
+<link package='go.3912' cicount='copy' />
1
0
Hello community,
here is the log from the commit of package docker for openSUSE:13.2:Update checked in at 2015-08-31 15:08:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/docker (Old)
and /work/SRC/openSUSE:13.2:Update/.docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.csBWAL/_old 2015-08-31 15:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.csBWAL/_new 2015-08-31 15:08:53.000000000 +0200
@@ -1 +1 @@
-<link package='docker.3761' cicount='copy' />
+<link package='docker.3912' cicount='copy' />
1
0
Hello community,
here is the log from the commit of package docker.3912 for openSUSE:13.2:Update checked in at 2015-08-31 15:08:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/docker.3912 (Old)
and /work/SRC/openSUSE:13.2:Update/.docker.3912.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker.3912"
Changes:
--------
New Changes file:
--- /dev/null 2015-08-24 19:43:32.284261900 +0200
+++ /work/SRC/openSUSE:13.2:Update/.docker.3912.new/docker.changes 2015-08-31 15:08:51.000000000 +0200
@@ -0,0 +1,1594 @@
+-------------------------------------------------------------------
+Fri Jul 24 14:24:16 UTC 2015 - jmassaguerpla(a)suse.com
+
+- Exclude archs where docker does not build. Otherwise it gets into
+ and infinite loop when building.
+
+ We'll fix that later if we want to release for those archs.
+
+-------------------------------------------------------------------
+Wed Jul 15 08:11:11 UTC 2015 - jmassaguerpla(a)suse.com
+
+- Update to 1.7.1 (2015-07-14) (bnc#938156)
+Runtime
+
+ Fix default user spawning exec process with docker exec
+ Make --bridge=none not to configure the network bridge
+ Publish networking stats properly
+ Fix implicit devicemapper selection with static binaries
+ Fix socket connections that hung intermittently
+ Fix bridge interface creation on CentOS/RHEL 6.6
+ Fix local dns lookups added to resolv.conf
+ Fix copy command mounting volumes
+ Fix read/write privileges in volumes mounted with --volumes-from
+
+Remote API
+
+ Fix unmarshalling of Command and Entrypoint
+ Set limit for minimum client version supported
+ Validate port specification
+ Return proper errors when attach/reattach fail
+
+Distribution
+
+ Fix pulling private images
+ Fix fallback between registry V2 and V1
+
+
+-------------------------------------------------------------------
+Fri Jul 10 11:22:00 UTC 2015 - jmassaguerpla(a)suse.com
+
+- Exclude init scripts other than systemd from the test-package
+
+-------------------------------------------------------------------
+Wed Jul 1 12:38:50 UTC 2015 - jmassaguerpla(a)suse.com
+
+- Exclude intel 32 bits arch. Docker does not built on that. Let's
+ make it explicit.
+
+-------------------------------------------------------------------
+Thu Jun 25 16:49:59 UTC 2015 - dmueller(a)suse.com
+
+- rediff ignore-dockerinit-checksum.patch, gcc-go-build-static-libgo.patch
+ to make them apply again.
+- introduce go_arches for architectures that use the go compiler
+ instead of gcc-go
+- add docker-netns-aarch64.patch: Add support for AArch64
+- enable build for aarch64
+
+-------------------------------------------------------------------
+Wed Jun 24 09:02:03 UTC 2015 - fcastelli(a)suse.com
+
+- Build man pages only on platforms where gc compiler is available.
+
+-------------------------------------------------------------------
+Mon Jun 22 08:48:11 UTC 2015 - fcastelli(a)suse.com
+
+- Updated to 1.7.0 (2015-06-16) - bnc#935570
+ * Runtime
+ - Experimental feature: support for out-of-process volume plugins
+ - The userland proxy can be disabled in favor of hairpin NAT using the daemon’s `--userland-proxy=false` flag
+ - The `exec` command supports the `-u|--user` flag to specify the new process owner
+ - Default gateway for containers can be specified daemon-wide using the `--default-gateway` and `--default-gateway-v6` flags
+ - The CPU CFS (Completely Fair Scheduler) quota can be set in `docker run` using `--cpu-quota`
+ - Container block IO can be controlled in `docker run` using`--blkio-weight`
+ - ZFS support
+ - The `docker logs` command supports a `--since` argument
+ - UTS namespace can be shared with the host with `docker run --uts=host`
+ * Quality
+ - Networking stack was entirely rewritten as part of the libnetwork effort
+ - Engine internals refactoring
+ - Volumes code was entirely rewritten to support the plugins effort
+ - Sending SIGUSR1 to a daemon will dump all goroutines stacks without exiting
+ * Build
+ - Support ${variable:-value} and ${variable:+value} syntax for environment variables
+ - Support resource management flags `--cgroup-parent`, `--cpu-period`, `--cpu-quota`, `--cpuset-cpus`, `--cpuset-mems`
+ - git context changes with branches and directories
+ - The .dockerignore file support exclusion rules
+ * Distribution
+ - Client support for v2 mirroring support for the official registry
+ * Bugfixes
+ - Firewalld is now supported and will automatically be used when available
+ - mounting --device recursively
+- Patch 0002-Stripped-dockerinit-binary.patch renamed to fix-docker-init.patch
+ and fixed to build with latest version of docker
+
+-------------------------------------------------------------------
+Tue Jun 9 16:35:46 UTC 2015 - jmassaguerpla(a)suse.com
+
+- Add test subpackage and fix line numbers in patches
+
+-------------------------------------------------------------------
+Fri Jun 5 15:29:45 UTC 2015 - fcastelli(a)suse.com
+
+- Fixed ppc64le name inside of spec file
+
+-------------------------------------------------------------------
+Fri Jun 5 15:23:47 UTC 2015 - fcastelli(a)suse.com
+
+- Build docker on PPC and S390x using gcc-go provided by gcc5
+ * added sysconfig.docker.ppc64le: make docker daemon start on ppc64le
+ despite some iptables issues. To be removed soon
+ * ignore-dockerinit-checksum.patch: applied only when building with
+ gcc-go. Required to workaround a limitation of gcc-go
+ * gcc-go-build-static-libgo.patch: used only when building with gcc-go,
+ link libgo statically into docker itself.
+
+-------------------------------------------------------------------
+Wed May 27 10:02:51 UTC 2015 - dmacvicar(a)suse.de
+
+- build and install man pages
+
+-------------------------------------------------------------------
+Mon May 18 15:08:59 UTC 2015 - fcastelli(a)suse.com
+
+- Update to version 1.6.2 (2015-05-13) [bnc#931301]
+ * Revert change prohibiting mounting into /sys
+
+-------------------------------------------------------------------
+Fri May 8 15:00:38 UTC 2015 - fcastelli(a)suse.com
+
+Updated to version 1.6.1 (2015-05-07) [bnc#930235]
+ * Security
+ - Fix read/write /proc paths (CVE-2015-3630)
+ - Prohibit VOLUME /proc and VOLUME / (CVE-2015-3631)
+ - Fix opening of file-descriptor 1 (CVE-2015-3627)
+ - Fix symlink traversal on container respawn allowing local privilege escalation (CVE-2015-3629)
+ - Prohibit mount of /sys
+ * Runtime
+ - Update Apparmor policy to not allow mounts
+- Updated libcontainer-apparmor-fixes.patch: adapt patch to reflect
+ changes introduced by docker 1.6.1
+
+-------------------------------------------------------------------
+Thu May 7 13:33:03 UTC 2015 - develop7(a)develop7.info
+
+- Get rid of SocketUser and SocketGroup workarounds for docker.socket
+
+-------------------------------------------------------------------
+Fri Apr 17 14:02:13 UTC 2015 - fcastelli(a)suse.com
+
+- Updated to version 1.6.0 (2015-04-07) [bnc#908033]
+ * Builder:
+ + Building images from an image ID
+ + build containers with resource constraints, ie `docker build --cpu-shares=100 --memory=1024m...`
+ + `commit --change` to apply specified Dockerfile instructions while committing the image
+ + `import --change` to apply specified Dockerfile instructions while importing the image
+ + basic build cancellation
+ * Client:
+ + Windows Support
+ * Runtime:
+ + Container and image Labels
+ + `--cgroup-parent` for specifying a parent cgroup to place container cgroup within
+ + Logging drivers, `json-file`, `syslog`, or `none`
+ + Pulling images by ID
+ + `--ulimit` to set the ulimit on a container
+ + `--default-ulimit` option on the daemon which applies to all created containers (and overwritten by `--ulimit` on run)
+- Updated '0002-Stripped-dockerinit-binary.patch' to reflect changes inside of
+ the latest version of Docker.
+- bnc#908033: support of Docker Registry API v2.
+
+-------------------------------------------------------------------
+Fri Apr 3 19:57:38 UTC 2015 - dmueller(a)suse.com
+
+- enable build for armv7l
+
+-------------------------------------------------------------------
+Fri Apr 3 14:59:35 UTC 2015 - fcastelli(a)suse.com
+
+- Updated docker.spec to fixed building with the latest version of our
+ Go pacakge.
+- Updated 0002-Stripped-dockerinit-binary.patch to fix check made by
+ the docker daemon against the dockerinit binary.
+
+-------------------------------------------------------------------
+Fri Mar 27 10:29:35 UTC 2015 - fcastelli(a)suse.com
+
+- Updated systemd service and socket units to fix socket activation
+ and to align with best practices recommended by upstram. Moreover
+ socket activation fixes bnc#920645.
+
+-------------------------------------------------------------------
+Wed Feb 11 13:59:01 UTC 2015 - fcastelli(a)suse.com
+
+ - Updated to 1.5.0 (2015-02-10):
+ * Builder:
+ - Dockerfile to use for a given `docker build` can be specified with
+ the `-f` flag
++++ 1397 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.2:Update/.docker.3912.new/docker.changes
New:
----
80-docker.rules
README_SUSE.md
docker-1.7.1.tar.bz2
docker-netns-aarch64.patch
docker-rpmlintrc
docker.changes
docker.service
docker.socket
docker.spec
docker_systemd_lt_214.socket
fix-docker-init.patch
gcc-go-build-static-libgo.patch
ignore-dockerinit-checksum.patch
libcontainer-apparmor-fixes.patch
sysconfig.docker
sysconfig.docker.ppc64le
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker.spec ++++++
#
# spec file for package docker
#
# Copyright (c) 2015 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define git_version 786b29d
%define go_arches %ix86 x86_64
Name: docker
Version: 1.7.1
Release: 0
Summary: The Linux container runtime
License: Apache-2.0
Group: System/Management
Url: http://www.docker.io
Source: %{name}-%{version}.tar.bz2
Source1: docker.service
Source3: 80-docker.rules
Source4: sysconfig.docker
%if 0%{?suse_version} > 1320
Source5: docker.socket
%else
Source5: docker_systemd_lt_214.socket
%endif
Source6: docker-rpmlintrc
Source7: README_SUSE.md
# TODO: remove once we figure out what is wrong with iptables on ppc64le
Source100: sysconfig.docker.ppc64le
Patch0: fix-docker-init.patch
# PATCH-FIX-OPENSUSE libcontainer-apparmor-fixes.patch -- mount rules aren't supported in our apparmor
Patch1: libcontainer-apparmor-fixes.patch
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
# Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time
# We cannot do that, right now a quick and really dirty way to get it running is
# to simply disable this check
Patch100: ignore-dockerinit-checksum.patch
Patch101: gcc-go-build-static-libgo.patch
Patch102: docker-netns-aarch64.patch
BuildRequires: bash-completion
BuildRequires: device-mapper-devel >= 1.2.68
BuildRequires: glibc-devel-static
%ifarch %go_arches
BuildRequires: go >= 1.4
BuildRequires: go-go-md2man
%else
BuildRequires: gcc5-go >= 5.0
%endif
BuildRequires: fdupes
BuildRequires: libapparmor-devel
BuildRequires: libbtrfs-devel >= 3.8
BuildRequires: procps
BuildRequires: sqlite3-devel
BuildRequires: systemd-devel
BuildRequires: zsh
Requires: apparmor-parser
Requires: bridge-utils
Requires: ca-certificates-mozilla
# Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
Requires: e2fsprogs
Requires: git-core >= 1.7
Requires: iproute2 >= 3.5
Requires: iptables >= 1.4
Requires: kernel >= 3.8.0
Requires: lvm2 >= 2.2.89
Requires: procps
Requires: tar >= 1.26
Requires: xz >= 4.9
Conflicts: lxc < 1.0
PreReq: %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: %ix86
ExcludeArch: s390
ExcludeArch: s390x
ExcludeArch: ppc
%description
Docker complements LXC with a high-level API which operates at the process
level. It runs unix processes with strong guarantees of isolation and
repeatability across servers.
Docker is a great building block for automating distributed systems: large-scale
web deployments, database clusters, continuous deployment systems, private PaaS,
service-oriented architectures, etc.
%package bash-completion
Summary: Bash Completion for %{name}
Group: System/Management
Requires: %{name} = %{version}
Requires: bash-completion
BuildArch: noarch
%description bash-completion
Bash command line completion support for %{name}.
%package zsh-completion
Summary: Zsh Completion for %{name}
Group: System/Management
Requires: %{name} = %{version}
Requires: zsh
BuildArch: noarch
%description zsh-completion
Zsh command line completion support for %{name}.
%package test
Summary: Test package for docker
Group: System/Management
Requires: device-mapper-devel >= 1.2.68
Requires: glibc-devel-static
%ifarch %go_arches
Requires: go >= 1.4
%else
Requires: gcc5-go >= 5.0
%endif
Requires: apparmor-parser
Requires: bash-completion
Requires: libapparmor-devel
Requires: libbtrfs-devel >= 3.8
Requires: procps
Requires: sqlite3-devel
BuildArch: noarch
%description test
Test package for docker. It contains the source code and the tests.
%prep
%setup -q -n docker-%{version}
%patch0 -p1
%patch1 -p1
%ifnarch %go_arches
%patch100
%patch101
%endif
%patch102
cp %{SOURCE7} .
find . -name ".gitignore" | xargs rm
%build
%ifnarch %go_arches
mkdir /tmp/dirty-hack
ln -s /usr/bin/go-5 /tmp/dirty-hack/go
export PATH=/tmp/dirty-hack:$PATH
%endif
(cat <<EOF
export AUTO_GOPATH=1
export DOCKER_BUILDTAGS="exclude_graphdriver_aufs apparmor selinux"
export DOCKER_GITCOMMIT=%{git_version}
EOF
) > docker_build_env
. ./docker_build_env
./hack/make.sh dynbinary
%ifarch %go_arches
man/md2man-all.sh
%endif
# remove other than systemd
# otherwise the resulting package will have extra requires
rm -rf hack/make/.build-deb
%install
install -d %{buildroot}%{go_contribdir}
install -d %{buildroot}%{_bindir}
install -D -m755 bundles/%{version}/dynbinary/%{name}-%{version} %{buildroot}/%{_bindir}/%{name}
install -d %{buildroot}/%{_prefix}/lib/docker
install -D -m755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit
install -Dd -m 0755 \
%{buildroot}%{_sysconfdir}/init.d \
%{buildroot}%{_sbindir}
install -D -m0644 contrib/completion/bash/docker "%{buildroot}/etc/bash_completion.d/%{name}"
install -D -m0644 contrib/completion/zsh/_docker "%{buildroot}/etc/zsh_completion.d/%{name}"
# copy all for the test package
install -d %{buildroot}/usr/src/docker/
cp -av . %{buildroot}/usr/src/docker/
#
# systemd service
#
install -D -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/%{name}.service
install -D -m 0644 %SOURCE5 %{buildroot}%{_unitdir}/%{name}.socket
ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdocker
#
# udev rules that prevents dolphin to show all docker devices and slows down
# upstream report https://bugs.kde.org/show_bug.cgi?id=329930
#
install -D -m 0644 %SOURCE3 %{buildroot}%{_prefix}/lib/udev/rules.d/80-%{name}.rules
# sysconfig file
%ifarch ppc64le
install -D -m 644 %SOURCE100 %{buildroot}/var/adm/fillup-templates/sysconfig.docker
%else
install -D -m 644 %SOURCE4 %{buildroot}/var/adm/fillup-templates/sysconfig.docker
%endif
%ifarch %go_arches
# install manpages
install -d %{buildroot}%{_mandir}/man1
install -p -m 644 man/man1/*.1 %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_mandir}/man5
install -p -m 644 man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
%endif
%fdupes %{buildroot}
%pre
echo "creating group docker..."
groupadd -r docker 2>/dev/null || :
%service_add_pre %{name}.service %{name}.socket
%post
%service_add_post %{name}.service %{name}.socket
%{fillup_only -n docker}
%preun
%service_del_preun %{name}.service %{name}.socket
%postun
%service_del_postun %{name}.service %{name}.socket
%files
%defattr(-,root,root)
%doc README.md LICENSE README_SUSE.md
%{_bindir}/docker
%{_sbindir}/rcdocker
%{_prefix}/lib/docker/
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
%{_prefix}/lib/udev/rules.d/80-%{name}.rules
/var/adm/fillup-templates/sysconfig.docker
%ifarch %go_arches
%{_mandir}/man1/docker-*.1.gz
%{_mandir}/man1/docker.1.gz
%{_mandir}/man5/Dockerfile.5.gz
%endif
%files bash-completion
%defattr(-,root,root)
%config %{_sysconfdir}/bash_completion.d/%{name}
%files zsh-completion
%defattr(-,root,root)
%config %{_sysconfdir}/zsh_completion.d/%{name}
%files test
%defattr(-,root,root)
/usr/src/docker/
# exclude binaries
%exclude /usr/src/docker/bundles/
# exclude init configurations other than systemd
%exclude /usr/src/docker/contrib/init/openrc
%exclude /usr/src/docker/contrib/init/sysvinit-debian
%exclude /usr/src/docker/contrib/init/sysvinit-redhat
%exclude /usr/src/docker/contrib/init/upstart
%changelog
++++++ 80-docker.rules ++++++
# hide docker's loopback devices from udisks, and thus from user desktops
SUBSYSTEM=="block", ENV{DM_NAME}=="docker-*", ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1"
SUBSYSTEM=="block", DEVPATH=="/devices/virtual/block/loop*", ATTR{loop/backing_file}=="/var/lib/docker/*", ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1"
++++++ README_SUSE.md ++++++
# Abstract
Docker is a lightweight "virtualization" method to run multiple virtual units
(containers, akin to “chroot”) simultaneously on a single control host.
Containers are isolated with Kernel Control Groups (cgroups) and Kernel Namespaces.
Docker provides an operating system-level virtualization where the Kernel
controls the isolated containers. With other full virtualization solutions
like Xen, KVM, or libvirt the processor simulates a complete hardware
environment and controls its virtual machines.
# Terminology
## chroot
A change root (chroot, or change root jail) is a section in the file system
which is isolated from the rest of the file system. For this purpose, the chroot
command is used to change the root of the file system. A program which is
executed in such a “chroot jail” cannot access files outside the designated
directory tree.
## cgroups
Kernel Control Groups (commonly referred to as just “cgroups”) are a Kernel
feature that allows aggregating or partitioning tasks (processes) and all their
children into hierarchical organized groups to isolate resources.
## Image
A "virtual machine" on the host server that can run any Linux system, for
example openSUSE, SUSE Linux Enterprise Desktop, or SUSE Linux Enterprise Server.
A Docker image is made by a series of layers built one over the other. Each layer
corresponds to a permanent change committed from a container to the image.
For more details checkout [Docker's official documentation](http://docs.docker.com/terms/image/).
## Image Name
A name that refers to an image. The name is used by the docker commands.
## Container
A running Docker Image.
## Container ID
A ID that refers to a container. The ID is used by the docker commands.
## TAG
A string associated to a Image. It commonly used to identify a specific version
of a Image (like tags in version control systems). It is also possible to refer
the same Image with different TAGs.
## Kernel Namespaces
A Kernel feature to isolate some resources like network, users, and others for
a group of processes.
## Docker Host Server
The system that runs the Docker daemon, provides the images, and the management
control capabilities through cgroups.
# Overview
Docker is a platform that allows developers and sysadmins to manage the complete
lifecycle of images.
Docker makes incredibly easy to build, ship and run images containing
applications.
Benefits of Docker:
* Isolating applications and operating systems through containers.
* Providing nearly native performance as Docker manages allocation of resources
in real-time.
* Controlling network interfaces and applying resources inside containers through cgroups.
* Versioning of images.
* Building images based on existing ones.
* Sharining/storing on [public](http://docs.docker.com/docker-hub/) or
[private](http://docs.docker.com/userguide/dockerrepos/#private-repositories)
repositories.
Limitations of Docker:
* All Docker containers are running inside the host system's Kernel and not with
a different Kernel.
* Only allows Linux "guest" operating systems.
* Docker is not a full virtualization stack like Xen, KVM, or libvirt.
* Security depends on the host system. Refer to the [official documentation](http://docs.docker.com/articles/security/)
for more details.
## Container drivers
Docker has different backend drivers to handle the containers. The recommended
on is [libcontainer](https://github.com/docker/libcontainer), which is also the
default choice. This driver provides direct access with cgroups.
The Docker packages ships also a LXC driver which handles containers using the
LXC tools.
At the time of writing, upstream is working on a `libvirt-lxc` driver.
## Storage drivers
Docker supports different storage drivers:
* `vfs`: this driver is automatically used when the Docker host filesystem
does not support copy-on-write. This is a simple driver which does not offer
some of the advantages of Docker (like sharing layers, more on that in the
next sections). It is highly reliable but also slow.
* `devicemapper`: this driver relies on the device-mapper thin provisioning
module. It supports copy-on-write, hence it offers all the advantages of
Docker.
* `btrfs`: this driver relies on Btrfs to provide all the features required
by Docker. To use this driver the `/var/lib/docker` directory must be on a
btrfs filesystem.
* `AUFS`: this driver relies on AUFS union filesystem. Neither the upstream
kernel nor the SUSE one supports this filesystem. Hence the AUFS driver is
not built into the SUSE Docker package.
It is possible to specify which driver to use by changing the value of the
`DOCKER_OPTS` variable defined inside of the `/etc/sysconfig/docker` file.
This can be done either manually or using &yast; by browsing to:
* System
* /etc/sysconfig Editor
* System
* Management
* DOCKER_OPTS
menu and entering the `-s storage_driver` string.
For example, to force the usage of the `devicemapper` driver
enter the following text:
```
DOCKER_OPTS="-s devicemapper
```
It is recommended to have `/var/lib/docker` mounted on a different filesystem
to not affect the Docker host OS in case of a filesystem corruption.
# Setting up a Docker host
Prepare the host:
1. Install the `docker` package.
2. Automatically start the Docker daemon at boot:
`sudo systemctl enable docker`
3. Start the Docker daemon:
`sudo systemctl start docker`
The Docker daemon listens on a local socket which is accessible only by the `root`
user and by the members of the `docker` group.
The `docker` group is automatically created at package installation time. To
allow a certain user to connect to the local Docker daemon use the following
command:
```
sudo /usr/sbin/usermod -aG docker <username>
```
The user will be able to communicate with the local Docker daemon upon his next
login.
## Networking
If you want your containers to be able to access the external network you must
enable the `net.ipv4.ip_forward` rule.
This can be done using YaST by browsing to the
`Network Devices -> Network Settings -> Routing` menu and ensuring that the
`Enable IPv4 Forwarding` box is checked.
This option cannot be changed when networking is handled by the Network Manager.
In such cases the `/etc/sysconfig/SuSEfirewall2` file needs to be edited by
hand to ensure the `FW_ROUTE` flag is set to `yes` like so:
```
FW_ROUTE="yes"
```
# Basic Docker operations
Images can be pulled from [Docker's central index](http://index.docker.io) using
the following command:
```
docker pull <image name>
```
Containers can be started using the `docker run` command.
Please refer to the [official documentation](http://docs.docker.com/)
for more details.
# Building Docker containers using KIWI
Starting from version 5.06.8 KIWI can be used to build Docker images.
Please refer to KIWI's [official documentation](https://doc.opensuse.org/projects/kiwi/doc/#chap.lxc).
The official `kiwi-doc` package contains examples of Docker images.
## Docker build system versus KIWI
Docker has an [internal build system](http://docs.docker.com/reference/builder/)
which makes incredibly easy to create new images based on existing ones.
Some users might be confused about what to use. The right approach is to build
the [base images](http://docs.docker.com/terms/image/#base-image-def) using KIWI
and then use them as foundation blocks inside of your Docker's build system.
That two advantages:
1. Be able to use docker specific directives (like `ENTRYPOINT`, `EXPOSE`, ...).
2. Be able to reuse already existing layers.
Sharing the common layers between different images makes possible to:
* Use less disk space on the Docker hosts.
* Make the deployments faster: only the requested layers are sent over the
network (it is like upgrading installed packages using delta rpms).
* Take full advantage of caching while building Docker images: this will result
in faster executions of `docker build` command.
To recap: KIWI is not to be intended as a replacement for Docker's build system.
It rather complements with it.
++++++ docker-netns-aarch64.patch ++++++
--- /dev/null
+++ vendor/src/github.com/vishvananda/netns/netns_linux_arm64.go
@@ -0,0 +1,7 @@
+// +build linux,arm64
+
+package netns
+
+const (
+ SYS_SETNS = 268
+)
++++++ docker-rpmlintrc ++++++
addFilter ("^docker.x86_64: W: statically-linked-binary /usr/lib64/docker/dockerinit")
addFilter ("^docker-bash-completion.noarch: W: sourced-script-with-shebang /etc/bash_completion.d/docker bash")
addFilter ("^docker.x86_64: W: statically-linked-binary /usr/lib/docker/dockerinit")
addFilter ("^docker.x86_64: W: unstripped-binary-or-object /usr/lib/docker/dockerinit")
addFilter ("^docker.x86_64: W: no-manual-page-for-binary docker")
addFilter ("^docker.x86_64: W: no-manual-page-for-binary nsinit")
addFilter ("test.noarch.*: E: devel-file-in-non-devel-package")
addFilter ("test.noarch.*: W: pem-certificate")
addFilter ("test.noarch.*: W: non-executable-script")
addFilter ("test.noarch.*: W: hidden-file-or-dir")
addFilter ("test.noarch.*: W: files-duplicate")
addFilter ("test.noarch.*: W: script-without-shebang /usr/src/docker/docs/README.md")
addFilter ("test.noarch.*: W: sourced-script-with-shebang /etc/bash_completion.d/docker bash")
addFilter ("test.noarch.*: W: suse-filelist-forbidden-fhs23 /usr/src/docker")
++++++ docker.service ++++++
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.com
After=network.target docker.socket
Requires=docker.socket
[Service]
EnvironmentFile=/etc/sysconfig/docker
ExecStart=/usr/bin/docker -d -H fd:// $DOCKER_OPTS
MountFlags=slave
LimitNOFILE=1048576
LimitNPROC=1048576
LimitCORE=infinity
[Install]
WantedBy=multi-user.target
++++++ docker.socket ++++++
[Unit]
Description=Docker Socket for the API
PartOf=docker.service
[Socket]
ListenStream=/var/run/docker.sock
SocketMode=0660
SocketUser=root
SocketGroup=docker
[Install]
WantedBy=sockets.target
++++++ docker_systemd_lt_214.socket ++++++
[Unit]
Description=Docker Socket for the API
PartOf=docker.service
[Socket]
ListenStream=/var/run/docker.sock
SocketMode=0660
# A Socket(User|Group) replacement workaround for systemd <= 214
ExecStartPost=/usr/bin/chown root:docker /var/run/docker.sock
[Install]
WantedBy=sockets.target
++++++ fix-docker-init.patch ++++++
Index: docker/hack/make/.dockerinit
===================================================================
--- docker.orig/hack/make/.dockerinit
+++ docker/hack/make/.dockerinit
@@ -29,5 +29,7 @@ else
exit 1
fi
+/usr/bin/strip -s $DEST/dockerinit-$VERSION
+
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1)
++++++ gcc-go-build-static-libgo.patch ++++++
--- hack/make/binary
+++ hack/make/binary
@@ -9,6 +9,7 @@
echo "Building: $DEST/$BINARY_FULLNAME"
go build \
+ -gccgoflags="-static-libgo" \
-o "$DEST/$BINARY_FULLNAME" \
"${BUILDFLAGS[@]}" \
-ldflags "
++++++ ignore-dockerinit-checksum.patch ++++++
--- utils/utils.go
+++ utils/utils.go
@@ -76,7 +76,7 @@
}
return os.SameFile(targetFileInfo, selfPathFileInfo)
}
- return dockerversion.INITSHA1 != "" && dockerInitSha1(target) == dockerversion.INITSHA1
+ return true
}
// Figure out the path of our dockerinit (which may be SelfPath())
++++++ libcontainer-apparmor-fixes.patch ++++++
Index: docker/vendor/src/github.com/docker/libcontainer/apparmor/gen.go
===================================================================
--- docker.orig/vendor/src/github.com/docker/libcontainer/apparmor/gen.go
+++ docker/vendor/src/github.com/docker/libcontainer/apparmor/gen.go
@@ -25,7 +25,6 @@ profile {{.Name}} flags=(attach_disconne
network,
capability,
file,
- umount,
deny @{PROC}/sys/fs/** wklx,
deny @{PROC}/sysrq-trigger rwklx,
++++++ sysconfig.docker ++++++
## Path : System/Management
## Description : Extra cli switches for docker daemon
## Type : string
## Default : ""
## ServiceRestart : docker
#
DOCKER_OPTS=""
++++++ sysconfig.docker.ppc64le ++++++
## Path : System/Management
## Description : Extra cli switches for docker daemon
## Type : string
## Default : ""
## ServiceRestart : docker
#
# TODO: remove it once we fix the real issue
DOCKER_OPTS=" -iptables=false "
1
0
Hello community,
here is the log from the commit of package libcamgm for openSUSE:Factory checked in at 2015-08-31 10:45:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcamgm (Old)
and /work/SRC/openSUSE:Factory/.libcamgm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcamgm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcamgm/libcamgm.changes 2015-02-08 13:03:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libcamgm.new/libcamgm.changes 2015-08-31 10:45:48.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Aug 30 13:19:10 UTC 2015 - mc(a)suse.com
+
+- disable testsuite
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcamgm.spec ++++++
--- /var/tmp/diff_new_pack.4L9lwS/_old 2015-08-31 10:45:49.000000000 +0200
+++ /var/tmp/diff_new_pack.4L9lwS/_new 2015-08-31 10:45:49.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcamgm
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -139,7 +139,7 @@
%check
# required for perl test cases
export LD_LIBRARY_PATH="%{buildroot}%{_libexecdir}/"
-%ifarch x86_64
+%if 0
make check DESTDIR=%{buildroot} %{?_smp_mflags}
%else
# openssl command output differ between architectures
1
0
Hello community,
here is the log from the commit of package rubygem-puma for openSUSE:Factory checked in at 2015-08-29 20:05:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-puma (Old)
and /work/SRC/openSUSE:Factory/.rubygem-puma.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puma"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-puma/rubygem-puma.changes 2015-08-27 08:56:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-puma.new/rubygem-puma.changes 2015-08-29 20:05:22.000000000 +0200
@@ -1,0 +2,32 @@
+Mon Aug 24 04:30:05 UTC 2015 - coolo(a)suse.com
+
+- updated to version 2.13.4
+ see installed History.txt
+
+ === 2.13.4 / 2015-08-16
+
+ * 1 bug fix:
+ * Use the environment possible set by the config early and from
+ the config file later (if set).
+
+ === 2.13.3 / 2015-08-15
+
+ Seriously, I need to revamp config with tests.
+
+ * 1 bug fix:
+ * Fix preserving options before cleaning for state. Fixes #769
+
+ === 2.13.2 / 2015-08-15
+
+ The "clearly I don't have enough tests for the config" release.
+
+ * 1 bug fix:
+ * Fix another place binds wasn't initialized. Fixes #767
+
+ === 2.13.1 / 2015-08-15
+
+ * 2 bug fixes:
+ * Fix binds being masked in config files. Fixes #765
+ * Use options from the config file properly in pumactl. Fixes #764
+
+-------------------------------------------------------------------
Old:
----
puma-2.13.0.gem
New:
----
puma-2.13.4.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puma.spec ++++++
--- /var/tmp/diff_new_pack.LnWwNF/_old 2015-08-29 20:05:23.000000000 +0200
+++ /var/tmp/diff_new_pack.LnWwNF/_new 2015-08-29 20:05:23.000000000 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-puma
-Version: 2.13.0
+Version: 2.13.4
Release: 0
%define mod_name puma
%define mod_full_name %{mod_name}-%{version}
++++++ puma-2.13.0.gem -> puma-2.13.4.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/History.txt new/History.txt
--- old/History.txt 2015-08-15 03:34:19.000000000 +0200
+++ new/History.txt 2015-08-16 18:21:02.000000000 +0200
@@ -1,3 +1,29 @@
+=== 2.13.4 / 2015-08-16
+
+* 1 bug fix:
+ * Use the environment possible set by the config early and from
+ the config file later (if set).
+
+=== 2.13.3 / 2015-08-15
+
+Seriously, I need to revamp config with tests.
+
+* 1 bug fix:
+ * Fix preserving options before cleaning for state. Fixes #769
+
+=== 2.13.2 / 2015-08-15
+
+The "clearly I don't have enough tests for the config" release.
+
+* 1 bug fix:
+ * Fix another place binds wasn't initialized. Fixes #767
+
+=== 2.13.1 / 2015-08-15
+
+* 2 bug fixes:
+ * Fix binds being masked in config files. Fixes #765
+ * Use options from the config file properly in pumactl. Fixes #764
+
=== 2.13.0 / 2015-08-14
* 1 minor feature:
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/binder.rb new/lib/puma/binder.rb
--- old/lib/puma/binder.rb 2015-08-15 03:34:19.000000000 +0200
+++ new/lib/puma/binder.rb 2015-08-16 18:21:02.000000000 +0200
@@ -227,7 +227,7 @@
# allow to accumulate before returning connection refused.
#
def add_tcp_listener(host, port, optimize_for_latency=true, backlog=1024)
- host = host[1..-2] if host[0..0] == '['
+ host = host[1..-2] if host and host[0..0] == '['
s = TCPServer.new(host, port)
if optimize_for_latency
s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/cli.rb new/lib/puma/cli.rb
--- old/lib/puma/cli.rb 2015-08-15 03:34:19.000000000 +0200
+++ new/lib/puma/cli.rb 2015-08-16 18:21:02.000000000 +0200
@@ -96,7 +96,7 @@
end
def env
- @cli_options[:environment] || ENV['RACK_ENV'] || 'development'
+ @options[:environment] || @cli_options[:environment] || ENV['RACK_ENV'] || 'development'
end
def write_state
@@ -300,13 +300,12 @@
#
def setup_options
- @cli_options = {
- :binds => []
- }
+ @cli_options = {}
+ @options = {}
@parser = OptionParser.new do |o|
o.on "-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)" do |arg|
- @cli_options[:binds] << arg
+ (@cli_options[:binds] ||= []) << arg
end
o.on "-C", "--config PATH", "Load PATH as a config file" do |arg|
@@ -352,7 +351,8 @@
o.on "-p", "--port PORT", "Define the TCP port to bind to",
"Use -b for more advanced options" do |arg|
- @cli_options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
+ binds = (@cli_options[:binds] ||= [])
+ binds << "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
end
o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/configuration.rb new/lib/puma/configuration.rb
--- old/lib/puma/configuration.rb 2015-08-15 03:34:19.000000000 +0200
+++ new/lib/puma/configuration.rb 2015-08-16 18:21:02.000000000 +0200
@@ -35,7 +35,9 @@
attr_reader :options
def initialize_copy(other)
- @conf = @conf.dup
+ @conf = nil
+ @cli_options = nil
+ @options = @options.dup
end
def default_options
@@ -55,7 +57,6 @@
# Load the options in the right priority
#
- @options = {}
@options.merge! default_options
@options.merge! @conf
@options.merge! @cli_options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/const.rb new/lib/puma/const.rb
--- old/lib/puma/const.rb 2015-08-15 03:34:19.000000000 +0200
+++ new/lib/puma/const.rb 2015-08-16 18:21:02.000000000 +0200
@@ -99,7 +99,7 @@
# too taxing on performance.
module Const
- PUMA_VERSION = VERSION = "2.13.0".freeze
+ PUMA_VERSION = VERSION = "2.13.4".freeze
CODE_NAME = "A Midsummer Code's Dream".freeze
FAST_TRACK_KA_TIMEOUT = 0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/control_cli.rb new/lib/puma/control_cli.rb
--- old/lib/puma/control_cli.rb 2015-08-15 03:34:19.000000000 +0200
+++ new/lib/puma/control_cli.rb 2015-08-16 18:21:02.000000000 +0200
@@ -17,37 +17,37 @@
@argv = argv
@stdout = stdout
@stderr = stderr
- @options = {}
+ @cli_options = {}
opts = OptionParser.new do |o|
o.banner = "Usage: pumactl (-p PID | -P pidfile | -S status_file | -C url -T token | -F config.rb) (#{COMMANDS.join("|")})"
o.on "-S", "--state PATH", "Where the state file to use is" do |arg|
- @options[:state] = arg
+ @cli_options[:state] = arg
end
o.on "-Q", "--quiet", "Not display messages" do |arg|
- @options[:quiet_flag] = true
+ @cli_options[:quiet_flag] = true
end
o.on "-P", "--pidfile PATH", "Pid file" do |arg|
- @options[:pidfile] = arg
+ @cli_options[:pidfile] = arg
end
o.on "-p", "--pid PID", "Pid" do |arg|
- @options[:pid] = arg.to_i
+ @cli_options[:pid] = arg.to_i
end
o.on "-C", "--control-url URL", "The bind url to use for the control server" do |arg|
- @options[:control_url] = arg
+ @cli_options[:control_url] = arg
end
o.on "-T", "--control-token TOKEN", "The token to use as authentication for the control server" do |arg|
- @options[:control_auth_token] = arg
+ @cli_options[:control_auth_token] = arg
end
o.on "-F", "--config-file PATH", "Puma config script" do |arg|
- @options[:config_file] = arg
+ @cli_options[:config_file] = arg
end
o.on_tail("-H", "--help", "Show this message") do
@@ -64,18 +64,24 @@
opts.order!(argv) { |a| opts.terminate a }
command = argv.shift
- @options[:command] = command if command
+ @cli_options[:command] = command if command
- unless @options[:config_file] == '-'
- if @options[:config_file].nil? and File.exist?('config/puma.rb')
- @options[:config_file] = 'config/puma.rb'
+ @options = nil
+
+ unless @cli_options[:config_file] == '-'
+ if @cli_options[:config_file].nil? and File.exist?('config/puma.rb')
+ @cli_options[:config_file] = 'config/puma.rb'
end
- if @options[:config_file]
- Puma::Configuration.new(@options).load
+ if @cli_options[:config_file]
+ config = Puma::Configuration.new(@cli_options)
+ config.load
+ @options = config.options
end
end
+ @options ||= @cli_options
+
# check present of command
unless @options[:command]
raise "Available commands: #{COMMANDS.join(", ")}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-08-15 03:34:19.000000000 +0200
+++ new/metadata 2015-08-16 18:21:02.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: puma
version: !ruby/object:Gem::Version
- version: 2.13.0
+ version: 2.13.4
platform: ruby
authors:
- Evan Phoenix
autorequire:
bindir: bin
cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rdoc
1
0
Hello community,
here is the log from the commit of package rubygem-byebug for openSUSE:Factory checked in at 2015-08-29 20:05:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-byebug (Old)
and /work/SRC/openSUSE:Factory/.rubygem-byebug.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-byebug"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-byebug/rubygem-byebug.changes 2015-08-27 08:56:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-byebug.new/rubygem-byebug.changes 2015-08-29 20:05:21.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Aug 24 04:28:30 UTC 2015 - coolo(a)suse.com
+
+- updated to version 6.0.2
+ see installed CHANGELOG.md
+
+ ## 6.0.2 - 2015-08-20
+ ### Fixed
+ * The user should always be given back a prompt unless (s)he explicitly states
+ the opposite. This provides a more general fix to the bug resolved in 6.0.1.
+
+ ## 6.0.1 - 2015-08-19
+ ### Fixed
+ * Bug in evaluation where the user would lose the command prompt when entering
+ an expression with a syntax error.
+
+-------------------------------------------------------------------
Old:
----
byebug-6.0.0.gem
New:
----
byebug-6.0.2.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-byebug.spec ++++++
--- /var/tmp/diff_new_pack.Pl6zOd/_old 2015-08-29 20:05:22.000000000 +0200
+++ /var/tmp/diff_new_pack.Pl6zOd/_new 2015-08-29 20:05:22.000000000 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-byebug
-Version: 6.0.0
+Version: 6.0.2
Release: 0
%define mod_name byebug
%define mod_full_name %{mod_name}-%{version}
++++++ byebug-6.0.0.gem -> byebug-6.0.2.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2015-08-18 01:32:12.000000000 +0200
+++ new/CHANGELOG.md 2015-08-20 17:06:59.000000000 +0200
@@ -1,3 +1,13 @@
+## 6.0.2 - 2015-08-20
+### Fixed
+* The user should always be given back a prompt unless (s)he explicitly states
+the opposite. This provides a more general fix to the bug resolved in 6.0.1.
+
+## 6.0.1 - 2015-08-19
+### Fixed
+* Bug in evaluation where the user would lose the command prompt when entering
+an expression with a syntax error.
+
## 6.0.0 - 2015-08-17
### Removed
* `autoeval` setting. I haven't heard of anyone setting it to false.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2015-08-18 01:32:12.000000000 +0200
+++ new/README.md 2015-08-20 17:06:59.000000000 +0200
@@ -53,9 +53,8 @@
[debugger][].
* Recommended:
- - MRI 2.0.0-p576 or higher.
- - MRI 2.1.3 or higher.
- - MRI 2.2.1 or higher.
+ - MRI 2.1.7 or higher.
+ - MRI 2.2.3 or higher.
## Install
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/commands/break.rb new/lib/byebug/commands/break.rb
--- old/lib/byebug/commands/break.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/commands/break.rb 2015-08-20 17:06:59.000000000 +0200
@@ -70,7 +70,7 @@
end
def target_object(str)
- k = warning_eval(str)
+ k = error_eval(str)
k && k.is_a?(Module) ? k.name : str
rescue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/commands/display.rb new/lib/byebug/commands/display.rb
--- old/lib/byebug/commands/display.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/commands/display.rb 2015-08-20 17:06:59.000000000 +0200
@@ -56,7 +56,7 @@
end
def eval_expr(expression)
- thread_safe_eval(expression).inspect
+ error_eval(expression).inspect
rescue
'(undefined)'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/commands/history.rb new/lib/byebug/commands/history.rb
--- old/lib/byebug/commands/history.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/commands/history.rb 2015-08-20 17:06:59.000000000 +0200
@@ -30,7 +30,7 @@
history = processor.interface.history
if @match[:num_cmds]
- size, = get_int(@match[:num_cmds], 'history', 1, history.size)
+ size, err = get_int(@match[:num_cmds], 'history', 1, history.size)
return errmsg(err) unless size
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/commands/list.rb new/lib/byebug/commands/list.rb
--- old/lib/byebug/commands/list.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/commands/list.rb 2015-08-20 17:06:59.000000000 +0200
@@ -36,11 +36,11 @@
def execute
msg = "No sourcefile available for #{frame.file}"
- return errmsg(msg) unless File.exist?(frame.file)
+ fail(msg) unless File.exist?(frame.file)
max_lines = n_lines(frame.file)
b, e = range(@match[2], max_lines)
- return errmsg('Invalid line range') unless valid_range?(b, e, max_lines)
+ fail('Invalid line range') unless valid_range?(b, e, max_lines)
display_lines(b, e)
@@ -85,11 +85,11 @@
def parse_range(input, size, max_line)
first, err = get_int(lower_bound(input), 'List', 1, max_line)
- return [-1, -1] if err
+ fail(err) unless first
if upper_bound(input)
- last, = get_int(upper_bound(input), 'List', 1, max_line)
- return [-1, -1] unless last
+ last, err = get_int(upper_bound(input), 'List', 1, max_line)
+ fail(err) unless last
last = amend(last, max_line)
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/commands/up.rb new/lib/byebug/commands/up.rb
--- old/lib/byebug/commands/up.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/commands/up.rb 2015-08-20 17:06:59.000000000 +0200
@@ -14,7 +14,7 @@
self.allow_in_post_mortem = true
def self.regexp
- /^\s* u(?:p)? (?:\s+(\S+))? \s*$/x
+ /^\s* up (?:\s+(\S+))? \s*$/x
end
def self.description
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/helpers/eval.rb new/lib/byebug/helpers/eval.rb
--- old/lib/byebug/helpers/eval.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/helpers/eval.rb 2015-08-20 17:06:59.000000000 +0200
@@ -19,8 +19,6 @@
# @param expression [String] Expression to evaluate
#
def single_thread_eval(expression)
- return error_eval(expression) if Setting[:stack_on_error]
-
warning_eval(expression)
end
@@ -29,9 +27,7 @@
# returning nil in an error happens.
#
def silent_eval(str, binding = frame._binding)
- binding.eval(str)
- rescue StandardError, ScriptError
- nil
+ safe_eval(str, binding) { |_e| nil }
end
#
@@ -39,7 +35,7 @@
# handling the errors at an error level.
#
def error_eval(str, binding = frame._binding)
- safe_eval(str, binding) { |e| error_msg(e) }
+ safe_eval(str, binding) { |e| fail(e, msg(e)) }
end
#
@@ -47,7 +43,7 @@
# handling the errors at a warning level.
#
def warning_eval(str, binding = frame._binding)
- safe_eval(str, binding) { |e| warning_msg(e) }
+ safe_eval(str, binding) { |e| errmsg(msg(e)) }
end
private
@@ -55,19 +51,25 @@
def safe_eval(str, binding)
binding.eval(str)
rescue StandardError, ScriptError => e
- raise(e, yield(e))
+ yield(e)
+ end
+
+ def msg(e)
+ msg = Setting[:stack_on_error] ? error_msg(e) : warning_msg(e)
+
+ pr('eval.exception', text_message: msg)
end
def error_msg(e)
at = e.backtrace
- locations = ["#{at.shift}: #{e.class} Exception(#{e.message})"]
- locations += at.map { |path| "\tfrom #{path}" }
- pr('eval.exception', text_message: locations.join("\n"))
+ locations = ["#{at.shift}: #{warning_msg(e)}"]
+ locations += at.map { |path| "\tfrom #{path}" }
+ locations.join("\n")
end
def warning_msg(e)
- pr('eval.exception', text_message: "#{e.class} Exception: #{e.message}")
+ "#{e.class} Exception: #{e.message}"
end
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/helpers/parse.rb new/lib/byebug/helpers/parse.rb
--- old/lib/byebug/helpers/parse.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/helpers/parse.rb 2015-08-20 17:06:59.000000000 +0200
@@ -14,17 +14,16 @@
#
def get_int(str, cmd, min = nil, max = nil)
if str !~ /\A-?[0-9]+\z/
- err = pr('parse.errors.int.not_number', cmd: cmd, str: str)
- return nil, errmsg(err)
+ return nil, pr('parse.errors.int.not_number', cmd: cmd, str: str)
end
int = str.to_i
if min && int < min
err = pr('parse.errors.int.too_low', cmd: cmd, str: str, min: min)
- return min, errmsg(err)
+ return nil, err
elsif max && int > max
err = pr('parse.errors.int.too_high', cmd: cmd, str: str, max: max)
- return max, errmsg(err)
+ return nil, err
end
int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/helpers/thread.rb new/lib/byebug/helpers/thread.rb
--- old/lib/byebug/helpers/thread.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/helpers/thread.rb 2015-08-20 17:06:59.000000000 +0200
@@ -9,30 +9,12 @@
end
def thread_arguments(ctx)
- status_flag = if ctx.suspended?
- '$'
- else
- current_thread?(ctx) ? '+' : ' '
- end
-
- debug_flag = ctx.ignored? ? '!' : ' '
-
- # Check whether it is Byebug.current_context or context
- if ctx == Byebug.current_context
- file_line = context.location
- else
- backtrace = ctx.thread.backtrace_locations
- if backtrace && backtrace[0]
- file_line = "#{backtrace[0].path}:#{backtrace[0].lineno}"
- end
- end
-
{
- status_flag: status_flag,
- debug_flag: debug_flag,
+ status_flag: status_flag(ctx),
+ debug_flag: debug_flag(ctx),
id: ctx.thnum,
thread: ctx.thread.inspect,
- file_line: file_line || '',
+ file_line: location(ctx),
pid: Process.pid,
status: ctx.thread.status,
current: current_thread?(ctx)
@@ -54,6 +36,28 @@
[ctx, err]
end
+
+ private
+
+ # TODO: Check whether it is Byebug.current_context or context
+ def location(ctx)
+ return context.location if ctx == Byebug.current_context
+
+ backtrace = ctx.thread.backtrace_locations
+ return '' unless backtrace && backtrace[0]
+
+ "#{backtrace[0].path}:#{backtrace[0].lineno}"
+ end
+
+ def status_flag(ctx)
+ return '$' if ctx.suspended?
+
+ current_thread?(ctx) ? '+' : ' '
+ end
+
+ def debug_flag(ctx)
+ ctx.ignored? ? '!' : ' '
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/processors/command_processor.rb new/lib/byebug/processors/command_processor.rb
--- old/lib/byebug/processors/command_processor.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/processors/command_processor.rb 2015-08-20 17:06:59.000000000 +0200
@@ -157,7 +157,7 @@
puts thread_safe_eval(input)
rescue => e
- errmsg(e)
+ errmsg(e.message)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/settings/autoeval.rb new/lib/byebug/settings/autoeval.rb
--- old/lib/byebug/settings/autoeval.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/settings/autoeval.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-require 'byebug/setting'
-
-module Byebug
- #
- # Setting for automatic evaluation of unknown commands.
- #
- class AutoevalSetting < Setting
- DEFAULT = true
-
- def banner
- 'Automatically evaluate unrecognized commands'
- end
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/subcommands.rb new/lib/byebug/subcommands.rb
--- old/lib/byebug/subcommands.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/subcommands.rb 2015-08-20 17:06:59.000000000 +0200
@@ -19,10 +19,11 @@
# Delegates to subcommands or prints help if no subcommand specified.
#
def execute
- return puts(help) unless @match[1]
+ subcmd_name = @match[1]
+ return puts(help) unless subcmd_name
- subcmd = subcommand_list.match(@match[1])
- fail CommandNotFound.new(@match[1], self.class) unless subcmd
+ subcmd = subcommand_list.match(subcmd_name)
+ fail CommandNotFound.new(subcmd_name, self.class) unless subcmd
subcmd.new(processor, arguments).execute
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/byebug/version.rb new/lib/byebug/version.rb
--- old/lib/byebug/version.rb 2015-08-18 01:32:12.000000000 +0200
+++ new/lib/byebug/version.rb 2015-08-20 17:06:59.000000000 +0200
@@ -2,5 +2,5 @@
# Reopen main module to define the library version
#
module Byebug
- VERSION = '6.0.0'
+ VERSION = '6.0.2'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-08-18 01:32:12.000000000 +0200
+++ new/metadata 2015-08-20 17:06:59.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: byebug
version: !ruby/object:Gem::Version
- version: 6.0.0
+ version: 6.0.2
platform: ruby
authors:
- David Rodriguez
@@ -10,7 +10,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: bundler
@@ -152,7 +152,6 @@
- lib/byebug/remote.rb
- lib/byebug/runner.rb
- lib/byebug/setting.rb
-- lib/byebug/settings/autoeval.rb
- lib/byebug/settings/autoirb.rb
- lib/byebug/settings/autolist.rb
- lib/byebug/settings/autosave.rb
@@ -189,7 +188,7 @@
version: '0'
requirements: []
rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
signing_key:
specification_version: 4
summary: Ruby 2.0 fast debugger - base + CLI
1
0
Hello community,
here is the log from the commit of package percona-toolkit for openSUSE:Factory checked in at 2015-08-29 20:05:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/percona-toolkit (Old)
and /work/SRC/openSUSE:Factory/.percona-toolkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "percona-toolkit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/percona-toolkit/percona-toolkit.changes 2015-04-15 16:24:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.percona-toolkit.new/percona-toolkit.changes 2015-08-29 20:05:20.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Aug 28 20:47:12 UTC 2015 - astieger(a)suse.com
+
+- Percona Toolkit 2.2.15
+- New features:
+ * Flow control in clusters:
+ pt-online-schema-change: add --max-flow-ctl option
+ pt-archiver: add --max-flow-ctl option
+ * pt-online-schema-change: add --sleep option
+ * pt-archiver: add ability to specify --check-slave-lag multiple
+ times for multiple slaves
+ * pt-kill: add --rds option to use Amazon RDS procedure calls
+ instead of the standard MySQL kill command.
+- Various bug fixes
+
+-------------------------------------------------------------------
Old:
----
percona-toolkit-2.2.14.tar.gz
New:
----
percona-toolkit-2.2.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ percona-toolkit.spec ++++++
--- /var/tmp/diff_new_pack.kY7hl7/_old 2015-08-29 20:05:21.000000000 +0200
+++ /var/tmp/diff_new_pack.kY7hl7/_new 2015-08-29 20:05:21.000000000 +0200
@@ -17,7 +17,7 @@
Name: percona-toolkit
-Version: 2.2.14
+Version: 2.2.15
Release: 0
Summary: Advanced MySQL and system command-line tools
License: GPL-2.0
++++++ percona-toolkit-2.2.14.tar.gz -> percona-toolkit-2.2.15.tar.gz ++++++
++++ 2650 lines of diff (skipped)
++++++ percona-toolkit-2.2.x-disable-default-version-check.patch ++++++
--- /var/tmp/diff_new_pack.kY7hl7/_old 2015-08-29 20:05:21.000000000 +0200
+++ /var/tmp/diff_new_pack.kY7hl7/_new 2015-08-29 20:05:21.000000000 +0200
@@ -40,11 +40,11 @@
bin/pt-variable-advisor | 2 --
18 files changed, 36 deletions(-)
-Index: percona-toolkit-2.2.14/bin/pt-archiver
+Index: percona-toolkit-2.2.15/bin/pt-archiver
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-archiver 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-archiver 2015-04-14 21:58:15.000000000 +0200
-@@ -7483,8 +7483,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-archiver 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-archiver 2015-08-28 22:46:44.000000000 +0200
+@@ -7948,8 +7948,6 @@ Show version and exit.
=item --[no]version-check
@@ -53,11 +53,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-config-diff
+Index: percona-toolkit-2.2.15/bin/pt-config-diff
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-config-diff 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-config-diff 2015-04-14 21:58:15.000000000 +0200
-@@ -5613,8 +5613,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-config-diff 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-config-diff 2015-08-28 22:46:44.000000000 +0200
+@@ -5618,8 +5618,6 @@ Show version and exit.
=item --[no]version-check
@@ -66,11 +66,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-deadlock-logger
+Index: percona-toolkit-2.2.15/bin/pt-deadlock-logger
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-deadlock-logger 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-deadlock-logger 2015-04-14 21:58:15.000000000 +0200
-@@ -5398,8 +5398,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-deadlock-logger 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-deadlock-logger 2015-08-28 22:46:44.000000000 +0200
+@@ -5404,8 +5404,6 @@ Show version and exit.
=item --[no]version-check
@@ -79,11 +79,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-diskstats
+Index: percona-toolkit-2.2.15/bin/pt-diskstats
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-diskstats 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-diskstats 2015-04-14 21:58:15.000000000 +0200
-@@ -5475,8 +5475,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-diskstats 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-diskstats 2015-08-28 22:46:44.000000000 +0200
+@@ -5480,8 +5480,6 @@ Show version and exit.
=item --[no]version-check
@@ -92,11 +92,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-duplicate-key-checker
+Index: percona-toolkit-2.2.15/bin/pt-duplicate-key-checker
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-duplicate-key-checker 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-duplicate-key-checker 2015-04-14 21:58:15.000000000 +0200
-@@ -5450,8 +5450,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-duplicate-key-checker 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-duplicate-key-checker 2015-08-28 22:46:44.000000000 +0200
+@@ -5456,8 +5456,6 @@ Show version and exit.
=item --[no]version-check
@@ -105,11 +105,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-find
+Index: percona-toolkit-2.2.15/bin/pt-find
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-find 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-find 2015-04-14 21:58:15.000000000 +0200
-@@ -4447,8 +4447,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-find 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-find 2015-08-28 22:46:44.000000000 +0200
+@@ -4453,8 +4453,6 @@ Show version and exit.
=item --[no]version-check
@@ -118,11 +118,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-fk-error-logger
+Index: percona-toolkit-2.2.15/bin/pt-fk-error-logger
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-fk-error-logger 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-fk-error-logger 2015-04-14 21:58:15.000000000 +0200
-@@ -4385,8 +4385,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-fk-error-logger 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-fk-error-logger 2015-08-28 22:46:44.000000000 +0200
+@@ -4391,8 +4391,6 @@ Show version and exit.
=item --[no]version-check
@@ -131,11 +131,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-heartbeat
+Index: percona-toolkit-2.2.15/bin/pt-heartbeat
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-heartbeat 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-heartbeat 2015-04-14 21:58:15.000000000 +0200
-@@ -6058,8 +6058,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-heartbeat 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-heartbeat 2015-08-28 22:46:44.000000000 +0200
+@@ -6064,8 +6064,6 @@ Show version and exit.
=item --[no]version-check
@@ -144,11 +144,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-index-usage
+Index: percona-toolkit-2.2.15/bin/pt-index-usage
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-index-usage 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-index-usage 2015-04-14 21:58:15.000000000 +0200
-@@ -7384,8 +7384,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-index-usage 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-index-usage 2015-08-28 22:46:44.000000000 +0200
+@@ -7390,8 +7390,6 @@ Show version and exit.
=item --[no]version-check
@@ -157,11 +157,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-kill
+Index: percona-toolkit-2.2.15/bin/pt-kill
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-kill 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-kill 2015-04-14 21:58:15.000000000 +0200
-@@ -7711,8 +7711,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-kill 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-kill 2015-08-28 22:46:44.000000000 +0200
+@@ -7731,8 +7731,6 @@ Show version and exit.
=item --[no]version-check
@@ -170,11 +170,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-online-schema-change
+Index: percona-toolkit-2.2.15/bin/pt-online-schema-change
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-online-schema-change 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-online-schema-change 2015-04-14 21:58:15.000000000 +0200
-@@ -11586,8 +11586,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-online-schema-change 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-online-schema-change 2015-08-28 22:46:44.000000000 +0200
+@@ -11641,8 +11641,6 @@ Show version and exit.
=item --[no]version-check
@@ -183,11 +183,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-query-digest
+Index: percona-toolkit-2.2.15/bin/pt-query-digest
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-query-digest 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-query-digest 2015-04-14 21:58:15.000000000 +0200
-@@ -16308,8 +16308,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-query-digest 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-query-digest 2015-08-28 22:46:44.000000000 +0200
+@@ -16326,8 +16326,6 @@ Show version and exit.
=item --[no]version-check
@@ -196,11 +196,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-slave-delay
+Index: percona-toolkit-2.2.15/bin/pt-slave-delay
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-slave-delay 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-slave-delay 2015-04-14 21:58:15.000000000 +0200
-@@ -4705,8 +4705,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-slave-delay 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-slave-delay 2015-08-28 22:46:44.000000000 +0200
+@@ -4711,8 +4711,6 @@ Show version and exit.
=item --[no]version-check
@@ -209,11 +209,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-slave-restart
+Index: percona-toolkit-2.2.15/bin/pt-slave-restart
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-slave-restart 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-slave-restart 2015-04-14 21:58:15.000000000 +0200
-@@ -5771,8 +5771,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-slave-restart 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-slave-restart 2015-08-28 22:46:44.000000000 +0200
+@@ -5777,8 +5777,6 @@ Show version and exit.
=item --[no]version-check
@@ -222,11 +222,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-table-checksum
+Index: percona-toolkit-2.2.15/bin/pt-table-checksum
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-table-checksum 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-table-checksum 2015-04-14 21:58:15.000000000 +0200
-@@ -12534,8 +12534,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-table-checksum 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-table-checksum 2015-08-28 22:46:44.000000000 +0200
+@@ -12540,8 +12540,6 @@ Show version and exit.
=item --[no]version-check
@@ -235,11 +235,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-table-sync
+Index: percona-toolkit-2.2.15/bin/pt-table-sync
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-table-sync 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-table-sync 2015-04-14 21:58:15.000000000 +0200
-@@ -12521,8 +12521,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-table-sync 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-table-sync 2015-08-28 22:46:44.000000000 +0200
+@@ -12527,8 +12527,6 @@ Show version and exit.
=item --[no]version-check
@@ -248,11 +248,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-upgrade
+Index: percona-toolkit-2.2.15/bin/pt-upgrade
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-upgrade 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-upgrade 2015-04-14 21:58:15.000000000 +0200
-@@ -11096,8 +11096,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-upgrade 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-upgrade 2015-08-28 22:46:44.000000000 +0200
+@@ -11101,8 +11101,6 @@ Show version and exit.
=item --[no]version-check
@@ -261,11 +261,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.14/bin/pt-variable-advisor
+Index: percona-toolkit-2.2.15/bin/pt-variable-advisor
===================================================================
---- percona-toolkit-2.2.14.orig/bin/pt-variable-advisor 2015-04-10 11:12:11.000000000 +0200
-+++ percona-toolkit-2.2.14/bin/pt-variable-advisor 2015-04-14 21:58:15.000000000 +0200
-@@ -5975,8 +5975,6 @@ Show version and exit.
+--- percona-toolkit-2.2.15.orig/bin/pt-variable-advisor 2015-08-27 17:43:44.000000000 +0200
++++ percona-toolkit-2.2.15/bin/pt-variable-advisor 2015-08-28 22:46:44.000000000 +0200
+@@ -5981,8 +5981,6 @@ Show version and exit.
=item --[no]version-check
1
0
Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-08-29 20:05:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2015-08-27 08:57:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-08-29 20:05:18.000000000 +0200
@@ -1,0 +2,30 @@
+Fri Aug 28 17:41:30 UTC 2015 - jfehlig(a)suse.com
+
+- Replace local libxl patches with upstream variants
+ Dropped:
+ 0003-libxl-fix-ref-counting-of-libxlMigrationDstArgs.patch
+ 0004-libxl-don-t-attempt-to-resume-domain-when-suspend-fa.patch
+ 0005-libxl-acquire-a-job-when-receiving-a-migrating-domai.patch
+ Added:
+ 44a54eb0-libxl-fix-refcnt-MigrationDstArgs.patch
+ 15120b8c-libxl-no-resume-on-suspend-fail.patch
+ e80b84a7-libxl-acquire-job-on-migrate.patch
+ bsc#936185
+- Added another virt-aa-helper upstream patch
+ 52970dec-virt-aa-helper-improve-valid-path.patch
+ lp#1483071
+- Added upstream patch to fix libvirt-tck memory balloon test
+ failure on Xen
+ 60acb38-revert-curmem-inactive-dom.patch
+
+-------------------------------------------------------------------
+Wed Aug 26 14:38:40 UTC 2015 - cbosdonnat(a)suse.com
+
+- Fix generated apparmor profile to allow access to ovmf and nvram.
+ 26c5fa3a-virt-aa-helper-missing-doc.patch
+ 2f01cfdf-virt-aa-helper-allow-ovmf.patch
+ 91fdcefa-virt-aa-helper-allow-nvram.patch
+ d25a5e08-virt-aa-helper-simplify-restriction-logic.patch
+ lp#1483071
+
+-------------------------------------------------------------------
Old:
----
0003-libxl-fix-ref-counting-of-libxlMigrationDstArgs.patch
0004-libxl-don-t-attempt-to-resume-domain-when-suspend-fa.patch
0005-libxl-acquire-a-job-when-receiving-a-migrating-domai.patch
New:
----
15120b8c-libxl-no-resume-on-suspend-fail.patch
26c5fa3a-virt-aa-helper-missing-doc.patch
2f01cfdf-virt-aa-helper-allow-ovmf.patch
44a54eb0-libxl-fix-refcnt-MigrationDstArgs.patch
52970dec-virt-aa-helper-improve-valid-path.patch
60acb38-revert-curmem-inactive-dom.patch
91fdcefa-virt-aa-helper-allow-nvram.patch
d25a5e08-virt-aa-helper-simplify-restriction-logic.patch
e80b84a7-libxl-acquire-job-on-migrate.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.6XsSsk/_old 2015-08-29 20:05:20.000000000 +0200
+++ /var/tmp/diff_new_pack.6XsSsk/_new 2015-08-29 20:05:20.000000000 +0200
@@ -447,10 +447,16 @@
Source99: baselibs.conf
# Upstream patches
Patch0: 269d39af-storage-allocation-fix.patch
+Patch1: 26c5fa3a-virt-aa-helper-missing-doc.patch
+Patch2: d25a5e08-virt-aa-helper-simplify-restriction-logic.patch
+Patch3: 2f01cfdf-virt-aa-helper-allow-ovmf.patch
+Patch4: 91fdcefa-virt-aa-helper-allow-nvram.patch
+Patch5: 52970dec-virt-aa-helper-improve-valid-path.patch
+Patch6: 44a54eb0-libxl-fix-refcnt-MigrationDstArgs.patch
+Patch7: 15120b8c-libxl-no-resume-on-suspend-fail.patch
+Patch8: e80b84a7-libxl-acquire-job-on-migrate.patch
+Patch9: 60acb38-revert-curmem-inactive-dom.patch
# Patches pending upstream review
-Patch100: 0003-libxl-fix-ref-counting-of-libxlMigrationDstArgs.patch
-Patch101: 0004-libxl-don-t-attempt-to-resume-domain-when-suspend-fa.patch
-Patch102: 0005-libxl-acquire-a-job-when-receiving-a-migrating-domai.patch
# Need to go upstream
Patch150: xen-pv-cdrom.patch
Patch151: blockcopy-check-dst-identical-device.patch
@@ -981,9 +987,15 @@
%prep
%setup -q
%patch0 -p1
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
++++++ 15120b8c-libxl-no-resume-on-suspend-fail.patch ++++++
commit 15120b8c61014a9263cb53314076da9a44e39621
Author: Jim Fehlig <jfehlig(a)suse.com>
Date: Wed Jul 15 17:29:15 2015 -0600
libxl: don't attempt to resume domain when suspend fails
Failure of libxl_domain_suspend() does not leave the domain in
a suspended state, so no need to call libxl_domain_resume(),
which btw will fail with "domain not suspended".
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
Index: libvirt-1.2.18/src/libxl/libxl_migration.c
===================================================================
--- libvirt-1.2.18.orig/src/libxl/libxl_migration.c
+++ libvirt-1.2.18/src/libxl/libxl_migration.c
@@ -178,7 +178,6 @@ libxlDoMigrateSend(libxlDriverPrivatePtr
int sockfd)
{
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
- virObjectEventPtr event = NULL;
int xl_flags = 0;
int ret;
@@ -188,24 +187,11 @@ libxlDoMigrateSend(libxlDriverPrivatePtr
ret = libxl_domain_suspend(cfg->ctx, vm->def->id, sockfd,
xl_flags, NULL);
if (ret != 0) {
- /* attempt to resume the domain on failure */
- if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) != 0) {
- VIR_DEBUG("Failed to resume domain following failed migration");
- virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
- VIR_DOMAIN_PAUSED_MIGRATION);
- event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED,
- VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED);
- ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm));
- }
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to send migration data to destination host"));
ret = -1;
- goto cleanup;
}
- cleanup:
- if (event)
- libxlDomainEventQueue(driver, event);
virObjectUnref(cfg);
return ret;
}
++++++ 26c5fa3a-virt-aa-helper-missing-doc.patch ++++++
>From 26c5fa3a9bd37624ddd1509daf7d6a84268f089e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org>
Date: Fri, 21 Aug 2015 12:29:25 +0200
Subject: [PATCH 1/4] virt-aa-helper: document --probing and --dry-run
---
src/security/virt-aa-helper.c | 2 ++
1 file changed, 2 insertions(+)
Index: libvirt-1.2.18/src/security/virt-aa-helper.c
===================================================================
--- libvirt-1.2.18.orig/src/security/virt-aa-helper.c
+++ libvirt-1.2.18/src/security/virt-aa-helper.c
@@ -107,12 +107,14 @@ vah_usage(void)
" Options:\n"
" -a | --add load profile\n"
" -c | --create create profile from template\n"
+ " -d | --dry-run dry run\n"
" -D | --delete unload and delete profile\n"
" -f | --add-file <file> add file to profile\n"
" -F | --append-file <file> append file to profile\n"
" -r | --replace reload profile\n"
" -R | --remove unload profile\n"
" -h | --help this help\n"
+ " -p | --probing [0|1] allow disk format probing\n"
" -u | --uuid <uuid> uuid (profile name)\n"
"\n"), progname);
++++++ 2f01cfdf-virt-aa-helper-allow-ovmf.patch ++++++
>From 2f01cfdf05448513d150ff1914d3444161c531b9 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri(a)debian.org>
Date: Fri, 21 Aug 2015 10:52:52 +0200
Subject: [PATCH 3/4] virt-aa-helper: allow access to /usr/share/ovmf/
We forbid access to /usr/share/, but (at least on Debian-based systems)
the Open Virtual Machine Firmware files needed for booting UEFI virtual
machines in QEMU live in /usr/share/ovmf/. Therefore, we need to add
that directory to the list of read only paths.
A similar patch was suggested by Jamie Strandboge <jamie(a)canonical.com>
on https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1483071.
---
src/security/virt-aa-helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: libvirt-1.2.18/src/security/virt-aa-helper.c
===================================================================
--- libvirt-1.2.18.orig/src/security/virt-aa-helper.c
+++ libvirt-1.2.18/src/security/virt-aa-helper.c
@@ -572,7 +572,8 @@ valid_path(const char *path, const bool
"/boot/",
"/vmlinuz",
"/initrd",
- "/initrd.img"
+ "/initrd.img",
+ "/usr/share/ovmf/" /* for OVMF images */
};
/* override the above with these */
const char * const override[] = {
++++++ 44a54eb0-libxl-fix-refcnt-MigrationDstArgs.patch ++++++
commit 44a54eb073d2ae52ebf1661ae73bb1f0f98599f9
Author: Jim Fehlig <jfehlig(a)suse.com>
Date: Wed Jul 15 16:35:50 2015 -0600
libxl: fix ref counting of libxlMigrationDstArgs
This patch fixes some flawed logic around ref counting the
libxlMigrationDstArgs object.
First, when adding sockets to the event loop with
virNetSocketAddIOCallback(), the generic virObjectFreeCallback()
was registered as a free function, with libxlMigrationDstArgs as
its parameter. A reference was also taken on
libxlMigrationDstArgs for each successful call to
virNetSocketAddIOCallback(). The rational behind this logic was
that the libxlMigrationDstArgs object had to out-live the socket
objects. But virNetSocketAddIOCallback() already takes a
reference on socket objects, ensuring their life until removed
from the event loop and unref'ed in virNetSocketEventFree(). We
only need to ensure libxlMigrationDstArgs lives until
libxlDoMigrateReceive() finishes, which can be done by simply
unref'ing libxlMigrationDstArgs at the end of
libxlDoMigrateReceive().
The second flaw was unref'ing the sockets in the failure path of
libxlMigrateReceive() and at the end of libxlDoMigrateReceive().
As mentioned above, the sockets are already unref'ed by
virNetSocketEventFree() when removed from the event loop.
Attempting to unref the socket a second time resulted in a
libvirtd crash since the socket was previously unref'ed and
disposed.
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
Index: libvirt-1.2.18/src/libxl/libxl_migration.c
===================================================================
--- libvirt-1.2.18.orig/src/libxl/libxl_migration.c
+++ libvirt-1.2.18/src/libxl/libxl_migration.c
@@ -109,7 +109,6 @@ libxlDoMigrateReceive(void *opaque)
/* Remove all listen socks from event handler, and close them. */
for (i = 0; i < nsocks; i++) {
- virNetSocketUpdateIOCallback(socks[i], 0);
virNetSocketRemoveIOCallback(socks[i]);
virNetSocketClose(socks[i]);
virObjectUnref(socks[i]);
@@ -117,6 +116,7 @@ libxlDoMigrateReceive(void *opaque)
}
args->nsocks = 0;
VIR_FORCE_CLOSE(recvfd);
+ virObjectUnref(args);
}
@@ -164,11 +164,11 @@ libxlMigrateReceive(virNetSocketPtr sock
virNetSocketUpdateIOCallback(socks[i], 0);
virNetSocketRemoveIOCallback(socks[i]);
virNetSocketClose(socks[i]);
- virObjectUnref(socks[i]);
socks[i] = NULL;
}
args->nsocks = 0;
VIR_FORCE_CLOSE(recvfd);
+ virObjectUnref(args);
}
static int
@@ -318,7 +318,7 @@ libxlDomainMigrationPrepare(virConnectPt
virNetSocketPtr *socks = NULL;
size_t nsocks = 0;
int nsocks_listen = 0;
- libxlMigrationDstArgs *args;
+ libxlMigrationDstArgs *args = NULL;
size_t i;
int ret = -1;
@@ -420,22 +420,12 @@ libxlDomainMigrationPrepare(virConnectPt
VIR_EVENT_HANDLE_READABLE,
libxlMigrateReceive,
args,
- virObjectFreeCallback) < 0)
+ NULL) < 0)
continue;
- /*
- * Successfully added sock to event loop. Take a ref on args to
- * ensure it is not freed until sock is removed from the event loop.
- * Ref is dropped in virObjectFreeCallback after being removed
- * from the event loop.
- */
- virObjectRef(args);
nsocks_listen++;
}
- /* Done with args in this function, drop reference */
- virObjectUnref(args);
-
if (!nsocks_listen)
goto error;
@@ -448,6 +438,8 @@ libxlDomainMigrationPrepare(virConnectPt
virObjectUnref(socks[i]);
}
VIR_FREE(socks);
+ virObjectUnref(args);
+
/* Remove virDomainObj from domain list */
if (vm) {
virDomainObjListRemove(driver->domains, vm);
++++++ 52970dec-virt-aa-helper-improve-valid-path.patch ++++++
commit 52970dec5b4d0fd1a9baa593b46a33bd7eeaf6b8
Author: Michal Privoznik <mprivozn(a)redhat.com>
Date: Thu Aug 27 02:50:21 2015 +0200
virt-aa-helper: Improve valid_path
So, after some movement in virt-aa-helper, I've noticed the
virt-aa-helper-test failing. I've ran gdb (it took me a while to
realize how to do that) and this showed up immediately:
Program received signal SIGSEGV, Segmentation fault.
strlen () at ../sysdeps/x86_64/strlen.S:106
106 ../sysdeps/x86_64/strlen.S: No such file or directory.
(gdb) bt
#0 strlen () at ../sysdeps/x86_64/strlen.S:106
#1 0x0000555555561a13 in array_starts_with (str=0x5555557ce910 "/tmp/tmp.6nI2Fkv0KL/1.img", arr=0x7fffffffd160, size=-1540438016) at security/virt-aa-helper.c:525
#2 0x0000555555561d49 in valid_path (path=0x5555557ce910 "/tmp/tmp.6nI2Fkv0KL/1.img", readonly=false) at security/virt-aa-helper.c:617
#3 0x0000555555562506 in vah_add_path (buf=0x7fffffffd3e0, path=0x5555557cb910 "/tmp/tmp.6nI2Fkv0KL/1.img", perms=0x555555581585 "rw", recursive=false) at security/virt-aa-helper.c:823
#4 0x0000555555562693 in vah_add_file (buf=0x7fffffffd3e0, path=0x5555557cb910 "/tmp/tmp.6nI2Fkv0KL/1.img", perms=0x555555581585 "rw") at security/virt-aa-helper.c:854
#5 0x0000555555562918 in add_file_path (disk=0x5555557d4440, path=0x5555557cb910 "/tmp/tmp.6nI2Fkv0KL/1.img", depth=0, opaque=0x7fffffffd3e0) at security/virt-aa-helper.c:931
#6 0x00007ffff78f18b1 in virDomainDiskDefForeachPath (disk=0x5555557d4440, ignoreOpenFailure=true, iter=0x5555555628a6 <add_file_path>, opaque=0x7fffffffd3e0) at conf/domain_conf.c:23286
#7 0x0000555555562b5f in get_files (ctl=0x7fffffffd670) at security/virt-aa-helper.c:982
#8 0x0000555555564100 in vahParseArgv (ctl=0x7fffffffd670, argc=5, argv=0x7fffffffd7e8) at security/virt-aa-helper.c:1277
#9 0x00005555555643d6 in main (argc=5, argv=0x7fffffffd7e8) at security/virt-aa-helper.c:1332
So I've taken look at valid_path() because it is obviously
calling array_starts_with() with malformed @size. And here's the
result: there are two variables to hold the size of three arrays
and their value is recalculated before each call of
array_starts_with(). What if we just use three variables,
initialize them and do not touch them afterwards?
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Index: libvirt-1.2.18/src/security/virt-aa-helper.c
===================================================================
--- libvirt-1.2.18.orig/src/security/virt-aa-helper.c
+++ libvirt-1.2.18/src/security/virt-aa-helper.c
@@ -546,9 +546,6 @@ array_starts_with(const char *str, const
static int
valid_path(const char *path, const bool readonly)
{
- int npaths;
- int nropaths;
-
const char * const restricted[] = {
"/bin/",
"/etc/",
@@ -581,6 +578,10 @@ valid_path(const char *path, const bool
"/etc/libvirt-sandbox/services/" /* for virt-sandbox service config */
};
+ const int nropaths = ARRAY_CARDINALITY(restricted);
+ const int nrwpaths = ARRAY_CARDINALITY(restricted_rw);
+ const int nopaths = ARRAY_CARDINALITY(override);
+
if (path == NULL) {
vah_error(NULL, 0, _("bad pathname"));
return -1;
@@ -600,21 +601,18 @@ valid_path(const char *path, const bool
vah_warning(_("path does not exist, skipping file type checks"));
/* overrides are always allowed */
- npaths = sizeof(override)/sizeof(*(override));
- if (array_starts_with(path, override, npaths) == 0)
+ if (array_starts_with(path, override, nopaths) == 0)
return 0;
/* allow read only paths upfront */
if (readonly) {
- nropaths = sizeof(restricted_rw)/sizeof(*(restricted_rw));
- if (array_starts_with(path, restricted_rw, nropaths) == 0)
+ if (array_starts_with(path, restricted_rw, nrwpaths) == 0)
return 0;
}
/* disallow RW acess to all paths in restricted and restriced_rw */
- npaths = sizeof(restricted)/sizeof(*(restricted));
- if ((array_starts_with(path, restricted, npaths) == 0
- || array_starts_with(path, restricted_rw, nropaths) == 0))
+ if ((array_starts_with(path, restricted, nropaths) == 0 ||
+ array_starts_with(path, restricted_rw, nrwpaths) == 0))
return 1;
return 0;
++++++ 60acb38-revert-curmem-inactive-dom.patch ++++++
commit 60acb38abbee1636a9cddf8d296f700d115c8f77
Author: Jim Fehlig <jfehlig(a)suse.com>
Date: Mon Aug 10 12:49:55 2015 -0600
Revert "LXC: show used memory as 0 when domain is not active"
This reverts commit 1ce7c1d20cfd5afb26d2dbc88201085d52415d0e,
which introduced a significant semantic change to the
virDomainGetInfo() API. Additionally, the change was only
made to 2 of the 15 virt drivers.
Conflicts:
src/qemu/qemu_driver.c
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
Index: libvirt-1.2.18/src/lxc/lxc_driver.c
===================================================================
--- libvirt-1.2.18.orig/src/lxc/lxc_driver.c
+++ libvirt-1.2.18/src/lxc/lxc_driver.c
@@ -597,7 +597,7 @@ static int lxcDomainGetInfo(virDomainPtr
if (!virDomainObjIsActive(vm)) {
info->cpuTime = 0;
- info->memory = 0;
+ info->memory = vm->def->mem.cur_balloon;
} else {
if (virCgroupGetCpuacctUsage(priv->cgroup, &(info->cpuTime)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED,
Index: libvirt-1.2.18/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.2.18.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.18/src/qemu/qemu_driver.c
@@ -2641,13 +2641,13 @@ qemuDomainGetInfo(virDomainPtr dom,
goto cleanup;
}
- if (virDomainObjIsActive(vm)) {
- if (VIR_ASSIGN_IS_OVERFLOW(info->memory, vm->def->mem.cur_balloon)) {
- virReportError(VIR_ERR_OVERFLOW, "%s",
- _("Current memory size too large"));
- goto cleanup;
- }
+ if (VIR_ASSIGN_IS_OVERFLOW(info->memory, vm->def->mem.cur_balloon)) {
+ virReportError(VIR_ERR_OVERFLOW, "%s",
+ _("Current memory size too large"));
+ goto cleanup;
+ }
+ if (virDomainObjIsActive(vm)) {
if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("cannot read cputime for domain"));
++++++ 91fdcefa-virt-aa-helper-allow-nvram.patch ++++++
>From 91fdcefa7f145c1c39acc8e9a44fbfbf11568e54 Mon Sep 17 00:00:00 2001
From: Peter Kieser <peter(a)kieser.ca>
Date: Thu, 20 Aug 2015 10:58:59 -0700
Subject: [PATCH 4/4] virt-aa-helper: add NVRAM store file for read/write
This is a cryptographically signed message in MIME format.
Some UEFI firmwares may want to use a non-volatile memory to store some
variables.
If AppArmor is enabled, and NVRAM store file is set currently
virt-aa-helper does
not add the NVRAM store file to the template. Add this file for
read/write when
this functionality is defined in domain XML.
Signed-off-by: Peter Kieser <peter(a)kieser.ca>
---
src/security/virt-aa-helper.c | 4 ++++
1 file changed, 4 insertions(+)
Index: libvirt-1.2.18/src/security/virt-aa-helper.c
===================================================================
--- libvirt-1.2.18.orig/src/security/virt-aa-helper.c
+++ libvirt-1.2.18/src/security/virt-aa-helper.c
@@ -1057,6 +1057,10 @@ get_files(vahControl * ctl)
if (vah_add_file(&buf, ctl->def->os.loader->path, "r") != 0)
goto cleanup;
+ if (ctl->def->os.loader && ctl->def->os.loader->nvram)
+ if (vah_add_file(&buf, ctl->def->os.loader->nvram, "rw") != 0)
+ goto cleanup;
+
for (i = 0; i < ctl->def->ngraphics; i++) {
if (ctl->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
ctl->def->graphics[i]->data.vnc.socket &&
++++++ d25a5e08-virt-aa-helper-simplify-restriction-logic.patch ++++++
>From d25a5e087ae10142d3d533ed193146736526b2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org>
Date: Fri, 21 Aug 2015 10:49:15 +0200
Subject: [PATCH 2/4] virt-aa-helper: Simplify restriction logic
First check overrides, then read only files then restricted access
itself.
This allows us to mark files for read only access whose parents were
already restricted for read write.
Based on a proposal by Martin Kletzander
---
src/security/virt-aa-helper.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
Index: libvirt-1.2.18/src/security/virt-aa-helper.c
===================================================================
--- libvirt-1.2.18.orig/src/security/virt-aa-helper.c
+++ libvirt-1.2.18/src/security/virt-aa-helper.c
@@ -546,7 +546,9 @@ array_starts_with(const char *str, const
static int
valid_path(const char *path, const bool readonly)
{
- int npaths, opaths;
+ int npaths;
+ int nropaths;
+
const char * const restricted[] = {
"/bin/",
"/etc/",
@@ -596,18 +598,23 @@ valid_path(const char *path, const bool
if (!virFileExists(path))
vah_warning(_("path does not exist, skipping file type checks"));
- opaths = sizeof(override)/sizeof(*(override));
+ /* overrides are always allowed */
+ npaths = sizeof(override)/sizeof(*(override));
+ if (array_starts_with(path, override, npaths) == 0)
+ return 0;
+
+ /* allow read only paths upfront */
+ if (readonly) {
+ nropaths = sizeof(restricted_rw)/sizeof(*(restricted_rw));
+ if (array_starts_with(path, restricted_rw, nropaths) == 0)
+ return 0;
+ }
+ /* disallow RW acess to all paths in restricted and restriced_rw */
npaths = sizeof(restricted)/sizeof(*(restricted));
- if (array_starts_with(path, restricted, npaths) == 0 &&
- array_starts_with(path, override, opaths) != 0)
- return 1;
-
- npaths = sizeof(restricted_rw)/sizeof(*(restricted_rw));
- if (!readonly) {
- if (array_starts_with(path, restricted_rw, npaths) == 0)
- return 1;
- }
+ if ((array_starts_with(path, restricted, npaths) == 0
+ || array_starts_with(path, restricted_rw, nropaths) == 0))
+ return 1;
return 0;
}
++++++ e80b84a7-libxl-acquire-job-on-migrate.patch ++++++
commit e80b84a74324cd535ec7232c4e1653805af2103a
Author: Jim Fehlig <jfehlig(a)suse.com>
Date: Thu Jul 16 12:24:32 2015 -0600
libxl: acquire a job when receiving a migrating domain
Commit f86ae403 moved acquiring a job from libxlDomainStart()
to its callers. One spot missed was in libxlDoMigrateReceive().
Acquire a job in libxlDoMigrateReceive() before calling
libxlDomainStart().
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
Index: libvirt-1.2.18/src/libxl/libxl_migration.c
===================================================================
--- libvirt-1.2.18.orig/src/libxl/libxl_migration.c
+++ libvirt-1.2.18/src/libxl/libxl_migration.c
@@ -95,17 +95,20 @@ libxlDoMigrateReceive(void *opaque)
int recvfd = args->recvfd;
size_t i;
int ret;
+ bool remove_dom = 0;
+
+ virObjectLock(vm);
+ if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
+ goto cleanup;
/*
* Always start the domain paused. If needed, unpause in the
* finish phase, after transfer of the domain is complete.
*/
- virObjectLock(vm);
ret = libxlDomainStart(driver, vm, true, recvfd);
- virObjectUnlock(vm);
if (ret < 0 && !vm->persistent)
- virDomainObjListRemove(driver->domains, vm);
+ remove_dom = true;
/* Remove all listen socks from event handler, and close them. */
for (i = 0; i < nsocks; i++) {
@@ -117,6 +120,17 @@ libxlDoMigrateReceive(void *opaque)
args->nsocks = 0;
VIR_FORCE_CLOSE(recvfd);
virObjectUnref(args);
+
+ if (!libxlDomainObjEndJob(driver, vm))
+ vm = NULL;
+
+ cleanup:
+ if (remove_dom && vm) {
+ virDomainObjListRemove(driver->domains, vm);
+ vm = NULL;
+ }
+ if (vm)
+ virObjectUnlock(vm);
}
1
0