From 673ca97602256b0a0cf35771873ed1083e129f91 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 22 Dec 2014 12:14:53 -0500
Subject: [PATCH] Upgrade stage3 packages

---
 config/packages-list   | 62 +++++++++++++++++++++---------------------
 stage3/hv-install-1    |  4 +--
 stage3/packages-update | 13 +++++----
 stage3/pkg/unrar       |  2 +-
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index aa23929..21f81f8 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -10,15 +10,15 @@ AGG="agg-2.5"
 ALSA_LIB="alsa-lib-1.0.28"
 ALSA_PLUGINS="alsa-plugins-1.0.28"
 ALSA_UTILS="alsa-utils-1.0.28"
-APR="apr-1.4.6"
-APR_UTIL="apr-util-1.5.1"
+APR="apr-1.5.1"
+APR_UTIL="apr-util-1.5.4"
 AVRLIBC="avr-libc-1.8.0"
 AVR_GDB="gdb-6.4"
 AVRDUDE="avrdude-6.0.1"
 ATK="atk-2.14.0"
 ATKMM="atkmm-2.22.7"
 AUDACITY="audacity-minsrc-2.0.2"
-AUDIOFILE="audiofile-0.3.4"
+AUDIOFILE="audiofile-0.3.6"
 AUTOCONF="autoconf-2.69"
 AUTOMAKE="automake-1.14"
 
@@ -28,7 +28,7 @@ BASHCOMPLETION="bash-completion-20060301"
 BC="bc-1.06.95"
 BDWGC="bdwgc-7_2alpha5-20110107"
 BISON="bison-2.7.1"
-BIND="bind-9.9.1-P2"
+BIND="bind-9.10.1-P1"
 BINUTILS="binutils-2.24"
 BRIDGE_UTILS="bridge-utils-1.5"
 BZIP2="bzip2-1.0.6"
@@ -45,14 +45,14 @@ CKERMIT="ckermit-8.0.211"
 CHORDPACK="chordpack-0.8.2"
 CLAMAV="clamav-0.97.5"
 CLOOG="cloog-0.18.2"
-CMAKE="cmake-2.8.10"
+CMAKE="cmake-3.1.0"
 COLORDIFF="colordiff-1.0.10"
 COREUTILS="coreutils-8.21"
 CPIO="cpio-2.11"
 CUPS="cups-2.0.1"
 CUPS_FILTERS="cups-filters-1.0.61"
 CUPS_PDF="cups-pdf-2.5.1"
-CURL="curl-7.27.0"
+CURL="curl-7.39.0"
 CVS="cvs-1.11.23"
 
 DBUS="dbus-1.8.12"
@@ -88,7 +88,7 @@ EVINCE="evince-2.32.0"
 EVIV2="exiv2-0.24"
 EXPAT="expat-2.1.0"
 
-FCRON="fcron-3.0.6"
+FCRON="fcron-3.2.0"
 FETCHMAIL="fetchmail-6.3.21"
 FFMPEG="ffmpeg-2.5"
 FFTW="fftw-3.3.2"
@@ -96,14 +96,14 @@ FIREFOX="firefox-34.0.5"
 FILE_PKG="file-5.18"
 FINDUTILS="findutils-4.4.2"
 FIRMWARE_B43_LPPHY="broadcom-wl-5.100.138"
-FLAC="flac-1.3.0"
+FLAC="flac-1.3.1"
 FLEX="flex-2.5.37"
 FONTCONFIG="fontconfig-2.11.1"
 FONTFORGE="FontForge-2014.11.26"
 FOO2ZJS="foo2zjs"
 FOOMATIC_FILTERS="foomatic-filters-4.0.17"
 FREETYPE="freetype-2.5.4"
-FRIBIDI="fribidi-0.19.2"
+FRIBIDI="fribidi-0.19.6"
 FUSE="fuse-2.9.1"
 B43_FWCUTTER="b43-fwcutter-015"
 
@@ -123,7 +123,7 @@ GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11"
 GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0"
 GIFLIB="giflib-5.1.0"
 GIMP="gimp-2.8.14"
-GIT="git-1.9.0"
+GIT="git-2.2.1"
 GLIB="glib-2.42.1"
 GLIB_NETWORKING="glib-networking-2.42.1"
 GLIBMM="glibmm-2.42.0"
@@ -188,7 +188,7 @@ INETUTILS="inetutils-1.9.2"
 INKSCAPE="inkscape-0.48.5"
 INTLTOOL="intltool-0.50.2"
 IPROUTE2="iproute2-3.3.0"
