Various things I forgot to commit.

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

22 files changed, 14 insertions, 125 deletions

diff --git a/data/glib/_metadata/version b/data/glib/_metadata/version
index 14f37ac81..1e38b29bf 100644
--- a/data/glib/_metadata/version
+++ b/data/glib/_metadata/version
@@ -1 +1 @@
-2.12.13
+2.20.4
diff --git a/data/glib/glib-2.12.13.tar.gz b/data/glib/glib-2.12.13.tar.gz
deleted file mode 100644
index 6b4cb1d97..000000000
--- a/data/glib/glib-2.12.13.tar.gz
+++ /dev/null
diff --git a/data/glib/glib-2.20.4.tar.bz2 b/data/glib/glib-2.20.4.tar.bz2
new file mode 100644
index 000000000..ccd58fdb7
--- /dev/null
+++ b/data/glib/glib-2.20.4.tar.bz2
diff --git a/data/glib/make.sh b/data/glib/make.sh
index 53c375ecb..3e4e753e7 100644
--- a/data/glib/make.sh
+++ b/data/glib/make.sh
@@ -1,5 +1,4 @@
 pkg:setup
-autoconf
-pkg:configure glib_cv_stack_grows=no glib_cv_uscore=yes ac_cv_func_posix_getpwuid_r=yes --with-libiconv=native
+pkg:configure glib_cv_stack_grows=no glib_cv_uscore=yes ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes --with-libiconv=native
 make
 pkg:install
diff --git a/data/glib/nmedit.diff b/data/glib/nmedit.diff
deleted file mode 100644
index a6c9db9a4..000000000
--- a/data/glib/nmedit.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru glib-2.12.13/aclocal.m4 glib-2.12.13+iPhone/aclocal.m4
---- glib-2.12.13/aclocal.m4	2007-07-16 18:58:02.000000000 +0000
-+++ glib-2.12.13+iPhone/aclocal.m4	2008-01-09 13:33:57.000000000 +0000
-@@ -4531,11 +4531,11 @@
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-         # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-           if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-           else
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-           fi
--            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       else
-       case $cc_basename in
-         xlc*)
-@@ -4543,8 +4543,8 @@
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-           ;;
-        *)
-          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -7296,8 +7296,8 @@
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
-       case $cc_basename in
-         xlc*)
-@@ -7305,8 +7305,8 @@
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-           ;;
-        *)
-          _LT_AC_TAGVAR(ld_shlibs, $1)=no
diff --git a/data/glib/visibility.diff b/data/glib/visibility.diff
deleted file mode 100644
index 4684e6771..000000000
--- a/data/glib/visibility.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru glib-2.12.13/configure.in glib-2.12.13+iPhone/configure.in
---- glib-2.12.13/configure.in	2007-07-16 18:57:18.000000000 +0000
-+++ glib-2.12.13+iPhone/configure.in	2008-01-09 13:31:52.000000000 +0000
-@@ -753,36 +753,7 @@
- 
- # check for GNUC visibility support
- AC_MSG_CHECKING(for GNUC visibility attribute)
--GLIB_CHECK_COMPILE_WARNINGS([
--void
--__attribute__ ((visibility ("hidden")))
--     f_hidden (void)
--{
--}
--void
--__attribute__ ((visibility ("internal")))
--     f_internal (void)
--{
--}
--void
--__attribute__ ((visibility ("protected")))
--     f_protected (void)
--{
--}
--void
--__attribute__ ((visibility ("default")))
--     f_default (void)
--{
--}
--int main (int argc, char **argv)
--{
--	f_hidden();
--	f_internal();
--	f_protected();
--	f_default();
--	return 0;
--}
--],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no)
-+g_have_gnuc_visibility=no
- AC_MSG_RESULT($g_have_gnuc_visibility)
- AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
- 
diff --git a/data/grep/_metadata/gettext.dep b/data/grep/_metadata/gettext.dep
deleted file mode 120000
index e8dbd8996..000000000
--- a/data/grep/_metadata/gettext.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../gettext
\ No newline at end of file
diff --git a/data/grep/_metadata/homepage b/data/grep/_metadata/homepage
new file mode 100644
index 000000000..4ef828191
--- /dev/null
+++ b/data/grep/_metadata/homepage
@@ -0,0 +1 @@
+http://www.gnu.org/software/grep/
diff --git a/data/grep/_metadata/version b/data/grep/_metadata/version
index 95e3ba819..fe16b348d 100644
--- a/data/grep/_metadata/version
+++ b/data/grep/_metadata/version
@@ -1 +1 @@
-2.5
+2.5.4
diff --git a/data/grep/destdir.diff b/data/grep/destdir.diff
deleted file mode 100644
index 6c28ab173..000000000
--- a/data/grep/destdir.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -u grep-2.5/src/Makefile.am grep-2.5+iPhone/src/Makefile.am
---- grep-2.5/src/Makefile.am	2002-03-13 15:20:13.000000000 +0000
-+++ grep-2.5+iPhone/src/Makefile.am	2007-12-26 23:59:25.000000000 +0000
-@@ -18,5 +18,5 @@
-              vms_fab.c vms_fab.h
- 
- install-exec-local:
--	@SYMLINK@ @SYMLINKFROM@ $(bindir)/egrep
--	@SYMLINK@ @SYMLINKFROM@ $(bindir)/fgrep
-+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/egrep
-+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/fgrep
-diff -r -u grep-2.5/src/Makefile.in grep-2.5+iPhone/src/Makefile.in
---- grep-2.5/src/Makefile.in	2002-03-13 15:23:51.000000000 +0000
-+++ grep-2.5+iPhone/src/Makefile.in	2007-12-26 23:59:16.000000000 +0000
-@@ -354,8 +354,8 @@
- 
- 
- install-exec-local:
--	@SYMLINK@ @SYMLINKFROM@ $(bindir)/egrep
--	@SYMLINK@ @SYMLINKFROM@ $(bindir)/fgrep
-+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/egrep
-+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/fgrep
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/data/grep/grep-2.5.4.tar.bz2 b/data/grep/grep-2.5.4.tar.bz2
new file mode 100644
index 000000000..48ee68c90
--- /dev/null
+++ b/data/grep/grep-2.5.4.tar.bz2
diff --git a/data/grep/grep-2.5.tar.gz b/data/grep/grep-2.5.tar.gz
deleted file mode 100644
index 7787ac5f6..000000000
--- a/data/grep/grep-2.5.tar.gz
+++ /dev/null
diff --git a/data/inetutils/make.sh b/data/inetutils/make.sh
index b335dcd3f..7481d441d 100644
--- a/data/inetutils/make.sh
+++ b/data/inetutils/make.sh
@@ -4,3 +4,7 @@ autoconf
 pkg:configure ac_cv_type_sa_family_t=yes ac_cv_type_socklen_t=yes ac_cv_member_struct_utmp_ut_user=yes ac_cv_func_obstack=no --disable-ifconfig --disable-ping6 --disable-syslogd --disable-talkd --disable-traceroute --disable-whois ac_cv_header_utmp_h=no
 make CFLAGS='-O2 -mthumb'
 pkg:install
