← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/eucalyptus/oneiric

« back to all changes in this revision

Viewing changes to .pc/02-Makefile.patch/cluster/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey), Dave Walker (Daviey)
  • Date: 2011-02-15 10:16:03 UTC
  • mfrom: (1.1.48 upstream)
  • Revision ID: james.westby@ubuntu.com-20110215101603-5q6ds5md3sd4cydv
Tags: 2.0.1+bzr1255-0ubuntu1
https://launchpad.net/bugs/687970
https://launchpad.net/bugs/675372
https://launchpad.net/bugs/711590
[ Dave Walker (Daviey) ]
* New upstream snapshot of minor point release, 2.0.1 (r1255).
  - Fixes FTBFS, (LP: #687970)
  - Stop unauthenticated users being able to reset user password. (LP: #675372).
* Switch from dhcp3-server to isc-dhcp-server as the new default. (LP: #711590)
  - debian/:
    + control: eucalyptus-cc, drop Recommends on dhcp3-server and add 
      isc-dhcp-server as the new default.
    + eucalyptus.conf: Use different dhcpd binary name.
    + patches/{18-priv_security.patch|08-ubuntu-default-networking.patch},
      updated rootwrap to use different dhpcd binary.
* Refreshed 06-UEC-webinterface.patch, dropping hunks now applied upstream.
* Updated standards version to 3.9.1, no changes required.
* debian/control: Updated VCS location.
* debian/source/include-binaries: Included newer favicon, overiding shipped.
* debian/{local/registration}/Makefile: Introduced a stanza for, for 
  re-arranging of Linker flags, resolving FTBFS. Added -Wall.
* debian/*: The binary resulting jars have been updated from *-2.0.0 to
  *-2.0.1.  References updated as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/02-Makefile.patch/cluster/Makefile
17
17
SCLIBS=../storage/storage.o 
18
18
VNLIBS=../net/vnetwork.o ../util/misc.o
19
19
WSSECLIBS=../util/euca_axis.o ../util/euca_auth.o
20
 
CC_LIBS         = ${LIBS} -lcurl
 
20
CC_LIBS         = ${LIBS} -lcurl -lssl -lcrypto -lrampart
21
21
 
22
22
all: server client
23
23
 
50
50
client: $(CLIENT)_full $(CLIENTKILLALL)
51
51
 
52
52
$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
53
 
        $(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
 
53
        $(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1 generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CC_LIBS) -lssl -lcrypto -lrampart
54
54
 
55
55
$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
56
 
        $(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
 
56
        $(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0 generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) -lssl -lcrypto -lrampart $(CC_LIBS)
57
57
 
58
58
deploy:
59
59
        $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/