From bc1f3b56bb4bcf86a460e400e2fb99aec32b0d03 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Sun, 10 Jul 2011 15:37:45 +0100 Subject: [PATCH] remove socks support --- debian/changelog | 10 +++++++--- debian/control | 2 +- debian/rules | 5 ++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce631d0..9217f77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -ckermit (212-1~b2) unstable; urgency=low +ckermit (300-1) unstable; urgency=low - * New upstream beta release. + * New upstream release (Closes: #633156). * Moved to main, ckermit is now DFSG-free!. * Updated copyright, kermit is now under a BSD-like license. * Being in main means we can finally enable crypto. This enables @@ -8,6 +8,10 @@ ckermit (212-1~b2) unstable; urgency=low + 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'. * 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 @@ -22,7 +26,7 @@ ckermit (212-1~b2) unstable; urgency=low + Standards-Version: 3.9.2 (no changes). * Remove XS-Autobuild: yes; not needed now we are in main. - -- Ian Beckwith Fri, 24 Jun 2011 17:49:03 +0100 + -- Ian Beckwith Sun, 10 Jul 2011 15:34:27 +0100 ckermit (211-15) unstable; urgency=low diff --git a/debian/control b/debian/control index 8fe4380..5765fb2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ckermit Section: comm Priority: extra Maintainer: Ian Beckwith -Build-Depends: libncurses5-dev, debhelper (>= 7.0.50~), libpam0g-dev, libssl-dev, libkrb5-dev, libsocks4 +Build-Depends: libncurses5-dev, debhelper (>= 7.0.50~), libpam0g-dev, libssl-dev, libkrb5-dev Standards-Version: 3.9.2 Homepage: http://www.kermit-project.org diff --git a/debian/rules b/debian/rules index 7c0be03..a378309 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,7 @@ BUILDDIR=`pwd`/debian/ckermit CFLAGS =-g \ -DIKSDCONF=\\\\\\\\\\\\\\\"/etc/kermit/iksd.conf\\\\\\\\\\\\\\\" \ -DCK_SYSINI=\\\\\\\\\\\\\\\"/etc/kermit/kermrc\\\\\\\\\\\\\\\" \ - -DCK_INI_B -DCK_SOCKS \ - -DX509_SUBJECT_ALT_NAME_TO_USER + -DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -23,7 +22,7 @@ else CFLAGS += -O2 endif -MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-lsocks -Wl,-z,defs -Wl,--as-needed" +MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-Wl,-z,defs -Wl,--as-needed" MAKETARGET=linux+krb5+openssl %: -- 2.11.0