[28785] in Source-Commits

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

ssh-server-config commit: Update for Zesty

daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sun May 7 04:29:22 2017

Date: Sun, 7 May 2017 04:29:15 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201705070829.v478TFGU024960@drugstore.mit.edu>
To: source-commits@mit.edu

https://github.com/mit-athena/ssh-server-config/commit/787e0c80b024633e05cd4f798f7cc7c63df5d541
commit 787e0c80b024633e05cd4f798f7cc7c63df5d541
Author: Anders Kaseorg <andersk@mit.edu>
Date:   Sun May 7 03:49:28 2017 -0400

    Update for Zesty
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>

 debian/changelog |    6 ++++++
 debian/rules     |    8 ++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4b312d..8e65cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-ssh-server-config (1.13) unstable; urgency=medium
+
+  * Update for Zesty.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sun, 07 May 2017 03:49:14 -0400
+
 debathena-ssh-server-config (1.12) unstable; urgency=medium
 
   * Remove debathena-ssh-server build dependency.
diff --git a/debian/rules b/debian/rules
index b92285d..d90cb5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,13 @@ DEB_UNDIVERT_FILES_debathena-ssh-server-config += \
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk
 
+ifneq ($(wildcard /usr/share/openssh/sshd_config),)
+
+PRIVSEP = yes
+debian/sshd_config.debathena-orig: $(call debian_check_files,/usr/share/openssh/sshd_config)
+	cp $< $@
+
+else
 ifeq ($(shell dpkg --compare-versions \
 	"`dpkg-query --showformat='$${Version}' --show openssh-server`" ">=" 1:4.3 && echo y),y)
 
@@ -22,6 +29,7 @@ debian/sshd_config.debathena-orig: /var/lib/dpkg/info/ssh-krb5.postinst
 	perl -0pe 's/^.*<<EOF[^\n]*\n(.*\n)EOF\n.*<<EOF[^\n]*\n.*\nEOF\n.*<<EOF[^\n]*\n(.*\n)EOF\n.*<<EOF[^\n]*\n(.*\n)EOF\n.*$$/$$1$$2$$3/s or die;' $< > $@
 
 endif
+endif
 
 common-build-indep:: debian/sshd_config.debathena
 

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