[arch-commits] Commit in docker/trunk (01-fix-libexec.patch PKGBUILD docker.install)

[Sébastien Luttringer]

    Date: Friday, December 6, 2013 @ 23:21:36
  Author: seblu
Revision: 102227

upgpkg: docker 1:0.7.1-1

- upstream release
- fix FS#38029
- fix FS#38025
- use upstream service file (pushed)
- remove path patch (pushed)

Added:
  docker/trunk/docker.install
Modified:
  docker/trunk/PKGBUILD
Deleted:
  docker/trunk/01-fix-libexec.patch

----------------------+
 01-fix-libexec.patch |   19 -------------------
 PKGBUILD             |   17 ++++++-----------
 docker.install       |   18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 30 deletions(-)

Deleted: 01-fix-libexec.patch
===================================================================
--- 01-fix-libexec.patch	2013-12-06 22:16:50 UTC (rev 102226)
+++ 01-fix-libexec.patch	2013-12-06 22:21:36 UTC (rev 102227)
@@ -1,19 +0,0 @@
-diff --git a/utils/utils.go b/utils/utils.go
-index cfdc73b..becc0dd 100644
---- a/utils/utils.go
-+++ b/utils/utils.go
-@@ -279,9 +279,14 @@ func DockerInitPath(localCopy string) string {
- 	var possibleInits = []string{
- 		localCopy,
- 		filepath.Join(filepath.Dir(selfPath), "dockerinit"),
-+
- 		// "/usr/libexec includes internal binaries that are not intended to be executed directly by users or shell scripts. Applications may use a single subdirectory under /usr/libexec."
- 		"/usr/libexec/docker/dockerinit",
- 		"/usr/local/libexec/docker/dockerinit",
-+
-+		// strict FHS 2.3: "/usr/lib includes object files, libraries, and internal binaries that are not intended to be executed directly by users or shell scripts."
-+		"/usr/lib/docker/dockerinit",
-+		"/usr/local/lib/docker/dockerinit",
- 	}
- 	for _, dockerInit := range possibleInits {
- 		path, err := exec.LookPath(dockerInit)
\ No newline at end of file

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-06 22:16:50 UTC (rev 102226)
+++ PKGBUILD	2013-12-06 22:21:36 UTC (rev 102227)
@@ -2,11 +2,11 @@
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url='http://www.docker.io/'
 license=('Apache')
 depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd')
@@ -13,12 +13,9 @@
 makedepends=('git' 'go')
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
-source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver"
-        'docker.service'
-        '01-fix-libexec.patch')
-md5sums=('SKIP'
-         '3f7ccab915fb1942f06e18946c2811d2'
-         '6684c04dd4697e0cb7aa3f171c96a2e4')
+install=$pkgname.install
+source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver")
+md5sums=('SKIP')
 # magic harcoded path
 _magic=src/github.com/dotcloud
 
@@ -25,8 +22,6 @@
 prepare() {
   mkdir -p "$_magic"
   ln -sfn "../../../docker" "$_magic/docker"
-  # patch for libexec path waiting 0.7.1
-  patch -p1 -d docker < 01-fix-libexec.patch
 }
 
 build() {
@@ -49,7 +44,7 @@
   install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker"
   install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker"
   # systemd
-  install -Dm644 "$srcdir/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service"
+  install -Dm644 "contrib/init/systemd/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service"
 }
 
 # vim:set ts=2 sw=2 et:

Added: docker.install
===================================================================
--- docker.install	                        (rev 0)
+++ docker.install	2013-12-06 22:21:36 UTC (rev 102227)
@@ -0,0 +1,18 @@
+# arg 1:  the new package version
+post_install() {
+  # create docker group (FS#38029)
+  getent group docker >/dev/null || groupadd -g 142 docker
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  (( $(vercmp $2 '1:0.7.1-1') < 0 )) &&  post_install "$1" || true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  groupdel docker >/dev/null 2>&1 || true
+}
+
+# vim:set ts=2 sw=2 et: