[pkg-eucalyptus-commits] r123 - eucalyptus/trunk/debian

[Rudy Godoy]

Author: rudy
Date: 2011-07-18 18:26:14 +0000 (Mon, 18 Jul 2011)
New Revision: 123

Modified:
   eucalyptus/trunk/debian/changelog
   eucalyptus/trunk/debian/control
   eucalyptus/trunk/debian/eucalyptus-cloud.postinst
   eucalyptus/trunk/debian/eucalyptus-sc.postinst
   eucalyptus/trunk/debian/eucalyptus-walrus.postinst
Log:
Upstream packaging changes

Modified: eucalyptus/trunk/debian/changelog
===================================================================
--- eucalyptus/trunk/debian/changelog	2011-07-16 01:46:30 UTC (rev 122)
+++ eucalyptus/trunk/debian/changelog	2011-07-18 18:26:14 UTC (rev 123)
@@ -1,3 +1,17 @@
+eucalyptus (2.0.3-1) unstable; urgency=low
+
+  * Incorporate upstream changes to packaging.
+
+ -- Rudy Godoy <rudy at stone-head.org>  Mon, 18 Jul 2011 13:22:34 -0500
+
+eucalyptus (2.0.3~bzrREVNO) UNRELEASED; urgency=low
+
+  * New 2.0.3 security release
+  * Added defense against XML Signature Element Wrapping attacks
+  * Fixed replay detection in CLC
+
+ -- Vika Felmetsger <rusvika at eucalyptus.com>  Thu, 14 Apr 2011 12:20:05 -0700
+
 eucalyptus (2.0.0-2) UNRELEASED; urgency=low
 
   * Switch libgeronimo-jpa-3.0-spec-java with libgeronimo-jpa-2.0-spec-java

Modified: eucalyptus/trunk/debian/control
===================================================================
--- eucalyptus/trunk/debian/control	2011-07-16 01:46:30 UTC (rev 122)
+++ eucalyptus/trunk/debian/control	2011-07-18 18:26:14 UTC (rev 123)
@@ -190,7 +190,7 @@
 Package: eucalyptus-cc
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}), apache2, libapache2-mod-axis2c (>= 1.6.0-2), 
-  eucalyptus-gl (>= ${binary:Version}), avahi-utils, librampart0, bridge-utils, vlan, dhcp3-server
+  eucalyptus-gl (>= ${binary:Version}), avahi-utils, librampart0 (>= 1.3.0-2), bridge-utils, vlan, dhcp3-server
 Recommends: vtun, libpam-modules (>= 1.0.1-9ubuntu3)
 Conflicts: apache2-mpm-itk
 Description: Elastic Utility Computing Architecture - Cluster controller
@@ -208,7 +208,7 @@
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}), 
   apache2-mpm-worker | apache2-mpm-prefork, libapache2-mod-axis2c (>= 1.6.0-2), 
-  eucalyptus-gl (>= ${binary:Version}), adduser, avahi-utils, librampart0, parted, libvirt-bin
+  eucalyptus-gl (>= ${binary:Version}), adduser, avahi-utils, librampart0 (>= 1.3.0-2), parted, libvirt-bin
 Replaces: eucalyptus-common
 Recommends: vlan, bridge-utils, qemu-kvm, aoetools
 Conflicts: apache2-mpm-itk, qemu (<< 0.11.0-0)

Modified: eucalyptus/trunk/debian/eucalyptus-cloud.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.postinst	2011-07-16 01:46:30 UTC (rev 122)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.postinst	2011-07-18 18:26:14 UTC (rev 123)
@@ -7,11 +7,24 @@
         chmod 700 /var/lib/eucalyptus/db || true
     fi
     euca_conf --enable cloud
+
     if which invoke-rc.d >/dev/null 2>&1; then
         invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
     else
         /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
     fi
+
+    if which invoke-rc.d >/dev/null 2>&1; then
+        invoke-rc.d eucalyptus-cloud start > /dev/null 2>&1 ||true
+    else
+        /etc/init.d/eucalyptus-cloud start > /dev/null 2>&1 ||true
+    fi
+
+#     if which invoke-rc.d >/dev/null 2>&1; then
+#         invoke-rc.d eucalyptus-cloud restart > /dev/null 2>&1 ||true
+#     else
+#         /etc/init.d/eucalyptus-cloud restart > /dev/null 2>&1 ||true
+#     fi
 fi
 
 #DEBHELPER#

Modified: eucalyptus/trunk/debian/eucalyptus-sc.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.postinst	2011-07-16 01:46:30 UTC (rev 122)
+++ eucalyptus/trunk/debian/eucalyptus-sc.postinst	2011-07-18 18:26:14 UTC (rev 123)
@@ -9,6 +9,18 @@
     else
         /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
     fi
+
+    if which invoke-rc.d >/dev/null 2>&1; then
+        invoke-rc.d eucalyptus-cloud start > /dev/null 2>&1 ||true
+    else
+        /etc/init.d/eucalyptus-cloud start > /dev/null 2>&1 ||true
+    fi
+
+#     if which invoke-rc.d >/dev/null 2>&1; then
+#         invoke-rc.d eucalyptus-cloud restart > /dev/null 2>&1 ||true
+#     else
+#         /etc/init.d/eucalyptus-cloud restart > /dev/null 2>&1 ||true
+#     fi
 fi
 
 exit 0

Modified: eucalyptus/trunk/debian/eucalyptus-walrus.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.postinst	2011-07-16 01:46:30 UTC (rev 122)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.postinst	2011-07-18 18:26:14 UTC (rev 123)
@@ -3,11 +3,25 @@
 
 if [ "$1" = "configure" ]; then
     euca_conf --enable walrus || true
+
+
     if which invoke-rc.d >/dev/null 2>&1; then
         invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
     else
         /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
     fi
+
+    if which invoke-rc.d >/dev/null 2>&1; then
+        invoke-rc.d eucalyptus-cloud start > /dev/null 2>&1 ||true
+    else
+        /etc/init.d/eucalyptus-cloud start > /dev/null 2>&1 ||true
+    fi
+
+#     if which invoke-rc.d >/dev/null 2>&1; then
+#         invoke-rc.d eucalyptus-cloud restart > /dev/null 2>&1 ||true
+#     else
+#         /etc/init.d/eucalyptus-cloud restart > /dev/null 2>&1 ||true
+#     fi
 fi
 exit 0