Various things I forgot to commit.

git-svn-id: http://svn.telesphoreo.org/trunk@670 514c082c-b64e-11dc-b46d-3d985efe055d

13 files changed, 85 insertions, 74 deletions

diff --git a/data/top/escape.diff b/data/top/escape.diff
new file mode 100644
index 000000000..ce794392c
--- /dev/null
+++ b/data/top/escape.diff
@@ -0,0 +1,12 @@
+diff -ru top-39/top.h top-39+iPhone/top.h
+--- top-39/top.h	2007-05-21 20:43:56.000000000 +0000
++++ top-39+iPhone/top.h	2009-05-12 10:34:55.000000000 +0000
+@@ -174,7 +174,7 @@
+ #define FORMAT_TIME_HHMMSS   'w'
+ 
+ #define VALID_FORMATS "abcdefghijklmnopqrstuvw"
+-#define FORMAT_ESCAPE        '\'
++#define FORMAT_ESCAPE        '\\'
+ #define FORMAT_LEFT          '^'
+ #define FORMAT_RIGHT         '$'
+ #define FORMAT_DELTA         '-'
diff --git a/data/top/rprvt.diff b/data/top/rprvt.diff
new file mode 100644
index 000000000..c78db0560
--- /dev/null
+++ b/data/top/rprvt.diff
@@ -0,0 +1,49 @@
+diff -ru top-39/top.h top-39+iPhone/top.h
+--- top-39/top.h	2007-05-21 20:43:56.000000000 +0000
++++ top-39+iPhone/top.h	2009-05-12 00:51:45.000000000 +0000
+@@ -180,10 +180,10 @@
+ #define FORMAT_DELTA         '-'
+ #define VALID_ESCAPES        "\\^$-"
+ 
+-#define LEGEND_CN  "  PID COMMAND      %CPU   TIME   #TH #PRTS #MREGS RPRVT  RSHRD  RSIZE  VSIZE"
+-#define FORMAT_CN  "$aaaa ^bbbbbbbbb $cccc% $wwwwwww $ee $ffff-$ggggg $hhhh- $iiii- $jjjj- $llll-"
+-#define LEGEND_CNW "  PID COMMAND      %CPU   TIME   #TH #PRTS(delta) #MREGS RPRVT(delta) RSHRD(delta) RSIZE(delta) VSIZE(delta)"
+-#define FORMAT_CNW "$aaaa ^bbbbbbbbb $cccc% $wwwwwww $ee $ffff------- $ggggg $hhhh------- $iiii------- $jjjj------- $llll-------"
++#define LEGEND_CN  "  PID COMMAND      %CPU   TIME   #TH #PRTS #MREGS  RPRVT  RSHRD  RSIZE  VSIZE"
++#define FORMAT_CN  "$aaaa ^bbbbbbbbb $cccc% $wwwwwww $ee $ffff-$ggggg $hhhhh- $iiii- $jjjj- $llll-"
++#define LEGEND_CNW "  PID COMMAND      %CPU   TIME   #TH #PRTS(delta) #MREGS  RPRVT(delta) RSHRD(delta) RSIZE(delta) VSIZE(delta)"
++#define FORMAT_CNW "$aaaa ^bbbbbbbbb $cccc% $wwwwwww $ee $ffff------- $ggggg $hhhhh------- $iiii------- $jjjj------- $llll-------"
+ #define LEGEND_CA  "  PID COMMAND      %CPU   TIME    FAULTS   PAGEINS COW_FAULTS MSGS_SENT  MSGS_RCVD  BSDSYSCALL MACHSYSCALL CSWITCH"
+ #define FORMAT_CA  "$aaaa ^bbbbbbbbb $cccc% $wwwwwww ^oooooo  ^ppppppp ^qqqqqqqqq ^rrrrrrrr  ^ssssssss  ^ttttttttt ^uuuuuuuuuu ^vvvvvv"
+ #define LEGEND_CD  "  PID COMMAND      %CPU   TIME   FAULTS PGINS/COWS MSENT/MRCVD    BSD/MACH      CSW"
+@@ -191,18 +191,18 @@
+ #define LEGEND_CE LEGEND_CA
+ #define FORMAT_CE FORMAT_CA
+ 
+-#define LEGEND_XCN  "  PID   UID  REG RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT    TIME  %CPU COMMAND"
+-#define FORMAT_XCN  "$aaaa $mmmm $ggg $hhhh- $iiii- $jjjj- $kkkk- $llll-$ee $ff-$dddddd $cccc ^bbbbbbbbbbbbbbb"
+-#define LEGEND_XCNW "  PID   UID  REG RPRVT( delta) RSHRD( delta) RSIZE( delta) VPRVT( delta) VSIZE( delta) TH PRT(delta)   TIME  %CPU COMMAND"
+-#define FORMAT_XCNW "$aaaa $mmmm $ggg $hhhh-------- $iiii-------- $jjjj-------- $kkkk-------- $llll--------$ee $ff-------$dddddd $cccc ^bbbbbbbbbbbbbbb"
+-#define LEGEND_XTCN  "  PID USERNAME  REG  RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT    TIME  %CPU COMMAND"
+-#define FORMAT_XTCN  "$aaaa ^nnnnnnnn $ggg $hhhh- $iiii- $jjjj- $kkkk- $llll-$ee $ff-$dddddd $cccc ^bbbbbbbbbbbbbbb"
+-#define LEGEND_XTCNW "  PID USERNAME  REG  RPRVT( delta) RSHRD( delta) RSIZE( delta) VPRVT( delta) VSIZE( delta) TH PRT(delta)   TIME  %CPU COMMAND"
+-#define FORMAT_XTCNW "$aaaa ^nnnnnnnn $ggg $hhhh-------- $iiii-------- $jjjj-------- $kkkk-------- $llll--------$ee $ff-------$dddddd $cccc ^bbbbbbbbbbbbbbb"
+-#define LEGEND_XCA "  PID   UID  REG RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT      FAULTS    PAGEINS COW_FAULTS  MSGS_SENT  MSGS_RCVD   BSYSCALL   MSYSCALL    CSWITCH   TIME  %CPU COMMAND"
+-#define FORMAT_XCA "$aaaa $mmmm $ggg $hhhh  $iiii $jjjjj  $kkkk  $llll $ee $ff  $ooooooooo  $pppppppp $qqqqqqqqq  $rrrrrrrr  $ssssssss   $ttttttt   $uuuuuuu    $vvvvvv $ddddd$ccccc $bbbbbbbbbbbbbbbb"
+-#define LEGEND_XTCA "  PID USERNAME  REG RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT      FAULTS    PAGEINS COW_FAULTS  MSGS_SENT  MSGS_RCVD   BSYSCALL   MSYSCALL    CSWITCH   TIME  %CPU COMMAND"
+-#define FORMAT_XTCA "$aaaa ^nnnnnnnn $ggg $hhhh  $iiii $jjjjj  $kkkk  $llll $ee $ff  $ooooooooo  $ppppppp $qqqqqqqqq  $rrrrrrrr  $ssssssss   $ttttttt   $uuuuuuu    $vvvvvv $ddddd$ccccc $bbbbbbbbbbbbbbbb"
++#define LEGEND_XCN  "  PID   UID  REG  RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT    TIME  %CPU COMMAND"
++#define FORMAT_XCN  "$aaaa $mmmm $ggg $hhhhh- $iiii- $jjjj- $kkkk- $llll-$ee $ff-$dddddd $cccc ^bbbbbbbbbbbbbbb"
++#define LEGEND_XCNW "  PID   UID  REG  RPRVT( delta) RSHRD( delta) RSIZE( delta) VPRVT( delta) VSIZE( delta) TH PRT(delta)   TIME  %CPU COMMAND"
++#define FORMAT_XCNW "$aaaa $mmmm $ggg $hhhhh-------- $iiii-------- $jjjj-------- $kkkk-------- $llll--------$ee $ff-------$dddddd $cccc ^bbbbbbbbbbbbbbb"
++#define LEGEND_XTCN  "  PID USERNAME  REG   RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT    TIME  %CPU COMMAND"
++#define FORMAT_XTCN  "$aaaa ^nnnnnnnn $ggg $hhhhh- $iiii- $jjjj- $kkkk- $llll-$ee $ff-$dddddd $cccc ^bbbbbbbbbbbbbbb"
++#define LEGEND_XTCNW "  PID USERNAME  REG   RPRVT( delta) RSHRD( delta) RSIZE( delta) VPRVT( delta) VSIZE( delta) TH PRT(delta)   TIME  %CPU COMMAND"
++#define FORMAT_XTCNW "$aaaa ^nnnnnnnn $ggg $hhhhh-------- $iiii-------- $jjjj-------- $kkkk-------- $llll--------$ee $ff-------$dddddd $cccc ^bbbbbbbbbbbbbbb"
++#define LEGEND_XCA "  PID   UID  REG  RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT      FAULTS    PAGEINS COW_FAULTS  MSGS_SENT  MSGS_RCVD   BSYSCALL   MSYSCALL    CSWITCH   TIME  %CPU COMMAND"
++#define FORMAT_XCA "$aaaa $mmmm $ggg $hhhhh  $iiii $jjjjj  $kkkk  $llll $ee $ff  $ooooooooo  $pppppppp $qqqqqqqqq  $rrrrrrrr  $ssssssss   $ttttttt   $uuuuuuu    $vvvvvv $ddddd$ccccc $bbbbbbbbbbbbbbbb"
++#define LEGEND_XTCA "  PID USERNAME  REG  RPRVT  RSHRD  RSIZE  VPRVT  VSIZE  TH PRT      FAULTS    PAGEINS COW_FAULTS  MSGS_SENT  MSGS_RCVD   BSYSCALL   MSYSCALL    CSWITCH   TIME  %CPU COMMAND"
++#define FORMAT_XTCA "$aaaa ^nnnnnnnn $ggg $hhhhh  $iiii $jjjjj  $kkkk  $llll $ee $ff  $ooooooooo  $ppppppp $qqqqqqqqq  $rrrrrrrr  $ssssssss   $ttttttt   $uuuuuuu    $vvvvvv $ddddd$ccccc $bbbbbbbbbbbbbbbb"
+ #define LEGEND_XCD LEGEND_XCA
+ #define FORMAT_XCD FORMAT_XCA
+ #define LEGEND_XCE LEGEND_XCA
diff --git a/data/top/stability.diff b/data/top/stability.diff
new file mode 100644
index 000000000..70729a518
--- /dev/null
+++ b/data/top/stability.diff
@@ -0,0 +1,13 @@
+diff -ru top-39/libtop.c top-39+iPhone/libtop.c
+--- top-39/libtop.c	2008-02-04 21:55:01.000000000 +0000
++++ top-39+iPhone/libtop.c	2009-05-13 09:13:40.000000000 +0000
+@@ -1647,6 +1647,9 @@
+ 		pinfo->psamp.vsize = ti.virtual_size;
+ 	}
+ 
++	if (pinfo->psamp.rprvt > 0xc0000000)
++            pinfo->psamp.rprvt = pinfo->psamp.p_rprvt;
++
+ 	/*
+ 	 * Get CPU usage statistics.
+ 	 */
diff --git a/data/x264/darwin.diff b/data/x264/darwin.diff
index f5dd7cd58..e69de29bb 100644
--- a/data/x264/darwin.diff
+++ b/data/x264/darwin.diff
@@ -1,65 +0,0 @@
-diff -ru x264-snapshot-20080226-2245/configure x264-snapshot-20080226-2245+iPhone/configure
---- x264-snapshot-20080226-2245/configure	2008-02-26 21:45:02.000000000 +0000
-+++ x264-snapshot-20080226-2245+iPhone/configure	2008-05-19 12:49:10.000000000 +0000
-@@ -182,8 +182,8 @@
-     ;;
-   darwin*)
-     SYS="MACOSX"
--    CFLAGS="$CFLAGS -falign-loops=16"
--    LDFLAGS="$LDFLAGS -lm -lmx"
-+    CFLAGS="$CFLAGS -falign-loops=16 -fno-common"
-+    LDFLAGS="$LDFLAGS -lm"
-     ;;
-   freebsd*)
-     SYS="FREEBSD"
-@@ -454,10 +454,10 @@
- 
- if [ "$shared" = "yes" ]; then
-     API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
--    echo "SONAME=libx264.so.$API" >> config.mak
-+    echo "SONAME=libx264.dylib.$API" >> config.mak
-     echo 'default: $(SONAME)' >> config.mak
-     if [ "$gtk" = "yes" ]; then
--        echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
-+        echo "SONAMEGTK=libx264gtk.dylib.$API" >> gtk/config.mak
-     fi
- fi
- 
-diff -ru x264-snapshot-20080226-2245/Makefile x264-snapshot-20080226-2245+iPhone/Makefile
---- x264-snapshot-20080226-2245/Makefile	2008-02-26 21:45:02.000000000 +0000
-+++ x264-snapshot-20080226-2245+iPhone/Makefile	2008-05-19 12:48:00.000000000 +0000
-@@ -74,11 +74,11 @@
- default: $(DEP) x264$(EXE)
- 
- libx264.a: .depend $(OBJS) $(OBJASM)
--	ar rc libx264.a $(OBJS) $(OBJASM)
--	ranlib libx264.a
-+	"$${PKG_TARG}-ar" rc libx264.a $(OBJS) $(OBJASM)
-+	"$${PKG_TARG}-ranlib" libx264.a
- 
- $(SONAME): .depend $(OBJS) $(OBJASM)
--	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
-+	$(CC) -dynamiclib -o $@ $(OBJS) $(OBJASM) -install_name $(libdir)/$(SONAME) $(LDFLAGS)
- 
- x264$(EXE): $(OBJCLI) libx264.a 
- 	$(CC) -o $@ $+ $(LDFLAGS)
-@@ -156,8 +156,8 @@
- 	install -m 644 libx264.a $(DESTDIR)$(libdir)
- 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- 	install x264 $(DESTDIR)$(bindir)
--	ranlib $(DESTDIR)$(libdir)/libx264.a
--	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
-+	"$${PKG_TARG}-ranlib" $(DESTDIR)$(libdir)/libx264.a
-+	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.dylib)
- 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
- 
- install-gtk: libx264gtk.a
-@@ -166,7 +166,7 @@
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
- 	rm -f $(DESTDIR)$(bindir)/x264 $(DESTDIR)$(libdir)/pkgconfig/x264.pc
--	$(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.so)
-+	$(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.dylib)
- 	$(MAKE) -C gtk uninstall
- 
- etags: TAGS
diff --git a/data/x264/make.sh b/data/x264/make.sh
index 8399d8b7b..1c2bd5467 100644
--- a/data/x264/make.sh
+++ b/data/x264/make.sh
@@ -1,4 +1,4 @@
 pkg:setup
