X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpackages-update;h=1f1f272d3bbe635eb54bfee52fae35fb548d0338;hb=1eb363044c6ee3115e62736aed4403b750082b44;hp=f89e0bef6041d727e3f95f5676508457684cfd91;hpb=aa229d2908422fce286bbd65710e31b086c8a2a2;p=hvlinux.git

diff --git a/stage3/packages-update b/stage3/packages-update
index f89e0be..1f1f272 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -1,6 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage3"
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
@@ -11,33 +10,64 @@ source ../functions
 source ../functions-update
 source ../packages-list
 
-# Execute a return statement instead of exit, to be able to continue with
-# downloading other packages
-export RCMD_NO_EXIT=1
-
 update_packages_init
 
+if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
+    export TEST_INTEGRITY=1
+fi
+
+# These packages were already downloaded for stage1:
+lpkg     1 ${NANO}
+
 # These packages were already downloaded for stage2:
 lpkg     2 ${INETUTILS}
-lpkg     2 ${EMACS}
 
 # These packages are only for stage3
-fpkg_sf    ${PCRE}
+fpkg_gnu   ${WHICH}
+fpkg       ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
+fpkg_sf    ${LIBUSB}
+fpkg_sf    ${LIBUSB_COMPAT} libusb
+fpkg       ${USBUTILS} ${SOURCEFORGE_URL}/project/linux-usb/usbutils
+fpkg       ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs
+fpkg       ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools
+fpkg       ${DHCP} ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
+fpkg       ${POPT} http://rpm5.org/files/popt
+fpkg       ${PAM} http://www.kernel.org/pub/linux/libs/pam/library
+fpkg       ${OPENSSL} ftp://ftp.openssl.org/source
+fpkg       ${OPENSSL_ROOT_CERTS} http://anduin.linuxfromscratch.org/files/BLFS
+fpkg       ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
+fpkg_sf    ${EXPAT}
+fpkg       ${APR}      http://apache.sunsite.ualberta.ca/apr
+fpkg       ${APR_UTIL} http://apache.sunsite.ualberta.ca/apr
+fpkg       ${NEON}     http://www.webdav.org/neon
+fpkg_sf    ${TCL} tcl
+fpkg       ${SQLITE} http://www.sqlite.org
+fpkg       ${SUBVERSION} http://subversion.tigris.org/downloads
+fpkg       ${SUDO} http://www.sudo.ws/sudo/dist
 fpkg_sf    ${STRACE}
+fpkg_sf    ${PCRE}
+
+fpkg_gnu   ${WGET}
+fpkg       ${TCPWRAPPERS} ftp://ftp.porcupine.org/pub/security
+fpkg       ${PORTMAP} http://neil.brown.name/portmap
+fpkg       ${NFS_UTILS} ftp://ftp.kernel.org/pub/linux/utils/nfs
 fpkg_sf    ${DDCLIENT}
 fpkg       ${LIBPCAP} "http://www.tcpdump.org/release"
 fpkg       ${TCPDUMP} "http://www.tcpdump.org/release"
 fpkg       ${NMAP} "http://download.insecure.org/nmap/dist"
-ARCH_EXT=tar.gz fpkg ${BIND} "http://gd.tuwien.ac.at/infosys/servers/isc/bind9/$(get_pkg_ver ${BIND})"
+fpkg -e "tar.gz" -s "$(get_pkg_ver ${BIND})" ${BIND} "http://gd.tuwien.ac.at/infosys/servers/isc/bind9"
 fpkg       ${IPTABLES} "http://www.netfilter.org/projects/iptables/files"
+fpkg       ${CURL} "http://curl.haxx.se/download"
+fpkg       ${RSYNC} "http://samba.org/ftp/rsync/src"
+
 fpkg       ${MYSQL} "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-$(get_pkg_ver_base ${MYSQL})"
-fpkg_mis   ${ZIP} "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')" ${SOURCEFORGE_URL}/infozip
-fpkg_mis   ${UNZIP} "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" ${SOURCEFORGE_URL}/infozip
-fpkg_mis   ${UNRAR} "unrarsrc-$(get_pkg_ver ${UNRAR})" "http://www.rarlab.com/rar"
+
+fpkg -f "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')"     -s "infozip" ${ZIP}   ${SOURCEFORGE_URL}
+fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" ${UNZIP} ${SOURCEFORGE_URL}
+fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" ${UNRAR} "http://www.rarlab.com/rar"
 fpkg_gnu   ${CPIO}
+
 fpkg_gnu   ${PARTED}
-fpkg       ${CURL} "http://curl.haxx.se/download"
-fpkg       ${RSYNC} "http://samba.org/ftp/rsync/src"
 fpkg_gnu   ${ED}
 fpkg_gnu   ${BC}
 fpkg_sf    ${FUSE}