+pkg:bin ping
+pkg: mkdir -p /sbin
+ln -s /bin/ping "${PKG_DEST}"/usr/bin
+ln -s /bin/ping "${PKG_DEST}"/sbin
diff --git a/data/iphone-java/_metadata/depiction b/data/iphone-java/_metadata/depiction
new file mode 100644
index 000000000..f3d82c5f7
--- /dev/null
+++ b/data/iphone-java/_metadata/depiction
@@ -0,0 +1 @@
+http://cydia.saurik.com/info/iphone-java/
diff --git a/data/iphone-java/_metadata/homepage b/data/iphone-java/_metadata/homepage
new file mode 100644
index 000000000..5cd94e20c
--- /dev/null
+++ b/data/iphone-java/_metadata/homepage
@@ -0,0 +1 @@
+http://www.jocstrap.com/
diff --git a/data/ispazio.net/ispazio.net.list b/data/ispazio.net/ispazio.net.list
index 670896132..3b6a53f37 100644
--- a/data/ispazio.net/ispazio.net.list
+++ b/data/ispazio.net/ispazio.net.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://cydia.ispazio.net/ ./
+deb http://www.ispaziorepo.com/cydia/apt/ ./
diff --git a/data/ispazio.net/ispaziorepo.com.png b/data/ispazio.net/ispaziorepo.com.png
new file mode 100644
index 000000000..d6b1a3918
--- /dev/null
+++ b/data/ispazio.net/ispaziorepo.com.png
diff --git a/data/ispazio.net/make.sh b/data/ispazio.net/make.sh
index 13d54fca4..531fabf29 100644
--- a/data/ispazio.net/make.sh
+++ b/data/ispazio.net/make.sh
@@ -1,2 +1,4 @@
 pkg: mkdir -p /etc/apt/sources.list.d
 pkg: cp -a %/ispazio.net.list /etc/apt/sources.list.d
+pkg: mkdir -p /Applications/Cydia.app/Sources
+pkg: cp -a %/ispaziorepo.com.png /Applications/Cydia.app/Sources/www.ispaziorepo.com.png
diff --git a/data/krb5/_metadata/libresolv.dep b/data/krb5/_metadata/libresolv.dep
deleted file mode 120000
index 40a8d5796..000000000
--- a/data/krb5/_metadata/libresolv.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libresolv
\ No newline at end of file
diff --git a/data/ldid/_metadata/version b/data/ldid/_metadata/version
index 1be2b398a..502380c6c 100644
--- a/data/ldid/_metadata/version
+++ b/data/ldid/_metadata/version
@@ -1 +1 @@
-1.0.476
+610
diff --git a/data/ldid/ldid-1.0.476.tgz b/data/ldid/ldid-1.0.476.tgz
deleted file mode 100644
index 7bd28a4b1..000000000
--- a/data/ldid/ldid-1.0.476.tgz
+++ /dev/null
diff --git a/data/ldid/ldid-1.0.610.tgz b/data/ldid/ldid-1.0.610.tgz
new file mode 100644
index 000000000..c6d130a35
--- /dev/null
+++ b/data/ldid/ldid-1.0.610.tgz