# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1287420387 0
# Node ID 31adf89b4637c273616efc1e4b09b40cb7264254
# Parent  66d952425df701ffd8392d6142767a486317a430# Parent  894e4ab15d39b939542e8a2c446575bd9f780eeb
merge

diff -r 66d952425df7 -r 31adf89b4637 aufs-utils/receipt
--- a/aufs-utils/receipt	Mon Oct 18 16:44:00 2010 +0000
+++ b/aufs-utils/receipt	Mon Oct 18 16:46:27 2010 +0000
@@ -25,8 +25,8 @@
 	cd $src
 	patch -p1 -R < $WOK/$PACKAGE/stuff/fix-kdir.patch
 	sed -i 's/-m 644 -T/-m 644/' Makefile
-	make && 
-	make DESTDIR=$PWD/_pkg install
+	make KDIR=$WOK/linux/linux-$KERNEL_VERSION && 
+	make KDIR=$WOK/linux/linux-$KERNEL_VERSION DESTDIR=$PWD/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 66d952425df7 -r 31adf89b4637 xorg-server-Xephyr/receipt
--- a/xorg-server-Xephyr/receipt	Mon Oct 18 16:44:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="xorg-server-Xephyr"
-VERSION="1.5.3"
-CATEGORY="x-window"
-SHORT_DESC="Xephyr server used to creat chrooted X env."
-MAINTAINER="pankso@slitaz.org"
-DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
-xorg-libXext xorg-libX11 zlib pixman hal libcrypto xorg-libXv"
-WANTED="xorg-server-tinyX"
-SOURCE="xorg-server"
-WEB_SITE="http://www.x.org/"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-	mkdir -p $fs/usr/bin
-	cp -a $_pkg/usr/bin/Xephyr $fs/usr/bin
-	chmod 4711 $fs/usr/bin/Xephyr
-}
diff -r 66d952425df7 -r 31adf89b4637 xorg-server-Xvesa/receipt
--- a/xorg-server-Xvesa/receipt	Mon Oct 18 16:44:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="xorg-server-Xvesa"
-VERSION="1.5.3"
-CATEGORY="x-window"
-SHORT_DESC="Xorg kdrive server Xvesa (tinyX)."
-MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
-xorg-base-fonts freetype zlib hal dbus pixman libcrypto"
-SUGGESTED="xorg-xrandr"
-WANTED="xorg-server-tinyX"
-SOURCE="xorg-server"
-WEB_SITE="http://www.x.org/"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-	mkdir -p $fs/usr/bin $fs/etc/X11
-	cp -a $_pkg/usr/bin/Xvesa $fs/usr/bin
-	chmod 4711 $fs/usr/bin/Xvesa
-}
-
-post_install()
-{
-	# Upgrade from 1.2.0 to 1.5.3
-	if ! grep -q "\-keybd keyboard" $1/etc/slim.conf; then
-		echo -n "Updating Slim configuration..."
-		res=$(grep ^xserver_arguments $1/etc/slim.conf | \
-			sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
-		sed -i s/"-screen $res"/"-screen $res -keybd keyboard -mouse mouse,5,\/dev\/input\/mice -nolisten tcp"/ \
-			$1/etc/slim.conf
-		status
-	fi
-}
diff -r 66d952425df7 -r 31adf89b4637 xorg-server-tinyX/receipt
--- a/xorg-server-tinyX/receipt	Mon Oct 18 16:44:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="xorg-server-tinyX"
-VERSION="1.5.3"
-CATEGORY="meta"
-SHORT_DESC="Xorg tinyX servers meta package."
-MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg-libX11 xorg-server-Xvesa"
-BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \
-xorg-libfontenc-dev xorg-libxkbfile xorg-evieext"
-SOURCE="xorg-server"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.x.org/"
-WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
-KDRIVE="
-Xchips
-Xvesa
-Xephyr
-Xi810
-Xnvidia
-Xepson
-Xsmi
-Xr128
-Xvia
-Xpm2
-Xati
-Xfake
-Xneomagic
-Xmach64
-Xfbdev
-Xmga
-Xvfb
-Xnest"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	while read file; do
-    	[ -f done.$file ] && continue
-    	echo "Apply $file..."
-    	busybox patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1
-	touch done.$file
-    done <<EOT
-hal_parallel.u
-boottimestamp.u
-EOT
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--with-module-dir=/usr/lib/X11/modules \
-		--with-xkb-output=/var/lib/xkb \
-		--with-serverconfig-path=/etc/X11 \
-		--with-fontdir=/usr/share/fonts/X11 \
-		--enable-install-setuid \
-		--disable-xorg \
-		--enable-kdrive \
-		--enable-kdrive-vesa \
-		--with-os-name="SliTaz GNU/Linux" \
-		--with-builder-addr=$MAINTAINER \
-		--disable-dri \
-		--disable-xorgcfg \
-		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$PWD/_pkg install
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-}
diff -r 66d952425df7 -r 31adf89b4637 xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-boottimestamp.u
--- a/xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-boottimestamp.u	Mon Oct 18 16:44:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-diff --git xorg-server-1.5.3/os/log.c xorg-server-1.5.3/os/log.c
-index 0860847..2c46f1a 100644
---- xorg-server-1.5.3/os/log.c
-+++ xorg-server-1.5.3/os/log.c
-@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args)
-     static char tmpBuffer[1024];
-     int len = 0;
- 
-+    struct timeval time;
-+    time_t tv_sec;
-+    suseconds_t tv_usec;
-+    static Bool first = TRUE;
-+    static time_t start_tv_sec;
-+    static suseconds_t start_usec;
-+    int diff_sec, diff_usec;
-+
-+    gettimeofday(&time, NULL);
-+    tv_sec = time.tv_sec;
-+    tv_usec = time.tv_usec;
-+    if (first == TRUE) {
-+        start_tv_sec = tv_sec;
-+        start_usec = tv_usec;
-+        first = FALSE;
-+    }
-+    diff_sec = (int)difftime(tv_sec, start_tv_sec);
-+    diff_usec = (tv_usec - start_usec);
-+    if (diff_usec < 0) {
-+        diff_sec--;
-+        diff_usec += 1000000;
-+    }
-+    sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
-+    len = strlen(tmpBuffer);
-+    if (logFile)
-+          fwrite(tmpBuffer, len, 1, logFile);
-+
-     /*
-      * Since a va_list can only be processed once, write the string to a
-      * buffer, and then write the buffer out to the appropriate output
diff -r 66d952425df7 -r 31adf89b4637 xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-hal_parallel.u
--- a/xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-hal_parallel.u	Mon Oct 18 16:44:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-diff --git xorg-server-1.5.3/config/hal.c xorg-server-1.5.3/config/hal.c
-index 8dfbb07..36fa839 100644
---- xorg-server-1.5.3/config/hal.c
-+++ xorg-server-1.5.3/config/hal.c
-@@ -467,11 +467,10 @@ disconnect_hook(void *data)
-info->system_bus = NULL;
-}
--static void
--connect_hook(DBusConnection *connection, void *data)
-+static BOOL
-+connect_and_register(DBusConnection *connection, struct config_hal_info *info)
-{
-DBusError error;
-- struct config_hal_info *info = data;
-char **devices;
-int num_devices, i;
-@@ -479,8 +478,10 @@ connect_hook(DBusConnection *connection, void *data)
-dbus_error_init(&error);
-- if (!info->hal_ctx)
-- info->hal_ctx = libhal_ctx_new();
-+ if (info->hal_ctx)
-+ return TRUE; /* already registered, pretend we did something */
-+
-+ info->hal_ctx = libhal_ctx_new();
-if (!info->hal_ctx) {
-LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n");
-goto out_err;
-@@ -512,7 +513,7 @@ connect_hook(DBusConnection *connection, void *data)
-dbus_error_free(&error);
-- return;
-+ return TRUE;
-out_ctx2:
-if (!libhal_ctx_shutdown(info->hal_ctx, &error))
-@@ -525,6 +526,104 @@ out_err:
-info->hal_ctx = NULL;
-info->system_bus = NULL;
-+ return FALSE;
-+}
-+
-+
-+/**
-+ * Handle NewOwnerChanged signals to deal with HAL startup at X server runtime.
-+ *
-+ * NewOwnerChanged is send once when HAL shuts down, and once again when it
-+ * comes back up. Message has three arguments, first is the name
-+ * (org.freedesktop.Hal), the second one is the old owner, third one is new
-+ * owner.
-+ */
-+static DBusHandlerResult
-+ownerchanged_handler(DBusConnection *connection, DBusMessage *message, void *data)
-+{
-+ int ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+
-+ if (dbus_message_is_signal(message,
-+ "org.freedesktop.DBus",
-+ "NameOwnerChanged")) {
-+ DBusError error;
-+ char *name, *old_owner, *new_owner;
-+
-+ dbus_error_init(&error);
-+ dbus_message_get_args(message, &error,
-+ DBUS_TYPE_STRING, &name,
-+ DBUS_TYPE_STRING, &old_owner,
-+ DBUS_TYPE_STRING, &new_owner,
-+ DBUS_TYPE_INVALID);
-+
-+ if (dbus_error_is_set(&error)) {
-+ ErrorF("[config/hal] failed to get NameOwnerChanged args: %s (%s)\n",
-+ error.name, error.message);
-+ } else if (name && strcmp(name, "org.freedesktop.Hal") == 0) {
-+
-+ if (!old_owner || !strlen(old_owner)) {
-+ DebugF("[config/hal] HAL startup detected.\n");
-+ if (connect_and_register(connection, (struct config_hal_info*)data))
-+ dbus_connection_unregister_object_path(connection,
-+ "/org/freedesktop/DBus");
-+ else
-+ ErrorF("[config/hal] Failed to connect to HAL bus.\n");
-+ }
-+
-+ ret = DBUS_HANDLER_RESULT_HANDLED;
-+ }
-+ dbus_error_free(&error);
-+ }
-+
-+ return ret;
-+}
-+
-+/**
-+ * Register a handler for the NameOwnerChanged signal.
-+ */
-+static BOOL
-+listen_for_startup(DBusConnection *connection, void *data)
-+{
-+ DBusObjectPathVTable vtable = { .message_function = ownerchanged_handler, };
-+ DBusError error;
-+ const char MATCH_RULE[] = "sender='org.freedesktop.DBus',"
-+ "interface='org.freedesktop.DBus',"
-+ "type='signal',"
-+ "path='/org/freedesktop/DBus',"
-+ "member='NameOwnerChanged'";
-+ int rc = FALSE;
-+
-+ dbus_error_init(&error);
-+ dbus_bus_add_match(connection, MATCH_RULE, &error);
-+ if (!dbus_error_is_set(&error)) {
-+ if (dbus_connection_register_object_path(connection,
-+ "/org/freedesktop/DBus",
-+ &vtable,
-+ data))
-+ rc = TRUE;
-+ else
-+ ErrorF("[config/hal] cannot register object path.\n");
-+ } else {
-+ ErrorF("[config/hal] couldn't add match rule: %s (%s)\n", error.name,
-+ error.message);
-+ ErrorF("[config/hal] cannot detect a HAL startup.\n");
-+ }
-+
-+ dbus_error_free(&error);
-+
-+ return rc;
-+}
-+
-+static void
-+connect_hook(DBusConnection *connection, void *data)
-+{
-+ struct config_hal_info *info = data;
-+
-+ if (listen_for_startup(connection, data) &&
-+ connect_and_register(connection, info))
-+ dbus_connection_unregister_object_path(connection,
-+ "/org/freedesktop/DBus");
-+
-return;
-}