Imported Debian patch 8.14.0.Beta5-1debian/8.14.0.Beta5-1

16 files changed, 48 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index 37f049c..da8e055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,25 @@
+sendmail (8.14.0.Beta5-1) experimental; urgency=low
+
+  * New upstream Beta
+  * Refit patches
+
+  * Major item
+    + Welcome back space betwixt 'from:' and '<other stuff>'
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 09 Jan 2007 21:40:00 -0000
+
+sendmail (8.14.0.Beta4-1) experimental; urgency=low
+
+   * Sigh... built here, but not build machines      closes: #405917
+   * change from ~ to . to appease build scripts and match upstream
+   * drop my check_helo patch, needs rework
+   * Upstream incorporated patch for greet_pause     closes: #312164
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Sun, 07 Jan 2007 22:50:00 -0000
+
 sendmail (8.14.0~Beta4-1) experimental; urgency=low
 
+   * Release to experimental
    * New upstream Beta
    * Refit patches
 
@@ -16,6 +36,8 @@ sendmail (8.14.0~Beta4-1) experimental; urgency=low
      + FEATURE(`badmx')
      + option `relaytofulladdress' for FEATURE(`access_db')
 
+   * Upstream incorporated patch for greet_pause     closes: #312164
+
  -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 05 Jan 2007 19:07:46 -0000
 
 sendmail (8.14.0~Beta4-0) private; urgency=low
diff --git a/debian/configure b/debian/configure
index 6cb6aec..c4681a1 100644
--- a/debian/configure
+++ b/debian/configure
@@ -2561,7 +2561,7 @@ if test -f ../build-tree/*/sendmail/version.c; then
 else
 	curr_dir=$(echo `pwd` | sed -e 's/\/debian$//' -);
 	version=$(expr "${curr_dir}" : '.*-\([0-9.].*\)');
-	beta_version=$(expr "${curr_dir}" : '.*~\([0-9.].*\)');
+	beta_version=$(expr "${curr_dir}" : '.*[+~]\([0-9.].*\)');
 	if test -z "$beta_version"; then
 		sm_version="$version";
 	else
diff --git a/debian/configure.ac b/debian/configure.ac
index b4403d1..b33d60b 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -144,7 +144,7 @@ if test -f ../build-tree/*/sendmail/version.c; then
 else
 	curr_dir=[$(echo `pwd` | sed -e 's/\/debian$//' -);]
 	version=[$(expr "${curr_dir}" : '.*-\([0-9.].*\)');]
-	beta_version=[$(expr "${curr_dir}" : '.*~\([0-9.].*\)');]
+	beta_version=[$(expr "${curr_dir}" : '.*[+~]\([0-9.].*\)');]
 	if test -z "$beta_version"; then
 		sm_version="$version";
 	else
diff --git a/debian/patches/8.14/8.14.0.Beta4/cyrusv2.m4.debian-patch b/debian/patches/8.14/8.14.0.Beta5/cyrusv2.m4.debian-patch
index 444ce34..e2d662b 100644
--- a/debian/patches/8.14/8.14.0.Beta4/cyrusv2.m4.debian-patch
+++ b/debian/patches/8.14/8.14.0.Beta5/cyrusv2.m4.debian-patch
@@ -1,4 +1,4 @@
---- sendmail-8.14.0.Beta4/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
+--- sendmail-8.14.0.Beta5/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
 +++ cyrusv2.m4.new	Wed Jun  5 04:21:34 2002
 @@ -12,7 +12,7 @@
  
diff --git a/debian/patches/8.14/8.14.0.Beta4/dpatch.001 b/debian/patches/8.14/8.14.0.Beta5/dpatch.001
index 81948ea..a19762a 100644
--- a/debian/patches/8.14/8.14.0.Beta4/dpatch.001
+++ b/debian/patches/8.14/8.14.0.Beta5/dpatch.001
@@ -19,7 +19,7 @@
 diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4'
 Index: ./cf/feature/local_procmail.m4
 Prereq:  8.22
-*** sendmail-8.14.0.Beta4/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
+*** sendmail-8.14.0.Beta5/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
 --- ./debian/patches/local_procmail.m4	Sat Nov 20 15:39:46 1999
 ***************
 *** 27,32 ****
diff --git a/debian/patches/8.14/8.14.0.Beta4/dpatch.002 b/debian/patches/8.14/8.14.0.Beta5/dpatch.002
index 1d7e9bd..1204954 100644
--- a/debian/patches/8.14/8.14.0.Beta4/dpatch.002
+++ b/debian/patches/8.14/8.14.0.Beta5/dpatch.002
@@ -1,4 +1,4 @@
---- sendmail-8.14.0.Beta4/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
+--- sendmail-8.14.0.Beta5/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
 +++ ./debian/patches/cf/mailer/cyrus.m4	Tue May  2 14:41:21 2000
 @@ -36,12 +36,12 @@
  # 
