Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (8c0ece04c2e73ff31a7c198cee4834d29873ef96)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (8c0ece04c2e73ff31a7c198cee4834d29873ef96)
  • Date: Thu, 30 Jun 2016 05:10:25 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/qemu/BUILD | 4 ++
utils/qemu/CONFIGURE | 5 ++-
utils/qemu/DEPENDS | 14
+++-------
utils/qemu/HISTORY | 4 ++
utils/qemu/PRE_SUB_DEPENDS | 2 -
utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS | 6
++++
utils/qemu/SUB_DEPENDS | 4 +-
7 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 8c0ece04c2e73ff31a7c198cee4834d29873ef96
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: May only have one of nettle or libgcrypt

ERROR: Only one of gcrypt & nettle can be enabled

commit f82bf92b76ca67db3568eb127ea88b5fc5a26a90
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: nss dependency moved to libcacard in 2.6.0

I based this on smartcard being related to nss in prior versions.

ERROR: unknown option --enable-smartcard-nss

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 792a9b7..875f0ca 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -2,6 +2,10 @@ message "${MESSAGE_COLOR}Target list:
$QEMU_ARCHS${DEFAULT_COLOR}" &&

cd "${SOURCE_DIRECTORY}" &&

+if [[ "x${QEMU_VNC_TLS}" == "xnone" ]]; then
+ OPTS="${OPTS} --disable-gcrypt --disable-nettle"
+fi &&
+
./configure --prefix="$INSTALL_ROOT/usr" \
--sysconfdir="$INSTALL_ROOT/etc" \
--localstatedir="$INSTALL_ROOT/var" \
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 5f3d3ee..628ab77 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -39,4 +39,7 @@ config_query_option QEMU_TPM "Enable Trusted Platform
Module (TPM)?" n \

config_query_option QEMU_VNC "Enable VNC support?" y \
'--enable-vnc' \
- '--disable-vnc --disable-vnc-sasl --disable-vnc-jpeg
--disable-vnc-png'
+ '--disable-vnc --disable-vnc-sasl --disable-vnc-jpeg
--disable-vnc-png' &&
+
+config_query_multi QEMU_VNC_TLS "Enable TLS encryption in VNC?" 'none'
'nettle' 'gcrypt'
+
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 8d928f0..24db2c1 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -116,15 +116,11 @@ if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
"--disable-gnutls" \
"to enable TLS encryption for VNC server" &&

- suggest_depends nettle \
- "--enable-nettle" \
- "--disable-nettle" \
- "to enable TLS encryption for VNC server" &&
-
- suggest_depends libgcrypt \
- "--enable-gcrypt" \
- "--disable-gcrypt" \
- "to enable TLS encryption for VNC server" &&
+ if [[ "x${QEMU_VNC_TLS}" == "xnettle" ]]; then
+ depends nettle '--enable-nettle --disable-gcrypt'
+ elif [[ "x${QEMU_VNC_TLS}" == "xgcrypt" ]]; then
+ depends libgcrypt '--enable-gcrypt --disable-nettle'
+ fi &&

suggest_depends LIBSASL \
"--enable-vnc-sasl" \
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 27d32f7..3288c89 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,7 @@
+2016-06-29 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: nss dependency moved to libcacard in
2.6.0
+ * CONFIGURE, DEPENDS, BUILD: May only have one of nettle or libgcrypt
+
2016-06-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.6.0
* DEPENDS, CONFIGURE: Updated dependencies and flags
diff --git a/utils/qemu/PRE_SUB_DEPENDS b/utils/qemu/PRE_SUB_DEPENDS
index c19df56..be9c910 100755
--- a/utils/qemu/PRE_SUB_DEPENDS
+++ b/utils/qemu/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NSS) is_depends_enabled $SPELL nss && return 0;;
+ NSS) is_depends_enabled $SPELL libcacard && return 0;;
*) echo "unknown sub_depends!" ;;
esac
return 1
diff --git
a/utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
b/utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..be9c910
--- /dev/null
+++ b/utils/qemu/REPAIR^35e01f923e4981c9151fa98a1e228423^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL libcacard && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/utils/qemu/SUB_DEPENDS b/utils/qemu/SUB_DEPENDS
index 75b63ab..dd6e029 100755
--- a/utils/qemu/SUB_DEPENDS
+++ b/utils/qemu/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
- NSS) echo "nss support requested, forcing nss dependency." &&
- depends nss '--enable-smartcard-nss'
+ NSS) echo "nss/smartcard support requested, forcing libcacard dependency."
&&
+ depends libcacard '--enable-smartcard'
;;
*) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (8c0ece04c2e73ff31a7c198cee4834d29873ef96), Eric Sandall, 06/30/2016

Archive powered by MHonArc 2.6.24.

Top of Page