Package: ekeyd
Version: 1.1.0-1
Severity: important
Tags: patch
User: [email protected]
Usertags: hurd
Hi,
as shown in [1], currently ekeyd fail to build on GNU/Hurd because of the
wrong check used for excluding the EGD Linux-only stuff.
Instead of checking that the build arch (that should be the host arch) contain
'kfreebsd' in its name, check that its OS is 'linux', and disable EDG if
it is not. The patch fixing that is attached.
Also, given that udev is Linux-only, the patch disables the udev recommend for
ekeyd, installing the udev stuff only if the host arch is Linux.
[1]
https://buildd.debian.org/fetch.cgi?pkg=ekeyd&arch=hurd-i386&ver=1.1.0-1&stamp=1257809385&file=log&as=raw
Thanks,
--
Pino
--- ekeyd-1.1.0.orig/debian/control
+++ ekeyd-1.1.0/debian/control
@@ -9,7 +9,7 @@
Package: ekeyd
Architecture: any
Depends: ${shlibs:Depends}, lua5.1, liblua5.1-socket2
-Recommends: udev
+Recommends: udev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
Suggests: munin-node
Description: Simtec Electronics UDEKEY01 Entropy Key Daemon
This does stuff with Entropy Keys. You want it if you have some.
--- ekeyd-1.1.0.orig/debian/rules
+++ ekeyd-1.1.0/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
-BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(findstring kfreebsd,$(BUILD_ARCH)),kfreebsd)
+DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifneq ($(DEB_HOST_ARCH_OS),linux)
SKIP_EGD_LINUX=YES
endif
@@ -22,15 +22,15 @@
dh_prep || dh_clean -k
dh_installdirs
$(MAKE) -C daemon install DESTDIR=$$(pwd)/debian/ekeyd BUILD_ULUSBD=yes
- install -m 644 doc/60-UDEKEY01.rules debian/ekeyd/lib/udev/rules.d/
- install -m 644 doc/60-UDEKEY01-UDS.rules
debian/ekeyd-uds/lib/udev/rules.d/60-UDEKEY01.rules
mv debian/ekeyd/usr/sbin/ekey-ulusbd debian/ekeyd-uds/usr/sbin/
mv debian/ekeyd/usr/share/man/man8/ekey-ulusbd.8.gz
debian/ekeyd-uds/usr/share/man/man8/
- install -m 755 doc/ekeyd-udev debian/ekeyd/lib/udev/ekeyd-udev
for RME in AUTHORS daemon/README daemon/README.security
daemon/README.protocol daemon/README.egd-protocol; do \
install -m 644 $$RME debian/ekeyd/usr/share/doc/ekeyd/ ; \
done
ifneq ($(SKIP_EGD_LINUX),YES)
+ install -m 644 doc/60-UDEKEY01.rules debian/ekeyd/lib/udev/rules.d/
+ install -m 644 doc/60-UDEKEY01-UDS.rules
debian/ekeyd-uds/lib/udev/rules.d/60-UDEKEY01.rules
+ install -m 755 doc/ekeyd-udev debian/ekeyd/lib/udev/ekeyd-udev
for RME in daemon/README.egd-linux daemon/README.egd-protocol; do \
install -m 644 $$RME
debian/ekeyd-egd-linux/usr/share/doc/ekeyd-egd-linux/ ; \
done
