summaryrefslogtreecommitdiff
path: root/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2020-04-28 10:23:07 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2020-04-28 10:23:07 +0000
commitd1e7a0dbefeeca0a612f533467323829437b6d37 (patch)
treef99647b61f008d9524c1d9a4472ce2d973aece14 /databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
parentx11/xpra: Slightly improve pkg-descr. (diff)
suppress deprecate warning with Ruby 2.7
PR: 245339 Approved by: maintainer timeout
Notes
Notes: svn path=/head/; revision=533243
Diffstat (limited to 'databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc')
-rw-r--r--databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc84
1 files changed, 83 insertions, 1 deletions
diff --git a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
index af02e55faea8..afd3561f8df8 100644
--- a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
+++ b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
@@ -1,6 +1,88 @@
--- bdbxml1/bdbxml.cc.orig 2011-04-06 19:35:39 UTC
+++ bdbxml1/bdbxml.cc
-@@ -2340,18 +2340,16 @@
+@@ -1148,15 +1148,19 @@ xb_con_init(int argc, VALUE *argv, VALUE obj)
+ flags = NUM2INT(b);
+ }
+ }
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+ if (flags & DB_TRUNCATE) {
+ rb_secure(2);
+ }
++#endif
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ if (flags & DB_CREATE) {
+ rb_secure(4);
+ }
+ if (rb_safe_level() >= 4) {
+ flags |= DB_RDONLY;
+ }
++#endif
+ if (!txn && con->env_val) {
+ bdb_ENV *envst = NULL;
+ GetEnvDBErr(con->env_val, envst, id_current_env, xb_eFatal);
+@@ -1179,9 +1183,11 @@ xb_con_close(int argc, VALUE *argv, VALUE obj)
+ xcon *con;
+ int flags = 0;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
+ rb_raise(rb_eSecurityError, "Insecure: can't close the container");
+ }
++#endif
+ Data_Get_Struct(obj, xcon, con);
+ if (!con->closed && con->con) {
+ if (rb_scan_args(argc, argv, "01", &a)) {
+@@ -1516,7 +1522,9 @@ xb_int_update(int argc, VALUE *argv, VALUE obj, XmlUpd
+ DbTxn *txn;
+ VALUE a;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ GetConTxn(obj, con, txn);
+ if (rb_scan_args(argc, argv, "10", &a) != 1) {
+ rb_raise(rb_eArgError, "invalid number of arguments (%d for 1)", argc);
+@@ -1545,7 +1553,9 @@ xb_int_push(int argc, VALUE *argv, VALUE obj, XmlUpdat
+ VALUE a, b;
+ int flags = 0;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ GetConTxn(obj, con, txn);
+ if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ flags = NUM2INT(b);
+@@ -1775,7 +1785,9 @@ xb_int_delete(int argc, VALUE *argv, VALUE obj, XmlUpd
+ VALUE a, b;
+ int flags = 0;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ GetConTxn(obj, con, txn);
+ if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ flags = NUM2INT(b);
+@@ -1824,7 +1836,9 @@ xb_con_remove(int argc, VALUE *argv, VALUE obj)
+ xcon *con;
+ DbTxn *txn = NULL;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+ rb_secure(2);
++#endif
+ if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ flags = NUM2INT(b);
+ }
+@@ -1844,7 +1858,9 @@ xb_con_rename(int argc, VALUE *argv, VALUE obj)
+ char *str;
+ DbTxn *txn = NULL;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+ rb_secure(2);
++#endif
+ if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3) {
+ flags = NUM2INT(c);
+ }
+@@ -2340,18 +2356,16 @@ extern "C" {
major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));
patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));