diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-31 12:32:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-31 12:32:39 +0000 |
| commit | 2e871f997a1ffce77dacdd3989841621caa14b79 (patch) | |
| tree | d8216a52c1cb1d890f809080b081a44ce07d2c5a | |
| parent | ea6f37407162790ebc283d23bf7edb2812aea647 (diff) | |
| parent | 01b2f5b66b1fdac7e42a2c2205661ff712365f18 (diff) | |
| download | aports-2e871f997a1ffce77dacdd3989841621caa14b79.tar.bz2 aports-2e871f997a1ffce77dacdd3989841621caa14b79.tar.xz | |
Merge git://git.alpinelinux.org/msmith/aports
| -rw-r--r-- | main/openssh/APKBUILD | 4 | ||||
| -rw-r--r-- | main/openssh/sshd.initd | 7 | ||||
| -rw-r--r-- | main/znc/APKBUILD (renamed from testing/znc/APKBUILD) | 0 | ||||
| -rw-r--r-- | main/znc/libiconv.patch (renamed from testing/znc/libiconv.patch) | 0 |
4 files changed, 9 insertions, 2 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 8741c511f1..c72ab84e72 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -2,7 +2,7 @@ pkgname=openssh pkgver=5.8_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=1 +pkgrel=2 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -88,5 +88,5 @@ client() { md5sums="86f5e1c23b4c4845f23b9b7b493fb53d openssh-5.8p1.tar.gz 4c96723cb6dd02f76fe263c4d68c6a6f openssh5.8-dynwindow_noneswitch.diff.gz 578fb646bab2d312172ec716970031b1 openssh5.8-peaktput.diff -e36e847812214822044b6d3e0027d3fc sshd.initd +dda71d60ff5b4fbb61ad99fe83de6bc3 sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" diff --git a/main/openssh/sshd.initd b/main/openssh/sshd.initd index d1e6e16d40..912d435c99 100644 --- a/main/openssh/sshd.initd +++ b/main/openssh/sshd.initd @@ -74,6 +74,13 @@ stop() { start-stop-daemon --stop --exec "${SSHD_BINARY}" \ --pidfile "${SSHD_PIDFILE}" --quiet eend $? + + if [ "$RC_RUNLEVEL" = "shutdown" ]; then + ebegin "Shutting down ssh connections" + _sshd_pids=$(pgrep "${SSHD_BINARY##*/}: .* \[priv]") + kill -TERM $_sshd_pids 2>&1 >/dev/null + eend 0 + fi } reload() { diff --git a/testing/znc/APKBUILD b/main/znc/APKBUILD index c9047564d0..c9047564d0 100644 --- a/testing/znc/APKBUILD +++ b/main/znc/APKBUILD diff --git a/testing/znc/libiconv.patch b/main/znc/libiconv.patch index 0af3a21048..0af3a21048 100644 --- a/testing/znc/libiconv.patch +++ b/main/znc/libiconv.patch |