Ajustements packages update

diff --git a/functions-update b/functions-update
index 916f239..d602572 100644 (file)
--- a/functions-update
+++ b/functions-update
@@ -18,7 +18,7 @@ HV_PATCHES_URL="${HV_BASE_URL}/patches"
 
 LFS_PACKAGES_URL="ftp://ftp.osuosl.org/pub/lfs/lfs-packages/conglomeration"
 HV_PACKAGES_URL="${HV_BASE_URL}/packages"
-SOURCEFORGE_URL="http://internap.dl.sourceforge.net/sourceforge"
+SOURCEFORGE_URL="http://cdnetworks-us-1.dl.sourceforge.net"
 GNOME_URL="http://ftp.gnome.org/pub/gnome/sources"
 GNU_URL="http://ftp.gnu.org/pub/gnu"
 TETEX_URL="http://www.tug.org/ftp/tex-archive/systems/unix/teTeX"
@@ -45,6 +45,10 @@ static_fetch_patches_list()
 #          slash is absolutely necessary for this to work.
 update_packages_init()
 {
+    # Execute a return statement instead of exit, to be able to continue with
+    # downloading other packages
+    export RCMD_NO_EXIT=1
+
     # First create log directory if it does not exists.
     if [ ! -d ${LFS_LOG_DIR} ]; then
        install -m755 -d ${LFS_LOG_DIR} || exit 1
@@ -207,7 +211,7 @@ static_getpkg()
 
     if [ -z "${ARCH_EXT}" ]; then
         # List of default archive extensions to try
-        ARCH_EXT="tar.bz2 tar.gz tgz .tar.Z"
+        ARCH_EXT="tar.bz2 tar.gz tgz tar.Z"
     fi
 
     for arch_ext in ${ARCH_EXT}; do

diff --git a/packages-list b/packages-list
index 320a1ff..ffcfda3 100644 (file)
--- a/packages-list
+++ b/packages-list
@@ -54,10 +54,10 @@ DIFFUTILS="diffutils-2.8.7"
 DOCBOOK_DSSSL_VER="1.79"
 DOCBOOK_DSSSL="docbook-dsssl-${DOCBOOK_DSSSL_VER}"
 DOCBOOK_UTILS="docbook-utils-0.6.14"
-DOCBOOK_XML_VER="4.4"
-DOCBOOK_XML_VER_PREV="4.1.2 4.2 4.3"
+DOCBOOK_XML_VER="4.5"
+DOCBOOK_XML_VER_PREV="4.1.2 4.2 4.3 4.4"
 DOCBOOK_XML="docbook-xml-${DOCBOOK_XML_VER}"
-DOCBOOK_XSL_VER="1.68.1"
+DOCBOOK_XSL_VER="1.75.2"
 DOCBOOK_XSL="docbook-xsl-${DOCBOOK_XSL_VER}"
 DOSFSTOOLS="dosfstools-3.0.9"
 DVDFS="dvdfs-0.2"
@@ -269,7 +269,7 @@ LIBRSVG="librsvg-2.26.0"
 LIBSNDFILE="libsndfile-1.0.18pre18"
 LIBSOUP="libsoup-2.4.1"
 LIBXML2="libxml2-2.6.26"
-LIBXSLT="libxslt-1.1.12"
+LIBXSLT="libxslt-1.1.26"
 LIBUSB="libusb-0.1.10a"
 LIBGPHOTO2="libgphoto2-2.1.99"
 LIBXKLAVIER="libxklavier-2.91"
@@ -320,24 +320,18 @@ PCIUTILS="pciutils-3.1.4"
 PCMANFM="pcmanfm-0.5"
 PCRE="pcre-8.00"
 PERL="perl-5.10.1"
-PERL_MOD_PDL="PDL-2.4.2"
-PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.94"
-PERL_MOD_XML_WRITER="XML-Writer-0.600"
-PERL_MOD_XML_PARSER="XML-Parser-2.34"
-PERL_MOD_XML_SIMPLE="XML-Simple-2.15"
-PERL_MOD_HTML_TAGSET="HTML-Tagset-3.10"
-PERL_MOD_HTML_PARSER="HTML-Parser-3.56"
+PERL_MOD_PDL="PDL-2.4.6"
+PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.963"
+PERL_MOD_XML_WRITER="XML-Writer-0.606"
+PERL_MOD_XML_PARSER="XML-Parser-2.36"
+PERL_MOD_XML_SIMPLE="XML-Simple-2.18"
+PERL_MOD_HTML_TAGSET="HTML-Tagset-3.20"
+PERL_MOD_HTML_PARSER="HTML-Parser-3.64"
 PERL_MOD_APACHE_LOGGED_AUTH_DBI="Apache-LoggedAuthDBI-0.12"
-PERL_MOD_DB_FILE="DB_File-1.814"
-PERL_MOD_DIGEST_SHA1="Digest-SHA1-2.11"
-PERL_MOD_LWP="libwww-perl-5.64"
-PERL_MOD_URI="URI-1.35"
-PERL_MOD_ARCHIVE_ZIP="Archive-Zip-1.18"
-PERL_MOD_COMPRESS_ZLIB="Compress-Zlib-2.004"
-PERL_MOD_IO_COMPRESS_BASE="IO-Compress-Base-2.004"
-PERL_MOD_IO_COMPRESS_ZLIB="IO-Compress-Zlib-2.004"
-PERL_MOD_COMPRESS_RAW_ZLIB="Compress-Raw-Zlib-2.004"
-PERL_MOD_NET_DNS="Net-DNS-0.61"
+PERL_MOD_DIGEST_SHA1="Digest-SHA1-2.12"
+PERL_MOD_LWP="libwww-perl-5.834"
+PERL_MOD_URI="URI-1.52"
+PERL_MOD_NET_DNS="Net-DNS-0.66"
 PHP="php-5.2.6"
 PIXMAN="pixman-0.17.4"
 POLKIT="polkit-0.94"
@@ -370,7 +364,7 @@ SENDMAIL_GID="bin"
 SGML_COMMON="sgml-common-0.6.3"
 SGML_DTD3_VER="3.1"
 SGML_DTD3="sgml-dtd-${SGML_DTD3_VER}"
-SGML_DTD4_VER="4.4"
+SGML_DTD4_VER="4.5"
 SGML_DTD4="sgml-dtd-${SGML_DTD4_VER}"
 SGML_SPM="SGMLSpm-1.03ii"
 SHADOW="shadow-4.1.4.2"
@@ -396,7 +390,7 @@ TANGO_ICON_THEME="tango-icon-theme-0.8.1"
 TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0"
 TAR_PACKAGE="tar-1.22"
 TCPDUMP="tcpdump-4.0.0"
-TCL="tcl8.5.7-src"
+TCL="tcl8.5.8-src"
 TCPWRAPPERS="tcp_wrappers_7.6"
 TETEX_SRC="tetex-src-3.0"
 TETEX_TEXMF="tetex-texmf-3.0"
@@ -405,11 +399,11 @@ TETEX_CM_SUPER="tetex-cm-super"
 TEXINFO="texinfo-4.13a"
 TFTP_HPA="tftp-hpa-0.49"
 TIFF="tiff-3.8.2"
-TK="tk8.5.7"
+TK="tk8.5.8"
 TRANSMISSION="transmission-1.34"
 
-UDEV="udev-149"
-UDEV_CONFIG="udev-config-20090925"
+UDEV="udev-151"
+UDEV_CONFIG="udev-config-20100128"
 UML_UTILITIES="uml_utilities_20070815"
 UNRAR="unrar-3.7.8"
 UNZIP="unzip-5.52"

diff --git a/stage3/packages-update b/stage3/packages-update
index 68a5671..7703578 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -11,10 +11,6 @@ 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
 
 # These packages were already downloaded for stage1:
@@ -38,7 +34,7 @@ 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}
+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
@@ -82,7 +78,8 @@ fpkg       ${PERL_MOD_XML_PARSER} "http://www.cpan.org/modules/by-module/XML"
 
 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"
