summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2015-09-10 12:22:49 +0100
committerColin Watson <cjwatson@debian.org>2015-09-10 12:22:49 +0100
commit0e4f63b129133ac05f9c3cd0ca2e2f25352cfa25 (patch)
treec47243c2f8ac31663135abd05f1114b397f89f89 /debian
parent573eae1ca709a461eff57d1949d5329b9e398894 (diff)
Build with audit support on Linux (closes: #797727, LP: #1478087).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules1
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5eb1d4528..47d92f436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
1openssh (1:6.9p1-2) UNRELEASED; urgency=medium 1openssh (1:6.9p1-2) UNRELEASED; urgency=medium
2 2
3 [ Colin Watson ]
3 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen 4 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen
4 invocation onto a separate line to make it easier to copy and paste 5 invocation onto a separate line to make it easier to copy and paste
5 (LP: #1491532). 6 (LP: #1491532).
6 7
8 [ Tyler Hicks ]
9 * Build with audit support on Linux (closes: #797727, LP: #1478087).
10
7 -- Colin Watson <cjwatson@debian.org> Tue, 08 Sep 2015 14:50:16 +0100 11 -- Colin Watson <cjwatson@debian.org> Tue, 08 Sep 2015 14:50:16 +0100
8 12
9openssh (1:6.9p1-1) unstable; urgency=medium 13openssh (1:6.9p1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c513f4ee4..441cb03e6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
2Section: net 2Section: net
3Priority: standard 3Priority: standard
4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org> 4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4) 5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4), libaudit-dev [linux-any]
6XS-Testsuite: autopkgtest 6XS-Testsuite: autopkgtest
7Standards-Version: 3.9.6 7Standards-Version: 3.9.6
8Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org> 8Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
diff --git a/debian/rules b/debian/rules
index d377ed2b0..198e2b616 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,7 @@ confflags += --with-kerberos5=/usr
91confflags += --with-ssl-engine 91confflags += --with-ssl-engine
92ifeq ($(DEB_HOST_ARCH_OS),linux) 92ifeq ($(DEB_HOST_ARCH_OS),linux)
93confflags += --with-selinux 93confflags += --with-selinux
94confflags += --with-audit=linux
94endif 95endif
95ifeq ($(DISTRIBUTOR),Ubuntu) 96ifeq ($(DISTRIBUTOR),Ubuntu)
96confflags += --with-consolekit 97confflags += --with-consolekit