From 3af763835d03474f8dd6fb7c352c8933502662e7 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sun, 29 Jan 2012 05:28:45 +0000
Subject: [PATCH] =?utf8?q?-D=C3=A9plac=C3=A9=20named=20de=20/home=20vers?=
 =?utf8?q?=20/srv=20-Corrections=20erreurs=20nouveaux=20paquets=20au=20sta?=
 =?utf8?q?ge3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/dependencies            |   3 +-
 config/packages-list           | 129 +++++++++++++++++----------------
 stage1/bootscripts/cleanfs     |   4 +-
 stage2/hv-utilities/rotatelogs |  10 +--
 stage3/bootscripts/named       |   2 +-
 stage3/hv-install-1            |  27 ++++---
 stage3/packages-update         |  24 +++---
 stage3/pkg/bind                |  39 +++++-----
 stage3/pkg/git                 |   6 ++
 stage3/pkg/krb5                |  10 +--
 stage3/pkg/usbutils            |   3 +
 stage4/hv-install-1            |   1 -
 stage4/packages-update         |   1 -
 13 files changed, 140 insertions(+), 119 deletions(-)

diff --git a/config/dependencies b/config/dependencies
index d285b61..8049464 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -1,3 +1,4 @@
+
 #!/bin/sh
 
 ${INTLTOOL}: ${PERL_MOD_XML_PARSER}
@@ -15,7 +16,7 @@ ${GRIP}: ${VTE} id3lib ${CDPARANOIA} ${GTK}
 ${GOFFICE}: ${LIBGSF} ${PCRE} ${PANGO}
 ${GNUMERIC}: ${GOFFICE}
 ${ABIWORD}: ${WV} ${GOFFICE}
-${GIT}: cpio
+${GIT}: cpio ${PYTHON}
 
 ${GIMP}: ${BABL} ${INTTOOL} ${PYGTK}
 
diff --git a/config/packages-list b/config/packages-list
index 1fcb725..0bb7b98 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -7,24 +7,25 @@ ABIWORD="abiword-2.8.6"
 ACK="ack-1.94"
 ACPID="acpid-2.0.9"
 AGG="agg-2.5"
-ALSA_LIB="alsa-lib-1.0.21"
-ALSA_PLUGINS="alsa-plugins-1.0.21"
-ALSA_UTILS="alsa-utils-1.0.21"
-APR="apr-1.3.9"
-APR_UTIL="apr-util-1.3.9"
+ALSA_LIB="alsa-lib-1.0.24.1"
+ALSA_PLUGINS="alsa-plugins-1.0.24"
+ALSA_UTILS="alsa-utils-1.0.24.2"
+APR="apr-1.4.5"
+APR_UTIL="apr-util-1.4.1"
 AVR_GDB="gdb-6.4"
 AVRDUDE="avrdude-5.1"
 ATK="atk-1.32.0"
 ATKMM="atkmm-2.22.5"
-AUDIOFILE="audiofile-0.2.6"
+AUDIOFILE="audiofile-0.3.2"
 AUTOCONF="autoconf-2.68"
 AUTOMAKE="automake-1.11.1"
 
 BABL="babl-0.1.2"
 BASH="bash-4.2"
 BC="bc-1.06"
+BDWGC="bdwgc-7_2alpha5-20110107"
 BISON="bison-2.5"
-BIND="bind-9.6.1-P3"
+BIND="bind-9.8.1-P1"
 BINUTILS="binutils-2.22"
 ARM_BINUTILS=${BINUTILS}
 AVR_BINUTILS=${BINUTILS}
@@ -46,7 +47,7 @@ COREUTILS="coreutils-8.14"
 CPIO="cpio-2.11"
 CUPS="cups-1.4.8"
 CUPS_PDF="cups-pdf-2.5.1"
-CURL="curl-7.19.7"
+CURL="curl-7.23.1"
 CVS="cvs-1.11.23"
 
 DBUS="dbus-1.2.24"
@@ -55,7 +56,7 @@ DBUS_GLIB="dbus-glib-0.88"
 DDCLIENT="ddclient-3.6.7"
 DEJAGNU="dejagnu-1.4.4"
 DESKTOP_FILE_UTILS="desktop-file-utils-0.17"
-DHCP="dhcp-4.2.3"
+DHCP="dhcp-4.2.3-P2"
 DIFFUTILS="diffutils-3.2"
 DOCBOOK_DSSSL_VER="1.79"
 DOCBOOK_DSSSL="docbook-dsssl-${DOCBOOK_DSSSL_VER}"
@@ -65,7 +66,7 @@ DOCBOOK_XML_VER_PREV="4.1.2 4.2 4.3 4.4"
 DOCBOOK_XML="docbook-xml-${DOCBOOK_XML_VER}"
 DOCBOOK_XSL_VER="1.75.2"
 DOCBOOK_XSL="docbook-xsl-${DOCBOOK_XSL_VER}"
