The package rpms/eucalyptus.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eucalyptus.git/commit/?id=91fe863....
Change:
-%ifnarch %{arm}
Thanks.
Full change:
============
commit 91fe863b480a8cff9ac088c247af0261cf33a51f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:43:13 2019 +0000
eucalyptus fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1674866
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8c5898f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/eucalyptus-3.1.2gitb8c109b4-generated.tgz
-/eucalyptus-3.1.2gitb8c109b4.tar.gz
-/eucalyptus-3.2.0git5ab72572.tar.gz
-/eucalyptus-3.2.0git5ab72572-generated.tar.gz
-/eucalyptus-3.2.0git5ab72572-generated.tgz
-/eucalyptus-3.2.1-generated.tgz
-/eucalyptus-3.2.1.tar.gz
-/eucalyptus-3.3.0.32052445.tgz
-/eucalyptus-3.3.0.32052445-generated.tgz
diff --git a/axis2.xml b/axis2.xml
deleted file mode 100644
index 4776efc..0000000
--- a/axis2.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<axisconfig name="Axis2/C">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
- <!-- Uncomment following to enable MTOM support globally -->
- <!--parameter name="enableMTOM"
locked="false">true</parameter-->
-
- <!-- Set the suitable size for optimum memory usage when sending large attachments
-->
- <!--parameter name="MTOMBufferSize"
locked="false">10</parameter-->
- <!--parameter name="MTOMMaxBuffers"
locked="false">1000</parameter-->
- <!--parameter name="EnableMTOMServiceCallback"
locked="false">true</parameter-->
- <!--parameter name="attachmentDIR"
locked="false">/path/to/the/attachment/caching/dir/</parameter-->
- <!--parameter name="MTOMCachingCallback"
locked="false">/path/to/the/caching_callback</parameter-->
- <!--parameter name="MTOMSendingCallback"
locked="false">/path/to/the/sending_callback</parameter-->
-
- <!-- Enable REST -->
- <parameter name="enableREST"
locked="false">true</parameter>
-
- <!-- Uncomment following to persist op_ctx, useful with RM -->
- <!--parameter name="persistOperationContext"
locked="false">true</parameter-->
-
- <!--if you want to extract the service archive file and work with that please
uncomment this-->
- <!--else , it wont extract archive file or does not take into consideration if
someone drop-->
- <!--exploded directory into /service directory-->
- <!--<parameter name="extractServiceArchive"
locked="false">true</parameter>-->
-
-
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
- <!-- This is the Deafult Message Receiver for the Request Response style
Operations -->
- <!--messageReceiver mep="INOUT"
class="axis2_receivers"/-->
-
-
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
-
- <transportReceiver name="http"
class="axis2_http_receiver">
- <parameter name="port"
locked="false">6060</parameter>
- <parameter name="exposeHeaders"
locked="true">false</parameter>
- </transportReceiver>
-
- <!--transportReceiver name="https"
class="axis2_http_receiver">
- <parameter name="port"
locked="false">6060</parameter>
- <parameter name="exposeHeaders"
locked="true">false</parameter>
- </transportReceiver-->
-
- <!--transportReceiver name="tcp"
class="axis2_tcp_receiver">
- <parameter name="port"
locked="false">6060</parameter>
- </transportReceiver-->
-
-
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
-
- <transportSender name="http" class="axis2_http_sender">
- <parameter name="PROTOCOL"
locked="false">HTTP/1.1</parameter>
- <parameter name="xml-declaration" insert="false"/>
- <!--parameter
name="Transfer-Encoding">chunked</parameter-->
- <!--parameter name="HTTP-Authentication" username=""
password="" locked="true"/-->
- <!--parameter name="PROXY" proxy_host="127.0.0.1"
proxy_port="8080" proxy_username="" proxy_password=""
locked="true"/-->
- </transportSender>
-
- <!-- Uncomment the following with appropriate parameters to enable the SSL
transport sender.
- Also make sure that the appropriate transport receiver is enabled above.-->
- <!--transportSender name="https"
class="axis2_http_sender">
- <parameter name="PROTOCOL"
locked="false">HTTP/1.1</parameter>
- <parameter name="xml-declaration" insert="false"/>
- </transportSender>
- <parameter
name="SERVER_CERT">/path/to/ca/certificate</parameter>
- <parameter
name="KEY_FILE">/path/to/client/certificate/chain/file</parameter>
- <parameter name="SSL_PASSPHRASE">passphrase</parameter>
- -->
-
- <!-- Uncomment this one with the appropriate papameters to enable the TCP
transport Sender-->
- <!--transportSender name="tcp" class="axis2_tcp_sender">
- <parameter name="PROTOCOL"
locked="false">TCP</parameter>
- <parameter name="xml-declaration" insert="false"/>
- </transportSender-->
-
-
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
- <!-- Comment this to disable Addressing -->
- <module ref="addressing"/>
-
-
- <!--Configuring module , providing paramters for modules whether they refer or
not-->
- <!--<moduleConfig name="addressing">-->
- <!--<parameter name="addressingPara"
locked="false">N/A</parameter>-->
- <!--</moduleConfig>-->
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
- <phaseOrder type="inflow">
- <!-- System pre defined phases -->
- <phase name="Transport"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch"/>
- <phase name="PostDispatch"/>
- <phase name="Security"/>
- <!-- End system pre defined phases -->
- <!-- After PostDispatch phase, module or service author can add any phase as
required -->
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- </phaseOrder>
- <phaseOrder type="outflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- <!--system predefined phase-->
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
- <phaseOrder type="INfaultflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- </phaseOrder>
- <phaseOrder type="Outfaultflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- <phase name="MessageOut"/>
- </phaseOrder>
-</axisconfig>
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..7166e11
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eucalyptus fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1674866
diff --git a/euca-WSDL2C.sh b/euca-WSDL2C.sh
deleted file mode 100644
index 3fffcdf..0000000
--- a/euca-WSDL2C.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CLASSPATH=$( build-classpath axis2v14/codegen axis2v14/adb axis2v14/adb-codegen
axis2v14/kernel neethi wsdl4j commons-logging axiom/axiom-api axiom/axiom-dom
axiom/axiom-impl XmlSchema backport-util-concurrent xalan-j2-serializer xalan-j2
):${CLASSPATH} java org.apache.axis2.wsdl.WSDL2C $*
-
diff --git a/eucalyptus-3.2-guava.patch b/eucalyptus-3.2-guava.patch
deleted file mode 100644
index 90f7ac5..0000000
--- a/eucalyptus-3.2-guava.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
----
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java 2012-12-11
11:16:05.039019755 -0500
-@@ -72,7 +72,7 @@
- import com.eucalyptus.records.Logs;
- import com.eucalyptus.util.EucalyptusCloudException;
- import com.eucalyptus.util.Exceptions;
--import com.google.common.util.concurrent.Futures;
-+import com.google.common.util.concurrent.JdkFutureAdapters;
- import com.google.common.util.concurrent.MoreExecutors;
-
- public class ComponentRegistrationHandler {
-@@ -140,7 +140,7 @@
- try {
- Components.lookup( newComponent ).setup( newComponent );
- Future<ServiceConfiguration> res = Topology.start( newComponent );
-- Futures.makeListenable( res ).addListener( new Runnable( ) {
-+ JdkFutureAdapters.listenInPoolThread( res ).addListener( new Runnable( ) {
-
- @Override
- public void run( ) {
-diff -ur
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java
eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java
----
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java 2012-12-11
11:09:34.068731461 -0500
-@@ -53,7 +53,7 @@
- public class SslUtils {
-
- private static final Map<SslCipherSuiteBuilderParams,String[]> SSL_CIPHER_LOOKUP
=
-- new MapMaker().maximumSize(32).makeComputingMap( SslCipherSuiteBuilder.INSTANCE
);
-+ new MapMaker().makeComputingMap( SslCipherSuiteBuilder.INSTANCE );
-
- public static String[] getEnabledCipherSuites( final String cipherStrings, final
String[] supportedCipherSuites ) {
- return SSL_CIPHER_LOOKUP.get( params(cipherStrings, supportedCipherSuites) );
-diff -ur
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
----
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java 2012-12-11
12:04:50.079883700 -0500
-@@ -68,6 +68,10 @@
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
- import java.lang.annotation.Target;
-+import java.lang.IllegalAccessException;
-+import java.lang.NoSuchMethodException;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
- import java.lang.reflect.UndeclaredThrowableException;
- import java.util.Arrays;
- import java.util.Collection;
-@@ -448,9 +452,22 @@
- try {
- ErrorMessages annote = Ats.from( input ).get( ErrorMessages.class );
- Function<Class, String> errorFunction = ( Function<Class, String>
) Classes.builder( input ).newInstance( );
-- ConcurrentMap<Class, String> errorMap = new MapMaker(
).expireAfterAccess( 60, TimeUnit.SECONDS ).makeComputingMap( errorFunction );
-+ MapMaker mm = new MapMaker( );
-+ Method expireAfterAccess =
mm.getClass().getDeclaredMethod("expireAfterAccess");
-+ expireAfterAccess.setAccessible(true);
-+ mm = (MapMaker) expireAfterAccess.invoke(mm, 60, TimeUnit.SECONDS );
-+ ConcurrentMap<Class, String> errorMap = mm.makeComputingMap(
errorFunction );
- classErrorMessages.put( annote.value( ), errorMap );
- return true;
-+ } catch ( InvocationTargetException ex ) {
-+ LOG.error( ex, ex );
-+ return false;
-+ } catch ( NoSuchMethodException ex ) {
-+ LOG.error( ex, ex );
-+ return false;
-+ } catch ( IllegalAccessException ex ) {
-+ LOG.error( ex, ex );
-+ return false;
- } catch ( UndeclaredThrowableException ex ) {
- LOG.error( ex, ex );
- return false;
diff --git a/eucalyptus-axis2-services.patch b/eucalyptus-axis2-services.patch
deleted file mode 100644
index ee2f81c..0000000
--- a/eucalyptus-axis2-services.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile
eucalyptus-3.2.0git5ab72572/cluster/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile 2012-12-11 10:08:32.915980248
-0500
-+++ eucalyptus-3.2.0git5ab72572/cluster/Makefile 2012-12-11 10:23:55.804473968 -0500
-@@ -152,25 +152,25 @@
- $(CC) -o $(CLIENTKILLALL) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(CLIENT).c
cc-client-marshal-adb.c -DMODE=0 generated/adb_*.o generated/axis2_stub_*.o ../util/log.o
../util/fault.o ../util/wc.o ../util/utf8.o ../util/misc.o ../util/euca_string.o
../storage/diskutil.o ../util/ipc.o ../util/sensor.o $(WSSECLIBS) $(CC_LIBS)
-
- fakedeploy:
-- $(INSTALL) $(SERVICE_SO_FAKE)
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(SERVICE_SO)
-+ $(INSTALL) $(SERVICE_SO_FAKE)
$(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/$(SERVICE_SO)
-
- deploy:
-- $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(CCWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) -d $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(CCWSDL) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/
- #no ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) >
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) >
$(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-
- #ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) | ../tools/add_service_policy.pl
../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" |
sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed
"s:SERVER-CERT:cluster-cert.pem:g" | sed
"s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g"
> $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) | ../tools/add_service_policy.pl
../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" |
sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed
"s:SERVER-CERT:cluster-cert.pem:g" | sed
"s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g"
> $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_WS.xml
- cat ../tools/client-policy-template.xml | sed
"s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed
"s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed
"s:CLIENT-CERT:cloud-cert.pem:g" | sed
"s:SERVER-CERT:cluster-cert.pem:g" | sed
"s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" |
sed "s:CLIENT-USERNAME:eucalyptus:g" > cc-client-policy.xml
- ## cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # cp cc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
- # ws
-- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+ $(INSTALL) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_WS.xml
$(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services.xml
- # no ws
--# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+# cp $(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services.xml
-
- indent:
- @for idfile in *.[ch]; do \
-@@ -190,4 +190,4 @@
- uninstall:
- # @$(RM) -f $(DESTDIR)$(sbindir)/$(SHUTDOWNCC)
- @$(RM) -f $(DESTDIR)$(eucastatedir)/keys/cc-client-policy.xml
-- @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-+ @$(RM) -rf $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/gatherlog/GLclient.c
eucalyptus-3.2.0git5ab72572/gatherlog/GLclient.c
---- eucalyptus-3.2.0git5ab72572.orig/gatherlog/GLclient.c 2012-12-10 14:18:28.000000000
-0500
-+++ eucalyptus-3.2.0git5ab72572/gatherlog/GLclient.c 2012-12-11 10:13:54.692409604 -0500
-@@ -201,7 +201,7 @@
- return (EUCA_INVALID_ERROR);
- }
-
-- snprintf(endpoint_uri, 256, " http://%s/axis2/services/EucalyptusGL",
argv[APPNAME_ARG]);
-+ snprintf(endpoint_uri, 256, "http://%s/axis2/services/EucalyptusGL",
argv[APPNAME_ARG]);
- if ((env = axutil_env_create_all("/tmp/fooh", AXIS2_LOG_LEVEL_TRACE)) ==
NULL) {
- printf("ERROR: fail to retrieve AXIS2 environment.\n");
- return (EUCA_ERROR);
-diff -ur eucalyptus-3.2.0git5ab72572.orig/gatherlog/Makefile
eucalyptus-3.2.0git5ab72572/gatherlog/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/gatherlog/Makefile 2012-12-11 10:08:32.915980248
-0500
-+++ eucalyptus-3.2.0git5ab72572/gatherlog/Makefile 2012-12-11 10:15:25.513200884 -0500
-@@ -107,22 +107,22 @@
- $(CC) -o $(CLIENT) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(CLIENT).c
gl-client-marshal-adb.c generated/adb_*.o generated/axis2_stub_*.o ../util/log.o
../util/misc.o ../util/euca_string.o ../storage/diskutil.o ../util/ipc.o
../util/euca_auth.o -DMODE=1 $(LIBS) $(LDFLAGS) -lssl -lcrypto
-
- deploy:
-- $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(GLWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) -d $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(GLWSDL) $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/
- #no ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) >
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) >
$(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-
- #ws-sec
--# cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) | ../tools/add_service_policy.pl
../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" |
sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed
"s:SERVER-CERT:cluster-cert.pem:g" | sed
"s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g"
> $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-+# cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) | ../tools/add_service_policy.pl
../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" |
sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed
"s:SERVER-CERT:cluster-cert.pem:g" | sed
"s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g"
> $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_WS.xml
- # cat ../tools/client-policy-template.xml | sed
"s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed
"s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed
"s:CLIENT-CERT:cloud-cert.pem:g" | sed
"s:SERVER-CERT:cluster-cert.pem:g" | sed
"s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" |
sed "s:CLIENT-USERNAME:eucalyptus:g" > cc-client-policy.xml
- # cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # cp cc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
- # ws
--# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+# cp $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_WS.xml
$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services.xml
- # no ws
-- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+ $(INSTALL) $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
$(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services.xml
-
- indent:
- @for idfile in *.[ch]; do \
-@@ -136,4 +136,4 @@
- install:
-
- uninstall:
-- @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-+ @$(RM) -rf $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/Makedefs.in
eucalyptus-3.2.0git5ab72572/Makedefs.in
---- eucalyptus-3.2.0git5ab72572.orig/Makedefs.in 2012-12-11 10:08:32.916980291 -0500
-+++ eucalyptus-3.2.0git5ab72572/Makedefs.in 2012-12-11 10:17:40.512827454 -0500
-@@ -8,9 +8,16 @@
-
- # packages we depend upon
- export APACHE2_MODULE_DIR = @APACHE2_MODULE_DIR@
-+export WSFCPP_HOME = @AXIS2C_HOME@
- export AXIS2C_HOME = @AXIS2C_HOME@
- export AXIS2C_SERVICES = @AXIS2C_SERVICES@
- export AXIS2_HOME = @AXIS2_HOME@
-+export AXIS2_NC_REPO = ${AXIS2C_SERVICES}/nc
-+export AXIS2_NC_SERVICES = ${AXIS2_NC_REPO}/services
-+export AXIS2_CC_REPO = ${AXIS2C_SERVICES}/cc
-+export AXIS2_CC_SERVICES = ${AXIS2_CC_REPO}/services
-+export AXIS2_GL_REPO = ${AXIS2C_SERVICES}/gl
-+export AXIS2_GL_SERVICES = ${AXIS2_GL_REPO}/services
- export LIBVIRT_HOME = @LIBVIRT_HOME@
- export VDDK_HOME = @VDDK_HOME@
-
-@@ -68,7 +75,8 @@
- -DLIBDIR=\"$(libdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
- -DLOCALSTATEDIR=\"$(localstatedir)\" \
-- -DHELPERDIR=\"$(datarootdir)\"
-+ -DHELPERDIR=\"$(datarootdir)\" \
-+ -DWSFCPP_HOME=\"$(WSFCPP_HOME)\"
-
- CPPFLAGS = @CPPFLAGS@ $(PATHS)
-
-diff -ur eucalyptus-3.2.0git5ab72572.orig/node/Makefile
eucalyptus-3.2.0git5ab72572/node/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/node/Makefile 2012-12-11 10:08:32.916980291 -0500
-+++ eucalyptus-3.2.0git5ab72572/node/Makefile 2012-12-11 10:27:15.359799110 -0500
-@@ -189,21 +189,21 @@
- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -o libvirt_tortura libvirt_tortura.c -lvirt
-
- deploy:
-- $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) -d $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/
-
- # no ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) >
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) >
$(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
- # ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) | ../tools/add_service_policy.pl
../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cluster-cert.pem:g" |
sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed
"s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" |
sed "s:CLIENT-USERNAME:eucalyptus:g" >
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-- cat ../tools/client-policy-template.xml | sed
"s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed
"s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed
"s:CLIENT-CERT:cluster-cert.pem:g" | sed
"s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g"
| sed "s:SERVER-KEY:node-pk.pem:g" | sed
"s:CLIENT-USERNAME:eucalyptus:g" > nc-client-policy.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl
$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) | ../tools/add_service_policy.pl
../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cluster-cert.pem:g" |
sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed
"s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" |
sed "s:CLIENT-USERNAME:eucalyptus:g" >
$(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-+ cat ../tools/client-policy-template.xml | sed
"s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed
"s:AXIS2C_HOME:$(AXIS2_NC_REPO):g" | sed
"s:CLIENT-CERT:cluster-cert.pem:g" | sed
"s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g"
| sed "s:SERVER-KEY:node-pk.pem:g" | sed
"s:CLIENT-USERNAME:eucalyptus:g" > nc-client-policy.xml
- # cp nc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- ## cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
- # ws
-- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
$(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+ $(INSTALL) $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_WS.xml
$(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services.xml
- # no ws
--# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+# cp $(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services.xml
-
- indent:
- @for idfile in *.[ch]; do \
-@@ -224,4 +224,4 @@
- uninstall:
- $(RM) -f $(DESTDIR)$(eucastatedir)/keys/nc-client-policy.xml
- $(RM) -f $(DESTDIR)$(eucasbindir)/euca_test_nc
-- $(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-+ $(RM) -rf $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)
diff --git a/eucalyptus-bad-tgt-check.patch b/eucalyptus-bad-tgt-check.patch
deleted file mode 100644
index 04ccff2..0000000
--- a/eucalyptus-bad-tgt-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
eucalyptus-3.3.0.32052445/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/ISCSIManager.java.orig 2013-03-28
17:32:16.000000000 -0400
-+++
eucalyptus-3.3.0.32052445/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/ISCSIManager.java 2013-04-06
16:02:28.846246704 -0400
-@@ -119,15 +119,15 @@
- LOG.warn("Unable to connect to tgt daemon. Is tgtd loaded?");
- LOG.info("Attempting to start tgtd ISCSI daemon");
- output = execute(new String[] { ROOT_WRAP, "service", TGT_SERVICE_NAME,
"status" }, timeout);
-- if (output.returnValue != 0 || StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) &&
!StringUtils.startsWith(output.error, "Redirecting"))) {
- output = execute(new String[] { ROOT_WRAP, "service", TGT_SERVICE_NAME,
"start" }, timeout);
-- if (output.returnValue != 0 || StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) &&
!StringUtils.startsWith(output.error, "Redirecting"))) {
-
Faults.forComponent(Storage.class).havingId(TGT_CORRUPTED).withVar("component",
"Storage Controller").withVar("operation", "service tgt
start").withVar("error", output.error).log();
- throw new EucalyptusCloudException("Unable to start tgt daemon. Cannot
proceed.");
- }
- } else {
- output = execute(new String[] { ROOT_WRAP, "service", "tgt",
"start" } ,timeout);
-- if (output.returnValue != 0 || StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) &&
!StringUtils.startsWith(output.error, "Redirecting"))) {
-
Faults.forComponent(Storage.class).havingId(TGT_CORRUPTED).withVar("component",
"Storage Controller").withVar("operation", "service tgt
start").withVar("error", output.error).log();
- throw new EucalyptusCloudException("Unable to start tgt daemon. Cannot
proceed.");
- }
-@@ -140,7 +140,7 @@
- Long timeout = DirectStorageInfo.getStorageInfo().getTimeoutInMillis();
-
- CommandOutput output = execute(new String[] { ROOT_WRAP, "service",
TGT_SERVICE_NAME, "status" }, timeout);
-- if (StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) &&
!StringUtils.startsWith(output.error, "Redirecting"))) {
-
Faults.forComponent(Storage.class).havingId(TGT_CORRUPTED).withVar("component",
"Storage Controller").withVar("operation", "service tgt
status").withVar("error", output.error).log();
- throw new EucalyptusCloudException("tgt service check failed with error: "
+ output.error);
- }
diff --git a/eucalyptus-braindead-gwt-import.patch
b/eucalyptus-braindead-gwt-import.patch
deleted file mode 100644
index 7538fc9..0000000
--- a/eucalyptus-braindead-gwt-import.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
eucalyptus-3.3.0.32052445/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java.orig 2013-04-06
18:56:12.674971976 -0400
-+++
eucalyptus-3.3.0.32052445/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java 2013-04-06
18:54:55.689948858 -0400
-@@ -70,7 +70,7 @@
-
- import edu.ucsb.eucalyptus.cloud.AccessDeniedException;
- import com.eucalyptus.util.EucalyptusCloudException;
--import com.google.gwt.thirdparty.guava.common.collect.Lists;
-+import com.google.common.collect.Lists;
-
- import edu.ucsb.eucalyptus.cloud.entities.*;
- import edu.ucsb.eucalyptus.msgs.*;
diff --git a/eucalyptus-cc.init b/eucalyptus-cc.init
deleted file mode 100755
index 4d4a2f3..0000000
--- a/eucalyptus-cc.init
+++ /dev/null
@@ -1,325 +0,0 @@
-#!/bin/bash
-#Copyright (c) 2009 Eucalyptus Systems, Inc.
-#
-#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, only version 3 of the License.
-#
-#This file 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/>.
-#
-#Please contact Eucalyptus Systems, Inc., 130 Castilian
-#Dr., Goleta, CA 93101 USA or visit <
http://www.eucalyptus.com/licenses/>
-#if you need additional information or have any questions.
-#
-#This file may incorporate work covered under the following copyright and
-#permission notice:
-#
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Regents of the University of California
-#
-#
-# Redistribution and use of this software in source and binary forms, with
-# or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
-# THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-# LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-# SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-# BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-# THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-# OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-# WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-# ANY SUCH LICENSES OR RIGHTS.
-#
-#
-# Init script for the Eucalyptus cluster controller
-#
-# chkconfig: 2345 99 05
-# description: script for starting and stopping eucalyptus cluster controller
-#
-### BEGIN INIT INFO
-# Provides: eucalyptus-cc
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Eucalyptus cluster controller
-# Description: Start the Eucalyptus cluster controller
-### END INIT INFO
-#
-
-# Do NOT "set -e"
-
-# if we have lsb functions let's source them
-WE_HAVE_LSB="N"
-if [ -e /lib/lsb/init-functions ]; then
- . /lib/lsb/init-functions
- # very old lsb don't have the functions we need
- if type log_daemon_msg > /dev/null 2> /dev/null ; then
- WE_HAVE_LSB="Y"
- fi
-fi
-
-if [ "$EUID" != "0" ]; then
- echo "Eucalyptus init scripts must be run as root."
- exit 1
-fi
-
-# I just wanted to set PATH to be the system PATH, but if a user install
-# eucalyptus manually, it may have binaries in a non-standard position:
-# hence we need to keep the PATH we receive.
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
-DESC="Eucalyptus cluster controller"
-NAME=eucalyptus-cc
-EUCA_USER="eucalyptus"
-
-export EUCALYPTUS="/"
-EUCAHELPERDIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCASBINDIR=$EUCALYPTUS/usr/sbin
-EUCACONFDIR=$EUCALYPTUS/etc/eucalyptus
-EUCADATADIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCARUNDIR=$EUCALYPTUS/var/run/eucalyptus
-EUCALOGDIR=$EUCALYPTUS/var/log/eucalyptus
-EUCALIBEXECDIR=$EUCALYPTUS/usr/libexec/eucalyptus/
-LIBDIR=@LIBDIR@
-
-# crude way to start the axis2c services
-do_start() {
- # fixes #469984 (was against NC but CC may have similar issue)
- IPTABLES="`which iptables 2> /dev/null`"
- if [ -n "$IPTABLES" ]; then
- [ -x $IPTABLES ] && $IPTABLES -L -n > /dev/null 2> /dev/null
- fi
-
- if ! $EUCASBINDIR/euca_conf --check cc ; then
- exit 1
- fi
-
- # we need IP forwarding and we need to use iptable over the bridge
- if [ -w /proc/sys/net/ipv4/ip_forward ]; then
- VAL=`cat /proc/sys/net/ipv4/ip_forward`
- if [ "$VAL" = "0" ]; then
- echo
- echo -n "Enabling IP forwarding"
- echo -n 1 > /proc/sys/net/ipv4/ip_forward
- fi
- fi
-
- # if in MANAGED or STATIC mode, we need to use
- # dhcpd, so better check we know how to use it
- if [ "$VNET_MODE" = "MANAGED" -o "$VNET_MODE" =
"STATIC" ]; then
- if [ -z "$VNET_DHCPDAEMON" -o ! -x $VNET_DHCPDAEMON ]; then
- echo
- echo "Cannot find dhcp server!"
- exit 1
- fi
- if ! $VNET_DHCPDAEMON --help 2>&1 |grep -- -tf > /dev/null ; then
- echo
- echo "dhcp server doesn't accept -tf option!"
- fi
- fi
-
- ulimit -u 100000
- ulimit -n 10000
- # now we start the services
- if ! httpd -f $EUCACONFDIR/httpd/conf/httpd-cc.conf ; then
- echo
- echo "Failed to start the CC!"
- exit 1
- fi
-}
-
-do_status() {
- pidfile=$EUCARUNDIR/eucalyptus-cc.pid
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- if ps axww|grep $pid|grep httpd-cc.conf > /dev/null ; then
- # we are good
- return 0
- fi
- fi
- return 1
-}
-
-do_stop() {
- pidfile="$EUCARUNDIR/eucalyptus-cc.pid"
-
- # let's be sure we are killing the right process
- if ! do_status ; then
- rm -f $pidfile
- return
- fi
- # now kill the services
- pidfiles="$EUCARUNDIR/net/euca-dhcp.pid $EUCARUNDIR/eucalyptus-cc.pid
$EUCARUNDIR/httpd-dynserv.pid"
- pids=""
- sids=""
- for pidfile in $pidfiles ; do
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- sids="$pid $sids"
- morepids="$pid"
- for i in `pgrep -P $pid`; do
- morepids="$morepids `echo $i`"
- morepids="$morepids `pgrep -P $i`"
- done
- pids="$pids $morepids"
- rm -f $pidfile
- fi
- done
- if [ -n "$pids" ]; then
- kill -15 $pids >/dev/null 2>&1
- pkill -9 -s $sids >/dev/null 2>&1
- fi
-
- dopkill=0
- for pid in $pids ; do
- timeout=5
- while [ $timeout -gt 0 ]; do
- if ps $pid > /dev/null 2>&1 ; then
- sleep 1
- timeout=$(($timeout - 1))
- dopkill=1
- else
- break
- fi
- done
- if [ $timeout -eq 0 ]; then
- kill -9 ${pid} >/dev/null 2>&1
- fi
- done
- if [ $dopkill -gt 0 ]; then
- pkill -9 -s $sids >/dev/null 2>&1
- fi
-}
-
-# set the library path correctly
-export LD_LIBRARY_PATH=$LIBDIR/wso2-axis2/modules/rampart
-export AXIS2C_HOME=$LIBDIR/eucalyptus/axis2/cc
-export WSFCPP_HOME=$LIBDIR/eucalyptus/axis2/cc
-
-case "$1" in
- start)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_daemon_msg "Starting $DESC" "$NAME"
- else
- echo -n "Starting $DESC: "
- fi
- fi
-
- # let's check there is no previous CC running
- if do_status ; then
- echo
- echo "another CC is already running!"
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- fi
- fi
- exit 1
- fi
-
- # start and stop are hard: clear the semaphores
- rm -f /dev/shm/*eucalyptusCC*
- do_start
- case "$?" in
- 0|1)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- *)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- else
- echo "failed!"
- fi
- fi
- ;;
- esac
- ;;
- stop)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Stopping $DESC"
- else
- echo -n "Stopping $DESC: "
- fi
- fi
- # start and stop are hard: we loose the CC state
- do_stop
- rm -f /dev/shm/*eucalyptusCC*
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- restart)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Restarting $DESC"
- else
- echo -n "Restarting $DESC: "
- fi
- fi
- # restart allow the CC to mantain the state across restart
- do_stop
- rm -f /dev/shm/*eucalyptusCC*
- do_start
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- status)
- if do_status ; then
- echo "CC is running"
- else
- exit 3
- fi
- ;;
-
- *)
- echo "Usage: $NAME {start|stop|restart}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/eucalyptus-cc.service b/eucalyptus-cc.service
deleted file mode 100644
index 8b5420e..0000000
--- a/eucalyptus-cc.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Eucalyptus Cluster Controller service
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/eucalyptus/eucalyptus-cc.pid
-# EnvironmentFile=/etc/sysconfig/eucalyptus
-ExecStart=/usr/libexec/eucalyptus/eucalyptus-cc.init start
-ExecStop=/usr/libexec/eucalyptus/eucalyptus-cc.init stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/eucalyptus-clean-cc b/eucalyptus-clean-cc
deleted file mode 100755
index 2d6ff84..0000000
--- a/eucalyptus-clean-cc
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-#Copyright (c) 2009 Eucalyptus Systems, Inc.
-#
-#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, only version 3 of the License.
-#
-#This file 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/>.
-#
-#Please contact Eucalyptus Systems, Inc., 130 Castilian
-#Dr., Goleta, CA 93101 USA or visit <
http://www.eucalyptus.com/licenses/>
-#if you need additional information or have any questions.
-#
-#This file may incorporate work covered under the following copyright and
-#permission notice:
-#
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Regents of the University of California
-#
-#
-# Redistribution and use of this software in source and binary forms, with
-# or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
-# THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-# LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-# SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-# BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-# THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-# OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-# WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-# ANY SUCH LICENSES OR RIGHTS.
-#
-
-EUCARUNDIR=/var/run/eucalyptus
-EUCASTATEDIR=/var/lib/eucalyptus
-
-systemctl status eucalyptus-cc && \
- echo "You must stop eucalyptus-cc prior to running $0"
-
-# fully clean up all local CC state
-do_fullclean() {
- pidfiles="`ls -1 $EUCARUNDIR/vtund*.pid 2>/dev/null`"
- pids=""
- sids=""
- for pidfile in $pidfiles ; do
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- sids="$pid $sids"
- morepids="$pid"
- for i in `pgrep -P $pid`; do
- morepids="$morepids `echo $i`"
- morepids="$morepids `pgrep -P $i`"
- done
- pids="$pids $morepids"
- rm -f $pidfile
- fi
- done
- if [ -n "$pids" ]; then
- kill -15 $pids >/dev/null 2>&1
- pkill -15 -s $sids >/dev/null 2>&1
- fi
-
- dopkill=0
- for pid in $pids ; do
- timeout=5
- while [ $timeout -gt 0 ]; do
- if ps $pid > /dev/null 2>&1 ; then
- sleep 1
- timeout=$(($timeout - 1))
- dopkill=1
- else
- break
- fi
- done
- if [ $timeout -eq 0 ]; then
- kill -9 ${pid} >/dev/null 2>&1
- fi
- done
- if [ $dopkill -gt 0 ]; then
- pkill -9 -s $sids >/dev/null 2>&1
- fi
-
- rm -f $EUCASTATEDIR/CC/*
- rm -f /dev/shm/*eucalyptusCC*
-}
-
-do_fullclean
diff --git a/eucalyptus-cloud.service b/eucalyptus-cloud.service
deleted file mode 100644
index c4b7932..0000000
--- a/eucalyptus-cloud.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Eucalyptus Cloud web services stack
-After=syslog.target network.target remote-fs.target nss-lookup.target
-Wants=tgtd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/eucalyptus/eucalyptus-cloud.pid
-ExecStart=/usr/libexec/eucalyptus/eucalyptus-cloud.init start
-ExecStop=/usr/libexec/eucalyptus/eucalyptus-cloud.init stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/eucalyptus-configurable-paths.patch b/eucalyptus-configurable-paths.patch
deleted file mode 100644
index b33312b..0000000
--- a/eucalyptus-configurable-paths.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572.orig/clc/Makefile
eucalyptus-3.2.0git5ab72572/clc/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/clc/Makefile 2012-12-11 09:15:58.232605029 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/Makefile 2012-12-11 09:24:53.263922777 -0500
-@@ -146,8 +146,8 @@
-
- uninstall:
- make -C eucadmin uninstall
-- $(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
-- $(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar
-+ $(RM) -rf $(DESTDIR)$(eucaconfdir)/cloud.d
-+ $(RM) -rf $(DESTDIR)$(eucadatadir)/*jar
- $(RM) -rf $(DESTDIR)$(vardir)/eucalyptus/webapps
-
- # cleaning up after run-test currently requires a few iterations of:
-diff -ur eucalyptus-3.2.0git5ab72572.orig/clc/modules/bootstrap/src/main/native/Makefile
eucalyptus-3.2.0git5ab72572/clc/modules/bootstrap/src/main/native/Makefile
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/bootstrap/src/main/native/Makefile 2012-12-10
14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/bootstrap/src/main/native/Makefile 2012-12-11
09:26:17.486400093 -0500
-@@ -85,8 +85,8 @@
- gengetopt --input=arguments.ggo --file-name=eucalyptus-opts --func-name=arguments
--arg-struct-name=eucalyptus_opts
-
- install: eucalyptus-cloud
-- $(INSTALL) -d $(DESTDIR)$(sbindir)
-- $(INSTALL) -m 0755 eucalyptus-cloud $(DESTDIR)$(sbindir)/eucalyptus-cloud
-+ $(INSTALL) -d $(DESTDIR)$(eucasbindir)
-+ $(INSTALL) -m 0755 eucalyptus-cloud $(DESTDIR)$(eucasbindir)/eucalyptus-cloud
-
- indent:
-
-@@ -101,4 +101,4 @@
- @$(RM) -f $(OBJS) eucalyptus-cloud arguments.ggo
-
- uninstall:
-- @$(RM) -f $(DESTDIR)$(sbindir)/eucalyptus-cloud
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/eucalyptus-cloud
-diff -ur eucalyptus-3.2.0git5ab72572.orig/clc/modules/storage-controller/native/Makefile
eucalyptus-3.2.0git5ab72572/clc/modules/storage-controller/native/Makefile
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/storage-controller/native/Makefile 2012-12-10
14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/storage-controller/native/Makefile 2012-12-11
09:28:43.780466669 -0500
-@@ -96,11 +96,11 @@
- distclean: clean
-
- install:
-- mkdir -p $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
-- cp $(LIBDIR)/$(LVM2_SO) $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
-- cp $(LIBDIR)/$(DAS_SO) $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
-+ mkdir -p $(DESTDIR)$(eucalibdir)
-+ cp $(LIBDIR)/$(LVM2_SO) $(DESTDIR)$(eucalibdir)
-+ cp $(LIBDIR)/$(DAS_SO) $(DESTDIR)$(eucalibdir)
-
- uninstall:
-- rm -r $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/$(LVM2_SO)
-- rm -r $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/$(DAS_SO)
-+ rm -r $(DESTDIR)$(eucalibdir)/$(LVM2_SO)
-+ rm -r $(DESTDIR)$(eucalibdir)/$(DAS_SO)
-
-diff -ur eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile
eucalyptus-3.2.0git5ab72572/cluster/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile 2012-12-10 14:18:28.000000000
-0500
-+++ eucalyptus-3.2.0git5ab72572/cluster/Makefile 2012-12-11 09:32:09.594033083 -0500
-@@ -184,10 +184,10 @@
- rm -rf generated cc-client-policy.xml
-
- install: deploy
-- @$(INSTALL) -m 0555 $(SHUTDOWNCC) $(DESTDIR)$(usrdir)/lib/eucalyptus
-- @$(INSTALL) cc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
-+ @$(INSTALL) -m 0555 $(SHUTDOWNCC) $(DESTDIR)$(eucalibexecdir)
-+ @$(INSTALL) cc-client-policy.xml $(DESTDIR)$(eucastatedir)/keys/
-
- uninstall:
- # @$(RM) -f $(DESTDIR)$(sbindir)/$(SHUTDOWNCC)
-- @$(RM) -f $(DESTDIR)$(vardir)/lib/eucalyptus/keys/cc-client-policy.xml
-+ @$(RM) -f $(DESTDIR)$(eucastatedir)/keys/cc-client-policy.xml
- @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/Makedefs.in
eucalyptus-3.2.0git5ab72572/Makedefs.in
---- eucalyptus-3.2.0git5ab72572.orig/Makedefs.in 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/Makedefs.in 2012-12-11 09:20:55.201015508 -0500
-@@ -18,19 +18,30 @@
- # comply to the GNU standard
- prefix = @prefix@
- #exec_prefix = @exec_prefix@
--#bindir = @bindir@
--#sbindir = @sbindir@
--#libdir = @libdir@
-+bindir = @bindir@
-+docdir = @docdir@
-+sbindir = @sbindir@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
- #mandir = @mandir@
--#incdir = @includedir@
--#etcdir = @sysconfdir@
--#datarootdir = @datarootdir@
--etcdir = ${prefix}/etc
--vardir = ${prefix}/var
--usrdir = ${prefix}/usr
--bindir = ${prefix}/usr/bin
--sbindir = ${prefix}/usr/sbin
--datarootdir = ${usrdir}/share
-+incdir = @includedir@
-+etcdir = @sysconfdir@
-+initddir = $(etcdir)/init.d
-+datarootdir = @datarootdir@
-+
-+# Trying to centralize the use of "prefix" and $EUCALYPTUS
-+eucaconfdir = ${prefix}${etcdir}/eucalyptus
-+eucadatadir = ${prefix}${datarootdir}/eucalyptus
-+eucadocdir = ${prefix}${docdir}/eucalyptus
-+eucalibdir = ${libdir}/eucalyptus
-+eucastatedir = ${prefix}${localstatedir}/lib/eucalyptus
-+eucarundir = ${prefix}${vardir}/run/eucalyptus
-+eucalibexecdir = ${prefix}${libexecdir}/eucalyptus
-+eucasbindir = ${prefix}/usr/sbin
-+# This _could_ be eucalibexecdir instead
-+eucahelperdir = ${eucadatadir}
-+
-
- # where we are going to install eucalyptus and where are the sources
- export EUCALYPTUS = ${prefix}
-@@ -51,6 +61,17 @@
- INDENTTOOLS = indent
- INDENTFLAGS = -nbad -bap -nbc -bbo -hnl -br -brs -c40 -cd40 -ncdb -ce -cli0 -d0 -di1
-nfc1 -i4 -nut -ip0 -l180 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss
-ts4 -il0 -nip
-
-+# various directory paths
-+PATHS= -DSYSCONFDIR=\"$(etcdir)\" \
-+ -DSBINDIR=\"$(sbindir)\" \
-+ -DDATADIR=\"$(datarootdir)\" \
-+ -DLIBDIR=\"$(libdir)\" \
-+ -DLIBEXECDIR=\"$(libexecdir)\" \
-+ -DLOCALSTATEDIR=\"$(localstatedir)\" \
-+ -DHELPERDIR=\"$(datarootdir)\"
-+
-+CPPFLAGS = @CPPFLAGS@ $(PATHS)
-+
- # compile time configurations
- euca_theme = @INTERFACE_THEME@
- extensions = @EXTENSIONS@
-diff -ur eucalyptus-3.2.0git5ab72572.orig/Makefile eucalyptus-3.2.0git5ab72572/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/Makefile 2012-12-11 09:24:11.448201502 -0500
-@@ -50,24 +50,24 @@
-
- install: deploy
- @$(INSTALL) -d $(DESTDIR)$(prefix)
-- @$(INSTALL) -d $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
-- @$(INSTALL) -d $(DESTDIR)$(etcdir)/eucalyptus/nc-hooks
-- @$(INSTALL) -m 0644 VERSION $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus-version
-+ @$(INSTALL) -d $(DESTDIR)$(eucaconfdir)/cloud.d
-+ @$(INSTALL) -d $(DESTDIR)$(eucaconfdir)/nc-hooks
-+ @$(INSTALL) -m 0644 VERSION $(DESTDIR)$(eucadatadir)/eucalyptus-version
- @$(INSTALL) -d $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/run/eucalyptus/net
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/lib/eucalyptus/keys
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/lib/eucalyptus/CC
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/log/eucalyptus
-- @$(INSTALL) -d $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -d $(DESTDIR)$(datarootdir)/eucalyptus/doc
-- @$(INSTALL) -d $(DESTDIR)$(usrdir)/sbin
-- @$(INSTALL) -d $(DESTDIR)$(usrdir)/lib/eucalyptus
-+ @$(INSTALL) -d $(DESTDIR)$(eucarundir)/net
-+ @$(INSTALL) -d $(DESTDIR)$(eucastatedir)/keys
-+ @$(INSTALL) -d $(DESTDIR)$(eucastatedir)/CC
-+ @$(INSTALL) -d $(DESTDIR)$(eucalogdir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucadocdir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucalibdir)
- @$(INSTALL) -d $(DESTDIR)$(etcdir)/bash_completion.d
- @for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $@) || exit $$? ; done
-
- uninstall:
-- @$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus-version
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/eucalyptus-version
- @for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $@) || exit $$? ; done
-
-diff -ur eucalyptus-3.2.0git5ab72572.orig/node/Makefile
eucalyptus-3.2.0git5ab72572/node/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/node/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/node/Makefile 2012-12-11 09:36:34.306077903 -0500
-@@ -218,10 +218,10 @@
- rm -rf generated $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local nc-client-policy.xml test
test_nc test_hooks *~* *#*
-
- install: deploy
-- $(INSTALL) nc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
-- $(INSTALL) -m 0755 test_nc $(DESTDIR)$(sbindir)/euca_test_nc
-+ $(INSTALL) nc-client-policy.xml $(DESTDIR)$(eucastatedir)/keys/
-+ $(INSTALL) -m 0755 test_nc $(DESTDIR)$(eucasbindir)/euca_test_nc
-
- uninstall:
-- $(RM) -f $(DESTDIR)$(vardir)/lib/eucalyptus/keys/nc-client-policy.xml
-- $(RM) -f $(DESTDIR)$(sbindir)/euca_test_nc
-+ $(RM) -f $(DESTDIR)$(eucastatedir)/keys/nc-client-policy.xml
-+ $(RM) -f $(DESTDIR)$(eucasbindir)/euca_test_nc
- $(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/tools/Makefile
eucalyptus-3.2.0git5ab72572/tools/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/tools/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/tools/Makefile 2012-12-11 09:52:21.369526869 -0500
-@@ -76,75 +76,55 @@
- @rm -rf eucalyptus eucalyptus-cloud eucalyptus-walrus eucalyptus-sc
-
- install: build
-- @if test -e /etc/init.d/eucalyptus ; then \
-- mv /etc/init.d/eucalyptus /etc/init.d/eucalyptus.old ; \
-+ @if test -e $(initddir)/eucalyptus ; then \
-+ mv $(initddir)/eucalyptus $(initddir)/eucalyptus.old ; \
- echo "Moving away old init.d script"; fi
-- @if test -e $(DESTDIR)$(etcdir)/init.d/eucalyptus ; then \
-- mv $(DESTDIR)$(etcdir)/init.d/eucalyptus $(DESTDIR)$(etcdir)/init.d/eucalyptus.old ;
fi
-- @$(INSTALL) -m 755 eucalyptus-cloud $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -m 755 eucalyptus-nc $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -m 755 eucalyptus-cc $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -m 644 httpd.conf $(DESTDIR)$(etcdir)/eucalyptus
-- @if test -e $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf ; then \
-- cp $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf
$(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf.old ; fi
-- @$(INSTALL) -m 644 eucalyptus.conf $(DESTDIR)$(etcdir)/eucalyptus
-- @$(INSTALL) -m 644 vtunall.conf.template $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 add_key.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 gen_libvirt_xml $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 gen_kvm_libvirt_xml $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 detach.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 partition2disk $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 get_xen_info $(DESTDIR)$(datarootdir)/eucalyptus/get_xen_info
-- @$(INSTALL) -m 755 get_sys_info $(DESTDIR)$(datarootdir)/eucalyptus/get_sys_info
-- @$(INSTALL) -m 755 euca_ipt $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 euca_upgrade $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 populate_arp.pl $(DESTDIR)$(datarootdir)/eucalyptus
--# @$(INSTALL) -m 755 euca_conf $(DESTDIR)$(sbindir)
--# -$(INSTALL) -m 755 euca_conf.complete $(DESTDIR)$(etcdir)/bash_completion.d/euca_conf
--# @$(INSTALL) -m 755 eucanetd $(DESTDIR)$(sbindir)
-- @$(INSTALL) -m 755 euca_sync_key $(DESTDIR)$(sbindir)
-- @$(INSTALL) -m 755 connect_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 connect_iscsitarget_sc.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 connect_iscsitarget_main.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 disconnect_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 disconnect_iscsitarget_sc.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 disconnect_iscsitarget_main.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 get_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 iscsitarget_common.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 floppy $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 dynserv.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 libvirt-kvm-windows-example.xml
$(DESTDIR)$(datarootdir)/eucalyptus/doc/
-- @$(INSTALL) -m 644 libvirt-xen-windows-example.xml
$(DESTDIR)$(datarootdir)/eucalyptus/doc/
-- @$(INSTALL) -m 755 getstats.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 getstats_net.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 euca-lictool $(DESTDIR)$(sbindir)
-- @$(INSTALL) -m 755 lic_template $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 lic_default $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 libvirt.xsl $(DESTDIR)$(etcdir)/eucalyptus
-- @$(INSTALL) -m 755 create-loop-devices $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 nc-hooks/example.sh $(DESTDIR)$(etcdir)/eucalyptus/nc-hooks/
-+ @if test -e $(DESTDIR)$(initddir)/eucalyptus ; then \
-+ mv $(DESTDIR)$(initddir)/eucalyptus $(DESTDIR)$(initddir)/eucalyptus.old ; fi
-+ @$(INSTALL) -m 755 eucalyptus-cloud $(DESTDIR)$(initddir)
-+ @$(INSTALL) -m 755 eucalyptus-nc $(DESTDIR)$(initddir)
-+ @$(INSTALL) -m 755 eucalyptus-cc $(DESTDIR)$(initddir)
-+ @$(INSTALL) -m 644 httpd.conf $(DESTDIR)$(eucaconfdir)
-+ @if test -e $(DESTDIR)$(eucaconfdir)/eucalyptus.conf ; then \
-+ cp $(DESTDIR)$(eucaconfdir)/eucalyptus.conf
$(DESTDIR)$(eucaconfdir)/eucalyptus.conf.old ; fi
-+ @$(INSTALL) -m 644 eucalyptus.conf $(DESTDIR)$(eucaconfdir)
-+ @$(INSTALL) -m 644 vtunall.conf.template $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -d 755 $(DESTDIR)$(eucahelperdir)
-+ @for x in add_key.pl gen_libvirt_xml gen_kvm_libvirt_xml detach.pl partition2disk \
-+ get_xen_info get_sys_info euca_ipt euca_upgrade populate_arp.pl \
-+ connect_iscsitarget.pl connect_iscsitarget_sc.pl disconnect_iscsitarget.pl \
-+ disconnect_iscsitarget_sc.pl get_iscsitarget.pl floppy dynserv.pl \
-+ connect_iscsitarget_main.pl disconnect_iscsitarget_main.pl \
-+ iscsitarget_common.pl getstats.pl getstats_net.pl create-loop-devices; \
-+ do $(INSTALL) -m 755 $$x $(DESTDIR)$(eucahelperdir); done
-+# @$(INSTALL) -m 755 eucanetd $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -m 755 euca_sync_key $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -m 644 libvirt-kvm-windows-example.xml $(DESTDIR)$(eucadocdir)
-+ @$(INSTALL) -m 644 libvirt-xen-windows-example.xml $(DESTDIR)$(eucadocdir)
-+ @$(INSTALL) -m 755 euca-lictool $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -m 755 lic_template $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -m 755 lic_default $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -m 644 libvirt.xsl $(DESTDIR)$(eucaconfdir)
-+ @$(INSTALL) -m 644 nc-hooks/example.sh $(DESTDIR)$(eucaconfdir)/nc-hooks/
-
- uninstall:
-- @$(RM) -f $(DESTDIR)$(etcdir)/init.d/eucalyptus-cloud
-- @$(RM) -f $(DESTDIR)$(etcdir)/init.d/eucalyptus-nc
-- @$(RM) -f $(DESTDIR)$(etcdir)/init.d/eucalyptus-cc
-- @$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/httpd*
-- @$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/vtunall.conf.template
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/add_key.pl
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/gen_libvirt_xml
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/gen_kvm_libvirt_xml
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/detach.pl
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/partition2disk
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/get_xen_info
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/get_sys_info
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/euca_ipt
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/euca_upgrade
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/populate_arp.pl
-- @$(RM) -f $(DESTDIR)$(sbindir)/euca_conf
-+ @for x in eucalyptus-cloud eucalyptus-nc eucalyptus-cc; \
-+ do @$(RM) -f $(DESTDIR)$(initddir)/$$x; done
-+ @$(RM) -f $(DESTDIR)$(eucaconfdir)/httpd*
-+ @$(RM) -f $(DESTDIR)$(eucaconfdir)/eucalyptus.conf
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/vtunall.conf.template
-+# XXX: Need root privs
- @$(RM) -f $(DESTDIR)$(etcdir)/bash_completion.d/euca_conf
-- @$(RM) -f $(DESTDIR)$(sbindir)/euca_sync_key
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/lic_template
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/lic_default
-- @$(RM) -f $(DESTDIR)$(sbindir)/euca-lictool
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/create-loop-devices
-+ @for x in add_key.pl gen_libvirt_xml gen_kvm_libvirt_xml detach.pl partition2disk \
-+ get_xen_info get_sys_info euca_ipt euca_upgrade populate_arp.pl \
-+ connect_iscsitarget.pl connect_iscsitarget_sc.pl disconnect_iscsitarget.pl \
-+ disconnect_iscsitarget_sc.pl get_iscsitarget.pl floppy dynserv.pl \
-+ connect_iscsitarget_main.pl disconnect_iscsitarget_main.pl \
-+ iscsitarget_common.pl getstats.pl getstats_net.pl create-loop-devices; \
-+ do $(RM) -f $(DESTDIR)$(eucahelperdir)/$$x; done
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/euca_conf
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/euca_sync_key
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/euca-lictool
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/lic_template
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/lic_default
-+
-diff -ur eucalyptus-3.2.0git5ab72572.orig/util/eucalyptus-config.h.in
eucalyptus-3.2.0git5ab72572/util/eucalyptus-config.h.in
---- eucalyptus-3.2.0git5ab72572.orig/util/eucalyptus-config.h.in 2012-12-10
14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/util/eucalyptus-config.h.in 2012-12-11 10:04:32.254948948
-0500
-@@ -70,6 +70,9 @@
- /* Current version */
- #undef EUCA_VERSION
-
-+/* location for rootwrap / mountwrap */
-+#undef EUCALYPTUS_LIBEXEC_DIR
-+
- /* headers on the system */
-
- /* Define if you have standards headers */
-diff -ur eucalyptus-3.2.0git5ab72572.orig/util/Makefile
eucalyptus-3.2.0git5ab72572/util/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/util/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/util/Makefile 2012-12-11 10:03:17.275828210 -0500
-@@ -112,17 +112,18 @@
- rm -rf eucalyptus-config.h
-
- install: all
-- $(INSTALL) -m 0755 euca_rootwrap $(DESTDIR)$(usrdir)/lib/eucalyptus/
-- $(INSTALL) -m 0755 euca_mountwrap $(DESTDIR)$(usrdir)/lib/eucalyptus/
-- $(INSTALL) -m 0755 euca-generate-fault $(DESTDIR)$(usrdir)/sbin/
-- $(INSTALL) -d $(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/
-- $(INSTALL) -m 0644 faults/en_US/common.xml
$(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/
-- $(INSTALL) -m 0644 -v faults/en_US/????.xml
$(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/
-- $(INSTALL) -d $(DESTDIR)$(etcdir)/eucalyptus/faults/en_US/
-+ $(INSTALL) -d -m 0755 $(DESTDIR)$(eucalibexecdir)
-+ $(INSTALL) -m 0755 euca_rootwrap $(DESTDIR)$(eucalibexecdir)/
-+ $(INSTALL) -m 0755 euca_mountwrap $(DESTDIR)$(eucalibexecdir)/
-+ $(INSTALL) -m 0755 euca-generate-fault $(DESTDIR)$(eucasbindir)/
-+ $(INSTALL) -d $(DESTDIR)$(eucadatadir)/faults/en_US/
-+ $(INSTALL) -m 0644 faults/en_US/common.xml $(DESTDIR)$(eucadatadir)/faults/en_US/
-+ $(INSTALL) -m 0644 -v faults/en_US/????.xml $(DESTDIR)$(eucadatadir)/faults/en_US/
-+ $(INSTALL) -d $(DESTDIR)$(eucaconfdir)/faults/en_US/
-
- deploy:
-
- uninstall:
-- $(RM) -f $(DESTDIR)$(usrdir)/lib/eucalyptus/euca_rootwrap
-- $(RM) -f $(DESTDIR)$(usrdir)/lib/eucalyptus/euca_mountwrap
-- $(RM) -f $(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/*.xml
-+ $(RM) -f $(DESTDIR)$(eucalibexecdir)/euca_rootwrap
-+ $(RM) -f $(DESTDIR)$(eucalibexecdir)/euca_mountwrap
-+ $(RM) -f $(DESTDIR)$(eucadatadir)/faults/en_US/*.xml
diff --git a/eucalyptus-console.service b/eucalyptus-console.service
deleted file mode 100644
index 1d48f49..0000000
--- a/eucalyptus-console.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=The Eucalyptus Cluster Controller service
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-User=eucaconsole
-PIDFile=/var/run/eucalyptus-console/eucalyptus-console.pid
-EnvironmentFile=/etc/sysconfig/eucalyptus-console
-ExecStart=/usr/bin/euca-console-server -d
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/eucalyptus-disable-gwt-in-buildxml.patch
b/eucalyptus-disable-gwt-in-buildxml.patch
deleted file mode 100644
index 4374b69..0000000
--- a/eucalyptus-disable-gwt-in-buildxml.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/clc/modules/www/build.xml 2012-06-20 06:21:42.000000000 +0000
-+++ b/clc/modules/www/build.xml 2012-06-29 11:59:29.000000000 +0000
-@@ -123,7 +123,7 @@
- <target name="compile-src">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${test.dir}"/>
-- <javac deprecation="false" srcdir="${src.dir}"
destdir="${build.dir}" classpathref="gwtclasspath"
failonerror="true" debug="true" target="1.5" />
-+ <javac deprecation="false" srcdir="${src.dir}"
excludes="com/eucalyptus/webui/**,com/eucalyptus/www/CommandServlet.java,com/eucalyptus/www/LoginServlet.java,com/eucalyptus/www/ReportServlet.java"
destdir="${build.dir}" classpathref="gwtclasspath"
failonerror="true" debug="true" target="1.5" />
- </target>
-
- <target name="clean">
-@@ -138,13 +138,15 @@
- <delete dir="${gwt.war.build.dir}" />
- <mkdir dir="${gwt.war.build.dir}" />
- <mkdir dir="${gwt.war.dir}" />
-+ <!--
- <java classpathref="gwtcompilerclasspath" fork="true"
failonerror="true" classname="com.google.gwt.dev.Compiler">
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="-Xss1024k" />
- <arg line="-war ${gwt.war.build.dir}" />
- <arg line="com.eucalyptus.webui.EucalyptusWebInterface" />
- </java>
-- <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml"
basedir="${gwt.war.build.dir}/${gwt.module.rename}/" />
-+ -->
-+ <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml"
basedir="${gwt.war.build.dir}/" />
- </target>
-
- <target name="compile-gwt-debug" depends="check-src"
unless="gwtc.notRequired">
diff --git a/eucalyptus-disable-gwt-in-makefile.patch
b/eucalyptus-disable-gwt-in-makefile.patch
deleted file mode 100644
index e80f866..0000000
--- a/eucalyptus-disable-gwt-in-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/clc/Makefile.orig 2012-06-29 11:29:29.000000000 +0000
-+++ b/clc/Makefile 2012-06-29 11:30:44.000000000 +0000
-@@ -152,22 +152,23 @@
- @touch .nogit
- endif
-
--update_properties: ${web_prop_dir}/eucalyptus-web.properties
-+update_properties:
-
- ${web_prop_dir}/eucalyptus-web.properties:
${web_prop_dir}/eucalyptus-web-default.properties ${TOP}/Makedefs
- @sed "s/\(^extensions =\).*/\1 ${extensions}/" <
${web_prop_dir}/eucalyptus-web-default.properties >
${web_prop_dir}/eucalyptus-web.properties
- @echo "Copied defaults to ${web_prop_dir}/eucalyptus-web.properties"
-
- update_theme:
-- @if test -d ${theme_dir}/${euca_theme} ; then \
-- if [ "`readlink ${theme_dir}/active`" != "${euca_theme}" ] ; then
\
-- echo "Making '${euca_theme}' the active theme" ; \
-- rm -f ${theme_dir}/active ; \
-- ln -sf ${euca_theme} ${theme_dir}/active ; \
-- fi \
-- else \
-- echo "Theme ${theme_dir}/${euca_theme} is not found!"; exit 1; \
-- fi \
-+ echo "Disabling update_theme as GWT is not being used."
-+ #@if test -d ${theme_dir}/${euca_theme} ; then \
-+ # if [ "`readlink ${theme_dir}/active`" != "${euca_theme}" ] ; then
\
-+ # echo "Making '${euca_theme}' the active theme" ; \
-+ # rm -f ${theme_dir}/active ; \
-+ # ln -sf ${euca_theme} ${theme_dir}/active ; \
-+ # fi \
-+ #else \
-+ # echo "Theme ${theme_dir}/${euca_theme} is not found!"; exit 1; \
-+ #fi \
-
- extras: update_properties
- @if test -n "${euca_theme}" ; then \
diff --git a/eucalyptus-disable-gwt.patch b/eucalyptus-disable-gwt.patch
deleted file mode 100644
index 1d2c9c3..0000000
--- a/eucalyptus-disable-gwt.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
b/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
-index c499c6d..d1ead20 100644
---- a/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
-+++ b/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
-@@ -95,8 +95,8 @@ import com.eucalyptus.crypto.Certs;
- import com.eucalyptus.crypto.util.PEMFiles;
- import com.eucalyptus.util.Internets;
- import com.eucalyptus.ws.StackConfiguration;
--import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
--import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-+//import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-+//import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-
- public class X509Download extends HttpServlet {
-
-@@ -313,11 +313,13 @@ public class X509Download extends HttpServlet {
- }
-
- public static String getError( String message ) {
-- SafeHtmlBuilder builder = new SafeHtmlBuilder( );
-- builder.append( SafeHtmlUtils.fromTrustedString(
"<html><title>Getting credentials failed</title><body><div
align=\"center\"><p><h1>Getting credentails
failed</h1></p><p><img src=\"themes/active/logo.png\"
/></p><p><h3 style=\"font-color: red;\">" ) );
-- builder.appendEscaped( message );
-- builder.append( SafeHtmlUtils.fromTrustedString(
"</h3></p></div></body></html>" ) );
-- return builder.toSafeHtml( ).asString( );
-+ return "<html><title>Getting credentials
failed</title><body><div
align=\"center\"><p><h1>Getting credentails
failed</h1></p><p><img src=\"themes/active/logo.png\"
/></p><p><h3 style=\"font-color: red;\">"
-+ + message +
"</h3></p></div></body></html>" ;
-+// SafeHtmlBuilder builder = new SafeHtmlBuilder( );
-+// builder.append( SafeHtmlUtils.fromTrustedString(
"<html><title>Getting credentials failed</title><body><div
align=\"center\"><p><h1>Getting credentails
failed</h1></p><p><img src=\"themes/active/logo.png\"
/></p><p><h3 style=\"font-color: red;\">" ) );
-+// builder.appendEscaped( message );
-+// builder.append( SafeHtmlUtils.fromTrustedString(
"</h3></p></div></body></html>" ) );
-+// return builder.toSafeHtml( ).asString( );
- }
-
- }
---- a/clc/modules/www/conf/gwt-web.xml 2012-06-28 19:36:09.000000000 -0700
-+++ b/clc/modules/www/conf/gwt-web.xml 2012-06-28 19:37:37.000000000 -0700
-@@ -81,81 +81,15 @@
-
- <servlet>
- <description></description>
-- <display-name>EucalyptusService</display-name>
-- <servlet-name>EucalyptusServiceImpl</servlet-name>
--
<servlet-class>com.eucalyptus.webui.server.EucalyptusServiceImpl</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description>Executes a command within Eucalyptus</description>
-- <display-name>Command Servlet</display-name>
-- <servlet-name>CommandServlet</servlet-name>
-- <servlet-class>com.eucalyptus.www.CommandServlet</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description>New Report Generation Servlet</description>
-- <display-name>Report Servlet</display-name>
-- <servlet-name>ReportServlet</servlet-name>
-- <servlet-class>com.eucalyptus.www.ReportServlet</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description>Logs into eucalyptus and returns a session
id</description>
-- <display-name>Login Servlet</display-name>
-- <servlet-name>LoginServlet</servlet-name>
-- <servlet-class>com.eucalyptus.www.LoginServlet</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description></description>
- <display-name>X509Downloader</display-name>
- <servlet-name>X509Download</servlet-name>
- <servlet-class>com.eucalyptus.www.X509Download</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
-- <servlet>
-- <description></description>
-- <display-name>CloudRegistration</display-name>
-- <servlet-name>CloudRegistration</servlet-name>
-- <servlet-class>com.eucalyptus.www.Registration</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
--
-- <servlet-mapping>
-- <servlet-name>EucalyptusServiceImpl</servlet-name>
-- <url-pattern>/backend</url-pattern>
-- </servlet-mapping>
--
- <servlet-mapping>
- <servlet-name>X509Download</servlet-name>
- <url-pattern>/getX509</url-pattern>
- </servlet-mapping>
-
-- <servlet-mapping>
-- <servlet-name>CommandServlet</servlet-name>
-- <url-pattern>/commandservlet</url-pattern>
-- </servlet-mapping>
--
-- <servlet-mapping>
-- <servlet-name>LoginServlet</servlet-name>
-- <url-pattern>/loginservlet</url-pattern>
-- </servlet-mapping>
--
-- <servlet-mapping>
-- <servlet-name>ReportServlet</servlet-name>
-- <url-pattern>/reportservlet</url-pattern>
-- </servlet-mapping>
--
-- <servlet-mapping>
-- <servlet-name>CloudRegistration</servlet-name>
-- <url-pattern>/register</url-pattern>
-- </servlet-mapping>
--
- </web-app>
diff --git a/eucalyptus-disable-reporting.patch b/eucalyptus-disable-reporting.patch
deleted file mode 100644
index 4b379a9..0000000
--- a/eucalyptus-disable-reporting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/module-inc.order
eucalyptus-3.2.0git5ab72572.good/clc/modules/module-inc.order
---- eucalyptus-3.2.0git5ab72572/clc/modules/module-inc.order 2012-12-10
14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/module-inc.order 2012-12-11
12:39:04.515976887 -0500
-@@ -15,7 +15,7 @@
- cluster-manager
- notifications
- storage-common
--reporting
-+# reporting
- troubleshooting
- walrus
- storage-controller
diff --git a/eucalyptus-drop-backport-util-concurrent.patch
b/eucalyptus-drop-backport-util-concurrent.patch
deleted file mode 100644
index f699f10..0000000
--- a/eucalyptus-drop-backport-util-concurrent.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 0237ff5b85b111f2ffed863fabfc51a590814822 Mon Sep 17 00:00:00 2001
-From: Marek Goldmann <goldmann(a)fedoraproject.org>
-Date: Wed, 28 Nov 2012 13:13:35 +0100
-Subject: [PATCH] Use java.util.concurrent from JDK, drop the use of
- backport-util-concurrent
-
----
- .../src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java | 2 +-
- .../src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java | 2 +-
- .../msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java | 2 +-
- .../msgs/src/main/java/com/eucalyptus/component/ComponentId.java | 2 +-
- .../src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java | 2 +-
- .../msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java | 2 +-
- clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java | 2 +-
- .../wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git
a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
-index b5b3430..9999287 100644
----
a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
-+++
b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
-@@ -111,7 +111,7 @@ import com.google.common.base.Function;
- import com.google.common.base.Predicate;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Lists;
--import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-+import java.util.concurrent.TimeUnit;
- import edu.ucsb.eucalyptus.cloud.VirtualBootRecord;
- import edu.ucsb.eucalyptus.cloud.VmKeyInfo;
- import edu.ucsb.eucalyptus.cloud.VmRunResponseType;
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
-index db01a04..48cd450 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
-@@ -72,7 +72,7 @@ import java.util.Properties;
- import org.apache.log4j.Logger;
- import com.google.common.collect.Maps;
- import com.google.common.io.Resources;
--import edu.emory.mathcs.backport.java.util.Collections;
-+import java.util.Collections;
-
- /**
- * Purpose: Show version information about the tree used to build the running software.
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
-index 631f74b..fdc492a 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
-@@ -31,7 +31,7 @@ import com.eucalyptus.ws.server.Pipelines;
- import com.google.common.base.Predicate;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
--import edu.emory.mathcs.backport.java.util.Arrays;
-+import java.util.Arrays;
- import edu.ucsb.eucalyptus.msgs.BaseMessage;
-
- public abstract class ComponentId implements HasName<ComponentId>,
HasFullName<ComponentId>, Serializable {
-diff --git
a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
-index a8b064f..7474a79 100644
----
a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
-+++
b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
-@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
- import org.apache.log4j.Logger;
- import com.eucalyptus.bootstrap.ServiceJarDiscovery;
- import com.google.common.collect.ObjectArrays;
--import edu.emory.mathcs.backport.java.util.Arrays;
-+import java.util.Arrays;
-
- public class PropertiesDiscovery extends ServiceJarDiscovery {
- private static Logger LOG = Logger.getLogger( PropertiesDiscovery.class );
-diff --git
a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
-index aa2c7ce..30860f6 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
-@@ -30,7 +30,7 @@ import com.google.common.collect.ArrayListMultimap;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Multimap;
- import com.google.common.collect.Ordering;
--import edu.emory.mathcs.backport.java.util.Collections;
-+import java.util.Collections;
-
- @SuppressWarnings( "unchecked" )
- public class PersistenceContexts {
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
-index f408717..3a94a97 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
-@@ -123,7 +123,7 @@ import com.google.common.collect.Collections2;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import com.google.common.primitives.Ints;
--import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-+import java.util.concurrent.atomic.AtomicBoolean;
-
- /**
- * TODO:GRZE: wrong package should be .util
-diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
-index 8772cd7..784d214 100644
---- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
-+++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
-@@ -92,7 +92,7 @@ import com.eucalyptus.util.Exceptions;
- import com.google.common.base.Predicate;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Maps;
--import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-+import java.util.concurrent.atomic.AtomicBoolean;
-
- @Provides( Empyrean.class )
- @RunDuring( Bootstrap.Stage.RemoteServicesInit )
----
eucalyptus-3.3.0.32052445/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java.orig 2013-03-28
17:32:16.000000000 -0400
-+++
eucalyptus-3.3.0.32052445/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java 2013-04-06
16:14:24.897834979 -0400
-@@ -76,7 +76,7 @@
- import com.google.common.collect.Collections2;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Maps;
--import edu.emory.mathcs.backport.java.util.Collections;
-+import java.util.Collections;
- import edu.ucsb.eucalyptus.msgs.BaseMessage;
-
- public class ComponentMessages {
diff --git a/eucalyptus-groovy18.patch b/eucalyptus-groovy18.patch
deleted file mode 100644
index 6b45b4f..0000000
--- a/eucalyptus-groovy18.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ur eucalyptus-3.bzr1505.new/clc/modules/module-inc.xml
eucalyptus-3.bzr1505/clc/modules/module-inc.xml
---- eucalyptus-3.bzr1505.new/clc/modules/module-inc.xml 2012-02-09 03:58:11.960546598
-0500
-+++ eucalyptus-3.bzr1505/clc/modules/module-inc.xml 2012-02-09 10:03:52.303521124 -0500
-@@ -118,6 +118,16 @@
- <include name="**/*" />
- </fileset>
- </path>
-+ <path id="srcpathjava">
-+ <fileset dir="${build.dir}">
-+ <include name="**/*.java" />
-+ </fileset>
-+ </path>
-+ <path id="srcpathgroovy">
-+ <fileset dir="${build.dir}">
-+ <include name="**/*.groovy" />
-+ </fileset>
-+ </path>
- <!--================================== copy conf
==================================-->
- <target name="copy-conf">
- <copy todir="${DESTDIR}${euca.conf.dir}">
-@@ -203,6 +203,18 @@
- <javac source="1.6" target="1.6" encoding="utf-8"
debug="true" />
- </groovyc>
- </target>
-+ <target name="build-groovy-isolated"
depends="should-build-groovy" unless="build.notRequired">
-+ <echo message="[COMPILE] ${builder.target} for ${ant.project.name}"
/>
-+ <antcall target="clean" />
-+ <mkdir dir="${build.dir}" />
-+ <mkdir dir="${conf.dir}" />
-+ <mkdir dir="${rsrc.dir}" />
-+ <mkdir dir="${test.dir}" />
-+ <mkdir dir="${src.dir}" />
-+ <taskdef name="groovyc"
classname="org.codehaus.groovy.ant.Groovyc" classpathref="classpath"
/>
-+ <groovyc srcdir="${src.dir}" classpathref="classpath"
sourcepathref="srcpathgroovy" destdir="${build.dir}"
verbose="true" listfiles="true"/>
-+ <javac srcdir="${src.dir}" classpathref="classpath"
destdir="${build.dir}" deprecation="true" failonerror="true"
debug="true" sourcepathref="srcpathjava" target="1.7"
listfiles="true" encoding="UTF-8" />
-+ </target>
- <target name="builder-test">
- <antcall target="build-mkdirs" inheritall="true"
inheritrefs="true" />
- <condition property="builder.target"
value="build-${builder.suffix}" else="build-java">
-diff -ur eucalyptus-3.bzr1505.new/clc/modules/configuration/build.xml
eucalyptus-3.bzr1505/clc/modules/configuration/build.xml
---- eucalyptus-3.bzr1505.new/clc/modules/configuration/build.xml 2012-02-09
02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505/clc/modules/configuration/build.xml 2012-02-10
04:53:55.476262078 -0500
-@@ -61,7 +61,7 @@
- -->
-
- <project name="eucalyptus-config" basedir=".">
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired"
targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-diff -ur eucalyptus-3.bzr1505.new/clc/modules/notifications/build.xml
eucalyptus-3.bzr1505/clc/modules/notifications/build.xml
---- eucalyptus-3.bzr1505.new/clc/modules/notifications/build.xml 2012-02-09
02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505/clc/modules/notifications/build.xml 2012-02-10
04:54:13.664260948 -0500
-@@ -61,7 +61,7 @@
- -->
-
- <project name="eucalyptus-notifications" basedir=".">
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired"
targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-diff -ur eucalyptus-3.bzr1505.old/clc/modules/cloud/build.xml
eucalyptus-3.bzr1505/clc/modules/cloud/build.xml
---- eucalyptus-3.bzr1505.old/clc/modules/cloud/build.xml 2012-02-09 02:24:49.000000000
-0500
-+++ eucalyptus-3.bzr1505/clc/modules/cloud/build.xml 2012-02-10 05:07:50.177185340 -0500
-@@ -62,7 +62,7 @@
-
- <project name="eucalyptus-cloud" basedir=".">
- <!--================================== BUILD TARGETS
==================================-->
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired"
targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/tokens/build.xml
eucalyptus-3.2.0git5ab72572.good/clc/modules/tokens/build.xml
---- eucalyptus-3.2.0git5ab72572/clc/modules/tokens/build.xml 2012-12-10
14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/tokens/build.xml 2012-12-11
12:16:38.586519614 -0500
-@@ -19,7 +19,7 @@
- additional information or have any questions.
- -->
- <project name="eucalyptus-tokens" basedir=".">
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired"
targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
diff --git a/eucalyptus-jarlinks.txt b/eucalyptus-jarlinks.txt
deleted file mode 100644
index e86acb7..0000000
--- a/eucalyptus-jarlinks.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-/usr/share/java/activemq/kahadb.jar
-/usr/share/java/activemq/activeio-core.jar
-/usr/share/java/activemq/activemq-core.jar
-/usr/share/java/activemq/protobuf.jar
-/usr/share/java/ant.jar
-/usr/share/java/antlr.jar
-/usr/share/java/apache-commons-beanutils.jar
-/usr/share/java/apache-commons-cli.jar
-/usr/share/java/apache-commons-collections.jar
-/usr/share/java/apache-commons-compress.jar
-/usr/share/java/apache-commons-fileupload.jar
-/usr/share/java/apache-commons-io.jar
-/usr/share/java/apache-commons-jxpath.jar
-/usr/share/java/apache-commons-lang.jar
-/usr/share/java/apache-commons-logging-adapters.jar
-/usr/share/java/apache-commons-logging-api.jar
-/usr/share/java/apache-commons-logging.jar
-/usr/share/java/apache-commons-pool.jar
-/usr/share/java/axiom/axiom-api.jar
-/usr/share/java/axiom/axiom-dom.jar
-/usr/share/java/axiom/axiom-impl.jar
-/usr/share/java/bcel.jar
-/usr/share/java/bcprov.jar
-/usr/share/java/bsf.jar
-/usr/share/java/btm.jar
-/usr/share/java/cglib.jar
-/usr/share/java/commons-codec.jar
-/usr/share/java/commons-digester.jar
-/usr/share/java/dnsjava.jar
-/usr/share/java/dom4j.jar
-/usr/share/java/ehcache-core.jar
-/usr/share/java/ezmorph.jar
-/usr/share/java/geronimo-ejb.jar
-/usr/share/java/geronimo-jms.jar
-/usr/share/java/geronimo-jta.jar
-/usr/share/java/geronimo-validation.jar
-/usr/share/java/groovy.jar
-/usr/share/java/guava.jar
-/usr/share/java/ha-jdbc.jar
-/usr/share/java/hamcrest12/all.jar
-/usr/share/java/hibernate3/hibernate-core-3.jar
-/usr/share/java/hibernate3/hibernate-ehcache-3.jar
-/usr/share/java/hibernate3/hibernate-entitymanager-3.jar
-/usr/share/java/hibernate3/hibernate-jbosscache-3.jar
-/usr/share/java/hibernate3/hibernate-proxool-3.jar
-/usr/share/java/hibernate/hibernate-commons-annotations.jar
-/usr/share/java/hibernate-jpa-2.0-api.jar
-/usr/share/java/jakarta-commons-httpclient.jar
-/usr/share/java/javamail/mail.jar
-/usr/share/java/javassist.jar
-/usr/share/java/java-uuid-generator.jar
-/usr/share/java/jaxen.jar
-/usr/share/java/jbosscache-core.jar
-/usr/share/java/jboss-common-core.jar
-/usr/share/java/jboss-connector-1.6-api.jar
-/usr/share/java/jboss-logging/jboss-logging.jar
-/usr/share/java/jcip-annotations.jar
-/usr/share/java/jetty/jetty-annotations.jar
-/usr/share/java/jetty/jetty-client.jar
-/usr/share/java/jetty/jetty-continuation.jar
-/usr/share/java/jetty/jetty-deploy.jar
-/usr/share/java/jetty/jetty-http.jar
-/usr/share/java/jetty/jetty-io.jar
-/usr/share/java/jetty/jetty-jmx.jar
-/usr/share/java/jetty/jetty-jndi.jar
-/usr/share/java/jetty/jetty-plus.jar
-/usr/share/java/jetty/jetty-rewrite.jar
-/usr/share/java/jetty/jetty-security.jar
-/usr/share/java/jetty/jetty-server.jar
-/usr/share/java/jetty/jetty-servlet.jar
-/usr/share/java/jetty/jetty-servlets.jar
-/usr/share/java/jetty/jetty-util.jar
-/usr/share/java/jetty/jetty-webapp.jar
-/usr/share/java/jetty/jetty-xml.jar
-/usr/share/java/jgroups212.jar
-/usr/share/java/jibx/bind.jar
-/usr/share/java/jibx/extras.jar
-/usr/share/java/jibx/run.jar
-/usr/share/java/jibx/schema.jar
-/usr/share/java/jibx/tools.jar
-/usr/share/java/jsch.jar
-/usr/share/java/json-lib.jar
-/usr/share/java/jsr-305.jar
-/usr/share/java/junit4.jar
-/usr/share/java/log4j.jar
-/usr/share/java/mule/mule-core.jar
-/usr/share/java/mule/mule-module-builders.jar
-/usr/share/java/mule/mule-module-client.jar
-/usr/share/java/mule/mule-module-spring-config.jar
-/usr/share/java/mule/mule-module-xml.jar
-/usr/share/java/mule/mule-transport-vm.jar
-/usr/share/java/netty31.jar
-/usr/share/java/objectweb-asm/asm-all.jar
-/usr/share/java/proxool.jar
-/usr/share/java/qname.jar
-/usr/share/java/quartz.jar
-/usr/share/java/regexp.jar
-/usr/share/java/rhq-plugin-annotations.jar
-/usr/share/java/slf4j/api.jar
-/usr/share/java/slf4j/jcl-over-slf4j.jar
-/usr/share/java/slf4j/jul-to-slf4j.jar
-/usr/share/java/slf4j/log4j12.jar
-/usr/share/java/springframework/spring-beans.jar
-/usr/share/java/springframework/spring-context.jar
-/usr/share/java/springframework/spring-context-support.jar
-/usr/share/java/springframework/spring-core.jar
-/usr/share/java/springframework/spring-expression.jar
-/usr/share/java/springframework/spring-web.jar
-/usr/share/java/stax2-api.jar
-/usr/share/java/tomcat-el-2.2-api.jar
-/usr/share/java/tomcat-servlet-3.0-api.jar
-/usr/share/java/velocity.jar
-/usr/share/java/woodstox-core.jar
-/usr/share/java/wsdl4j.jar
-/usr/share/java/wss4j/wss4j.jar
-/usr/share/java/xalan-j2.jar
-/usr/share/java/xalan-j2-serializer.jar
-/usr/share/java/xerces-j2.jar
-/usr/share/java/xml-commons-apis.jar
-/usr/share/java/xml-security.jar
-/usr/share/java/xom.jar
-/usr/share/java/xpp3.jar
-/usr/share/java/xstream.jar
diff --git a/eucalyptus-javah-classpath.patch b/eucalyptus-javah-classpath.patch
deleted file mode 100644
index 6b83f47..0000000
--- a/eucalyptus-javah-classpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.3.0.32052445/clc/modules/storage-controller/build.xml.orig 2013-03-28
17:32:16.000000000 -0400
-+++ eucalyptus-3.3.0.32052445/clc/modules/storage-controller/build.xml 2013-04-08
10:05:25.072742075 -0400
-@@ -74,7 +74,7 @@
- <antcall target="build-java" />
- <antcall target="jar" />
- <mkdir dir="include" />
-- <javah
classpath="${build.dir}:${modules.dir}/core/build:${modules.dir}/msgs/build:${modules.dir}/storage-common/build:${lib.dir}/groovy-all-1.7.2.jar:${lib.dir}/hibernate-3.5.6-Final.jar"
destdir="include" force="yes">
-+ <javah
classpath="${build.dir}:${modules.dir}/core/build:${modules.dir}/msgs/build:${modules.dir}/storage-common/build:${lib.dir}/groovy.jar:${lib.dir}/hibernate-core-3.jar"
destdir="include" force="yes">
- <class name="com.eucalyptus.storage.OverlayManager" />
- <class name="com.eucalyptus.storage.DASManager" />
- </javah>
diff --git a/eucalyptus-jdk7.patch b/eucalyptus-jdk7.patch
deleted file mode 100644
index 5716ab4..0000000
--- a/eucalyptus-jdk7.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/clc/modules/module-inc.xml b/clc/modules/module-inc.xml
-index 2315bee..10f38c9 100644
---- a/clc/modules/module-inc.xml
-+++ b/clc/modules/module-inc.xml
-@@ -171,7 +171,7 @@
- <echo message="[COMPILE] ${builder.target} for ${ant.project.name}"
/>
- <antcall target="clean" />
- <antcall target="build-mkdirs" inheritall="true"
inheritrefs="true" />
-- <javac srcdir="${src.dir}" classpathref="classpath"
destdir="${build.dir}" deprecation="false"
failonerror="true" debug="true" sourcepathref="srcpath"
target="1.5" listfiles="true" />
-+ <javac srcdir="${src.dir}" classpathref="classpath"
destdir="${build.dir}" deprecation="false"
failonerror="true" debug="true" sourcepathref="srcpath"
source="1.6" target="1.6" listfiles="true" />
- </target>
- <target name="should-build-groovy">
- <mkdir dir="${build.dir}" />
-@@ -185,7 +185,7 @@
- <antcall target="build-mkdirs" inheritall="true"
inheritrefs="true" />
- <taskdef name="groovyc"
classname="org.codehaus.groovy.ant.Groovyc" classpathref="classpath"
/>
- <groovyc srcdir="${src.dir}" classpathref="classpath"
sourcepathref="srcpath" destdir="${build.dir}"
verbose="true" listfiles="true">
-- <javac target="1.5" debug="true" />
-+ <javac source="1.6" target="1.6" debug="true" />
- </groovyc>
- </target>
- <target name="builder-test">
-diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
-index 4e458f5..1c44c55 100644
---- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
-+++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
-@@ -216,7 +216,7 @@ public class BaseMessage {
- try {
- Class responseClass = ClassLoader.getSystemClassLoader( ).loadClass( replyType );
- reply = ( TYPE ) responseClass.newInstance( );
-- reply.correlationId = this.correlationId;
-+ reply.setCorrelationId ( this.correlationId );
- } catch ( Exception e ) {
- Logger.getLogger( BaseMessage.class ).debug( e, e );
- throw new TypeNotPresentException( this.correlationId, e );
-diff --git a/clc/modules/storage-controller/build.xml
b/clc/modules/storage-controller/build.xml
-index 625fccb..6b80c8a 100644
---- a/clc/modules/storage-controller/build.xml
-+++ b/clc/modules/storage-controller/build.xml
-@@ -74,7 +74,7 @@
- <antcall target="build-java" />
- <antcall target="jar" />
- <mkdir dir="include" />
-- <javah classpath="${build.dir}" destdir="include"
force="yes">
-+ <javah
classpath="${build.dir}:${modules.dir}/core/build:${modules.dir}/msgs/build:${modules.dir}/storage-common/build:/usr/share/java/groovy.jar"
destdir="include" force="yes">
- <class name="com.eucalyptus.storage.OverlayManager" />
- <class name="com.eucalyptus.storage.AOEManager" />
- <class name="com.eucalyptus.storage.DASManager" />
diff --git a/eucalyptus-jetty-logging.patch b/eucalyptus-jetty-logging.patch
deleted file mode 100644
index d40981f..0000000
--- a/eucalyptus-jetty-logging.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN
eucalyptus-3.2.1/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java
eucalyptus-3.2.1.new/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java
----
eucalyptus-3.2.1/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2013-02-28
14:02:03.161907116 -0500
-+++
eucalyptus-3.2.1.new/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2013-02-28
22:02:51.845870758 -0500
-@@ -225,7 +225,7 @@
- capacity = (capacity > 1 ? capacity - 1 : capacity);
-
- } catch(Exception e) {
-- Log.warn("Unable to detect usable space in the directory:" +
WalrusProperties.bucketRootDirectory + " because of exception: " +
e.getMessage() + ". Using Walrus default: " +
WalrusProperties.DEFAULT_INITIAL_CAPACITY + "GB");
-+ // Log.warn("Unable to detect usable space in the directory:" +
WalrusProperties.bucketRootDirectory + " because of exception: " +
e.getMessage() + ". Using Walrus default: " +
WalrusProperties.DEFAULT_INITIAL_CAPACITY + "GB");
- }
- return capacity;
- }
-diff -urN
eucalyptus-3.2.1/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java
eucalyptus-3.2.1.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java
----
eucalyptus-3.2.1/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2013-02-28
14:02:03.160907102 -0500
-+++
eucalyptus-3.2.1.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2013-02-28
22:03:07.611087579 -0500
-@@ -482,7 +482,7 @@
- }
-
- private int getChunkSize( String hex ) {
-- Log.info( "Chunk Size Hex to parse:" + hex );
-+ // Log.info( "Chunk Size Hex to parse:" + hex );
- hex = hex.replaceAll( "\\W", "" ).trim( );
- for ( int i = 0; i < hex.length( ); i++ ) {
- char c = hex.charAt( i );
-@@ -491,7 +491,7 @@
- break;
- }
- }
-- Log.info( "Chunk Size in Hex:" + hex );
-+ // Log.info( "Chunk Size in Hex:" + hex );
- return Integer.parseInt( hex, 16 );
- }
-
diff --git a/eucalyptus-jetty-ssl-config.patch b/eucalyptus-jetty-ssl-config.patch
deleted file mode 100644
index ec1caf2..0000000
--- a/eucalyptus-jetty-ssl-config.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -urN
eucalyptus-3.2.1.new/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
eucalyptus-3.2.1/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
----
eucalyptus-3.2.1.new/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2013-02-28
14:02:03.160907102 -0500
-+++
eucalyptus-3.2.1/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2013-03-01
09:13:04.881625622 -0500
-@@ -70,7 +70,7 @@
- import java.nio.channels.SocketChannel;
- import org.apache.log4j.Logger;
- import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-+// import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
- import org.eclipse.jetty.xml.XmlConfiguration;
- import com.eucalyptus.component.id.Eucalyptus;
- import com.eucalyptus.component.id.HttpService;
-@@ -252,7 +252,7 @@
- }
- }
-
-- public static final class ConfiguredSslSelectChannelConnector extends
SslSelectChannelConnector {
-+ /* public static final class ConfiguredSslSelectChannelConnector extends
SslSelectChannelConnector {
- protected SSLEngine createSSLEngine() throws IOException {
- SocketChannel channel = SocketChannel.open();
- return super.createSSLEngine(channel);
-@@ -264,5 +264,5 @@
- engine.setEnabledCipherSuites( getEnabledCipherSuites(HTTPS_CIPHERS,
engine.getSupportedCipherSuites()) );
- return engine;
- }
-- }
-+ } */
- }
-diff -urN eucalyptus-3.2.1.new/clc/modules/www/src/main/resources/eucalyptus-jetty.xml
eucalyptus-3.2.1/clc/modules/www/src/main/resources/eucalyptus-jetty.xml
----
eucalyptus-3.2.1.new/clc/modules/www/src/main/resources/eucalyptus-jetty.xml 2013-02-28
14:02:03.161907116 -0500
-+++ eucalyptus-3.2.1/clc/modules/www/src/main/resources/eucalyptus-jetty.xml 2013-03-01
09:09:47.611172790 -0500
-@@ -63,26 +63,47 @@
- -->
-
- <Configure id="Server"
class="org.eclipse.jetty.server.Server">
-+ <!-- =========================================================== -->
-+ <!-- Setup the SSL Context factory used to establish all TLS -->
-+ <!-- Connections and session. -->
-+ <!-- -->
-+ <!-- Consult the javadoc of o.e.j.util.ssl.SslContextFactory -->
-+ <!-- o.e.j.server.HttpConnectionFactory for all configuration -->
-+ <!-- that may be set here. -->
-+ <!-- =========================================================== -->
-+ <New id="sslContextFactory"
class="org.eclipse.jetty.util.ssl.SslContextFactory">
-+ <Set name="KeyStorePath"><SystemProperty
name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-+ <Set name="KeyStorePassword">eucalyptus</Set>
-+ <Set name="KeyStoreType">pkcs12</Set>
-+ <Set name="KeyManagerPassword">eucalyptus</Set>
-+ <Set name="TrustStorePath"><SystemProperty
name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-+ <Set name="TrustStorePassword">eucalyptus</Set>
-+ <Set name="TrustStoreType">pkcs12</Set>
-+ </New>
-+
- <Call name="addConnector">
- <Arg>
-- <New
class="com.eucalyptus.bootstrap.HttpServerBootstrapper$ConfiguredSslSelectChannelConnector">
-- <Set name="Port">
-+ <New class="org.eclipse.jetty.server.ServerConnector">
-+ <Arg name="server"><Ref refid="Server"
/></Arg>
-+ <Arg name="factories">
-+ <Array type="org.eclipse.jetty.server.ConnectionFactory">
-+ <Item>
-+ <New
class="org.eclipse.jetty.server.SslConnectionFactory">
-+ <Arg name="next">http/1.1</Arg>
-+ <Arg name="sslContextFactory"><Ref
refid="sslContextFactory"/></Arg>
-+ </New>
-+ </Item>
-+ <Item>
-+ <New
class="org.eclipse.jetty.server.HttpConnectionFactory">
-+ <Arg name="config"><Ref
refid="tlsHttpConfig"/></Arg>
-+ </New>
-+ </Item>
-+ </Array>
-+ </Arg>
-+ <Set name="port">
- <SystemProperty name="euca.https.port" default="8443"
/>
- </Set>
-- <Set name="maxIdleTime">30000</Set>
-- <Set name="keystoreType">pkcs12</Set>
-- <Set name="truststoreType">pkcs12</Set>
-- <Set name="keystore"><SystemProperty
name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-- <Set name="truststore"><SystemProperty
name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-- <Set name="password">eucalyptus</Set>
-- <Set name="keyPassword">eucalyptus</Set>
-- <Set name="trustPassword">eucalyptus</Set>
-- <!-- Set name="ThreadPool">
-- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-- <Set name="minThreads">10</Set>
-- <Set name="maxThreads">25</Set>
-- </New>
-- </Set -->
-+ <Set name="idleTimeout">30000</Set>
- </New>
- </Arg>
- </Call>
diff --git a/eucalyptus-jetty8.patch b/eucalyptus-jetty8.patch
deleted file mode 100644
index de22a05..0000000
--- a/eucalyptus-jetty8.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -ur
eucalyptus-3.bzr1505/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java
eucalyptus-3.bzr1505.new/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java
----
eucalyptus-3.bzr1505/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java 2012-02-09
02:24:49.000000000 -0500
-+++
eucalyptus-3.bzr1505.new/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java 2012-02-09
04:33:05.473353310 -0500
-@@ -7,7 +7,7 @@
- import javax.servlet.http.HttpServletResponse;
-
- import org.apache.log4j.Logger;
--import org.mortbay.jetty.handler.rewrite.Rule;
-+import org.eclipse.jetty.rewrite.handler.Rule;
- import com.eucalyptus.bootstrap.HttpServerBootstrapper;
- import com.eucalyptus.component.ServiceConfiguration;
- import com.eucalyptus.component.Topology;
-diff -ur
eucalyptus-3.bzr1505/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java
eucalyptus-3.bzr1505.new/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java
----
eucalyptus-3.bzr1505/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java 2012-02-09
02:24:49.000000000 -0500
-+++
eucalyptus-3.bzr1505.new/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java 2012-02-09
05:31:39.500028619 -0500
-@@ -13,7 +13,7 @@
- import com.eucalyptus.bootstrap.SystemIds;
- import com.eucalyptus.system.SubDirectory;
-
--public class EmpyreanTransactionManager extends org.mortbay.component.AbstractLifeCycle
implements org.jboss.cache.transaction.TransactionManagerLookup,
org.hibernate.transaction.TransactionManagerLookup {
-+public class EmpyreanTransactionManager extends
org.eclipse.jetty.util.component.AbstractLifeCycle implements
org.jboss.cache.transaction.TransactionManagerLookup,
org.hibernate.transaction.TransactionManagerLookup {
- // public static final String JNDI_NAME = "eucalyptusTransactionManager";
- private static Logger LOG = Logger.getLogger(
EmpyreanTransactionManager.class );
- private static Context ctx = getContext( );
-diff -ur
eucalyptus-3.1.0/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java
eucalyptus-3.1.0.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java
----
eucalyptus-3.1.0/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2012-06-19
14:41:48.000000000 -0400
-+++
eucalyptus-3.1.0.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2012-06-19
14:41:48.000000000 -0400
-@@ -64,7 +64,7 @@
- import org.jboss.netty.handler.codec.http.HttpResponse;
- import org.jboss.netty.handler.codec.http.HttpVersion;
- import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.eucalyptus.context.Context;
- import com.eucalyptus.context.Contexts;
-diff -ur eucalyptus-3.1.0/clc/modules/www.orig/conf/www/admin.xml
eucalyptus-3.1.0/clc/modules/www/conf/www/admin.xml
---- eucalyptus-3.1.0/clc/modules/www.orig/conf/www/admin.xml 2012-06-19
14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/modules/www/conf/www/admin.xml 2012-08-07 11:34:32.191760020
-0400
-@@ -64,7 +64,7 @@
- -->
-
- <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://jetty.mortbay.org/configure.dtd">
--<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="contextPath">/</Set>
- <Set name="parentLoaderPriority">true</Set>
- <Set name="logUrlOnStart">true</Set>
-diff -ur
eucalyptus-3.1.0/clc/modules/www.orig/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
eucalyptus-3.1.0/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
----
eucalyptus-3.1.0/clc/modules/www.orig/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2012-08-07
11:29:11.908789566 -0400
-+++
eucalyptus-3.1.0/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2012-08-07
11:34:41.070759181 -0400
-@@ -65,10 +65,11 @@
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.net.URL;
-+import java.nio.channels.SocketChannel;
- import org.apache.log4j.Logger;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.security.SslSelectChannelConnector;
--import org.mortbay.xml.XmlConfiguration;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-+import org.eclipse.jetty.xml.XmlConfiguration;
- import com.eucalyptus.component.id.Eucalyptus;
- import com.eucalyptus.component.id.HttpService;
- import com.eucalyptus.configurable.ConfigurableClass;
-@@ -119,7 +119,8 @@
- if ( System.getProperty( "http.proxyPort" ) != null ) {
- httpProxyPort = System.getProperty( "http.proxyPort" );
- }
-- jettyServer = new org.mortbay.jetty.Server( );
-+ jettyServer = new org.eclipse.jetty.server.Server( );
-+ System.setProperty( "org.eclipse.jetty.util.log.DEBUG", "true"
);
- System.setProperty( "euca.http.port", "" + HTTP_PORT );
- System.setProperty( "euca.https.port", "" + HTTPS_PORT );
- URL defaultConfig = ClassLoader.getSystemResource( "eucalyptus-jetty.xml"
);
-@@ -241,9 +251,14 @@
- }
-
- public static final class ConfiguredSslSelectChannelConnector extends
SslSelectChannelConnector {
-- @Override
- protected SSLEngine createSSLEngine() throws IOException {
-- final SSLEngine engine = super.createSSLEngine();
-+ SocketChannel channel = SocketChannel.open();
-+ return super.createSSLEngine(channel);
-+ }
-+
-+ @Override
-+ protected SSLEngine createSSLEngine(SocketChannel channel) throws IOException {
-+ final SSLEngine engine = super.createSSLEngine(channel);
- engine.setEnabledCipherSuites( getEnabledCipherSuites(HTTPS_CIPHERS,
engine.getSupportedCipherSuites()) );
- return engine;
- }
-diff -ur eucalyptus-3.1.0/clc/modules/www.orig/src/main/resources/eucalyptus-jetty.xml
eucalyptus-3.1.0/clc/modules/www/src/main/resources/eucalyptus-jetty.xml
----
eucalyptus-3.1.0/clc/modules/www.orig/src/main/resources/eucalyptus-jetty.xml 2012-06-19
14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/modules/www/src/main/resources/eucalyptus-jetty.xml 2012-08-07
11:34:25.586760613 -0400
-@@ -62,7 +62,7 @@
- NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.
- -->
-
--<Configure id="Server" class="org.mortbay.jetty.Server">
-+<Configure id="Server"
class="org.eclipse.jetty.server.Server">
- <Call name="addConnector">
- <Arg>
- <New
class="com.eucalyptus.bootstrap.HttpServerBootstrapper$ConfiguredSslSelectChannelConnector">
-@@ -77,14 +77,12 @@
- <Set name="password">eucalyptus</Set>
- <Set name="keyPassword">eucalyptus</Set>
- <Set name="trustPassword">eucalyptus</Set>
-- <Set name="ThreadPool">
-- <New class="org.mortbay.thread.QueuedThreadPool">
-+ <!-- Set name="ThreadPool">
-+ <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">25</Set>
-- <Set name="lowThreads">5</Set>
-- <Set name="SpawnOrShrinkAt">2</Set>
- </New>
-- </Set>
-+ </Set -->
- </New>
- </Arg>
- </Call>
-@@ -90,7 +90,7 @@
- </Call>
- <Call name="addConnector">
- <Arg>
-- <New class="org.mortbay.jetty.nio.SelectChannelConnector">
-+ <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="Port">
- <SystemProperty name="euca.http.port" default="8080"
/>
- </Set>
-@@ -98,26 +98,26 @@
- </Arg>
- </Call>
- <Set name="handler">
-- <New id="Handlers"
class="org.mortbay.jetty.handler.rewrite.RewriteHandler">
-+ <New id="Handlers"
class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
- <Set name="rules">
-- <Array type="org.mortbay.jetty.handler.rewrite.Rule">
-+ <Array type="org.eclipse.jetty.rewrite.handler.Rule">
- <Item>
- <New id="httpsRedirect"
class="com.eucalyptus.www.Redirect" />
- </Item>
- </Array>
- </Set>
- <Set name="handler">
-- <New id="Handlers"
class="org.mortbay.jetty.handler.HandlerCollection">
-+ <New id="Handlers"
class="org.eclipse.jetty.server.handler.HandlerCollection">
- <Set name="handlers">
-- <Array type="org.mortbay.jetty.Handler">
-+ <Array type="org.eclipse.jetty.server.Handler">
- <Item>
-- <New id="Contexts"
class="org.mortbay.jetty.handler.ContextHandlerCollection" />
-+ <New id="Contexts"
class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
- </Item>
- <Item>
-- <New id="DefaultHandler"
class="org.mortbay.jetty.handler.DefaultHandler" />
-+ <New id="DefaultHandler"
class="org.eclipse.jetty.server.handler.DefaultHandler" />
- </Item>
- <Item>
-- <New id="RequestLog"
class="org.mortbay.jetty.handler.RequestLogHandler" />
-+ <New id="RequestLog"
class="org.eclipse.jetty.server.handler.RequestLogHandler" />
- </Item>
- </Array>
- </Set>
-@@ -132,7 +132,7 @@
- </Call>
- <Call name="addLifeCycle">
- <Arg>
-- <New class="org.mortbay.jetty.deployer.ContextDeployer">
-+ <New class="org.eclipse.jetty.deploy.ContextDeployer">
- <Set name="contexts">
- <Ref id="Contexts" />
- </Set>
-@@ -144,7 +144,7 @@
- </Call>
- <Ref id="RequestLog">
- <Set name="requestLog">
-- <New id="RequestLogImpl"
class="org.mortbay.jetty.NCSARequestLog">
-+ <New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><SystemProperty
name="euca.log.dir" default="./log"
/>/jetty-request-yyyy_mm_dd.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="retainDays">90</Set>
-diff -ur eucalyptus-3.1.0/clc/modules/core/src/main/resources/log4j.xml
eucalyptus-3.1.0.patched/clc/modules/core/src/main/resources/log4j.xml
---- eucalyptus-3.1.0/clc/modules/core/src/main/resources/log4j.xml 2012-06-19
14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0.patched/clc/modules/core/src/main/resources/log4j.xml 2012-08-08
14:44:16.357733943 -0400
-@@ -301,7 +301,7 @@
- <priority value="${euca.log.level}" />
- <appender-ref ref="cloud-exhaust" />
- </category>
-- <category name="org.mortbay" additivity="false">
-+ <category name="org.eclipse.jetty" additivity="false">
- <priority value="${euca.log.level}" />
- <appender-ref ref="cloud-exhaust" />
- </category>
-diff -ur
eucalyptus-3.2.0git5ab72572/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java
eucalyptus-3.2.0git5ab72572.good/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java
----
eucalyptus-3.2.0git5ab72572/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572.good/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2012-12-11
12:06:37.423401474 -0500
-@@ -72,7 +72,7 @@
- import javax.persistence.Table;
- import org.hibernate.annotations.Cache;
- import org.hibernate.annotations.CacheConcurrencyStrategy;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.eucalyptus.configurable.ConfigurableClass;
- import com.eucalyptus.configurable.ConfigurableField;
diff --git a/eucalyptus-jni-abspath.patch b/eucalyptus-jni-abspath.patch
deleted file mode 100644
index 05293e1..0000000
--- a/eucalyptus-jni-abspath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
eucalyptus-3.1.0.orig/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java 2012-08-16
23:14:00.640939401 -0400
-+++
eucalyptus-3.1.0/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java 2012-08-27
14:18:56.459491065 -0400
-@@ -91,6 +91,7 @@
- import com.eucalyptus.crypto.Ciphers;
- import com.eucalyptus.entities.EntityWrapper;
- import com.eucalyptus.storage.StorageManagers.StorageManagerProperty;
-+import com.eucalyptus.system.BaseDirectory;
- import com.eucalyptus.util.EucalyptusCloudException;
- import com.eucalyptus.util.StorageProperties;
- import com.eucalyptus.util.WalrusProperties;
-@@ -287,7 +288,7 @@
- }
- //The following should be executed only once during the entire lifetime of the VM.
- if(!initialized) {
-- System.loadLibrary("lvm2control");
-+ System.load(BaseDirectory.JNI.toString() + "/liblvm2control.so");
- registerSignals();
- initialized = true;
- }
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/DASManager.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/DASManager.java 2012-12-11
14:26:02.451443203 -0500
-@@ -289,7 +289,7 @@
-
- public void initialize() {
- if(!initialized) {
-- System.loadLibrary("dascontrol");
-+ System.load(BaseDirectory.JNI.toString() + "/libdascontrol.so");
- registerSignals();
- initialized = true;
- }
diff --git a/eucalyptus-move-version-file.patch b/eucalyptus-move-version-file.patch
deleted file mode 100644
index cd35a41..0000000
--- a/eucalyptus-move-version-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.1.0.orig/tools/euca_conf.in 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/tools/euca_conf.in 2012-08-27 16:39:21.337567567 -0400
-@@ -750,6 +750,8 @@
-
- if [ -e $EUCALYPTUS/etc/eucalyptus/eucalyptus-version ]; then
- VERSION="$EUCALYPTUS/etc/eucalyptus/eucalyptus-version"
-+ elif [ -e /usr/share/eucalyptus/eucalyptus-version ]; then
-+ VERSION="/usr/share/eucalyptus/eucalyptus-version"
- elif [ -e @prefix@/etc/eucalyptus/eucalyptus-version ]; then
- VERSION="@prefix@/etc/eucalyptus/eucalyptus-version"
- fi
diff --git a/eucalyptus-nc-libvirt.rules b/eucalyptus-nc-libvirt.rules
deleted file mode 100644
index e5e2b64..0000000
--- a/eucalyptus-nc-libvirt.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (action.id == "org.libvirt.unix.manage" &&
- subject.user == "eucalyptus") {
- polkit.log("action=" + action.id);
- polkit.log("subject=" + subject);
- polkit.log("Returning " + polkit.Result.YES);
- return polkit.Result.YES;
- }
- polkit.log("Returning " + polkit.Result.NOT_HANDLED + " for user "
+ subject.user);
- return polkit.Result.NOT_HANDLED;
-});
diff --git a/eucalyptus-nc.init b/eucalyptus-nc.init
deleted file mode 100755
index 7157a14..0000000
--- a/eucalyptus-nc.init
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/bin/bash
-#Copyright (c) 2009 Eucalyptus Systems, Inc.
-#
-#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, only version 3 of the License.
-#
-#This file 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/>.
-#
-#Please contact Eucalyptus Systems, Inc., 130 Castilian
-#Dr., Goleta, CA 93101 USA or visit <
http://www.eucalyptus.com/licenses/>
-#if you need additional information or have any questions.
-#
-#This file may incorporate work covered under the following copyright and
-#permission notice:
-#
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Regents of the University of California
-#
-#
-# Redistribution and use of this software in source and binary forms, with
-# or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
-# THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-# LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-# SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-# BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-# THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-# OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-# WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-# ANY SUCH LICENSES OR RIGHTS.
-#
-
-#
-# Init script for the Eucalyptus node controller.
-#
-# chkconfig: 2345 99 05
-# description: script for starting and stopping eucalyptus node controller
-#
-### BEGIN INIT INFO
-# Provides: eucalyptus-nc
-# Required-Start: $remote_fs $syslog libvirtd
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Eucalyptus node controller
-# Description: Start the Eucalyptus node controller
-### END INIT INFO
-#
-
-# Do NOT "set -e"
-
-# if we have lsb functions let's source them
-WE_HAVE_LSB="N"
-if [ -e /lib/lsb/init-functions ]; then
- . /lib/lsb/init-functions
- # very old lsb don't have the functions we need
- if type log_daemon_msg > /dev/null 2> /dev/null ; then
- WE_HAVE_LSB="Y"
- fi
-fi
-
-if [ "$EUID" != "0" ]; then
- echo "Eucalyptus init scritps must be run as root."
- exit 1
-fi
-
-# I just wanted to set PATH to be the system PATH, but if a user install
-# eucalyptus manually, it may have binaries in a non-standard position:
-# hence we need to keep the PATH we receive.
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
-DESC="Eucalyptus services"
-NAME=eucalyptus-nc
-BRCTL="`which brctl 2> /dev/null`"
-MODPROBE="`which modprobe 2> /dev/null`"
-EUCA_USER="eucalyptus"
-
-export EUCALYPTUS="/"
-. $EUCALYPTUS/etc/eucalyptus/eucalyptus.conf
-EUCAHELPERDIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCASBINDIR=$EUCALYPTUS/usr/sbin
-EUCACONFDIR=$EUCALYPTUS/etc/eucalyptus
-EUCADATADIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCARUNDIR=$EUCALYPTUS/var/run/eucalyptus
-EUCALOGDIR=$EUCALYPTUS/var/log/eucalyptus
-LIBDIR=@LIBDIR@
-
-# crude way to start the axis2c services
-do_start() {
- # fixes #469984
- IPTABLES="`which iptables 2> /dev/null`"
- if [ -n "$IPTABLES" ]; then
- [ -x $IPTABLES ] && $IPTABLES -L -n > /dev/null 2> /dev/null
- fi
-
- if [ ! -x $EUCASBINDIR/euca_conf ]; then
- echo "Some eucalyptus components are missing"
- exit 1
- fi
-
- # Add loop devices if necessary (and possible)
- [ -z "$CREATE_NC_LOOP_DEVICES" ] && CREATE_NC_LOOP_DEVICES=256
- if [ "$CREATE_NC_LOOP_DEVICES" -gt 0 ] 2>/dev/null; then
- "$EUCAHELPERDIR/create-loop-devices" $CREATE_NC_LOOP_DEVICES
- fi
-
- # let's see how many loop devices we have available
- LOOP_AVL_DEV="`/bin/ls -1d /dev/loop* 2>/dev/null | wc -l`"
- LOOP_AVL_SYS="`/bin/ls -1d /sys/block/loop* 2>/dev/null | wc -l`"
- if [ -z "$LOOP_AVL_DEV" -o "$LOOP_AVL_DEV" = "0" ]; then
- echo "warning: no loop devices found in /dev; expect problems" >&2
- elif [ $LOOP_AVL_DEV -lt 50 ]; then
- echo "warning: found $LOOP_AVL_DEV loop devices in /dev; at least 50 are
recommended" >&2
- elif [ -z "$LOOP_AVL_SYS" -o "$LOOP_AVL_SYS" -lt
"$LOOP_AVL_DEV" ] && [[ `uname -r` < 2.6.22 ]]; then # The version
comparison does not work in every shell
- # When then loop driver's max_loop option is not 0, loop device nodes
- # that are not automatically created by the kernel do not work. We can
- # check for this case by looking for too few loop device entries in
- # sysfs.
- #
- # Trying to determine whether or not max_loop is 0 is difficult on
- # Linux 2, so in general we make no attempt to do so. However, max_loop
- # *cannot* be 0 on Linux < 2.6.22, so we perform this check on those
- # systems so it will hopefully cover the majority of cases.
- echo "warning: found fewer loop devices in /sys/block than in /dev ($LOOP_AVL_SYS
< $LOOP_AVL_DEV); expect problems"
- fi
-
- if ! $EUCASBINDIR/euca_conf --check nc ; then
- exit 1
- fi
-
- # we have a program to test the hypervisor and more for the NC
- if [ ! -x $EUCASBINDIR/euca_test_nc ]; then
- echo
- echo "Cannot check Node Controller: missing euca_test_nc."
- else
- # sometimes, libvirtd takes some time to start on init, so retry euca_test_nc
a few times before failing
- for i in 1 2 3 4 5
- do
- PASSED=0
- if ( $EUCASBINDIR/euca_test_nc $HYPERVISOR >
$EUCALOGDIR/euca_test_nc.log 2>&1 ); then
- PASSED=1
- else
- sleep 1
- fi
- done
- if ( test $PASSED = "0" ); then
- echo
- echo "Node Controller cannot be started: errors in
$EUCALOGDIR/euca_test_nc.log"
- exit 1
- fi
- fi
-
- # on SYSTEM or STATIC mode the bridge needs to exists
- if [ "$VNET_MODE" = "SYSTEM" -o "$VNET_MODE" =
"STATIC" ]; then
- if [ -n "$BRCTL" -a -x $BRCTL ]; then
- if ! $BRCTL show |grep $VNET_BRIDGE > /dev/null 2> /dev/null ; then
- echo
- echo "Warning! Cannot find bridge $VNET_BRIDGE: instances may be without
net"
- fi
- fi
- fi
-
- # we need IP forwarding and we need to use iptable over the bridge
- if [ -w /proc/sys/net/ipv4/ip_forward ]; then
- VAL=`cat /proc/sys/net/ipv4/ip_forward`
- if [ "$VAL" = "0" ]; then
- echo
- echo "Enabling IP forwarding for eucalyptus."
- echo -n 1 > /proc/sys/net/ipv4/ip_forward
- fi
- fi
- if [ -w /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
- VAL=`cat /proc/sys/net/bridge/bridge-nf-call-iptables`
- if [ "$VAL" = "0" ]; then
- echo
- echo "Enabling bridge netfiltering for eucalyptus."
- echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables
- fi
- fi
-
- if [ -x $EUCASBINDIR/eucanetd ]; then
- if ! $EUCASBINDIR/eucanetd ; then
- echo
- echo "Failed to start the eucanetd"
- fi
- fi
-
- if ! httpd -f $EUCACONFDIR/httpd/conf/httpd-nc.conf ; then
- echo
- echo "Failed to start the NC!"
- exit 1
- fi
-}
-
-do_status() {
- pidfile=$EUCARUNDIR/eucalyptus-nc.pid
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- if ps axww|grep $pid|grep httpd-nc.conf > /dev/null ; then
- # we are good
- return 0
- fi
- fi
- return 1
-}
-
-do_stop() {
- netpid="$EUCARUNDIR/eucanetd.pid"
- if [ -f "$netpid" ]; then
- kill `cat $netpid` >/dev/null 2>&1
- rm -f $netpid
- fi
-
- pidfile=$EUCARUNDIR/eucalyptus-nc.pid
-
- # let's be sure we are killing the right process
- if ! do_status ; then
- rm -f $pidfile
- return
- fi
-
- # now kill the services
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- kill $pid > /dev/null 2>&1
- else
- return
- fi
- timeout=5
- while [ $timeout -gt 0 ]; do
- if ps $pid > /dev/null 2>&1 ; then
- sleep 1
- timeout=$(($timeout - 1))
- else
- break
- fi
- done
- if [ $timeout -eq 0 ]; then
- kill -9 $pid > /dev/null 2>&1
- fi
- rm -f $pidfile
-}
-
-# set the library path correctly
-export LD_LIBRARY_PATH=$LIBDIR/wso2-axis2/modules/rampart
-export AXIS2C_HOME=$LIBDIR/eucalyptus/axis2/nc
-export WSFCPP_HOME=$LIBDIR/eucalyptus/axis2/nc
-
-case "$1" in
- start)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_daemon_msg "Starting $DESC" "$NAME"
- else
- echo -n "Starting $DESC: "
- fi
- fi
-
- # let's check there is no previous NC running
- if do_status ; then
- echo
- echo "another NC is already running!"
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- fi
- fi
- exit 1
- fi
-
- rm -f /dev/shm/sem.eucalyptus-nc* /dev/shm/sem.eucalyptus-st*
- do_start
- case "$?" in
- 0|1)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- *)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- else
- echo "failed!"
- fi
- fi
- ;;
- esac
- ;;
- stop)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Stopping $DESC"
- else
- echo -n "Stopping $DESC: "
- fi
- fi
- do_stop
- rm -f /dev/shm/sem.eucalyptus-nc* /dev/shm/sem.eucalyptus-st*
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- restart)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Restarting $DESC"
- else
- echo -n "Restarting $DESC: "
- fi
- fi
- # restart allow the CC to mantain the state across restart
- do_stop
- do_start
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- status)
- if do_status ; then
- echo "NC is running"
- else
- exit 3
- fi
- ;;
- *)
- echo "Usage: $NAME {start|stop|restart}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/eucalyptus-nc.service b/eucalyptus-nc.service
deleted file mode 100644
index 0d89cc4..0000000
--- a/eucalyptus-nc.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Eucalyptus Node Controller service
-After=syslog.target network.target remote-fs.target nss-lookup.target libvirtd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/eucalyptus/eucalyptus-nc.pid
-# EnvironmentFile=/etc/sysconfig/eucalyptus
-ExecStart=/usr/libexec/eucalyptus/eucalyptus-nc.init start
-ExecStop=/usr/libexec/eucalyptus/eucalyptus-nc.init stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/eucalyptus-no-console-cert-validation.patch
b/eucalyptus-no-console-cert-validation.patch
deleted file mode 100644
index eb6e922..0000000
--- a/eucalyptus-no-console-cert-validation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.2.0git5ab72572.orig/console/eucaconsole/botoclcinterface.py 2012-12-10
14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/console/eucaconsole/botoclcinterface.py 2012-12-13
07:43:13.297385594 -0500
-@@ -52,7 +52,7 @@
- except ConfigParser.Error:
- pass
- self.conn = EC2Connection(access_id, secret_key, region=reg,
-- port=port, path=path,
-+ port=port, path=path, validate_certs=False,
- is_secure=True, security_token=token, debug=0)
- self.conn.APIVersion = '2012-03-01'
- self.conn.http_connection_kwargs['timeout'] = 30
diff --git a/eucalyptus-rootwrap-python.patch b/eucalyptus-rootwrap-python.patch
deleted file mode 100644
index 9150fdf..0000000
--- a/eucalyptus-rootwrap-python.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/check.py
eucalyptus-3.1.0/clc/eucadmin/eucadmin/check.py
---- eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/check.py 2012-06-19 14:41:48.000000000
-0400
-+++ eucalyptus-3.1.0/clc/eucadmin/eucadmin/check.py 2012-08-16 16:32:39.180732968 -0400
-@@ -32,7 +32,7 @@
- import pwd
- from eucadmin.command import Command
-
--RootWrapPath = 'usr/lib/eucalyptus/euca_rootwrap'
-+RootWrapPath = '/usr/libexec/eucalyptus/euca_rootwrap'
-
- class Check(object):
-
-diff -ur eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/eucasetup.py
eucalyptus-3.1.0/clc/eucadmin/eucadmin/eucasetup.py
---- eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/eucasetup.py 2012-06-19
14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/eucadmin/eucadmin/eucasetup.py 2012-08-16 16:32:54.400888899
-0400
-@@ -32,8 +32,8 @@
- import pwd
- from eucadmin.utils import chown_recursive, chmod_recursive
-
--RootWrapPath = 'usr/lib/eucalyptus/euca_rootwrap'
--MountWrapPath = 'usr/lib/eucalyptus/euca_mountwrap'
-+RootWrapPath = '/usr/libexec/eucalyptus/euca_rootwrap'
-+MountWrapPath = '/usr/libexec/eucalyptus/euca_mountwrap'
-
- MakeDirs = ['var/lib/eucalyptus/dynserv/data',
- 'var/lib/eucalyptus/db',
diff --git a/eucalyptus-unlink-mod_rampart.patch b/eucalyptus-unlink-mod_rampart.patch
deleted file mode 100644
index 7bdff5a..0000000
--- a/eucalyptus-unlink-mod_rampart.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- eucalyptus-3.2.0git5ab72572.orig/configure 2012-12-12 11:00:38.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/configure 2012-12-12 11:01:29.000000000 -0500
-@@ -5951,7 +5951,6 @@
-
- fi
-
--
- { $as_echo "$as_me:$LINENO: checking for main in -lmod_rampart" >&5
- $as_echo_n "checking for main in -lmod_rampart... " >&6; }
- if test "${ac_cv_lib_mod_rampart_main+set}" = set; then
-@@ -6012,12 +6011,8 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mod_rampart_main" >&5
- $as_echo "$ac_cv_lib_mod_rampart_main" >&6; }
- if test "x$ac_cv_lib_mod_rampart_main" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBMOD_RAMPART 1
--_ACEOF
--
-- LIBS="-lmod_rampart $LIBS"
--
-+ { $as_echo "$as_me:$LINENO: result: Found libmod_rampart" >&5
-+$as_echo "Found libmod_rampart" >&6; }
- else
- { { $as_echo "$as_me:$LINENO: error: Cannot find libmod_rampart" >&5
- $as_echo "$as_me: error: Cannot find libmod_rampart" >&2;}
---- eucalyptus-3.2.0git5ab72572.orig/configure.ac 2012-12-11 10:32:38.707295562 -0500
-+++ eucalyptus-3.2.0git5ab72572/configure.ac 2012-12-12 10:44:29.156296112 -0500
-@@ -234,7 +234,7 @@
- AC_CHECK_LIB([axis2_parser],[axiom_xml_reader_init],,AC_MSG_ERROR([Cannot find axis2
libs!]))
- AC_CHECK_LIB([axutil],[main],,AC_MSG_ERROR([Cannot find libaxutil]))
- AC_CHECK_LIB([m],[main])
--AC_CHECK_LIB([mod_rampart],[main],,AC_MSG_ERROR([Cannot find libmod_rampart]))
-+AC_CHECK_LIB([mod_rampart],[main],AC_MSG_RESULT([Found
libmod_rampart]),AC_MSG_ERROR([Cannot find libmod_rampart]))
- AC_CHECK_LIB([neethi],[main],,AC_MSG_ERROR([Cannot find libneethi!]))
- AC_CHECK_LIB([pthread],[main])
- AC_CHECK_LIB([rt],[main])
diff --git a/eucalyptus-wso2-axis2-configure.patch
b/eucalyptus-wso2-axis2-configure.patch
deleted file mode 100644
index 197a49f..0000000
--- a/eucalyptus-wso2-axis2-configure.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur eucalyptus-3.1.0.orig/configure eucalyptus-3.1.0/configure
---- eucalyptus-3.1.0.orig/configure 2012-08-16 23:14:00.585938864 -0400
-+++ eucalyptus-3.1.0/configure 2012-08-18 10:07:10.102716060 -0400
-@@ -4124,6 +4124,10 @@
- for x in ${AXIS2C_HOME}/include/axis2-*
${AXIS2C_HOME}/include/rampart-*; do
- INCLUDES="${INCLUDES} -I$x"
- done
-+ else
-+ for x in /usr/include/axis2-* /usr/include/rampart-*; do
-+ INCLUDES="${INCLUDES} -I$x"
-+ done
- fi
- if test -d "${AXIS2C_HOME}"/lib ; then
- LDFLAGS="-L${AXIS2C_HOME}/lib ${LDFLAGS}"
-diff -ur eucalyptus-3.1.0.orig/configure.ac eucalyptus-3.1.0/configure.ac
---- eucalyptus-3.1.0.orig/configure.ac 2012-08-16 23:14:00.587938882 -0400
-+++ eucalyptus-3.1.0/configure.ac 2012-08-18 10:06:36.011376622 -0400
-@@ -124,6 +124,10 @@
- for x in ${AXIS2C_HOME}/include/axis2-*
${AXIS2C_HOME}/include/rampart-*; do
- INCLUDES="${INCLUDES} -I$x"
- done
-+ else
-+ for x in /usr/include/axis2-* /usr/include/rampart-*; do
-+ INCLUDES="${INCLUDES} -I$x"
-+ done
- fi
- if test -d "${AXIS2C_HOME}"/lib ; then
- LDFLAGS="-L${AXIS2C_HOME}/lib ${LDFLAGS}"
diff --git a/eucalyptus-wss4j-support.patch b/eucalyptus-wss4j-support.patch
deleted file mode 100644
index 86fd9d1..0000000
--- a/eucalyptus-wss4j-support.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-diff -urN
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java 1969-12-31
19:00:00.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java 2012-12-11
10:36:26.895875354 -0500
-@@ -0,0 +1,133 @@
-+/**
-+ * Licensed to the Apache Software Foundation (ASF) under one
-+ * or more contributor license agreements. See the NOTICE file
-+ * distributed with this work for additional information
-+ * regarding copyright ownership. The ASF licenses this file
-+ * to you under the Apache License, Version 2.0 (the
-+ * "License"); you may not use this file except in compliance
-+ * with the License. You may obtain a copy of the License at
-+ *
-+ *
http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing,
-+ * software distributed under the License is distributed on an
-+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+ * KIND, either express or implied. See the License for the
-+ * specific language governing permissions and limitations
-+ * under the License.
-+ */
-+
-+package com.eucalyptus.crypto.util;
-+
-+import org.apache.ws.security.WSDocInfo;
-+import org.apache.ws.security.WSSecurityException;
-+import org.apache.ws.security.message.CallbackLookup;
-+import org.apache.ws.security.message.DOMCallbackLookup;
-+import org.apache.xml.security.signature.XMLSignatureInput;
-+import org.apache.xml.security.utils.resolver.ResourceResolverException;
-+import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
-+import org.w3c.dom.Attr;
-+import org.w3c.dom.Element;
-+
-+/**
-+ * XML-Security resolver that is used for resolving same-document URIs like
URI="#id".
-+ * It is designed to work only with SOAPEnvelopes.
-+ * <p/>
-+ *
-+ * @author Davanum Srinivas (dims(a)yahoo.com).
-+ */
-+public class EnvelopeIdResolver extends ResourceResolverSpi {
-+ private static org.apache.commons.logging.Log log =
-+ org.apache.commons.logging.LogFactory.getLog(EnvelopeIdResolver.class);
-+
-+ private boolean doDebug = false;
-+
-+ private WSDocInfo wsDocInfo;
-+
-+ /**
-+ * @param docInfo The WSDocInfo object to be used for resolving elements
-+ */
-+ public void setWsDocInfo(WSDocInfo docInfo) {
-+ wsDocInfo = docInfo;
-+ }
-+
-+ /**
-+ * This is the workhorse method used to resolve resources.
-+ * <p/>
-+ *
-+ * @param uri
-+ * @param BaseURI
-+ * @return TODO
-+ * @throws ResourceResolverException
-+ */
-+ public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
-+ throws ResourceResolverException {
-+
-+ doDebug = log.isDebugEnabled();
-+
-+ String uriNodeValue = uri.getNodeValue();
-+ if (doDebug) {
-+ log.debug("enter engineResolve, look for: " + uriNodeValue);
-+ }
-+
-+ //
-+ // First check to see if the element that we require is a previously processed
-+ // Security Token that is stored in WSDocInfo.
-+ //
-+ Element selectedElem = null;
-+ String id = uriNodeValue.substring(1);
-+ if (selectedElem == null && wsDocInfo != null) {
-+ selectedElem = wsDocInfo.getTokenElement(id);
-+ }
-+
-+ if (selectedElem == null && (id != null || "".equals(id))) {
-+ CallbackLookup callbackLookup = null;
-+ if (wsDocInfo != null) {
-+ callbackLookup = wsDocInfo.getCallbackLookup();
-+ }
-+ if (callbackLookup == null) {
-+ callbackLookup = new DOMCallbackLookup(uri.getOwnerDocument());
-+ }
-+ try {
-+ selectedElem = callbackLookup.getElement(id, null, true);
-+ } catch (WSSecurityException ex) {
-+ throw new ResourceResolverException(
-+ ex.getMessage(), new Object[]{"Id: " + id + " not
found"},
-+ uri, BaseURI
-+ );
-+ }
-+ if (selectedElem == null) {
-+ throw new ResourceResolverException("generic.EmptyMessage",
-+ new Object[]{"Id: " + id + " not found"},
-+ uri,
-+ BaseURI);
-+ }
-+ }
-+
-+ XMLSignatureInput result = new XMLSignatureInput(selectedElem);
-+ result.setMIMEType("text/xml");
-+ if (doDebug) {
-+ log.debug("exit engineResolve, result: " + result);
-+ }
-+ return result;
-+ }
-+
-+ /**
-+ * This method helps the ResourceResolver to decide whether a
-+ * ResourceResolverSpi is able to perform the requested action.
-+ * <p/>
-+ *
-+ * @param uri
-+ * @param BaseURI
-+ * @return TODO
-+ */
-+ public boolean engineCanResolve(Attr uri, String BaseURI) {
-+ if (uri == null) {
-+ return false;
-+ }
-+ String uriNodeValue = uri.getNodeValue();
-+ return uriNodeValue.startsWith("#");
-+ }
-+
-+}
-+
-diff -urN
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java 2012-12-11
10:36:34.270183164 -0500
-@@ -69,6 +69,7 @@
- import java.security.cert.X509Certificate;
- import java.util.Calendar;
- import java.util.Date;
-+import java.util.List;
- import java.util.Vector;
- import org.apache.axiom.om.OMElement;
- import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-@@ -79,7 +80,7 @@
- import org.apache.ws.security.WSSConfig;
- import org.apache.ws.security.WSSecurityEngineResult;
- import org.apache.ws.security.WSSecurityException;
--import org.apache.ws.security.message.EnvelopeIdResolver;
-+import org.apache.ws.security.handler.RequestData;
- import org.apache.ws.security.message.token.BinarySecurity;
- import org.apache.ws.security.message.token.Reference;
- import org.apache.ws.security.message.token.SecurityTokenReference;
-@@ -111,6 +112,7 @@
- public class WSSecurity {
- private static Logger LOG = Logger.getLogger( WSSecurity.class );
- private static CertificateFactory factory;
-+ public static final WSSConfig wssConfig;
- private static final String SYSTEM_PROPERTY_SKIP_SECURITY_CHECK =
"com.eucalyptus.crypto.util.skipWsSecurityConfigurationChecks";
-
- static {
-@@ -120,9 +122,12 @@
- LOG.fatal("XML Security configuration not applied, set system property
"+SYSTEM_PROPERTY_SKIP_SECURITY_CHECK+"=true to skip check");
- throw new RuntimeException("XML Security Configuration not applied");
- }
-- WSSConfig.getDefaultWSConfig( ).addJceProvider( "BC",
BouncyCastleProvider.class.getCanonicalName( ) );
-- WSSConfig.getDefaultWSConfig( ).setTimeStampStrict( true );
-- WSSConfig.getDefaultWSConfig( ).setEnableSignatureConfirmation( true );
-+ wssConfig = WSSConfig.getNewInstance( );
-+
-+ wssConfig.addJceProvider( "BC",
BouncyCastleProvider.class.getCanonicalName( ) );
-+ wssConfig.setTimeStampStrict( true );
-+ wssConfig.setEnableSignatureConfirmation( true );
-+ wssConfig.setWsiBSPCompliant( false );
- }
-
- public static void init() {
-@@ -166,12 +171,9 @@
- throws WSSecurityException, XMLSignatureException, XMLSecurityException {
- final SecurityTokenReference secRef = WSSecurity.getSecurityTokenReference(
sig.getKeyInfo( ) );
- final Reference tokenRef = secRef.getReference( );
-- Element bstDirect = WSSecurityUtil.getElementByWsuId( securityNode.getOwnerDocument(
), tokenRef.getURI( ) );
-+ Element bstDirect = WSSecurityUtil.findElementById( securityNode.getOwnerDocument(
), tokenRef.getURI( ), false );
- if ( bstDirect == null ) {
-- bstDirect = WSSecurityUtil.getElementByGenId( securityNode.getOwnerDocument( ),
tokenRef.getURI( ) );
-- if ( bstDirect == null ) {
-- throw new WSSecurityException( WSSecurityException.INVALID_SECURITY,
"noCert" );
-- }
-+ throw new WSSecurityException( WSSecurityException.INVALID_SECURITY,
"noCert" );
- }
- BinarySecurity token = new BinarySecurity( bstDirect );
- String type = token.getValueType( );
-@@ -276,15 +278,17 @@
- // can't call handleTimestamp() directly because
- // the config will not be set in that case
- // all null-params are not used by handleToken()
-- Vector retResults = new Vector();
-- tsProc.handleToken((Element)node, null, null, null, null, retResults,
WSSConfig.getDefaultWSConfig());
-+ RequestData data = new RequestData();
-+ data.setWssConfig(WSSecurity.wssConfig);
-+
-+ List<WSSecurityEngineResult> retResults = tsProc.handleToken((Element)node,
data, null);
-
- // need to make sure that the timestamp's valid period
- // is at least as long as the request caching time
- Timestamp ts =
(Timestamp)((WSSecurityEngineResult)retResults.get(0)).get(WSSecurityEngineResult.TAG_TIMESTAMP);
- LOG.debug("timestamp: " + ts);
-
-- Date expires = ts.getExpires().getTime();
-+ Date expires = ts.getExpires();
-
- if(!SecurityContext.validateTimestampPeriod(expires)) {
- LOG.warn("[security] ]Timestamp expiration is further in the future than
replay cache expiration");
-@@ -338,12 +342,12 @@
- } catch ( XMLSecurityException e2 ) {
- throw new WSSecurityException( WSSecurityException.FAILED_CHECK,
"noXMLSig", null, e2 );
- }
-- sig.addResourceResolver( EnvelopeIdResolver.getInstance( ) );
-+ sig.addResourceResolver( new EnvelopeIdResolver() );
- return sig;
- }
-
- public static SecurityTokenReference getSecurityTokenReference( KeyInfo info ) throws
WSSecurityException {
-- Node secTokenRef = WSSecurityUtil.getDirectChild( info.getElement( ),
SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_NS );
-+ Node secTokenRef = WSSecurityUtil.getDirectChildElement( info.getElement( ),
SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_NS );
- if ( secTokenRef == null ) {
- throw new WSSecurityException( WSSecurityException.INVALID_SECURITY,
"unsupportedKeyInfo" );
- }
-diff -urN
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java 2012-12-11
10:36:34.270183164 -0500
-@@ -64,6 +64,7 @@
-
- import java.util.Collection;
- import java.util.Vector;
-+import java.util.List;
- import org.apache.axiom.om.OMElement;
- import org.apache.axiom.om.OMException;
- import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-@@ -121,9 +122,16 @@
-
- final Vector v = new Vector( );
- final WSSecHeader wsheader = new WSSecHeader( "", false );
-- wsheader.insertSecurityHeader( doc );
-+ try {
-+ wsheader.insertSecurityHeader( doc );
-+ } catch ( WSSecurityException e ) {
-+ LOG.error( doc );
-+ LOG.error( e, e );
-+ Channels.fireExceptionCaught( ctx, e );
-+ }
-
- final WSSecSignature signer = new WSSecSignature( );
-+ signer.setWsConfig(WSSecurity.wssConfig);
- signer.setKeyIdentifierType( WSConstants.BST_DIRECT_REFERENCE );
- signer.setSigCanonicalization( WSConstants.C14N_EXCL_OMIT_COMMENTS );
- try {
-@@ -142,9 +150,9 @@
- }
- v.addAll( this.getSignatureParts( ) );
- signer.appendBSTElementToHeader( wsheader );
-- signer.appendToHeader( wsheader );
-+ List<javax.xml.crypto.dsig.Reference> references = null;
- try {
-- signer.addReferencesToSign( v, wsheader );
-+ references = signer.addReferencesToSign( v, wsheader );
- } catch ( WSSecurityException e ) {
- LOG.error( doc );
- LOG.error( e, e );
-@@ -152,7 +160,7 @@
- }
-
- try {
-- signer.computeSignature( );
-+ signer.computeSignature( references, false, null );
- } catch ( WSSecurityException e ) {
- LOG.error( doc );
- LOG.error( e, e );
-diff -urN
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java
----
eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java 2012-12-10
14:18:28.000000000 -0500
-+++
eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java 2012-12-11
10:36:26.897875437 -0500
-@@ -64,6 +64,7 @@
-
- import org.apache.ws.security.WSSecurityException;
- import org.apache.ws.security.components.crypto.Crypto;
-+import org.apache.ws.security.components.crypto.CryptoType;
- import com.eucalyptus.component.ComponentId;
- import com.eucalyptus.component.auth.SystemCredentials;
- import com.eucalyptus.component.id.Eucalyptus;
-@@ -72,6 +73,8 @@
- import java.math.BigInteger;
- import java.security.KeyStore;
- import java.security.PrivateKey;
-+import java.security.PublicKey;
-+import javax.security.auth.callback.CallbackHandler;
- import java.security.cert.Certificate;
- import java.security.cert.CertificateFactory;
- import java.security.cert.X509Certificate;
-@@ -84,27 +87,37 @@
- }
-
- @Override
-- public X509Certificate[] getCertificates( final String arg0 ) throws
WSSecurityException {
-+ public X509Certificate[] getCertificatesFromBytes( final byte[] data ) throws
WSSecurityException {
- return new X509Certificate[] { SystemCredentials.lookup( this.componentId
).getCertificate( ) };
- }
-
- @Override
-- public PrivateKey getPrivateKey( final String alias, final String password ) throws
Exception {
-+ public X509Certificate[] getX509Certificates( final CryptoType cryptoType ) throws
WSSecurityException {
-+ return new X509Certificate[] { SystemCredentials.lookup( this.componentId
).getCertificate( ) };
-+ }
-+
-+ @Override
-+ public PrivateKey getPrivateKey( final String alias, final String password ) throws
WSSecurityException {
- return SystemCredentials.lookup( this.componentId ).getPrivateKey( );
- }
-
-+ @Override
-+ public PrivateKey getPrivateKey( final X509Certificate certificate, final
CallbackHandler callbackHandler ) throws WSSecurityException {
-+ return SystemCredentials.lookup( this.componentId ).getPrivateKey( );
-+ }
-+
-+ @Override public void setCryptoProvider( final String provider ) { }
-+ @Override public String getCryptoProvider() { return null; }
-+ @Override public void setCertificateFactory( final String provider, final
CertificateFactory certFactory) { }
-+ @Override public void setDefaultX509Identifier( final String identifier) { }
-+
- @Override public X509Certificate loadCertificate( final InputStream inputStream )
throws WSSecurityException { return null; }
-- @Override public X509Certificate[] getX509Certificates( final byte[] bytes, final
boolean b ) throws WSSecurityException { return new X509Certificate[0]; }
-- @Override public byte[] getCertificateData( final boolean b, final X509Certificate[]
x509Certificates ) throws WSSecurityException { return new byte[0]; }
-- @Override public String getAliasForX509Cert( final Certificate certificate ) throws
WSSecurityException { return null; }
-- @Override public String getAliasForX509Cert( final String s ) throws
WSSecurityException { return null; }
-- @Override public String getAliasForX509Cert( final String s, final BigInteger
bigInteger ) throws WSSecurityException { return null; }
-- @Override public String getAliasForX509Cert( final byte[] bytes ) throws
WSSecurityException { return null; }
-- @Override public String getDefaultX509Alias( ) { return null; }
-- @Override public byte[] getSKIBytesFromCert( final X509Certificate x509Certificate )
throws WSSecurityException { return new byte[0]; }
-- @Override public String getAliasForX509CertThumb( final byte[] bytes ) throws
WSSecurityException { return null; }
-- @Override public KeyStore getKeyStore( ) { return null; }
-- @Override public CertificateFactory getCertificateFactory( ) throws
WSSecurityException { return null; }
-- @Override public boolean validateCertPath( final X509Certificate[] x509Certificates )
throws WSSecurityException { return false; }
-- @Override public String[] getAliasesForDN( final String s ) throws WSSecurityException
{ return new String[0]; }
-+ @Override public String getX509Identifier( final X509Certificate cert ) throws
WSSecurityException { return null; }
-+ @Override public byte[] getBytesFromCertificates( final X509Certificate[] certs )
throws WSSecurityException { return new byte[0]; }
-+ @Override public byte[] getSKIBytesFromCert( final X509Certificate cert ) throws
WSSecurityException { return new byte[0]; }
-+ @Override public String getDefaultX509Identifier() throws WSSecurityException { return
null; }
-+ @Override public CertificateFactory getCertificateFactory() throws WSSecurityException
{ return null; }
-+ @Override public boolean verifyTrust( final X509Certificate[] certs ) throws
WSSecurityException { return false; }
-+ @Override public boolean verifyTrust( final X509Certificate[] certs, boolean
enableRevocation ) throws WSSecurityException { return false; }
-+ @Override public boolean verifyTrust( final PublicKey publicKey ) throws
WSSecurityException { return false; }
- }
diff --git a/eucalyptus.spec b/eucalyptus.spec
deleted file mode 100644
index ed95300..0000000
--- a/eucalyptus.spec
+++ /dev/null
@@ -1,1161 +0,0 @@
-%global axis2c_home %{_libdir}/wso2-axis2
-%global axis2c_services %{_libdir}/%{name}/axis2
-%global eucalibexecdir %{_libexecdir}/%{name}
-%global eucadatadir %{_datadir}/%{name}
-%global eucajavalibdir %{_datadir}/%{name}
-%global helperdir %{_datadir}/%{name}
-%global gittag 32052445
-%global tar_suffix .%{gittag}
-%global with_axis2v14 0
-%global _hardened_build 1
-%global __provides_exclude_from ^%{_libdir}/%{name}/.*.so$
-
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-Summary: Elastic Utility Computing Architecture
-Name: eucalyptus
-Version: 3.3.0
-Release: 0.15.20130408git%{gittag}%{?dist}
-License: GPLv3 and (GPLv3 and ASL 2.0) and (GPLv3 and BSD)
-URL:
http://www.eucalyptus.com
-
-BuildRequires: help2man
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: libvirt-devel >= 0.6
-BuildRequires: libxslt-devel
-BuildRequires: openssl-devel
-BuildRequires: python-boto >= 2.1
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: swig
-BuildRequires: wso2-axis2-devel
-BuildRequires: wso2-rampart-devel
-BuildRequires: wso2-wsf-cpp-devel
-BuildRequires: iscsi-initiator-utils
-BuildRequires: curl-devel
-BuildRequires: systemd-units
-
-BuildRequires: activemq-core
-BuildRequires: ant >= 1.7
-BuildRequires: antlr-tool
-BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-compress
-BuildRequires: apache-commons-fileupload
-BuildRequires: apache-commons-io
-BuildRequires: apache-commons-lang
-BuildRequires: axiom
-# BuildRequires: axis2
-BuildRequires: bcel
-BuildRequires: bouncycastle
-BuildRequires: btm
-BuildRequires: dnsjava
-# Should be a json-lib Requires
-BuildRequires: ezmorph
-BuildRequires: geronimo-jta
-BuildRequires: geronimo-validation
-BuildRequires: groovy
-BuildRequires: guava >= 9
-BuildRequires: ha-jdbc
-BuildRequires: hamcrest12
-BuildRequires: hibernate3 >= 3.6.10-7
-BuildRequires: hibernate3-ehcache >= 3.6.10-7
-BuildRequires: hibernate3-entitymanager >= 3.6.10-7
-BuildRequires: hibernate3-jbosscache >= 3.6.10-7
-BuildRequires: hibernate3-proxool >= 3.6.10-7
-BuildRequires: hibernate-jpa-2.0-api
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: javamail
-BuildRequires: jboss-logging
-BuildRequires: jetty-annotations
-BuildRequires: jetty-client
-BuildRequires: jetty-continuation
-BuildRequires: jetty-deploy
-BuildRequires: jetty-http
-BuildRequires: jetty-io
-BuildRequires: jetty-jmx
-BuildRequires: jetty-jndi
-BuildRequires: jetty-plus
-BuildRequires: jetty-rewrite
-BuildRequires: jetty-security
-BuildRequires: jetty-server
-BuildRequires: jetty-servlet
-BuildRequires: jetty-servlets
-BuildRequires: jetty-util
-BuildRequires: jetty-webapp
-BuildRequires: jetty-xml
-BuildRequires: jgroups212
-BuildRequires: jibx
-BuildRequires: jsch
-BuildRequires: json-lib
-BuildRequires: junit
-BuildRequires: log4j
-BuildRequires: mule-module-builders
-BuildRequires: mule-module-client
-BuildRequires: mule-module-xml
-BuildRequires: mule-transport-vm
-BuildRequires: netty31
-BuildRequires: proxool
-BuildRequires: rhq-plugin-annotations
-BuildRequires: springframework-context-support
-BuildRequires: springframework-web
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: velocity
-BuildRequires: woodstox-core
-BuildRequires: wsdl4j
-BuildRequires: wss4j >= 1.6.7-1
-BuildRequires: xalan-j2
-BuildRequires: xml-commons-apis
-BuildRequires: xml-security >= 1.5.3-1
-# Should be a json-lib Requires
-BuildRequires: xom
-BuildRequires: m2crypto
-
-%if %with_axis2v14
-BuildRequires: axis2v14
-%endif
-
-Requires: vconfig
-Requires: wget
-Requires: rsync
-Requires: which
-Requires: libselinux-python
-Requires: perl(Crypt::OpenSSL::RSA)
-Requires: perl(Crypt::OpenSSL::Random)
-Requires: sudo
-Requires(pre): %{_sbindir}/groupadd
-Requires(pre): %{_sbindir}/useradd
-Requires(post): %{_sbindir}/euca_conf
-
-#Source0:
http://downloads.eucalyptus.com/releases/eucalyptus/3.2/source/eucalyptus...
-# git archive --format=tgz --prefix=eucalyptus-3.3.0.$( git rev-parse HEAD | cut -c1-8)/
\
-# HEAD -o ~/fedpkg/eucalyptus/eucalyptus-3.3.0.$( git rev-parse HEAD | cut -c1-8).tgz
-Source0: eucalyptus-%{version}.%{gittag}.tgz
-# A version of WSDL2C.sh that respects standard classpaths
-Source1: euca-WSDL2C.sh
-Source2: eucalyptus-jarlinks.txt
-
-# XXX: these system units should go in the source tree
-Source3: eucalyptus-cloud.service
-Source4: eucalyptus-cc.service
-Source5: eucalyptus-nc.service
-
-# These are sources that greatly simplify CC/NC startup,
-# Removing dynamic config file generation and needless
-# guesswork about where axis2 files are.
-Source6: axis2.xml
-Source7: eucalyptus-cc.init
-Source8: eucalyptus-nc.init
-# Note that these needed to be adapted for httpd 2.4
-# See
http://httpd.apache.org/docs/2.4/upgrading.html
-Source9: httpd-cc.conf
-Source10: httpd-nc.conf
-Source11: httpd-common.conf
-
-# Axis2/Java code generation is broken with v1.6
-# To regenerate this code:
-# 1) yum install
http://arg.fedorapeople.org/axis2v14/noarch/axis2v14-1.4.1-1.fc18.noarch.rpm
-# 2) Set with_axis2v14 to 1
-# 3) fedpkg prep
-# 4) pushd eucalyptus-<version>
-# 5) Run configure command from: rpmspec -P ../eucalyptus.spec | grep -A 15 ^./configure
-# 6) for x in gatherlog cluster node; do pushd $x; make generated/stubs; popd; done
-# 7) find . -name '*.o' | xargs rm
-# 8) popd
-# 9) tar czf eucalyptus-<version>-generated.tgz \
-# eucalyptus-<version>/{node,cluster,gatherlog}/generated
-%if !%with_axis2v14
-Source12: eucalyptus-%{version}%{tar_suffix}-generated.tgz
-%endif
-
-# Add a separate "clean" script for the CC
-Source13: eucalyptus-clean-cc
-
-# Add a new-style polkit rule
-Source14: eucalyptus-nc-libvirt.rules
-
-# Add tmpfiles config
-Source15: eucalyptus.tmpfiles
-
-# Systemd unit for eucalyptus-console
-Source16: eucalyptus-console.service
-
-#
https://eucalyptus.atlassian.net/browse/EUCA-2364
-Patch0: eucalyptus-jdk7.patch
-#
https://eucalyptus.atlassian.net/browse/EUCA-3253
-Patch2: eucalyptus-jetty8.patch
-#
https://eucalyptus.atlassian.net/browse/EUCA-2993
-Patch4: eucalyptus-groovy18.patch
-
-# Three separate patches to disable gwt
-Patch9: eucalyptus-disable-gwt.patch
-Patch10: eucalyptus-disable-gwt-in-buildxml.patch
-Patch11: eucalyptus-disable-gwt-in-makefile.patch
-
-# Make install paths configurable
-#
https://eucalyptus.atlassian.net/browse/EUCA-3531
-Patch13: eucalyptus-configurable-paths.patch
-
-# Make one repo per service of Axis2 services
-Patch14: eucalyptus-axis2-services.patch
-
-# Fix rootwrap path in python files
-Patch15: eucalyptus-rootwrap-python.patch
-
-# Fix include location for axis2 libs
-Patch16: eucalyptus-wso2-axis2-configure.patch
-
-# Use System.load with an absolute path for JNI lib load
-Patch18: eucalyptus-jni-abspath.patch
-
-# Move version file out of /etc
-Patch20: eucalyptus-move-version-file.patch
-
-# Support wss4j 1.6.x
-Patch23: eucalyptus-wss4j-support.patch
-
-# eucalyptus 3.2 patches
-Patch24: eucalyptus-disable-reporting.patch
-Patch25: eucalyptus-3.2-guava.patch
-
-# Drop backport-util-concurrent usage
-Patch26: eucalyptus-drop-backport-util-concurrent.patch
-
-# tgt checks are not systemd-compatible
-#
https://eucalyptus.atlassian.net/browse/EUCA-4398
-Patch27: eucalyptus-bad-tgt-check.patch
-
-# libmod_rampart should not be linked into CC, GL, or NC
-#
https://eucalyptus.atlassian.net/browse/EUCA-4400
-Patch28: eucalyptus-unlink-mod_rampart.patch
-
-# cert validation in boto 2.6.0 breaks the user console,
-# since the CLC has a self-signed cert
-Patch29: eucalyptus-no-console-cert-validation.patch
-
-# jetty.util.log.Log usage breaks in Jetty 9
-Patch30: eucalyptus-jetty-logging.patch
-# jetty SslSelectChannelConnector was deprecated and has been removed.
-Patch31: eucalyptus-jetty-ssl-config.patch
-
-# import guava class from guava (!) instead of GWT
-Patch32: eucalyptus-braindead-gwt-import.patch
-
-# Fix classpath for JNI builds (do we still need to build these?
-Patch33: eucalyptus-javah-classpath.patch
-
-%description
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the common parts; you will need to install at
-least one of the cloud controller (cloud), cluster controller (cc),
-node controller (nc), storage controller (sc), or walrus packages as well.
-
-%package common-java
-Summary: Elastic Utility Computing Architecture - ws java stack
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
-Requires: java-headless >= 1:1.6.0
-Requires: lvm2
-Requires: activemq-core
-Requires: ant
-Requires: antlr-tool
-Requires: apache-commons-codec
-Requires: apache-commons-collections
-Requires: apache-commons-compress
-Requires: apache-commons-fileupload
-Requires: apache-commons-io
-Requires: axiom
-Requires: bcel
-Requires: bouncycastle
-Requires: btm
-Requires: dnsjava
-Requires: dom4j
-Requires: ezmorph
-Requires: geronimo-jms
-Requires: geronimo-jta
-Requires: groovy
-Requires: guava >= 9
-Requires: ha-jdbc
-Requires: hamcrest12
-Requires: hibernate3 >= 3.6.10-7
-Requires: hibernate3-ehcache >= 3.6.10-7
-Requires: hibernate3-entitymanager >= 3.6.10-7
-Requires: hibernate3-jbosscache >= 3.6.10-7
-Requires: hibernate3-proxool >= 3.6.10-7
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
-Requires: jakarta-commons-httpclient
-Requires: javamail
-Requires: jboss-logging
-Requires: jetty
-Requires: jgroups212
-Requires: jibx
-Requires: jsch
-Requires: json-lib
-Requires: jsr-305
-Requires: log4j
-Requires: mule-module-builders
-Requires: mule-module-client
-Requires: mule-module-management
-Requires: mule-module-spring-config
-Requires: mule-module-xml
-Requires: mule-transport-vm
-Requires: mx4j
-Requires: netty31
-Requires: postgresql-jdbc
-Requires: proxool
-Requires: springframework-context-support
-Requires: springframework-web
-Requires: stax-utils
-Requires: tomcat-servlet-3.0-api
-Requires: velocity
-Requires: woodstox-core
-Requires: wsdl4j
-Requires: wss4j >= 1.6.7-1
-Requires: xalan-j2
-Requires: xml-commons-apis
-Requires: xml-security >= 1.5.3-1
-Requires: xom
-Requires: %{_sbindir}/euca_conf
-Requires(preun): systemd-units
-Requires(post): systemd-units
-
-%description common-java
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the java WS stack.
-
-%package walrus
-Summary: Elastic Utility Computing Architecture - walrus
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-java = %{version}-%{release}
-Requires: drbd-utils
-Requires: lvm2
-
-%description walrus
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains storage component for your cloud: images and buckets
-are handled by walrus. Typically this package is installed alongside the
-cloud controller.
-
-%package sc
-Summary: Elastic Utility Computing Architecture - storage controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-java = %{version}-%{release}
-Requires: rhq-plugin-annotations
-Requires: device-mapper-multipath
-Requires: lvm2
-Requires: iscsi-initiator-utils
-Requires: scsi-target-utils
-
-%description sc
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the storage controller part of eucalyptus, which
-handles the elastic blocks for a given cluster. Typically you install it
-alongside the cluster controller.
-
-%package cloud
-Summary: Elastic Utility Computing Architecture - cloud controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-java%{?_isa} = %{version}-%{release}
-Requires: euca2ools >= 2.0
-Requires: lvm2
-Requires: perl(Getopt::Long)
-Requires: postgresql
-Requires: postgresql-server
-
-# For reporting web UI
-# Requires: dejavu-serif-fonts
-
-%description cloud
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the cloud controller part of eucalyptus. The cloud
-controller needs to be reachable by both the cluster controller and from
-the cloud clients.
-
-%package cc
-Summary: Elastic Utility Computing Architecture - cluster controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gl = %{version}-%{release}
-Requires: bridge-utils
-Requires: iproute
-Requires: iptables
-Requires: vtun
-Requires: dhcp
-Requires: httpd
-Requires: %{_sbindir}/euca_conf
-Requires: mod_wso2-axis2
-# XXX: I wish this were not "devel", but some modules are being
-# loaded without a version
-Requires: wso2-axis2-devel
-Requires: wso2-axis2-modules
-Requires(preun): systemd-units
-Requires(post): systemd-units
-
-%description cc
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the cluster controller part of eucalyptus. It
-handles a group of node controllers.
-
-%package nc
-Summary: Elastic Utility Computing Architecture - node controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gl = %{version}-%{release}
-Requires: bridge-utils
-Requires: device-mapper
-Requires: device-mapper-multipath
-Requires: euca2ools >= 2.1.3
-Requires: perl(Sys::Virt)
-Requires: perl(Time::HiRes)
-Requires: perl(XML::Simple)
-# The next six come from storage/diskutil.c, which shells out to lots of stuff.
-Requires: coreutils
-Requires: e2fsprogs
-Requires: file
-# grub2 package not available on arm
-%ifnarch %{arm}
-Requires: grub2
-%endif
-Requires: parted
-Requires: util-linux
-Requires: curl
-Requires: httpd
-Requires: kvm
-Requires: iscsi-initiator-utils
-Requires: libvirt
-Requires: mod_wso2-axis2
-# XXX: I wish this were not "devel", but some modules are being
-# loaded without a version
-Requires: wso2-axis2-devel
-Requires: wso2-axis2-modules
-Requires: %{_sbindir}/euca_conf
-Requires(preun): systemd-units
-Requires(post): systemd-units
-
-%description nc
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the node controller part of eucalyptus. This
-component handles instances.
-
-%package gl
-Summary: Elastic Utility Computing Architecture - log service
-Requires: %{name} = %{version}-%{release}
-Requires: httpd
-
-%description gl
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the internal log service of eucalyptus.
-
-%package admin-tools
-Summary: Elastic Utility Computing Architecture - admin CLI tools
-License: BSD
-Requires: %{name} = %{version}-%{release}
-Requires: python-eucadmin = %{version}-%{release}
-Requires: rsync
-BuildArch: noarch
-
-%description admin-tools
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains command line tools necessary for managing a
-Eucalyptus cluster.
-
-%package -n python-eucadmin
-Summary: Elastic Utility Computing Architecture - administration Python library
-# A patched version of python's gzip is included, so we add the Python license
-License: BSD and Python
-Requires: PyGreSQL
-Requires: python-boto >= 2.1
-Requires: rsync
-BuildArch: noarch
-
-%description -n python-eucadmin
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the Python library used by Eucalyptus administration
-tools. It is neither intended nor supported for use by any other programs.
-
-%package axis2-clients
-Summary: Axis2/C web service clients for Eucalyptus services
-License: GPLv3
-Requires: wso2-axis2
-Requires: %{name}-cc = %{version}-%{release}
-
-%description axis2-clients
-This package contains three debugging programs for testing Eucalyptus
-components which run as Axis2/C webservices.
-
-%package console
-Summary: Client user interface for Eucalyptus
-License: GPLv3 and BSD
-
-Requires: python-tornado
-Requires: python-boto >= 2.1
-Requires: m2crypto
-
-%description console
-Client user interface for Eucalyptus.
-
-
-%prep
-%setup -q -n %{name}-%{version}.%{gittag}
-%if !%with_axis2v14
-tar --strip-components=1 -xvzf %{SOURCE12}
-touch gatherlog/generated/stubs cluster/generated/stubs node/generated/stubs
-%endif
-# This patch is upstream now
-# %patch0 -p1
-%patch2 -p1
-%patch4 -p1
-%patch9 -p1
-# This patch is no longer needed due to build refactoring
-# %patch10 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-# JNI libraries appear not to be loaded in 3.3
-# %patch18 -p1
-%patch20 -p1
-%patch23 -p1
-# Reporting can be used in 3.3
-# %patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-# This patch is upstream now
-# %patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-
-# remove classes which depend on junit
-# This is because junit on Fedora bundles hamcrest 1.1, which has conflicts
-# with hamcrest 1.2. And regardless, these should not be bundled into our
-# production jars.
-pushd clc/modules
-rm core/src/main/java/edu/ucsb/eucalyptus/util/XMLParserTest.java
-rm dns/src/main/java/com/eucalyptus/cloud/ws/tests/DNSControlTest.java
-rm dns/src/main/java/com/eucalyptus/cloud/ws/tests/RemoveARecordTest.java
-rm
storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateVolumeFromSnapshotTest.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/StorageTests.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/VolumeTest.java
-rm
storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/DeleteSnapshotTest.java
-rm
storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateSnapshotTest.java
-popd
-
-# This has a compilation error, and we aren't supporting upgrades from anything
older
-rm clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java
-
-# Remove admin web UI. It uses GWT. Ick.
-rm -rf clc/modules/www
-
-# Do not redistribute a binary floppy image
-# We should have a script to reconstruct this
-echo -n > tools/floppy
-
-# Filter unwanted perl provides
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl(disconnect_iscsitarget_main.pl)/d' \
- -e '/perl(connect_iscsitarget_main.pl)/d' \
- -e '/perl(iscsitarget_common.pl)/d'
-EOF
-
-%global __perl_provides %{_builddir}/%{name}-%{version}%{?tar_suffix}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
-# Filter unwanted perl requires
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(disconnect_iscsitarget_main.pl)/d' \
- -e '/perl(connect_iscsitarget_main.pl)/d' \
- -e '/perl(iscsitarget_common.pl)/d'
-EOF
-
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?tar_suffix}/%{name}-req
-chmod +x %{__perl_requires}
-
-
-%build
-export CFLAGS="%{optflags}"
-export LDFLAGS="$RPM_LD_FLAGS"
-
-# TODO: we should use %%configure now, except that "prefix" is still broken
-# Also, helperdir sould be a config option, unless we decide that
-# it's always eucadatadir
-./configure --with-axis2=%{_datadir}/axis2-* \
- --with-axis2c=%{axis2c_home} \
- --with-axis2c-services=%{axis2c_services} \
- --with-wsdl2c-sh=%{SOURCE1} \
- --enable-debug \
- --prefix=/ \
- --sbindir=%{_sbindir} \
- --libexecdir=%{_libexecdir} \
- --libdir=%{_libdir} \
- --datarootdir=%{_datadir} \
- --localstatedir=%{_localstatedir} \
- --sysconfdir=%{_sysconfdir} \
- --with-apache2-module-dir=%{_libdir}/httpd/modules \
- --with-db-home=/usr \
- --with-extra-version=%{release}
-
-# symlink java deps
-mkdir clc/lib
-for x in $( cat %{SOURCE2} );
-do
- if [ ! -e $x ]; then
- echo "Could not find $x"
- exit 1
- fi
- ln -s $x clc/lib/;
-done
-
-# Don't bother with git since we're using a cloud-libs tarball
-touch clc/.nogit
-
-# FIXME: storage/Makefile breaks with parallel make
-make # %{?_smp_mflags}
-pushd clc/eucadmin
-( export PYTHONPATH=.; python gen_manpages.py )
-popd
-
-# Build the Eucalyptus Console
-pushd console
-%py2_build
-popd console
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-for x in $( cat %{SOURCE2} | grep -v junit4 );
-do
- rm $RPM_BUILD_ROOT%{eucajavalibdir}/$( basename $x )
- ln -s $x $RPM_BUILD_ROOT%{eucajavalibdir}
-done
-rm $RPM_BUILD_ROOT%{eucajavalibdir}/junit4*
-
-# Fix jar paths and replace them with symlinks
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-for x in $RPM_BUILD_ROOT%{eucajavalibdir}/eucalyptus-*.jar; do
- if [ $( basename $x ) == "eucalyptus-storagecontroller-%{version}.jar" ];
then
- DESTFILE=%{_libdir}/%{name}/$( basename $x )
- else
- DESTFILE=%{_javadir}/%{name}/$( basename $x )
- fi
- mv $x $RPM_BUILD_ROOT$DESTFILE
- ln -s $DESTFILE $RPM_BUILD_ROOT/%{eucajavalibdir}/
-done
-
-# Link jars not needed at build time
-for jar in mule/mule-module-management \
- postgresql-jdbc \
- avalon-framework-impl \
- avalon-logkit \
- stax-utils \
- mx4j/mx4j-impl \
- mx4j/mx4j \
- mx4j/mx4j-jmx \
- mx4j/mx4j-remote \
- mx4j/mx4j-tools; do
- ln -s /usr/share/java/${jar}.jar $RPM_BUILD_ROOT%{eucajavalibdir}
-done
-
-pushd clc/eucadmin/man
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-cp -p * $RPM_BUILD_ROOT/%{_mandir}/man1
-popd
-
-sed -i -e 's#.*EUCALYPTUS=.*#EUCALYPTUS="/"#' \
- -e 's#.*HYPERVISOR=.*#HYPERVISOR="kvm"#' \
- -e
's#.*INSTANCE_PATH=.*#INSTANCE_PATH="/var/lib/%{name}/instances"#' \
- -e 's#.*VNET_BRIDGE=.*#VNET_BRIDGE="br0"#' \
- -e 's#.*USE_VIRTIO_DISK=.*#USE_VIRTIO_DISK="1"#' \
- -e 's#.*USE_VIRTIO_ROOT=.*#USE_VIRTIO_ROOT="1"#' \
- -e 's#.*VNET_PUBINTERFACE=.*#VNET_PUBINTERFACE="em1"#' \
- -e 's#.*VNET_PRIVINTERFACE=.*#VNET_PRIVINTERFACE="em1"#' \
- $RPM_BUILD_ROOT/etc/%{name}/eucalyptus.conf
-
-# Move init scripts into sbindir and call them from systemd
-mv $RPM_BUILD_ROOT/etc/init.d/eucalyptus-cloud \
- $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-cloud.init
-rm -rf $RPM_BUILD_ROOT/etc/init.d
-cp -p %{SOURCE7} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-cc.init
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-nc.init
-sed -i -e "s#@LIBDIR@#%{_libdir}#"
$RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-cc.init
-sed -i -e "s#@LIBDIR@#%{_libdir}#"
$RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-nc.init
-
-cp -p %{SOURCE13} $RPM_BUILD_ROOT/%{_sbindir}/eucalyptus-clean-cc
-
-# Make a server root for apache
-mkdir -p $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/
-cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-cc.conf
-cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-nc.conf
-cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-common.conf
-ln -s %{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/%{name}/httpd/modules
-rm $RPM_BUILD_ROOT/etc/%{name}/httpd.conf
-
-sed -i -e "s#@EUCAAXIS2HOME@#%{axis2c_services}#"
$RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-nc.conf
-sed -i -e "s#@EUCAAXIS2HOME@#%{axis2c_services}#"
$RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-cc.conf
-
-# Create the directories where components store their data
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}
-touch $RPM_BUILD_ROOT/var/lib/%{name}/services
-for dir in bukkits CC db keys ldap upgrade vmware volumes webapps; do
- install -d -m 0700 $RPM_BUILD_ROOT/var/lib/%{name}/$dir
-done
-install -d -m 0771 $RPM_BUILD_ROOT/var/lib/%{name}/instances
-
-# Add PolicyKit config on systems that support it
-mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/rules.d/
-cp -p %{SOURCE14} $RPM_BUILD_ROOT/usr/share/polkit-1/rules.d/eucalyptus-nc-libvirt.rules
-
-# Put udev rules in the right place
-mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
-cp -p $RPM_BUILD_ROOT/usr/share/eucalyptus/udev/rules.d/12-dm-permissions.rules
$RPM_BUILD_ROOT/etc/udev/rules.d/12-dm-permissions.rules
-cp -p $RPM_BUILD_ROOT/usr/share/eucalyptus/udev/rules.d/65-drbd-owner.rules
$RPM_BUILD_ROOT/etc/udev/rules.d/65-drbd-owner.rules
-rm -rf $RPM_BUILD_ROOT/usr/share/eucalyptus/udev
-
-
-# Install systemd service files
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m 644 %{SOURCE3} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-cloud.service
-install -p -m 644 %{SOURCE4} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-cc.service
-install -p -m 644 %{SOURCE5} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-nc.service
-install -p -m 644 %{SOURCE16} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-console.service
-
-# Copy axis2.xml into /etc for now, and symlink it
-install -m 644 %{SOURCE6} \
- $RPM_BUILD_ROOT/etc/%{name}/axis2.xml
-
-# add a mess of symlinks
-ln -s /etc/%{name}/axis2.xml $RPM_BUILD_ROOT%{axis2c_services}/cc/
-ln -s /etc/%{name}/axis2.xml $RPM_BUILD_ROOT%{axis2c_services}/nc/
-ln -s %{_libdir}/wso2-axis2/modules $RPM_BUILD_ROOT%{axis2c_services}/cc/
-ln -s %{_libdir}/wso2-axis2/modules $RPM_BUILD_ROOT%{axis2c_services}/nc/
-ln -s %{_libdir} $RPM_BUILD_ROOT%{axis2c_services}/cc/lib
-ln -s %{_libdir} $RPM_BUILD_ROOT%{axis2c_services}/nc/lib
-ln -s %{axis2c_services}/gl/services/EucalyptusGL
$RPM_BUILD_ROOT%{axis2c_services}/cc/services
-ln -s %{axis2c_services}/gl/services/EucalyptusGL
$RPM_BUILD_ROOT%{axis2c_services}/nc/services
-
-# Install axis2 test client files
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -m 755 gatherlog/GLclient $RPM_BUILD_ROOT%{_bindir}
-install -m 755 node/NCclient $RPM_BUILD_ROOT%{_bindir}
-install -m 755 cluster/CCclient_full $RPM_BUILD_ROOT%{_bindir}/CCclient
-
-# Fix some file permissions found by rpmlint
-chmod -x $RPM_BUILD_ROOT/var/lib/%{name}/keys/nc-client-policy.xml
-chmod -x $RPM_BUILD_ROOT/var/lib/%{name}/keys/cc-client-policy.xml
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/cc/services/EucalyptusCC/eucalyptus_cc.wsdl
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/cc/services/EucalyptusCC/services.xml
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/gl/services/EucalyptusGL/eucalyptus_gl.wsdl
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/gl/services/EucalyptusGL/services.xml
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/nc/services/EucalyptusNC/services.xml
-chmod -x $RPM_BUILD_ROOT%{_datadir}/eucalyptus/floppy
-
-# This file is no longer needed, and was not even ported from MySQL to PostGreSQL
-rm $RPM_BUILD_ROOT%{python_sitelib}/eucadmin/local.py*
-
-# This is not the ideal way to set kernel parameters. We'll deal with this
-# via documentation for now.
-rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cloud.d/init.d/01_pg_kernel_params
-
-# Move cloud.d directories which aren't config files. We need symlinks
-# for now, though.
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cloud.d/scripts \
- $RPM_BUILD_ROOT%{_libexecdir}/%{name}/scripts
-ln -s %{_libexecdir}/%{name}/scripts \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cloud.d/
-
-# doc fixups
-mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/drbd.conf.example \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-
-# install tmpfiles config
-install -d -m 755 $RPM_BUILD_ROOT/etc/tmpfiles.d
-install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT/etc/tmpfiles.d/%{name}
-
-# Install Eucalyptus Console
-pushd console
-%py2_install
-
-# Install sysconfig file
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -m 644 ../tools/eucalyptus-console.sysconfig
$RPM_BUILD_ROOT/etc/sysconfig/eucalyptus-console
-
-echo "
-[paths]
-staticpath: /usr/share/eucalyptus-console/static
-" >> $RPM_BUILD_ROOT/etc/eucalyptus-console/console.ini
-
-# Enable SSL support by default
-# NOTE: The certificate and key are not packaged, but will be generated
-# on the first run of the service.
-#
-# Fixes EUCA-3901
-sed -i -e 's@^#sslcert:.*$@sslcert: /etc/eucalyptus-console/console.crt@' \
- -e 's@^#sslkey:.*$@sslkey: /etc/eucalyptus-console/console.key@' \
- $RPM_BUILD_ROOT/etc/eucalyptus-console/console.ini
-
-# Create directory for pid file
-install -d $RPM_BUILD_ROOT/var/run/eucalyptus-console
-popd console
-
-
-%files
-%doc LICENSE README CHANGELOG
-%doc tools/multipath.conf.example tools/iscsid.conf.example
-# Eucalyptus initialization fails if the eucalyptus user
-# cannot write this file.
-%config(noreplace) %attr(-,eucalyptus,eucalyptus) /etc/%{name}/eucalyptus.conf
-%{_datadir}/%{name}/eucalyptus-version
-%config(noreplace) /etc/%{name}/axis2.xml
-%dir /etc/%{name}/httpd
-%dir /etc/%{name}/httpd/conf
-%config(noreplace) /etc/%{name}/httpd/conf/httpd-common.conf
-%config /etc/tmpfiles.d/%{name}
-/etc/%{name}/httpd/modules
-# Needed for multipath on NCs and SAN-enabled SCs
-/etc/udev/rules.d/12-dm-permissions.rules
-/etc/udev/rules.d/65-drbd-owner.rules
-%attr(-,root,root) %dir %{eucalibexecdir}
-%attr(4750,root,eucalyptus) %{eucalibexecdir}/euca_mountwrap
-%attr(4750,root,eucalyptus) %{eucalibexecdir}/euca_rootwrap
-%dir %{eucadatadir}
-%{_sbindir}/euca_sync_key
-%{_sbindir}/euca-generate-fault
-
-# helperdir is either eucadatadir or eucalibexecdir
-%{helperdir}/add_key.pl
-%{helperdir}/connect_iscsitarget.pl
-%{helperdir}/connect_iscsitarget_main.pl
-%{helperdir}/create-loop-devices
-%{helperdir}/disconnect_iscsitarget.pl
-%{helperdir}/disconnect_iscsitarget_main.pl
-%{helperdir}/euca_ipt
-%{helperdir}/euca_upgrade
-%{helperdir}/floppy
-%{helperdir}/faults/
-%{helperdir}/get_iscsitarget.pl
-%{helperdir}/iscsitarget_common.pl
-%{helperdir}/populate_arp.pl
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/db
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/keys
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/upgrade
-# Can this file go into a single-component package? What uses it?
-/var/lib/%{name}/keys/cc-client-policy.xml
-%attr(-,eucalyptus,eucalyptus) %dir /var/log/%{name}
-%attr(-,eucalyptus,eucalyptus) %dir /var/run/%{name}
-
-%files common-java
-%{_unitdir}/eucalyptus-cloud.service
-%{_libexecdir}/%{name}/eucalyptus-cloud.init
-# cloud.d contains random stuff used by every Java component. Most of it
-# probably belongs in /usr/share, but moving it will be painful.
-%{_sysconfdir}/%{name}/cloud.d/
-%{_libexecdir}/%{name}/scripts/
-%{_sbindir}/eucalyptus-cloud
-%{eucajavalibdir}/*jar*
-%{_javadir}/%{name}/*jar*
-%{_libdir}/%{name}/eucalyptus-storagecontroller-%{version}.jar
-%ghost /var/lib/%{name}/services
-%attr(-,eucalyptus,eucalyptus) /var/lib/%{name}/webapps/
-
-%files cloud
-%{_sbindir}/euca-lictool
-%{eucadatadir}/lic_default
-%{eucadatadir}/lic_template
-
-%files walrus
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/bukkits
-%doc %{_docdir}/%{name}-%{version}/drbd.conf.example
-
-%files sc
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/volumes
-%{helperdir}/connect_iscsitarget_sc.pl
-%{helperdir}/disconnect_iscsitarget_sc.pl
-%{_libdir}/eucalyptus/libdascontrol.so
-%{_libdir}/eucalyptus/liblvm2control.so
-
-%files cc
-%{_unitdir}/eucalyptus-cc.service
-%{_libexecdir}/%{name}/eucalyptus-cc.init
-%{axis2c_services}/cc
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/CC
-%config(noreplace) /etc/%{name}/httpd/conf/httpd-cc.conf
-%{_datadir}/%{name}/vtunall.conf.template
-%attr(0755,root,root) %{_libexecdir}/eucalyptus/shutdownCC
-%{_sbindir}/eucalyptus-clean-cc
-%{helperdir}/dynserv.pl
-%{helperdir}/getstats_net.pl
-# Is this used?
-/var/lib/%{name}/keys/nc-client-policy.xml
-
-%files nc
-%config(noreplace) /etc/%{name}/libvirt.xsl
-%dir /etc/%{name}/nc-hooks
-/etc/%{name}/nc-hooks/example.sh
-%{_unitdir}/eucalyptus-nc.service
-%{_libexecdir}/%{name}/eucalyptus-nc.init
-%{axis2c_services}/nc
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/instances
-%config(noreplace) /etc/%{name}/httpd/conf/httpd-nc.conf
-%{_sbindir}/euca_test_nc
-%{helperdir}/detach.pl
-%{helperdir}/gen_kvm_libvirt_xml
-%{helperdir}/gen_libvirt_xml
-%{helperdir}/getstats.pl
-%{helperdir}/get_sys_info
-%{helperdir}/get_xen_info
-%{helperdir}/partition2disk
-/usr/share/polkit-1/rules.d/eucalyptus-nc-libvirt.rules
-%{_docdir}/%{name}-%{version}/libvirt*
-
-%files gl
-%{axis2c_services}/gl
-
-# NB: the vmware tools packaged here only work against Eucalyptus
-# Enterprise plugins, but the client and server may be different
-# systems, so it's reasonable to package these commands here.
-%files admin-tools
-%{_sbindir}/euca_conf
-%{_sbindir}/euca-configure-vmware
-%{_sbindir}/euca-deregister-arbitrator
-%{_sbindir}/euca-deregister-cloud
-%{_sbindir}/euca-deregister-cluster
-%{_sbindir}/euca-deregister-storage-controller
-%{_sbindir}/euca-deregister-vmware-broker
-%{_sbindir}/euca-deregister-walrus
-%{_sbindir}/euca-describe-arbitrators
-%{_sbindir}/euca-describe-clouds
-%{_sbindir}/euca-describe-clusters
-%{_sbindir}/euca-describe-components
-%{_sbindir}/euca-describe-nodes
-%{_sbindir}/euca-describe-properties
-%{_sbindir}/euca-describe-services
-%{_sbindir}/euca-describe-storage-controllers
-%{_sbindir}/euca-describe-vmware-brokers
-%{_sbindir}/euca-describe-walruses
-%{_sbindir}/euca-get-credentials
-%{_sbindir}/euca-modify-cluster
-%{_sbindir}/euca-modify-property
-%{_sbindir}/euca-modify-service
-%{_sbindir}/euca-modify-storage-controller
-%{_sbindir}/euca-modify-walrus
-%{_sbindir}/euca-register-arbitrator
-%{_sbindir}/euca-register-cloud
-%{_sbindir}/euca-register-cluster
-%{_sbindir}/euca-register-storage-controller
-%{_sbindir}/euca-register-vmware-broker
-%{_sbindir}/euca-register-walrus
-%{_sbindir}/eureport-generate-report
-%{_sbindir}/eureport-export-data
-%{_sbindir}/eureport-delete-data
-%{_sbindir}/euca-describe-instance-types
-%{_sbindir}/euca-migrate-instances
-%{_mandir}/man1/*
-
-%files -n python-eucadmin
-%{python2_sitelib}/eucadmin*
-
-%files console
-%doc console/README.md
-%{python2_sitelib}/esapi*
-%{python2_sitelib}/eucaconsole*
-%{python2_sitelib}/Eucalyptus_Management_Console*.egg-info
-%{_bindir}/euca-console-server
-%{_unitdir}/eucalyptus-console.service
-%attr(-,eucaconsole,eucaconsole) %{_datadir}/eucalyptus-console
-%attr(-,eucaconsole,eucaconsole) %dir /etc/eucalyptus-console
-%attr(-,eucaconsole,eucaconsole) %config /etc/eucalyptus-console/console.ini
-%attr(-,eucaconsole,eucaconsole) %dir /var/run/eucalyptus-console
-%config /etc/sysconfig/eucalyptus-console
-
-%files axis2-clients
-%{_bindir}/NCclient
-%{_bindir}/CCclient
-%{_bindir}/GLclient
-
-%pre
-getent group eucalyptus >/dev/null || groupadd -r eucalyptus
-## FIXME: Make QA (and Eucalyptus proper?) work with /sbin/nologin as the shell
[RT:2092]
-#getent passwd eucalyptus >/dev/null || \
-# useradd -r -g eucalyptus -d /var/lib/%{name} -s /sbin/nologin \
-# -c 'Eucalyptus' eucalyptus
-getent passwd eucalyptus >/dev/null || \
- useradd -r -g eucalyptus -d /var/lib/%{name} \
- -c 'Eucalyptus' eucalyptus
-
-%pre console
-getent group eucaconsole >/dev/null || groupadd -r eucaconsole
-getent passwd eucaconsole >/dev/null || \
- useradd -r -g eucaconsole -d /etc/eucalyptus-console \
- -c 'Eucalyptus Console' eucaconsole
-
-%post
-udevadm control --reload-rules
-
-%post common-java
-%systemd_post eucalyptus-cloud.service
-
-%post cc
-%systemd_post eucalyptus-cc.service
-
-%post nc
-usermod -a -G kvm eucalyptus
-%systemd_post eucalyptus-nc.service
-
-%post console
-%systemd_post eucalyptus-console.service
-
-%preun common-java
-%systemd_preun eucalyptus-cloud.service
-
-%preun cc
-%systemd_preun eucalyptus-cc.service
-
-%preun nc
-%systemd_preun eucalyptus-nc.service
-
-%preun console
-%systemd_preun eucalyptus-console.service
-
-%postun
-# Reload udev rules on uninstall
-if [ "$1" = "0" ]; then
- /sbin/service udev-post reload || :
-fi
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.15.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.14.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.13.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.12.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.11.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.10.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.0-0.9.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.0-0.8.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.0-0.7.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> -
3.3.0-0.6.20130408git32052445
-- Use Requires: java-headless rebuild (#1067528)
-
-* Sat Aug 10 2013 Matt Spaulding <mspaulding06(a)gmail.com> -
3.3.0-0.5.20130408git32052445
-- Remove grub2 requirement to fix arm build
-
-* Tue Aug 06 2013 Dennis Gilmore <dennis(a)ausil.us> - 3.3.0-0.4.20130408git32052445
-- fix path to wss4j.jar
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.0-0.3.20130408git32052445
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 3.3.0-0.2.20130408git32052445
-- Perl 5.18 rebuild
-
-* Mon Apr 8 2013 Andy Grimm <agrimm(a)gmail.com> - 3.3.0-0.1.20130408git32052445
-- Update to 3.3.0 snapshot
-
-* Fri Mar 1 2013 Andy Grimm <agrimm(a)gmail.com> - 3.2.1-3
-- Fix build issues caused by Jetty 9 update
-
-* Thu Feb 28 2013 Andy Grimm <agrimm(a)gmail.com> - 3.2.1-2
-- Add explicit BuildRequires/Requires for jboss-logging
-
-* Thu Feb 28 2013 Andy Grimm <agrimm(a)gmail.com> - 3.2.1-1
-- Update to 3.2.1 (CVE-2012-4066)
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.2.0-0.6.20121210git5ab72572
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Dec 13 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.5.20121210git5ab7257
-- Remove backport-util-concurrent
-- Add systemd unit for eucalyptus-console
-- Fix cert validation error in eucalyptus-console
-- Fix a typo in eucalyptus-clean-cc script
-
-* Wed Dec 12 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.4.20121210git5ab7257
-- Use newer wss4j / xml-security / hibernate in F18
-- Fix systemd macro usage
-
-* Wed Dec 12 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.3.20121210git5ab7257
-- Work around incorrect tgt status checks
-- Define environment variables in eucalyptus-clean-cc script
-- Remove libmod_rampart link from axis2 service modules
-
-* Tue Dec 11 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.2.20121210git5ab7257
-- Add compatibility for F18
-
-* Mon Dec 10 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.1.20121210git5ab7257
-- Bump to 3.2.0
-
-* Thu Nov 08 2012 Marek Goldmann <mgoldman(a)redhat.com> -
3.1.2-0.7.20120917gitb8c109b4
-- Add support for new Maven compat version resolver (hibernate3)
-
-* Tue Oct 09 2012 Andy Grimm <agirmm(a)gmail.com> - 3.1.2-0.6.20120917gitb8c109b4
-- First official Fedora build
diff --git a/eucalyptus.tmpfiles b/eucalyptus.tmpfiles
deleted file mode 100644
index 4cc131f..0000000
--- a/eucalyptus.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/eucalyptus 755 eucalyptus eucalyptus
diff --git a/httpd-cc.conf b/httpd-cc.conf
deleted file mode 100644
index ddb60ba..0000000
--- a/httpd-cc.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This is the apache config for eucalyptus: we use it only to load the
-# axis2c module which will take care of the WebServices
-#
-
-ServerRoot "/etc/eucalyptus/httpd"
-
-Include conf/httpd-common.conf
-
-Listen 8774
-
-PidFile /var/run/eucalyptus/eucalyptus-cc.pid
-
-ErrorLog /var/log/eucalyptus/httpd-cc_error_log
-
-Axis2RepoPath /usr/lib64/eucalyptus/axis2/cc
-Axis2LogFile /var/log/eucalyptus/axis2-cc.log
-Axis2MaxLogFileSize 128
-Axis2LogLevel info
-<Location /axis2>
- SetHandler axis2_module
-</Location>
-
diff --git a/httpd-common.conf b/httpd-common.conf
deleted file mode 100644
index a72560c..0000000
--- a/httpd-common.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This is the apache config for eucalyptus: we use it only to load the
-# axis2c module which will take care of the WebServices
-#
-
-ServerTokens OS
-
-ServerRoot "/etc/eucalyptus/httpd"
-
-ServerName 127.0.0.1
-
-KeepAliveTimeout 30
-
-User eucalyptus
-Group eucalyptus
-
-LogLevel info
-
-<IfModule authz_host>
- <Directory />
- Order deny,allow
- Allow from all
- Deny from all
- </Directory>
-</IfModule>
-
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule axis2_module modules/mod_axis2.so
-LoadModule mpm_event_module modules/mod_mpm_event.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule unixd_module modules/mod_unixd.so
diff --git a/httpd-nc.conf b/httpd-nc.conf
deleted file mode 100644
index 1067a30..0000000
--- a/httpd-nc.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This is the apache config for eucalyptus: we use it only to load the
-# axis2c module which will take care of the WebServices
-#
-
-ServerRoot "/etc/eucalyptus/httpd"
-
-Include conf/httpd-common.conf
-
-Listen 8775
-
-PidFile /var/run/eucalyptus/eucalyptus-nc.pid
-
-ErrorLog /var/log/eucalyptus/httpd-nc_error_log
-
-Axis2RepoPath /usr/lib64/eucalyptus/axis2/nc/
-Axis2LogFile /var/log/eucalyptus/axis2-nc.log
-Axis2MaxLogFileSize 128
-Axis2LogLevel debug
-<Location /axis2>
- SetHandler axis2_module
-</Location>
-
diff --git a/sources b/sources
deleted file mode 100644
index 75aa9b7..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-f82ac5ec2153ec2d7e35f7eb9ab4c0f7 eucalyptus-3.3.0.32052445.tgz
-81024eefd6be8d71e3f0f427f2ddfa46 eucalyptus-3.3.0.32052445-generated.tgz