@@ -45,270 +75,43 @@ fpkg       ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"
 fpkg       ${CVS} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS})"
 fpkg       ${GIT}          "http://www.kernel.org/pub/software/scm/git"
 fpkg       ${GIT_MANPAGES} "http://www.kernel.org/pub/software/scm/git"
-fpkg_mis   ${LIBJPEG} "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" "http://www.ijg.org/files"
-fpkg_mis   ${LIBOPENJPEG} "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" "http://www.openjpeg.org"
-fpkg_sf    ${LIBPNG}
-fpkg_gnome ${LIBART}
-fpkg_sf    ${LIBEXIF}
-fpkg       ${FRIBIDI} "http://fribidi.org/download"
-fpkg_sf    ${FREETYPE}
-fpkg       ${FONTCONFIG} "http://fontconfig.org/release"
-
-###fpkg_hv    ${XFREE86}
-
-fpkg       ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
-fpkg_mis   ${TK} "${TK}-src" ${SOURCEFORGE_URL}/tcl
-
-fpkg       ${TIFF} "http://libtiff.maptools.org/dl"
-fpkg_sf    ${GIFLIB}
-fpkg       ${LCMS}    "http://www.littlecms.com"
-fpkg_sf    ${LIBMNG}
-
-fpkg       ${WINDOWMAKER}       "http://windowmaker.info/pub/source/release"
-fpkg       ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
-fpkg_sf    ${LESSTIF}
-
-exit 1
-
-
-
 
+# Perl modules
+fpkg_sf    ${PERL_MOD_PDL} pdl
+fpkg       ${PERL_MOD_XML_WRITER} "http://www.cpan.org/modules/by-module/XML"
+fpkg       ${PERL_MOD_XML_PARSER} "http://www.cpan.org/modules/by-module/XML"
 
+fpkg_gnome ${INTLTOOL}
 fpkg       ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
-fpkg       ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
+
+fpkg -e "tgz" ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
 fpkg_hv    ${SGML_DTD3}
 fpkg_hv    ${SGML_DTD4}
 fpkg_sf    ${OPENSP} "openjade"
 fpkg_sf    ${OPENJADE}
+fpkg_hv    ${SGML_SPM} # For re-generating fontconfig documentation.
 fpkg_sf    ${DOCBOOK_DSSSL} "docbook"
 fpkg       ${DOCBOOK_UTILS} "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES"
-fpkg_gnome ${LIBXML2}
+fpkg       ${LIBXML2} "http://xmlsoft.org/sources"
 fpkg       ${LIBXSLT} "http://xmlsoft.org/sources"
 fpkg_hv    ${DOCBOOK_XML}
 fpkg_sf    ${DOCBOOK_XSL} "docbook"
-# For re-generating fontconfig documentation.
-fpkg_hv    ${SGML_SPM}
-
 fpkg_sf    ${XMLTOMAN}
+fpkg       ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
 
-# Perl modules
-fpkg_sf    ${PERL_MOD_PDL} pdl
-fpkg       ${PERL_MOD_XML_WRITER} "http://www.cpan.org/modules/by-module/XML"
-fpkg       ${PERL_MOD_XML_PARSER} "http://www.cpan.org/modules/by-module/XML"
-fpkg       ${PERL_MOD_XML_SIMPLE} "http://www.cpan.org/modules/by-module/XML"
-fpkg       ${PERL_MOD_PARSE_REDESCENT} "http://www.cpan.org/modules/by-module/Parse"
-
-# Gtk
-fpkg_gnome ${GTK_DOC}
-fpkg_gnome ${GLIB}
-fpkg       ${PIXMAN} "http://cairographics.org/releases"
-fpkg       ${GLITZ} "http://cairographics.org/snapshots"
-fpkg       ${CAIRO} "http://cairographics.org/releases"
-fpkg       ${CAIROMM} "http://cairographics.org/releases"
-fpkg_gnome ${PANGO}
-fpkg_gnome ${ATK}
-fpkg_gnome ${GTK2}
-fpkg_gnome ${GTK_ENGINES}
-fpkg_gnome ${PYGOBJECT}
-fpkg_gnome ${PYGTK}
-
-fpkg_gnome ${LIBSIGCPP}
-fpkg       ${GC} " http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
-fpkg_gnome ${GLIBMM}
-fpkg_gnome ${GTKMM}
+fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" ${LIBJPEG} "http://www.ijg.org/files"
+fpkg -f "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" ${LIBOPENJPEG} "http://www.openjpeg.org"
+fpkg_sf    ${LIBPNG}
+fpkg_gnome ${LIBART}
+fpkg_sf    ${LIBEXIF}
+fpkg       ${FRIBIDI} "http://fribidi.org/download"
 fpkg       ${HICOLOR_ICON_THEME} "http://icon-theme.freedesktop.org/releases"
