Source: gnunet
Version: 0.9.5a-3
Severity: important
Tags: patch
Hi,
currently gnunet FTBFS on kfreebsd-*[1][2] and hurd-i386[3].
The problem is due to the gnunet-server.install.kfreebsd and
gnunet-server.install.hurd files, which are outdated w.r.t.
gnunet-server.install.
Attached there is a patch which
a) removes the useless leftovers of vpn, dns and gns stuff (which are
useless as the related libraries are not built)
b) generates gnunet-server.install.kfreebsd/.hurd dynamically based on
gnunet-server.install, so they don't need to be shipped "statically"
c) removes the now-dynamically-generated
gnunet-server.install.kfreebsd/.hurd files
Note I didn't test the result on either kFreeBSD or Hurd, so #702101
could still apply (and thus requiring more work).
[1]
https://buildd.debian.org/status/fetch.php?pkg=gnunet&arch=kfreebsd-i386&ver=0.9.5a-3&stamp=1393772529
[2]
https://buildd.debian.org/status/fetch.php?pkg=gnunet&arch=kfreebsd-amd64&ver=0.9.5a-3&stamp=1393715732
[3]
https://buildd.debian.org/status/fetch.php?pkg=gnunet&arch=hurd-i386&ver=0.9.5a-3&stamp=1393719014
Thanks,
--
Pino
--- a/debian/gnunet-server.install.hurd
+++ /dev/null
@@ -1,62 +0,0 @@
-etc/gnunet.conf
-usr/bin/gnunet-arm
-usr/bin/gnunet-ats
-usr/bin/gnunet-config
-usr/bin/gnunet-core
-usr/bin/gnunet-fs
-usr/bin/gnunet-gns*
-usr/bin/gnunet-mesh
-usr/bin/gnunet-namestore
-usr/bin/gnunet-nat-server
-usr/bin/gnunet-peerinfo
-usr/bin/gnunet-resolver
-usr/bin/gnunet-rsa
-usr/bin/gnunet-testing
-usr/bin/gnunet-testing-run-service
-usr/bin/gnunet-transport
-usr/bin/gnunet-transport-certificate-creation
-usr/lib/*/gnunet/libexec/*
-usr/lib/*/libgnunetarm.so.*
-usr/lib/*/libgnunetats.so.*
-usr/lib/*/libgnunetblock.so.*
-usr/lib/*/libgnunetcore.so.*
-usr/lib/*/libgnunetdatacache.so.*
-usr/lib/*/libgnunetdht.so.*
-usr/lib/*/libgnunetdnsstub.so.*
-usr/lib/*/libgnunetfragmentation.so.*
-usr/lib/*/libgnunethello.so.*
-usr/lib/*/libgnunetlockmanager.so.0*
-usr/lib/*/libgnunetmesh.so.*
-usr/lib/*/libgnunetnamestore.so.*
-usr/lib/*/libgnunetnat.so.*
-usr/lib/*/libgnunetnse.so.*
-usr/lib/*/libgnunetpeerinfo.so.*
-usr/lib/*/libgnunetregex.so.*
-usr/lib/*/libgnunetregexblock.so.*
-usr/lib/*/libgnunetstream.so.*
-usr/lib/*/libgnunettesting.so.*
-usr/lib/*/libgnunettestbed.so.0*
-usr/lib/*/libgnunettransport.so.*
-usr/lib/*/libgnunettransporttesting.so.*
-usr/lib/*/libgnunettun.so.*
-usr/lib/*/gnunet/*.so
-usr/share/gnunet/config.d
-usr/share/gnunet/hellos/*
-usr/share/gnunet/testing_hostkeys.ecc
-usr/share/man/man1/gnunet-arm.1
-usr/share/man/man1/gnunet-ats.1
-usr/share/man/man1/gnunet-config.1
-usr/share/man/man1/gnunet-core.1
-usr/share/man/man1/gnunet-dns2gns.1
-usr/share/man/man1/gnunet-fs.1
-usr/share/man/man1/gnunet-gns.1
-usr/share/man/man1/gnunet-gns-fcfsd.1
-usr/share/man/man1/gnunet-gns-proxy.1
-usr/share/man/man1/gnunet-namestore.1
-usr/share/man/man1/gnunet-nat-server.1
-usr/share/man/man1/gnunet-peerinfo.1
-usr/share/man/man1/gnunet-rsa.1
-usr/share/man/man1/gnunet-transport.1
-usr/share/man/man1/gnunet-vpn.1
-usr/share/man/man5/gnunet.conf.5
-debian/man/* usr/share/man/man1/
--- a/debian/gnunet-server.install.kfreebsd
+++ /dev/null
@@ -1,62 +0,0 @@
-etc/gnunet.conf
-usr/bin/gnunet-arm
-usr/bin/gnunet-ats
-usr/bin/gnunet-config
-usr/bin/gnunet-core
-usr/bin/gnunet-fs
-usr/bin/gnunet-gns*
-usr/bin/gnunet-mesh
-usr/bin/gnunet-namestore
-usr/bin/gnunet-nat-server
-usr/bin/gnunet-peerinfo
-usr/bin/gnunet-resolver
-usr/bin/gnunet-rsa
-usr/bin/gnunet-testing
-usr/bin/gnunet-testing-run-service
-usr/bin/gnunet-transport
-usr/bin/gnunet-transport-certificate-creation
-usr/lib/*/gnunet/libexec/*
-usr/lib/*/libgnunetarm.so.*
-usr/lib/*/libgnunetats.so.*
-usr/lib/*/libgnunetblock.so.*
-usr/lib/*/libgnunetcore.so.*
-usr/lib/*/libgnunetdatacache.so.*
-usr/lib/*/libgnunetdht.so.*
-usr/lib/*/libgnunetdnsstub.so.*
-usr/lib/*/libgnunetfragmentation.so.*
-usr/lib/*/libgnunethello.so.*
-usr/lib/*/libgnunetlockmanager.so.0*
-usr/lib/*/libgnunetmesh.so.*
-usr/lib/*/libgnunetnamestore.so.*
-usr/lib/*/libgnunetnat.so.*
-usr/lib/*/libgnunetnse.so.*
-usr/lib/*/libgnunetpeerinfo.so.*
-usr/lib/*/libgnunetregex.so.*
-usr/lib/*/libgnunetregexblock.so.*
-usr/lib/*/libgnunetstream.so.*
-usr/lib/*/libgnunettesting.so.*
-usr/lib/*/libgnunettestbed.so.0*
-usr/lib/*/libgnunettransport.so.*
-usr/lib/*/libgnunettransporttesting.so.*
-usr/lib/*/libgnunettun.so.*
-usr/lib/*/gnunet/*.so
-usr/share/gnunet/config.d
-usr/share/gnunet/hellos/*
-usr/share/gnunet/testing_hostkeys.ecc
-usr/share/man/man1/gnunet-arm.1
-usr/share/man/man1/gnunet-ats.1
-usr/share/man/man1/gnunet-config.1
-usr/share/man/man1/gnunet-core.1
-usr/share/man/man1/gnunet-dns2gns.1
-usr/share/man/man1/gnunet-fs.1
-usr/share/man/man1/gnunet-gns.1
-usr/share/man/man1/gnunet-gns-fcfsd.1
-usr/share/man/man1/gnunet-gns-proxy.1
-usr/share/man/man1/gnunet-namestore.1
-usr/share/man/man1/gnunet-nat-server.1
-usr/share/man/man1/gnunet-peerinfo.1
-usr/share/man/man1/gnunet-rsa.1
-usr/share/man/man1/gnunet-transport.1
-usr/share/man/man1/gnunet-vpn.1
-usr/share/man/man5/gnunet.conf.5
-debian/man/* usr/share/man/man1/
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
SHELL := sh -e
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
%:
dh ${@} --with autoreconf
@@ -34,8 +35,21 @@ override_dh_auto_install:
debian/tmp/usr/bin/gnunet-service-template \
debian/tmp/usr/bin/gnunet-template \
debian/tmp/usr/bin/gnunet-helper-transport-wlan-dummy
+
+ifneq ($(DEB_HOST_MULTIARCH),linux)
+ # Remove files related to the libraries/tools not built
+ find debian/tmp -name '*gnunet*vpn*' -print -delete
+ find debian/tmp -name '*gnunet*dns*' -print -delete
+ find debian/tmp -name '*gns*' -print -delete
+endif
override_dh_install: debian/gnunet-server.init
+ cat debian/gnunet-server.install \
+ | grep -v gnunet-dns | grep -v gnunetdns \
+ | grep -v gns \
+ | grep -v gnunet-vpn | grep -v gnunetvpn \
+ > debian/gnunet-server.install.kfreebsd
+ cp debian/gnunet-server.install.kfreebsd debian/gnunet-server.install.hurd
dh_install -a --fail-missing
override_dh_strip:
@@ -46,6 +60,7 @@ override_dh_auto_clean:
rm -rf debian/gnunet-server.init
rm -rf contrib/gnunet_janitor.py contrib/gnunet_pyexpect.py libltdl/ \
src/integration-tests/*.py
+ rm -f debian/gnunet-server.install.kfreebsd debian/gnunet-server.install.hurd
debian/gnunet-server.init: debian/gnunet-server.init.in
sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
