3 files changed, 13 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 5e5084424..f32d19477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:3.7.1p2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Remove -fno-builtin-log and -DHAVE_MMAP_ANON_SHARED compiler options,
+    which are no longer necessary.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 23 Sep 2003 19:22:38 +0100
+
 openssh (1:3.6.1p2-12) unstable; urgency=low
 
   * Update Spanish debconf template translation (thanks, Javier
diff --git a/debian/rules b/debian/rules
index a69463757..b3ff3c0f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ build-stamp:
         dh_testdir
         ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 \
                 --with-privsep-path=/var/run/sshd  --without-rand-helper
-        $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -fno-builtin-log -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED -DSSH_VERSION="\"$(SSH_VERSION)\""' \
+        $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DSSH_VERSION="\"$(SSH_VERSION)\""' \
                 SSH_KEYSIGN='/usr/lib/ssh-keysign'
         # Support building on Debian 3.0 (with GNOME 1.4) and later.
         if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
diff --git a/debian/templates.master b/debian/templates.master
index a4005fd38..4d60e95da 100644
--- a/debian/templates.master
+++ b/debian/templates.master
@@ -26,9 +26,9 @@ _Description: Enable Privilege separation
  fail, and PAM keyboard-interactive authentication won't work.
  .
  Since you've opted to have me generate an sshd_config file for you, you
- can choose whether or not to have Privilege Separation turned on or not.
+ can choose whether or not to have privilege separation turned on or not.
  Unless you know you need to use PAM features that won't work with this
- option, you should say yes here.
+ option, you should enable it.
 
 Template: ssh/new_config
 Type: boolean
@@ -75,7 +75,7 @@ _Description: ssh2 keys merged in configuration files
 Template: ssh/use_old_init_script
 Type: boolean
 Default: false
-_Description: Do you want to continue (and risk killing active ssh sessions) ?
+_Description: Do you want to continue (and risk killing active ssh sessions)?
  The version of /etc/init.d/ssh that you have installed, is likely to kill
  all running sshd instances.  If you are doing this upgrade via an ssh
  session, that would be a Bad Thing(tm).
@@ -134,7 +134,7 @@ _Description: Do you want /usr/lib/ssh-keysign to be installed SUID root?
 Template: ssh/run_sshd
 Type: boolean
 Default: true
-_Description: Do you want to run the sshd server ?
+_Description: Do you want to run the sshd server?
  This package contains both the ssh client, and the sshd server.
  .
  Normally the sshd Secure Shell Server will be run to allow remote logins