wok-next rev 19803
Up ruby
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Jun 26 15:28:24 2017 +0300 (2017-06-26) |
| parents | f3ccdc5d10ed |
| children | b2efa70e9283 |
| files | libruby-extras/receipt libruby/receipt ruby-dev/receipt ruby/receipt ruby/stuff/openssl-1.0.patch ruby/stuff/ruby.desktop |
line diff
1.1 --- a/libruby-extras/receipt Mon Jun 26 13:51:02 2017 +0300 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,20 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="libruby-extras" 1.7 -VERSION="1.9.2-p180" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="Ruby libraries." 1.10 -MAINTAINER="pankso@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -WEB_SITE="http://www.ruby-lang.org/" 1.13 -WANTED="ruby" 1.14 -HOST_ARCH="i486 arm" 1.15 - 1.16 -DEPENDS="ruby" 1.17 - 1.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.19 -genpkg_rules() 1.20 -{ 1.21 - mkdir -p $fs/usr/lib 1.22 - cp -a $install/usr/lib/ruby $fs/usr/lib 1.23 -}
2.1 --- a/libruby/receipt Mon Jun 26 13:51:02 2017 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,18 +0,0 @@ 2.4 -# SliTaz package receipt. 2.5 - 2.6 -PACKAGE="libruby" 2.7 -VERSION="1.9.2-p180" 2.8 -CATEGORY="development" 2.9 -SHORT_DESC="Ruby shared libraries." 2.10 -MAINTAINER="pankso@slitaz.org" 2.11 -LICENSE="GPL2" 2.12 -WEB_SITE="http://www.ruby-lang.org/" 2.13 -WANTED="ruby" 2.14 -HOST_ARCH="i486 arm" 2.15 - 2.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.17 -genpkg_rules() 2.18 -{ 2.19 - mkdir -p $fs/usr/lib/ 2.20 - cp -a $install/usr/lib/*.so* $fs/usr/lib 2.21 -}
3.1 --- a/ruby-dev/receipt Mon Jun 26 13:51:02 2017 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,23 +0,0 @@ 3.4 -# SliTaz package receipt. 3.5 - 3.6 -PACKAGE="ruby-dev" 3.7 -VERSION="1.9.2-p180" 3.8 -CATEGORY="development" 3.9 -SHORT_DESC="Devel file for Ruby (to compile ruby-modules)." 3.10 -MAINTAINER="pankso@slitaz.org" 3.11 -LICENSE="GPL2" 3.12 -WEB_SITE="http://www.ruby-lang.org/" 3.13 -WANTED="ruby" 3.14 -HOST_ARCH="i486 arm" 3.15 - 3.16 -DEPENDS="ruby" 3.17 - 3.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.19 -genpkg_rules() 3.20 -{ 3.21 - mkdir -p $fs/usr/lib/ 3.22 - cp -a $install/usr/lib/*.a $fs/usr/lib 3.23 - cp -a $install/usr/include $fs/usr 3.24 - cp -a $install/usr/lib/ruby $fs/usr/lib 3.25 - cp -a $install/usr/lib/libruby.so* $fs/usr/lib 3.26 -}
4.1 --- a/ruby/receipt Mon Jun 26 13:51:02 2017 +0300 4.2 +++ b/ruby/receipt Mon Jun 26 15:28:24 2017 +0300 4.3 @@ -1,49 +1,72 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="ruby" 4.8 -VERSION="1.9.2-p180" 4.9 +VERSION="2.4.0" 4.10 CATEGORY="development" 4.11 -SHORT_DESC="Dynamic programming language focused on simplicity and productivity." 4.12 +SHORT_DESC="Dynamic programming language focused on simplicity and productivity" 4.13 MAINTAINER="pankso@slitaz.org" 4.14 LICENSE="GPL2" 4.15 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.16 WEB_SITE="http://www.ruby-lang.org/" 4.17 -WGET_URL="ftp://ftp.ruby-lang.org/pub/ruby/${VERSION%.*}/$TARBALL" 4.18 -TAGS="ruby language programming" 4.19 HOST_ARCH="i486 arm" 4.20 4.21 -SUGGESTED="tk" 4.22 -RELATED="libruby libruby-extras ruby-dev" 4.23 -DEPENDS="libruby libdb ncurses openssl readline zlib gdbm" 4.24 -BUILD_DEPENDS="zlib-dev tcl-dev openssl-dev db-dev readline-dev" 4.25 +TARBALL="$PACKAGE-$VERSION.tar.xz" 4.26 +WGET_URL="http://cache.ruby-lang.org/pub/ruby/${VERSION%.*}/$TARBALL" 4.27 4.28 -# Handle cross compilation. 4.29 -case "$ARCH" in 4.30 - i?86) 4.31 - BUILD_DEPENDS="$BUILD_DEPENDS coreutils-file-output-full tk-dev " ;; 4.32 - arm*) 4.33 - # executable host ruby is required. use --with-baseruby option. 4.34 - # --with-arch=arm 4.35 - export ac_cv_func_getpgrp_void=yes 4.36 - export ac_cv_func_setpgrp_void=yes 4.37 - ARCH_ARGS="--with-baseruby=/usr/bin/ruby" ;; 4.38 -esac 4.39 +BUILD_DEPENDS="gmp-dev db-dev libffi-dev openssl-dev tcl-dev tk-dev zlib-dev \ 4.40 +gdbm-dev readline-dev" 4.41 +BUILD_DEPENDS_arm="zlib-dev tcl-dev openssl-dev db-dev readline-dev" 4.42 +SPLIT="libruby libruby-extras ruby-doc ruby-dev" 4.43 4.44 # Rules to configure and make the package. 4.45 compile_rules() 4.46 { 4.47 + # Handle cross compilation. 4.48 + case "$ARCH" in 4.49 + arm*) 4.50 + # executable host ruby is required. use --with-baseruby option. 4.51 + # --with-arch=arm 4.52 + export ac_cv_func_getpgrp_void=yes 4.53 + export ac_cv_func_setpgrp_void=yes 4.54 + ARCH_ARGS="--with-baseruby=/usr/bin/ruby" ;; 4.55 + esac 4.56 + 4.57 #patch -Np1 < $stuff/openssl-1.0.patch 4.58 ./configure \ 4.59 - --prefix=/usr \ 4.60 --enable-shared \ 4.61 - $CONFIGURE_ARGS ${ARCH_ARGS} && 4.62 + --docdir=/usr/share/doc/ruby-$VERSION \ 4.63 + $CONFIGURE_ARGS $ARCH_ARGS && 4.64 make $MAKEFLAGS && 4.65 - make DESTDIR=$DESTDIR install 4.66 + make install 4.67 } 4.68 4.69 # Rules to gen a SliTaz package suitable for Tazpkg. 4.70 genpkg_rules() 4.71 { 4.72 - mkdir -p $fs/usr/lib 4.73 - cp -a $install/usr/bin $fs/usr 4.74 + case $PACKAGE in 4.75 + ruby) 4.76 + copy /usr/bin/ 4.77 + TAGS="ruby language programming" 4.78 + SUGGESTED="tk" 4.79 + DEPENDS="gmp libruby" 4.80 + ;; 4.81 + libruby) 4.82 + copy libruby.so* 4.83 + CAT="libdevel|shared libraries" 4.84 + DEPENDS="gmp" 4.85 + ;; 4.86 + libruby-extras) 4.87 + copy /usr/lib/ruby/ 4.88 + CAT="libdevel|native libraries" 4.89 + DEPENDS="ruby gdbm gmp libcrypto libdb libffi libssl ncurses \ 4.90 + readline zlib" 4.91 + ;; 4.92 + ruby-doc) 4.93 + CAT="development|ri documentation" 4.94 + copy /usr/share/ri/ 4.95 + ;; 4.96 + ruby-dev) 4.97 + copy @dev 4.98 + DEPENDS="ruby libruby libruby-extras" 4.99 + ;; 4.100 + esac 4.101 }
5.1 --- a/ruby/stuff/openssl-1.0.patch Mon Jun 26 13:51:02 2017 +0300 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,176 +0,0 @@ 5.4 -diff -Nura ruby-1.9.1-p378.orig/ext/openssl/ossl.c ruby-1.9.1-p378/ext/openssl/ossl.c 5.5 ---- ruby-1.9.1-p378.orig/ext/openssl/ossl.c 2009-01-15 16:39:30.000000000 +0100 5.6 -+++ ruby-1.9.1-p378/ext/openssl/ossl.c 2010-04-01 07:41:19.397603813 +0200 5.7 -@@ -92,7 +92,7 @@ 5.8 - 5.9 - #define OSSL_IMPL_SK2ARY(name, type) \ 5.10 - VALUE \ 5.11 --ossl_##name##_sk2ary(STACK *sk) \ 5.12 -+ossl_##name##_sk2ary(STACK_OF(type) *sk) \ 5.13 - { \ 5.14 - type *t; \ 5.15 - int i, num; \ 5.16 -@@ -102,7 +102,7 @@ 5.17 - OSSL_Debug("empty sk!"); \ 5.18 - return Qnil; \ 5.19 - } \ 5.20 -- num = sk_num(sk); \ 5.21 -+ num = sk_##type##_num(sk); \ 5.22 - if (num < 0) { \ 5.23 - OSSL_Debug("items in sk < -1???"); \ 5.24 - return rb_ary_new(); \ 5.25 -@@ -110,7 +110,7 @@ 5.26 - ary = rb_ary_new2(num); \ 5.27 - \ 5.28 - for (i=0; i<num; i++) { \ 5.29 -- t = (type *)sk_value(sk, i); \ 5.30 -+ t = sk_##type##_value(sk, i); \ 5.31 - rb_ary_push(ary, ossl_##name##_new(t)); \ 5.32 - } \ 5.33 - return ary; \ 5.34 -diff -Nura ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c 5.35 ---- ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c 2008-07-22 17:34:23.000000000 +0200 5.36 -+++ ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c 2010-04-01 07:41:19.415105324 +0200 5.37 -@@ -572,12 +572,11 @@ 5.38 - return self; 5.39 - } 5.40 - 5.41 --static STACK * 5.42 --pkcs7_get_certs_or_crls(VALUE self, int want_certs) 5.43 -+static STACK_OF(X509) * 5.44 -+pkcs7_get_certs(VALUE self) 5.45 - { 5.46 - PKCS7 *pkcs7; 5.47 - STACK_OF(X509) *certs; 5.48 -- STACK_OF(X509_CRL) *crls; 5.49 - int i; 5.50 - 5.51 - GetPKCS7(self, pkcs7); 5.52 -@@ -585,17 +584,38 @@ 5.53 - switch(i){ 5.54 - case NID_pkcs7_signed: 5.55 - certs = pkcs7->d.sign->cert; 5.56 -- crls = pkcs7->d.sign->crl; 5.57 - break; 5.58 - case NID_pkcs7_signedAndEnveloped: 5.59 - certs = pkcs7->d.signed_and_enveloped->cert; 5.60 -+ break; 5.61 -+ default: 5.62 -+ certs = NULL; 5.63 -+ } 5.64 -+ 5.65 -+ return certs; 5.66 -+} 5.67 -+ 5.68 -+static STACK_OF(X509_CRL) * 5.69 -+pkcs7_get_crls(VALUE self) 5.70 -+{ 5.71 -+ PKCS7 *pkcs7; 5.72 -+ STACK_OF(X509_CRL) *crls; 5.73 -+ int i; 5.74 -+ 5.75 -+ GetPKCS7(self, pkcs7); 5.76 -+ i = OBJ_obj2nid(pkcs7->type); 5.77 -+ switch(i){ 5.78 -+ case NID_pkcs7_signed: 5.79 -+ crls = pkcs7->d.sign->crl; 5.80 -+ break; 5.81 -+ case NID_pkcs7_signedAndEnveloped: 5.82 - crls = pkcs7->d.signed_and_enveloped->crl; 5.83 - break; 5.84 - default: 5.85 -- certs = crls = NULL; 5.86 -+ crls = NULL; 5.87 - } 5.88 - 5.89 -- return want_certs ? certs : crls; 5.90 -+ return crls; 5.91 - } 5.92 - 5.93 - static VALUE 5.94 -@@ -610,7 +630,7 @@ 5.95 - STACK_OF(X509) *certs; 5.96 - X509 *cert; 5.97 - 5.98 -- certs = pkcs7_get_certs_or_crls(self, 1); 5.99 -+ certs = pkcs7_get_certs(self); 5.100 - while((cert = sk_X509_pop(certs))) X509_free(cert); 5.101 - rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); 5.102 - 5.103 -@@ -620,7 +640,7 @@ 5.104 - static VALUE 5.105 - ossl_pkcs7_get_certificates(VALUE self) 5.106 - { 5.107 -- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); 5.108 -+ return ossl_x509_sk2ary(pkcs7_get_certs(self)); 5.109 - } 5.110 - 5.111 - static VALUE 5.112 -@@ -650,7 +670,7 @@ 5.113 - STACK_OF(X509_CRL) *crls; 5.114 - X509_CRL *crl; 5.115 - 5.116 -- crls = pkcs7_get_certs_or_crls(self, 0); 5.117 -+ crls = pkcs7_get_crls(self); 5.118 - while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); 5.119 - rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); 5.120 - 5.121 -@@ -660,7 +680,7 @@ 5.122 - static VALUE 5.123 - ossl_pkcs7_get_crls(VALUE self) 5.124 - { 5.125 -- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); 5.126 -+ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); 5.127 - } 5.128 - 5.129 - static VALUE 5.130 -diff -Nura ruby-1.9.1-p378.orig/ext/openssl/ossl_ssl.c ruby-1.9.1-p378/ext/openssl/ossl_ssl.c 5.131 ---- ruby-1.9.1-p378.orig/ext/openssl/ossl_ssl.c 2009-04-19 15:32:18.000000000 +0200 5.132 -+++ ruby-1.9.1-p378/ext/openssl/ossl_ssl.c 2010-04-01 07:41:19.450937427 +0200 5.133 -@@ -88,12 +88,18 @@ 5.134 - 5.135 - ID ID_callback_state; 5.136 - 5.137 -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L 5.138 -+#define OSSL_MORE_CONST const 5.139 -+#define STACK _STACK 5.140 -+#else 5.141 -+#define OSSL_MORE_CONST 5.142 -+#endif 5.143 - /* 5.144 - * SSLContext class 5.145 - */ 5.146 - struct { 5.147 - const char *name; 5.148 -- SSL_METHOD *(*func)(void); 5.149 -+ OSSL_MORE_CONST SSL_METHOD *(*func)(void); 5.150 - } ossl_ssl_method_tab[] = { 5.151 - #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method } 5.152 - OSSL_SSL_METHOD_ENTRY(TLSv1), 5.153 -@@ -142,7 +148,7 @@ 5.154 - static VALUE 5.155 - ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method) 5.156 - { 5.157 -- SSL_METHOD *method = NULL; 5.158 -+ OSSL_MORE_CONST SSL_METHOD *method = NULL; 5.159 - const char *s; 5.160 - int i; 5.161 - 5.162 -@@ -585,7 +591,7 @@ 5.163 - } 5.164 - 5.165 - static VALUE 5.166 --ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher) 5.167 -+ossl_ssl_cipher_to_ary(OSSL_MORE_CONST SSL_CIPHER *cipher) 5.168 - { 5.169 - VALUE ary; 5.170 - int bits, alg_bits; 5.171 -@@ -1213,7 +1219,7 @@ 5.172 - ossl_ssl_get_cipher(VALUE self) 5.173 - { 5.174 - SSL *ssl; 5.175 -- SSL_CIPHER *cipher; 5.176 -+ OSSL_MORE_CONST SSL_CIPHER *cipher; 5.177 - 5.178 - Data_Get_Struct(self, SSL, ssl); 5.179 - if (!ssl) {
6.1 --- a/ruby/stuff/ruby.desktop Mon Jun 26 13:51:02 2017 +0300 6.2 +++ b/ruby/stuff/ruby.desktop Mon Jun 26 15:28:24 2017 +0300 6.3 @@ -1,10 +1,9 @@ 6.4 [Desktop Entry] 6.5 -Encoding=UTF-8 6.6 +Type=Application 6.7 Name=Ruby interpreter 6.8 Name[pt]=Interpretador Ruby 6.9 Name[pt_BR]=Interpretador Ruby 6.10 -Terminal=false 6.11 -Exec=xterm -e irb 6.12 +Name[ru]=Интерпретатор Ruby 6.13 +Exec=terminal -e irb 6.14 Icon=ruby 6.15 -Type=Application 6.16 Categories=Development;