Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=2e65d3510f4c78f5af2fda0f5a96f36a3a63447b
commit 2e65d3510f4c78f5af2fda0f5a96f36a3a63447b Author: James Buren <r...@frugalware.org> Date: Mon Jun 4 21:45:45 2012 -0500 openssh-5.9p1-5-x86_64 * convert to use systemd schema diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild index 16103f0..54f5840 100644 --- a/source/network/openssh/FrugalBuild +++ b/source/network/openssh/FrugalBuild @@ -4,7 +4,7 @@ pkgname=openssh pkgver=5.9p1 -pkgrel=4 +pkgrel=5 pkgdesc='Secure Shell daemon and clients' url="http://www.openssh.com/"; backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config') @@ -19,6 +19,11 @@ source=(http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar sshd-keygen sshd-keygen.service sshd.service) signatures=("$source.asc" '' '' '' '' '' '' '') replaces=('openldev') +options=('scriptlet') + +_F_sysvinit_units=(sshd) +_F_systemd_units=(sshd-keygen=e sshd=e) +Finclude systemd subpkgs=('openssh-askpass') subdescs=('X11 passphrase dialog for OpenSSH') @@ -58,6 +63,7 @@ build() Fcp $pkgname-$pkgver/contrib/gnome-ssh-askpass2 usr/libexec/ssh-askpass || Fdie Fcp $pkgname-$pkgver/contrib/ssh-copy-id usr/bin/ssh-copy-id || Fdie Fsplit openssh-askpass usr/libexec/ssh-askpass + Fgenscriptlet } # optimization OK diff --git a/source/network/openssh/openssh.install b/source/network/openssh/openssh.install deleted file mode 100644 index e78a7de..0000000 --- a/source/network/openssh/openssh.install +++ /dev/null @@ -1,31 +0,0 @@ -post_install() { - chkconfig --add rc.sshd - systemctl enable sshd.service >/dev/null 2>&1 - systemctl enable sshd-keygen.service >/dev/null 2>&1 -} - -post_upgrade() { - systemctl daemon-reload >/dev/null 2>&1 - # this can be removed after Frugalware-1.6 - if [ `vercmp $2 5.9p1-2` -lt 0 ] ; then - if chkconfig rc.sshd; then - post_install - fi - fi -} - -pre_remove() { - chkconfig --del rc.sshd - systemctl --no-reload disable sshd.service >/dev/null 2>&1 - systemctl --no-reload disable sshd-keygen.service >/dev/null 2>&1 - systemctl stop sshd.service >/dev/null 2>&1 - systemctl stop sshd-keygen.service > /dev/null 2>&1 -} - -post_remove() { - systemctl daemon-reload >/dev/null 2>&1 -} - -op=$1 -shift -$op $* _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
