This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository zoo-project.
commit 8d559771ecc1df97332bbdb6a873eeec3cdcba71
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Jun 27 00:59:52 2016 +0200
Update hardening-buildflags.patch for additional zoo-services.
---
debian/patches/hardening-buildflags.patch | 35 +++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/debian/patches/hardening-buildflags.patch
b/debian/patches/hardening-buildflags.patch
index 32e68f8..c5f44bb 100644
--- a/debian/patches/hardening-buildflags.patch
+++ b/debian/patches/hardening-buildflags.patch
@@ -1,4 +1,4 @@
-Description: Use hardening buildflags set in the environment.
+Description: Use hardening buildflags.
Author: Bas Couwenberg <sebas...@debian.org>
Forwarded: not-needed
@@ -56,6 +56,23 @@ Forwarded: not-needed
zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c
zoo_service_loader.o ulinet.o service.h lex.sr.o service_conf.tab.o
service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o
response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE}
${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE}
${OTB_FILE} ${SAGA_FILE}
g++ -g -O2 ${JSCFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${RUBYCFLAGS}
${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c
-fno-common -DPIC -o zoo_loader.o
+--- a/zoo-project/zoo-services/cgal/Makefile
++++ b/zoo-project/zoo-services/cgal/Makefile
+@@ -1,12 +1,12 @@
+ ZRPATH=../..
+ include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
+-CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS}
${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC -DLINUX_FREE_ISSUE #-DDEBUG
++CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS}
${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC ${HARDENING_CFLAGS}
${HARDENING_CPPFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
+ CC=gcc
+
+ cgi-env/cgal_service.zo: delaunay.c voronoi.c cgal_service.o
+ g++ ${CFLAGS} -c ./delaunay.c
+ g++ ${CFLAGS} -c ./voronoi.c
+- g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o
./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS}
-lCGAL -lgmp ${GDAL_LIBS} -L${ZRPATH}/zoo-kernel/ -lzoo_service
++ g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o
./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS}
-lCGAL -lgmp ${GDAL_LIBS} -L${ZRPATH}/zoo-kernel/ -lzoo_service
${HARDENING_LDFLAGS}
+
+ cgal_service.o: cgal_service.c cgal_service.h
+ g++ ${CFLAGS} -c ./cgal_service.c
--- a/zoo-project/zoo-services/ogr/base-vect-ops/Makefile
+++ b/zoo-project/zoo-services/ogr/base-vect-ops/Makefile
@@ -1,6 +1,6 @@
@@ -71,7 +88,21 @@ Forwarded: not-needed
cgi-env/ogr_service.zo: service.c
- g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c
${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS}
${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi -lpthread -L${ZRPATH}/zoo-kernel/
-lzoo_service
-+ g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c
${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS}
${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} ${HARDENING_LDFLAGS} -lfcgi -lpthread
-L${ZRPATH}/zoo-kernel/ -lzoo_service
++ g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c
${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS}
${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi -lpthread -L${ZRPATH}/zoo-kernel/
-lzoo_service ${HARDENING_LDFLAGS}
install:
install -d ${CGI_DIR}/ogr/base-vect-ops
+--- a/zoo-project/zoo-services/utils/status/Makefile
++++ b/zoo-project/zoo-services/utils/status/Makefile
+@@ -1,9 +1,9 @@
+ ZRPATH=../../..
+ include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
+-CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS}
${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
++CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS}
${PYTHONCFLAGS} ${HARDENING_CFLAGS} ${HARDENING_CPPFLAGS} -DLINUX_FREE_ISSUE
#-DDEBUG
+
+ cgi-env/wps_status.zo: service.c
+- g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c
${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS}
${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/
-lzoo_service
++ g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c
${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS}
${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/
-lzoo_service ${HARDENING_LDFLAGS}
+
+ install:
+ install -d ${CGI_DIR}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/zoo-project.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
