[arch-commits] Commit in grml-zsh-config/repos (extra-any)

2010-03-10 Thread Pierre Schmitz
Date: Thursday, March 11, 2010 @ 00:37:23
  Author: pierre
Revision: 71864

archrelease: copy trunk to extra-any

Added:
  grml-zsh-config/repos/extra-any/



[arch-commits] Commit in grml-zsh-config/repos (extra-any)

2010-03-10 Thread Pierre Schmitz
Date: Thursday, March 11, 2010 @ 00:37:08
  Author: pierre
Revision: 71863

archrelease: remove extra-any

Deleted:
  grml-zsh-config/repos/extra-any/



[arch-commits] Commit in grml-zsh-config/trunk (PKGBUILD)

2010-03-10 Thread Pierre Schmitz
Date: Thursday, March 11, 2010 @ 00:37:00
  Author: pierre
Revision: 71862

upgpkg: grml-zsh-config 0.3.80-1
upstream update

Modified:
  grml-zsh-config/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-11 01:11:38 UTC (rev 71861)
+++ PKGBUILD2010-03-11 05:37:00 UTC (rev 71862)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=grml-zsh-config
-pkgver=0.3.79
+pkgver=0.3.80
 pkgrel=1
 pkgdesc="grml's zsh setup"
 arch=('any')
@@ -11,7 +11,7 @@
 depends=('zsh')
 makedepends=('txt2tags')
 
source=("http://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_${pkgver}.tar.gz";)
-md5sums=('c8123412fc02f91638d4792e5a49f861')
+md5sums=('d64bce22f6a9cd281eecb2fe3c5ebda0')
 
 build() {
cd ${srcdir}/grml-etc-core/doc



[arch-commits] Commit in gparted/repos (extra-x86_64)

2010-03-10 Thread Giovanni Scafora
Date: Wednesday, March 10, 2010 @ 20:11:38
  Author: giovanni
Revision: 71861

archrelease: copy trunk to extra-x86_64

Added:
  gparted/repos/extra-x86_64/



[arch-commits] Commit in gparted/repos (extra-x86_64)

2010-03-10 Thread Giovanni Scafora
Date: Wednesday, March 10, 2010 @ 20:11:18
  Author: giovanni
Revision: 71860

archrelease: remove extra-x86_64

Deleted:
  gparted/repos/extra-x86_64/



[arch-commits] Commit in gparted/repos (extra-i686)

2010-03-10 Thread Giovanni Scafora
Date: Wednesday, March 10, 2010 @ 20:11:01
  Author: giovanni
Revision: 71859

archrelease: copy trunk to extra-i686

Added:
  gparted/repos/extra-i686/



[arch-commits] Commit in gparted/repos (extra-i686)

2010-03-10 Thread Giovanni Scafora
Date: Wednesday, March 10, 2010 @ 20:10:42
  Author: giovanni
Revision: 71858

archrelease: remove extra-i686

Deleted:
  gparted/repos/extra-i686/



[arch-commits] Commit in gparted/trunk (PKGBUILD)

2010-03-10 Thread Giovanni Scafora
Date: Wednesday, March 10, 2010 @ 20:10:25
  Author: giovanni
Revision: 71857

upgpkg: gparted 0.5.2-1
upstream release

Modified:
  gparted/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 23:47:59 UTC (rev 71856)
+++ PKGBUILD2010-03-11 01:10:25 UTC (rev 71857)
@@ -3,8 +3,8 @@
 # Contributor: Andrew Simmons 
 
 pkgname=gparted
-pkgver=0.5.1
-pkgrel=4
+pkgver=0.5.2
+pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net";
@@ -20,7 +20,7 @@
 'gksu: to run gparted directly from menu')
 install=gparted.install
 
