The branch, release/4.0.0.x has been updated via 5a29dae3550069dc53ffb2d12b25bac51e02596d (commit) from a147c0c3885d856a22f0fbba1191223b05564f64 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5a29dae3550069dc53ffb2d12b25bac51e02596d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 11 11:46:33 2013 +0100 Make CFLAGS usable in x2goserver. (Fixes: #83). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/Makefile | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08885e5..6d58d10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low + + [ Bernard Cafarelli ] + * New upstream version (4.0.0.1): + - Make CFLAGS usable in x2goserver. (Fixes: #83). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 + x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 43fdccf..4287478 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -3,6 +3,10 @@ SRC_DIR=$(CURDIR) SHELL=/bin/bash +CC ?= gcc +CFLAGS += -fPIE +LDFLAGS += -pie + INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_PROGRAM=install -o root -g root -m 755 @@ -37,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).