From 2cd9d2b5d02d25096f690a7a7e2830b939ad9d45 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Sun, 10 Jul 2011 16:18:44 +0100 Subject: [PATCH] added patch from ubuntu to fix FTBFS with gold (Closes: #617529) (LP: #732064) --- debian/changelog | 7 +++++-- debian/patches/010_fix_ftbfs_binutils-gold.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 ----- makefile | 4 ++-- 5 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 debian/patches/010_fix_ftbfs_binutils-gold.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 9217f77..283a7b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,11 +7,14 @@ ckermit (300-1) unstable; urgency=low us to close a 10 year old bug! (Closes: #95135). + use make target linux+krb5+openssl. + add ssl-dev and libkrb5-dev to Build-Depends. - * Removed all patches from debian/patches, all taken upstream. * Removed socks support because: + libsocks4 doesn't support socks5, and is orphaned. + socks support causes problems with avahi. + you can get the same functionality with 'tsocks kermit'. + * Removed all patches from debian/patches, all taken upstream. + * Added patch 010_fix_ftbfs_binutils-gold from ubuntu (Closes: #617529). + Moved LNKFLAGS to the end to fix FTBFS with gold (LP: #732064). + Thanks to Tarun Kumar Mall . * debian/rules: use dh minimal rules file. * Bump debhelper build depends to (>= 7.0.50~) for dh override support. * Update PAM config, now just includes common-auth, common-account @@ -26,7 +29,7 @@ ckermit (300-1) unstable; urgency=low + Standards-Version: 3.9.2 (no changes). * Remove XS-Autobuild: yes; not needed now we are in main. - -- Ian Beckwith Sun, 10 Jul 2011 15:34:27 +0100 + -- Ian Beckwith Sun, 10 Jul 2011 16:15:54 +0100 ckermit (211-15) unstable; urgency=low diff --git a/debian/patches/010_fix_ftbfs_binutils-gold.patch b/debian/patches/010_fix_ftbfs_binutils-gold.patch new file mode 100644 index 0000000..a7da446 --- /dev/null +++ b/debian/patches/010_fix_ftbfs_binutils-gold.patch @@ -0,0 +1,22 @@ +Index: ckermit/makefile +=================================================================== +--- ckermit.orig/makefile 2011-07-10 16:09:55.000000000 +0100 ++++ ckermit/makefile 2011-07-10 16:10:00.000000000 +0100 +@@ -1270,7 +1270,7 @@ + ckuscr.$(EXT) ckcnet.$(EXT) ckctel.$(EXT) ckusig.$(EXT) \ + ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) ckuath.$(EXT) \ + ck_crp.$(EXT) ck_ssl.$(EXT) +- $(CC2) $(LNKFLAGS) -o wermit \ ++ $(CC2) -o wermit \ + ckcmai.$(EXT) ckclib.$(EXT) ckutio.$(EXT) ckufio.$(EXT) \ + ckcfns.$(EXT) ckcfn2.$(EXT) ckcfn3.$(EXT) ckuxla.$(EXT) \ + ckcpro.$(EXT) ckucmd.$(EXT) ckuus2.$(EXT) ckuus3.$(EXT) \ +@@ -1278,7 +1278,7 @@ + ckuusx.$(EXT) ckuusy.$(EXT) ckuusr.$(EXT) ckucns.$(EXT) \ + ckudia.$(EXT) ckuscr.$(EXT) ckcnet.$(EXT) ckusig.$(EXT) \ + ckctel.$(EXT) ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) \ +- ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS) ++ ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS) $(LNKFLAGS) + + # Malloc Debugging version + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..55ff80d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +010_fix_ftbfs_binutils-gold.patch diff --git a/debian/rules b/debian/rules index 6757c3b..effef9d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# modified for ckermit by Ian Beckwith # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 diff --git a/makefile b/makefile index 176bc4e..0165d38 100644 --- a/makefile +++ b/makefile @@ -1270,7 +1270,7 @@ xermit: ckcmai.$(EXT) ckclib.$(EXT) ckucmd.$(EXT) ckuusr.$(EXT) ckuus2.$(EXT) \ ckuscr.$(EXT) ckcnet.$(EXT) ckctel.$(EXT) ckusig.$(EXT) \ ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) ckuath.$(EXT) \ ck_crp.$(EXT) ck_ssl.$(EXT) - $(CC2) $(LNKFLAGS) -o wermit \ + $(CC2) -o wermit \ ckcmai.$(EXT) ckclib.$(EXT) ckutio.$(EXT) ckufio.$(EXT) \ ckcfns.$(EXT) ckcfn2.$(EXT) ckcfn3.$(EXT) ckuxla.$(EXT) \ ckcpro.$(EXT) ckucmd.$(EXT) ckuus2.$(EXT) ckuus3.$(EXT) \ @@ -1278,7 +1278,7 @@ xermit: ckcmai.$(EXT) ckclib.$(EXT) ckucmd.$(EXT) ckuusr.$(EXT) ckuus2.$(EXT) \ ckuusx.$(EXT) ckuusy.$(EXT) ckuusr.$(EXT) ckucns.$(EXT) \ ckudia.$(EXT) ckuscr.$(EXT) ckcnet.$(EXT) ckusig.$(EXT) \ ckctel.$(EXT) ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) \ - ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS) + ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS) $(LNKFLAGS) # Malloc Debugging version -- 2.11.0