openssh: merge -server; there's no need to split it just to save 800KB.

This commit is contained in:
Juan RP 2014-11-04 16:44:14 +01:00
parent 447e0afcb9
commit 8468d004e3
2 changed files with 11 additions and 32 deletions

View File

@ -1 +0,0 @@
openssh

View File

@ -1,9 +1,7 @@
# Template file for 'openssh' # Template file for 'openssh'
_desc="The OpenSSH implementation of SSH protocol"
pkgname=openssh pkgname=openssh
version=6.7p1 version=6.7p1
revision=3 revision=4
build_style=gnu-configure build_style=gnu-configure
configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@ -12,9 +10,10 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
--with-pid-dir=/run --with-pam --with-pie --without-kerberos5 LD=$CC" --with-pid-dir=/run --with-pam --with-pie --without-kerberos5 LD=$CC"
hostmakedepends="automake libtool perl" hostmakedepends="automake libtool perl"
makedepends="zlib-devel libressl-devel pam-devel" makedepends="zlib-devel libressl-devel pam-devel"
short_desc="${_desc} - client" short_desc="The OpenSSH implementation of SSH protocol"
replaces="openssh-client<6.1p1" replaces="openssh-server>=0"
conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/pam.d/sshd" conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
make_dirs="/var/chroot/ssh 0755 root root"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.openssh.org" homepage="http://www.openssh.org"
license="BSD" license="BSD"
@ -33,7 +32,6 @@ pre_configure() {
fi fi
autoreconf -fi autoreconf -fi
} }
post_install() { post_install() {
vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
vinstall contrib/ssh-copy-id 755 usr/bin vinstall contrib/ssh-copy-id 755 usr/bin
@ -48,28 +46,10 @@ post_install() {
${DESTDIR}/etc/ssh/sshd_config ${DESTDIR}/etc/ssh/sshd_config
vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd
} if [ "$build_option_systemd" ]; then
vmkdir usr/lib/systemd/system
openssh-server_package() { install -m644 ${FILESDIR}/*.{socket,service} \
conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" ${PKGDESTDIR}/usr/lib/systemd/system
make_dirs="/var/chroot/ssh 0755 root root" fi
replaces="runit-void<20141013_2" vsv sshd
depends="openssh>=$version"
short_desc="${_desc} - server"
pkg_install() {
vmove usr/libexec/sftp-server
vmove etc/ssh/sshd_config
vmove usr/sbin
vmove usr/share/man/man5/sshd_config.5
for f in sftp-server sshd; do
vmove usr/share/man/man8/${f}.8
done
vmove etc/pam.d
if [ "$build_option_systemd" ]; then
vmkdir usr/lib/systemd/system
install -m644 ${FILESDIR}/*.{socket,service} \
${PKGDESTDIR}/usr/lib/systemd/system
fi
vsv sshd
}
} }