Upgrade to gnupg-2.0.26

[hvlinux.git] / stage3 / hv-install-1

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 49b0916..74e4feb 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -87,7 +87,7 @@ ipkg ${CPIO} "\
 
 ipkg ${SCREEN}
 
-ipkg ${PARTED} "--disable-device-mapper"
+ipkg ${PARTED} "--disable-static --disable-device-mapper"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
 ipkg -m noac ${DOSFSTOOLS}
@@ -116,7 +116,7 @@ ipkg -m acnb ${OPENJADE} "--enable-splibdir=/usr/lib"
 ipkg -m noac ${DOCBOOK_DSSSL}
 ipkg -m noac ${SGML_SPM}
 ipkg ${DOCBOOK_UTILS}
-ipkg -m acnb ${LIBXML2}
+ipkg -m acnb ${LIBXML2} "--disable-static --with-history"
 ipkg -m acnb ${LIBXSLT}
 ipkg -m noac ${DOCBOOK_XML}
 ipkg -m noac ${DOCBOOK_XSL}
@@ -139,10 +139,10 @@ ipkg ${LIBART}
 ipkg ${LIBEXIF}
 ipkg ${FRIBIDI}
 ipkg -m acnb ${HICOLOR_ICON_THEME}
-ipkg ${GIFLIB}
-ipkg -m noac ${LIBMNG}
+ipkg ${GIFLIB} "--disable-static"
+ipkg -m acnb ${LIBMNG} "--disable-static"
 
-ipkg ${FREETYPE}
+ipkg ${FREETYPE} "--disable-static"
 ipkg ${FONTCONFIG}
 
 ipkg -m noac ${CKERMIT}
@@ -158,7 +158,7 @@ ipkg ${GUILE2} \
 ipkg ${LIBGPG_ERROR}
 ipkg ${LIBGCRYPT}
 ipkg ${NETTLE} "--libdir=/usr/lib"
-ipkg -m acnb ${GNUTLS}
+ipkg -m acnb ${GNUTLS} "--with-default-trust-store-file=/etc/ssl-ca-bundle.crt"
 
 # Mail
 ipkg -l "${SASL2}-pass1" -s "cyrus-sasl" ${SASL2}
@@ -172,7 +172,12 @@ else
     ipkg ${MSMTP}
 fi
 
-ipkg ${GNUPG} "--libexecdir=/usr/lib"
+ipkg ${PTH} "\
+    --disable-static \
+    --mandir=/usr/share/man"
+ipkg ${LIBASSUAN}
+ipkg ${LIBKSBA}
+ipkg ${GNUPG} "-enable-symcryptrun"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl --enable-hcache"
 
 ipkg ${YASM}
@@ -184,7 +189,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${ALSA_LIB}
         ipkg -m acnb ${ALSA_UTILS}
 
-        ipkg -m acnb ${CDPARANOIA}
+        ipkg -j -m acnb ${CDPARANOIA}
 
         ipkg -m noac -s "ladspa" ${LADSPA}