Skip to content

Instantly share code, notes, and snippets.

@mariuz
Created April 2, 2014 11:49
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mariuz/9932596 to your computer and use it in GitHub Desktop.
Save mariuz/9932596 to your computer and use it in GitHub Desktop.
diff -Nru openssh-6.6p1/debian/changelog openssh-6.6p1/debian/changelog
--- openssh-6.6p1/debian/changelog 2014-03-31 11:20:50.000000000 +0000
+++ openssh-6.6p1/debian/changelog 2014-04-02 11:38:06.000000000 +0000
@@ -1,3 +1,9 @@
+openssh (1:6.6p1-2ubuntu1) precise; urgency=low
+
+ * add changes for 12.04 lts
+
+ -- Ubuntu <ubuntu@assetpanda.com> Wed, 02 Apr 2014 11:37:51 +0000
+
openssh (1:6.6p1-2) unstable; urgency=medium
* If no root password is set, then switch to "PermitRootLogin
diff -Nru openssh-6.6p1/debian/control openssh-6.6p1/debian/control
--- openssh-6.6p1/debian/control 2014-03-26 12:42:47.000000000 +0000
+++ openssh-6.6p1/debian/control 2014-04-02 07:38:18.000000000 +0000
@@ -2,7 +2,7 @@
Section: net
Priority: standard
Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
-Build-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 (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4)
+Build-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 (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev
Standards-Version: 3.9.5
Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
Homepage: http://www.openssh.org/
@@ -45,7 +45,7 @@
Priority: optional
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps, openssh-sftp-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base , procps, openssh-sftp-server
Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
Conflicts: ssh-socks, ssh2, sftp
Replaces: ssh, ssh-krb5
diff -Nru openssh-6.6p1/debian/rules openssh-6.6p1/debian/rules
--- openssh-6.6p1/debian/rules 2014-03-29 23:05:01.000000000 +0000
+++ openssh-6.6p1/debian/rules 2014-04-02 07:29:04.000000000 +0000
@@ -119,7 +119,7 @@
confflags_udeb += --with-ldflags='-Wl,--as-needed'
%:
- dh $@ --with=autoreconf,systemd
+ dh $@ --with=autoreconf
autoreconf:
autoreconf -f -i
@@ -192,10 +192,6 @@
# Avoid breaking dh_installexamples later.
mkdir -p debian/openssh-server/usr/share/doc/openssh-client
-override_dh_systemd_enable:
- dh_systemd_enable -popenssh-server --name ssh ssh.service
- dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
-
override_dh_installinit:
dh_installinit -R --name ssh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment