sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (d3fedf4c4eecd6fd59912e790fcf73d143b54b92)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (d3fedf4c4eecd6fd59912e790fcf73d143b54b92)
- Date: Sat, 25 Apr 2015 06:34:47 -0500
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
xorg-xserver/xorg-server/CONFIGURE | 7 +++++++
xorg-xserver/xorg-server/DEPENDS | 16 ++++++++++++++++
xorg-xserver/xorg-server/HISTORY | 4 ++++
3 files changed, 27 insertions(+)
New commits:
commit d3fedf4c4eecd6fd59912e790fcf73d143b54b92
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xorg-server: fixed build with upgrading of libgcrypt and further upgrades
of all crypto libraries (because of missing actual dependencies)
(cherry picked from commit 7b17606dc5043d0552a43734bd23979c9406c41c)
Conflicts:
xorg-xserver/xorg-server/DEPENDS
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index b298eda..1d2492e 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -1,6 +1,13 @@
list_remove XORG_SERVER_OPTS "--enable-multibuffer" "--disable-multibuffer"
. $GRIMOIRE/config_query_multi.function
+
+# for order see configure.ac
+config_query_list XORG_SHA1 "Choose SHA1 implementation:" \
+ nettle \
+ libgcrypt \
+ openssl &&
+
config_query XORG_XINITRC_XSESSION \
"install a .desktop file that calls the user's .xinitrc?" \
n
&&
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 60c9a1e..1c2548d 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -1,5 +1,17 @@
. $GRIMOIRE/FUNCTIONS
+case "$XORG_SHA1" in
+ nettle)
+ depends nettle '--with-sha1=libnettle'
+ ;;
+ libgcrypt)
+ depends libgcrypt '--with-sha1=libgcrypt'
+ ;;
+ openssl)
+ depends SSL '--with-sha1=libcrypto'
+ ;;
+esac &&
+
#
## Check this every release as X.org likes to change things on us...
#
@@ -145,7 +157,11 @@ depends font-cursor-misc &&
depends font-misc-misc &&
depends font-alias &&
depends libpciaccess &&
+<<<<<<< HEAD
depends SSL &&
+=======
+depends libxtst &&
+>>>>>>> 7b17606... xorg-server: fixed build with upgrading of libgcrypt and
further upgrades of all crypto libraries (because of missing actual
dependencies)
if list_find "$XORG_SERVER_FONT_100DPI" "all"
then
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 0a698de..a88eec8 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added selection of SHA1 implementation
+ * DEPENDS: fixed dependencies on a crypto library
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER
- [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (d3fedf4c4eecd6fd59912e790fcf73d143b54b92), Vlad Glagolev, 04/25/2015
Archive powered by MHonArc 2.6.24.