-DOSFSTOOLS="dosfstools-3.0.9"
+DOSFSTOOLS="dosfstools-3.0.12"
 DVDFS="dvdfs-0.2"
 DVDRWTOOLS="dvd+rw-tools-7.1"
 
@@ -90,11 +91,11 @@ FINDUTILS="findutils-4.4.2"
 FIRMWARE_B43_LPPHY="broadcom-wl-4.178.10.4"
 FLAC="flac-1.2.1"
 FLEX="flex-2.5.35"
-FONTCONFIG="fontconfig-2.7.3"
+FONTCONFIG="fontconfig-2.8.0"
 FONTFORGE="fontforge_full-20110222"
-FREETYPE="freetype-2.3.11"
+FREETYPE="freetype-2.4.8"
 FRIBIDI="fribidi-0.10.9"
-FUSE="fuse-2.8.3"
+FUSE="fuse-2.8.6"
 B43_FWCUTTER="b43-fwcutter-013"
 
 GAWK="gawk-4.0.0"
@@ -119,7 +120,7 @@ GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11"
 GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0"
 GIFLIB="giflib-4.1.6"
 GIMP="gimp-2.6.11"
-GIT="git-1.6.6.1"
+GIT="git-1.7.8.3"
 GIT_MANPAGES="git-manpages-1.6.6.1"
 GLIB="glib-2.28.7"
 GLIBMM="glibmm-2.28.1"
@@ -131,7 +132,7 @@ GNOME_ICON_THEME="gnome-icon-theme-2.30.3"
 GNOME_MEDIA="gnome-media-2.32.0"
 GNUMERIC="gnumeric-1.10.17"
 GNUPG="gnupg-1.4.11"
-GNUTLS="gnutls-2.10.2"
+GNUTLS="gnutls-3.0.7"
 GOBJECT_INSTROSPECTION="gobject-introspection-0.10.2"
 GOFFICE="goffice-0.8.17"
 GPERF="gperf-3.0.4"
@@ -149,7 +150,7 @@ GST_FFMPEG="gst-ffmpeg-0.10.12"
 GTK="gtk+-2.24.4"
 GTK_ENGINES="gtk-engines-2.20.2"
 GTKMM="gtkmm-2.24.0"
-GUILE="guile-1.8.7"
+GUILE="guile-2.0.3"
 GUITARTEX="guitartex-hv-r119"
 GUTENPRINT="gutenprint-5.2.5"
 GVFS="gvfs-1.8.2"
@@ -158,7 +159,7 @@ GZIP="gzip-1.4"
 HAL="hal-0.5.14"
 HAL_INFO="hal-info-20091130"
 HELP2MAN="help2man-1.37.1"
-HICOLOR_ICON_THEME="hicolor-icon-theme-0.11"
+HICOLOR_ICON_THEME="hicolor-icon-theme-0.12"
 HTTPD="httpd-2.2.8"
 HVCLOCK="hvclock-1.0.2"
 
@@ -169,74 +170,75 @@ IMLIB2="imlib-1.4.2"
 INDENT="indent-2.2.10"
 INETUTILS="inetutils-1.8"
 INKSCAPE="inkscape-0.48.1"
-INTLTOOL="intltool-0.40.6"
+INTLTOOL="intltool-0.50.0"
 IPROUTE2="iproute2-3.1.0"
-IPTABLES="iptables-1.4.7"
+IPTABLES="iptables-1.4.12"
 ISO_CODES="iso-codes-3.23"
 
-JACK="jack-audio-connection-kit-0.120.1"
+JACK="jack-audio-connection-kit-0.121.3"
 JASPER="jasper-1.900.1"
 
 KBD="kbd-1.15.2"
-KERBEROS5="krb5-1.6"
+KERBEROS5="krb5-1.10"
 KERNEL="linux-3.1.6"
 NOUVEAU_NVIDIA_KERNEL="linux-2.6.38-rc7-g3d3d123-nouveau-git"
 KVM="kvm-84"
 
 LADSPA="ladspa_sdk"
 LAME="lame-3.99.3"
-LCMS="lcms-1.18a"
+LCMS="lcms-1.19"
 LESS="less-444"
 LESSTIF="lesstif-0.95.2"
 LFS_BOOTSCRIPTS="lfs-bootscripts-20070813"
 LIBA52="a52dec-0.7.4"
-LIBART="libart_lgpl-2.3.20"
+LIBART="libart_lgpl-2.3.21"
 BOOST="boost_1_45_0"
 LIBCROCO="libcroco-0.6.2"
 LIBDVDCSS="libdvdcss-1.2.10"
 LIBDVDREAD="libdvdread-0.9.7"
-LIBEXIF="libexif-0.6.17"
+LIBEXIF="libexif-0.6.19"
 LIBEVENT="libevent-2.0.12-stable"
 LIBFAAD2="faad2-2.7"
 LIBFAAC="faac-1.28"
