The branch, master has been updated via 5b05ae9c35e0971afa386651a762965a6d99a05f (commit) via 5ba9e70c907f246ba8fc17dd406abac2e05be243 (commit) from fcc0db91bd1b1615e00055c0d353c7c7d7fa4aeb (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 5b05ae9c35e0971afa386651a762965a6d99a05f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 11 11:54:30 2013 +0100 follow-up commit for last cherry-pick commit 5ba9e70c907f246ba8fc17dd406abac2e05be243 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 11 11:46:33 2013 +0100 Make CFLAGS usable in x2goserver. (Fixes: #83). Conflicts (resolved by Mike Gabriel): debian/changelog x2goserver/Makefile ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ libx2go-server-db-perl/Makefile | 6 +++++- x2goserver/Makefile | 2 -- 3 files changed, 13 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 64412af..1c67c6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,14 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +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/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index 3d57f2d..67767b8 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/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 @@ -35,7 +39,7 @@ all: clean build build: build-arch build-indep build-arch: - gcc -fPIE -pie $(CFLAGS) -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c build-indep: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index f2d6d7a..4f19236 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -34,8 +34,6 @@ all: clean build build: build-arch build-indep -build-arch: - build-indep: build_man2html 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).