Hello,

In the course of getting iFolder accepted into Fedora, the following
patches are being carried. They change the Makefile to utilise system
gsoap rather than carrying ifolder's own version and modify the 64-bit
hack to disable using static archives for security reasons. For more
detail please see the ongoing review of simias at:

https://bugzilla.redhat.com/show_bug.cgi?id=285801


--- simias-1.6/src/core/libsimias/Makefile.am   2007-11-29
05:42:23.000000000 +0000
+++ simias-1.6/src/core/libsimias/Makefile.am_system_soap
2007-12-16 18:45:16.000000000 +0000
@@ -14,7 +14,7 @@
 override CFLAGS =

 libsimias_la_SOURCES = \
-       envC.c simiasClientLib.c stdsoap2.c simias.c simias.h
simiasweb.c simiasweb.h
+       envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h

 libsimias_la_CFLAGS = \
        $(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES
@@ -22,23 +22,15 @@
 libsimias_la_LDFLAGS = \
        $(XML2_LIBS)

-envC.c: $(srcdir)/stdsoap2.c
+envC.c:
        > $(srcdir)/env.h
-       $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
+       soapcpp2 -c -penv $(srcdir)/env.h

-$(srcdir)/stdsoap2.c:
-if !DARWIN
-       make -C $(GSOAP_PATH)/src && cp $(GSOAP_PATH)/src/soapcpp2 $(GSOAP_PATH)
-       make -C $(GSOAP_PATH)/wsdl && cp $(GSOAP_PATH)/wsdl/wsdl2h $(GSOAP_PATH)
-endif
-       cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
-       cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
-
-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
-       $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)
+$(srcdir)/libsimias.h: $(SIMIAS_WSDL)
+       wsdl2h -c -o $@ $(SIMIAS_WSDL)

 $(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h
-       $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
+       soapcpp2 -c -n -psimias $(srcdir)/libsimias.h

 install-exec-hook:
 if !WINDOWS
@@ -50,7 +42,6 @@
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        $(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias
        $(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias
-       $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias
        $(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias
        $(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias
        $(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias
@@ -58,13 +49,12 @@
 uninstall-local:
        rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h
        rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap
-       rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h
        rm -f $(DESTDIR)$(includedir)/simias/simiasH.h
        rm -f $(DESTDIR)$(includedir)/simias/simias.h
        rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h

 clean-local:
-       rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS*
env* soap*
+       rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
        rm -rf $(COMMON_CLEAN_FILES)

 distclean-local:


--

Regards
Chris
_______________________________________________
ifolder-dev mailing list
[email protected]
http://forge.novell.com/mailman/listinfo/ifolder-dev

Reply via email to