diff options
author | Colin Watson <cjwatson@debian.org> | 2017-01-15 02:27:55 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-01-15 02:27:55 +0000 |
commit | 403c387be6fb8ae4b852cff5d68313fd4af3a90b (patch) | |
tree | e293b0598a9bea488e122bbc20e4f9cf3a532cfb | |
parent | 1f8af0f8fa5f06438721a20a9ac284e15884aa9b (diff) |
Remove LOGIN_PROGRAM and LOGIN_NO_ENDOPT definitions, since UseLogin is gone.
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | debian/rules | 1 |
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 @@ | |||
1 | openssh (1:7.4p1-6) UNRELEASED; urgency=medium | 1 | openssh (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 | |||
107 | export DEB_BUILD_MAINT_OPTIONS := hardening=+all | 107 | export DEB_BUILD_MAINT_OPTIONS := hardening=+all |
108 | include /usr/share/dpkg/buildflags.mk | 108 | include /usr/share/dpkg/buildflags.mk |
109 | cflags := $(CPPFLAGS) $(CFLAGS) | 109 | cflags := $(CPPFLAGS) $(CFLAGS) |
110 | cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT | ||
111 | cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" | 110 | cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" |
112 | cflags_udeb := -Os | 111 | cflags_udeb := -Os |
113 | cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" | 112 | cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" |