X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpackages-update;h=8275cdfefe949c610e46dd0700082af44f235e09;hb=6039efc819b29ad7fa890c95fda918c57ebe475c;hp=de074d91dde39c6d7a12ac50268ed72127df4658;hpb=e941771d74ef457edb2c321a76e88a7c9a79c7f8;p=hvlinux.git

diff --git a/stage3/packages-update b/stage3/packages-update
index de074d9..8275cdf 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_HV_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
@@ -18,14 +14,13 @@ 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 -e "tar.xz" -s "linux/utils/usb/usbutils" ${USBUTILS} ${KERNEL_URL}
+fpkg -e "tar.xz" -s "software/network/rfkill" ${RFKILL} ${KERNEL_URL}
 fpkg ${REISERFSPROGS} "ftp://anduin.linuxfromscratch.org/BLFS/svn/r"
 fpkg -e "tar.gz" ${POPT} "http://rpm5.org/files/popt"
 fpkg -m sf ${LIBTIRPC}
-fpkg ${RPCNIS_HEADERS} "http://anduin.linuxfromscratch.org/other"
 fpkg ${PAM} "https://fedorahosted.org/releases/l/i/linux-pam"
 fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} "http://fcron.free.fr/archives"
 fpkg -e "tar.gz" ${OPENSSL} "ftp://ftp.openssl.org/source"
-fpkg ${OPENSSL_ROOT_CERTS} "http://anduin.linuxfromscratch.org/files/BLFS"
 fpkg -e "tar.gz" ${OPENSSH} "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable"
 fpkg ${LYNX} "ftp://lynx.isc.org/current"
 fpkg -m sf ${EXPAT}
@@ -33,30 +28,30 @@ fpkg -m apa ${APR}
 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 -e "tar.gz" ${SQLITE} "http://www.sqlite.org/2014"
 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.xz" ${STRACE}
 fpkg -m sf ${PCRE}
+fpkg -m sf ${HTOP}
 
 fpkg -m gnu ${WGET}
 fpkg -e "tar.gz" ${TCPWRAPPERS} "ftp://ftp.porcupine.org/pub/security"
 fpkg -m sf ${RPCBIND}
 fpkg -m sf -s "nfs" ${NFS_UTILS}
-fpkg -e "tar.gz" ${XINETD} "http://www.xinetd.org"
+fpkg -m hv -e "tar.gz" ${XINETD}
 fpkg -m sf ${DDCLIENT}
 fpkg -e "tar.gz" ${LIBPCAP} ${TCPDUMP_URL}
 fpkg -e "tar.gz" ${TCPDUMP} ${TCPDUMP_URL}
 fpkg ${NMAP} "http://download.insecure.org/nmap/dist"
-fpkg -e "tar.gz" -s "$(get_pkg_ver ${BIND})" ${BIND} \
-    "ftp://ftp.isc.org/isc/bind9"
+fpkg -e "tar.gz" -v 0 ${BIND} "ftp://ftp.isc.org/isc/bind9"
 fpkg ${IPTABLES} "http://www.netfilter.org/projects/iptables/files"
 fpkg ${CURL} "http://curl.haxx.se/download"
 fpkg -e "tar.gz" ${RSYNC} "http://samba.org/ftp/rsync/src"
 fpkg -m hv ${GETDATE}
 
-fpkg -e "tar.gz" ${LIBARCHIVE} "http://github.com/downloads/libarchive/libarchive"
-fpkg -e "tar.gz" ${CMAKE} "http://www.cmake.org/files/v$(get_pkg_ver2 ${CMAKE})"
+fpkg -e "tar.gz" ${LIBARCHIVE} "http://www.libarchive.org/downloads"
+fpkg -e "tar.gz" -s "v" -v 2 ${CMAKE} "http://www.cmake.org/files"
 
 fpkg -e "tar.gz" ${MYSQL} \
     "http://anduin.linuxfromscratch.org/sources/BLFS/svn/m"
@@ -66,7 +61,8 @@ fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" \
     -e "tar.gz" ${UNZIP} ${SOURCEFORGE_URL}
 fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" -e "tar.gz" ${UNRAR} \
     "http://www.rarlab.com/rar"
-fpkg -m sf -s "p7zip" ${P7ZIP}
+fpkg -m sf -s "p7zip" -f "${P7ZIP}_src_all" ${P7ZIP}
+fpkg -e "tar.gz" ${PBZIP2} "http://compression.ca/pbzip2"
 fpkg -m gnu ${CPIO}
 fpkg -m gnu ${SCREEN}
 
