Bump version of consolekit and apply fix for the pkgconfig file.

11 files changed, 366 insertions, 0 deletions

diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 615cf55..b441a1d 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,5 +1,16 @@
+AUX 90-consolekit 272 RMD160 f95a580dda5e8d65713153921cd77f8c064b2357 SHA1 f3e535ae34b9f30ad45c77ceac116ec73572b3d9 SHA256 d372f292f765c1cab533285be8f9af16b0783d7aa44a5e038174396e61c780cc
 AUX consolekit-0.1.rc 540 RMD160 0db24125d14b177ac54819f4d57fcac589a86bf3 SHA1 e1001914190b644d1557034f5534ba412e4ead57 SHA256 53510ed5f365af2f5fc760fb9462aea660ba54cbbd5f4c6be8d3bc75c4c399c8
+AUX consolekit-0.2.10-cleanup_console_tags.patch 1680 RMD160 1fccda3d4da3197ba9416b12177d05dd4a2e9705 SHA1 a7c0a267ce9950e8e3887abbe7a778e70f24a26b SHA256 1bc8323346d3a58c23d3790a317b7965dbd964b2307ef9bc6a8374f45a34f0f7
+AUX consolekit-0.2.10-directory-leak.patch 270 RMD160 b0fadcdbeb020d31a294f67b1e1c1b456f819ecc SHA1 0d8933736cc72a5fe4501c61ac531e958433f77d SHA256 800f61f49f6df1a6d4d6b9f9d7c08f14483c13bed2089c988d039288f4a66a4b
+AUX consolekit-0.2.10-pam-add-nox11.patch 2258 RMD160 23b77cc0397e08bfc367bbe6683d44d67b9e5a22 SHA1 051973327b7a629d84ecb938980c7bf110c6f8fc SHA256 1e96db20c78b4b983ac89f98ebaeeb5ef08239916ada6e7ecfff3e9c12c8f1ef
 AUX consolekit-0.2.10-pkg-config-path-fix.patch 398 RMD160 358cf77b76fa7b738c21a65ece617a3f01b75d35 SHA1 72494c6953ca7219f9cd07b28394b820b223d335 SHA256 9fb6e18ea12947f78fdc35cba1585c4564e76c1ad1707a84ef088048fb7745ca
+AUX consolekit-0.2.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54eb7d42d600f4e1b1 SHA1 ada8d56ab096dc49d609f1d9f44679971936c0df SHA256 9e31ae84ec3d838aaaddaa1fee1b68f7bf02e6c16935ca2a7a3cc086ff868433
 AUX consolekit-0.2.3-freebsd.patch 2945 RMD160 e1193ba4010daa33c9646ed8a78a374944ea73dc SHA1 10af67cab72a184fbe89ba36330a20020ae60206 SHA256 f17aa9f3229a24d6bd4291c9f249396864eceb9c01ed00e5c97172c1c57932c5
+AUX consolekit-0.3.0-allow-setidle.patch 648 RMD160 03bd610a6d13ece9a1ad46beb43efbc3ac875e61 SHA1 00145467e96ac917e0aa6a756a938f2c62434602 SHA256 693accef2bea6fe62900226075c88b50b6ff541649a86affbebe98ea6134ec08
+AUX consolekit-0.3.0-shutdown.patch 924 RMD160 d0ad31aed472df41f94327c0625b64aee31fc6ed SHA1 f02205b3273047afdfe4438fac4f71f50655112b SHA256 7016cf51e86a5e87104ce960524fa4c75a1f7362d7b3d8d8e0e3e5f8469132ab
+AUX consolekit-0.3.0-skip_xmlto_validation.patch 770 RMD160 b8b229e8d7ab2f2ef2266dc553588f9a1ccf0600 SHA1 5518debddb04d814f12a5377e4b958c8963ffaee SHA256 28e1cb19567d8b57d81aea5c0ed02f998cc7017fe3ada5759574fdaa217653cb
+AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
 DIST ConsoleKit-0.2.10.tar.gz 521473 RMD160 fa75c371a28803c990c9293732229e2c67625ff6 SHA1 ac4107f2239b072156f4a815609ea1c6fbb5f6cf SHA256 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb
+DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 SHA1 e3b6156622cc14ebca7382a55b8ed15f2f2bad98 SHA256 cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
 EBUILD consolekit-0.2.10.ebuild 2077 RMD160 56ae68a1e98938d394a6bcdcb3ff452504e56092 SHA1 3027f32ab716e1c43a219401d228a455f3ae0f6e SHA256 ddb58621d2b5dce1a908bf7ba84165c885aff998f0c468e357a2b66b1b41523d
