[arch-commits] Commit in rssh/trunk (PKGBUILD rssh.patch)

[Gaetan Bisson]

    Date: Wednesday, August 18, 2010 @ 11:30:04
  Author: bisson
Revision: 87880

minor upstream update

Modified:
  rssh/trunk/PKGBUILD
  rssh/trunk/rssh.patch

------------+
 PKGBUILD   |   30 +++++++++++++++++-------------
 rssh.patch |   12 ++++++------
 2 files changed, 23 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-18 15:28:53 UTC (rev 87879)
+++ PKGBUILD	2010-08-18 15:30:04 UTC (rev 87880)
@@ -1,25 +1,29 @@
 # $Id$
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=rssh
-pkgver=2.3.2
-pkgrel=3
-pkgdesc="A restricted shell for use with OpenSSH, allowing only scp and/or sftp"
+pkgver=2.3.3
+pkgrel=1
+pkgdesc='A restricted shell for use with OpenSSH, allowing only scp and/or sftp'
 arch=('i686' 'x86_64')
-url="http://www.pizzashack.org/rssh/index.shtml"
+url='http://www.pizzashack.org/rssh/index.shtml'
 depends=('openssh' 'glibc')
 backup=('etc/rssh.conf')
 license=('custom:rssh')
-source=(http://downloads.sourceforge.net/sourceforge/rssh/rssh-$pkgver.tar.gz
-        rssh.patch)
-md5sums=('65712f2c06ff5fc6fc783bc8c2e4e1ba' '7b8c260ce1952afe6ebaf9972bf78341')
+source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-$pkgver.tar.gz"
+        'rssh.patch')
+sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a'
+          '07deb7c88a52dccb45aa45a59f9e98e5c511ff3a')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/rssh.patch || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 < ../rssh.patch
   ./configure --prefix=/usr --libexecdir=/usr/lib/rssh \
     --mandir=/usr/share/man --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=$pkgdir install
-  # install license
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/rssh/LICENSE
+  make
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/rssh/LICENSE
+}

Modified: rssh.patch
===================================================================
--- rssh.patch	2010-08-18 15:28:53 UTC (rev 87879)
+++ rssh.patch	2010-08-18 15:30:04 UTC (rev 87880)
@@ -1,6 +1,6 @@
-diff -Naur rssh-2.3.2-orig/Makefile.am rssh-2.3.2/Makefile.am
---- rssh-2.3.2-orig/Makefile.am	2006-01-03 09:34:59.000000000 -0800
-+++ rssh-2.3.2/Makefile.am	2006-06-29 23:38:56.000000000 -0700
+diff -Naur Makefile.am Makefile.am
+--- Makefile.am	2006-01-03 09:34:59.000000000 -0800
++++ Makefile.am	2006-06-29 23:38:56.000000000 -0700
 @@ -16,7 +16,7 @@
  	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
  
@@ -10,9 +10,9 @@
  
  rpm:	dist
  	rpmbuild -ta --sign $(base).tar.gz
-diff -Naur rssh-2.3.2-orig/Makefile.in rssh-2.3.2/Makefile.in
---- rssh-2.3.2-orig/Makefile.in	2006-01-06 18:24:57.000000000 -0800
-+++ rssh-2.3.2/Makefile.in	2006-06-29 23:38:30.000000000 -0700
+diff -Naur Makefile.in Makefile.in
+--- Makefile.in	2006-01-06 18:24:57.000000000 -0800
++++ Makefile.in	2006-06-29 23:38:30.000000000 -0700
 @@ -728,7 +728,7 @@
  	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<