source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9c7e6853851d1d23aef40d9edc315a6b')
+md5sums=('9020d112fa239ef1b58ed34bbad254c2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"



[arch-commits] Commit in telepathy-butterfly/repos (extra-x86_64)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:59
  Author: ibiru
Revision: 71856

archrelease: copy trunk to extra-x86_64

Added:
  telepathy-butterfly/repos/extra-x86_64/



[arch-commits] Commit in python-telepathy/repos (extra-x86_64)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:52
  Author: ibiru
Revision: 71855

archrelease: copy trunk to extra-x86_64

Added:
  python-telepathy/repos/extra-x86_64/



[arch-commits] Commit in telepathy-butterfly/repos (extra-x86_64)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:43
  Author: ibiru
Revision: 71854

archrelease: remove extra-x86_64

Deleted:
  telepathy-butterfly/repos/extra-x86_64/



[arch-commits] Commit in telepathy-butterfly/repos (extra-i686)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:36
  Author: ibiru
Revision: 71853

archrelease: copy trunk to extra-i686

Added:
  telepathy-butterfly/repos/extra-i686/



[arch-commits] Commit in python-telepathy/repos (extra-x86_64)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:36
  Author: ibiru
Revision: 71852

archrelease: remove extra-x86_64

Deleted:
  python-telepathy/repos/extra-x86_64/



[arch-commits] Commit in python-telepathy/repos (extra-i686)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:29
  Author: ibiru
Revision: 71851

archrelease: copy trunk to extra-i686

Added:
  python-telepathy/repos/extra-i686/



[arch-commits] Commit in telepathy-butterfly/repos (extra-i686)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:20
  Author: ibiru
Revision: 71850

archrelease: remove extra-i686

Deleted:
  telepathy-butterfly/repos/extra-i686/



[arch-commits] Commit in telepathy-butterfly/trunk (PKGBUILD)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:13
  Author: ibiru
Revision: 71849

upgpkg: telepathy-butterfly 0.5.5-1
update to 0.5.5

Modified:
  telepathy-butterfly/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 23:47:13 UTC (rev 71848)
+++ PKGBUILD2010-03-10 23:47:13 UTC (rev 71849)
@@ -1,21 +1,21 @@
 # $Id$
-# Maintainer:  Biru Ionut 
+# Maintainer:  Ionut Biru 
 # Contributor: Daniel Balieiro 
 pkgname=telepathy-butterfly
-pkgver=0.5.4
+pkgver=0.5.5
 pkgrel=1
 pkgdesc="A MSN connection manager for Telepathy"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org";
 groups=('telepathy')
 license=('GPL')
-depends=('papyon>=0.4.4' 'python-telepathy>=0.15.14')
+depends=('papyon>=0.4.4' 'python-telepathy>=0.15.16')
 
source=(http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-$pkgver.tar.gz)
+sha256sums=('db191897cd84b35a9a49a8c203328f757ee20b15ca3216e7bdafab67e54c9dbb')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
   make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR="$pkgdir" install || return 1
 }
-md5sums=('3cedf582597ebe742fe7c05fc6ec8943')



[arch-commits] Commit in python-telepathy/repos (extra-i686)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:13
  Author: ibiru
Revision: 71848

archrelease: remove extra-i686

Deleted:
  python-telepathy/repos/extra-i686/



[arch-commits] Commit in papyon/repos (extra-any)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:05
  Author: ibiru
Revision: 71847

archrelease: copy trunk to extra-any

Added:
  papyon/repos/extra-any/



[arch-commits] Commit in python-telepathy/trunk (PKGBUILD)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:47:02
  Author: ibiru
Revision: 71846

upgpkg: python-telepathy 0.15.16-1
update to 0.15.16

Modified:
  python-telepathy/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 23:46:49 UTC (rev 71845)
+++ PKGBUILD2010-03-10 23:47:02 UTC (rev 71846)
@@ -1,8 +1,8 @@
 # $Id$
-# Maintainer: Biru Ionut 
+# Maintainer:  Ionut Biru 
 # Contributor: Daniel Balieiro 
 pkgname=python-telepathy
-pkgver=0.15.15
+pkgver=0.15.16
 pkgrel=1
 pkgdesc="Python libraries for use in Telepathy clients and connection managers"
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@
 depends=('dbus-python')
 makedepends=('libxslt')
 
source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-$pkgver.tar.gz)
+sha256sums=('3cb2c3efae570ab10761445f49be34b458223eb720a4dcc3f700a2c91845c627')
 
 build() {
-cd $srcdir/telepathy-python-$pkgver
+cd "$srcdir/telepathy-python-$pkgver"
 ./configure --prefix=/usr
 make || return 1
-make DESTDIR=$pkgdir install || return 1
+make DESTDIR="$pkgdir" install || return 1
 }
-md5sums=('714fac03ff1386092f209f7ec398d261')