+EBUILD consolekit-0.3.0-r2.ebuild 3118 RMD160 ee01d36f8f447ab49db5a7defe60d410c531a400 SHA1 d84fa993574aca6249bebc1b52a8aba8f1c5831d SHA256 25e3e3dc03fbbe689fe9c52561697383ce845fc37cc2699cfb02899b31bdb3e5
diff --git a/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild b/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild
new file mode 100644
index 0000000..0c61cbc
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild,v 1.9 2009/10/28 18:20:50 armin76 Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib pam
+
+MY_PN="ConsoleKit"
+MY_PV="${PV//_pre*/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="debug doc pam policykit"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=dev-libs/dbus-glib-0.61
+	>=x11-libs/libX11-1.0.0
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/policykit-0.7 )
+	elibc_glibc? ( !=sys-libs/glibc-2.4* )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	doc? ( app-text/xmlto )"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+src_prepare() {
+	# Fix directory leaks, bug #258685
+	epatch "${FILESDIR}/${PN}-0.2.10-directory-leak.patch"
+
+	# Clean up at_console compat files, bug #257761
+	epatch "${FILESDIR}/${PN}-0.2.10-cleanup_console_tags.patch"
+
+	# Add nox11 option to no interfere with Xsession script, bug #257763
+	epatch "${FILESDIR}/${PN}-0.2.10-pam-add-nox11.patch"
+
+	# Fix automagic dependency on policykit
+	epatch "${FILESDIR}/${PN}-0.2.10-polkit-automagic.patch"
+
+	# Fix inability to shutdown/restart
+	epatch "${FILESDIR}/${P}-shutdown.patch"
+
+	# Add SetIdleHint policy to handle new default deny on dbus
+	epatch "${FILESDIR}/${P}-allow-setidle.patch"
+
+	epatch "${FILESDIR}"/${P}-skip_xmlto_validation.patch
+
+	# Fix the path for the pkg-config file
+	epatch "${FILESDIR}/${PN}-0.2.10-pkg-config-path-fix.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam pam-module) \
+		$(use_enable policykit polkit) \
+		--with-pam-module-dir=/$(getpam_mod_dir) \
+		--with-dbus-services=/usr/share/dbus-1/services/ \
+		--localstatedir=/var
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# crappy Redhat init script
+	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
+
+	# Portage barfs on .la files
+	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
+
+	# Gentoo style init script
+	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
+
+	# Some PM drop empty dirs, bug #257164
+	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
+	keepdir /etc/ConsoleKit/run-session.d
+	keepdir /var/run/ConsoleKit
+	keepdir /var/log/ConsoleKit
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/90-consolekit" || die "doexe failed"
+
+	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d/
+	doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "You need to restart ConsoleKit to get the new features."
+	ewarn "This can be done with /etc/init.d/consolekit restart"
+	ewarn "but make sure you do this and then restart your session"
+	ewarn "otherwise you will get access denied for certain actions"
+}
diff --git a/sys-auth/consolekit/files/90-consolekit b/sys-auth/consolekit/files/90-consolekit
new file mode 100644
index 0000000..3094714
--- /dev/null
+++ b/sys-auth/consolekit/files/90-consolekit
@@ -0,0 +1,12 @@
+# -*- sh -*-
+# Xsession.d script for ck-launch-session.
+#
+#
+# This file is sourced by Xsession(5), not executed.
+
+CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
+
+if [ -z "$XDG_SESSION_COOKIE" ] && [ -x "$CK_LAUNCH_SESSION" ]; then
+	command="$CK_LAUNCH_SESSION $command"
+fi
+
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch b/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch
new file mode 100644
index 0000000..d1699d9
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch
@@ -0,0 +1,65 @@
+# http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/0.2.10-1ubuntu9/
+--- a/src/main.c	2008-07-25 03:19:34.000000000 +0200
++++ b/src/main.c	2008-07-26 00:25:13.000000000 +0200
+@@ -149,6 +149,43 @@
+         unlink (CONSOLE_KIT_PID_FILE);
+ }
+ 
++#define CONSOLE_TAGS_DIR "/var/run/console"
++
++static void
++delete_console_tags (void)
++{
++	GDir *dir;
++	GError *error = NULL;
++	const gchar *name;
++
++	g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
++
++	dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
++	if (dir == NULL) {
++		g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
++		           error->message);
++		g_error_free (error);
++		return;
++	}
++	while ((name = g_dir_read_name (dir)) != NULL) {
++		gchar *file;
++		file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
++
++		g_debug ("Removing tag file: %s", file);
++		if (unlink (file) == -1) {
++			g_warning ("Couldn't delete tag file: %s", file);
++		}
++		g_free (file);
++	}
++}
++
++static void
++cleanup (void)
++{
++	delete_console_tags ();
++	delete_pid ();
++}
++
+ /* copied from nautilus */
+ static int debug_log_pipes[2];
+ 
+@@ -229,7 +266,7 @@
+                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
+                 written = write (pf, pid, strlen (pid));
+                 close (pf);
+-                g_atexit (delete_pid);
++                g_atexit (cleanup);
+         } else {
+                 g_warning ("Unable to write pid file %s: %s",
+                            CONSOLE_KIT_PID_FILE,
+@@ -312,6 +349,8 @@
+ 
+         g_debug ("initializing console-kit-daemon %s", VERSION);
+ 
++	delete_console_tags ();
++
+         create_pid_file ();
+ 
+         manager = ck_manager_new ();
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch b/sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch
new file mode 100644
index 0000000..450ff77
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch
@@ -0,0 +1,11 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=258685
+--- a/src/ck-run-programs.c
++++ b/src/ck-run-programs.c
+@@ -225,6 +225,7 @@
+         out_loop:
+                 g_free (child_argv[0]);
+         }
++        g_dir_close (dir);
+ out:
+         g_strfreev (env_for_child);
+ }
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch b/sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch
new file mode 100644
index 0000000..ddac6bc
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch
@@ -0,0 +1,54 @@
+# Description: Add "nox11" option to the PAM module, which ignores PAM
+#   sessions where PAM_TTY is an X11 display. This allows adding
+#   pam_ck_connector to PAM's "common-session" without interfering
+#   with the already existing ConsoleKit operations in gdm, the
+#   Xsession script, etc.
+# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=16746
+
+Index: consolekit-0.2.10/pam-ck-connector/pam-ck-connector.c
+===================================================================
+--- consolekit-0.2.10.orig/pam-ck-connector/pam-ck-connector.c	2008-08-04 18:23:37.000000000 +0200
++++ consolekit-0.2.10/pam-ck-connector/pam-ck-connector.c	2008-08-04 18:23:49.000000000 +0200
+@@ -63,6 +63,7 @@
+ #include "ck-connector.h"
+ 
+ static int opt_debug = FALSE;
++static int opt_nox11 = FALSE;
+ 
+ #ifndef HAVE_PAM_SYSLOG
+ 
+@@ -145,6 +146,8 @@
+         for (i = 0; i < argc && argv[i] != NULL; i++) {
+                 if (strcmp (argv[i] , "debug") == 0) {
+                         opt_debug = TRUE;
++                } else if (strcmp (argv[i] , "nox11") == 0) {
++                        opt_nox11 = TRUE;
+                 } else {
+                         ck_pam_syslog (pamh, LOG_ERR, "unknown option: %s", argv[i]);
+                 }
+@@ -276,6 +279,10 @@
+         x11_display = NULL;
+         /* interpret any tty with a colon as a DISPLAY */
+         if (strchr (display_device, ':') != NULL) {
++                if (opt_nox11) {
++                        ck_pam_syslog (pamh, LOG_WARNING, "nox11 mode, ignoring PAM_TTY %s", display_device);
++                        goto out;
++                }
+                 x11_display = display_device;
+                 display_device = "";
+         } else if (strncmp (_PATH_DEV, display_device, 5) != 0) {
+Index: consolekit-0.2.10/pam-ck-connector/pam_ck_connector.8
+===================================================================
+--- consolekit-0.2.10.orig/pam-ck-connector/pam_ck_connector.8	2008-08-04 18:23:44.000000000 +0200
++++ consolekit-0.2.10/pam-ck-connector/pam_ck_connector.8	2008-08-04 18:23:49.000000000 +0200
+@@ -66,6 +66,10 @@
+ .TP 3n
+ \fBdebug\fR
+ Print debug information.
++.TP 3n
++\fBnox11\fR
++Do not create a session if PAM specifies an X11 display instead of a
++/dev/tty terminal.
+ .fi
+ .RE
+ .sp
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-polkit-automagic.patch b/sys-auth/consolekit/files/consolekit-0.2.10-polkit-automagic.patch
new file mode 100644
index 0000000..18b0de8
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.10-polkit-automagic.patch
@@ -0,0 +1,29 @@
+diff -Naur ConsoleKit-0.2.10/configure.ac ConsoleKit-0.2.10.new/configure.ac
+--- ConsoleKit-0.2.10/configure.ac	2008-02-13 09:25:50.000000000 +0530
++++ ConsoleKit-0.2.10.new/configure.ac	2008-08-09 11:36:25.000000000 +0530
+@@ -55,10 +55,21 @@
+   gthread-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+ 
+-PKG_CHECK_MODULES(POLKIT,
+-  polkit >= $POLKIT_REQUIRED_VERSION,
+-  have_polkit=yes,
+-  have_polkit=no)
++AC_ARG_ENABLE([polkit],
++  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
++  enable_polkit=$enableval,
++  enable_polkit=auto)
++
++if test "x$enable_polkit" != "xno"; then
++  PKG_CHECK_MODULES(POLKIT,
++    polkit >= $POLKIT_REQUIRED_VERSION,
++    have_polkit=yes,
++    have_polkit=no)
++  if test "x$enable_polkit"  = "xyes" -a "x$have_polkit" = "xno"; then
++    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
++  fi
++fi
++
+ if test "x$have_polkit" = "xyes" ; then
+        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
+ fi
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch b/sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch
new file mode 100644
index 0000000..27aa96a
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN ConsoleKit-0.3.0.orig/data/ConsoleKit.conf ConsoleKit-0.3.0/data/ConsoleKit.conf
+--- ConsoleKit-0.3.0.orig/data/ConsoleKit.conf	2008-04-19 01:39:49.000000000 -0400
++++ ConsoleKit-0.3.0/data/ConsoleKit.conf	2009-04-27 15:20:57.000000000 -0400
+@@ -90,6 +90,8 @@
+     <allow send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetIdleHint"/>
+     <allow send_interface="org.freedesktop.ConsoleKit.Session"
++           send_member="SetIdleHint"/>
++    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetIdleSinceHint"/>
+   </policy>
+ 
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch b/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch
new file mode 100644
index 0000000..682f820
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch
@@ -0,0 +1,32 @@
+From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 1 Oct 2008 22:27:24 +0200
+Subject: [PATCH] allow shutdown without policykit or RBAC intervention.
+
+---
+ src/ck-manager.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/ck-manager.c b/src/ck-manager.c
+index bcb9350..54a78e6 100644
+--- a/src/ck-manager.c
++++ b/src/ck-manager.c
+@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager             *manager,
+         }
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
+-        goto out;
+ #endif
+ 
+         g_debug ("ConsoleKit preforming Restart: %s", action);
+@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager             *manager,
+         }
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
+-        goto out;
+ #endif
+ 
+         g_debug ("Stopping system");
+-- 
+1.6.0.2
+
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch b/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch
new file mode 100644
index 0000000..1dfe366
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch
@@ -0,0 +1,18 @@
+Because xmlto-0.0.22 adds --noent to xmllint options, it's more strict,
+and doesn't validate anymore. This is a temp. solution until upstream
+gets their documentation fixed.
+
+http://bugs.gentoo.org/show_bug.cgi?id=271678
+
+diff -ur ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am ConsoleKit-0.3.0/doc/dbus/Makefile.am
+--- ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am	2008-07-31 00:35:51.000000000 +0300
++++ ConsoleKit-0.3.0/doc/dbus/Makefile.am	2009-06-09 22:30:57.000000000 +0300
+@@ -16,7 +16,7 @@
+ htmldoc_DATA = ConsoleKit.html
+ 
+ ConsoleKit.html : $(SPEC_XML_FILES)
+-	$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
++	$(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
+ 
+ endif # DOCBOOK_DOCS_ENABLED
+ 
diff --git a/sys-auth/consolekit/files/pam-foreground-compat.ck b/sys-auth/consolekit/files/pam-foreground-compat.ck
new file mode 100644
index 0000000..0697ca8
--- /dev/null
+++ b/sys-auth/consolekit/files/pam-foreground-compat.ck
@@ -0,0 +1,17 @@
+#!/bin/sh
+TAGDIR=/var/run/console
+
+[ -n "$CK_SESSION_USER_UID" ] || exit 1
+
+TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
+
+if [ "$1" = "session_added" ]; then
+	mkdir -p "$TAGDIR"
+	echo "$CK_SESSION_ID" >> "$TAGFILE"
+fi
+
+if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
+	sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
+	[ -s "$TAGFILE" ] || rm -f "$TAGFILE"
+fi
+