Skip to Content.
Sympa Menu

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

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 (deff2078d9b3033cef0708f6c6aa848815b571d2)
  • Date: Wed, 16 Aug 2017 02:18:59 +0000

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

crypto/gnupg/HISTORY | 5 +++++
crypto/gnupg/TRIGGERS | 6 +++++-
disk/udev/DEPENDS | 4 ++++
disk/udev/HISTORY | 5 +++++
4 files changed, 19 insertions(+), 1 deletion(-)

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

gnupg, udev: Fix udev -> eudev migration if gnupg is built with LIBUSB

When udev is dispelled, we no longer have libudev.so.0 which gnupg
requires when
built with LIBUSB support, breaking all further casts (by breaking GPG
integrity
checking).

diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index ade9bb7..22c9a80 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,8 @@
+2017-08-15 Eric Sandall <sandalle AT sourcemage.org>
+ * TRIGGERS: If gnupg is built with LIBUSB (requires libudev.so),
re-cast
+ udev will depend on gnupg built statically if this is the case
+ Fixes udev -> eudev migration
+
2016-08-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.21, SECURITY_PATCH=13

diff --git a/crypto/gnupg/TRIGGERS b/crypto/gnupg/TRIGGERS
index 37f3e4f..d65907a 100755
--- a/crypto/gnupg/TRIGGERS
+++ b/crypto/gnupg/TRIGGERS
@@ -1,5 +1,9 @@
-
if is_depends_enabled $SPELL curl
then
on_cast curl check_self
+fi &&
+
+# Work around migration from udev -> eudev if gnupg is built with LIBUSB
support
+if is_depends_enabled gnupg $(get_spell_provider gnupg LIBUSB); then
+ on_pre_dispel udev cast_self
fi
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index f319ce2..f03b749 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,2 +1,6 @@
+# Work around udev -> eudev migration if gnupg is built with LIBUSB support
+if is_depends_enabled gnupg $(get_spell_provider gnupg LIBUSB); then
+ depends -sub STATIC gnupg
+fi &&
depends eudev &&
force_depends eudev
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index c0b4057..407d596 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,8 @@
+2017-08-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: If gnupg is built with LIBUSB (requires libudev.so), depend
+ on gnupg built statically.
+ Fixes udev -> eudev migration
+
2017-08-12 Remko van der Vossen <wich AT sourcemage.org>
* PROVIDES: remove DEVICE-MANAGER
* everything: deprecate udev in favour of eudev



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (deff2078d9b3033cef0708f6c6aa848815b571d2), Eric Sandall, 08/18/2017

Archive powered by MHonArc 2.6.24.

Top of Page