Attachment 174283 Details for Bug 212304 – rip crypt_r out of rubygem-bcrypt

[patch] rip crypt_r out of rubygem-bcrypt

rubygem-bcrypt.diff (text/plain), 1.32 KB, created by Johannes Jost Meixner on 2016-09-01 10:22:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Jost Meixner

Created: 2016-09-01 10:22:36 UTC

Size: 1.32 KB

patch

obsolete

>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 0000000..1efe091
>--- /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 0000000..ecc49d5
>--- /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

Actions: View | Diff

Attachments on bug 212304: 174283