<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84ff5b50c079aea023d41a967b361b5cc96a04a1">https://github.com/macports/macports-ports/commit/84ff5b50c079aea023d41a967b361b5cc96a04a1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 84ff5b50c079aea023d41a967b361b5cc96a04a1
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Mar 9 13:57:44 2024 +0700
<span style='display:block; white-space:pre;color:#404040;'> rb-aescrypt: fix the port, use approriate name
</span>---
ruby/rb-aes/Portfile | 17 -------
ruby/rb-aes/files/patch-aes.c | 11 -----
ruby/rb-aescrypt/Portfile | 29 ++++++++++++
ruby/rb-aescrypt/files/patch-aes.c | 81 +++++++++++++++++++++++++++++++++
ruby/rb-aescrypt/files/patch-platform.h | 11 +++++
5 files changed, 121 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-aes/Portfile b/ruby/rb-aes/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cfced66bd7b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-aes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup ruby 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ruby.setup {aes aes-rb} 0.1.0 extconf.rb {README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aes-example.rb aes-test.rb aes-ecb-tbl.txt}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description An AES encryption algorithm for ruby, using the AESCrypt library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description An all-C (for performance) implementation of the AES \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encryption algorithm for Ruby, implementing ECB and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFB-128 modes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://aescrypt.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://aescrypt.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD-old Ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 ba28ad8fa9217b7e5bd64db647fa59c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-aes.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-aes/files/patch-aes.c b/ruby/rb-aes/files/patch-aes.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c65e3fd6f49..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-aes/files/patch-aes.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aes.c Thu Jan 24 15:02:24 2002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ../aes-rb-0.1.0-patched/aes.c Sat Dec 18 22:11:50 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ***************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aes_dealloc(AesObject *rijnp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PyMem_DEL(rijnp); /* add it back to the free object list. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(rijnp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /***************
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-aescrypt/Portfile b/ruby/rb-aescrypt/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..48d791971cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-aescrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup ruby 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ruby.branches 3.3 3.2 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ruby.setup {aescrypt aes-rb} 0.1.0 extconf.rb {README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aes-example.rb aes-test.rb aes-ecb-tbl.txt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description An AES encryption algorithm for Ruby, using the AESCrypt library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description An all-C (for performance) implementation of the AES \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ encryption algorithm for Ruby, implementing ECB and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFB-128 modes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://aescrypt.sourceforge.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append crypto security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD Ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 111cc5139c89e36f2c4bb4098251a2ae4d93a4d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4b53150f59eaae7083aa8274b4b798805383df999b0208ba58ac8bf59c617068 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 77170
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-aes.c patch-platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cflags='-fms-extensions -Wno-incompatible-function-pointer-types -Wno-int-conversion'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-aescrypt/files/patch-aes.c b/ruby/rb-aescrypt/files/patch-aes.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4365afd0a2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-aescrypt/files/patch-aes.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aes.c Thu Jan 24 15:02:24 2002
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aes.c Sat Dec 18 22:11:50 2004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ***************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aes_dealloc(AesObject *rijnp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PyMem_DEL(rijnp); /* add it back to the free object list. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(rijnp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /***************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/pluskid/rmmseg-cpp/commit/279bd6fdb6307b24068d343005cfbf918bba88d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aes.c 2024-03-09 12:42:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aes.c 2024-03-09 12:59:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,8 +100,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check_Type(key, T_STRING);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hexkey_len=RSTRING(key)->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hexkey=RSTRING(key)->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hexkey_len=RSTRING_LEN(key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hexkey=RSTRING_PTR(key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hexkey_len != 16*2 && hexkey_len != 24*2 && hexkey_len != 32*2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,8 +139,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u1byte out_blk[16];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check_Type(args, T_STRING); /* make sure it's a string */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data_len=RSTRING(args)->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data=RSTRING(args)->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data_len=RSTRING_LEN(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data=RSTRING_PTR(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Data_Get_Struct(self,AesObject, rijnp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (data_len != 16) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,8 +179,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check_Type(args,T_STRING); /* make sure it's a string. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- src=RSTRING(args)->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- src_len=RSTRING(args)->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ src=RSTRING_PTR(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ src_len=RSTRING_LEN(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (src_len != 16) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_raise(rb_eArgError, "wrong data length (must be 16 bytes, found %d bytes)", src_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,8 +217,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check_Type(args,T_STRING); /* make sure it's a string. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- src=RSTRING(args)->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- srclen=RSTRING(args)->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ src=RSTRING_PTR(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ srclen=RSTRING_LEN(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Data_Get_Struct(self,AesObject,rijnp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,8 +274,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALUE retvalue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check_Type(args, T_STRING); /* make sure it's a string */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- srclen=RSTRING(args)->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- src=RSTRING(args)->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ srclen=RSTRING_LEN(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ src=RSTRING_PTR(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Data_Get_Struct(self,AesObject, rijnp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,8 +315,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u1byte out_blk[16];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check_Type(args, T_STRING); /* make sure it's a string */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data_len=RSTRING(args)->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data=RSTRING(args)->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data_len=RSTRING_LEN(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data=RSTRING_PTR(args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (data_len != 16) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-aescrypt/files/patch-platform.h b/ruby/rb-aescrypt/files/patch-platform.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a67647d2a5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-aescrypt/files/patch-platform.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- platform.h 2001-05-23 06:39:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ platform.h 2024-03-09 12:53:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if WORDS_BIGENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if WORDS_BIGENDIAN || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LittleEndian 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ALIGN32 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>