-LIBFFI="libffi-3.0.8"
+LIBFFI="libffi-3.0.10"
 LIBGAMIN="gamin-0.1.10"
-LIBGCRYPT="libgcrypt-1.4.6"
+LIBGCRYPT="libgcrypt-1.5.0"
 LIBGEDA="libgeda-1.2.0"
 LIBGLADE="libglade-2.6.4"
 LIBGPG_ERROR="libgpg-error-1.10"
 LIBGSF="libgsf-1.14.19"
 LIBID3TAG="libid3tag-0.15.1b"
 LIBIDL="libIDL-0.8.14"
-LIBJPEG="libjpeg-7"
+LIBJPEG="libjpeg-8c"
 LIBMAD="libmad-0.15.1b"
 LIBMNG="libmng-1.0.10"
 LIBNOTIFY="libnotify-0.4.4"
 LIBOGG="libogg-1.3.0"
 LIBOIL="liboil-0.3.17"
-LIBOPENJPEG="libopenjpeg-1.2"
+LIBOPENJPEG="openjpeg_v1_4_sources_r697"
 LIBPCAP="libpcap-1.1.1"
 LIBPIPELINE="libpipeline-1.2.0"
 LIBPNG="libpng-1.5.5"
 LIBPTHREAD_STUBS="libpthread-stubs-0.3"
 LIBRSVG="librsvg-2.32.1"
-LIBSAMPLERATE="libsamplerate-0.1.7"
+LIBSAMPLERATE="libsamplerate-0.1.8"
 LIBSIGCPP="libsigc++-2.2.8"
-LIBSNDFILE="libsndfile-1.0.23"
+LIBSNDFILE="libsndfile-1.0.25"
 LIBSOUP="libsoup-2.32.2"
 LIBSPF2="libspf2-1.2.5"
 LIBSPECTRE="libspectre-0.2.6"
-LIBTASN1="libtasn1-2.8"
+LIBTASN1="libtasn1-2.10"
 LIBTHEORA="libtheora-1.1.1"
 LIBTOOL="libtool-2.4.2"
 LIBVORBIS="libvorbis-1.3.2"
 VORBIS_TOOLS="vorbis-tools-1.2.0"
 LIBVPX="libvpx-v0.9.7"
-LIBUSB="libusb-1.0.2"
+LIBUNISTRING="libunistring-0.9.3"
+LIBUSB="libusb-1.0.8"
 LIBUSB_COMPAT="libusb-compat-0.1.3"
 LIBWNCK="libwnck-2.30.6"
 LIBXKLAVIER="libxklavier-5.0"
-LIBXML2="libxml2-2.7.7"
+LIBXML2="libxml2-2.7.8"
 LIBXSLT="libxslt-1.1.26"
 LILYPOND="lilypond-2.14.2"
 LTSP_UTILS="ltsp-utils-0.25-0"
@@ -254,42 +256,43 @@ MODULE_INIT_TOOLS="module-init-tools-3.16"
 MPC="mpc-0.9"
 MPFR="mpfr-3.1.0"
 MUTT="mutt-1.5.21"
-MYSQL="mysql-5.1.52"
+MYSQL="mysql-5.5.17"
 
 NANO="nano-2.2.6"
-NASM="nasm-2.09.04"
+NASM="nasm-2.09.10"
 NCURSES="ncurses-5.9"
-NEON="neon-0.29.1"
+NEON="neon-0.29.6"
+NETTLE="nettle-2.4"
 NEWLIB="newlib-1.16.0"
-NFS_UTILS="nfs-utils-1.2.3"
-NMAP="nmap-4.20"
+NFS_UTILS="nfs-utils-1.2.5"
+NMAP="nmap-5.51"
 
 OPENJADE="openjade-1.3.2"
 OPENLDAP="openldap-2.4.23"
 OPENSP="OpenSP-1.5.2"
-OPENSSH="openssh-5.8p1"
-OPENSSL="openssl-1.0.0b"
+OPENSSH="openssh-5.9p1"
+OPENSSL="openssl-1.0.0e"
 OPENSSL_ROOT_CERTS="BLFS-ca-bundle-3.12.8.0"
 ORBIT2="ORBit2-2.14.19"
 
-PAM="Linux-PAM-1.1.3"
+PAM="Linux-PAM-1.1.5"
 PANGO="pango-1.28.4"
 PANGOMM="pangomm-2.28.2"
-PARTED="parted-1.9.0"
+PARTED="parted-3.0"
 PATCH_PACKAGE="patch-2.6.1"
-PCIUTILS="pciutils-3.1.4"
+PCIUTILS="pciutils-3.1.8"
 MENU_CACHE="menu-cache-0.3.2"
 LIBFM="libfm-0.1.16"
 PCMANFM="pcmanfm-0.9.9"
 PCRE="pcre-8.12"
 PERL="perl-5.14.2"