diff --git a/debian/patches/8.14/8.14.0.Beta4/dpatch.003 b/debian/patches/8.14/8.14.0.Beta5/dpatch.003
index 1388252..da95f7e 100644
--- a/debian/patches/8.14/8.14.0.Beta4/dpatch.003
+++ b/debian/patches/8.14/8.14.0.Beta5/dpatch.003
@@ -19,7 +19,7 @@
 diff -c 'rmail/rmail.c' 'debian/patches/rmail.c'
 Index: ./rmail/rmail.c
 Prereq:  8.61
-*** sendmail-8.14.0.Beta4/rmail/rmail.c	Sat Sep 16 18:20:25 2000
+*** sendmail-8.14.0.Beta5/rmail/rmail.c	Sat Sep 16 18:20:25 2000
 --- ./debian/patches/rmail.c	Thu Sep 28 17:00:59 2000
 ***************
 *** 318,324 ****
diff --git a/debian/patches/8.14/8.14.0.Beta4/dpatch.004 b/debian/patches/8.14/8.14.0.Beta5/dpatch.004
index bc17482..3295e3e 100644
--- a/debian/patches/8.14/8.14.0.Beta4/dpatch.004
+++ b/debian/patches/8.14/8.14.0.Beta5/dpatch.004
@@ -19,7 +19,7 @@
 diff -c 'sendmail/control.c' 'debian/patches/control.c'
 Index: ./sendmail/control.c
 Prereq:  8.128
-*** sendmail-8.14.0.Beta4/sendmail/control.c	Sat Nov 20 15:26:23 1999
+*** sendmail-8.14.0.Beta5/sendmail/control.c	Sat Nov 20 15:26:23 1999
 --- ./debian/patches/control.c	Sat Nov 20 15:39:52 1999
 ***************
 *** 92,98 ****
diff --git a/debian/patches/8.14/8.14.0.Beta4/dpatch.005 b/debian/patches/8.14/8.14.0.Beta5/dpatch.005
index 714c46b..63f5d27 100644
--- a/debian/patches/8.14/8.14.0.Beta4/dpatch.005
+++ b/debian/patches/8.14/8.14.0.Beta5/dpatch.005
@@ -19,7 +19,7 @@
 diff -c './cf/mailer/fax.m4' 'fax.m4'
 Index: ./cf/mailer/fax.m4
 Prereq:  8.16
-*** sendmail-8.14.0.Beta4/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
+*** sendmail-8.14.0.Beta5/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
 --- ./fax.m4	Wed Jan  3 14:26:13 2001
 ***************
 *** 19,26 ****
diff --git a/debian/patches/8.14/8.14.0.Beta4/drac.patch b/debian/patches/8.14/8.14.0.Beta5/drac.patch
index 50c3a91..88f93c9 100644
--- a/debian/patches/8.14/8.14.0.Beta4/drac.patch
+++ b/debian/patches/8.14/8.14.0.Beta5/drac.patch
@@ -1,5 +1,5 @@
---- sendmail-8.14.0.Beta4/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
-+++ sendmail-8.14.0.Beta4/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
+--- sendmail-8.14.0.Beta5/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
++++ sendmail-8.14.0.Beta5/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
 @@ -2110,6 +2110,13 @@
  R127.0.0.1		$@ RELAY		originated locally
  RIPv6:::1		$@ RELAY		originated locally
@@ -15,7 +15,7 @@
  R$*			$: $>A <$1> <?> <+ Connect> <$1>
  R<RELAY> $* 		$@ RELAY		relayable IP address
 --- /dev/null   2002-01-01 00:00:00.000000000 +0900
-+++ sendmail-8.14.0.Beta4/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
++++ sendmail-8.14.0.Beta5/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
 @@ -0,0 +1,5 @@
 +define(`_DRAC_', `')
 +
diff --git a/debian/patches/8.14/8.14.0.Beta4/kfreebsd.patch b/debian/patches/8.14/8.14.0.Beta5/kfreebsd.patch
index ff92403..8d4590e 100644
--- a/debian/patches/8.14/8.14.0.Beta4/kfreebsd.patch
+++ b/debian/patches/8.14/8.14.0.Beta5/kfreebsd.patch
@@ -1,6 +1,6 @@
-diff -Nurd sendmail-8.14.0.Beta4.orig/devtools/bin/Build sendmail-8.14.0.Beta4/devtools/bin/Build
---- sendmail-8.14.0.Beta4.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.14.0.Beta4/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
+diff -Nurd sendmail-8.14.0.Beta5.orig/devtools/bin/Build sendmail-8.14.0.Beta5/devtools/bin/Build
+--- sendmail-8.14.0.Beta5.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.14.0.Beta5/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
 @@ -422,6 +422,7 @@
    NeXT)		mkdir="mkdirs";;
    UNICOSMK)	rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)\..*$/\1.\2.\3/'`;;
@@ -9,9 +9,9 @@ diff -Nurd sendmail-8.14.0.Beta4.orig/devtools/bin/Build sendmail-8.14.0.Beta4/d
  esac
  
  # get "base part" of operating system release
