Merge lp:~tribaal/ubuntu/utopic/ubumirror/upstream-0.5-release into lp:ubuntu/utopic/ubumirror

[Chris Glass]

This branch updates the package to upstream's latest release (0.5), as per attached bug.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== added directory 'assets'
=== added file 'assets/README.txt'
--- assets/README.txt	1970-01-01 00:00:00 +0000
+++ assets/README.txt	2014-08-18 15:14:37 +0000
@@ -0,0 +1,2 @@
+This directory is not distributed in the deb file, but holds the "other" things
+like the logo.

=== added file 'assets/ubumirror-logo.svg'
--- assets/ubumirror-logo.svg	1970-01-01 00:00:00 +0000
+++ assets/ubumirror-logo.svg	2014-08-18 15:14:37 +0000
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="113.38597"
+   height="113.38599"
+   viewBox="0 0 113.38597 113.386"
+   enable-background="new 0 0 283.465 283.465"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="mirror_orange_hex_2.svg"><metadata
+     id="metadata4797"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs4795" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     id="namedview4793"
+     showgrid="false"
+     inkscape:zoom="2.1060801"
+     inkscape:cx="39.948234"
+     inkscape:cy="-8.1206781"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><path
+     d="M 56.693001,0 C 25.432001,0 0,25.432001 0,56.691996 c 0,31.260007 25.432001,56.693994 56.693001,56.693994 31.260978,0 56.692969,-25.433987 56.692969,-56.693994 C 113.38597,25.432001 87.953979,0 56.693001,0 z"
+     id="path4791"
+     inkscape:connector-curvature="0"
+     style="fill:#dd4814"
+     sodipodi:nodetypes="sssss"
+     inkscape:export-filename="/home/tribaal/Desktop/g5791_14.png"
+     inkscape:export-xdpi="11.11"
+     inkscape:export-ydpi="11.11" /><g
+     id="g5791"
+     transform="matrix(0.88992454,0.56218499,-0.5698707,0.87792233,39.008016,-47.742568)"
+     inkscape:export-xdpi="11.11"
+     inkscape:export-ydpi="11.11"><path
+       transform="translate(-80.243861,-78.344598)"
+       d="m 167.60995,144.58139 c 0,16.12736 -8.92845,29.20117 -19.94226,29.20117 -11.0138,0 -19.94226,-13.07381 -19.94226,-29.20117 0,-16.12736 8.92846,-29.20117 19.94226,-29.20117 11.01381,0 19.94226,13.07381 19.94226,29.20117 z"
+       sodipodi:ry="29.201168"
+       sodipodi:rx="19.942261"
+       sodipodi:cy="144.58139"
+       sodipodi:cx="147.66769"
+       id="path5777"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:type="arc" /><path
+       transform="translate(-81.905711,-81.193492)"
+       d="m 162.38698,147.19289 c 0,12.84944 -5.84601,23.26597 -13.05744,23.26597 -7.21142,0 -13.05743,-10.41653 -13.05743,-23.26597 0,-12.84945 5.84601,-23.26598 13.05743,-23.26598 7.21143,0 13.05744,10.41653 13.05744,23.26598 z"
+       sodipodi:ry="23.265972"
+       sodipodi:rx="13.057433"
+       sodipodi:cy="147.19289"
+       sodipodi:cx="149.32954"
+       id="path5779"
+       style="fill:#dd4814;fill-opacity:1"
+       sodipodi:type="arc" /><rect
+       rx="3.3237102"
+       ry="1.899263"
+       y="93.538704"
+       x="64.100121"
+       height="19.467445"
+       width="6.6474204"
+       id="rect5781"
+       style="fill:#ffffff;fill-opacity:1" /><path
+       transform="translate(1.899263,-0.47481575)"
+       inkscape:transform-center-y="-0.05303025"
+       inkscape:transform-center-x="0.069577817"
+       d="m 69.797914,53.179362 c -0.497436,-0.497436 3.420314,1.768975 3.310265,1.074155 -0.110048,-0.69482 -3.135691,2.671316 -2.816317,2.04451 0.319374,-0.626806 -0.62546,3.799555 0.0013,3.480181 0.626806,-0.319374 -3.509554,-2.156737 -2.814734,-2.046689 0.69482,0.110049 -3.80687,0.57928 -3.309433,1.076716 0.497436,0.497436 0.966667,-4.004253 1.076715,-3.309433 0.110049,0.69482 -1.727314,-3.441541 -2.046688,-2.814735 -0.319374,0.626806 4.106987,-0.318027 3.480181,0.0013 -0.626806,0.319373 2.73933,-2.706269 2.044511,-2.816317 -0.69482,-0.110049 1.57159,3.807701 1.074154,3.310265 z"
+       inkscape:randomized="0"
+       inkscape:rounded="-0.20213914"
+       inkscape:flatsided="false"
+       sodipodi:arg2="-0.15707958"
+       sodipodi:arg1="-0.78539811"
+       sodipodi:r2="5.2744656"
+       sodipodi:r1="2.6859634"
+       sodipodi:cy="55.078625"
+       sodipodi:cx="67.898651"
+       sodipodi:sides="5"
+       id="path5785"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:type="star" /><path
+       transform="translate(-7.5970519,-1.899263)"
+       inkscape:transform-center-y="-0.27839706"
+       inkscape:transform-center-x="-0.041438382"
+       d="m 72.171991,67.898653 c 0.379971,-0.253314 -2.425836,-1.125111 -1.969539,-1.106705 0.456297,0.01841 -2.410612,0.661379 -2.052279,0.944474 0.358333,0.283096 0.320419,-2.654786 0.443918,-2.215134 0.123498,0.439652 -1.373928,-2.088251 -1.532437,-1.659974 -0.158509,0.428276 2.623866,-0.515637 2.243895,-0.262323 -0.37997,0.253314 1.561478,-1.951989 1.105181,-1.970395 -0.456297,-0.01841 1.301219,2.336105 0.942886,2.053009 -0.358333,-0.283095 2.338974,0.881856 2.215476,0.442204 -0.123498,-0.439652 -1.819669,1.959429 -1.66116,1.531153 0.158509,-0.428277 -0.115912,2.497005 0.264059,2.243691 z"
+       inkscape:randomized="0"
+       inkscape:rounded="-0.20213914"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.6111123"
+       sodipodi:arg1="0.98279372"
+       sodipodi:r2="1.7436062"
+       sodipodi:r1="3.423945"
+       sodipodi:cy="65.049759"
+       sodipodi:cx="70.272728"
+       sodipodi:sides="5"
+       id="path5789"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:type="star" /></g></svg>
\ No newline at end of file

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-14 13:11:54 +0000
+++ debian/changelog	2014-08-18 15:14:37 +0000
@@ -1,3 +1,9 @@
+ubumirror (0.5) utopic; urgency=medium
+
+  * New upstream release (LP: #1358349)
+
+ -- Christopher Glass (Canonical) <[e-mail]>  Mon, 18 Aug 2014 17:07:18 +0200
+
 ubumirror (0.4) utopic; urgency=low
 
   * New upstream release (LP: #1341523)

=== modified file 'debian/ubumirror.install'
--- debian/ubumirror.install	2010-02-17 18:06:32 +0000
+++ debian/ubumirror.install	2014-08-18 15:14:37 +0000
@@ -1,2 +1,2 @@
-ubuarchive ubucdimage ubuports uburelease       usr/bin
+ubuarchive ubucdimage ubuports uburelease ubucloudimage       usr/bin
 ubumirror.conf                                  etc

=== modified file 'ubucdimage'
--- ubucdimage	2014-07-14 13:11:54 +0000
+++ ubucdimage	2014-08-18 15:14:37 +0000
@@ -76,7 +76,7 @@
     $UBUCDI_MIRROR $UBUCDI_DIR
 
 if [ $? -ne 0 ]; then
-    ( echo "Sync for $FLAVOUR failed. Please check logs."; \
+    ( echo "CDimage sync failed. Please check logs."; \
         egrep '^write failed|@ERROR' $LOGFILE ) | mail -s "Ubuntu cdimage sync failed" $EMAIL
     echo "$(date -R): sync for cdimage failed."
     exit 2
@@ -84,6 +84,7 @@
 
 echo "$(date -R): sync for cdimage completed."
 
+echo "$(date -R): Releasing lock file..."
 rm -f $LOCK > /dev/null 2>&1
 
 echo "$(date -R): Ubuntu daily CD image mirror operations completed."

=== added file 'ubucloudimage'
--- ubucloudimage	1970-01-01 00:00:00 +0000
+++ ubucloudimage	2014-08-18 15:14:37 +0000
@@ -0,0 +1,89 @@
+#!/bin/sh
+#
+#   ubucloudimage - provides an easy way to sync cloud images from an ubuntu
+#                   cloud-image mirror.
+#
+#   Copyright (C) 2014 - 2015 Christopher Glass
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+set -e
+
+if [ ! -f /etc/ubumirror.conf ]; then
+    echo "Configuration file /etc/ubumirror.conf not found."
+    exit 2
+fi
+
+. /etc/ubumirror.conf
+
+LOGFILE="$LOGDIR/ubucloudimage.log"
+
+# Log all activity to file.
+exec >> $LOGFILE 2>&1
+
+if [ -z "$UBUARC_DIR" ]; then
+    echo -n "No Ubuntu cloud-image target directory (UBUCLOUD_DIR) set in "
+    echo "/etc/ubumirror.conf."
+    exit 2
+fi
+
+LOCK="${UBUCLOUD_DIR}/Archive-Update-in-Progress-${HOSTNAME}"
+
+trap 'rm -f $LOCK > /dev/null 2>&1; savelog -c 28 -n $LOGFILE > /dev/null' EXIT
+
+# Get in the right directory and set the umask
+cd $HOME
+umask 022
+
+echo "$(date -R): Initiating Ubuntu cloud-image mirror operations..."
+
+# Check to see if another sync is in progress
+if ! ( set -o noclobber; echo "$$" > "${LOCK}") 2> /dev/null; then
+    if ! $(kill -0 $(cat ${LOCK}) 2>/dev/null); then
+        # Process does either not exist or is not owned by us.
+        echo "$$" > "${LOCK}"
+    else
+        echo "$(date -R): Unable to proceed with operations; lock file still exists for PID $(cat ${LOCK})."
+        exit 1
+    fi
+fi
+
+echo "$(date -R): Lock established for process $(cat $LOCK)."
+
+set +e
+echo "$(date -R): Initiating cloud-image sync..."
+
+mkdir -p $UBUCLOUD_DIR
+
+rsync -av --partial --delete --delete-after \
+      --timeout=$IO_TIMEOUT \
+      --bwlimit=$SPEED \
+      --exclude ".trace/${HOSTNAME}" \
+      $UBUCOUD_EXCLUDE \
+      $UBUCLOUD_MIRROR $UBUCLOUD_DIR
+
+if [ $? -ne 0 ]; then
+    ( echo "CLoud-image sync failed. Please check logs."; \
+        egrep '^write failed|@ERROR' $LOGFILE ) | mail -s "Cloud-image sync failed" $EMAIL
+    echo "$(date -R): Cloud-image sync failed."
+    exit 1
+fi
+
+echo "$(date -R): Cloud-image sync completed."
+
+echo "$(date -R): Releasing lock file..."
+rm -f $LOCK > /dev/null 2>&1
+
+echo "$(date -R): Ubuntu cloud-image mirror operations completed."

=== modified file 'ubumirror.conf'
--- ubumirror.conf	2014-07-14 13:11:54 +0000
+++ ubumirror.conf	2014-08-18 15:14:37 +0000
@@ -31,6 +31,10 @@
 # UBUPOR_DIR is the destination for the base of the ports directory
 # The script (ubuports) won't run if this variable isn't set
 #UBUPOR_DIR="/srv/mirror/ubuntu-ports"
+#
+# UBUCLOUD_DIR is the destination for the base of the cloud-image directory
+# The script (ubucloudimage) won't run if this variable isn't set
+#UBUCLOUD_DIR="/srv/mirror/ubuntu-cloud-images"
 
 # LOGDIR is the destination directory of all the logs
 LOGDIR="/var/log/ubumirror/"
@@ -41,6 +45,7 @@
 UBUCDI_MIRROR=rsync://rsync.cdimage.ubuntu.com/cdimage
 UBUREL_MIRROR=rsync://rsync.releases.ubuntu.com/releases
 UBUPOR_MIRROR=rsync://rsync.ports.ubuntu.com/ubuntu-ports
+UBUCLOUD_MIRROR=rsync://cloud-images.ubuntu.com/cloud-images
 
 # UBU{ARC,CDI,REL}_EXCLUDE is what things you want to exclude
 UBUARC_EXCLUDE=""
@@ -65,3 +70,5 @@
 # --exclude *_powerpc.deb --exclude *_powerpc.udeb \
 # --exclude *_sparc.deb --exclude *_sparc.udeb \
 # --exclude Contents-powerpc.gz --exclude Contents-sparc.gz \
+
+UBUCLOUD_EXCLUDE=""

=== modified file 'ubumirror.crontab'
--- ubumirror.crontab	2014-07-14 13:11:54 +0000
+++ ubumirror.crontab	2014-08-18 15:14:37 +0000
@@ -12,3 +12,5 @@
 33 */4 * * * /usr/bin/uburelease >/dev/null
 # Update cdimage mirror every twenty-four hours around 5 am.
 53 4 * * * /usr/bin/ubucdimage >/dev/null
+# Update cloud-images mirror every twenty-four hours around 5 am.
+23 4 * * * /usr/bin/ubucloudimage >/dev/null

=== modified file 'uburelease'
--- uburelease	2014-07-14 13:11:54 +0000
+++ uburelease	2014-08-18 15:14:37 +0000
@@ -66,7 +66,7 @@
 echo "$(date -R): Initiating Ubuntu release CD image sync..."
 
 rsync -av --partial --delete-after \
-      --bwlimit=$SPEED 
+      --bwlimit=$SPEED \
       --timeout=$IO_TIMEOUT \
       --exclude ".trace/${HOSTNAME}" \
       --exclude Archive-Update-in-Progress-* \