-PERL_MOD_PDL="PDL-2.4.6"
+PERL_MOD_PDL="PDL-2.4.9"
 PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.965001"
-PERL_MOD_XML_WRITER="XML-Writer-0.612"
+PERL_MOD_XML_WRITER="XML-Writer-0.614"
 PERL_MOD_XML_PARSER="XML-Parser-2.40"
 PERL_MOD_XML_SIMPLE="XML-Simple-2.18"
 PERL_MOD_HTML_TAGSET="HTML-Tagset-3.20"
-PERL_MOD_HTML_PARSER="HTML-Parser-3.68"
+PERL_MOD_HTML_PARSER="HTML-Parser-3.69"
 PERL_MOD_APACHE_LOGGED_AUTH_DBI="Apache-LoggedAuthDBI-0.12"
 PERL_MOD_DIGEST_SHA1="Digest-SHA1-2.13"
 PERL_MOD_LWP="libwww-perl-6.01"
@@ -301,8 +304,8 @@ POLKIT="polkit-0.99"
 POLICYKIT="PolicyKit-0.9"
 POPPLER="poppler-0.16.5"
 PKG_CONFIG="pkg-config-0.26"
-POPT="popt-1.15"
-PORTAUDIO="portaudio-v19_20071207"
+POPT="popt-1.16"
+PORTAUDIO="pa_stable_v19_20111121"
 PORTMAP="portmap-6.0"
 PPL="ppl-0.11.2"
 PROCMAIL="procmail-3.22"
@@ -311,15 +314,15 @@ PSMISC="psmisc-22.13"
 PYCAIRO="py2cairo-1.10.0"
 PYGOBJECT="pygobject-2.28.4"
 PYGTK="pygtk-2.24.0"
-PYTHON="Python-2.6.4"
+PYTHON="Python-2.7.2"
 
 QT="qt-everywhere-opensource-src-4.7.1"
 
 RALENTI="ralenti-0.1"
 READLINE="readline-6.2"
 REISERFSPROGS="reiserfsprogs-3.6.21"
-RSYNC="rsync-3.0.7"
-RUBBERBAND="rubberband-1.6.0"
+RSYNC="rsync-3.0.9"
+RUBBERBAND="rubberband-1.7.0"
 
 SAMBA="samba-3.0.21c"
 SANE_BACKENDS="sane-backends-1.0.22"
@@ -345,10 +348,10 @@ SQLITE="sqlite-autoconf-3070800"
 SQUIRRELMAIL="squirrelmail-1.5.1"
 SSMTP="ssmtp-2.64"
 STARTUP_NOTIFICATION="startup-notification-0.9"
-STRACE="strace-4.5.20"
-SUBVERSION="subversion-1.6.6"
+STRACE="strace-4.6"
+SUBVERSION="subversion-1.7.2"
 SYLPHEED="sylpheed-3.1.1"
-SUDO="sudo-1.7.2p2"
+SUDO="sudo-1.8.2"
 SYSKLOGD="sysklogd-1.5"
 SYSVINIT="sysvinit-2.88dsf"
 
@@ -357,32 +360,32 @@ TALLOC="talloc-2.0.1"
 TANGO_ICON_THEME="tango-icon-theme-0.8.90"
 TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0"
 TAR_PACKAGE="tar-1.26"
-TCPDUMP="tcpdump-4.0.0"
-TCL="tcl8.5.8-src"
+TCPDUMP="tcpdump-4.2.1"
+TCL="tcl8.5.10-src"
 TCPWRAPPERS="tcp_wrappers_7.6"
 TEXLIVE="texlive-20100722-source"
 TEXLIVE_TEXMF="texlive-20100722-texmf"
 TEXINFO="texinfo-4.13a"
 TFTP_HPA="tftp-hpa-0.49"
-TIFF="tiff-3.9.4"
-TK="tk8.5.8-src"
+TIFF="tiff-4.0.0"
+TK="tk8.5.9-src"
 TRANSMISSION="transmission-2.33"
 
 UDEV="udev-173"
 UML_UTILITIES="uml_utilities_20070815"
-UNRAR="unrar-3.7.8"
-UNZIP="unzip-5.52"
+UNRAR="unrar-3.9.10"
+UNZIP="unzip-6.0"
 UPSTART="upstart-0.6.3"
-USBUTILS="usbutils-0.86"
+USBUTILS="usbutils_005.orig"
 UTIL_LINUX="util-linux-2.20.1"
 UW_IMAP="imap-2007e"
 
-VAMP="vamp-plugin-sdk-2.2.1"
+VAMP="vamp-plugin-sdk-2.3"
 VIEWNIOR="viewnior-1.1"
 VLC="vlc-1.1.13"
 VTE="vte-0.28.2"
 
-WGET="wget-1.11.4"
+WGET="wget-1.13.4"
 WHICH="which-2.20"
 WINDOWMAKER="WindowMaker-0.92.0"
 WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
