summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules1
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 56f09982f..5e5ad70ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
1openssh (1:7.4p1-6) UNRELEASED; urgency=medium 1openssh (1:7.4p1-6) UNRELEASED; urgency=medium
2 2
3 * Remove temporary file on exit from postinst (closes: #850275). 3 * Remove temporary file on exit from postinst (closes: #850275).
4 * Remove LOGIN_PROGRAM and LOGIN_NO_ENDOPT definitions, since UseLogin is
5 gone.
4 6
5 -- Colin Watson <cjwatson@debian.org> Fri, 06 Jan 2017 08:40:14 +0000 7 -- Colin Watson <cjwatson@debian.org> Fri, 06 Jan 2017 08:40:14 +0000
6 8
diff --git a/debian/rules b/debian/rules
index 34701bb22..6b3b335b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,7 +107,6 @@ confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superu
107export DEB_BUILD_MAINT_OPTIONS := hardening=+all 107export DEB_BUILD_MAINT_OPTIONS := hardening=+all
108include /usr/share/dpkg/buildflags.mk 108include /usr/share/dpkg/buildflags.mk
109cflags := $(CPPFLAGS) $(CFLAGS) 109cflags := $(CPPFLAGS) $(CFLAGS)
110cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT
111cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" 110cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
112cflags_udeb := -Os 111cflags_udeb := -Os
113cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" 112cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"