Import Debian changes 0.88-13

ucspi-tcp (0.88-13) unstable; urgency=high

  * Added patch to fix VERY dead default RBL (Closes: #410125)
  * Updated control file
  * Cleaned up rules script to allow autobuilding
  * Removed old usr/doc symlink code

9 files changed, 58 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index e4b5a2a..6565fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ucspi-tcp (0.88-13) unstable; urgency=high
+
+  * Added patch to fix VERY dead default RBL (Closes: #410125)
+  * Updated control file
+  * Cleaned up rules script to allow autobuilding
+  * Removed old usr/doc symlink code
+
+ -- Jon Marler <jmarler@debian.org>  Wed,  7 Feb 2007 16:50:27 -0600
+
 ucspi-tcp (0.88-12) unstable; urgency=low
 
   * Fix to allow building -src package without building binary package
diff --git a/debian/control b/debian/control
index 0d2f586..fc98ba2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: ucspi-tcp
 Section: non-free/net
 Priority: optional
 Maintainer: Jon Marler <jmarler@debian.org> 
-Standards-Version: 3.0.0.0
+Build-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make, fakeroot | sudo, groff-base, adduser
+Standards-Version: 3.7.2
 
 Package: ucspi-tcp-src
 Architecture: all
diff --git a/debian/control.real b/debian/control.real
index 6ce332c..1fed3ab 100644
--- a/debian/control.real
+++ b/debian/control.real
@@ -2,7 +2,8 @@ Source: ucspi-tcp
 Section: non-free/net
 Priority: optional
 Maintainer: Jon Marler <jmarler@debian.org> 
-Standards-Version: 3.0.0.0
+Build-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make, fakeroot | sudo, groff-base, adduser
+Standards-Version: 3.7.2
 
 Package: ucspi-tcp
 Architecture: any
diff --git a/debian/postinst b/debian/postinst
index 53a09ad..48012b7 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,7 +1,7 @@
 #!/bin/sh -e
-if [ "$1" = "configure" ]; then
-       if [ -d /usr/doc -a ! -e /usr/doc/ucspi-tcp -a -d /usr/share/doc/ucspi-tcp ]; then
-        ln -sf ../share/doc/ucspi-tcp /usr/doc/ucspi-tcp
-       fi
-fi
+#if [ "$1" = "configure" ]; then
+#       if [ -d /usr/doc -a ! -e /usr/doc/ucspi-tcp -a -d /usr/share/doc/ucspi-tcp ]; then
+#        ln -sf ../share/doc/ucspi-tcp /usr/doc/ucspi-tcp
+#       fi
+#fi
 
diff --git a/debian/rules b/debian/rules
index 0514313..47a3b37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ debian/control: debian/control.real
 	debian/rules clean
 	cd ..; dpkg-source -b $(PACKAGE)-$(PKG_UPVER)
 
-binary:	binary-indep binary-src
+binary:	binary-src
 
 source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
diff --git a/debian/src.postinst b/debian/src.postinst
index 9e8bfaf..d7181d8 100644
--- a/debian/src.postinst
+++ b/debian/src.postinst
@@ -1,10 +1,11 @@
 #!/bin/sh -e
 
-if [ "$1" = "configure" ]; then
-       if [ -d /usr/doc -a ! -e /usr/doc/ucspi-tcp-src -a -d /usr/share/doc/ucspi-tcp-src ]; then
-        ln -sf ../share/doc/ucspi-tcp-src /usr/doc/ucspi-tcp-src
-       fi
-fi
+# This code is old, and no longer needed
+#if [ "$1" = "configure" ]; then
+#       if [ -d /usr/doc -a ! -e /usr/doc/ucspi-tcp-src -a -d /usr/share/doc/ucspi-tcp-src ]; then
+#        ln -sf ../share/doc/ucspi-tcp-src /usr/doc/ucspi-tcp-src
+#       fi
+#fi
 
 # Below removed at the request of Thomas Huriaux BUG#402339
 #echo ""
diff --git a/debian/src.prerm b/debian/src.prerm
index e1dba46..0189a6a 100644
--- a/debian/src.prerm
+++ b/debian/src.prerm
@@ -1,5 +1,6 @@
 #!/bin/sh -e
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ucspi-tcp ]; then
-        rm -f /usr/doc/ucspi-tcp
-fi
+# More old code no longer needed
+#if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ucspi-tcp ]; then
+#        rm -f /usr/doc/ucspi-tcp
+#fi
 
diff --git a/patches/rblsmtpd-nodefaultrbl.patch b/patches/rblsmtpd-nodefaultrbl.patch
new file mode 100644
index 0000000..fd9e90e
--- /dev/null
+++ b/patches/rblsmtpd-nodefaultrbl.patch
@@ -0,0 +1,28 @@
+diff -ur ucspi-tcp-0.88.orig/rblsmtpd.c ucspi-tcp-0.88/rblsmtpd.c
+--- ucspi-tcp-0.88.orig/rblsmtpd.c	Thu Jan 16 14:33:56 2003
++++ ucspi-tcp-0.88/rblsmtpd.c	Thu Jan 16 14:38:17 2003
+@@ -155,7 +155,6 @@
+ 
+ main(int argc,char **argv,char **envp)
+ {
+-  int flagwantdefaultrbl = 1;
+   char *x;
+   int opt;
+ 
+@@ -182,7 +181,7 @@
+       case 'c': flagfailclosed = 1; break;
+       case 'C': flagfailclosed = 0; break;
+       case 't': scan_ulong(optarg,&timeout); break;
+-      case 'r': rbl(optarg); flagwantdefaultrbl = 0; break;
++      case 'r': rbl(optarg); break;
+       case 'a': antirbl(optarg); break;
+       default: usage();
+     }
+@@ -190,7 +189,6 @@
+   argv += optind;
+   if (!*argv) usage();
+ 
+-  if (flagwantdefaultrbl) rbl("rbl.maps.vix.com");
+   if (decision >= 2) rblsmtpd();
+ 
+   pathexec_run(*argv,argv,envp);
diff --git a/rblsmtpd.c b/rblsmtpd.c
index 7c329b7..8cc1460 100644
--- a/rblsmtpd.c
+++ b/rblsmtpd.c
@@ -202,7 +202,6 @@ void rblsmtpd(void)
 
 main(int argc,char **argv,char **envp)
 {
-  int flagwantdefaultrbl = 1;
   char *x;
   int opt;
 
@@ -229,7 +228,7 @@ main(int argc,char **argv,char **envp)
       case 'c': flagfailclosed = 1; break;
       case 'C': flagfailclosed = 0; break;
       case 't': scan_ulong(optarg,&timeout); break;
-      case 'r': rbl(optarg); flagwantdefaultrbl = 0; break;
+      case 'r': rbl(optarg); break;
       case 'a': antirbl(optarg); break;
       default: usage();
     }
@@ -237,7 +236,6 @@ main(int argc,char **argv,char **envp)
   argv += optind;
   if (!*argv) usage();
 
-  if (flagwantdefaultrbl) rbl("rbl.maps.vix.com");
   if (decision >= 2) rblsmtpd();
 
   pathexec_run(*argv,argv,envp);