debian/changelog | 18 ++++++++++++++++++ debian/rules | 4 +++- debian/xfs.init | 6 +++--- 3 files changed, 24 insertions(+), 4 deletions(-)
New commits: commit 73b718ea2454591ab1a4a531d48c7dc887c26c5f Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Jul 7 15:01:58 2008 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 830110f..bfa0f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xfs (1:1.0.8-2) UNRELEASED; urgency=low +xfs (1:1.0.8-2) unstable; urgency=low * Add $syslog dependency to the xfs init.d script (closes: #489232). Thanks, Sven Joachim! - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 07 Jul 2008 14:44:37 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 07 Jul 2008 15:01:38 +0200 xfs (1:1.0.8-1.1) unstable; urgency=low commit f68611d1a3b1b25465f5e45d39b8f32a002f911f Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Jul 7 15:01:18 2008 +0200 Add $syslog dependency to the xfs init.d script (closes: #489232). Thanks, Sven Joachim! diff --git a/debian/changelog b/debian/changelog index 474bb0d..830110f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfs (1:1.0.8-2) UNRELEASED; urgency=low + + * Add $syslog dependency to the xfs init.d script (closes: #489232). + Thanks, Sven Joachim! + + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 07 Jul 2008 14:44:37 +0200 + xfs (1:1.0.8-1.1) unstable; urgency=low * Non-maintainer upload to fix RC bug. diff --git a/debian/xfs.init b/debian/xfs.init index 2134183..99a6221 100644 --- a/debian/xfs.init +++ b/debian/xfs.init @@ -21,8 +21,8 @@ ### BEGIN INIT INFO # Provides: xfs -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs +# Required-Start: $local_fs $remote_fs $syslog +# Required-Stop: $local_fs $remote_fs $syslog # Should-Start: $network # Should-Stop: $network # Default-Start: 2 3 4 5 commit ded690c26c32c0cbee941bb953a6c5dad93affdd Author: Petter Reinholdtsen <[EMAIL PROTECTED]> Date: Mon Jul 7 14:42:11 2008 +0200 xfs 1.0.8-1.1 NMU diff --git a/debian/changelog b/debian/changelog index b8a70a3..474bb0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xfs (1:1.0.8-1.1) unstable; urgency=low + + * Non-maintainer upload to fix RC bug. + * Run xfs process as user nobody by default (Closes: #50859). Patch + from Petter Reinholdtsen. + * Build with -DUSE_SYSLOG to get the syslog option to work, to avoid + log rotation issue when xfs is running as a non-privileged + user (Closes: 481758). Patch from Sven Joachim. + + -- Petter Reinholdtsen <[EMAIL PROTECTED]> Thu, 26 Jun 2008 22:45:42 +0200 + xfs (1:1.0.8-1) unstable; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index 750f5ed..ab2c6b2 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif +CPPFLAGS = -DUSE_SYSLOG DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -42,7 +43,8 @@ build-stamp: ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --sysconfdir=/etc $(confflags) \ - CFLAGS="$(CFLAGS)" + CFLAGS="$(CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) touch build-stamp diff --git a/debian/xfs.init b/debian/xfs.init index 664ee99..2134183 100644 --- a/debian/xfs.init +++ b/debian/xfs.init @@ -92,7 +92,7 @@ case "$1" in start) set_up_socket_dir echo -n "Starting X font server: xfs" - start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon \ + start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon -user nobody -droppriv \ || echo -n " already running" echo "." ;; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]