[arch-commits] Commit in ruby/repos (3 files)

[andyrtr at archlinux.org]

    Date: Tuesday, June 24, 2008 @ 12:35:05
  Author: andyrtr
Revision: 3538

Merged revisions 2912-3537 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/ruby/trunk

........
  r3536 | andyrtr | 2008-06-24 16:20:05 +0000 (Di, 24 Jun 2008) | 2 lines
  
  upgpkg: ruby 1.8.7_p22-1
      fixes a vulnerability
........

Modified:
  ruby/repos/extra-i686/	(properties)
  ruby/repos/extra-i686/PKGBUILD
Deleted:
  ruby/repos/extra-i686/ruby-1.8.6_p36-rb_thread_status_prototype.patch

-------------------------------------------------+
 PKGBUILD                                        |    6 ++---
 ruby-1.8.6_p36-rb_thread_status_prototype.patch |   25 ----------------------
 2 files changed, 3 insertions(+), 28 deletions(-)


Property changes on: ruby/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /ruby/trunk:1-2911
   + /ruby/trunk:1-3537

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-24 16:20:36 UTC (rev 3537)
+++ extra-i686/PKGBUILD	2008-06-24 16:35:05 UTC (rev 3538)
@@ -3,8 +3,8 @@
 # Contributors: John Proctor <jproctor at prium.net>
 #               Jeramy Rutley <jrutley at gmail.com>
 pkgname=ruby
-pkgver=1.8.7_p17
-_pkgver=1.8.7-p17
+pkgver=1.8.7_p22
+_pkgver=1.8.7-p22
 pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 depends=('gdbm' 'db>=4.6' 'openssl>=0.9.8h-3' 'zlib' 'readline' 'termcap-compat')
 makedepends=('tk>=8.5')
 source=(ftp://ftp.ruby-lang.org/pub/ruby/stable/${pkgname}-${_pkgver}.tar.bz2) 
-md5sums=('4bbcf952fad200f4d265cb77a123d2fc')
+md5sums=('2d57acee0d80531e14ec0f6826a1f9fb')
 options=('!emptydirs' 'force')
 
 build() {

Deleted: extra-i686/ruby-1.8.6_p36-rb_thread_status_prototype.patch
===================================================================
--- extra-i686/ruby-1.8.6_p36-rb_thread_status_prototype.patch	2008-06-24 16:20:36 UTC (rev 3537)
+++ extra-i686/ruby-1.8.6_p36-rb_thread_status_prototype.patch	2008-06-24 16:35:05 UTC (rev 3538)
@@ -1,25 +0,0 @@
-Index: intern.h
-===================================================================
---- intern.h	(revision 12566)
-+++ intern.h	(revision 12567)
-@@ -204,7 +204,6 @@
- void rb_thread_polling _((void));
- void rb_thread_sleep _((int));
- void rb_thread_sleep_forever _((void));
--enum rb_thread_status rb_thread_status _((VALUE));
- VALUE rb_thread_stop _((void));
- VALUE rb_thread_wakeup _((VALUE));
- VALUE rb_thread_wakeup_alive _((VALUE));
-Index: ext/thread/thread.c
-===================================================================
---- ext/thread/thread.c	(revision 12566)
-+++ ext/thread/thread.c	(revision 12567)
-@@ -14,6 +14,8 @@
- #include <rubysig.h>
- #include <node.h>
- 
-+enum rb_thread_status rb_thread_status _((VALUE));
-+
- static VALUE rb_cMutex;
- static VALUE rb_cConditionVariable;
- static VALUE rb_cQueue;