-CC=${PKG_TARG}-gcc pkg:configure --enable-shared
+CC=${PKG_TARG}-gcc ./configure --enable-shared --host="${PKG_TARG}"
 make
 pkg:install
diff --git a/data/x264/x264-snapshot-20080226-2245.tar.bz2 b/data/x264/x264-snapshot-20080226-2245.tar.bz2
deleted file mode 100644
index 4a812ea90..000000000
--- a/data/x264/x264-snapshot-20080226-2245.tar.bz2
+++ /dev/null
diff --git a/data/x264/x264-snapshot-20080921-2245.tar.bz2 b/data/x264/x264-snapshot-20080921-2245.tar.bz2
new file mode 100644
index 000000000..905aaf724
--- /dev/null
+++ b/data/x264/x264-snapshot-20080921-2245.tar.bz2
diff --git a/data/zodttd/_metadata/extrainst_ b/data/zodttd/_metadata/extrainst_
new file mode 100755
index 000000000..77895813b
--- /dev/null
+++ b/data/zodttd/_metadata/extrainst_
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [[ $1 == install || $1 == upgrade ]]; then
+    /usr/bin/apt-key add /usr/share/keyrings/zodttd-keyring.gpg
+fi
diff --git a/data/zodttd/_metadata/postinst b/data/zodttd/_metadata/postinst
deleted file mode 100755
index 188547456..000000000
--- a/data/zodttd/_metadata/postinst
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/apt-key add /usr/share/keyrings/zodttd-keyring.gpg
diff --git a/data/zodttd/_metadata/prerm b/data/zodttd/_metadata/prerm
index 4a327b794..7394703ad 100755
--- a/data/zodttd/_metadata/prerm
+++ b/data/zodttd/_metadata/prerm
@@ -1,6 +1,4 @@
 #!/bin/sh