+fpkg       ${TIFF} "http://libtiff.maptools.org/dl"
+fpkg_sf    ${GIFLIB}
+fpkg       ${LCMS}    "http://www.littlecms.com"
+fpkg_sf    ${LIBMNG}
 
-fpkg_hv    ${HVCLOCK}
-fpkg_hv    ${WMNOTIFY}
-
-fpkg       ${DESKTOP_FILE_UTILS} "http://freedesktop.org/software/desktop-file-utils/releases"
-fpkg       ${SHARED_MIME_INFO} "http://people.freedesktop.org/~hadess"
-fpkg_gnome ${STARTUP_NOTIFICATION}
-fpkg_gnome ${LIBWNCK}
-fpkg_sf    ${LIBXKLAVIER} gswitchit
-fpkg_gnome ${LIBGLADE}
-fpkg_gnome ${LIBSOUP}
-fpkg_gnome ${LIBIDL}
-fpkg_gnome ${LIBRSVG}
-
-fpkg_gnome ${INTLTOOL}
-fpkg_gnu   ${GSL}
-
-fpkg_sf    ${LIBUSB}
-fpkg_sf    ${LIBGPHOTO2} "gphoto"
-
-fpkg       ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver_base ${BABL})"
-fpkg       ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver_base ${BABL})"
-fpkg       ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver_base ${GIMP})"
-fpkg_sf    ${GUTENPRINT}
-fpkg_hv    ${INKSCAPE}
-
-fpkg       ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
-fpkg       ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
-
-fpkg_mis   ${CUPS} "${CUPS}-source" "http://ftp.easysw.com/pub/cups/$(get_pkg_ver ${CUPS})"
-fpkg_sf    ${SPLIX}
-
-fpkg_mis   ${ESPGS} "${ESPGS}-source" "http://ftp.easysw.com/pub/ghostscript/$(get_pkg_ver ${ESPGS})"
-fpkg_sf    ${GHOSTSCRIPT_FONTS_STD} "ghostscript"
-fpkg_sf    ${GHOSTSCRIPT_FONTS_OTHER} "ghostscript"
-
-fpkg_hv    ${IMAGE_MAGICK}
-fpkg       ${ICON_NAMING_UTILS}       "http://tango.freedesktop.org/releases"
-fpkg       ${TANGO_ICON_THEME}        "http://tango-project.org/releases"
-fpkg       ${TANGO_ICON_THEME_EXTRAS} "http://tango-project.org/releases"
-
-
-fpkg       ${TETEX_SRC}      "${TETEX_URL}/$(get_pkg_ver ${TETEX_SRC})/distrib"
-fpkg       ${TETEX_TEXMF}    "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMF})/distrib"
-fpkg       ${TETEX_TEXMFSRC} "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMFSRC})/distrib"
-fpkg       ${TETEX_CM_SUPER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/t"
-# For re-generating fontconfig documentation.
-fpkg_sf    ${JADETEX}
-
-fpkg       ${POPPLER} "http://poppler.freedesktop.org"
-
-fpkg       ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane/${SANE_BACKENDS}"
-fpkg       ${XSANE}         "ftp://ftp.sane-project.org/pub/sane/xsane"
-
-fpkg_sf    ${JACK} "jackit"
-fpkg       ${ALSA_LIB}     "ftp://ftp.alsa-project.org/pub/lib"
-fpkg       ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
-fpkg       ${ALSA_UTILS}   "ftp://ftp.alsa-project.org/pub/utils"
-fpkg       ${ALSA_OSS}     "ftp://ftp.alsa-project.org/pub/oss-lib"
-
-# Multimedia libraries and drivers.
-fpkg       ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
-fpkg_gnome ${ESOUND}
-
-fpkg       ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
-fpkg       ${LIBOIL} "http://liboil.freedesktop.org/download"
-fpkg       ${SPEEX} "http://downloads.xiph.org/releases/speex"
-fpkg       ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio"
-
-# Temporaire, version beta
-fpkg       ${LIBSNDFILE} "http://www.mega-nerd.com/tmp"
-#fpkg       ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile"
-
-fpkg       ${LIBOGG}    "http://downloads.xiph.org/releases/ogg"
-fpkg       ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
-fpkg       ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
-
-fpkg_hv    ${FLAC}
-fpkg_hv    ${FFMPEG}
-fpkg       ${XVIDCORE} "http://downloads.xvid.org/downloads"
-
-# Audio utilities
-fpkg_sf    ${LAME}
-fpkg       ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
-fpkg_hv    ${LIBA52}
-fpkg_hv    ${LIBID3TAG}
-fpkg       ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
-fpkg_sf    ${LIBFAAC}
-fpkg       ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
-fpkg_sf    ${GRIP}
-fpkg_sf    ${CDRDAO}
-fpkg_hv    ${PORTAUDIO}
-fpkg_hv    ${SWEEP}
-fpkg       ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
-fpkg       ${SYLPHEED} "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})"
-
-fpkg_hv    ${NSS}
-fpkg       ${FIREFOX} "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
-
-fpkg_hv    ${JAVA}
-fpkg_hv    ${AGG}
-fpkg       ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
-
-fpkg       ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
-fpkg       ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
-fpkg       ${HAL} "http://people.freedesktop.org/~david/dist"
-
-fpkg       ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
-fpkg_mis   ${OPENLDAP} "openldap-stable-20070831" \
-    "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable"
-fpkg_hv    ${KERBEROS5}
-
-fpkg_mis   ${SENDMAIL} "sendmail.$(get_pkg_ver ${SENDMAIL})" "ftp://ftp.sendmail.org/pub/sendmail"
-fpkg       ${LIBSPF2} "http://libspf2.org/spf"
-fpkg       ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist"
-fpkg_hv    ${MILTER_SPF}
-fpkg       ${PROCMAIL} "http://www.procmail.org"
-fpkg       ${FETCHMAIL} "http://download.berlios.de/fetchmail"
-fpkg_sf    ${MUTT}
-
-fpkg_mis   ${FCRON} "${FCRON}.src" "ftp://ftp.seul.org/pub/fcron"
-fpkg_hv    ${GETDATE}
-
-fpkg_sf    ${CLAMAV}
-
-fpkg       ${PERL_MOD_HTML_TAGSET} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
-fpkg       ${PERL_MOD_HTML_PARSER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
-fpkg       ${PERL_MOD_APACHE_LOGGED_AUTH_DBI} "http://search.cpan.org/CPAN/authors/id/S/SI/SIMKIN"
-fpkg       ${PERL_MOD_DB_FILE} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_DIGEST_SHA1} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
-# URI is needed by LWP
-fpkg       ${PERL_MOD_URI} "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS"
-# LWP is Needed by LTSP
-fpkg       ${PERL_MOD_LWP} "http://www.linpro.no/lwp"
-
-# ZIP is Needed by OO
-fpkg       ${PERL_MOD_ARCHIVE_ZIP} "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK"
-fpkg       ${PERL_MOD_COMPRESS_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_IO_COMPRESS_BASE} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_IO_COMPRESS_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_COMPRESS_RAW_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_NET_DNS} "http://search.cpan.org/CPAN/authors/id/O/OL/OLAF"
-
-fpkg       ${SPAMASSASSIN} "http://apache.sunsite.ualberta.ca/spamassassin/source"
-fpkg       ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap"
-
-fpkg       ${HTTPD} "http://www.apache.org/dist/httpd"
-
-
-
-fpkg_sf    ${MAILMAN}
-
-fpkg       ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
-
-fpkg       ${PHP}   "http://us2.php.net/distributions"
-
-lpkg     2 ${SUBVERSION}
-fpkg_gnu   ${INDENT}
-
-fpkg       ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
-fpkg       ${TFTP_HPA} "http://www.kernel.org/pub/software/network/tftp"
-
-fpkg_sf    ${KVM}
-fpkg_hv    ${BRIDGE_UTILS}
-fpkg_hv    ${UML_UTILITIES}
-
-fpkg_gnu   ${GUILE}
-
-fpkg_sf    ${LIBBOOST}
-
-fpkg       ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
-
-fpkg_hv    ${CKERMIT}
-
-fpkg       ${LIBGAMIN} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg_sf    ${PCMANFM}
-
-fpkg_gnu   ${HELP2MAN}
-
-fpkg       ${LIBDVDCSS}  "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg       ${LIBDVDREAD} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg       ${DVDFS} "http://jspenguin.org:81/dvdfs"
-
-
-
-fpkg       ${LIBFFI} "ftp://sourceware.org/pub/libffi"
-fpkg_gnome ${GOBJECT_INSTROSPECTION}
-fpkg       ${EGGDBUS} "http://hal.freedesktop.org/releases"
-fpkg       ${POLKIT} "http://hal.freedesktop.org/releases"
-
-fpkg       ${GNUPG} "ftp://ftp.gnupg.org/gcrypt/gnupg"
-
-
+fpkg_sf    ${FREETYPE}
+fpkg       ${FONTCONFIG} "http://fontconfig.org/release"
 
 exit $?