Source: ssh-askpass Version: 1:1.2.4.1-9 Tags: patch upstream User: helm...@debian.org Usertags: rebootstrap Control: block 873764 by -1
ssh-askpass fails to cross build from source, because ... it uses xmkmf. I looked at xmkmf hard and there seems to be no way to make this work at all. I talked to vorlon, and we agreed that xmkmf should just die (#873764). As such I am asking you to migrate away from xmkmf. I am attaching a patch moves to autoconf in a minimal way that makes the binary package look mostly equal to the original package (according to diffoscope). Oh and the patch makes cross building work. Can you apply it? Or at least, can you remove xmkmf usage? Helmut
diff --minimal -Nru ssh-askpass-1.2.4.1/debian/changelog ssh-askpass-1.2.4.1/debian/changelog --- ssh-askpass-1.2.4.1/debian/changelog 2009-11-23 03:09:59.000000000 +0100 +++ ssh-askpass-1.2.4.1/debian/changelog 2017-08-30 19:28:49.000000000 +0200 @@ -1,3 +1,10 @@ +ssh-askpass (1:1.2.4.1-9.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Rewrite build system as autoconf (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Wed, 30 Aug 2017 19:28:49 +0200 + ssh-askpass (1:1.2.4.1-9) unstable; urgency=low * switch to 3.0 (quilt) source format diff --minimal -Nru ssh-askpass-1.2.4.1/debian/control ssh-askpass-1.2.4.1/debian/control --- ssh-askpass-1.2.4.1/debian/control 2009-11-23 02:05:03.000000000 +0100 +++ ssh-askpass-1.2.4.1/debian/control 2017-08-30 19:28:49.000000000 +0200 @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Philip Hands <p...@hands.com> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libx11-dev, libxt-dev, x11proto-core-dev, xutils-dev +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libx11-dev, libxt-dev, x11proto-core-dev, dh-autoreconf, pkg-config Standards-Version: 3.8.3 Homepage: http://www.jmknoble.net/software/x11-ssh-askpass/ diff --minimal -Nru ssh-askpass-1.2.4.1/debian/patches/autotools.patch ssh-askpass-1.2.4.1/debian/patches/autotools.patch --- ssh-askpass-1.2.4.1/debian/patches/autotools.patch 1970-01-01 01:00:00.000000000 +0100 +++ ssh-askpass-1.2.4.1/debian/patches/autotools.patch 2017-08-30 19:28:49.000000000 +0200 @@ -0,0 +1,49 @@ +Index: ssh-askpass-1.2.4.1/Makefile.am +=================================================================== +--- /dev/null ++++ ssh-askpass-1.2.4.1/Makefile.am +@@ -0,0 +1,16 @@ ++libexec_PROGRAMS = x11-ssh-askpass ++x11_ssh_askpass_SOURCES = drawing.c dynlist.c resources.c x11-ssh-askpass.c ++nodist_x11_ssh_askpass_SOURCES = SshAskpass_ad.h ++x11_ssh_askpass_CFLAGS = $(X11_CFLAGS) $(XT_CFLAGS) $(SM_CFLAGS) $(ICE_CFLAGS) ++x11_ssh_askpass_LDADD = $(X11_LIBS) $(XT_LIBS) $(SM_LIBS) $(ICE_LIBS) ++askpassconfdir = $(sysconfdir)/X11/app-defaults ++askpassconf_DATA = SshAskpass ++CLEANFILES = SshAskpass_ad.h x11-ssh-askpass.1x SshAskpass ++man1_MANS = x11-ssh-askpass.1x ++BUILT_SOURCES = SshAskpass_ad.h x11-ssh-askpass.1x ++SshAskpass_ad.h:SshAskpass-default.ad ++ sed -n '/^[^!]/s/.*/"&",/p' <$< >$@ ++x11-ssh-askpass.1x:x11-ssh-askpass.man ++ cp $< $@ ++SshAskpass:SshAskpass-default.ad ++ cp $< $@ +Index: ssh-askpass-1.2.4.1/configure.ac +=================================================================== +--- /dev/null ++++ ssh-askpass-1.2.4.1/configure.ac +@@ -0,0 +1,10 @@ ++AC_INIT([ssh-askpass],[1.2.4.1],[jmkno...@pobox.com]) ++AM_INIT_AUTOMAKE([foreign]) ++AC_PROG_CC ++PKG_CHECK_MODULES([X11],[x11]) ++PKG_CHECK_MODULES([XT],[xt]) ++PKG_CHECK_MODULES([SM],[sm]) ++PKG_CHECK_MODULES([ICE],[ice]) ++AC_SUBST(NAME,[x11-ssh-askpass]) ++AC_CONFIG_FILES([Makefile x11-ssh-askpass.man]) ++AC_OUTPUT() +Index: ssh-askpass-1.2.4.1/x11-ssh-askpass.man.in +=================================================================== +--- ssh-askpass-1.2.4.1.orig/x11-ssh-askpass.man.in ++++ ssh-askpass-1.2.4.1/x11-ssh-askpass.man.in +@@ -3,7 +3,7 @@ + .\" Modified by Jim Knoble <jmkno...@pobox.com> for non-OpenBSD + .\" distribution + .\" +-.Dd @DATE@ ++.Dd September 17, 2001 + .Dt @NAME@ 1 + .Os "Version @VERSION@" + .Sh NAME diff --minimal -Nru ssh-askpass-1.2.4.1/debian/patches/series ssh-askpass-1.2.4.1/debian/patches/series --- ssh-askpass-1.2.4.1/debian/patches/series 2009-11-23 02:35:55.000000000 +0100 +++ ssh-askpass-1.2.4.1/debian/patches/series 2017-08-30 19:28:49.000000000 +0200 @@ -1,2 +1,3 @@ debian_paths debian_cflags +autotools.patch diff --minimal -Nru ssh-askpass-1.2.4.1/debian/rules ssh-askpass-1.2.4.1/debian/rules --- ssh-askpass-1.2.4.1/debian/rules 2009-11-23 02:05:03.000000000 +0100 +++ ssh-askpass-1.2.4.1/debian/rules 2017-08-30 19:28:49.000000000 +0200 @@ -4,21 +4,7 @@ export DH_VERBOSE=1 %: - dh $@ - -override_dh_auto_clean: - dh_auto_clean - rm -f SshAskpass.ad + dh $@ --with=autoreconf override_dh_auto_configure: dh_auto_configure -- --libexecdir=/usr/lib/ssh - -override_dh_auto_build: - xmkmf - $(MAKE) includes - $(MAKE) - -override_dh_auto_install: - $(MAKE) install install.man DESTDIR=`pwd`/debian/ssh-askpass - rm -f debian/ssh-askpass/usr/lib/ssh/ssh-askpass - rm -f debian/ssh-askpass/usr/share/man/man1/ssh-askpass.1x