[arch-commits] Commit in papyon/repos (extra-any)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:46:49
  Author: ibiru
Revision: 71845

archrelease: remove extra-any

Deleted:
  papyon/repos/extra-any/



[arch-commits] Commit in papyon/trunk (PKGBUILD)

2010-03-10 Thread Ionut Biru
Date: Wednesday, March 10, 2010 @ 18:46:41
  Author: ibiru
Revision: 71844

upgpkg: papyon 0.4.5-1
update to 0.4.5

Modified:
  papyon/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 18:50:50 UTC (rev 71843)
+++ PKGBUILD2010-03-10 23:46:41 UTC (rev 71844)
@@ -1,8 +1,8 @@
 # $Id$
-# Maintainer: Biru Ionut 
+# Maintainer: Ionut Biru 
 
 pkgname=papyon
-pkgver=0.4.4
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="papyon is the library behind the msn connection manager : 
telepathy-butterfly."
 arch=('any')
@@ -11,9 +11,9 @@
 depends=('pygobject' 'pyopenssl')
 provides=('pymsn')
 
source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e7ff99e831aa33a7c5721081718c8698')
+sha256sums=('51d075b74c2264c382da379db0a5b05f6b34a72cfe9b788b33de28f08340b152')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  python setup.py install --root=$pkgdir || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  python setup.py install --root="$pkgdir" --optimize=1 || return 1
 }



[arch-commits] Commit in system-config-printer/repos (extra-any)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:50:50
  Author: andrea
Revision: 71843

archrelease: copy trunk to extra-any

Added:
  system-config-printer/repos/extra-any/



[arch-commits] Commit in system-config-printer/repos (extra-any)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:50:32
  Author: andrea
Revision: 71842

archrelease: remove extra-any

Deleted:
  system-config-printer/repos/extra-any/



[arch-commits] Commit in system-config-printer/trunk (PKGBUILD)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:50:13
  Author: andrea
Revision: 71841

upgpkg: system-config-printer 1.1.18-1
upstream release

Modified:
  system-config-printer/trunk/PKGBUILD

--+
 PKGBUILD |   23 ---
 1 file changed, 4 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 18:47:40 UTC (rev 71840)
+++ PKGBUILD2010-03-10 18:50:13 UTC (rev 71841)
@@ -4,16 +4,15 @@
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
'system-config-printer-gnome')
-#  'system-config-printer-udev)
-pkgver=1.1.16
+pkgver=1.1.18
 pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/";
 arch=('any')
 license=('GPL')