@@ -74,9 +70,11 @@ fpkg -m gnu ${PARTED}
 fpkg -m sf ${FUSE}
 fpkg -e "tar.gz" ${DOSFSTOOLS} "http://fossies.org/linux/misc"
 
-fpkg -e "tar.gz" ${GIT} "http://git-core.googlecode.com/files"
-fpkg -e "tar.gz" "git-manpages-$(get_pkg_ver ${GIT})" \
-    "http://git-core.googlecode.com/files"
+fpkg -e "tar.xz" -s "software/scm/git" ${GIT} ${KERNEL_URL}
+fpkg -e "tar.gz" -s "software/scm/git" \
+     "git-manpages-$(get_pkg_ver ${GIT})" ${KERNEL_URL}
+fpkg -e "tar.gz" ${GIT_CRYPT} \
+     "https://www.agwa.name/projects/git-crypt/downloads"
 
 fpkg -e "tar.gz" ${DIALOG} "ftp://ftp.us.debian.org/debian/pool/main/d/dialog"
 
@@ -88,6 +86,7 @@ fpkg -m pm -s "C/CH/CHORNY"  ${PERL_MOD_XML_PARSER}
 # Utilities
 fpkg -m hv ${ACK}
 fpkg -e "tar.gz" ${COLORDIFF} "http://colordiff.sourceforge.net"
+fpkg -m gnu ${GDB}
 
 fpkg -e "tar.gz" ${INTLTOOL} "http://launchpad.net/intltool/trunk/$(get_pkg_ver ${INTLTOOL})/+download"
 
@@ -108,9 +107,8 @@ fpkg -m sf -s "docbook" ${DOCBOOK_XSL}
 fpkg -m sf ${XMLTOMAN}
 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 -e "tar.gz" ${LIBOPENJPEG} "http://openjpeg.googlecode.com/files"
+fpkg -m sf -e "tar.gz" ${LIBJPEG}
+fpkg -m sf -e "tar.gz" ${LIBOPENJPEG}
 
 fpkg -m sf ${LIBPNG}
 fpkg -m gnome ${LIBART}
@@ -137,7 +135,7 @@ fpkg -m gnu ${GUILE2}
 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 -e "tar.xz" -s "gnutls"       ${GNUTLS}       ${GNUPG_URL}
+fpkg -e "tar.xz" -s "gnutls/v" -v 2 ${GNUTLS} ${GNUPG_URL}
 
 fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
 fpkg -e "tgz" ${OPENLDAP} \
@@ -151,7 +149,11 @@ else
     fpkg -m sf -e "tar.bz2" ${MSMTP}
 fi
 
-fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
+fpkg -m gnu ${PTH}
+fpkg -s "libassuan" ${LIBASSUAN} ${GNUPG_URL}
+fpkg -s "libksba" ${LIBKSBA} ${GNUPG_URL}
+fpkg -s "pinentry" ${PINENTRY} ${GNUPG_URL}
+fpkg -s "gnupg" ${GNUPG} ${GNUPG_URL}
 fpkg -m sf ${MUTT}
 
 fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases"
@@ -160,8 +162,7 @@ fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases"
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     if [ "x${SOUND_CARD}" = "xyes" ]; then
 
-        fpkg ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds/$(get_pkg_ver \
-          ${NASM})"
+        fpkg -v 0 ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds"
         fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
         fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
 
@@ -172,7 +173,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg"
         fpkg -e "tar.gz" ${LIBVORBIS} \
             "http://downloads.xiph.org/releases/vorbis"
-        fpkg -m sf ${FLAC}
+        fpkg -e "zip" ${VORBISGAIN} "http://sjeng.org/ftp/vorbis"
+        fpkg -e "tar.xz" ${FLAC} "http://downloads.xiph.org/releases/flac"
 
         fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files"
         fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
@@ -186,7 +188,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
         fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
         fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads"
-        fpkg ${LIBX264} "ftp://ftp.videolan.org/pub/videolan/x264/snapshots"
+        fpkg -f "${LIBX264}-stable" ${LIBX264} \
+             "ftp://ftp.videolan.org/pub/videolan/x264/snapshots"
 
         fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
         fpkg -e "tgz" ${PORTAUDIO} "http://www.portaudio.com/archives"