diff --git a/stage1/bootscripts/cleanfs b/stage1/bootscripts/cleanfs
index 153f241..48c2fdc 100755
--- a/stage1/bootscripts/cleanfs
+++ b/stage1/bootscripts/cleanfs
@@ -21,8 +21,8 @@ clean_files()
     cd /var/run &&
     find . ! -type d ! -name utmp ! -newer /proc -exec rm -f {} \; || failed=1
 
-    if [ -d /home/named ]; then
-        cd /home/named/var/run &&
+    if [ -d /srv/named ]; then
+        cd /srv/named/var/run &&
         find . ! -type d ! -name utmp ! -newer /proc -exec rm -f {} \; || failed=1
     fi
 
diff --git a/stage2/hv-utilities/rotatelogs b/stage2/hv-utilities/rotatelogs
index 735c1d4..dd5cc41 100755
--- a/stage2/hv-utilities/rotatelogs
+++ b/stage2/hv-utilities/rotatelogs
@@ -14,7 +14,7 @@ LOGFILES_APACHE="access_log error_log ssl_request_log"
 LOGDIR_CUPS=/var/log/cups
 LOGFILES_CUPS="access_log error_log"
 
-LOGDIR_NAMED=/home/named/etc/namedb
+LOGDIR_NAMED=/srv/named/etc/namedb
 LOGFILES_NAMED="named.run"
 
 # arg 1: Backup log directory
