summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2016-09-07 18:37:34 +0000
committerSteve Wills <swills@FreeBSD.org>2016-09-07 18:37:34 +0000
commit07e62b8b794883689c41cc58f1d25db4a57a03e4 (patch)
tree1c55b814672c18da28e927b060c62dfc97ba78fb /security
parentnet-im/py-nbxmpp: update to 0.5.4 (diff)
security/rubygem-bcrypt: rip out unused crypt_r implementation
PR: 212304 Submitted by: xmj
Notes
Notes: svn path=/head/; revision=421517
Diffstat (limited to 'security')
-rw-r--r--security/rubygem-bcrypt/files/patch-ext_mri_ow-crypt.h10
-rw-r--r--security/rubygem-bcrypt/files/patch-ext_mri_wrapper.c16
2 files changed, 26 insertions, 0 deletions
diff --git a/security/rubygem-bcrypt/files/patch-ext_mri_ow-crypt.h b/security/rubygem-bcrypt/files/patch-ext_mri_ow-crypt.h
new file mode 100644
index 000000000000..1efe091c6879
--- /dev/null
+++ b/security/rubygem-bcrypt/files/patch-ext_mri_ow-crypt.h
@@ -0,0 +1,10 @@
+--- ext/mri/ow-crypt.h.orig 2016-09-01 08:48:28 UTC
++++ ext/mri/ow-crypt.h
+@@ -16,7 +16,6 @@
+
+ #ifndef __SKIP_GNU
+ extern char *crypt(__CONST char *key, __CONST char *setting);
+-extern char *crypt_r(__CONST char *key, __CONST char *setting, void *data);
+ #endif
+
+ #ifndef __SKIP_OW
diff --git a/security/rubygem-bcrypt/files/patch-ext_mri_wrapper.c b/security/rubygem-bcrypt/files/patch-ext_mri_wrapper.c
new file mode 100644
index 000000000000..ecc49d59831b
--- /dev/null
+++ b/security/rubygem-bcrypt/files/patch-ext_mri_wrapper.c
@@ -0,0 +1,16 @@
+--- ext/mri/wrapper.c.orig 2016-09-01 08:48:10 UTC
++++ ext/mri/wrapper.c
+@@ -185,13 +185,6 @@ char *crypt_ra(__CONST char *key, __CONS
+ return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
+ }
+
+-char *crypt_r(__CONST char *key, __CONST char *setting, void *data)
+-{
+- return _crypt_retval_magic(
+- crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),
+- setting, (char *)data);
+-}
+-
+ #define __crypt_gensalt_rn crypt_gensalt_rn
+ #define __crypt_gensalt_ra crypt_gensalt_ra
+ #define __crypt_gensalt crypt_gensalt