From 13b71d3646054a698956460aa4246d9c9167dee4 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 16:31:45 +0000
Subject: Output NUL terminated lines with sort -z (busybox#1591). Fixes
 updatedb.

---
 packages/busybox/busybox-1.9.1/sort-z-nul.patch | 50 +++++++++++++++++++++++++
 packages/busybox/busybox_1.9.1.bb               |  3 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 packages/busybox/busybox-1.9.1/sort-z-nul.patch

diff --git a/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/packages/busybox/busybox-1.9.1/sort-z-nul.patch
new file mode 100644
index 0000000000..55452a4524
--- /dev/null
+++ b/packages/busybox/busybox-1.9.1/sort-z-nul.patch
@@ -0,0 +1,50 @@
+Summary: 0001591: inconsistent behavior of sort -z
+
+URL: http://busybox.net/bugs/view.php?id=1591
+http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u
+
+Description:
+
+busybox sort -z does:
+use NUL instead of EOL on input
+
+GNU sort -z does:
+use NUL instead of EOL on input and output
+
+GNU sort -z documents:
+use NUL instead of EOL on input
+
+Additional Information:
+
+Note that sort -z is not part of any standard. But several applications
+(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior.
+
+GNU sort documentation bug was reported to coreutils maintainers.
+
+Notes: 
+
+vda 02-13-08 06:30 (0004364)
+Fixed in revision 21004. Thanks!
+
+--- busybox/coreutils/sort.c	2007/11/16 12:39:16	20435
++++ busybox/coreutils/sort.c	2008/02/13 14:30:33	21004
+@@ -32,7 +32,7 @@
+ 	FLAG_u  = 8,            /* Unique */
+ 	FLAG_c  = 0x10,         /* Check: no output, exit(!ordered) */
+ 	FLAG_s  = 0x20,         /* Stable sort, no ascii fallback at end */
+-	FLAG_z  = 0x40,         /* Input is null terminated, not \n */
++	FLAG_z  = 0x40,         /* Input and output is NUL terminated, not \n */
+ /* These can be applied to search keys, the previous four can't */
+ 	FLAG_b  = 0x80,         /* Ignore leading blanks */
+ 	FLAG_r  = 0x100,        /* Reverse */
+@@ -396,8 +396,9 @@
+ 		if (linecount) linecount = flag+1;
+ 	}
+ 	/* Print it */
++	flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
+ 	for (i = 0; i < linecount; i++)
+-		fprintf(outfile, "%s\n", lines[i]);
++		fprintf(outfile, "%s%c", lines[i], flag);
+ 
+ 	fflush_stdout_and_exit(EXIT_SUCCESS);
+ }
diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb
index b41f1779b0..237f6a6dac 100644
--- a/packages/busybox/busybox_1.9.1.bb
+++ b/packages/busybox/busybox_1.9.1.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
@@ -12,6 +12,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://syslog.conf \
            file://udhcpscript.patch;patch=1 \
            file://adduser-longops.patch;patch=1 \
+           file://sort-z-nul.patch;patch=1;status=upstream \
            file://umount.busybox \
            file://run_parts.c \
            file://defconfig"
-- 
cgit v1.2.3


From 74a532e4bc5f8b037d050a0a1fb66ea35eeac1ec Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 17:08:48 +0000
Subject: - Ignore false toggle signals (work-around for OE#3390). - Fixed
 default ALSA state for SL-Cxx00 (OE#2617). - Do not alter incorrect mixer
 levels by zaurus-mixer-callback. - Allow to disable rotation by touch
 ~/.norot. - Fixed detection of panel_user.

---
 packages/zaurusd/files/01-check-toggle-landscape   |   9 +
 packages/zaurusd/files/01-check-toggle-portait     |   9 +
 .../zaurusd/files/alsa-cxx00-default.state.patch   | 276 +++++++++++++++------
 packages/zaurusd/files/zaurus-hinge.in             |   7 +-
 .../zaurusd/files/zaurusd-mixer-callback.patch     |  11 -
 packages/zaurusd/zaurusd_svn.bb                    |  10 +-
 6 files changed, 237 insertions(+), 85 deletions(-)
 create mode 100644 packages/zaurusd/files/01-check-toggle-landscape
 create mode 100644 packages/zaurusd/files/01-check-toggle-portait
 delete mode 100644 packages/zaurusd/files/zaurusd-mixer-callback.patch

diff --git a/packages/zaurusd/files/01-check-toggle-landscape b/packages/zaurusd/files/01-check-toggle-landscape
new file mode 100644
index 0000000000..13ae9a4e68
--- /dev/null
+++ b/packages/zaurusd/files/01-check-toggle-landscape
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = landscape ; then
+    exit
+fi
+echo landscape > /var/run/last-screen-rotation
diff --git a/packages/zaurusd/files/01-check-toggle-portait b/packages/zaurusd/files/01-check-toggle-portait
new file mode 100644
index 0000000000..4c3b7f1291
--- /dev/null
+++ b/packages/zaurusd/files/01-check-toggle-portait
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by                                                              
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = portait ; then
+    exit
+fi
+echo portait > /var/run/last-screen-rotation
diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch
index c3e234b534..b10e6c85dd 100644
--- a/packages/zaurusd/files/alsa-cxx00-default.state.patch
+++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch
@@ -1,64 +1,194 @@
---- zaurusd/config/alsa/cxx00-default.state.orig	2006-06-28 08:45:07.000000000 +0000
-+++ zaurusd/config/alsa/cxx00-default.state	2007-05-21 21:40:50.000000000 +0000
-@@ -32,7 +32,7 @@
+http://bugs.openembedded.org/show_bug.cgi?id=2617
+- Fixes default ALSA state for SL-Cxx00.
+  * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24).
+  * Increased Mic Levels and Boost.
+  * Enabled Capture Switch.
+  * Improved Headphones / Speaker volume balance.
+  * 3D Mode changed to "Playback" (still Off by default).
+  * Disabled all bypasses.
+  * All Mono signals decreased to 0 (not connected).
+  * Line Mux changed to differential, keeping PGA unused.
+  * Using Digital mono for recording (jack supports ony mono).
+  * Enabled Automatic Level Control, optimized for voice recording.
+  * Enabled Zero Cross volume changes.
+- Do not alter incorrect mixer levels by zaurus-mixer-callback.
+
+Index: zaurusd/config/alsa/cxx00-default.state
+===================================================================
+--- zaurusd.orig/config/alsa/cxx00-default.state	2006-06-28 08:45:07.000000000 +0000
++++ zaurusd/config/alsa/cxx00-default.state	2007-11-27 23:06:43.000000000 +0000
+@@ -6,8 +6,8 @@
+ 		comment.range '0 - 63'
+ 		iface MIXER
+ 		name 'Capture Volume'
+-		value.0 23
+-		value.1 23
++		value.0 48
++		value.1 48
+ 	}
+ 	control.2 {
+ 		comment.access 'read write'
+@@ -15,8 +15,8 @@
+ 		comment.count 2
+ 		iface MIXER
+ 		name 'Capture ZC Switch'
+-		value.0 false
+-		value.1 false
++		value.0 true
++		value.1 true
+ 	}
+ 	control.3 {
+ 		comment.access 'read write'
+@@ -24,26 +24,26 @@
+ 		comment.count 2
+ 		iface MIXER
+ 		name 'Capture Switch'
+-		value.0 false
+-		value.1 false
++		value.0 true
++		value.1 true
+ 	}
+ 	control.4 {
+ 		comment.access 'read write'
  		comment.type BOOLEAN
  		comment.count 2
  		iface MIXER
 -		name 'Out1 Playback ZC Switch'
+-		value.0 false
+-		value.1 false
 +		name 'Headphone Playback ZC Switch'
- 		value.0 false
- 		value.1 false
++		value.0 true
++		value.1 true
  	}