@@ -23,13 +23,13 @@ rotate_log()
 {
     backup_log_dir=${1}
     file=${2}
-    
+
     for day in 8 7 6 5 4 3 2 1 0 ; do
 	if [ -f ${backup_log_dir}/${file}.${day} ]; then
 	    mv ${backup_log_dir}/${file}.${day} ${backup_log_dir}/${file}.$((${day}+1)) || exit 1
 	fi
     done
-    
+
     if [ -f ${file} ]; then
 	user=$(ls -l --numeric-uid-gid ${file} | awk '{ print $3 }')
 	group=$(ls -l --numeric-uid-gid ${file} | awk '{ print $4 }')
@@ -65,7 +65,7 @@ if [ -d ${LOGDIR} ]; then
         rotate_log ${BACKUP_LOGDIR} ${file} || exit 1
     done
 
-    kill -HUP `cat /home/named/var/run/named.pid` || exit 1
+    kill -HUP `cat /srv/named/var/run/named.pid` || exit 1
 fi
 
 # For Apache web server (if installed)
@@ -78,7 +78,7 @@ if [ -d ${LOGDIR} ]; then
     for file in ${LOGFILES_APACHE}; do
         rotate_log ${BACKUP_LOGDIR}/apache ${file} || exit 1
     done
-    
+
     /usr/sbin/apachectl graceful &&
     sleep 2
 fi
diff --git a/stage3/bootscripts/named b/stage3/bootscripts/named
index 108a452..289215a 100755
--- a/stage3/bootscripts/named
+++ b/stage3/bootscripts/named
@@ -10,7 +10,7 @@ log_script_name "$0 $*"
 
 DAEMON=/usr/sbin/named
 DAEMON_DESC="BIND server"
-DAEMON_OPTS="-u named -t /home/named -c /etc/named.conf"
+DAEMON_OPTS="-u named -t /srv/named -c /etc/named.conf"
 
 init_resolver()
 {
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 9b50978..2af024c 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -11,11 +11,11 @@ ipkg -m acnb ${REISERFSPROGS}
 ipkg -m acnb ${POPT}
 ipkg ${PAM}
 ipkg -m noac ${OPENSSL}
-ipkg ${WGET}
+ipkg ${WGET} "--with-ssl=openssl"
 ipkg -m noac ${PCIUTILS}
 ipkg -m acnb ${LIBUSB}
 ipkg ${LIBUSB_COMPAT}
-ipkg ${USBUTILS}
+ipkg -s usbutils ${USBUTILS}
 ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
@@ -38,7 +38,9 @@ ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
 ipkg -m noac ${PORTMAP}
-ipkg -m acnb ${NFS_UTILS} "--disable-nfsv4 \
+ipkg -m acnb ${NFS_UTILS} "\
+    --disable-nfsv4 \
+    --disable-nfsv41 \
     --sbindir=/sbin \
     --disable-tirpc \
     --disable-gss"
@@ -73,7 +75,6 @@ ipkg ${BC} "--with-readline"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
 ipkg -m noac ${DOSFSTOOLS}
-ipkg -m acnb ${GIT}
 
 # Perl modules
 ipkg -m pm ${PERL_MOD_PDL}
@@ -87,6 +88,8 @@ ipkg -m noac ${COLORDIFF}
 ipkg ${INTLTOOL}
 ipkg ${PYTHON} "--enable-shared"
 
+ipkg -m acnb ${GIT}
+
 # DocBook
 ipkg -m acnb ${SGML_COMMON}
 ipkg -m noac -s sgml-dtd3 ${SGML_DTD3}
@@ -104,16 +107,16 @@ ipkg -m noac ${XMLTOMAN}
 ipkg ${XMLTO}
 
 # Graphic libraries
-ipkg ${LIBJPEG} "--enable-static --enable-shared"
-ipkg -m noac ${LIBOPENJPEG}
 ipkg ${LIBPNG}
+ipkg ${TIFF}
+ipkg -m acnb ${LCMS}
+ipkg ${LIBJPEG} "--enable-static --enable-shared"
+ipkg -m acnb ${LIBOPENJPEG}
 ipkg ${LIBART}
 ipkg ${LIBEXIF}
 ipkg ${FRIBIDI}
 ipkg -m acnb ${HICOLOR_ICON_THEME}
-ipkg ${TIFF}
 ipkg ${GIFLIB}
-ipkg -m acnb ${LCMS}
 ipkg -m noac ${LIBMNG}
 
 ipkg ${FREETYPE}
@@ -122,6 +125,9 @@ ipkg ${FONTCONFIG}
 ipkg -m noac ${CKERMIT}
 
 ipkg ${LIBTASN1}
+ipkg ${LIBUNISTRING}
+ipkg ${LIBFFI}
+ipkg ${BDWGC}
 ipkg ${GUILE} \
     --enable-posix \
     --disable-static \
@@ -129,6 +135,7 @@ ipkg ${GUILE} \
     --enable-regex
 ipkg ${LIBGPG_ERROR}
 ipkg ${LIBGCRYPT}
+ipkg ${NETTLE}
 ipkg -m acnb ${GNUTLS}
 
 # Mail
@@ -151,8 +158,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     if [ "x${SOUND_CARD}" = "xyes" ]; then
         # Utilitaires
         ipkg -m acnb ${NASM}
-        ipkg -m acnb ${VAMP}
-        ipkg ${FFTW} "--with-pic"
 
         ipkg ${ALSA_LIB}
         ipkg -m acnb ${ALSA_UTILS}
@@ -167,6 +172,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 	ipkg -m acnb ${FLAC}
 
 	ipkg ${LIBSNDFILE}
+        ipkg -m acnb ${VAMP}
+        ipkg ${FFTW} "--with-pic"
         ipkg ${LIBSAMPLERATE}
 	ipkg ${LAME}
         CFLAGS="-fPIC ${CFLAGS}" ipkg ${LIBA52} "--enable-shared"
diff --git a/stage3/packages-update b/stage3/packages-update
index 1436c95..3e4f99e 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -13,7 +13,7 @@ fpkg -m gnu ${WHICH}
 fpkg -s "software/utils/pciutils" ${PCIUTILS} ${KERNEL_URL}
 fpkg -m sf -e "tar.bz2" ${LIBUSB}
 fpkg -m sf -e "tar.bz2" -s "libusb" ${LIBUSB_COMPAT}
-fpkg -m sf -s "linux-usb/usbutils" ${USBUTILS}
+fpkg ${USBUTILS} "http://ftp.de.debian.org/debian/pool/main/u/usbutils"
 fpkg -s "linux/utils/fs/reiserfs" ${REISERFSPROGS} ${KERNEL_URL}
 fpkg -e "tar.gz" ${POPT} "http://rpm5.org/files/popt"
 fpkg -s "linux/libs/pam/library" ${PAM} ${KERNEL_URL}
@@ -28,9 +28,9 @@ fpkg -m apa -s apr ${APR_UTIL}
 fpkg -e "tar.gz" ${NEON} "http://www.webdav.org/neon"
 fpkg -m sf -s "tcl" ${TCL}
 fpkg -e "tar.gz" ${SQLITE} "http://www.sqlite.org"
-fpkg ${SUBVERSION} "http://subversion.tigris.org/downloads"
+fpkg ${SUBVERSION} "http://mirror.csclub.uwaterloo.ca/apache/subversion"
 fpkg -e "tar.gz" ${SUDO} "http://www.sudo.ws/sudo/dist"
-fpkg -m sf -e "tar.bz2" ${STRACE} 
+fpkg -m sf -e "tar.bz2" ${STRACE}
 fpkg -m sf ${PCRE}
 
 fpkg -m gnu ${WGET}
@@ -74,7 +74,7 @@ fpkg -m pm -s "C/CH/CHORNY"  ${PERL_MOD_XML_PARSER}
 fpkg -m hv ${ACK}
 fpkg -m hv -e "tar.gz" ${COLORDIFF}
 
-fpkg -m gnome ${INTLTOOL}
+fpkg -e "tar.gz" ${INTLTOOL} "http://launchpad.net/intltool/trunk/$(get_pkg_ver ${INTLTOOL})/+download"
 fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
 
 fpkg -e "tgz" ${SGML_COMMON} \
@@ -96,8 +96,8 @@ fpkg ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
 
 fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" -e "tar.gz" ${LIBJPEG} \
     "http://www.ijg.org/files"
-fpkg -f "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" \
-    -e "tar.gz" ${LIBOPENJPEG} "http://www.openjpeg.org"
+fpkg -e "tgz" ${LIBOPENJPEG} "http://openjpeg.googlecode.com/files"
+
 fpkg -m sf ${LIBPNG}
 fpkg -m gnome ${LIBART}
 fpkg -m sf ${LIBEXIF}
@@ -117,15 +117,19 @@ fpkg -e "tar.gz" ${FONTCONFIG} "http://fontconfig.org/release"
 fpkg -m hv ${CKERMIT}
 
 fpkg -m gnu ${LIBTASN1}
+fpkg -m gnu ${LIBUNISTRING}
+fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
+fpkg ${BDWGC} "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
 fpkg -m gnu ${GUILE}
 fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL}
 fpkg -s "libgcrypt"    ${LIBGCRYPT}    ${GNUPG_URL}
+fpkg -e "tar.gz" ${NETTLE} "http://www.lysator.liu.se/~nisse/archive"
 fpkg -s "gnutls"       ${GNUTLS}       ${GNUPG_URL}
 
 fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
 fpkg -e "tgz" ${OPENLDAP} \
     "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release"
-fpkg -m hv ${KERBEROS5}
+fpkg ${KERBEROS5} "http://web.mit.edu/kerberos/www/krb5/1.10"
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     fpkg -e "tar.gz" -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} \
@@ -156,7 +160,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
         fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files"
         fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
