[docker-io] update to upstream 0.7.1 release
by Vincent Batts
commit 18b2c2f9010d9a6663c3873093f0242821ca44d8
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Fri Dec 6 11:32:15 2013 -0500
update to upstream 0.7.1 release
docker-0.7-remove-dotcloud-tar.patch | 13 -----
docker-0.7.0-iptables-fix.patch | 89 ----------------------------------
docker-0.7.1-loop-defines.patch | 27 ++++++++++
docker-io.spec | 17 +++----
docker-rhel-brctl.patch | 21 --------
5 files changed, 35 insertions(+), 132 deletions(-)
---
diff --git a/docker-0.7.1-loop-defines.patch b/docker-0.7.1-loop-defines.patch
new file mode 100644
index 0000000..d16c205
--- /dev/null
+++ b/docker-0.7.1-loop-defines.patch
@@ -0,0 +1,27 @@
+diff --git a/graphdriver/devmapper/devmapper_wrapper.go b/graphdriver/devmapper/devmapper_wrapper.go
+index 9a36e66..80d430e 100644
+--- a/graphdriver/devmapper/devmapper_wrapper.go
++++ b/graphdriver/devmapper/devmapper_wrapper.go
+@@ -8,6 +8,14 @@ package devmapper
+ #include <linux/loop.h> // FIXME: present only for defines, maybe we can remove it?
+ #include <linux/fs.h> // FIXME: present only for BLKGETSIZE64, maybe we can remove it?
+
++#ifndef LOOP_CTL_GET_FREE
++ #define LOOP_CTL_GET_FREE 0x4C82
++#endif
++
++#ifndef LO_FLAGS_PARTSCAN
++ #define LO_FLAGS_PARTSCAN 8
++#endif
++
+ // FIXME: Can't we find a way to do the logging in pure Go?
+ extern void DevmapperLogCallback(int level, char *file, int line, int dm_errno_or_class, char *str);
+
+@@ -55,7 +63,6 @@ type (
+ }
+ )
+
+-// FIXME: Make sure the values are defined in C
+ // IOCTL consts
+ const (
+ BlkGetSize64 = C.BLKGETSIZE64
diff --git a/docker-io.spec b/docker-io.spec
index 3c032bb..0023e56 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,19 +9,17 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 0ff9bc1be3ae044107732c605986a0af20220134
+%global commit e39d35dedad1db952c30958303902b4c96e1f406
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.7.0
-Release: 14%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
-Patch0: docker-0.7-remove-dotcloud-tar.patch
+Patch0: docker-0.7.1-loop-defines.patch
Patch1: docker-0.7-el6-docs.patch
-Patch2: docker-rhel-brctl.patch
-Patch3: docker-0.7.0-iptables-fix.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -73,12 +71,10 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%patch0 -p1 -b docker-0.7-remove-dotcloud-tar.patch
+%patch0 -p1 -b loop-defines
%if 0%{?rhel} >= 6
%patch1 -p1 -b docker-0.7-el6-docs.patch
-%patch2 -p1 -b brctl
%endif
-%patch3 -p1 -b docker-0.7.0-iptables-fix.patch
%build
mkdir _build
@@ -169,6 +165,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
+* Fri Dec 06 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7.1-1
+- upstream release of v0.7.1
+
* Mon Dec 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-14
- sysvinit patch corrected (epel only)
- 80-docker.rules unified for udisks1 and udisks2
10 years, 4 months
[golang] Created tag golang-1.2-1.fc21
by Vincent Batts
The lightweight tag 'golang-1.2-1.fc21' was created pointing to:
5a84c90... updating to upstream go1.2, with notes on two upstream issu
10 years, 4 months
[golang/f20: 2/2] Merge branch 'master' into f20
by Vincent Batts
commit 2f21c1b8e2dc617275dabc0eff7b093cba0fc4c3
Merge: 3d2e2d5 5a84c90
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed Dec 4 10:33:43 2013 -0500
Merge branch 'master' into f20
.gitignore | 1 +
golang-1.1.2-long-links.patch | 510 --------------------
golang-1.1.2-ustar-split.patch | 62 ---
...e-build.patch => golang-1.2-verbose-build.patch | 14 +-
golang.spec | 57 +--
sources | 2 +-
6 files changed, 27 insertions(+), 619 deletions(-)
---
10 years, 4 months
[golang/f19: 2/2] Merge branch 'master' into f19
by Vincent Batts
commit 0aff087ed36c8131f642ab0f82e6ae904c97cd8f
Merge: d4e31c0 5a84c90
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed Dec 4 10:33:38 2013 -0500
Merge branch 'master' into f19
.gitignore | 1 +
golang-1.1.2-long-links.patch | 510 --------------------
golang-1.1.2-ustar-split.patch | 62 ---
...e-build.patch => golang-1.2-verbose-build.patch | 14 +-
golang.spec | 57 +--
sources | 2 +-
6 files changed, 27 insertions(+), 619 deletions(-)
---
10 years, 4 months
