[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.1-4-g171e8df

X2Go dev team git-admin at x2go.org
Wed May 22 17:29:35 CEST 2013


The branch, master has been updated
       via  171e8df1620f71bef0600fe3d8380c8d2a493758 (commit)
      from  44fb5f47579b3b2cde8093ce8c05b46e11a13e67 (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 171e8df1620f71bef0600fe3d8380c8d2a493758
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 22 17:29:27 2013 +0200

    Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent setuid wrapper. (Fixes: #216).

-----------------------------------------------------------------------

Summary of changes:
 Makefile         |    6 +++---
 debian/changelog |    2 ++
 debian/rules     |    1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index acfd7b7..cb6a1b8 100755
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,8 @@ LDFLAGS += -pie
 RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty
 
-DESTDIR=
-PREFIX=/usr/local
+DESTDIR ?=
+PREFIX ?= /usr/local
 ETCDIR=/etc/x2go
 BINDIR=$(PREFIX)/bin
 SBINDIR=$(PREFIX)/sbin
@@ -56,7 +56,7 @@ build: build-arch build-indep
 build-arch: build_setuidwrappers
 
 build_setuidwrappers:
-	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c
 
 build-indep:
 
diff --git a/debian/changelog b/debian/changelog
index 0749ee7..f14bb75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.0.2.2):
     - Convert unicode type host fields into single element lists. Fix
       UCCS+zeroconf tests.
+    - Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent
+      setuid wrapper. (Fixes: #216).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 19 May 2013 13:12:51 +0200
 
diff --git a/debian/rules b/debian/rules
index da48cec..4eb9899 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@
 #export DEB_CFLAGS_MAINT_APPEND = -Wall
 #include /usr/share/dpkg/buildflags.mk
 
+export PREFIX=/usr
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport")


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list