From 99e6df8e99db74a51c7d48e00c54f6dd834a9b97 Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 29 Jun 2007 00:28:25 +0000 Subject: [PATCH] Dem Silvio ein Applejuice/Java-Paket gebaut. Bitte testen. Den Pakfire ein wenig weitergemacht... cURL-Libs in die ISO gepackt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@651 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/curl | 62 +++ config/rootfiles/packages/applejuice | 140 ++++++ config/rootfiles/packages/java | 701 +++++++++++++++++++++++++++ doc/packages-list.txt | 1 - html/cgi-bin/pakfire.cgi | 4 +- lfs/Config | 5 +- lfs/applejuice | 7 +- lfs/java | 8 +- make.sh | 6 +- src/misc-progs/Makefile | 6 +- src/misc-progs/applejuicectrl.c | 44 ++ src/misc-progs/restartapplejuice.c | 26 - src/pakfire/lib/functions.pl | 34 +- src/pakfire/pakfire | 80 ++- src/paks/applejuice/install.sh | 4 + src/paks/applejuice/uninstall.sh | 2 + src/paks/applejuice/update.sh | 0 src/paks/clamav/uninstall.sh | 2 +- src/paks/java/install.sh | 4 + src/paks/java/uninstall.sh | 2 + src/paks/java/update.sh | 0 21 files changed, 1066 insertions(+), 72 deletions(-) create mode 100644 config/rootfiles/common/curl create mode 100644 config/rootfiles/packages/applejuice create mode 100644 config/rootfiles/packages/java create mode 100644 src/misc-progs/applejuicectrl.c delete mode 100644 src/misc-progs/restartapplejuice.c create mode 100644 src/paks/applejuice/install.sh create mode 100644 src/paks/applejuice/uninstall.sh create mode 100644 src/paks/applejuice/update.sh create mode 100644 src/paks/java/install.sh create mode 100644 src/paks/java/uninstall.sh create mode 100644 src/paks/java/update.sh diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl new file mode 100644 index 0000000000..585965d062 --- /dev/null +++ b/config/rootfiles/common/curl @@ -0,0 +1,62 @@ +#usr/bin/curl +#usr/bin/curl-config +#usr/include/curl +#usr/include/curl/curl.h +#usr/include/curl/curlver.h +#usr/include/curl/easy.h +#usr/include/curl/mprintf.h +#usr/include/curl/multi.h +#usr/include/curl/stdcheaders.h +#usr/include/curl/types.h +#usr/lib/libcurl.a +#usr/lib/libcurl.la +usr/lib/libcurl.so +usr/lib/libcurl.so.3 +usr/lib/libcurl.so.3.0.0 +#usr/lib/pkgconfig/libcurl.pc +#usr/man/man1/curl-config.1 +#usr/man/man1/curl.1 +#usr/man/man3/curl_easy_cleanup.3 +#usr/man/man3/curl_easy_duphandle.3 +#usr/man/man3/curl_easy_getinfo.3 +#usr/man/man3/curl_easy_init.3 +#usr/man/man3/curl_easy_perform.3 +#usr/man/man3/curl_easy_reset.3 +#usr/man/man3/curl_easy_setopt.3 +#usr/man/man3/curl_easy_strerror.3 +#usr/man/man3/curl_escape.3 +#usr/man/man3/curl_formadd.3 +#usr/man/man3/curl_formfree.3 +#usr/man/man3/curl_free.3 +#usr/man/man3/curl_getdate.3 +#usr/man/man3/curl_getenv.3 +#usr/man/man3/curl_global_cleanup.3 +#usr/man/man3/curl_global_init.3 +#usr/man/man3/curl_global_init_mem.3 +#usr/man/man3/curl_mprintf.3 +#usr/man/man3/curl_multi_add_handle.3 +#usr/man/man3/curl_multi_cleanup.3 +#usr/man/man3/curl_multi_fdset.3 +#usr/man/man3/curl_multi_info_read.3 +#usr/man/man3/curl_multi_init.3 +#usr/man/man3/curl_multi_perform.3 +#usr/man/man3/curl_multi_remove_handle.3 +#usr/man/man3/curl_multi_strerror.3 +#usr/man/man3/curl_share_cleanup.3 +#usr/man/man3/curl_share_init.3 +#usr/man/man3/curl_share_setopt.3 +#usr/man/man3/curl_share_strerror.3 +#usr/man/man3/curl_slist_append.3 +#usr/man/man3/curl_slist_free_all.3 +#usr/man/man3/curl_strequal.3 +#usr/man/man3/curl_unescape.3 +#usr/man/man3/curl_version.3 +#usr/man/man3/curl_version_info.3 +#usr/man/man3/libcurl-easy.3 +#usr/man/man3/libcurl-errors.3 +#usr/man/man3/libcurl-multi.3 +#usr/man/man3/libcurl-share.3 +#usr/man/man3/libcurl-tutorial.3 +#usr/man/man3/libcurl.3 +#usr/share/curl +#usr/share/curl/curl-ca-bundle.crt diff --git a/config/rootfiles/packages/applejuice b/config/rootfiles/packages/applejuice new file mode 100644 index 0000000000..cd6050aa74 --- /dev/null +++ b/config/rootfiles/packages/applejuice @@ -0,0 +1,140 @@ +etc/rc.d/init.d/applejuice +#opt/applejuice +opt/applejuice/ajcore.jar +opt/applejuice/libajnetmask.so +#srv/web/phpaj +srv/web/phpaj/phpaj +#srv/web/phpaj/phpaj/export +#srv/web/phpaj/phpaj/export/Default.php +#srv/web/phpaj/phpaj/export/ajl.php +#srv/web/phpaj/phpaj/export/bb.php +#srv/web/phpaj/phpaj/export/html.php +#srv/web/phpaj/phpaj/index.php +#srv/web/phpaj/phpaj/language +#srv/web/phpaj/phpaj/language/deutsch.xml +#srv/web/phpaj/phpaj/language/english.xml +#srv/web/phpaj/phpaj/main +#srv/web/phpaj/phpaj/main/classes +#srv/web/phpaj/phpaj/main/classes/class_core.php +#srv/web/phpaj/phpaj/main/classes/class_downloads.php +#srv/web/phpaj/phpaj/main/classes/class_icons.php +#srv/web/phpaj/phpaj/main/classes/class_search.php +#srv/web/phpaj/phpaj/main/classes/class_server.php +#srv/web/phpaj/phpaj/main/classes/class_share.php +#srv/web/phpaj/phpaj/main/classes/class_uploads.php +#srv/web/phpaj/phpaj/main/directory.php +#srv/web/phpaj/phpaj/main/dl_parts.php +#srv/web/phpaj/phpaj/main/dl_users.php +#srv/web/phpaj/phpaj/main/downloads.php +#srv/web/phpaj/phpaj/main/extras.php +#srv/web/phpaj/phpaj/main/index.php +#srv/web/phpaj/phpaj/main/progressbar.php +#srv/web/phpaj/phpaj/main/search.php +#srv/web/phpaj/phpaj/main/server.php +#srv/web/phpaj/phpaj/main/settings.php +#srv/web/phpaj/phpaj/main/shareexport.php +#srv/web/phpaj/phpaj/main/sharefiles.php +#srv/web/phpaj/phpaj/main/shares.php +#srv/web/phpaj/phpaj/main/showparts.php +#srv/web/phpaj/phpaj/main/start.php +#srv/web/phpaj/phpaj/main/status.php +#srv/web/phpaj/phpaj/main/subs.php +#srv/web/phpaj/phpaj/main/top.php +#srv/web/phpaj/phpaj/main/uploads.php +#srv/web/phpaj/phpaj/minigui +#srv/web/phpaj/phpaj/minigui/downloads.php +#srv/web/phpaj/phpaj/minigui/index.php +#srv/web/phpaj/phpaj/minigui/minigui.php +#srv/web/phpaj/phpaj/plugins +#srv/web/phpaj/phpaj/plugins/ajl +#srv/web/phpaj/phpaj/plugins/ajl/ajl.php +#srv/web/phpaj/phpaj/plugins/ajl/icon.gif +#srv/web/phpaj/phpaj/plugins/ajl/info.php +#srv/web/phpaj/phpaj/plugins/register.php +#srv/web/phpaj/phpaj/plugins/sharestats +#srv/web/phpaj/phpaj/plugins/sharestats/info.php +#srv/web/phpaj/phpaj/plugins/sharestats/sharestats.php +#srv/web/phpaj/phpaj/plugins/versionchecker +#srv/web/phpaj/phpaj/plugins/versionchecker/info.php +#srv/web/phpaj/phpaj/plugins/versionchecker/versionchecker.php +#srv/web/phpaj/phpaj/plugins/wizard +#srv/web/phpaj/phpaj/plugins/wizard/icon.gif +#srv/web/phpaj/phpaj/plugins/wizard/info.php +#srv/web/phpaj/phpaj/plugins/wizard/wizard.php +#srv/web/phpaj/phpaj/plugins/wizard/wizard.xml +#srv/web/phpaj/phpaj/style +#srv/web/phpaj/phpaj/style/default +#srv/web/phpaj/phpaj/style/default/default_blue.css +#srv/web/phpaj/phpaj/style/default/default_green.css +#srv/web/phpaj/phpaj/style/default/default_grey.css +#srv/web/phpaj/phpaj/style/default/info.png +#srv/web/phpaj/phpaj/style/default/minus.png +#srv/web/phpaj/phpaj/style/default/os +#srv/web/phpaj/phpaj/style/default/os/bsd.png +#srv/web/phpaj/phpaj/style/default/os/linux.png +#srv/web/phpaj/phpaj/style/default/os/mac.png +#srv/web/phpaj/phpaj/style/default/os/na.png +#srv/web/phpaj/phpaj/style/default/os/netware.png +#srv/web/phpaj/phpaj/style/default/os/os2.png +#srv/web/phpaj/phpaj/style/default/os/solaris.png +#srv/web/phpaj/phpaj/style/default/os/win.png +#srv/web/phpaj/phpaj/style/default/plus.png +#srv/web/phpaj/phpaj/style/default/server +#srv/web/phpaj/phpaj/style/default/server/alt.gif +#srv/web/phpaj/phpaj/style/default/server/neu.gif +#srv/web/phpaj/phpaj/style/default/server/verbinde.gif +#srv/web/phpaj/phpaj/style/default/server/verbunden.gif +#srv/web/phpaj/phpaj/style/default/stop.png +#srv/web/phpaj/phpaj/style/default/tabs +#srv/web/phpaj/phpaj/style/default/tabs/download.gif +#srv/web/phpaj/phpaj/style/default/tabs/extras.gif +#srv/web/phpaj/phpaj/style/default/tabs/kill.gif +#srv/web/phpaj/phpaj/style/default/tabs/logout.gif +#srv/web/phpaj/phpaj/style/default/tabs/meinshare.gif +#srv/web/phpaj/phpaj/style/default/tabs/optionen.gif +#srv/web/phpaj/phpaj/style/default/tabs/server.gif +#srv/web/phpaj/phpaj/style/default/tabs/start.gif +#srv/web/phpaj/phpaj/style/default/tabs/suchen.gif +#srv/web/phpaj/phpaj/style/default/tabs/upload.gif +#srv/web/phpaj/phpaj/style/default/user +#srv/web/phpaj/phpaj/style/default/user/direct.png +#srv/web/phpaj/phpaj/style/default/user/indirect.png +#srv/web/phpaj/phpaj/style/default/user/tryindirect.png +#srv/web/phpaj/phpaj/style/default/user/unknown.png +#srv/web/phpaj/phpaj/style/default/warnung.gif +#srv/web/phpaj/phpaj/style/default/x.png +#srv/web/phpaj/phpaj/style/default_blue.php +#srv/web/phpaj/phpaj/style/default_green.php +#srv/web/phpaj/phpaj/style/default_grey.php +#srv/web/phpaj/phpaj/style/new +#srv/web/phpaj/phpaj/style/new.php +#srv/web/phpaj/phpaj/style/new/bg.png +#srv/web/phpaj/phpaj/style/new/new.css +#srv/web/phpaj/phpaj/style/tango +#srv/web/phpaj/phpaj/style/tango.php +#srv/web/phpaj/phpaj/style/tango/bg.png +#srv/web/phpaj/phpaj/style/tango/icons +#srv/web/phpaj/phpaj/style/tango/icons/direct.png +#srv/web/phpaj/phpaj/style/tango/icons/down.png +#srv/web/phpaj/phpaj/style/tango/icons/empty.png +#srv/web/phpaj/phpaj/style/tango/icons/extras.png +#srv/web/phpaj/phpaj/style/tango/icons/home.png +#srv/web/phpaj/phpaj/style/tango/icons/indirect.png +#srv/web/phpaj/phpaj/style/tango/icons/info.png +#srv/web/phpaj/phpaj/style/tango/icons/kill.png +#srv/web/phpaj/phpaj/style/tango/icons/logout.png +#srv/web/phpaj/phpaj/style/tango/icons/minus.png +#srv/web/phpaj/phpaj/style/tango/icons/plus.png +#srv/web/phpaj/phpaj/style/tango/icons/preferences.png +#srv/web/phpaj/phpaj/style/tango/icons/search.png +#srv/web/phpaj/phpaj/style/tango/icons/server.png +#srv/web/phpaj/phpaj/style/tango/icons/share.png +#srv/web/phpaj/phpaj/style/tango/icons/stop.png +#srv/web/phpaj/phpaj/style/tango/icons/up.png +#srv/web/phpaj/phpaj/style/tango/icons/warning.png +#srv/web/phpaj/phpaj/style/tango/icons/x.png +#srv/web/phpaj/phpaj/style/tango/tango.css +#srv/web/phpaj/phpaj/vars.php +usr/local/bin/applejuicectrl +#var/ipfire/applejuice +var/ipfire/applejuice/settings diff --git a/config/rootfiles/packages/java b/config/rootfiles/packages/java new file mode 100644 index 0000000000..820e7f1d06 --- /dev/null +++ b/config/rootfiles/packages/java @@ -0,0 +1,701 @@ +usr/bin/java +#usr/java +#usr/java/bin +usr/java/bin/ControlPanel +usr/java/bin/java +usr/java/bin/java_vm +usr/java/bin/javaws +usr/java/bin/keytool +usr/java/bin/kinit +usr/java/bin/klist +usr/java/bin/ktab +usr/java/bin/orbd +usr/java/bin/pack200 +usr/java/bin/policytool +usr/java/bin/rmid +usr/java/bin/rmiregistry +usr/java/bin/servertool +usr/java/bin/tnameserv +usr/java/bin/unpack200 +#usr/java/javaws +usr/java/javaws/javaws +#usr/java/lib +usr/java/lib/applet +#usr/java/lib/audio +usr/java/lib/audio/soundbank.gm +usr/java/lib/charsets.jar +usr/java/lib/classlist +#usr/java/lib/cmm +usr/java/lib/cmm/CIEXYZ.pf +usr/java/lib/cmm/GRAY.pf +usr/java/lib/cmm/LINEAR_RGB.pf +usr/java/lib/cmm/PYCC.pf +usr/java/lib/cmm/sRGB.pf +usr/java/lib/content-types.properties +usr/java/lib/deploy.jar +#usr/java/lib/ext +usr/java/lib/ext/dnsns.jar +usr/java/lib/ext/localedata.jar +usr/java/lib/ext/sunjce_provider.jar +usr/java/lib/ext/sunpkcs11.jar +usr/java/lib/flavormap.properties +#usr/java/lib/fontconfig.RedHat.2.1.bfc +#usr/java/lib/fontconfig.RedHat.2.1.properties.src +#usr/java/lib/fontconfig.RedHat.3.bfc +#usr/java/lib/fontconfig.RedHat.3.properties.src +#usr/java/lib/fontconfig.RedHat.8.0.bfc +#usr/java/lib/fontconfig.RedHat.8.0.properties.src +#usr/java/lib/fontconfig.RedHat.9.0.bfc +#usr/java/lib/fontconfig.RedHat.9.0.properties.src +#usr/java/lib/fontconfig.RedHat.bfc +#usr/java/lib/fontconfig.RedHat.properties.src +#usr/java/lib/fontconfig.SuSE.bfc +#usr/java/lib/fontconfig.SuSE.properties.src +#usr/java/lib/fontconfig.Sun.2003.bfc +#usr/java/lib/fontconfig.Sun.2003.properties.src +#usr/java/lib/fontconfig.Sun.bfc +#usr/java/lib/fontconfig.Sun.properties.src +#usr/java/lib/fontconfig.Turbo.8.0.bfc +#usr/java/lib/fontconfig.Turbo.8.0.properties.src +#usr/java/lib/fontconfig.Turbo.bfc +#usr/java/lib/fontconfig.Turbo.properties.src +#usr/java/lib/fontconfig.bfc +#usr/java/lib/fontconfig.properties.src +#usr/java/lib/fonts +#usr/java/lib/fonts/LucidaBrightDemiBold.ttf +#usr/java/lib/fonts/LucidaBrightDemiItalic.ttf +#usr/java/lib/fonts/LucidaBrightItalic.ttf +#usr/java/lib/fonts/LucidaBrightRegular.ttf +#usr/java/lib/fonts/LucidaSansDemiBold.ttf +#usr/java/lib/fonts/LucidaSansRegular.ttf +#usr/java/lib/fonts/LucidaTypewriterBold.ttf +#usr/java/lib/fonts/LucidaTypewriterRegular.ttf +#usr/java/lib/fonts/fonts.dir +#usr/java/lib/i386 +usr/java/lib/i386/awt_robot +#usr/java/lib/i386/client +usr/java/lib/i386/client/Xusage.txt +usr/java/lib/i386/client/classes.jsa +usr/java/lib/i386/client/libjsig.so +usr/java/lib/i386/client/libjvm.so +usr/java/lib/i386/gtkhelper +#usr/java/lib/i386/headless +usr/java/lib/i386/headless/libmawt.so +usr/java/lib/i386/jvm.cfg +usr/java/lib/i386/libJdbcOdbc.so +usr/java/lib/i386/libawt.so +usr/java/lib/i386/libcmm.so +usr/java/lib/i386/libdcpr.so +usr/java/lib/i386/libdeploy.so +usr/java/lib/i386/libdt_socket.so +usr/java/lib/i386/libfontmanager.so +usr/java/lib/i386/libhprof.so +usr/java/lib/i386/libinstrument.so +usr/java/lib/i386/libioser12.so +usr/java/lib/i386/libj2pkcs11.so +usr/java/lib/i386/libjaas_unix.so +usr/java/lib/i386/libjava.so +usr/java/lib/i386/libjava_crw_demo.so +usr/java/lib/i386/libjavaplugin_jni.so +usr/java/lib/i386/libjavaplugin_nscp.so +usr/java/lib/i386/libjavaplugin_nscp_gcc29.so +usr/java/lib/i386/libjawt.so +usr/java/lib/i386/libjdwp.so +usr/java/lib/i386/libjpeg.so +usr/java/lib/i386/libjsig.so +usr/java/lib/i386/libjsound.so +usr/java/lib/i386/libjsoundalsa.so +usr/java/lib/i386/libmanagement.so +usr/java/lib/i386/libmlib_image.so +usr/java/lib/i386/libnative_chmod.so +usr/java/lib/i386/libnet.so +usr/java/lib/i386/libnio.so +usr/java/lib/i386/librmi.so +usr/java/lib/i386/libunpack.so +usr/java/lib/i386/libverify.so +usr/java/lib/i386/libzip.so +#usr/java/lib/i386/motif21 +usr/java/lib/i386/motif21/libmawt.so +usr/java/lib/i386/native_threads +usr/java/lib/i386/native_threads/libhpi.so +#usr/java/lib/i386/server +usr/java/lib/i386/server/Xusage.txt +usr/java/lib/i386/server/libjsig.so +usr/java/lib/i386/server/libjvm.so +#usr/java/lib/i386/xawt +#usr/java/lib/i386/xawt/libmawt.so +usr/java/lib/im +usr/java/lib/im/indicim.jar +usr/java/lib/im/thaiim.jar +#usr/java/lib/images +#usr/java/lib/images/cursors +usr/java/lib/images/cursors/cursors.properties +usr/java/lib/images/cursors/invalid32x32.gif +usr/java/lib/images/cursors/motif_CopyDrop32x32.gif +usr/java/lib/images/cursors/motif_CopyNoDrop32x32.gif +usr/java/lib/images/cursors/motif_LinkDrop32x32.gif +usr/java/lib/images/cursors/motif_LinkNoDrop32x32.gif +usr/java/lib/images/cursors/motif_MoveDrop32x32.gif +usr/java/lib/images/cursors/motif_MoveNoDrop32x32.gif +#usr/java/lib/images/icons +usr/java/lib/images/icons/sun-java.png +usr/java/lib/images/icons/sun-java_HighContrast.png +usr/java/lib/images/icons/sun-java_HighContrastInverse.png +usr/java/lib/images/icons/sun-java_LowContrast.png +#usr/java/lib/javaws +usr/java/lib/javaws.jar +#usr/java/lib/javaws/Java1.5.ico +usr/java/lib/javaws/messages.properties +usr/java/lib/javaws/messages_de.properties +usr/java/lib/javaws/messages_es.properties +usr/java/lib/javaws/messages_fr.properties +usr/java/lib/javaws/messages_it.properties +usr/java/lib/javaws/messages_ja.properties +usr/java/lib/javaws/messages_ko.properties +usr/java/lib/javaws/messages_sv.properties +usr/java/lib/javaws/messages_zh_CN.properties +usr/java/lib/javaws/messages_zh_HK.properties +usr/java/lib/javaws/messages_zh_TW.properties +usr/java/lib/javaws/miniSplash.jpg +usr/java/lib/jce.jar +usr/java/lib/jsse.jar +usr/java/lib/jvm.hprof.txt +#usr/java/lib/locale +usr/java/lib/locale/de +usr/java/lib/locale/de/LC_MESSAGES +usr/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/es +usr/java/lib/locale/es/LC_MESSAGES +usr/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/fr +usr/java/lib/locale/fr/LC_MESSAGES +usr/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/it +usr/java/lib/locale/it/LC_MESSAGES +usr/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/ja +usr/java/lib/locale/ja/LC_MESSAGES +usr/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/ko +usr/java/lib/locale/ko.UTF-8 +usr/java/lib/locale/ko.UTF-8/LC_MESSAGES +usr/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/ko/LC_MESSAGES +usr/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/sv +usr/java/lib/locale/sv/LC_MESSAGES +usr/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/zh +usr/java/lib/locale/zh.GBK +usr/java/lib/locale/zh.GBK/LC_MESSAGES +usr/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/zh/LC_MESSAGES +usr/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/zh_HK.BIG5HK +usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES +usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/zh_TW +usr/java/lib/locale/zh_TW.BIG5 +usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES +usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/locale/zh_TW/LC_MESSAGES +usr/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo +usr/java/lib/logging.properties +usr/java/lib/management +usr/java/lib/management/jmxremote.access +usr/java/lib/management/jmxremote.password.template +usr/java/lib/management/management.properties +usr/java/lib/management/snmp.acl.template +usr/java/lib/net.properties +usr/java/lib/oblique-fonts +usr/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf +usr/java/lib/oblique-fonts/LucidaSansOblique.ttf +usr/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf +usr/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf +usr/java/lib/oblique-fonts/fonts.dir +usr/java/lib/plugin.jar +usr/java/lib/psfont.properties.ja +usr/java/lib/psfontj2d.properties +usr/java/lib/rt.jar +usr/java/lib/security +usr/java/lib/security/US_export_policy.jar +usr/java/lib/security/cacerts +usr/java/lib/security/java.policy +usr/java/lib/security/java.security +usr/java/lib/security/javaws.policy +usr/java/lib/security/local_policy.jar +usr/java/lib/sound.properties +usr/java/lib/zi +usr/java/lib/zi/Africa +usr/java/lib/zi/Africa/Abidjan +usr/java/lib/zi/Africa/Accra +usr/java/lib/zi/Africa/Addis_Ababa +usr/java/lib/zi/Africa/Algiers +usr/java/lib/zi/Africa/Asmera +usr/java/lib/zi/Africa/Bamako +usr/java/lib/zi/Africa/Bangui +usr/java/lib/zi/Africa/Banjul +usr/java/lib/zi/Africa/Bissau +usr/java/lib/zi/Africa/Blantyre +usr/java/lib/zi/Africa/Brazzaville +usr/java/lib/zi/Africa/Bujumbura +usr/java/lib/zi/Africa/Cairo +usr/java/lib/zi/Africa/Casablanca +usr/java/lib/zi/Africa/Ceuta +usr/java/lib/zi/Africa/Conakry +usr/java/lib/zi/Africa/Dakar +usr/java/lib/zi/Africa/Dar_es_Salaam +usr/java/lib/zi/Africa/Djibouti +usr/java/lib/zi/Africa/Douala +usr/java/lib/zi/Africa/El_Aaiun +usr/java/lib/zi/Africa/Freetown +usr/java/lib/zi/Africa/Gaborone +usr/java/lib/zi/Africa/Harare +usr/java/lib/zi/Africa/Johannesburg +usr/java/lib/zi/Africa/Kampala +usr/java/lib/zi/Africa/Khartoum +usr/java/lib/zi/Africa/Kigali +usr/java/lib/zi/Africa/Kinshasa +usr/java/lib/zi/Africa/Lagos +usr/java/lib/zi/Africa/Libreville +usr/java/lib/zi/Africa/Lome +usr/java/lib/zi/Africa/Luanda +usr/java/lib/zi/Africa/Lubumbashi +usr/java/lib/zi/Africa/Lusaka +usr/java/lib/zi/Africa/Malabo +usr/java/lib/zi/Africa/Maputo +usr/java/lib/zi/Africa/Maseru +usr/java/lib/zi/Africa/Mbabane +usr/java/lib/zi/Africa/Mogadishu +usr/java/lib/zi/Africa/Monrovia +usr/java/lib/zi/Africa/Nairobi +usr/java/lib/zi/Africa/Ndjamena +usr/java/lib/zi/Africa/Niamey +usr/java/lib/zi/Africa/Nouakchott +usr/java/lib/zi/Africa/Ouagadougou +usr/java/lib/zi/Africa/Porto-Novo +usr/java/lib/zi/Africa/Sao_Tome +usr/java/lib/zi/Africa/Tripoli +usr/java/lib/zi/Africa/Tunis +usr/java/lib/zi/Africa/Windhoek +usr/java/lib/zi/America +usr/java/lib/zi/America/Adak +usr/java/lib/zi/America/Anchorage +usr/java/lib/zi/America/Anguilla +usr/java/lib/zi/America/Antigua +usr/java/lib/zi/America/Araguaina +usr/java/lib/zi/America/Argentina +usr/java/lib/zi/America/Argentina/Buenos_Aires +usr/java/lib/zi/America/Argentina/Catamarca +usr/java/lib/zi/America/Argentina/Cordoba +usr/java/lib/zi/America/Argentina/Jujuy +usr/java/lib/zi/America/Argentina/La_Rioja +usr/java/lib/zi/America/Argentina/Mendoza +usr/java/lib/zi/America/Argentina/Rio_Gallegos +usr/java/lib/zi/America/Argentina/San_Juan +usr/java/lib/zi/America/Argentina/Tucuman +usr/java/lib/zi/America/Argentina/Ushuaia +usr/java/lib/zi/America/Aruba +usr/java/lib/zi/America/Asuncion +usr/java/lib/zi/America/Bahia +usr/java/lib/zi/America/Barbados +usr/java/lib/zi/America/Belem +usr/java/lib/zi/America/Belize +usr/java/lib/zi/America/Boa_Vista +usr/java/lib/zi/America/Bogota +usr/java/lib/zi/America/Boise +usr/java/lib/zi/America/Cambridge_Bay +usr/java/lib/zi/America/Campo_Grande +usr/java/lib/zi/America/Cancun +usr/java/lib/zi/America/Caracas +usr/java/lib/zi/America/Cayenne +usr/java/lib/zi/America/Cayman +usr/java/lib/zi/America/Chicago +usr/java/lib/zi/America/Chihuahua +usr/java/lib/zi/America/Coral_Harbour +usr/java/lib/zi/America/Costa_Rica +usr/java/lib/zi/America/Cuiaba +usr/java/lib/zi/America/Curacao +usr/java/lib/zi/America/Danmarkshavn +usr/java/lib/zi/America/Dawson +usr/java/lib/zi/America/Dawson_Creek +usr/java/lib/zi/America/Denver +usr/java/lib/zi/America/Detroit +usr/java/lib/zi/America/Dominica +usr/java/lib/zi/America/Edmonton +usr/java/lib/zi/America/Eirunepe +usr/java/lib/zi/America/El_Salvador +usr/java/lib/zi/America/Fortaleza +usr/java/lib/zi/America/Glace_Bay +usr/java/lib/zi/America/Godthab +usr/java/lib/zi/America/Goose_Bay +usr/java/lib/zi/America/Grand_Turk +usr/java/lib/zi/America/Grenada +usr/java/lib/zi/America/Guadeloupe +usr/java/lib/zi/America/Guatemala +usr/java/lib/zi/America/Guayaquil +usr/java/lib/zi/America/Guyana +usr/java/lib/zi/America/Halifax +usr/java/lib/zi/America/Havana +usr/java/lib/zi/America/Hermosillo +usr/java/lib/zi/America/Indiana +usr/java/lib/zi/America/Indiana/Indianapolis +usr/java/lib/zi/America/Indiana/Knox +usr/java/lib/zi/America/Indiana/Marengo +usr/java/lib/zi/America/Indiana/Vevay +usr/java/lib/zi/America/Inuvik +usr/java/lib/zi/America/Iqaluit +usr/java/lib/zi/America/Jamaica +usr/java/lib/zi/America/Juneau +usr/java/lib/zi/America/Kentucky +usr/java/lib/zi/America/Kentucky/Louisville +usr/java/lib/zi/America/Kentucky/Monticello +usr/java/lib/zi/America/La_Paz +usr/java/lib/zi/America/Lima +usr/java/lib/zi/America/Los_Angeles +usr/java/lib/zi/America/Maceio +usr/java/lib/zi/America/Managua +usr/java/lib/zi/America/Manaus +usr/java/lib/zi/America/Martinique +usr/java/lib/zi/America/Mazatlan +usr/java/lib/zi/America/Menominee +usr/java/lib/zi/America/Merida +usr/java/lib/zi/America/Mexico_City +usr/java/lib/zi/America/Miquelon +usr/java/lib/zi/America/Monterrey +usr/java/lib/zi/America/Montevideo +usr/java/lib/zi/America/Montreal +usr/java/lib/zi/America/Montserrat +usr/java/lib/zi/America/Nassau +usr/java/lib/zi/America/New_York +usr/java/lib/zi/America/Nipigon +usr/java/lib/zi/America/Nome +usr/java/lib/zi/America/Noronha +usr/java/lib/zi/America/North_Dakota +usr/java/lib/zi/America/North_Dakota/Center +usr/java/lib/zi/America/Panama +usr/java/lib/zi/America/Pangnirtung +usr/java/lib/zi/America/Paramaribo +usr/java/lib/zi/America/Phoenix +usr/java/lib/zi/America/Port-au-Prince +usr/java/lib/zi/America/Port_of_Spain +usr/java/lib/zi/America/Porto_Velho +usr/java/lib/zi/America/Puerto_Rico +usr/java/lib/zi/America/Rainy_River +usr/java/lib/zi/America/Rankin_Inlet +usr/java/lib/zi/America/Recife +usr/java/lib/zi/America/Regina +usr/java/lib/zi/America/Rio_Branco +usr/java/lib/zi/America/Santiago +usr/java/lib/zi/America/Santo_Domingo +usr/java/lib/zi/America/Sao_Paulo +usr/java/lib/zi/America/Scoresbysund +usr/java/lib/zi/America/St_Johns +usr/java/lib/zi/America/St_Kitts +usr/java/lib/zi/America/St_Lucia +usr/java/lib/zi/America/St_Thomas +usr/java/lib/zi/America/St_Vincent +usr/java/lib/zi/America/Swift_Current +usr/java/lib/zi/America/Tegucigalpa +usr/java/lib/zi/America/Thule +usr/java/lib/zi/America/Thunder_Bay +usr/java/lib/zi/America/Tijuana +usr/java/lib/zi/America/Toronto +usr/java/lib/zi/America/Tortola +usr/java/lib/zi/America/Vancouver +usr/java/lib/zi/America/Whitehorse +usr/java/lib/zi/America/Winnipeg +usr/java/lib/zi/America/Yakutat +usr/java/lib/zi/America/Yellowknife +usr/java/lib/zi/Antarctica +usr/java/lib/zi/Antarctica/Casey +usr/java/lib/zi/Antarctica/Davis +usr/java/lib/zi/Antarctica/DumontDUrville +usr/java/lib/zi/Antarctica/Mawson +usr/java/lib/zi/Antarctica/McMurdo +usr/java/lib/zi/Antarctica/Palmer +usr/java/lib/zi/Antarctica/Rothera +usr/java/lib/zi/Antarctica/Syowa +usr/java/lib/zi/Antarctica/Vostok +usr/java/lib/zi/Asia +usr/java/lib/zi/Asia/Aden +usr/java/lib/zi/Asia/Almaty +usr/java/lib/zi/Asia/Amman +usr/java/lib/zi/Asia/Anadyr +usr/java/lib/zi/Asia/Aqtau +usr/java/lib/zi/Asia/Aqtobe +usr/java/lib/zi/Asia/Ashgabat +usr/java/lib/zi/Asia/Baghdad +usr/java/lib/zi/Asia/Bahrain +usr/java/lib/zi/Asia/Baku +usr/java/lib/zi/Asia/Bangkok +usr/java/lib/zi/Asia/Beirut +usr/java/lib/zi/Asia/Bishkek +usr/java/lib/zi/Asia/Brunei +usr/java/lib/zi/Asia/Calcutta +usr/java/lib/zi/Asia/Choibalsan +usr/java/lib/zi/Asia/Chongqing +usr/java/lib/zi/Asia/Colombo +usr/java/lib/zi/Asia/Damascus +usr/java/lib/zi/Asia/Dhaka +usr/java/lib/zi/Asia/Dili +usr/java/lib/zi/Asia/Dubai +usr/java/lib/zi/Asia/Dushanbe +usr/java/lib/zi/Asia/Gaza +usr/java/lib/zi/Asia/Harbin +usr/java/lib/zi/Asia/Hong_Kong +usr/java/lib/zi/Asia/Hovd +usr/java/lib/zi/Asia/Irkutsk +usr/java/lib/zi/Asia/Jakarta +usr/java/lib/zi/Asia/Jayapura +usr/java/lib/zi/Asia/Jerusalem +usr/java/lib/zi/Asia/Kabul +usr/java/lib/zi/Asia/Kamchatka +usr/java/lib/zi/Asia/Karachi +usr/java/lib/zi/Asia/Kashgar +usr/java/lib/zi/Asia/Katmandu +usr/java/lib/zi/Asia/Krasnoyarsk +usr/java/lib/zi/Asia/Kuala_Lumpur +usr/java/lib/zi/Asia/Kuching +usr/java/lib/zi/Asia/Kuwait +usr/java/lib/zi/Asia/Macau +usr/java/lib/zi/Asia/Magadan +usr/java/lib/zi/Asia/Makassar +usr/java/lib/zi/Asia/Manila +usr/java/lib/zi/Asia/Muscat +usr/java/lib/zi/Asia/Nicosia +usr/java/lib/zi/Asia/Novosibirsk +usr/java/lib/zi/Asia/Omsk +usr/java/lib/zi/Asia/Oral +usr/java/lib/zi/Asia/Phnom_Penh +usr/java/lib/zi/Asia/Pontianak +usr/java/lib/zi/Asia/Pyongyang +usr/java/lib/zi/Asia/Qatar +usr/java/lib/zi/Asia/Qyzylorda +usr/java/lib/zi/Asia/Rangoon +usr/java/lib/zi/Asia/Riyadh +usr/java/lib/zi/Asia/Riyadh87 +usr/java/lib/zi/Asia/Riyadh88 +usr/java/lib/zi/Asia/Riyadh89 +usr/java/lib/zi/Asia/Saigon +usr/java/lib/zi/Asia/Sakhalin +usr/java/lib/zi/Asia/Samarkand +usr/java/lib/zi/Asia/Seoul +usr/java/lib/zi/Asia/Shanghai +usr/java/lib/zi/Asia/Singapore +usr/java/lib/zi/Asia/Taipei +usr/java/lib/zi/Asia/Tashkent +usr/java/lib/zi/Asia/Tbilisi +usr/java/lib/zi/Asia/Tehran +usr/java/lib/zi/Asia/Thimphu +usr/java/lib/zi/Asia/Tokyo +usr/java/lib/zi/Asia/Ulaanbaatar +usr/java/lib/zi/Asia/Urumqi +usr/java/lib/zi/Asia/Vientiane +usr/java/lib/zi/Asia/Vladivostok +usr/java/lib/zi/Asia/Yakutsk +usr/java/lib/zi/Asia/Yekaterinburg +usr/java/lib/zi/Asia/Yerevan +usr/java/lib/zi/Atlantic +usr/java/lib/zi/Atlantic/Azores +usr/java/lib/zi/Atlantic/Bermuda +usr/java/lib/zi/Atlantic/Canary +usr/java/lib/zi/Atlantic/Cape_Verde +usr/java/lib/zi/Atlantic/Faeroe +usr/java/lib/zi/Atlantic/Madeira +usr/java/lib/zi/Atlantic/Reykjavik +usr/java/lib/zi/Atlantic/South_Georgia +usr/java/lib/zi/Atlantic/St_Helena +usr/java/lib/zi/Atlantic/Stanley +usr/java/lib/zi/Australia +usr/java/lib/zi/Australia/Adelaide +usr/java/lib/zi/Australia/Brisbane +usr/java/lib/zi/Australia/Broken_Hill +usr/java/lib/zi/Australia/Currie +usr/java/lib/zi/Australia/Darwin +usr/java/lib/zi/Australia/Hobart +usr/java/lib/zi/Australia/Lindeman +usr/java/lib/zi/Australia/Lord_Howe +usr/java/lib/zi/Australia/Melbourne +usr/java/lib/zi/Australia/Perth +usr/java/lib/zi/Australia/Sydney +usr/java/lib/zi/CET +usr/java/lib/zi/EET +usr/java/lib/zi/Etc +##usr/java/lib/zi/Etc/GMT +##usr/java/lib/zi/Etc/GMT1 +##usr/java/lib/zi/Etc/GMT10 +##usr/java/lib/zi/Etc/GMT11 +##usr/java/lib/zi/Etc/GMT12 +##usr/java/lib/zi/Etc/GMT2 +##usr/java/lib/zi/Etc/GMT3 +##usr/java/lib/zi/Etc/GMT4 +##usr/java/lib/zi/Etc/GMT5 +##usr/java/lib/zi/Etc/GMT6 +##usr/java/lib/zi/Etc/GMT7 +##usr/java/lib/zi/Etc/GMT8 +##usr/java/lib/zi/Etc/GMT9 +##usr/java/lib/zi/Etc/GMT-1 +##usr/java/lib/zi/Etc/GMT-10 +##usr/java/lib/zi/Etc/GMT-11 +##usr/java/lib/zi/Etc/GMT-12 +##usr/java/lib/zi/Etc/GMT-13 +##usr/java/lib/zi/Etc/GMT-14 +##usr/java/lib/zi/Etc/GMT-2 +##usr/java/lib/zi/Etc/GMT-3 +##usr/java/lib/zi/Etc/GMT-4 +##usr/java/lib/zi/Etc/GMT-5 +##usr/java/lib/zi/Etc/GMT-6 +##usr/java/lib/zi/Etc/GMT-7 +##usr/java/lib/zi/Etc/GMT-8 +##usr/java/lib/zi/Etc/GMT-9 +##usr/java/lib/zi/Etc/UCT +##usr/java/lib/zi/Etc/UTC +usr/java/lib/zi/Europe +usr/java/lib/zi/Europe/Amsterdam +usr/java/lib/zi/Europe/Andorra +usr/java/lib/zi/Europe/Athens +usr/java/lib/zi/Europe/Belgrade +usr/java/lib/zi/Europe/Berlin +usr/java/lib/zi/Europe/Brussels +usr/java/lib/zi/Europe/Bucharest +usr/java/lib/zi/Europe/Budapest +usr/java/lib/zi/Europe/Chisinau +usr/java/lib/zi/Europe/Copenhagen +usr/java/lib/zi/Europe/Dublin +usr/java/lib/zi/Europe/Gibraltar +usr/java/lib/zi/Europe/Helsinki +usr/java/lib/zi/Europe/Istanbul +usr/java/lib/zi/Europe/Kaliningrad +usr/java/lib/zi/Europe/Kiev +usr/java/lib/zi/Europe/Lisbon +usr/java/lib/zi/Europe/London +usr/java/lib/zi/Europe/Luxembourg +usr/java/lib/zi/Europe/Madrid +usr/java/lib/zi/Europe/Malta +usr/java/lib/zi/Europe/Minsk +usr/java/lib/zi/Europe/Monaco +usr/java/lib/zi/Europe/Moscow +usr/java/lib/zi/Europe/Oslo +usr/java/lib/zi/Europe/Paris +usr/java/lib/zi/Europe/Prague +usr/java/lib/zi/Europe/Riga +usr/java/lib/zi/Europe/Rome +usr/java/lib/zi/Europe/Samara +usr/java/lib/zi/Europe/Simferopol +usr/java/lib/zi/Europe/Sofia +usr/java/lib/zi/Europe/Stockholm +usr/java/lib/zi/Europe/Tallinn +usr/java/lib/zi/Europe/Tirane +usr/java/lib/zi/Europe/Uzhgorod +usr/java/lib/zi/Europe/Vaduz +usr/java/lib/zi/Europe/Vienna +usr/java/lib/zi/Europe/Vilnius +usr/java/lib/zi/Europe/Warsaw +usr/java/lib/zi/Europe/Zaporozhye +usr/java/lib/zi/Europe/Zurich +usr/java/lib/zi/GMT +usr/java/lib/zi/Indian +usr/java/lib/zi/Indian/Antananarivo +usr/java/lib/zi/Indian/Chagos +usr/java/lib/zi/Indian/Christmas +usr/java/lib/zi/Indian/Cocos +usr/java/lib/zi/Indian/Comoro +usr/java/lib/zi/Indian/Kerguelen +usr/java/lib/zi/Indian/Mahe +usr/java/lib/zi/Indian/Maldives +usr/java/lib/zi/Indian/Mauritius +usr/java/lib/zi/Indian/Mayotte +usr/java/lib/zi/Indian/Reunion +usr/java/lib/zi/MET +usr/java/lib/zi/Pacific +usr/java/lib/zi/Pacific/Apia +usr/java/lib/zi/Pacific/Auckland +usr/java/lib/zi/Pacific/Chatham +usr/java/lib/zi/Pacific/Easter +usr/java/lib/zi/Pacific/Efate +usr/java/lib/zi/Pacific/Enderbury +usr/java/lib/zi/Pacific/Fakaofo +usr/java/lib/zi/Pacific/Fiji +usr/java/lib/zi/Pacific/Funafuti +usr/java/lib/zi/Pacific/Galapagos +usr/java/lib/zi/Pacific/Gambier +usr/java/lib/zi/Pacific/Guadalcanal +usr/java/lib/zi/Pacific/Guam +usr/java/lib/zi/Pacific/Honolulu +usr/java/lib/zi/Pacific/Johnston +usr/java/lib/zi/Pacific/Kiritimati +usr/java/lib/zi/Pacific/Kosrae +usr/java/lib/zi/Pacific/Kwajalein +usr/java/lib/zi/Pacific/Majuro +usr/java/lib/zi/Pacific/Marquesas +usr/java/lib/zi/Pacific/Midway +usr/java/lib/zi/Pacific/Nauru +usr/java/lib/zi/Pacific/Niue +usr/java/lib/zi/Pacific/Norfolk +usr/java/lib/zi/Pacific/Noumea +usr/java/lib/zi/Pacific/Pago_Pago +usr/java/lib/zi/Pacific/Palau +usr/java/lib/zi/Pacific/Pitcairn +usr/java/lib/zi/Pacific/Ponape +usr/java/lib/zi/Pacific/Port_Moresby +usr/java/lib/zi/Pacific/Rarotonga +usr/java/lib/zi/Pacific/Saipan +usr/java/lib/zi/Pacific/Tahiti +usr/java/lib/zi/Pacific/Tarawa +usr/java/lib/zi/Pacific/Tongatapu +usr/java/lib/zi/Pacific/Truk +usr/java/lib/zi/Pacific/Wake +usr/java/lib/zi/Pacific/Wallis +usr/java/lib/zi/WET +usr/java/lib/zi/ZoneInfoMappings +#usr/java/licenses +#usr/java/licenses/CHANGES +#usr/java/licenses/COPYRIGHT +#usr/java/licenses/LICENSE +#usr/java/licenses/README +#usr/java/licenses/THIRDPARTYLICENSEREADME.txt +#usr/java/licenses/Welcome.html +#usr/java/man +#usr/java/man/ja +#usr/java/man/ja_JP.eucJP +#usr/java/man/ja_JP.eucJP/man1 +#usr/java/man/ja_JP.eucJP/man1/java.1 +#usr/java/man/ja_JP.eucJP/man1/javaws.1 +#usr/java/man/ja_JP.eucJP/man1/keytool.1 +#usr/java/man/ja_JP.eucJP/man1/kinit.1 +#usr/java/man/ja_JP.eucJP/man1/klist.1 +#usr/java/man/ja_JP.eucJP/man1/ktab.1 +#usr/java/man/ja_JP.eucJP/man1/orbd.1 +#usr/java/man/ja_JP.eucJP/man1/pack200.1 +#usr/java/man/ja_JP.eucJP/man1/policytool.1 +#usr/java/man/ja_JP.eucJP/man1/rmid.1 +#usr/java/man/ja_JP.eucJP/man1/rmiregistry.1 +#usr/java/man/ja_JP.eucJP/man1/servertool.1 +#usr/java/man/ja_JP.eucJP/man1/tnameserv.1 +#usr/java/man/ja_JP.eucJP/man1/unpack200.1 +#usr/java/man/man1 +#usr/java/man/man1/java.1 +#usr/java/man/man1/javaws.1 +#usr/java/man/man1/keytool.1 +#usr/java/man/man1/kinit.1 +#usr/java/man/man1/klist.1 +#usr/java/man/man1/ktab.1 +#usr/java/man/man1/orbd.1 +#usr/java/man/man1/pack200.1 +#usr/java/man/man1/policytool.1 +#usr/java/man/man1/rmid.1 +#usr/java/man/man1/rmiregistry.1 +#usr/java/man/man1/servertool.1 +#usr/java/man/man1/tnameserv.1 +#usr/java/man/man1/unpack200.1 +#usr/java/plugin +#usr/java/plugin/desktop +#usr/java/plugin/desktop/sun_java.desktop +#usr/java/plugin/desktop/sun_java.png +#usr/java/plugin/i386 +#usr/java/plugin/i386/ns7 +#usr/java/plugin/i386/ns7-gcc29 +#usr/java/plugin/i386/ns7-gcc29/libjavaplugin_oji.so +#usr/java/plugin/i386/ns7/libjavaplugin_oji.so +usr/java/version diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 6b931ba8e6..74d37460a7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -217,7 +217,6 @@ * rrdtool-1.2.15 * rsync-2.6.8 * rtorrent-0.7.4 -* samba-3.0.25a * samba-3.0.25b * screen-4.0.2 * sed-4.1.5 diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index b26fb1c060..f9144a316a 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -29,8 +29,8 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; -$pakfiresettings{'AUTOUPDATE'} = ''; -$pakfiresettings{'UUID'} = ''; +$pakfiresettings{'AUTOUPDATE'} = 'off'; +$pakfiresettings{'UUID'} = 'on'; &Header::getcgihash(\%pakfiresettings); diff --git a/lfs/Config b/lfs/Config index 2100303f24..fd34ebf91c 100644 --- a/lfs/Config +++ b/lfs/Config @@ -15,7 +15,6 @@ # URL_IPFIRE = http://source.ipfire.org/othersrc URL_TOOLCHAIN = http://source.ipfire.org/toolchain -URL_IPCOP = http://ipcop.ath.cx # Default compiler optimizations. # @@ -159,10 +158,10 @@ define PAK # Bringing the files to their right place. @rm -rf /install/packages/package @mkdir -p /install/packages/package - @cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \ + cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \ /install/packages/package -grep -v "#" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES - @chmod 755 /install/packages/package/{,un}install.sh + chmod 755 /install/packages/package/{{,un}install,update}.sh cd / && tar cvf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*' cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files rm -rf /install/packages/package diff --git a/lfs/applejuice b/lfs/applejuice index 4ff12d642d..c03ef39e07 100644 --- a/lfs/applejuice +++ b/lfs/applejuice @@ -36,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = applejuice PAK_VER = 1 +DESCDE = "Applejuice ist ein (deutsches) P2P-Netzwerk." +DESCEN = "Applejuice is a german p2p-network." +DEPS = "java" + ############################################################################### # Top-level Rules ############################################################################### @@ -79,10 +83,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice + ln -svf ../../opt/applejuice/libajnetmask.so /usr/lib mkdir -p /srv/web/phpaj cd $(DIR_APP) && cp -rfv phpaj /srv/web/phpaj -mkdir /var/ipfire/applejuice echo "RAMSIZE=64" > /var/ipfire/applejuice/settings chown nobody.nobody /var/ipfire/applejuice -R @rm -rf $(DIR_APP) - @$(POSTBUILD) \ No newline at end of file + @$(POSTBUILD) diff --git a/lfs/java b/lfs/java index b0b00b7909..f066c4c204 100644 --- a/lfs/java +++ b/lfs/java @@ -34,7 +34,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = java -PAK_VER = ipfire-beta1 +PAK_VER = 1 + +DESCDE = "" +DESCEN = "" +DEPS = "" ############################################################################### # Top-level Rules @@ -80,4 +84,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar zxf $(DIR_DL)/$(DL_FILE) -C /usr ln -s /usr/java/bin/java /usr/bin/java @rm -rf $(DIR_APP) - @$(POSTBUILD) \ No newline at end of file + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d88d36b3e6..7a5f5c8424 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2006 IPFire-Team . # +# Copyright (C) 2007 IPFire-Team . # # # ############################################################################ # @@ -635,14 +635,14 @@ buildpackages() { ipfirepackages() { ipfiredist alsa # ipfiredist amavisd -# ipfiredist applejuice + ipfiredist applejuice # ipfiredist asterisk ipfiredist clamav ipfiredist cups ipfiredist cyrus-sasl # ipfiredist fetchmail # ipfiredist gnump3d -# ipfiredist java + ipfiredist java ipfiredist libogg ipfiredist libvorbis # ipfiredist mailx diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index e020fdbb6e..3e935e4878 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -7,7 +7,7 @@ PROGS = iowrap SUID_PROGS = setdmzholes setportfw setfilters setxtaccess \ squidctrl restartssh ipfirereboot setaliases \ ipsecctrl timectrl dhcpctrl snortctrl \ - restartapplejuice rebuildhosts \ + applejuicectrl rebuildhosts \ restartsyslogd logwatch openvpnctrl outgoingfwctrl \ restartwireless getipstat qosctrl launch-ether-wake \ redctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ @@ -91,8 +91,8 @@ setfilters: setfilters.c setuid.o ../install+setup/libsmooth/varval.o rebuildhosts: rebuildhosts.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ rebuildhosts.c setuid.o ../install+setup/libsmooth/varval.o -o $@ -restartapplejuice: restartapplejuice.c setuid.o ../install+setup/libsmooth/varval.o - $(COMPILE) -I../install+setup/libsmooth/ restartapplejuice.c setuid.o ../install+setup/libsmooth/varval.o -o $@ +applejuicectrl: applejuicectrl.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ applejuicectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ dhcpctrl: dhcpctrl.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ dhcpctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ diff --git a/src/misc-progs/applejuicectrl.c b/src/misc-progs/applejuicectrl.c new file mode 100644 index 0000000000..9d63e51f23 --- /dev/null +++ b/src/misc-progs/applejuicectrl.c @@ -0,0 +1,44 @@ +/* This file is part of the IPFire Firewall. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + */ + +#include +#include +#include +#include +#include +#include +#include "setuid.h" + +int main(int argc, char *argv[]) { + + if (!(initsetuid())) + exit(1); + + if (argc < 2) { + fprintf(stderr, "\nNo argument given.\n\napplejuicectrl (start|stop|restart)\n\n"); + exit(1); + } + + if (strcmp(argv[1], "start") == 0) { + safe_system("/etc/rc.d/init.d/applejuice start"); + } else if (strcmp(argv[1], "stop") == 0) { + safe_system("/etc/rc.d/init.d/applejuice stop"); + } else if (strcmp(argv[1], "restart") == 0) { + safe_system("/etc/rc.d/init.d/applejuice restart"); + } else if (strcmp(argv[1], "enable") == 0) { + safe_system("ln -fs ../init.d/applejuice /etc/rc.d/rc3.d/S99applejuice >/dev/null 2>&1"); + safe_system("ln -fs ../init.d/applejuice /etc/rc.d/rc0.d/K00applejuice >/dev/null 2>&1"); + safe_system("ln -fs ../init.d/applejuice /etc/rc.d/rc6.d/K00applejuice >/dev/null 2>&1"); + } else if (strcmp(argv[1], "disable") == 0) { + safe_system("rm -f /etc/rc.d/rc*.d/*applejuice >/dev/null 2>&1"); + } else { + fprintf(stderr, "\nBad argument given.\n\napplejuicectrl (start|stop|restart)\n\n"); + exit(1); + } + + return 0; +} diff --git a/src/misc-progs/restartapplejuice.c b/src/misc-progs/restartapplejuice.c deleted file mode 100644 index c1a9850780..0000000000 --- a/src/misc-progs/restartapplejuice.c +++ /dev/null @@ -1,26 +0,0 @@ -/* IFire helper program - restartapplejuice - * - * Starts or stops the applejuice core - * - */ - -#include -#include -#include -#include -#include -#include -#include "setuid.h" - - -int main(void) -{ - if (!(initsetuid())) - exit(1); - - safe_system("/etc/init.d/applejuice stop"); - sleep(3); - safe_system("/etc/init.d/applejuice start"); - - return 0; -} diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index e453768dba..8492e0d76f 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -28,8 +28,9 @@ sub logger { sub usage { &Pakfire::message("Usage: pakfire "); &Pakfire::message(" - Contacts the servers for new lists of paks."); - &Pakfire::message(" - Installs the latest version of a pak."); + &Pakfire::message(" - Installs the latest version of all paks."); &Pakfire::message(" - Outputs a short list with all available paks."); + &Pakfire::message(""); exit 1; } @@ -80,12 +81,11 @@ sub fetchfile { my %proxysettings=(); &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings); - if ($_=$proxysettings{'UPSTREAM_PROXY'}) { - my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); + if ($proxysettings{'UPSTREAM_PROXY'}) { if ($proxysettings{'UPSTREAM_USER'}) { - $ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$peer:$peerport/"); + $ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"); } else { - $ua->proxy("http","http://$peer:$peerport/"); + $ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/"); } } @@ -208,6 +208,7 @@ sub dblist { my $filter = shift; my $forweb = shift; my @meta; + my @updatepaks; my $file; my $line; my $prog; @@ -247,6 +248,7 @@ sub dblist { foreach $prog (@db) { @templine = split(/\;/,$prog); if (("$name" eq "$templine[0]") && ("$release" < "$templine[2]" )) { + push(@updatepaks,$name); if ("$forweb" eq "forweb") { print "\n"; } else { @@ -255,6 +257,7 @@ sub dblist { } } } + return @updatepaks; } else { my $line; my @templine; @@ -389,8 +392,8 @@ sub decryptpak { my $file = getpak("$pak", "noforce"); - my $return = system("cd $Conf::tmpdir/ && gpg -d < $Conf::cachedir/$file | cpio -i >/dev/null 2>&1"); - + my $return = system("cd $Conf::tmpdir/ && gpg -d < $Conf::cachedir/$file | tar x >/dev/null 2>&1"); + $return %= 255; logger("Decryption process returned the following: $return"); if ($return != 0) { exit 1; } } @@ -438,7 +441,7 @@ sub setuppak { decryptpak("$pak"); - my $return = system("cd $Conf::tmpdir && ./install.sh >> $Conf::logdir/install-$pak.log 2>&1"); + my $return = system("cd $Conf::tmpdir && NAME=$pak ./install.sh >> $Conf::logdir/install-$pak.log 2>&1"); $return %= 255; if ($return == 0) { move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak"); @@ -452,18 +455,20 @@ sub setuppak { return $return; } -sub updatepak { +sub upgradepak { my $pak = shift; - message("We are going to update: $pak"); + message("We are going to upgrade: $pak"); decryptpak("$pak"); - my $return = system("cd $Conf::tmpdir && ./update.sh >> $Conf::logdir/update-$pak.log 2>&1"); + my $return = system("cd $Conf::tmpdir && NAME=$pak ./update.sh >> $Conf::logdir/update-$pak.log 2>&1"); + $return %= 255; if ($return == 0) { move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak"); cleanup("tmp"); - message("Update completed. Congratulations!"); + copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/"); + message("Upgrade completed. Congratulations!"); } else { message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem."); exit $return; @@ -478,7 +483,8 @@ sub removepak { decryptpak("$pak"); - my $return = system("cd $Conf::tmpdir && ./uninstall.sh >> $Conf::logdir/uninstall-$pak.log 2>&1"); + my $return = system("cd $Conf::tmpdir && NAME=$pak ./uninstall.sh >> $Conf::logdir/uninstall-$pak.log 2>&1"); + $return %= 255; if ($return == 0) { open(FILE, "<$Conf::dbdir/rootfiles/$pak"); my @file = ; @@ -530,7 +536,7 @@ sub makeuuid { } sub senduuid { - if ($pakfiresettings{'UUID'} eq "on") { + if ($pakfiresettings{'UUID'} ne "off") { unless("$Conf::uuid") { $Conf::uuid = `cat $Conf::dbdir/uuid`; } diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index cdf0b619c3..008382ce7e 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -30,27 +30,42 @@ if ("$ARGV[0]" eq "install") { &Pakfire::lock("on"); shift; + + ### Make sure that the list is not outdated. + &Pakfire::dbgetlist("noforce"); + + open(FILE, "<$Conf::dbdir/lists/packages_list.db"); + my @db = ; + close(FILE); + + my $dep; my @deps; + my $pak; my @paks; my @temp; + my @templine; + my $found = 0; my @all; - foreach (@ARGV) { - unless ("$_" =~ "^-") { - push(@paks,$_) if $_; + foreach $pak (@ARGV) { + unless ("$pak" =~ "^-") { + $found = 0; + foreach (@db) { + @templine = split(/;/,$_); + if ("$templine[0]" eq "$pak" ) { + push(@paks,$pak); + push(@all,$pak); + @temp = &Pakfire::resolvedeps("$pak"); + foreach $dep (@temp) { + push(@deps,$dep) if $dep; + push(@all,$dep) if $dep; + } + $found = 1; + break; + } + } + &Pakfire::message("\nThe pak \"$pak\" is not known. Please try running \"pakfire update\".") if ($found == 0); } } - - foreach (@paks) { - @temp = &Pakfire::resolvedeps("$_"); - foreach (@temp) { push(@deps,$_) if $_; } - } - - foreach (@paks) { - push(@all,$_) if $_; - } - foreach (@deps) { - push(@all,$_) if $_; - } &Pakfire::message("\n\n### Packages to install:"); foreach (sort @paks) { @@ -108,7 +123,38 @@ } elsif ("$ARGV[0]" eq "upgrade") { - &Pakfire::dblist("upgrade", "noweb"); + my @upgradepaks = &Pakfire::dblist("upgrade", "noweb"); + my @temp; + + foreach (@upgradepaks) { + @temp = &Pakfire::resolvedeps("$_"); + foreach (@temp) { push(@upgradepaks,$_) if $_; } + } + + if (@upgradepaks) { + &Pakfire::message(""); + &Pakfire::message("We are going to install all packages listed above."); + if ($interactive) { + &Pakfire::message("Is this okay? [y/N]"); + my $ret = ; + chomp($ret); + &Pakfire::logger("Answer: $ret"); + if ( $ret ne "y" ) { + &Pakfire::message("Installation aborted."); + exit 1; + } + } + } + + ### Download first + foreach (sort @upgradepaks) { + &Pakfire::message("# --> Downloading: $_"); + &Pakfire::getpak("$_", ""); + } + + foreach (sort @upgradepaks) { + &Pakfire::upgradepak("$_"); + } } elsif ("$ARGV[0]" eq "list") { &Pakfire::dblist("all", "noweb"); @@ -122,3 +168,5 @@ } else { &Pakfire::usage; } + +exit 0; diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh new file mode 100644 index 0000000000..a47a7831dc --- /dev/null +++ b/src/paks/applejuice/install.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files diff --git a/src/paks/applejuice/uninstall.sh b/src/paks/applejuice/uninstall.sh new file mode 100644 index 0000000000..05a7907cf5 --- /dev/null +++ b/src/paks/applejuice/uninstall.sh @@ -0,0 +1,2 @@ +#!/bin/bash + diff --git a/src/paks/applejuice/update.sh b/src/paks/applejuice/update.sh new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/clamav/uninstall.sh b/src/paks/clamav/uninstall.sh index 910f089273..b52f51f910 100644 --- a/src/paks/clamav/uninstall.sh +++ b/src/paks/clamav/uninstall.sh @@ -1,3 +1,3 @@ #!/bin/bash -clamavctrl disable +/usr/local/bin/clamavctrl disable diff --git a/src/paks/java/install.sh b/src/paks/java/install.sh new file mode 100644 index 0000000000..a47a7831dc --- /dev/null +++ b/src/paks/java/install.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files diff --git a/src/paks/java/uninstall.sh b/src/paks/java/uninstall.sh new file mode 100644 index 0000000000..05a7907cf5 --- /dev/null +++ b/src/paks/java/uninstall.sh @@ -0,0 +1,2 @@ +#!/bin/bash + diff --git a/src/paks/java/update.sh b/src/paks/java/update.sh new file mode 100644 index 0000000000..e69de29bb2 -- 2.39.2