-  
+
         fpkg -m sf ${LAME}
         fpkg -m hv ${LIBA52}
         fpkg -m hv ${LIBID3TAG}
@@ -171,10 +175,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         fpkg -e "tar.gz" -f "pa_stable_v19_20071207" ${PORTAUDIO} \
           "http://www.portaudio.com/archives"
 
-        fpkg -m sf -s "vamp" ${VAMP}
+        fpkg -e "tar.gz" ${VAMP} "http://code.soundsoftware.ac.uk/attachments/download/224"
         fpkg -e "tar.gz" ${FFTW} "http://www.fftw.org"
         fpkg ${RUBBERBAND} \
-            "http://code.breakfastquay.com/attachments/download/16"
+            "http://code.breakfastquay.com/attachments/download/23"
 
         fpkg -e "tar.gz" ${SPEEX} "http://downloads.xiph.org/releases/speex"
         fpkg -e "tar.gz" ${JACK} "http://jackaudio.org/downloads"
diff --git a/stage3/pkg/bind b/stage3/pkg/bind
index 2c71ca0..bc22cfa 100644
--- a/stage3/pkg/bind
+++ b/stage3/pkg/bind
@@ -3,13 +3,8 @@
 hvconfig_pre()
 {
     groupadd -f named
-    hv_useradd -c BindOwner -g named -m -s /bin/false named
-}
-
-hvconfig_post()
-{
-    # Use updated address for L.ROOT-SERVERS.NET.
-    sed -i "s@198.32.64.12@199.7.83.42@" ${LFS_TMP}/${PACKAGE}/lib/dns/rootns.c
+    hv_useradd -c BindOwner -g named -s /bin/false named
+    install -d -m770 -o named -g named /srv/named
 }
 
 hvbuild_post()
@@ -24,18 +19,18 @@ hvbuild_post()
     # forever for keyboard input before continuing.
     BINDKEY=$(rndc-confgen -b 512 -r /dev/random | grep -m 1 "secret" | cut -d '"' -f 2)
 
-    cd /home/named
-    mkdir -p dev etc/namedb/{pz,slave} var/run
-    rm -f /home/named/dev/null
-    mknod /home/named/dev/null c 1 3
-    rm -f /home/named/dev/random
-    mknod /home/named/dev/random c 1 8
-    chmod 666 /home/named/dev/{null,random}
-    cp /etc/localtime /home/named/etc
+    cd /srv/named
+    mkdir -p dev etc/namedb/{pz,slave} var/run usr/lib
+    rm -f /srv/named/dev/null
+    mknod /srv/named/dev/null c 1 3
+    rm -f /srv/named/dev/random
+    mknod /srv/named/dev/random c 1 8
+    chmod 666 /srv/named/dev/{null,random}
+    cp /etc/localtime /srv/named/etc
 
     # Creating the named.conf file from which named will read the location of
     # zone files, root name servers and secure DNS keys.
-    cat > /home/named/etc/named.conf << "EOF"
+    cat > /srv/named/etc/named.conf << "EOF"
 options {
     directory "/etc/namedb";
     pid-file "/var/run/named.pid";
@@ -95,7 +90,7 @@ logging {
   };
 };
 EOF
