diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
| commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
| tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /core/openssh/PKGBUILD | |
| parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
| parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'core/openssh/PKGBUILD')
| -rw-r--r-- | core/openssh/PKGBUILD | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 49f2f87ee..49bc64e2f 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 153965 2012-03-21 06:20:49Z pierre $ +# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=5.9p1 -pkgrel=8 +pkgver=6.0p1 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' -arch=('i686' 'x86_64' 'mips64el') -license=('custom:BSD') url='http://www.openssh.org/portable.html' -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('krb5' 'openssl' 'libedit') +license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') +depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.close-sessions' 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' +sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '3413909fd45a28701c92e6e5b59c6b65346ddb0f' '21fa88de6cc1c7912e71655f50896ba17991a1c2') +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,19 +32,27 @@ build() { --prefix=/usr \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ - --with-privsep-user=nobody \ - --with-md5-passwords \ + --with-ldns \ + --with-libedit \ + --with-ssl-engine \ --with-pam \ - --with-mantype=man \ - --with-xauth=/usr/bin/xauth \ + --with-privsep-user=nobody \ --with-kerberos5=/usr \ - --with-ssl-engine \ - --with-libedit=/usr/lib \ - --disable-strip # stripping is done by makepkg + --with-xauth=/usr/bin/xauth \ + --with-mantype=man \ + --with-md5-passwords \ make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # The connect.sh test must be run by a user with a decent login shell; + # chroot builds use nobody with /bin/false. + make tests || true +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install |