-@@ -41,7 +41,7 @@
+ 	control.5 {
+ 		comment.access 'read write'
  		comment.type BOOLEAN
  		comment.count 2
  		iface MIXER
 -		name 'Out2 Playback ZC Switch'
+-		value.0 false
+-		value.1 false
 +		name 'Speaker Playback ZC Switch'
- 		value.0 false
- 		value.1 false
++		value.0 true
++		value.1 true
+ 	}
+ 	control.6 {
+ 		comment.access 'read write'
+@@ -92,8 +92,8 @@
+ 		comment.range '0 - 255'
+ 		iface MIXER
+ 		name 'PCM Volume'
+-		value.0 255
+-		value.1 255
++		value.0 220
++		value.1 220
  	}
-@@ -218,7 +218,7 @@
- 		comment.item.3 Stereo
+ 	control.11 {
+ 		comment.access 'read write'
+@@ -131,7 +131,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'Treble Volume'
+-		value 15
++		value 0
+ 	}
+ 	control.15 {
+ 		comment.access 'read write'
+@@ -188,7 +188,7 @@
+ 		comment.item.1 Playback
  		iface MIXER
- 		name 'ALC Capture Function'
--		value Left
-+		value Off
+ 		name '3D Mode'
+-		value Capture
++		value Playback
  	}