-diff -Nurd sendmail-8.14.0.Beta4.orig/include/sm/conf.h sendmail-8.14.0.Beta4/include/sm/conf.h
---- sendmail-8.14.0.Beta4.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.14.0.Beta4/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
+diff -Nurd sendmail-8.14.0.Beta5.orig/include/sm/conf.h sendmail-8.14.0.Beta5/include/sm/conf.h
+--- sendmail-8.14.0.Beta5.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.14.0.Beta5/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
 @@ -783,7 +783,7 @@
  **	See also BSD defines.
  */
@@ -100,9 +100,9 @@ diff -Nurd sendmail-8.14.0.Beta4.orig/include/sm/conf.h sendmail-8.14.0.Beta4/in
  **  DELL SVR4 Issue 2.2, and others
  **	From Kimmo Suominen <kim@grendel.lut.fi>
  **
-diff -Nurd sendmail-8.14.0.Beta4.orig/include/sm/os/sm_os_linux.h sendmail-8.14.0.Beta4/include/sm/os/sm_os_linux.h
---- sendmail-8.14.0.Beta4.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.14.0.Beta4/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
+diff -Nurd sendmail-8.14.0.Beta5.orig/include/sm/os/sm_os_linux.h sendmail-8.14.0.Beta5/include/sm/os/sm_os_linux.h
+--- sendmail-8.14.0.Beta5.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.14.0.Beta5/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
 @@ -15,23 +15,27 @@
  
  #define SM_OS_NAME	"linux"
diff --git a/debian/patches/8.14/8.14.0.Beta4/ldap_url_search.p0 b/debian/patches/8.14/8.14.0.Beta5/ldap_url_search.p0
index 9d82eae..97fbd1e 100644
--- a/debian/patches/8.14/8.14.0.Beta4/ldap_url_search.p0
+++ b/debian/patches/8.14/8.14.0.Beta5/ldap_url_search.p0
@@ -4,7 +4,7 @@ RCS file: /cvs/libsm/ldap.c,v
 retrieving revision 1.51
 retrieving revision 1.53
 diff -u -r1.51 -r1.53
---- ./sendmail-8.14.0.Beta4/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
+--- ./sendmail-8.14.0.Beta5/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
 +++ ldap.c	30 Oct 2003 23:33:10 -0000	1.53
 @@ -1043,6 +1043,7 @@
  						   NULL : lmap->ldap_attr),
diff --git a/debian/patches/8.14/8.14.0.Beta4/maxseq.patch b/debian/patches/8.14/8.14.0.Beta5/maxseq.patch
index 5840e34..3b4aefe 100644
--- a/debian/patches/8.14/8.14.0.Beta4/maxseq.patch
+++ b/debian/patches/8.14/8.14.0.Beta5/maxseq.patch
@@ -19,7 +19,7 @@
 diff -c 'conf.h' 'conf.h.new'
 Index: ./conf.h
 Prereq:  8.574
-*** ./sendmail-8.14.0.Beta4/sendmail/conf.h	Fri Sep 21 19:01:46 2001
+*** ./sendmail-8.14.0.Beta5/sendmail/conf.h	Fri Sep 21 19:01:46 2001
 --- ./conf.h.new	Wed Oct 10 09:24:41 2001
 ***************
 *** 74,79 ****
diff --git a/debian/patches/8.14/8.14.0.Beta4/qtool.patch b/debian/patches/8.14/8.14.0.Beta5/qtool.patch
index b25a1be..28ba7d1 100644
--- a/debian/patches/8.14/8.14.0.Beta4/qtool.patch
+++ b/debian/patches/8.14/8.14.0.Beta5/qtool.patch
@@ -1,5 +1,5 @@
-*** ./sendmail-8.14.0.Beta4/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
---- ./sendmail-8.14.0.Beta4/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
+*** ./sendmail-8.14.0.Beta5/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
+--- ./sendmail-8.14.0.Beta5/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
 ***************
 *** 355,373 ****
   sub lock_file
diff --git a/debian/patches/8.14/8.14.0.Beta4/client_helo.patch b/debian/patches/8.14/client_helo.patch
index b83bc81..b83bc81 100644
--- a/debian/patches/8.14/8.14.0.Beta4/client_helo.patch
+++ b/debian/patches/8.14/client_helo.patch
diff --git a/debian/rules b/debian/rules
index afdd278..c436464 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,11 +140,11 @@ version		   := ${version_full}
 version_major  := $(shell expr "${version_full}" : '\([0-9]*\.[0-9]*\)')
 version_minor  := $(shell expr "${version_full}" : '[0-9]*\.[0-9]*\.\(.*\)')
 ifneq (, $(findstring +,${version_minor}))
-	beta_version := $(shell expr "${version_full}" : '.*+\([0-9.].*\)')
+	beta_version := $(shell expr "${version_full}" : '.*[+~]\([0-9.].*\)')
 	beta_major := $(shell expr "${beta_version}" : '\([0-9]*\.[0-9]*\)')
 	beta_minor := $(shell expr "${beta_version}" : '[0-9]*\.[0-9]*\.\(.*\)')
 	ifneq (, $(beta_version))
-		version		   := ${beta_version}
+		version        := ${beta_version}
 		version_major  := ${beta_major}
 		version_minor  := ${beta_minor}
 		endif