-case "$1" in
-    (remove|purge)
-        /usr/bin/apt-key del 718BABDF
-    ;;
-esac
+if [[ $1 == remove ]]; then
+    /usr/bin/apt-key del 718BABDF
+fi
diff --git a/data/zodttd/make.sh b/data/zodttd/make.sh
index ce6b483a5..98c6ec454 100644
--- a/data/zodttd/make.sh
+++ b/data/zodttd/make.sh
@@ -2,3 +2,5 @@ pkg: mkdir -p /etc/apt/sources.list.d
 pkg: cp -a %/zodttd.list /etc/apt/sources.list.d
 pkg: mkdir -p /usr/share/keyrings
 pkg: cp -a %/failkey.asc /usr/share/keyrings/zodttd-keyring.gpg
+pkg: mkdir -p /Applications/Cydia.app/Sources
+pkg: cp -a %/www.zodttd.com.png /Applications/Cydia.app/Sources/cydia.zodttd.com.png
diff --git a/data/zodttd/www.zodttd.com.png b/data/zodttd/www.zodttd.com.png
new file mode 100644
index 000000000..83a3b33bf
--- /dev/null
+++ b/data/zodttd/www.zodttd.com.png
diff --git a/data/zodttd/zodttd.list b/data/zodttd/zodttd.list
index 6d65ac455..2b567fc6b 100644
--- a/data/zodttd/zodttd.list
+++ b/data/zodttd/zodttd.list
@@ -3,4 +3,4 @@
 # either add your own .list file to /etc/apt/sources.list.d
 # or add your entry to the global /etc/apt/sources.list file
 
-deb http://www.zodttd.com/repo/cydia/ stable main
+deb http://cydia.zodttd.com/repo/cydia/ stable main