From 07e62b8b794883689c41cc58f1d25db4a57a03e4 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Wed, 7 Sep 2016 18:37:34 +0000 Subject: [PATCH] security/rubygem-bcrypt: rip out unused crypt_r implementation PR: 212304 Submitted by: xmj --- .../files/patch-ext_mri_ow-crypt.h | 10 ++++++++++ .../rubygem-bcrypt/files/patch-ext_mri_wrapper.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 security/rubygem-bcrypt/files/patch-ext_mri_ow-crypt.h create mode 100644 security/rubygem-bcrypt/files/patch-ext_mri_wrapper.c 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