[docker-io/el6] add audit_write.patch
by Lokesh Mandvekar
commit acd88e77fe3f84efdd41c1c117ea2d773c719ec0
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Aug 1 17:39:11 2014 -0500
add audit_write.patch
audit-write.patch | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 0 deletions(-)
---
diff --git a/audit-write.patch b/audit-write.patch
new file mode 100644
index 0000000..fd8855c
--- /dev/null
+++ b/audit-write.patch
@@ -0,0 +1,105 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>docker-io.git - docker-io</title>
+<meta name='generator' content='cgit v0.10.1'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/docker-io.git/atom/audit-write.patch?h...' type='application/atom+xml'/>
+</head>
+<body>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='docker-io.git' href='/cgit/docker-io.git/'>docker-io.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='el6'>el6</option>
+<option value='epel7'>epel7</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='f21'>f21</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>docker-io</td><td class='sub right'>Jon Ciesla</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/docker-io.git/'>summary</a><a href='/cgit/docker-io.git/refs/'>refs</a><a href='/cgit/docker-io.git/log/audit-write.patch'>log</a><a class='active' href='/cgit/docker-io.git/tree/audit-write.patch'>tree</a><a href='/cgit/docker-io.git/commit/audit-write.patch'>commit</a><a href='/cgit/docker-io.git/diff/audit-write.patch'>diff</a><a href='/cgit/docker-io.git/stats/audit-write.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/docker-io.git/log/audit-write.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/docker-io.git/tree/'>root</a>/<a href='/cgit/docker-io.git/tree/audit-write.patch'>audit-write.patch</a></div><div class='content'>blob: 140d8ab2eb56e1bb1969c8a3c8b7cf1297619537 (<a href='/cgit/docker-io.git/plain/audit-write.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+<a id='n14' href='#n14'>14</a>
+<a id='n15' href='#n15'>15</a>
+<a id='n16' href='#n16'>16</a>
+<a id='n17' href='#n17'>17</a>
+<a id='n18' href='#n18'>18</a>
+<a id='n19' href='#n19'>19</a>
+<a id='n20' href='#n20'>20</a>
+<a id='n21' href='#n21'>21</a>
+<a id='n22' href='#n22'>22</a>
+<a id='n23' href='#n23'>23</a>
+<a id='n24' href='#n24'>24</a>
+<a id='n25' href='#n25'>25</a>
+<a id='n26' href='#n26'>26</a>
+<a id='n27' href='#n27'>27</a>
+<a id='n28' href='#n28'>28</a>
+<a id='n29' href='#n29'>29</a>
+</pre></td>
+<td class='lines'><pre><code>From 29ecc95c31ecfe15e3b3d8db94cea1c555e526a3 Mon Sep 17 00:00:00 2001
+From: Alexandr Morozov <lk4d4math(a)gmail.com>
+Date: Wed, 23 Jul 2014 09:57:41 +0400
+Subject: [PATCH] Add AUDIT_WRITE cap
+
+Fixes #6345
+
+Thanks @larsks for outstanding investigation
+
+Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math(a)gmail.com> (github: LK4D4)
+---
+ daemon/execdriver/native/template/default_template.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/execdriver/native/template/default_template.go b/daemon/execdriver/native/template/default_template.go
+index cc5cc4f..be3dd5a 100644
+--- a/daemon/execdriver/native/template/default_template.go
++++ b/daemon/execdriver/native/template/default_template.go
+@@ -23,6 +23,7 @@ func New() *libcontainer.Config {
+ "NET_BIND_SERVICE",
+ "SYS_CHROOT",
+ "KILL",
++ "AUDIT_WRITE",
+ },
+ Namespaces: map[string]bool{
+ "NEWNS": true,
+--
+1.9.3
+
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated by cgit v0.10.1 at 2014-08-01 16:03:46 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
9 years, 9 months
[docker-io/el6] Resolves: rhbz#1124036 - update to v1.1.2
by Lokesh Mandvekar
commit 1b982bc7c7d6b96c15150411d1bcae3475b07c4b
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Aug 1 17:11:41 2014 -0500
Resolves: rhbz#1124036 - update to v1.1.2
This update is built using libcontainer directly from the vendor dir,
on account of some errors in getting libcontainer built for el6 (which in
turn depended on docker-io-pkg-devel)
*This is only a one-time hack*.
docker-io.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 9b223dc..41be23c 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -40,7 +40,7 @@ BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
# RHBZ#1109039 use syndtr/gocapability >= 0-0.7
BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7
-BuildRequires: golang(github.com/docker/libcontainer)
+#BuildRequires: golang(github.com/docker/libcontainer)
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
BuildRequires: device-mapper-devel
Requires(post): chkconfig
@@ -156,7 +156,7 @@ The import paths of %{import_path}/pkg/...
%prep
%setup -q -n docker-%{version}
-rm -rf vendor
+#rm -rf vendor
%patch1 -p1 -F 2 -b upstream-patched-archive-tar
%patch2 -p1 -F 2
cp -p %{SOURCE1} contrib/init/sysvinit-redhat/docker.sysconfig
@@ -169,7 +169,7 @@ ln -s $(pwd) ./_build/src/github.com/dotcloud/docker
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
#export DOCKER_BUILDTAGS='selinux'
-export GOPATH=$(pwd)/_build:%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)/vendor
export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs'
hack/make.sh dynbinary
9 years, 9 months
[docker-io/el6] remove unused patches
by Lokesh Mandvekar
commit 4f477ed8df897a1d4bb3ac77dec0b0b66b079230
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 22:54:24 2014 -0500
remove unused patches
finalize-namespace.patch | 64 ----------------------------------------------
sources | 2 +-
2 files changed, 1 insertions(+), 65 deletions(-)
---
diff --git a/sources b/sources
index 3ab3623..06b3414 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c835295e1e0609affe9a3c7ec75d7240 v1.0.0.tar.gz
+2e02d5288ecd6cbd9a6c3e4fd3b81ffc v1.1.2.tar.gz
9 years, 9 months
[docker-io/el6] remove docker.service file from el6
by Lokesh Mandvekar
commit ee74cb99991e6b1313402d8562fe3f5be10e4b39
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Aug 1 15:28:57 2014 -0500
remove docker.service file from el6
docker.service | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
9 years, 9 months
[docker-io/el6] Resolves: rhbz#1124036 - update to v1.1.2
by Lokesh Mandvekar
commit 8d24ec1e42399f3c8a522ac2fb94239074524ccc
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 22:49:08 2014 -0500
Resolves: rhbz#1124036 - update to v1.1.2
docker-io.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index a7ea912..9b223dc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -462,12 +462,18 @@ fi
%{gopath}/src/%{import_path}/pkg/version/*.go
%changelog
-* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1
+* Fri Aug 01 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1
- Resolves: rhbz#1124036 - update to upstream v1.1.2
* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-7
- create -devel and -pkg-devel subpackages
+* Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10
+- split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer
+
+* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-9
+- /etc/sysconfig/docker should be config(noreplace)
+
* Thu Jun 19 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 1.0.0-6
- Clean up after ourselves from previous releases. We caused a failure in
yum update transactions by removing chkconfig entries.
9 years, 9 months