-makedepends=('intltool' 'python' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 
'libcups' 'libxml2') # libusb with system-config-printer-udev
-source=(http://cyberelk.net/tim/data/${pkgbase}/1.1/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('22394a052fa730a890f6bfea1aec0aa2')
+makedepends=('intltool' 'python' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 
'libcups' 'libxml2')
+source=("http://cyberelk.net/tim/data/${pkgbase}/1.1/${pkgbase}-${pkgver}.tar.bz2";)
+md5sums=('073788462a8122f4b3c9ad31465c61be')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -30,7 +29,6 @@
   depends=('pycups' 'dbus-python' 'pysmbc')
   optdepends=('system-config-printer-gnome: for the GTK frontend'
'kdeadmin-system-config-printer-kde: for the administration tool in KDE 
System Settings')
-#  'system-config-printer-udev: for automatic disabling/enabling when 
printer is connected')
   replaces=('system-config-printer')
   provides=("system-config-printer=$pkgver")
   conflicts=('system-config-printer')
@@ -85,16 +83,3 @@
   rm ${pkgdir}/etc/dbus-1/system.d/newprinternotification.conf || return 1
   rm -r ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/ || return 1
 }
-
-#package_system-config-printer-udev() {
-#  pkgdesc='A CUPS printer configuration tool and status applet - udev rules 
for auto-setup'
-#  depends=('udev' 'libusb' 'system-config-printer-common')
-#
-#  cd ${srcdir}/${pkgbase}-${pkgver}/udev
-#  install -d ${pkgdir}/lib/udev/rules.d
-#  gcc -o udev-configure-printer udev-configure-printer.c || return 1
-#  install -m755 udev-{add,configure}-printer \
-#${pkgdir}/lib/udev || return 1
-#  install -m644 70-printers.rules \
-#${pkgdir}/lib/udev/rules.d || return 1
-#}



[arch-commits] Commit in pycups/repos (extra-x86_64)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:47:40
  Author: andrea
Revision: 71840

archrelease: copy trunk to extra-x86_64

Added:
  pycups/repos/extra-x86_64/



[arch-commits] Commit in pycups/repos (extra-x86_64)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:47:22
  Author: andrea
Revision: 71839

archrelease: remove extra-x86_64

Deleted:
  pycups/repos/extra-x86_64/



[arch-commits] Commit in pycups/repos (extra-i686)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:47:12
  Author: andrea
Revision: 71838

archrelease: copy trunk to extra-i686

Added:
  pycups/repos/extra-i686/



[arch-commits] Commit in pycups/repos (extra-i686)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:46:51
  Author: andrea
Revision: 71837

archrelease: remove extra-i686

Deleted:
  pycups/repos/extra-i686/



[arch-commits] Commit in pycups/trunk (PKGBUILD)

2010-03-10 Thread Andrea Scarpino
Date: Wednesday, March 10, 2010 @ 13:46:42
  Author: andrea
Revision: 71836

upgpkg: pycups 1.9.49-1
upstream release

Modified:
  pycups/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 15:34:18 UTC (rev 71835)
+++ PKGBUILD2010-03-10 18:46:42 UTC (rev 71836)
@@ -3,19 +3,22 @@
 # Contributor: nesl247 
 
 pkgname=pycups
-pkgver=1.9.48
+pkgver=1.9.49
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
 url="http://cyberelk.net/tim/software/pycups/";
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libcups' 'python')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2e9ed692c75328e7fb88f8c230f70990')
+source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('6db9d8bc7f40315bc0b93f210737cc82')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  make || return 1
+}
 
-  make || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install || return 1
 }



[arch-commits] Commit in openssh/repos (testing-x86_64)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 10:34:18
  Author: pierre
Revision: 71835

archrelease: copy trunk to testing-x86_64

Added:
  openssh/repos/testing-x86_64/



[arch-commits] Commit in openssh/repos (testing-x86_64)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 10:34:03
  Author: pierre
Revision: 71834

archrelease: remove testing-x86_64

Deleted:
  openssh/repos/testing-x86_64/



[arch-commits] Commit in openssh/repos (testing-i686)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 10:33:51
  Author: pierre
Revision: 71833

archrelease: copy trunk to testing-i686

Added:
  openssh/repos/testing-i686/



[arch-commits] Commit in openssh/repos (testing-i686)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 10:33:35
  Author: pierre
Revision: 71832

archrelease: remove testing-i686

Deleted:
  openssh/repos/testing-i686/



[arch-commits] Commit in openssh/trunk (PKGBUILD sshd)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 10:33:21
  Author: pierre
Revision: 71831

upgpkg: openssh 5.4p1-2
fix FS#18611 and FS#17138

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

--+
 PKGBUILD |5 ++---
 sshd |8 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 12:57:25 UTC (rev 71830)
+++ PKGBUILD2010-03-10 15:33:21 UTC (rev 71831)
@@ -4,8 +4,7 @@
 
 pkgname=openssh
 pkgver=5.4p1
-pkgrel=1
-#_gsskexver=20080404
+pkgrel=2
 pkgdesc='A Secure SHell server/client'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -15,7 +14,7 @@
 
source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz";
 'sshd' 'sshd.confd' 'sshd.pam')
 md5sums=('da10af8a789fa2e83e3635f3a1b76f5e'
- 'e8a3b7a3e3ace43eeb1f28a7c93fa15d'
+ 'bc6a8bdb8d41ad821589c3e9c284e27d'
  'e2cea70ac13af7e63d40eb04415eacd5'
  '1c7c2ea8734ec7e3ca58d820634dc73a')
 

Modified: sshd
===
--- sshd2010-03-10 12:57:25 UTC (rev 71830)
+++ sshd2010-03-10 15:33:21 UTC (rev 71831)
@@ -4,7 +4,13 @@
 . /etc/rc.d/functions
 . /etc/conf.d/sshd
 