- 	control.24 {
+ 	control.21 {
  		comment.access 'read write'
-@@ -321,8 +321,8 @@
+@@ -226,7 +226,7 @@
+ 		comment.count 1
+ 		iface MIXER
+ 		name 'ALC Capture ZC Switch'
+-		value false
++		value true
+ 	}
+ 	control.25 {
+ 		comment.access 'read write'
+@@ -235,7 +235,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Capture Hold Time'
+-		value 0
++		value 9
+ 	}
+ 	control.26 {
+ 		comment.access 'read write'
+@@ -244,7 +244,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Capture Decay Time'
+-		value 3
++		value 9
+ 	}
+ 	control.27 {
+ 		comment.access 'read write'
+@@ -253,7 +253,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Capture Attack Time'
+-		value 2
++		value 3
+ 	}
+ 	control.28 {
+ 		comment.access 'read write'
+@@ -306,7 +306,7 @@
+ 		comment.count 1
+ 		iface MIXER
+ 		name 'ZC Timeout Switch'
+-		value false
++		value true
+ 	}
+ 	control.34 {
+ 		comment.access 'read write'
+@@ -321,7 +321,7 @@
  		comment.type BOOLEAN
  		comment.count 1
  		iface MIXER
 -		name 'Right Out2 Playback Invert Switch'
--		value true
 +		name 'Right Speaker Playback Invert Switch'
-+		value false
+ 		value true
  	}
  	control.36 {
- 		comment.access 'read write'
 @@ -331,8 +331,8 @@
  		comment.range '0 - 3'
  		iface MIXER
  		name 'Mic Boost'
 -		value.0 2
 -		value.1 2
++		value.0 3
++		value.1 3
+ 	}
+ 	control.37 {
+ 		comment.access 'read write'
+@@ -341,8 +341,8 @@
+ 		comment.range '0 - 7'
+ 		iface MIXER
+ 		name 'Bypass Left Playback Volume'
+-		value.0 2
+-		value.1 2
 +		value.0 0
 +		value.1 0
  	}
- 	control.37 {
+ 	control.38 {
  		comment.access 'read write'
-@@ -351,8 +351,8 @@
+@@ -361,8 +361,8 @@
  		comment.range '0 - 7'
  		iface MIXER
- 		name 'Bypass Right Playback Volume'
--		value.0 0
--		value.1 0
-+		value.0 2
-+		value.1 2
+ 		name 'Bypass Mono Playback Volume'
+-		value.0 2
+-		value.1 2
++		value.0 0
++		value.1 0
  	}
- 	control.39 {
+ 	control.40 {
  		comment.access 'read write'
 @@ -378,9 +378,9 @@
  		comment.count 2
@@ -68,8 +198,8 @@
 -		value.0 120
 -		value.1 120
 +		name 'Headphone Playback Volume'
-+		value.0 121
-+		value.1 121
++		value.0 105
++		value.1 105
  	}
  	control.42 {
  		comment.access 'read write'
@@ -81,17 +211,26 @@
 -		value.0 119
 -		value.1 119
 +		name 'Speaker Playback Volume'
-+		value.0 121
-+		value.1 121
++		value.0 127
++		value.1 127
  	}
  	control.43 {
  		comment.access 'read write'
+@@ -399,7 +399,7 @@
+ 		comment.range '0 - 127'
+ 		iface MIXER
+ 		name 'Mono Playback Volume'
+-		value 121
++		value 0
+ 	}
+ 	control.44 {
+ 		comment.access 'read write'
 @@ -411,7 +411,7 @@
  		comment.item.3 'Digital Mono'
  		iface MIXER
  		name 'Right ADC Mux'
 -		value 'Mono (Left)'
-+		value Stereo
++		value 'Digital Mono'
  	}
  	control.45 {
  		comment.access 'read write'
@@ -100,55 +239,19 @@
  		iface MIXER
  		name 'Left ADC Mux'
 -		value 'Mono (Left)'
-+		value Stereo
++		value 'Digital Mono'
  	}
  	control.46 {
  		comment.access 'read write'
-@@ -458,7 +458,7 @@
- 		comment.item.4 Differential
- 		iface MIXER
- 		name 'Right Line Mux'
--		value Differential
-+		value 'Line 1'
- 	}
- 	control.49 {
- 		comment.access 'read write'
 @@ -471,7 +471,7 @@
  		comment.item.4 Differential
  		iface MIXER
  		name 'Left Line Mux'
 -		value PGA
-+		value 'Line 1'
++		value Differential
  	}
  	control.50 {
  		comment.access 'read write'
-@@ -483,7 +483,7 @@
- 		comment.item.3 Differential
- 		iface MIXER
- 		name 'Right PGA Mux'
--		value Differential
-+		value 'Line 1'
- 	}
- 	control.51 {
- 		comment.access 'read write'
-@@ -495,7 +495,7 @@
- 		comment.item.3 Differential
- 		iface MIXER
- 		name 'Left PGA Mux'
--		value Differential
-+		value 'Line 1'
- 	}
- 	control.52 {
- 		comment.access 'read write'
-@@ -535,7 +535,7 @@
- 		comment.count 1
- 		iface MIXER
- 		name 'Right Mixer Left Playback Switc'
--		value false
-+		value true
- 	}
- 	control.57 {
- 		comment.access 'read write'
 @@ -610,9 +610,8 @@
  		comment.access 'read write'
  		comment.type ENUMERATED
@@ -161,3 +264,38 @@
  		iface MIXER
  		name 'Speaker Function'
  		value On
+Index: zaurusd/scripts/zaurus-mixer-callback.in
+===================================================================
+--- zaurusd.orig/scripts/zaurus-mixer-callback.in	2007-11-27 23:32:45.000000000 +0000
++++ zaurusd/scripts/zaurus-mixer-callback.in	2007-11-27 23:36:54.000000000 +0000
+@@ -16,8 +16,6 @@
+ JACK="$1"
+ SPK="$2"
+ LEFT="true"
+-RLPLAYBACK="false"
+-RLBYPASS="false"
+ 
+ case $SPK in
+   "On")
+@@ -37,8 +35,6 @@
+     ;;
+   "Headset" | "Mic" | "Line")
+     LEFT="false"
+-    RLPLAYBACK="true"
+-    RLBYPASS="true"
+     SPK="Off"
+     ;;
+   *)
+@@ -58,12 +54,6 @@
+ }; /Speaker Function/ {
+ N
+ s:\(Speaker Function.*\n.*value \).*$:\1$SPK:
+-}; /Right Mixer Left Playback/ {
+-N
+-s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK:
+-}; /Right Mixer Left Bypass/ {
+-N
+-s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS:
+ }; /Left Mixer Playback/ {
+ N
+ s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT:
diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in
index f719ba3c76..9670e8803e 100644
--- a/packages/zaurusd/files/zaurus-hinge.in
+++ b/packages/zaurusd/files/zaurus-hinge.in
@@ -19,9 +19,12 @@ if [ -z "$1" ]; then
    exit 1
 fi
 
-panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`"
-
+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $1}'`"
 
+# touch ~/.norot can disable rotation.
+if test -f /home/$panel_user/.norot ; then
+  exit
+fi
 
 STATE=$1
 
diff --git a/packages/zaurusd/files/zaurusd-mixer-callback.patch b/packages/zaurusd/files/zaurusd-mixer-callback.patch
deleted file mode 100644
index 7c9455d042..0000000000
--- a/packages/zaurusd/files/zaurusd-mixer-callback.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zaurusd/scripts/zaurus-mixer-callback.in.orig	2007-06-05 03:15:30.000000000 +0000
-+++ zaurusd/scripts/zaurus-mixer-callback.in	2007-06-05 03:14:53.000000000 +0000
-@@ -16,7 +16,7 @@
- JACK="$1"
- SPK="$2"
- LEFT="true"
--RLPLAYBACK="false"
-+RLPLAYBACK="true"
- RLBYPASS="false"
- 
- case $SPK in
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 3ea0d2b22f..be9379eced 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
@@ -14,10 +14,11 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
 	   file://disable-alsa-handling.patch;patch=1 \
 	   file://zaurus-hinge.matchbox-portrait \	   
 	   file://zaurus-hinge.matchbox-landscape \
-	   file://zaurusd-mixer-callback.patch;patch=1 \
 	   file://tslib-1.diff;patch=1 \
 	   file://zaurus-hinge.bl-on \
-	   file://zaurus-hinge.bl-off"
+	   file://zaurus-hinge.bl-off \
+	   file://01-check-toggle-landscape \
+	   file://01-check-toggle-portait"
 
 
 S = "${WORKDIR}/${PN}"
@@ -39,6 +40,9 @@ do_install_append() {
 	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on"
 	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off"
 
+	install -m 0755 "${WORKDIR}/01-check-toggle-landscape" "${D}/etc/zaurusd/hinge-landscape.d/01-check-toggle"
+	install -m 0755 "${WORKDIR}/01-check-toggle-portait" "${D}/etc/zaurusd/hinge-portrait.d/01-check-toggle"
+
 	install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape"
 	install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait"
 }
-- 
cgit v1.2.3


From c29453d85e7236aaef0ed5b5b20de2b18b1a8381 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 19 Feb 2008 19:34:46 +0000
Subject: ipkg-utils: ipkg-make-index-track-stamps.patch: Remove hunk with
 whitespace-only changes.

---
 .../ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
index 9f9b9359ce..ad6df4f2e9 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
@@ -86,12 +86,3 @@ Index: ipkg-utils/ipkg-make-index
  if opt_s:
       sys.exit(0)
  
-@@ -154,7 +177,7 @@ if packages_filename:
-      os.rename(tmp_packages_filename, packages_filename)
-      os.rename(tmp_gzip_filename, gzip_filename)
- 
--if verbose:	
-+if verbose:
-      sys.stderr.write("Generate Packages.filelist file\n")
- files = {}
- names = packages.packages.keys()
-- 
cgit v1.2.3


From 5afdb5f594d828b1f948ea5dc7820e3d1deef4e6 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 19:40:27 +0000
Subject: add blackbox 0.70.1, fixes #981

---
 packages/blackbox/.mtn2git_empty                   |  0
 packages/blackbox/blackbox_0.70.1.bb               | 14 ++++++++++++++
 packages/blackbox/files/.mtn2git_empty             |  0
 packages/blackbox/files/remove-host-includes.patch | 19 +++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 packages/blackbox/.mtn2git_empty
 create mode 100644 packages/blackbox/blackbox_0.70.1.bb
 create mode 100644 packages/blackbox/files/.mtn2git_empty
 create mode 100644 packages/blackbox/files/remove-host-includes.patch

diff --git a/packages/blackbox/.mtn2git_empty b/packages/blackbox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/blackbox/blackbox_0.70.1.bb b/packages/blackbox/blackbox_0.70.1.bb
new file mode 100644
index 0000000000..50dc5a69c6
--- /dev/null
+++ b/packages/blackbox/blackbox_0.70.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Blackbox Window Manager"
+SECTION = "x11/wm"
+LICENSE = "GPL"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
+  file://remove-host-includes.patch;patch=1"
+S = "${WORKDIR}/blackbox-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
+
diff --git a/packages/blackbox/files/.mtn2git_empty b/packages/blackbox/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/blackbox/files/remove-host-includes.patch b/packages/blackbox/files/remove-host-includes.patch
new file mode 100644
index 0000000000..bf557b51da
--- /dev/null
+++ b/packages/blackbox/files/remove-host-includes.patch
@@ -0,0 +1,19 @@
+Index: blackbox-0.70.1/configure.ac
+===================================================================
+--- blackbox-0.70.1.orig/configure.ac
++++ blackbox-0.70.1/configure.ac
+@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc])
+ dnl Determine default prefix
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
+ 
+-dnl Look in the most logical places for external libraries
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-
+ dnl Locate required external software
+ AC_PROG_CC
+ 
-- 
cgit v1.2.3


From f14f0d3bfd9ebd96079700cf30b5c4ebffc9b6c4 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 19 Feb 2008 21:15:37 +0000
Subject: ipkg-utils*: Re-add support for openwrt-style .ipk's. * There're two
 .ipk formats: one with ar top-level wrapping (essentially, .deb format,
 native OE format) and with tar.gz top-level wrap, used by OpenWRT and some
 tiny distros. When I did performance optimization work on ipkg-make-index, I
 just blocked support of tar.gz-style ipk's, as it was unclear if those are
 used in OE at all. Now support is readded, with the old code to handle them
 (i.e. not as optimal as ar-style ones). * This makes DISTRO=openwrt-sdk
 usable for producing compatible packages and deploy-feed for them. But
 there're still some issues to resolve before OE can be said to provide
 seamless support for building packages for OpenWRT.

---
 .../ipkg-utils-native_1.6+cvs20050404.bb           |   2 +-
 .../ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch    | 105 +++++++++++----------
 packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb  |   2 +-
 3 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 3101ecb3be..ba3c8ecd0c 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r15"
