Author: mhekkel-guest Date: 2012-05-22 14:00:32 +0000 (Tue, 22 May 2012) New Revision: 10949
Added: trunk/packages/libzeep/trunk/debian/patches/hurd-patch trunk/packages/libzeep/trunk/debian/patches/s390-patch Modified: trunk/packages/libzeep/trunk/debian/changelog trunk/packages/libzeep/trunk/debian/patches/makefile.diff trunk/packages/libzeep/trunk/debian/patches/series Log: fix for compilation problems on hurd and s390; added hardening flags Modified: trunk/packages/libzeep/trunk/debian/changelog =================================================================== --- trunk/packages/libzeep/trunk/debian/changelog 2012-05-22 13:45:50 UTC (rev 10948) +++ trunk/packages/libzeep/trunk/debian/changelog 2012-05-22 14:00:32 UTC (rev 10949) @@ -1,3 +1,10 @@ +libzeep (2.9.0-2) unstable; urgency=low + + * Work arounds for compilation failures on i386-hurd and s390 + * Added the include-binaries file to the svn repository. + + -- Maarten L. Hekkelman <[email protected]> Wed, 22 May 2012 10:00:00 +0200 + libzeep (2.9.0-1) unstable; urgency=low * Initial release. (Closes: #671481) Added: trunk/packages/libzeep/trunk/debian/patches/hurd-patch =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/hurd-patch (rev 0) +++ trunk/packages/libzeep/trunk/debian/patches/hurd-patch 2012-05-22 14:00:32 UTC (rev 10949) @@ -0,0 +1,36 @@ +Description: assorted fixes + [Maarten L. Hekkelman <[email protected]>] + * Fixed compilation failure by only adding the WCONTINUED + flag if it is defined. + . + Upstream is aware of this patch. +Author: Maarten L. Hekkelman <[email protected]> +--- a/src/preforked-http-server.cpp ++++ b/src/preforked-http-server.cpp +@@ -40,8 +40,11 @@ + { + kill(m_pid, SIGKILL); + +- int status; +- waitpid(m_pid, &status, WUNTRACED | WCONTINUED); ++ int status, flags = WUNTRACED; ++#ifdef WCONTINUED ++ flags |= WCONTINUED; ++#endif ++ waitpid(m_pid, &status, flags); + } + + m_io_service.stop(); +@@ -147,7 +150,11 @@ + + while (count-- > 0) + { +- if (waitpid(m_pid, &status, WUNTRACED | WCONTINUED | WNOHANG) == -1) ++ int flags = WUNTRACED | WNOHANG; ++#ifdef WCONTINUED ++ flags |= WCONTINUED; ++#endif ++ if (waitpid(m_pid, &status, flags) == -1) + break; + + if (WIFEXITED(status)) Modified: trunk/packages/libzeep/trunk/debian/patches/makefile.diff =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/makefile.diff 2012-05-22 13:45:50 UTC (rev 10948) +++ trunk/packages/libzeep/trunk/debian/patches/makefile.diff 2012-05-22 14:00:32 UTC (rev 10949) @@ -1,7 +1,7 @@ Changes in makefile for distribution as a .deb --- a/makefile +++ b/makefile -@@ -4,19 +4,11 @@ +@@ -4,19 +4,14 @@ # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) @@ -23,10 +23,28 @@ +INCDIR = $(DESTDIR)/usr/include +MANDIR = $(DESTDIR)/usr/share/man/man3 +DOCDIR = $(DESTDIR)/usr/share/doc/libzeep-dev ++ ++CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) ++LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) BOOST_LIBS = system thread filesystem regex math_c99 BOOST_LIBS := $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) -@@ -56,7 +48,7 @@ +@@ -30,10 +25,10 @@ + SO_NAME = libzeep.so.$(VERSION_MAJOR) + LIB_NAME = $(SO_NAME).$(VERSION_MINOR) + +-CC ?= c++ +-CFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x +-#CFLAGS += -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x +-CFLAGS += -Wall ++CXX ?= c++ ++CXXFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x ++#CXXFLAGS += -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x ++CXXFLAGS += -Wall + + VPATH += src + +@@ -56,13 +51,13 @@ obj/xpath.o \ obj/writer.o @@ -35,7 +53,23 @@ libzeep.a: $(OBJECTS) ld -r -o $@ $(OBJECTS) -@@ -109,8 +101,6 @@ + + $(LIB_NAME): $(OBJECTS) +- $(CC) -shared -o $@ -Wl,-soname=$(SO_NAME) $(LDFLAGS) $(OBJECTS) ++ $(CXX) -shared -o $@ -Wl,-soname=$(SO_NAME) $(LDFLAGS) $(OBJECTS) + + $(SO_NAME): $(LIB_NAME) + ln -fs $(LIB_NAME) $@ +@@ -72,7 +67,7 @@ + + # assuming zeep-test is build when install was not done already + zeep-test: zeep-test.cpp libzeep.a +- $(CC) -I$(BOOST_INC_DIR) -o $@ -I. zeep-test.cpp libzeep.a $(LDFLAGS) ++ $(CXX) -I$(BOOST_INC_DIR) -o $@ -I. zeep-test.cpp libzeep.a $(LDFLAGS) + + install-libs: libzeep.so + install -d $(LIBDIR) +@@ -109,8 +104,6 @@ for d in . images libzeep zeep zeep/http zeep/http/preforked_server_base zeep/http/el \ zeep/http/el/object zeep/xml zeep/xml/doctype zeep/xml/container zeep/xml/element \ index; do install -d $(DOCDIR)/$$d; install doc/html/$$d/*.* $(DOCDIR)/$$d; done; @@ -44,3 +78,12 @@ ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so install: install-libs install-dev +@@ -125,7 +118,7 @@ + cp $(DIST_NAME).tgz ../ppa/libzeep_$(VERSION).orig.tar.gz + + obj/%.o: %.cpp | obj +- $(CC) -MD -c -o $@ $< $(CFLAGS) ++ $(CXX) -MD -c -o $@ $< $(CXXFLAGS) + + obj: + mkdir -p obj Added: trunk/packages/libzeep/trunk/debian/patches/s390-patch =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/s390-patch (rev 0) +++ trunk/packages/libzeep/trunk/debian/patches/s390-patch 2012-05-22 14:00:32 UTC (rev 10949) @@ -0,0 +1,47 @@ +Description: assorted fixes + [Maarten L. Hekkelman <[email protected]>] + * Fixed compilation failure by not returning size_t but uint64. Should + be fixed in upstream by a better solution. + . + Upstream is aware of this patch. +Author: Maarten L. Hekkelman <[email protected]> +--- a/src/webapp-el.cpp ++++ b/src/webapp-el.cpp +@@ -175,7 +175,7 @@ + os << ']'; + } + virtual int compare(object_impl* rhs) const; +- virtual size_t count() const { return m_v.size(); } ++ virtual uint64 count() const { return m_v.size(); } + + virtual detail::object_iterator_impl* + create_iterator(bool begin) const +@@ -619,7 +619,7 @@ + return result; + } + +-size_t object::count() const ++uint64 object::count() const + { + if (type() != array_type) + throw exception("count/length is only defined for array types"); +--- a/zeep/http/webapp/el.hpp ++++ b/zeep/http/webapp/el.hpp +@@ -114,7 +114,7 @@ + object& operator[](const char* name); + object& operator[](uint32 ix); + +- size_t count() const; ++ uint64 count() const; + bool empty() const; + + bool operator<(const object& rhs) const; +@@ -331,7 +331,7 @@ + { + public: + +- virtual size_t count() const = 0; ++ virtual uint64 count() const = 0; + + virtual object_iterator_impl* + create_iterator(bool begin) const = 0; Modified: trunk/packages/libzeep/trunk/debian/patches/series =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/series 2012-05-22 13:45:50 UTC (rev 10948) +++ trunk/packages/libzeep/trunk/debian/patches/series 2012-05-22 14:00:32 UTC (rev 10949) @@ -1 +1,3 @@ +hurd-patch makefile.diff +s390-patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