-PID=`cat /var/run/sshd.pid 2>/dev/null`
+PID="$(cat /var/run/sshd.pid 2>/dev/null)"
+# check if there is a sshd using that pid and ignore it otherwise
+if [ "$(readlink /proc/${PID}/exe 2>/dev/null)" != '/usr/sbin/sshd' ]; then
+  PID=''
+  rm -f /var/run/sshd.pid
+fi
+
 case "$1" in
   start)
 stat_busy "Starting Secure Shell Daemon"



[arch-commits] Commit in openssh/repos (testing-x86_64)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 07:57:25
  Author: pierre
Revision: 71830

archrelease: copy trunk to testing-x86_64

Added:
  openssh/repos/testing-x86_64/



[arch-commits] Commit in openssh/repos (testing-i686)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 07:57:00
  Author: pierre
Revision: 71829

archrelease: copy trunk to testing-i686

Added:
  openssh/repos/testing-i686/



[arch-commits] Commit in openssh/trunk (PKGBUILD)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 07:56:36
  Author: pierre
Revision: 71828

upgpkg: openssh 5.4p1-1
minor cleanup; upstream update

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-10 12:28:46 UTC (rev 71827)
+++ PKGBUILD2010-03-10 12:56:36 UTC (rev 71828)
@@ -3,24 +3,24 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=5.3p1
-pkgrel=4
+pkgver=5.4p1
+pkgrel=1
 #_gsskexver=20080404
 pkgdesc='A Secure SHell server/client'
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.openssh.org/portable.html";
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
-depends=('openssl>=0.9.8k' 'zlib' 'pam' 'tcp_wrappers' 'heimdal>=1.3.1')
-source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz
-sshd sshd.confd sshd.pam)
-
#http://www.sxw.org.uk/computing/patches/${pkgname}-${pkgver}-gsskex-$_gsskexver.patch
-md5sums=('13563dbf61f36ca9a1e4254260131041' '4ac6786894a8a95cf5e57f060240de55'
- 'e2cea70ac13af7e63d40eb04415eacd5' '1c7c2ea8734ec7e3ca58d820634dc73a')
+depends=('openssl' 'zlib' 'pam' 'tcp_wrappers' 'heimdal')
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz";
+'sshd' 'sshd.confd' 'sshd.pam')
+md5sums=('da10af8a789fa2e83e3635f3a1b76f5e'
+ 'e8a3b7a3e3ace43eeb1f28a7c93fa15d'
+ 'e2cea70ac13af7e63d40eb04415eacd5'
+ '1c7c2ea8734ec7e3ca58d820634dc73a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  #patch -up0 < ${srcdir}/${pkgname}-${pkgver}-gsskex-$_gsskexver.patch
 
   #NOTE we disable-strip so that makepkg can decide whether to strip or not
   ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \
@@ -29,6 +29,10 @@
 --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \
 --disable-strip
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   install -Dm755 ${srcdir}/sshd ${pkgdir}/etc/rc.d/sshd



[arch-commits] Commit in openssh/trunk (sshd)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 07:28:46
  Author: pierre
Revision: 71827

Revert 'Use pidof instead of trusting the pid file'; fixes FS#18611

Modified:
  openssh/trunk/sshd

--+
 sshd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: sshd
===
--- sshd2010-03-10 12:10:24 UTC (rev 71826)
+++ sshd2010-03-10 12:28:46 UTC (rev 71827)
@@ -4,7 +4,7 @@
 . /etc/rc.d/functions
 . /etc/conf.d/sshd
 
-PID=$(pidof -o %PPID /usr/sbin/sshd)
+PID=`cat /var/run/sshd.pid 2>/dev/null`
 case "$1" in
   start)
 stat_busy "Starting Secure Shell Daemon"



[arch-commits] Commit in pacman-mirrorlist/trunk (PKGBUILD)

2010-03-10 Thread Pierre Schmitz
Date: Wednesday, March 10, 2010 @ 07:10:24
  Author: pierre
Revision: 71826

keep an upgrade path for older installations

Modified:
  pacman-mirrorlist/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-09 22:50:33 UTC (rev 71825)
+++ PKGBUILD2010-03-10 12:10:24 UTC (rev 71826)
@@ -11,6 +11,9 @@
 backup=(etc/pacman.d/mirrorlist)
 source=(mirrorlist)
 
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
 # NOTE on building this package:
 # * Go to the trunk/ directory
 # * Run bash -c ". PKGBUILD; updatelist"