-    sed -i -e "s!_BIND_KEY_!${BINDKEY}!g" /home/named/etc/named.conf
+    sed -i -e "s!_BIND_KEY_!${BINDKEY}!g" /srv/named/etc/named.conf
 
     cat > /etc/rndc.conf << "EOF"
 key rndc_key {
@@ -110,7 +105,7 @@ options {
 EOF
     sed -i -e "s!_BIND_KEY_!${BINDKEY}!g" /etc/rndc.conf
 
-    cat > /home/named/etc/namedb/pz/127.0.0 << "EOF"
+    cat > /srv/named/etc/namedb/pz/127.0.0 << "EOF"
 $TTL 3D
 @      IN      SOA     ns.local.domain. hostmaster.local.domain. (
                         1       ; Serial
@@ -122,7 +117,7 @@ $TTL 3D
 1               PTR     localhost.
 EOF
 
-    cat > /home/named/etc/namedb/root.hints << "EOF"
+    cat > /srv/named/etc/namedb/root.hints << "EOF"
 .                       6D  IN      NS      A.ROOT-SERVERS.NET.
 .                       6D  IN      NS      B.ROOT-SERVERS.NET.
 .                       6D  IN      NS      C.ROOT-SERVERS.NET.
@@ -151,7 +146,11 @@ L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
 M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
 EOF
 
-    chown -R named.named /home/named
+    # Needed to solve bug:
+    #   initializing DST: openssl failure
+    cp -a /usr/lib/engines /srv/named/usr/lib
+
+    chown -R named.named /srv/named
 
     # Bootscript
     install -v -m740 ${SCRDIR}/bootscripts/named /etc/rc.d/init.d
diff --git a/stage3/pkg/git b/stage3/pkg/git
index 8776b65..99f530f 100644
--- a/stage3/pkg/git
+++ b/stage3/pkg/git
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+hvconfig_pre()
+{
+    cd ${LFS_TMP}/${PACKAGE}
+    autoreconf -i
+}
+
 hvbuild_post()
 {
     decompress_package ${GIT_MANPAGES} /usr/share/man
diff --git a/stage3/pkg/krb5 b/stage3/pkg/krb5
index 8f6f0df..e35383b 100644
--- a/stage3/pkg/krb5
+++ b/stage3/pkg/krb5
@@ -14,7 +14,7 @@ hvconfig_pre()
 hvconfig()
 {
     cd ${LFS_TMP}/${PACKAGE}/src
-    ./configure CPPFLAGS="-I/usr/include/et -I/usr/include/ss -DEAI_NODATA=EAI_NONAME" \
+    ./configure CPPFLAGS="-I/usr/include/et -I/usr/include/ss" \
         ${CONFIGURE_OPTS}
 }
 
@@ -37,11 +37,11 @@ hvbuild_post()
     #fi
     #install -v -m755 /usr/sbin/login.krb5 /bin/login
 
-    mv -v /usr/lib/libdes425.so.3* /lib
-    mv -v /usr/lib/libkrb4.so.2* /lib
+########    mv -v /usr/lib/libdes425.so.3* /lib
+########    mv -v /usr/lib/libkrb4.so.2* /lib
 
-    ln -svfT ../../lib/libdes425.so.3.0 /usr/lib/libdes425.so
-    ln -svfT ../../lib/libkrb4.so.2.0 /usr/lib/libkrb4.so
+########    ln -svfT ../../lib/libdes425.so.3.0 /usr/lib/libdes425.so
+########    ln -svfT ../../lib/libkrb4.so.2.0 /usr/lib/libkrb4.so
 
     cat > /etc/krb5.conf << EOF
 [libdefaults]
diff --git a/stage3/pkg/usbutils b/stage3/pkg/usbutils
index 9a5f186..4793705 100644
--- a/stage3/pkg/usbutils
+++ b/stage3/pkg/usbutils
@@ -2,6 +2,9 @@
 
 hvconfig_pre()
 {
+    cd ${LFS_TMP}/${PACKAGE}
+    ./autogen.sh
+    make distclean
     CONFIGURE_OPTS="\
         ${CONFIGURE_OPTS} \
         --disable-zlib"
diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 52478e5..b6940ea 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -71,7 +71,6 @@ install_xorg_modules ${XORG_FONT}
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
 ipkg_xorg ${LUIT} "app"
 ipkg ${PIXMAN}
-ipkg ${LIBFFI}
 ipkg ${DBUS}
 ipkg ${GLIB}
 ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests"
diff --git a/stage4/packages-update b/stage4/packages-update
index d0514b7..6f924f6 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -84,7 +84,6 @@ fpkg -m fd -o "xlibs" -s "xkbdesc" -e "tar.bz2" ${XKEYBOARD_CONFIG}
 
 fpkg -m xorg -s app ${LUIT}
 fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
-fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
 
 fpkg -m fd -s "releases/dbus" ${DBUS}
 fpkg -m gnome ${GOBJECT_INSTROSPECTION}
-- 
2.20.1