[23045] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r22708 - trunk/debathena/config/ssh-client-config/debian

daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Fri Jan 25 15:55:56 2008

Date: Fri, 25 Jan 2008 15:55:26 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801252055.PAA17180@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: tabbott
Date: 2008-01-25 15:55:26 -0500 (Fri, 25 Jan 2008)
New Revision: 22708

Modified:
   trunk/debathena/config/ssh-client-config/debian/changelog
   trunk/debathena/config/ssh-client-config/debian/rules
Log:


Modified: trunk/debathena/config/ssh-client-config/debian/changelog
===================================================================
--- trunk/debathena/config/ssh-client-config/debian/changelog	2008-01-25 20:42:36 UTC (rev 22707)
+++ trunk/debathena/config/ssh-client-config/debian/changelog	2008-01-25 20:55:26 UTC (rev 22708)
@@ -1,3 +1,10 @@
+debathena-ssh-client-config (1.0debathena6) unstable; urgency=low
+
+  * Eliminate all GSSAPIAuthentication lines in /etc/ssh/ssh_config before
+    adding the right version, to avoid duplicates.
+
+ -- Tim Abbott <tabbott@mit.edu>  Fri, 25 Jan 2008 15:53:06 -0500
+
 debathena-ssh-client-config (1.0debathena5) unstable; urgency=low
 
   * Use new check-conffiles interface from debathena-config-build-common

Modified: trunk/debathena/config/ssh-client-config/debian/rules
===================================================================
--- trunk/debathena/config/ssh-client-config/debian/rules	2008-01-25 20:42:36 UTC (rev 22707)
+++ trunk/debathena/config/ssh-client-config/debian/rules	2008-01-25 20:55:26 UTC (rev 22708)
@@ -11,7 +11,7 @@
 
 debian/ssh_config.debathena: $(call debathena_check_conffiles,/etc/ssh/ssh_config)
 	perl -0pe ' \
-	    s/^\s*#?\s*GSSAPIAuthentication.*\n//m; \
+	    s/^\s*#?\s*GSSAPIAuthentication.*\n//mg; \
 	    s/$$/\n    GSSAPIAuthentication yes/ or die;' $< > $@
 
 clean::


home help back first fref pref prev next nref lref last post