summaryrefslogtreecommitdiff
path: root/core/openssh/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-09-10 15:50:09 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-09-10 15:50:09 -0300
commit678a7a4fb762d6669c9c2105b78d107aeebe163e (patch)
treeff00f3107491221d314e82982159160e1fa15778 /core/openssh/PKGBUILD
parentf5cfd603b3511e75e414558f6cc9c10f8af0b750 (diff)
parent2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/haskell-stm/PKGBUILD community-staging/haskell-syb/PKGBUILD community/cantata/PKGBUILD community/linux-tools/PKGBUILD community/python-pymongo/PKGBUILD core/less/PKGBUILD extra/alsa-plugins/PKGBUILD extra/avfs/PKGBUILD extra/cups/PKGBUILD extra/icedtea-web/PKGBUILD extra/kdeadmin/PKGBUILD extra/kdemultimedia-mplayerthumbs/PKGBUILD extra/kdepim/PKGBUILD extra/libreoffice/PKGBUILD extra/mysql/PKGBUILD extra/ocaml/PKGBUILD extra/sqlite/PKGBUILD extra/vim/PKGBUILD gnome-unstable/at-spi2-atk/PKGBUILD gnome-unstable/at-spi2-core/PKGBUILD gnome-unstable/atk/PKGBUILD gnome-unstable/glib2/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD multilib/lib32-alsa-lib/PKGBUILD multilib/lib32-alsa-plugins/PKGBUILD multilib/lib32-fontconfig/PKGBUILD staging/ghc/PKGBUILD staging/ghc/build.mk staging/haskell-http/PKGBUILD staging/haskell-mtl/PKGBUILD staging/haskell-network/PKGBUILD staging/haskell-parsec/PKGBUILD staging/haskell-random/PKGBUILD staging/haskell-text/PKGBUILD staging/haskell-transformers/PKGBUILD staging/haskell-zlib/PKGBUILD testing/coreutils/PKGBUILD testing/coreutils/coreutils.install testing/dhcpcd/PKGBUILD testing/kactivities/PKGBUILD testing/kdeaccessibility-jovie/PKGBUILD testing/kdeaccessibility-kaccessible/PKGBUILD testing/kdeaccessibility-kmag/PKGBUILD testing/kdeaccessibility-kmousetool/PKGBUILD testing/kdeaccessibility-kmouth/PKGBUILD testing/kdeadmin/PKGBUILD testing/kdeartwork/PKGBUILD testing/kdebase-konsole/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/kdebase/PKGBUILD testing/kdebindings-kimono/PKGBUILD testing/kdebindings-korundum/PKGBUILD testing/kdebindings-kross/PKGBUILD testing/kdebindings-perlkde/PKGBUILD testing/kdebindings-perlqt/PKGBUILD testing/kdebindings-python/PKGBUILD testing/kdebindings-qtruby/PKGBUILD testing/kdebindings-qyoto/PKGBUILD testing/kdebindings-smokegen/PKGBUILD testing/kdebindings-smokekde/PKGBUILD testing/kdebindings-smokeqt/PKGBUILD testing/kdeedu-analitza/PKGBUILD testing/kdeedu-blinken/PKGBUILD testing/kdeedu-cantor/PKGBUILD testing/kdeedu-kalgebra/PKGBUILD testing/kdeedu-kalzium/PKGBUILD testing/kdeedu-kanagram/PKGBUILD testing/kdeedu-kbruch/PKGBUILD testing/kdeedu-kgeography/PKGBUILD testing/kdeedu-khangman/PKGBUILD testing/kdeedu-kig/PKGBUILD testing/kdeedu-kiten/PKGBUILD testing/kdeedu-klettres/PKGBUILD testing/kdeedu-kmplot/PKGBUILD testing/kdeedu-kstars/PKGBUILD testing/kdeedu-ktouch/PKGBUILD testing/kdeedu-kturtle/PKGBUILD testing/kdeedu-kwordquiz/PKGBUILD testing/kdeedu-marble/PKGBUILD testing/kdeedu-pairs/PKGBUILD testing/kdeedu-parley/PKGBUILD testing/kdeedu-rocs/PKGBUILD testing/kdeedu-step/PKGBUILD testing/kdegames/PKGBUILD testing/kdegraphics-gwenview/PKGBUILD testing/kdegraphics-kamera/PKGBUILD testing/kdegraphics-kcolorchooser/PKGBUILD testing/kdegraphics-kgamma/PKGBUILD testing/kdegraphics-kolourpaint/PKGBUILD testing/kdegraphics-kruler/PKGBUILD testing/kdegraphics-ksaneplugin/PKGBUILD testing/kdegraphics-ksnapshot/PKGBUILD testing/kdegraphics-mobipocket/PKGBUILD testing/kdegraphics-okular/PKGBUILD testing/kdegraphics-strigi-analyzer/PKGBUILD testing/kdegraphics-svgpart/PKGBUILD testing/kdegraphics-thumbnailers/PKGBUILD testing/kdemultimedia-audiocd-kio/PKGBUILD testing/kdemultimedia-dragonplayer/PKGBUILD testing/kdemultimedia-ffmpegthumbs/PKGBUILD testing/kdemultimedia-juk/PKGBUILD testing/kdemultimedia-kmix/PKGBUILD testing/kdemultimedia-kscd/PKGBUILD testing/kdemultimedia-mplayerthumbs/PKGBUILD testing/kdenetwork/PKGBUILD testing/kdepim-runtime/PKGBUILD testing/kdepim/PKGBUILD testing/kdepimlibs/PKGBUILD testing/kdeplasma-addons/PKGBUILD testing/kdesdk-kate/PKGBUILD testing/kdesdk/PKGBUILD testing/kdetoys/PKGBUILD testing/kdeutils-filelight/PKGBUILD testing/kdeutils-kcalc/PKGBUILD testing/kdeutils-kcharselect/PKGBUILD testing/kdeutils-kdf/PKGBUILD testing/kdeutils-kfloppy/PKGBUILD testing/kdeutils-kgpg/PKGBUILD testing/kdeutils-kremotecontrol/PKGBUILD testing/kdeutils-ktimer/PKGBUILD testing/kdeutils-kwallet/PKGBUILD testing/kdeutils-superkaramba/PKGBUILD testing/kdeutils-sweeper/PKGBUILD testing/kdewebdev/PKGBUILD testing/kmod/PKGBUILD testing/libkcddb/PKGBUILD testing/libkcompactdisc/PKGBUILD testing/libkdcraw/PKGBUILD testing/libkdeedu/PKGBUILD testing/libkexiv2/PKGBUILD testing/libkipi/PKGBUILD testing/libksane/PKGBUILD testing/libmpc/PKGBUILD testing/nepomuk-core/PKGBUILD testing/procps-ng/PKGBUILD testing/sudo/PKGBUILD testing/sysvinit/PKGBUILD testing/util-linux/PKGBUILD testing/util-linux/util-linux.install
Diffstat (limited to 'core/openssh/PKGBUILD')
-rw-r--r--core/openssh/PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 7e6d6bf5a..6d3313bfe 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165852 2012-09-01 14:30:06Z bisson $
+# $Id: PKGBUILD 166025 2012-09-04 14:40:23Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=6.1p1
-pkgrel=1
+pkgrel=2
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
@@ -27,8 +27,8 @@ sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
'954bf1660aa32620c37034320877f4511b767ccb'
'6c71de2c2ca9622aa8e863acd94b135555e11125'
'bd6eae36c7ef9efb7147778baad7858b81f2d660'
- 'f27617eeb694f4edd474638adf16733d8a793d85'
- 'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
+ '1fd209980ee2fcdd7b219883e8add0f5ca63388a'
+ 'b7acfce018efc111e7ce80dbe37b932caf7c2d53'
'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
'659e3ee95c269014783ff8b318c6f50bf7496fbd'
'1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')