+PR = "r16"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
index 25eb2cce6f..389a86018b 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
@@ -1,13 +1,6 @@
----
- arfile.py |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py   |  106 ++++++++++++++++++++++++++---------------------------
- setup.py  |    2 -
- 3 files changed, 177 insertions(+), 55 deletions(-)
-
-Index: ipkg-utils/arfile.py
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/arfile.py	2007-05-26 23:46:59.000000000 +0100
+diff -r 720080c24d2f arfile.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/arfile.py	Sun Jan 27 23:26:35 2008 +0200
 @@ -0,0 +1,124 @@
 +"""
 +arfile - A module to parse GNU ar archives.
@@ -133,23 +126,10 @@ Index: ipkg-utils/arfile.py
 +
 +        f2 = tarf.extractfile("control")
 +        print f2.read()
-Index: ipkg-utils/setup.py
-===================================================================
---- ipkg-utils.orig/setup.py	2007-05-26 23:45:55.000000000 +0100
-+++ ipkg-utils/setup.py	2007-05-26 23:46:59.000000000 +0100
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
- 		      platforms = 'POSIX',
- 		      keywords = 'ipkg familiar',
-                       url = 'http://www.handhelds.org/sources.html/',
--                      py_modules = [ 'ipkg' ],
-+                      py_modules = [ 'ipkg', 'arfile' ],
- 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
-                       )
-Index: ipkg-utils/ipkg.py
-===================================================================
---- ipkg-utils.orig/ipkg.py	2007-05-26 23:46:55.000000000 +0100
-+++ ipkg-utils/ipkg.py	2007-05-26 23:45:20.000000000 +0100
-@@ -41,6 +41,8 @@ import re
+diff -r 720080c24d2f ipkg.py
+--- a/ipkg.py	Sun Jan 27 23:13:26 2008 +0200
++++ b/ipkg.py	Sun Jan 27 23:26:35 2008 +0200
+@@ -41,6 +41,8 @@ import string
  import string
  import commands
  from stat import ST_SIZE
@@ -158,7 +138,7 @@ Index: ipkg-utils/ipkg.py
  
  class Version:
      """A class for holding parsed package version information."""
-@@ -131,78 +133,61 @@ class Package:
+@@ -131,77 +133,61 @@ class Package:
  	self.section = None
          self.filename_header = None
  	self.file_list = []
@@ -198,8 +178,6 @@ Index: ipkg-utils/ipkg.py
 -            self.size = stat[ST_SIZE]
 +
              self.filename = os.path.basename(fn)
-+            assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported"
-+
  	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
 -            if self.isdeb:
 -                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
@@ -227,15 +205,18 @@ Index: ipkg-utils/ipkg.py
 -                            self.__dict__[name] = value
 -                else:
 -                    line = control.readline()
++	    if self.isdeb:
++        	ar = arfile.ArFile(f)
++        	tarStream = ar.open("control.tar.gz")
++        	tarf = tarfile.open("control.tar.gz", "r", tarStream)
++
++        	try:
++        	    control = tarf.extractfile("control")
++        	except KeyError:
++        	    control = tarf.extractfile("./control")
++	    else:
++		control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
 +
-+            ar = arfile.ArFile(f)
-+            tarStream = ar.open("control.tar.gz")
-+            tarf = tarfile.open("control.tar.gz", "r", tarStream)
-+
-+            try:
-+        	control = tarf.extractfile("control")
-+            except KeyError:
-+        	control = tarf.extractfile("./control")
 +            self.read_control(control)
              control.close()
 -            if self.isdeb:
@@ -251,7 +232,7 @@ Index: ipkg-utils/ipkg.py
  	self.scratch_dir = None
  	self.file_dir = None
  	self.meta_dir = None
- 
++
 +    def __getattr__(self, name):
 +        if name == "md5":
 +            self._computeFileMD5()
@@ -269,11 +250,10 @@ Index: ipkg-utils/ipkg.py
 +            sum.update(data)
 +        f.close()
 +        self.md5 = sum.hexdigest()
-+
+ 
      def read_control(self, control):
          import os
- 
-@@ -221,9 +203,15 @@ class Package:
+@@ -221,9 +207,15 @@ class Package:
                      value = value + '\n' + line
                  if name == 'size':
                      self.size = int(value)
@@ -290,20 +270,43 @@ Index: ipkg-utils/ipkg.py
                      return # consumes one blank line at end of package descriptoin
              else:
                  line = control.readline()
-@@ -314,6 +302,16 @@ class Package:
+@@ -314,7 +306,27 @@ class Package:
  	return self.section
  
      def get_file_list(self):
+-	return self.file_list
 +        if not self.fn:
 +            return []
-+        f = open(self.fn, "rb")
-+        ar = arfile.ArFile(f)
-+        tarStream = ar.open("data.tar.gz")
-+        tarf = tarfile.open("data.tar.gz", "r", tarStream)
-+        self.file_list = tarf.getnames()
++	
++	if self.isdeb:
++    	    f = open(self.fn, "rb")
++    	    ar = arfile.ArFile(f)
++    	    tarStream = ar.open("data.tar.gz")
++    	    tarf = tarfile.open("data.tar.gz", "r", tarStream)
++    	    self.file_list = tarf.getnames()
++    	    f.close()
++	else:
++            f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r") 
++            while 1: 
++                line = f.readline() 
++                if not line: break 
++                self.file_list.append(string.rstrip(line)) 
++            f.close() 
++
++        # Make sure that filelist has consistent format regardless of tar version
 +        self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list)
-+
-+        f.close()
- 	return self.file_list
++        return self.file_list
  
      def write_package(self, dirname):
+         buf = self.render_control()
+diff -r 720080c24d2f setup.py
+--- a/setup.py	Sun Jan 27 23:13:26 2008 +0200
++++ b/setup.py	Sun Jan 27 23:26:35 2008 +0200
+@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+ 		      platforms = 'POSIX',
+ 		      keywords = 'ipkg familiar',
+                       url = 'http://www.handhelds.org/sources.html/',
+-                      py_modules = [ 'ipkg' ],
++                      py_modules = [ 'ipkg', 'arfile' ],
+ 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
+                       )
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index c089796ccb..febecb0085 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
-- 
cgit v1.2.3


From 2e6af6d47a620f38b76fb1442f72161dcbcc736b Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 19 Feb 2008 21:37:09 +0000
Subject: joe 3.1: Update DESCRIPTION to something useful and add HOMEPAGE.

---
 packages/joe/joe_3.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/joe/joe_3.1.bb b/packages/joe/joe_3.1.bb
index 31050477b8..d2f2aa6ad2 100644
--- a/packages/joe/joe_3.1.bb
+++ b/packages/joe/joe_3.1.bb
@@ -1,6 +1,8 @@
 SECTION = "console/utils"
-DESCRIPTION = "Joe's own editor."
+DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters."
+HOMEPAGE = "http://joe-editor.sourceforge.net/"
 LICENSE ="GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
+PR = "r1"
 
 inherit autotools
-- 
cgit v1.2.3


From 0efa4c6c1cf75c70c9eae673daae44e937a92e1f Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 23:35:23 +0000
Subject: Fixed default ALSA state for SL-Cxx00 (OE#2617).   * Fixes
 bass/treble levels (reflects kernel fix alsa-wm8750-treble.patch (>2.6.24)). 
  * Increased Mic Levels and Boost.   * Enabled Capture Switch.   * Improved
 Headphones / Speaker volume balance.   * Disabled all bypasses.   * Disabled
 Left -> Right routing.   * All Mono signals decreased to 0 (not connected).  
 * Line Mux changed to differential, keeping PGA unused.   * Using Digital
 mono for recording (jack supports ony mono).   * Enabled Automatic Level
 Control, optimized for voice recording.   * Enabled Zero Cross volume
 changes.

---
 packages/alsa/alsa-state/akita/asound.state | 66 +++++++++++------------
 packages/alsa/alsa-state/spitz/asound.state | 82 ++++++++++++++---------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/packages/alsa/alsa-state/akita/asound.state b/packages/alsa/alsa-state/akita/asound.state
index ee5ef519c3..d1bacfb708 100644
--- a/packages/alsa/alsa-state/akita/asound.state
+++ b/packages/alsa/alsa-state/akita/asound.state
@@ -6,8 +6,8 @@ state.Spitz {
 		comment.range '0 - 63'
 		iface MIXER
 		name 'Capture Volume'
-		value.0 23
-		value.1 23
+		value.0 48
+		value.1 48
 	}
 	control.2 {
 		comment.access 'read write'
@@ -15,8 +15,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.3 {
 		comment.access 'read write'
@@ -24,8 +24,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.4 {
 		comment.access 'read write'
@@ -33,8 +33,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.5 {
 		comment.access 'read write'
@@ -42,8 +42,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.6 {
 		comment.access 'read write'
@@ -92,8 +92,8 @@ state.Spitz {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 220
+		value.1 220
 	}
 	control.11 {
 		comment.access 'read write'
@@ -122,7 +122,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Bass Volume'
-		value 11
+		value 0
 	}
 	control.14 {
 		comment.access 'read write'
@@ -131,7 +131,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Treble Volume'
-		value 11
+		value 0
 	}
 	control.15 {
 		comment.access 'read write'
@@ -158,7 +158,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name '3D Volume'
-		value 9
+		value 0
 	}
 	control.18 {
 		comment.access 'read write'
@@ -226,7 +226,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ALC Capture ZC Switch'
-		value false
+		value true
 	}
 	control.25 {
 		comment.access 'read write'
@@ -235,7 +235,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Hold Time'
-		value 0
+		value 9
 	}
 	control.26 {
 		comment.access 'read write'
@@ -244,7 +244,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Decay Time'
-		value 3
+		value 9
 	}
 	control.27 {
 		comment.access 'read write'
@@ -253,7 +253,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Attack Time'
-		value 2
+		value 3
 	}
 	control.28 {
 		comment.access 'read write'
@@ -298,7 +298,7 @@ state.Spitz {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'Right ADC Capture Volume'
-		value 0
+		value 195
 	}
 	control.33 {
 		comment.access 'read write'
@@ -306,7 +306,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ZC Timeout Switch'
-		value false
+		value true
 	}
 	control.34 {
 		comment.access 'read write'
@@ -331,8 +331,8 @@ state.Spitz {
 		comment.range '0 - 3'
 		iface MIXER
 		name 'Mic Boost'
-		value.0 0
-		value.1 0
+		value.0 3
+		value.1 3
 	}
 	control.37 {
 		comment.access 'read write'
@@ -379,8 +379,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Headphone Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 105
+		value.1 105
 	}
 	control.42 {
 		comment.access 'read write'
@@ -389,8 +389,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Speaker Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 127
+		value.1 127
 	}
 	control.43 {
 		comment.access 'read write'
@@ -411,7 +411,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Right ADC Mux'
-		value 'Mono (Left)'
+		value 'Digital Mono'
 	}
 	control.45 {
 		comment.access 'read write'
@@ -423,7 +423,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Left ADC Mux'
-		value 'Mono (Left)'
+		value 'Digital Mono'
 	}
 	control.46 {
 		comment.access 'read write'
@@ -458,7 +458,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Right Line Mux'
-		value 'Line 2'
+		value Differential
 	}
 	control.49 {
 		comment.access 'read write'
@@ -471,7 +471,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Left Line Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.50 {
 		comment.access 'read write'
@@ -483,7 +483,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Right PGA Mux'
-		value 'Line 2'
+		value Differential
 	}
 	control.51 {
 		comment.access 'read write'
@@ -495,7 +495,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Left PGA Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.52 {
 		comment.access 'read write'
diff --git a/packages/alsa/alsa-state/spitz/asound.state b/packages/alsa/alsa-state/spitz/asound.state
index 81b6ed9814..d1bacfb708 100644
--- a/packages/alsa/alsa-state/spitz/asound.state
+++ b/packages/alsa/alsa-state/spitz/asound.state
@@ -6,8 +6,8 @@ state.Spitz {
 		comment.range '0 - 63'
 		iface MIXER
 		name 'Capture Volume'
-		value.0 23
-		value.1 23
+		value.0 48
+		value.1 48
 	}
 	control.2 {
 		comment.access 'read write'
@@ -15,8 +15,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.3 {
 		comment.access 'read write'
@@ -24,8 +24,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.4 {
 		comment.access 'read write'
@@ -33,8 +33,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.5 {
 		comment.access 'read write'
@@ -42,8 +42,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.6 {
 		comment.access 'read write'
@@ -92,8 +92,8 @@ state.Spitz {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 220
+		value.1 220
 	}
 	control.11 {
 		comment.access 'read write'
@@ -131,7 +131,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Treble Volume'
-		value 15
+		value 0
 	}
 	control.15 {
 		comment.access 'read write'
@@ -188,7 +188,7 @@ state.Spitz {
 		comment.item.1 Playback
 		iface MIXER
 		name '3D Mode'
-		value Capture
+		value Playback
 	}
 	control.21 {
 		comment.access 'read write'
@@ -218,7 +218,7 @@ state.Spitz {
 		comment.item.3 Stereo
 		iface MIXER
 		name 'ALC Capture Function'
-		value Off
+		value Left
 	}
 	control.24 {
 		comment.access 'read write'
@@ -226,7 +226,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ALC Capture ZC Switch'
-		value false
+		value true
 	}
 	control.25 {
 		comment.access 'read write'
@@ -235,7 +235,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Hold Time'
-		value 0
+		value 9
 	}
 	control.26 {
 		comment.access 'read write'
@@ -244,7 +244,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Decay Time'
-		value 3
+		value 9
 	}
 	control.27 {
 		comment.access 'read write'
@@ -253,7 +253,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Attack Time'
-		value 2
+		value 3
 	}
 	control.28 {
 		comment.access 'read write'
@@ -306,7 +306,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ZC Timeout Switch'
-		value false
+		value true
 	}
 	control.34 {
 		comment.access 'read write'
@@ -322,7 +322,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'Right Speaker Playback Invert Switch'
-		value false
+		value true
 	}
 	control.36 {
 		comment.access 'read write'
@@ -331,8 +331,8 @@ state.Spitz {
 		comment.range '0 - 3'
 		iface MIXER
 		name 'Mic Boost'
-		value.0 0
-		value.1 0
+		value.0 3
+		value.1 3
 	}
 	control.37 {
 		comment.access 'read write'
@@ -341,8 +341,8 @@ state.Spitz {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Bypass Left Playback Volume'
-		value.0 2
-		value.1 2
+		value.0 0
+		value.1 0
 	}
 	control.38 {
 		comment.access 'read write'
@@ -351,8 +351,8 @@ state.Spitz {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Bypass Right Playback Volume'
-		value.0 2
-		value.1 2
+		value.0 0
+		value.1 0
 	}
 	control.39 {
 		comment.access 'read write'
@@ -361,8 +361,8 @@ state.Spitz {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Bypass Mono Playback Volume'
-		value.0 2
-		value.1 2
+		value.0 0
+		value.1 0
 	}
 	control.40 {
 		comment.access 'read write'
@@ -379,8 +379,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Headphone Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 105
+		value.1 105
 	}
 	control.42 {
 		comment.access 'read write'
@@ -389,8 +389,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Speaker Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 127
+		value.1 127
 	}
 	control.43 {
 		comment.access 'read write'
@@ -399,7 +399,7 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Mono Playback Volume'
-		value 121
+		value 0
 	}
 	control.44 {
 		comment.access 'read write'
@@ -411,7 +411,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Right ADC Mux'
-		value Stereo
+		value 'Digital Mono'
 	}
 	control.45 {
 		comment.access 'read write'
@@ -423,7 +423,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Left ADC Mux'
-		value Stereo
+		value 'Digital Mono'
 	}
 	control.46 {
 		comment.access 'read write'
@@ -458,7 +458,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Right Line Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.49 {
 		comment.access 'read write'
@@ -471,7 +471,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Left Line Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.50 {
 		comment.access 'read write'
@@ -483,7 +483,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Right PGA Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.51 {
 		comment.access 'read write'
@@ -495,7 +495,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Left PGA Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.52 {
 		comment.access 'read write'
@@ -535,7 +535,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'Right Mixer Left Playback Switc'
-		value true
+		value false
 	}
 	control.57 {
 		comment.access 'read write'
-- 
cgit v1.2.3


From a31fef72ef3076a0250cc304c25f6a68ae2b9b9e Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 23:42:47 +0000
Subject: dbus 1.1.4 fix permissions of dbus system bus activation helper
 binary * with this revision, system bus activation finally works

---
 packages/dbus/dbus.inc      | 22 ++++++++++++++++------
 packages/dbus/dbus_1.1.4.bb |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index b2ced23d99..ed0a0b3cf2 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -1,5 +1,6 @@
+DESCRIPTION = "A message bus system for inter-process communication"
 HOMEPAGE = "http://dbus.freedesktop.org"
-DESCRIPTION = "Message bus system for applications to talk to one another"
+SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
@@ -56,13 +57,20 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 
 grep -q netdev: /etc/group || addgroup netdev
-
+chmod u+s /usr/libexec/dbus-daemon-launch-helper
 }
 
-EXTRA_OECONF = "--disable-qt --disable-qt3  --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x"
-
+EXTRA_OECONF = "\
+  --disable-qt \
+  --disable-qt3 \
+  --disable-gtk \
+  --disable-tests \
+  --disable-checks \
+  --disable-xml-docs \
+  --disable-doxygen-docs \
+  --with-xml=expat \
+  --without-x \
+"
 
 do_stage() {
 	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
@@ -76,4 +84,6 @@ do_stage() {
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+	# the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
+	install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
 }
diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb
index 8e3e329fde..7838e55ca1 100644
--- a/packages/dbus/dbus_1.1.4.bb
+++ b/packages/dbus/dbus_1.1.4.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r1"
+PR = "r2"
-- 
cgit v1.2.3


From caa7a3cfd0e36fd85c88be9b3da099623eff09a0 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 23:43:14 +0000
Subject: gsm0710muxd svn fix name of dbus service file (temp.)

---
 packages/freesmartphone/gsm0710muxd_svn.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb
index 4a4dc3b7d4..98b9360c00 100644
--- a/packages/freesmartphone/gsm0710muxd_svn.bb
+++ b/packages/freesmartphone/gsm0710muxd_svn.bb
@@ -5,13 +5,18 @@ SECTION = "console/network"
 DEPENDS = "intltool-native dbus"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
 S = "${WORKDIR}/gsm0710muxd"
 
 inherit autotools
 
+do_install_append() {
+	# temp hack
+	mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service
+}
+
 pkg_postinst_${PN}() {
 	# can't do this offline
 	if [ "x$D" != "x" ]; then
-- 
cgit v1.2.3


From 20d42693b736d4986cbf898c9ef1b392a65f3f85 Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Tue, 19 Feb 2008 23:53:49 +0000
Subject: zziplib: Unification and new versions.  - added zziplib.inc file  -
 added native and non-native recipe for latest stable (0.12) series  - added
 native and non-native recipe for latest development (0.13) series

---
 packages/zziplib/files/.mtn2git_empty         |   0
 packages/zziplib/files/zip_c.patch            |  15 +
 packages/zziplib/files/zziplib-autoconf.patch | 509 ++++++++++++++++++++++++++
 packages/zziplib/zziplib-native_0.12.83.bb    |   9 +
 packages/zziplib/zziplib-native_0.13.49.bb    |   9 +
 packages/zziplib/zziplib.inc                  |  20 +
 packages/zziplib/zziplib_0.10.82.bb           |  22 +-
 packages/zziplib/zziplib_0.12.83.bb           |   4 +
 packages/zziplib/zziplib_0.13.49.bb           |  12 +
 9 files changed, 580 insertions(+), 20 deletions(-)
 create mode 100644 packages/zziplib/files/.mtn2git_empty
 create mode 100644 packages/zziplib/files/zip_c.patch
 create mode 100644 packages/zziplib/files/zziplib-autoconf.patch
 create mode 100644 packages/zziplib/zziplib-native_0.12.83.bb
 create mode 100644 packages/zziplib/zziplib-native_0.13.49.bb
 create mode 100644 packages/zziplib/zziplib.inc
 create mode 100644 packages/zziplib/zziplib_0.12.83.bb
 create mode 100644 packages/zziplib/zziplib_0.13.49.bb

diff --git a/packages/zziplib/files/.mtn2git_empty b/packages/zziplib/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/zziplib/files/zip_c.patch b/packages/zziplib/files/zip_c.patch
new file mode 100644
index 0000000000..fb23ce650e
--- /dev/null
+++ b/packages/zziplib/files/zip_c.patch
@@ -0,0 +1,15 @@
+From zziplib Debian source package
+--- a/zzip/zip.c	2007-03-19 02:27:49.000000000 +1100
++++ b/zzip/zip.c	2007-11-07 17:40:52.985849197 +1100
+@@ -402,7 +402,10 @@
+         uint16_t u_extras, u_comment, u_namlen;
+ 
+         if (fd_map) 
+-	{ d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */
++        {
++             d = &dirent;
++             memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */
++        }
+         else
+         {
+             if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0)
diff --git a/packages/zziplib/files/zziplib-autoconf.patch b/packages/zziplib/files/zziplib-autoconf.patch
new file mode 100644
index 0000000000..6fc666f8f2
--- /dev/null
+++ b/packages/zziplib/files/zziplib-autoconf.patch
@@ -0,0 +1,509 @@
+Reworks zziplib's configure and top-level makefile considerably to make
+this package compile in a cross-compilation environment. This has not
+and will not be sent upstream because the author most likely wants it that
+way (lots of MSVC crap).
+
+Index: zziplib-0.13.49/Makefile.am
+===================================================================
+--- zziplib-0.13.49.orig/Makefile.am	2008-02-19 22:54:19.000000000 +0100
++++ zziplib-0.13.49/Makefile.am	2008-02-19 23:37:40.000000000 +0100
+@@ -1,126 +1,10 @@
+-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
+ ACLOCAL_AMFLAGS = -I m4
+-WANT_AUTOMAKE = 1.7
+-WANT_AUTOCONF = 2.57
++WANT_AUTOMAKE = 1.96
++WANT_AUTOCONF = 2.61
+ 
+ DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
+ SUBDIRS =      zzip zzipwrap bins test docs @SDL@
+ 
+-# see Makefile.mk for the "make rpm" target
+-rpm2: dist-bzip2 $(PACKAGE).spec
+-	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
+-
+-indent-check:
+-	(cd zzip && $(MAKE) `basename $@`)
+-
+-doc docs docu clean-doc clean-docs clean-docu   zzip.html zzip.xml zzip.pdf \
+-man mans manpages htmpages unpack clean-unpack  changes.htm pdfs \
+-omf install-omf install-doc install-docs install-sf install-man3 install-mans :
+-	(cd docs && $(MAKE) `basename $@`)
+-
+-sdl testsdl test-sdl install-sdl :
+-	(cd SDL && $(MAKE) `basename $@`)
+-
+-check-test0 check-test1 check-zzdir check-zzcat \
+-check-zzxor check-zzxordir check-zzxorcat \
+-check-sfx     check-readme : \
+-	(cd test && $(MAKE) `basename $@`)
+-
+-MSVC8 =   msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \
+-msvc8/zzdir.vcproj    msvc8/zzipself.vcproj     msvc8/zzip.vcproj \
+-msvc8/zziplib.sln     msvc8/zzipsetstub.sln     msvc8/zzobfuscated.sln \
+-msvc8/zziplib.vcproj  msvc8/zzipsetstub.vcproj  msvc8/zzobfuscated.vcproj \
+-msvc8/zzcat.sln       msvc8/zzipself.bat        msvc8/zzip.sln \
+-msvc8/zzcat.vcproj    msvc8/zzipself.sln        msvc8/zziptest.sln \
+-msvc8/zzdir.sln       msvc8/zzipself.txt        msvc8/zziptest.vcproj \
+-                      msvc8/zzipfseeko.vcproj   msvc8/zzipmmapped.vcproj 
+-
+-MSVC7 =   msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \
+-msvc7/zzdir.vcproj    msvc7/zzipself.vcproj     msvc7/zzip.vcproj \
+-msvc7/zziplib.sln     msvc7/zzipsetstub.sln     msvc7/zzobfuscated.sln \
+-msvc7/zziplib.vcproj  msvc7/zzipsetstub.vcproj  msvc7/zzobfuscated.vcproj \
+-msvc7/zzcat.sln       msvc7/zzipself.bat        msvc7/zzip.sln \
+-msvc7/zzcat.vcproj    msvc7/zzipself.sln        msvc7/zziptest.sln \
+-msvc7/zzdir.sln       msvc7/zzipself.txt        msvc7/zziptest.vcproj
+-
+-MSVC6 = \
+-msvc6/zzcat.dsp        msvc6/zziplib.dsp      msvc6/zzipwrap.dsp \
+-msvc6/zzdir.dsp        msvc6/zziplib.dsw      msvc6/zzobfuscated.dsp \
+-msvc6/zziptest.dsp     msvc6/zzip.dsp  
+-
+ EXTRA_DIST =   zziplib.spec zzipback.sed Makefile.mk \
+-               $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
+-
+-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
+-	comp compats msvc6 msvc7
+-# ------------------------------------------------------------------------
+-
+-test-comp:
+-	test ! -d testing || rm -r testing
+-	mkdir testing
+-	(cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz)
+-	(cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure)
+-	$(MAKE) -C  "testing/$(PACKAGE)-$(VERSION)/zziplib"
+-	$(MAKE) -C  "testing/$(PACKAGE)-$(VERSION)/zziplib"  check
+-
+-clean-comp:
+-	test ! -d testing || rm -r testing
+-
+-msvc :
+-	mkdir bin
+-	mkdir lib
+-	mkdir include
+-	mkdir include/zzip
+-	cp $(srcdir)/msvc6/Release/*.exe bin/
+-	cp $(srcdir)/msvc6/Release/*.dll bin/
+-	cp $(srcdir)/msvc6/Release/*.lib lib/
+-	cp $(srcdir)/zzip/*.h include/zzip/
+-	zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/
+-	zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/
+-	rm -r bin lib include
+-
+-# ------------------------------------------------------------------ zzip64
+-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64
+-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64"
++               $(am__aclocal_m4_deps)
+ 
+-zzip64-setup: zzip64-setup.tmp
+-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc
+-	- mkdir zzip64
+-	cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/
+-	date > zzip64.dir
+-zzip64-build: zzip64-build.tmp
+-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/*
+-	cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64)
+-zzip64-install: zzip64-install.tmp
+-zzip64-install.tmp : zzip64-build.tmp
+-	cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip64.so
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip64.a
+-	cd $(DESTDIR)$(libdir) && \
+-        sed -e 's/zzip.so/zzip64.so/' \
+-            -e 's/zzip.a/zzip64.a/'     libzzip.la > libzzip64.la
+-	cd $(DESTDIR)$(libdir)/pkgconfig && \
+-	sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
+-	    -e 's/-lzzip/-lzzip64/' \
+-	    -e 's/zziplib/zziplib64/'   zziplib.pc > zziplib64.pc
+-zzip32-postinstall:
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip32.so
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip32.a
+-	cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+-	cd $(DESTDIR)$(libdir) && ln -s libzzip32.a  libzzip.a
+-	cd $(DESTDIR)$(libdir) && \
+-	sed -e 's/zzip.so/zzip32.so/' \
+-	    -e 's/zzip.a/zzip32.a/'     libzzip.la > libzzip32.la
+-	cd $(DESTDIR)$(libdir)/pkgconfig && \
+-	sed -e 's/-lzzip/-lzzip32/' \
+-	     -e 's/zziplib/zziplib32/'  zziplib.pc > zziplib32.pc
+-zzip-postinstall:
+-	: "the 12.8x and 11.8x and 10.8x packages are all the same actually"
+-	cd $(DESTDIR)$(libdir) || exit 1 \
+-	; for i in libzzip*.so.1? ; do : \
+-	; v10=`echo $i | sed -e "s/.so.../.so.10/"` \
+-	; v11=`echo $i | sed -e "s/.so.../.so.11/"` \
+-	; v12=`echo $i | sed -e "s/.so.../.so.12/"` \
+-	; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \
+-	; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \
+-	; ln -s $v10 $v11 || true; done
+Index: zziplib-0.13.49/configure.ac
+===================================================================
+--- zziplib-0.13.49.orig/configure.ac	2008-02-15 21:56:37.000000000 +0100
++++ zziplib-0.13.49/configure.ac	2008-02-19 23:43:05.000000000 +0100
+@@ -1,12 +1,12 @@
+-AC_INIT(zziplib.spec)
+-AC_PREREQ(2.49)
+-AC_COPYRIGHT([Guido Draheim <guido@gmx.de> for ZZipLib.SF.net])
++AC_PREREQ(2.61)
++AC_INIT([zziplib], [0.13.49], [Guido Draheim <guido@gmx.de>])
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
++
++AC_CONFIG_SRCDIR([zzip/zip.c])
+ AC_REVISION($Revision: 1.9 $)
+-AC_CONFIG_AUX_DIR(uses)
++
+ # =======================================================================
+-AC_CANONICAL_SYSTEM
+-dnl AM_ENABLE_MULTILIB([Makefile],[$host])
+-AX_ENABLE_BUILDDIR_UNAME
+ AC_SET_DEFAULT_PATHS_SYSTEM
+ # -----------------------------------------------------------------------
+ AC_ARG_ENABLE(thread-safe,AC_HELP_STRING(
+@@ -61,8 +61,6 @@
+ AC_SUBST(ZLIB_INCL)
+ AC_SUBST(ZLIB_LDIR)
+ # -----------------------------------------------------------------------
+-AX_SPEC_DEFAULTS
+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+ dnl test ".$CFLAGS" = "." && CFLAGS="" 
+ AC_PROG_CC
+ dnl test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3"
+@@ -77,7 +75,7 @@
+ sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in
+ AC_CONFIG_HEADERS([config.h])
+ AX_PREFIX_CONFIG_H([zzip/_config.h],[zzip],[config.h])
+-AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
++#AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
+ AM_MAINTAINER_MODE
+ 
+ AX_CREATE_PKGCONFIG_INFO(dnl
+Index: zziplib-0.13.49/install-sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ zziplib-0.13.49/install-sh	2008-02-19 23:43:36.000000000 +0100
+@@ -0,0 +1,323 @@
++#!/bin/sh
++# install - install a program, script, or datafile
++
++scriptversion=2005-05-14.22
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch.  It can only install one file at a time, a restriction
++# shared with many OS's install programs.
++
++# set DOITPROG to echo to test this script
++
++# Don't use :- since 4.3BSD and earlier shells don't like it.
++doit="${DOITPROG-}"
++
++# put in absolute paths if you don't have them in your path; or use env. vars.
++
++mvprog="${MVPROG-mv}"
++cpprog="${CPPROG-cp}"
++chmodprog="${CHMODPROG-chmod}"
++chownprog="${CHOWNPROG-chown}"
++chgrpprog="${CHGRPPROG-chgrp}"
++stripprog="${STRIPPROG-strip}"
++rmprog="${RMPROG-rm}"
++mkdirprog="${MKDIRPROG-mkdir}"
++
++chmodcmd="$chmodprog 0755"
++chowncmd=
++chgrpcmd=
++stripcmd=
++rmcmd="$rmprog -f"
++mvcmd="$mvprog"
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++   or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c         (ignored)
++-d         create directories instead of installing files.
++-g GROUP   $chgrpprog installed files to GROUP.
++-m MODE    $chmodprog installed files to MODE.
++-o USER    $chownprog installed files to USER.
++-s         $stripprog installed files.
++-t DIRECTORY  install into DIRECTORY.
++-T         report an error if DSTFILE is a directory.
++--help     display this help and exit.
++--version  display version info and exit.
++
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++  case $1 in
++    -c) shift
++        continue;;
++
++    -d) dir_arg=true
++        shift
++        continue;;
++
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
++
++    --help) echo "$usage"; exit $?;;
++
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
++
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
++
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
++
++    -t) dstarg=$2
++	shift
++	shift
++	continue;;
++
++    -T) no_target_directory=true
++	shift
++	continue;;
++
++    --version) echo "$0 $scriptversion"; exit $?;;
++
++    *)  # When -d is used, all remaining arguments are directories to create.
++	# When -t is used, the destination is already specified.
++	test -n "$dir_arg$dstarg" && break
++        # Otherwise, the last argument is the destination.  Remove it from $@.
++	for arg
++	do
++          if test -n "$dstarg"; then
++	    # $@ is not empty: it contains at least $arg.
++	    set fnord "$@" "$dstarg"
++	    shift # fnord
++	  fi
++	  shift # arg
++	  dstarg=$arg
++	done
++	break;;
++  esac
++done
++
++if test -z "$1"; then
++  if test -z "$dir_arg"; then
++    echo "$0: no input file specified." >&2
++    exit 1
++  fi
++  # It's OK to call `install-sh -d' without argument.
++  # This can happen when creating conditional directories.
++  exit 0
++fi
++
++for src
++do
++  # Protect names starting with `-'.
++  case $src in
++    -*) src=./$src ;;
++  esac
++
++  if test -n "$dir_arg"; then
++    dst=$src
++    src=
++
++    if test -d "$dst"; then
++      mkdircmd=:
++      chmodcmd=
++    else
++      mkdircmd=$mkdirprog
++    fi
++  else
++    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++    # might cause directories to be created, which would be especially bad
++    # if $src (and thus $dsttmp) contains '*'.
++    if test ! -f "$src" && test ! -d "$src"; then
++      echo "$0: $src does not exist." >&2
++      exit 1
++    fi
++
++    if test -z "$dstarg"; then
++      echo "$0: no destination specified." >&2
++      exit 1
++    fi
++
++    dst=$dstarg
++    # Protect names starting with `-'.
++    case $dst in
++      -*) dst=./$dst ;;
++    esac
++
++    # If destination is a directory, append the input filename; won't work
++    # if double slashes aren't ignored.
++    if test -d "$dst"; then
++      if test -n "$no_target_directory"; then
++	echo "$0: $dstarg: Is a directory" >&2
++	exit 1
++      fi
++      dst=$dst/`basename "$src"`
++    fi
++  fi
++
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++  # Make sure that the destination directory exists.
++
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
++
++    oIFS=$IFS
++    # Some sh's can't handle IFS=/ for some reason.
++    IFS='%'
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
++    IFS=$oIFS
++
++    pathcomp=
++
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
++      shift
++      if test ! -d "$pathcomp"; then
++        $mkdirprog "$pathcomp"
++	# mkdir can fail with a `File exist' error in case several
++	# install-sh are creating the directory concurrently.  This
++	# is OK.
++	test -d "$pathcomp" || exit
++      fi
++      pathcomp=$pathcomp/
++    done
++  fi
++
++  if test -n "$dir_arg"; then
++    $doit $mkdircmd "$dst" \
++      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
++  else
++    dstfile=`basename "$dst"`
++
++    # Make a couple of temp file names in the proper directory.
++    dsttmp=$dstdir/_inst.$$_
++    rmtmp=$dstdir/_rm.$$_
++
++    # Trap to clean up those temp files at exit.
++    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++    trap '(exit $?); exit' 1 2 13 15
++
++    # Copy the file name to the temp name.
++    $doit $cpprog "$src" "$dsttmp" &&
++
++    # and set any options; do chmod last to preserve setuid bits.
++    #
++    # If any of these fail, we abort the whole thing.  If we want to
++    # ignore errors from any of these, just make sure not to ignore
++    # errors from the above "$doit $cpprog $src $dsttmp" command.
++    #
++    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++    # Now rename the file to the real destination.
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++      || {
++	   # The rename failed, perhaps because mv can't rename something else
++	   # to itself, or perhaps because mv is so ancient that it does not
++	   # support -f.
++
++	   # Now remove or move aside any old file at destination location.
++	   # We try this two ways since rm can't unlink itself on some
++	   # systems and the destination file might be busy for other
++	   # reasons.  In this case, the final cleanup might fail but the new
++	   # file should still install successfully.
++	   {
++	     if test -f "$dstdir/$dstfile"; then
++	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++	       || {
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++		 (exit 1); exit 1
++	       }
++	     else
++	       :
++	     fi
++	   } &&
++
++	   # Now rename the file to the real destination.
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++	 }
++    }
++  fi || { (exit 1); exit 1; }
++done
++
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{