-IPTABLES="iptables-1.4.15"
+IPTABLES="iptables-1.4.21"
 ISO_CODES="iso-codes-3.57"
 ISL="isl-0.12.2"
 ITSTOOL="itstool-2.0.2"
@@ -213,7 +213,7 @@ LIBA52="a52dec-0.7.4"
 LIBART="libart_lgpl-2.3.21"
 LIBASSUAN="libassuan-2.2.0"
 BOOST="boost_1_57_0"
-LIBARCHIVE="libarchive-3.0.4"
+LIBARCHIVE="libarchive-3.1.2"
 LIBCROCO="libcroco-0.6.8"
 LIBDVDCSS="libdvdcss-1.3.0"
 LIBDVDREAD="libdvdread-5.0.0"
@@ -223,20 +223,20 @@ LIBFAAD2="faad2-2.7"
 LIBFAAC="faac-1.28"
 LIBFFI="libffi-3.0.11"
 LIBGAMIN="gamin-0.1.10"
-LIBGCRYPT="libgcrypt-1.5.0"
+LIBGCRYPT="libgcrypt-1.6.2"
 LIBGLADE="libglade-2.6.4"
 LIBGPG_ERROR="libgpg-error-1.17"
 LIBGSF="libgsf-1.14.30"
 LIBID3TAG="libid3tag-0.15.1b"
-LIBJPEG="libjpeg-turbo-1.3.0"
+LIBJPEG="libjpeg-turbo-1.3.1"
 LIBKSBA="libksba-1.3.2"
 LIBMAD="libmad-0.15.1b"
 LIBMNG="libmng-2.0.2"
 LIBNL="libnl-3.2.22"
 LIBNOTIFY="libnotify-0.5.2"
-LIBOGG="libogg-1.3.0"
+LIBOGG="libogg-1.3.2"
 LIBOIL="liboil-0.3.17"
-LIBOPENJPEG="openjpeg-1.5.0"
+LIBOPENJPEG="openjpeg-1.5.2"
 LIBPCAP="libpcap-1.3.0"
 LIBPIPELINE="libpipeline-1.4.0"
 LIBPNG="libpng-1.6.15"
@@ -248,12 +248,12 @@ LIBSNDFILE="libsndfile-1.0.25"
 LIBSOUP="libsoup-2.48.1"
 LIBSPF2="libspf2-1.2.9"
 LIBSPECTRE="libspectre-0.2.7"
-LIBTASN1="libtasn1-2.13"
+LIBTASN1="libtasn1-4.2"
 LIBTHEORA="libtheora-1.1.1"
-LIBTIRPC="libtirpc-0.2.2"
+LIBTIRPC="libtirpc-0.2.5"
 RPCNIS_HEADERS="rpcnis-headers"
 LIBTOOL="libtool-2.4.2"
-LIBVORBIS="libvorbis-1.3.3"
+LIBVORBIS="libvorbis-1.3.4"
 VORBIS_TOOLS="vorbis-tools-1.4.0"
 VORBISGAIN="vorbisgain-0.36"
 LIBVPX="libvpx-v1.3.0"
@@ -263,8 +263,8 @@ LIBUSB_COMPAT="libusb-compat-0.1.4"
 LIBWNCK="libwnck-2.30.7"
 LIBXKLAVIER="libxklavier-5.3"
 LIBXML2="libxml2-2.9.2"
-LIBXSLT="libxslt-1.1.26"
-LIBX264="x264-snapshot-20130416-2245"
+LIBXSLT="libxslt-1.1.28"
+LIBX264="x264-snapshot-20141208-2245"
 LIGHTTPD="lighttpd-1.4.32"
 LILYPOND="lilypond-2.18.2"
 LLVM="llvm-3.1"
@@ -295,10 +295,10 @@ MYSQL="mysql-5.5.28"
 NANO="nano-2.2.6"
 NASM="nasm-2.10.04"
 NCURSES="ncurses-5.9"
-NEON="neon-0.29.6"
+NEON="neon-0.30.1"
 NETTLE="nettle-2.7.1"
 NEWLIB="newlib-1.16.0"
-NFS_UTILS="nfs-utils-1.2.5"
+NFS_UTILS="nfs-utils-1.3.1"
 NMAP="nmap-6.01"
 NSPR="nspr-4.10.7"
 NSS="nss-3.17.3"
@@ -314,7 +314,7 @@ PANGO="pango-1.36.8"
 PANGOMM="pangomm-2.34.0"
 PARTED="parted-3.2"
 PATCH_PACKAGE="patch-2.7.1"
