Add pinentry for gnupg

[hvlinux.git] / stage3 / packages-update

diff --git a/stage3/packages-update b/stage3/packages-update
index 0059278..8275cdf 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -18,7 +18,6 @@ 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"
@@ -40,7 +39,7 @@ 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}
@@ -51,7 +50,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} \
@@ -62,7 +61,7 @@ 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}
@@ -71,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"
 
@@ -85,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"
 
@@ -106,7 +108,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}
@@ -147,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"
@@ -182,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"