+ARCH_EXT=tgz fpkg ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
+unset ARCH_EXT
 fpkg_hv    ${SGML_DTD3}
 fpkg_hv    ${SGML_DTD4}
 fpkg_sf    ${OPENSP} "openjade"

diff --git a/stage4/stage4-install b/stage4/stage4-install
index fc484d7..1c4c970 100755 (executable)
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -218,7 +218,9 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_pm    ${PERL_MOD_HTML_TAGSET}
     ipkg_pm    ${PERL_MOD_HTML_PARSER}
     ipkg_pm    ${PERL_MOD_APACHE_LOGGED_AUTH_DBI}
-    ipkg_pm    ${PERL_MOD_DB_FILE}
+    ############ipkg_pm    ${PERL_MOD_DB_FILE}
+# Berkeley DB n'est plus installé...
+########PERL_MOD_DB_FILE="DB_File-1.814"
     ipkg_pm    ${PERL_MOD_DIGEST_SHA1}
     ipkg_pm    ${PERL_MOD_URI}
     ipkg_pm    ${PERL_MOD_LWP}
@@ -230,8 +232,11 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     #ipkg_pm    ${PERL_MOD_IO_COMPRESS_BASE}
     #ipkg_pm    ${PERL_MOD_COMPRESS_RAW_ZLIB}
     #ipkg_pm    ${PERL_MOD_IO_COMPRESS_ZLIB}
-
-
+PERL_MOD_ARCHIVE_ZIP="Archive-Zip-1.30"
+PERL_MOD_COMPRESS_ZLIB="Compress-Zlib-2.015"
+PERL_MOD_IO_COMPRESS_BASE="IO-Compress-Base-2.024"
+PERL_MOD_IO_COMPRESS_ZLIB="IO-Compress-Zlib-2.024"
+PERL_MOD_COMPRESS_RAW_ZLIB="Compress-Raw-Zlib-2.024"
 
     ipkg_cust ${SPAMASSASSIN} cis-spamassassin
     ipkg_cust ${UW_IMAP}      cis-uw-imap