.gitignore | 21 --------------------- debian/changelog | 31 +++++++++++++++++++++++++++++++ debian/control | 2 +- debian/rules | 4 ++++ debian/xfs.init | 13 ++++++++++++- debian/xfs.insserv | 2 ++ debian/xfs.postinst.in | 2 +- debian/xfs.postrm.in | 3 ++- 8 files changed, 53 insertions(+), 25 deletions(-)
New commits: commit 5f3774ee76a327716774201224e0487a5364c655 Author: Julien Cristau <[email protected]> Date: Sun Jan 3 16:25:31 2010 +0000 Import 1:1.0.8-6 upload diff --git a/debian/changelog b/debian/changelog index 0eccee6..21f1938 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfs (1:1.0.8-6) unstable; urgency=low + + * QA upload. + * Unsafe /tmp usage fixed in the init script. (Closes: #521107) + + -- Luciano Bello <[email protected]> Wed, 18 Nov 2009 03:08:34 -0300 + xfs (1:1.0.8-5) unstable; urgency=low * QA upload. diff --git a/debian/xfs.init b/debian/xfs.init index 2e1e7d0..02f2d72 100644 --- a/debian/xfs.init +++ b/debian/xfs.init @@ -57,7 +57,8 @@ do_restorecon () { set_up_socket_dir () { echo -n "Setting up X font server socket directory $SOCKET_DIR..." if [ -e $SOCKET_DIR ] && ! [ -d $SOCKET_DIR ]; then - mv $SOCKET_DIR $SOCKET_DIR.$$ + SOCKET_DIR_TMP=$(mktemp -d $SOCKET_DIR.XXXXX) + mv $SOCKET_DIR $SOCKET_DIR_TMP fi if ! [ -d $SOCKET_DIR ]; then mkdir -m 1777 $SOCKET_DIR || : commit b4fd56d2dbc7414adbb40b4ac4a9465aac186fbe Author: Julien Cristau <[email protected]> Date: Tue Oct 20 20:47:20 2009 +0200 Import 1:1.0.8-5 upload diff --git a/debian/changelog b/debian/changelog index 29e21ce..0eccee6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xfs (1:1.0.8-5) unstable; urgency=low + + * QA upload. + * Move the fixup of the home directory name typo from the postinst to the + init script, to increase the chances that the daemon is not yet running + so that we can successfully run usermod to do the cleanup, and not need + to disturb the possible running X session by restarting the daemon. + (Closes: #546198) + + -- Guillem Jover <[email protected]> Sat, 12 Sep 2009 03:17:23 +0200 + xfs (1:1.0.8-4) unstable; urgency=low * QA upload. diff --git a/debian/xfs.init b/debian/xfs.init index 490f19d..2e1e7d0 100644 --- a/debian/xfs.init +++ b/debian/xfs.init @@ -73,6 +73,14 @@ set_up_pid_dir () { fi } +fixup_user_homedir () { + # Fix a typo in the home directory name created by an old package. + u_home=$(getent passwd debian-xfs | cut -d ":" -f 6) + if [ "$u_home" = "/nonexistant" ] ; then + usermod --home /nonexistent debian-xfs >/dev/null || true + fi +} + stillrunning () { if expr "$(cat /proc/$DAEMONPID/cmdline 2>/dev/null)" : "$DAEMON" >/dev/null \ 2>&1; then @@ -110,6 +118,7 @@ fi case "$1" in start) + fixup_user_homedir set_up_socket_dir set_up_pid_dir echo -n "Starting X font server: xfs" diff --git a/debian/xfs.postinst.in b/debian/xfs.postinst.in index 046eecb..a60a3f8 100644 --- a/debian/xfs.postinst.in +++ b/debian/xfs.postinst.in @@ -19,12 +19,6 @@ if ! getent passwd debian-$THIS_PACKAGE > /dev/null ; then adduser --quiet --system --disabled-password \ --home /nonexistent --no-create-home \ --shell /bin/false --group debian-$THIS_PACKAGE -else - # Fix a typo in the home directory name created by an old package - u_home=$(getent passwd debian-$THIS_PACKAGE | cut -d ":" -f 6) - if [ "$u_home" = "/nonexistant" ] ; then - usermod --home /nonexistent debian-$THIS_PACKAGE - fi fi #INCLUDE_SHELL_LIB# commit a96fabe593ba9e03f31216cbeef3cbfcad08035a Author: Julien Cristau <[email protected]> Date: Tue Oct 20 20:45:18 2009 +0200 Import 1:1.0.8-4 upload diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a835d28..0000000 --- a/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -.deps -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -compile -config -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -missing -stamp-h1 -xfs -xfs.1 -*~ diff --git a/autogen.sh b/autogen.sh old mode 100755 new mode 100644 diff --git a/debian/changelog b/debian/changelog index 08078b6..29e21ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +xfs (1:1.0.8-4) unstable; urgency=low + + * QA upload. + * Fix init script dependency information: + - Add X-Start-Before with current display managers. (Closes: #542678) + Thanks to Petter Reinholdtsen <[email protected]>. + * Fix typo in debian-xfs's user home directory name, for new and already + created users. (Closes: #511786) + * Define a new $x-font-server init.d virtual facility with xfs as value. + * Bump Standards-Version to 3.8.3. + + -- Guillem Jover <[email protected]> Fri, 11 Sep 2009 00:35:05 +0200 + xfs (1:1.0.8-3) unstable; urgency=low * Remove the -1 debian revisions from build-depends. diff --git a/debian/control b/debian/control index 4116d03..a965d01 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: libxfont-dev (>= 1:1.0.0), xtrans-dev (>= 1.0.0), quilt -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xfs Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xfs.git diff --git a/debian/rules b/debian/rules index ce7d89c..edc47a8 100755 --- a/debian/rules +++ b/debian/rules @@ -72,6 +72,10 @@ install: build dh_clean -k dh_installdirs + mkdir -p $(CURDIR)/debian/$(PACKAGE)/etc/insserv.conf.d + cp $(CURDIR)/debian/$(PACKAGE).insserv \ + $(CURDIR)/debian/$(PACKAGE)/etc/insserv.conf.d/$(PACKAGE) + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. diff --git a/debian/xfs.init b/debian/xfs.init index d8f70c4..490f19d 100644 --- a/debian/xfs.init +++ b/debian/xfs.init @@ -25,6 +25,7 @@ # Required-Stop: $local_fs $remote_fs $syslog # Should-Start: $network # Should-Stop: $network +# X-Start-Before: gdm kdm xdm ldm sdm # Default-Start: 2 3 4 5 # Default-Stop: 1 # Short-Description: Start/stop script for the X Font Server. diff --git a/debian/xfs.insserv b/debian/xfs.insserv new file mode 100644 index 0000000..213df0b --- /dev/null +++ b/debian/xfs.insserv @@ -0,0 +1,2 @@ +# X Font Server available +$x-font-server xfs diff --git a/debian/xfs.postinst.in b/debian/xfs.postinst.in index aabc9ce..046eecb 100644 --- a/debian/xfs.postinst.in +++ b/debian/xfs.postinst.in @@ -17,8 +17,14 @@ THIS_SCRIPT=postinst if ! getent passwd debian-$THIS_PACKAGE > /dev/null ; then adduser --quiet --system --disabled-password \ - --home /nonexistant --no-create-home \ + --home /nonexistent --no-create-home \ --shell /bin/false --group debian-$THIS_PACKAGE +else + # Fix a typo in the home directory name created by an old package + u_home=$(getent passwd debian-$THIS_PACKAGE | cut -d ":" -f 6) + if [ "$u_home" = "/nonexistant" ] ; then + usermod --home /nonexistent debian-$THIS_PACKAGE + fi fi #INCLUDE_SHELL_LIB# diff --git a/debian/xfs.postrm.in b/debian/xfs.postrm.in index b96e1d2..803ec04 100644 --- a/debian/xfs.postrm.in +++ b/debian/xfs.postrm.in @@ -30,7 +30,8 @@ if [ "$1" = "purge" ]; then # Remove the user if we are relatively certain that we created it u_home=$(getent passwd debian-$THIS_PACKAGE | cut -d ":" -f 6) u_shell=$(getent passwd debian-$THIS_PACKAGE | cut -d ":" -f 7) - if [ "$u_home" = "/nonexistant" ] && [ "$u_shell" = "/bin/false" ] && [ -x /usr/sbin/deluser ] ; then + if [ "$u_home" = "/nonexistent" ] && [ "$u_shell" = "/bin/false" ] && + [ -x /usr/sbin/deluser ] ; then deluser --system --quiet debian-$THIS_PACKAGE fi fi diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh old mode 100755 new mode 100644 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk old mode 100755 new mode 100644 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