-PCIUTILS="pciutils-3.2.0"
+PCIUTILS="pciutils-3.3.0"
 MENU_CACHE="menu-cache-0.3.3"
 LIBFM="libfm-1.2.3"
 PCMANFM="pcmanfm-1.2.3"
@@ -355,9 +355,9 @@ QT="qt-everywhere-opensource-src-4.8.5"
 
 RALENTI="ralenti-0.1"
 READLINE="readline-6.3"
-REISERFSPROGS="reiserfsprogs-3.6.21"
+REISERFSPROGS="reiserfsprogs-3.6.24"
 RFKILL="rfkill-0.5"
-RPCBIND="rpcbind-0.2.0"
+RPCBIND="rpcbind-0.2.2"
 RSYNC="rsync-3.0.9"
 RUBBERBAND="rubberband-1.7.0"
 
@@ -412,10 +412,10 @@ TUNCTL="tunctl-1.5"
 TZDATA="tzdata2014j"
 
 EUDEV="eudev-1.7"
-UNRAR="unrar-4.2.4"
+UNRAR="unrar-5.2.3"
 UNZIP="unzip-6.0"
 UPSTART="upstart-0.6.3"
-USBUTILS="usbutils-006"
+USBUTILS="usbutils-008"
 UTIL_LINUX="util-linux-2.23.1"
 UW_IMAP="imap-2007e"
 
@@ -427,7 +427,7 @@ VOBCOPY="vobcopy-1.2.0"
 VTE="vte-0.28.2"
 
 WEBKIT="webkit-1.8.3"
-WGET="wget-1.14"
+WGET="wget-1.16.1"
 WHICH="which-2.20"
 WINDOWMAKER="WindowMaker-0.95.6"
 WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
@@ -462,11 +462,11 @@ LIBXCB="libxcb-1.8.1"
 XDG_UTILS="xdg-utils-1.1.0-rc1"
 XARCHIVER="xarchiver-0.5.2"
 XINETD="xinetd-2.3.15"
-XMLTO="xmlto-0.0.25"
+XMLTO="xmlto-0.0.26"
 XMLTOMAN="xmltoman-0.4"
 XSCREENSAVER="xscreensaver-5.32"
 XTERM="xterm-293"
-XVIDCORE="xvidcore-1.3.2"
+XVIDCORE="xvidcore-1.3.3"
 XZ_UTILS="xz-5.0.4"
 
 YASM="yasm-1.3.0"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 74e4feb..d936200 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -24,7 +24,7 @@ ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
-ipkg ${APR} "--disable-static --with-installbuilddir=/usr/share/apr-1/build"
+ipkg -j ${APR} "--disable-static --with-installbuilddir=/usr/share/apr-1/build"
 ipkg ${APR_UTIL} "--with-apr=/usr --with-gdbm=/usr -with-openssl=/usr"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
@@ -47,7 +47,7 @@ ipkg -m acnb ${HTOP}
 
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
-ipkg -m acnb ${RPCBIND} "--bindir=/sbin --with-rpcuser=root"
+ipkg -m acnb ${RPCBIND} "--bindir=/sbin --with-rpcuser=root --with-systemdsystemunitdir=no"
 LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} " \
     --disable-nfsv4 \
     --disable-nfsv41 \
diff --git a/stage3/packages-update b/stage3/packages-update
index 2e344e8..e63a516 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -51,7 +51,7 @@ 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" ${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} \
@@ -71,9 +71,9 @@ 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" ${DIALOG} "ftp://ftp.us.debian.org/debian/pool/main/d/dialog"
 
@@ -106,7 +106,7 @@ fpkg -m sf ${XMLTOMAN}
 fpkg ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
 
 fpkg -m sf -e "tar.gz" ${LIBJPEG}
-fpkg -e "tar.gz" ${LIBOPENJPEG} "http://openjpeg.googlecode.com/files"
+fpkg -m sf -e "tar.gz" ${LIBOPENJPEG}
 
 fpkg -m sf ${LIBPNG}
 fpkg -m gnome ${LIBART}
@@ -185,7 +185,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"
diff --git a/stage3/pkg/unrar b/stage3/pkg/unrar
index 51221be..6cdfed2 100644
--- a/stage3/pkg/unrar
+++ b/stage3/pkg/unrar
@@ -3,6 +3,6 @@
 hvbuild()
 {
     cd ${LFS_TMP}/${PACKAGE}
-    make -f makefile.unix
+    make -f makefile
     install -v -m755 unrar /usr/bin
 }
-- 
2.20.1