Subject: Postfix 19990906 Patch 07

From: [email-masked] (Wietse Venema)
Date: Sat, 13 Nov 1999 13:11:02 -0500 (EST)

A few minor glitches were found in Postfix 19990906 Patchlevel 06,
which was released a week ago. The glitches affected only sites
doing a fresh install.

  - When doing a fresh install, INSTALL.sh didn't set main.cf:mail_owner
    properly.  (Simon J. Mudd).

  - When doing a fresh install, INSTALL.sh no longer worked (missing
    main.cf file).  Fix:  add "-c" argument to the postmap commands
    (Lars Hecking @ nmrc.ucc.ie).

  - "DO NOT EDIT" comments were mistakenly placed in the sample
    pcre and regexp configuration files.

A patch for the above defects is appended below the signature. A
complete source kit, postfix-19990906-pl07.tar.gz, will be made
available from the primary site:

   ftp://ftp.porcupine.org/mirrors/postfix-release/official/
   http://ftp.porcupine.org/mirrors/postfix-release/index.html

including a PGP signature (postfix-19990906-pl07.tar.gz.sig). 

These files are expected to arrive on the Postfix download sites
in a day or so. See http://www.postfix.org/ for a list of download
sites.

	Wietse

Prereq: "Postfix-19990906-pl06"
diff -cr ../postfix-19990906-pl06/global/mail_version.h ./global/mail_version.h
*** ../postfix-19990906-pl06/global/mail_version.h	Thu Nov  4 09:48:21 1999
--- ./global/mail_version.h	Sat Nov 13 12:19:54 1999
***************
*** 15,21 ****
    * Version of this program.
    */
  #define VAR_MAIL_VERSION	"mail_version"
! #define DEF_MAIL_VERSION	"Postfix-19990906-pl06"
  extern char *var_mail_version;
  
  /* LICENSE
--- 15,21 ----
    * Version of this program.
    */
  #define VAR_MAIL_VERSION	"mail_version"
! #define DEF_MAIL_VERSION	"Postfix-19990906-pl07"
  extern char *var_mail_version;
  
  /* LICENSE
diff -cr ../postfix-19990906-pl06/HISTORY ./HISTORY
*** ../postfix-19990906-pl06/HISTORY	Sat Nov  6 10:51:32 1999
--- ./HISTORY	Sat Nov 13 12:59:42 1999
***************
*** 3126,3128 ****
--- 3126,3142 ----
  
  	Bugfix: LDAP lookup timeout settings were ignored. Patch
  	by John Hensley. File: util/dict_ldap.c.
+ 
+ 19991108
+ 
+ 	Bugfix: when doing a fresh install, INSTALL.sh didn't set
+ 	main.cf:mail_owner properly (Simon J. Mudd).
+ 
+ 19991109
+ 
+ 	Bugfix: when doing a fresh install, INSTALL.sh no longer
+ 	worked (missing main.cf file).  Fix: add "-c" argument to
+ 	the postmap commands (Lars Hecking @ nmrc.ucc.ie).
+ 
+ 	Documentation: removed spurious "do not edit" comments from
+ 	the sample pcre and regexp configuration files.
diff -cr ../postfix-19990906-pl06/INSTALL.sh ./INSTALL.sh
*** ../postfix-19990906-pl06/INSTALL.sh	Fri Nov  5 11:10:25 1999
--- ./INSTALL.sh	Sat Nov 13 12:57:20 1999
***************
*** 6,11 ****
--- 6,14 ----
  PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc
  umask 022
  
+ # Workaround, should edit main.cf in place.
+ trap 'rm -f ./main.cf; exit 1' 0 1 2 3 15
+ 
  cat <<EOF
  
  Warning: this script replaces existing sendmail or Postfix programs.
***************
*** 138,144 ****
     esac
  done
  
! bin/postmap -q "$owner" unix:passwd.byname >/dev/null || {
      echo "$owner needs an entry in the passwd file" 1>&2
      echo "Remember, $owner must have a dedicated user id and group id." 1>&2
      exit 1
--- 141,150 ----
     esac
  done
  
! # Workaround, should edit main.cf in place.
! echo "mail_owner = $owner" >./main.cf
! 
! bin/postmap -c . -q "$owner" unix:passwd.byname >/dev/null || {
      echo "$owner needs an entry in the passwd file" 1>&2
      echo "Remember, $owner must have a dedicated user id and group id." 1>&2
      exit 1
***************
*** 146,152 ****
  
  case $setgid in
  no) ;;
!  *) bin/postmap -q "$setgid" unix:group.byname >/dev/null || {
  	echo "$setgid needs an entry in the group file" 1>&2
  	echo "Remember, $setgid must have a dedicated group id." 1>&2
  	exit 1
--- 152,158 ----
  
  case $setgid in
  no) ;;
!  *) bin/postmap -c . -q "$setgid" unix:group.byname >/dev/null || {
  	echo "$setgid needs an entry in the group file" 1>&2
  	echo "Remember, $setgid must have a dedicated group id." 1>&2
  	exit 1
***************
*** 199,205 ****
  	s;^daemon_directory .*;daemon_directory = $daemon_directory;
  	s;^command_directory .*;command_directory = $command_directory;
  	s;^queue_directory .*;queue_directory = $queue_directory;
! 	s;^mail_owner .*;mail_owner = $mail_owner;
      " conf/main.cf >$config_directory/main.cf || exit 1
  
      echo "Warning: you still need to edit myorigin/mydestination in" 1>&2
--- 205,211 ----
  	s;^daemon_directory .*;daemon_directory = $daemon_directory;
  	s;^command_directory .*;command_directory = $command_directory;
  	s;^queue_directory .*;queue_directory = $queue_directory;
! 	s;^mail_owner .*;mail_owner = $owner;
      " conf/main.cf >$config_directory/main.cf || exit 1
  
      echo "Warning: you still need to edit myorigin/mydestination in" 1>&2
diff -cr ../postfix-19990906-pl06/conf/sample-pcre.cf ./conf/sample-pcre.cf
*** ../postfix-19990906-pl06/conf/sample-pcre.cf	Thu Nov  4 20:52:52 1999
--- ./conf/sample-pcre.cf	Tue Nov  9 10:59:13 1999
***************
*** 1,6 ****
- # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF
- # HERE JUST SERVES AS AN EXAMPLE.
- #
  # 
  #	Sample pcre (PERL-compatible regular expression) map file
  #
--- 1,3 ----
diff -cr ../postfix-19990906-pl06/conf/sample-regexp.cf ./conf/sample-regexp.cf
*** ../postfix-19990906-pl06/conf/sample-regexp.cf	Thu Nov  4 20:53:02 1999
--- ./conf/sample-regexp.cf	Tue Nov  9 11:00:10 1999
***************
*** 1,6 ****
- # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF
- # HERE JUST SERVES AS AN EXAMPLE.
- #
  # Sample regexp lookup "table".
  #
  # Format is /regexp/flags or /regexp/flags!/regexp/flags
--- 1,3 ----