From: Ian Beckwith <ianb@erislabs.net>
Date: Tue, 15 Jan 2008 12:04:50 +0000 (+0000)
Subject: switch from libsocksd to libsocks4
X-Git-Tag: 211-11~5
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=42673cc2b75430812e1fb6344eec90a8c8e9e0f0

switch from libsocksd to libsocks4
---

diff --git a/debian/changelog b/debian/changelog
index f7c88df..b3db986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+ckermit (211-10) unstable; urgency=low
+
+  * Add DM-Upload-Allowed: yes.
+  * Switch to linking with libsocks4 as libsocksd has been removed from
+    testing.
+
+ -- Ian Beckwith <ianb@erislabs.net>  Tue, 15 Jan 2008 12:03:44 +0000
+
 ckermit (211-9) unstable; urgency=low
 
   * Fix iksd user information disclosure when PAM is used (Closes: #417247).
   * Update maintainer email address.
-  * Add DM-Upload-Allowed: yes.
   * Bump ck_patch to 2.
   * Fix menu section.
   * Stop ignoring return code of 'make clean'.
diff --git a/debian/control b/debian/control
index a9e2350..9cd9872 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ckermit
 Section: non-free/comm
 Priority: extra
 Maintainer: Ian Beckwith <ianb@erislabs.net>
-Build-Depends: libncurses5-dev, debhelper (>= 5), libpam0g-dev, libsocksd-dev
+Build-Depends: libncurses5-dev, debhelper (>= 5), libpam0g-dev, libsocks4
 Standards-Version: 3.7.3
 XS-Autobuild: yes
 XS-DM-Upload-Allowed: yes
diff --git a/debian/rules b/debian/rules
index 447524e..c426730 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,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="-lsocksd -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="-lsocks -Wl,-z,defs -Wl,--as-needed"
 
 #MAKETARGET=linux+krb5+krb4+openssl+shadow+pam
 MAKETARGET=linux+shadow+pam