From 76c6a57448997902c63c817f8eb2a870ac858459a97442de43276b3d735820bb Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 8 Jul 2013 13:10:39 +0000
Subject: [PATCH] Accepting request 182498 from home:Andreas_Schwab:Factory

- crypt_blowfish-gensalt.patch: separare crypt_gensalt into its own
  library libowcrypt, remove crypt_rn and crypt_ra (fate#314945)
- glibc-2.14-crypt-versioning.diff, glibc-fix-check-abi.patch,
  glibc-crypt-badsalttest.patch: folded into glibc-2.14-crypt.diff
- crypt_blowfish-const.patch: constify crypt_blowfish
- crypt_blowfish-1.2-sha.diff: refresh

OBS-URL: https://build.opensuse.org/request/show/182498
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=298
---
 crypt_blowfish-1.2-sha.diff        |  53 +--
 crypt_blowfish-1.2-versioning.diff |  55 ---
 crypt_blowfish-const.patch         |  46 +++
 crypt_blowfish-gensalt.patch       | 380 ++++++++++++++++++
 glibc-2.14-crypt-versioning.diff   |  33 --
 glibc-2.14-crypt.diff              | 601 ++++++++++++++++++++++++++++-
 glibc-crypt-badsalttest.patch      |  16 -
 glibc-fix-check-abi.patch          | 581 ----------------------------
 glibc-testsuite.changes            |  16 +
 glibc-testsuite.spec               |  28 +-
 glibc-utils.changes                |  16 +
 glibc-utils.spec                   |  28 +-
 glibc.changes                      |  10 +
 glibc.spec                         |  22 +-
 14 files changed, 1115 insertions(+), 770 deletions(-)
 delete mode 100644 crypt_blowfish-1.2-versioning.diff
 create mode 100644 crypt_blowfish-const.patch
 create mode 100644 crypt_blowfish-gensalt.patch
 delete mode 100644 glibc-2.14-crypt-versioning.diff
 delete mode 100644 glibc-crypt-badsalttest.patch
 delete mode 100644 glibc-fix-check-abi.patch

diff --git a/crypt_blowfish-1.2-sha.diff b/crypt_blowfish-1.2-sha.diff
index 546acec..218ce1e 100644
--- a/crypt_blowfish-1.2-sha.diff
+++ b/crypt_blowfish-1.2-sha.diff
@@ -9,11 +9,11 @@ Subject: [PATCH crypt_blowfish] support for sha256 and sha512
  wrapper.c       |   23 +++++++++++++++++++++
  3 files changed, 95 insertions(+), 0 deletions(-)
 
-diff --git a/crypt.3 b/crypt.3
-index e2f25bd..40a3538 100644
---- a/crypt.3
-+++ b/crypt.3
-@@ -399,6 +399,20 @@ too low for the currently available hardware.
+Index: crypt_blowfish-1.2/crypt.3
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt.3
++++ crypt_blowfish-1.2/crypt.3
+@@ -399,6 +399,20 @@ too low for the currently available hard
  .hash "$1$" "\e$1\e$[^$]{1,8}\e$[./0-9A-Za-z]{22}" unlimited 8 "" 128 "6 to 48" 1000
  .PP
  .ti -2
@@ -34,10 +34,10 @@ index e2f25bd..40a3538 100644
  .BR "OpenBSD-style Blowfish-based" " (" bcrypt )
  .br
  .B bcrypt
-diff --git a/crypt_gensalt.c b/crypt_gensalt.c
-index 73c15a1..5cf9812 100644
---- a/crypt_gensalt.c
-+++ b/crypt_gensalt.c
+Index: crypt_blowfish-1.2/crypt_gensalt.c
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_gensalt.c
++++ crypt_blowfish-1.2/crypt_gensalt.c
 @@ -19,6 +19,7 @@
   */
  
@@ -46,7 +46,7 @@ index 73c15a1..5cf9812 100644
  
  #include <errno.h>
  #ifndef __set_errno
-@@ -122,3 +123,60 @@ char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
+@@ -122,3 +123,60 @@ char *_crypt_gensalt_md5_rn(const char *
  
  	return output;
  }
@@ -107,19 +107,23 @@ index 73c15a1..5cf9812 100644
 +	errno = ENOMEM;
 +	return NULL;
 +}
-diff --git a/wrapper.c b/wrapper.c
-index 344053b..070d91d 100644
---- a/wrapper.c
-+++ b/wrapper.c
-@@ -44,12 +44,18 @@
- 
- #include "crypt_blowfish.h"
- #include "crypt_gensalt.h"
+Index: crypt_blowfish-1.2/crypt_gensalt.h
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_gensalt.h
++++ crypt_blowfish-1.2/crypt_gensalt.h
+@@ -26,5 +26,7 @@ extern char *_crypt_gensalt_extended_rn(
+ 	const char *input, int size, char *output, int output_size);
+ extern char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
+ 	const char *input, int size, char *output, int output_size);
 +extern char *_crypt_gensalt_sha2_rn(const char *prefix, unsigned long count,
 +	const char *input, int size, char *output, int output_size);
  
- #if defined(__GLIBC__) && defined(_LIBC)
- /* crypt.h from glibc-crypt-2.1 will define struct crypt_data for us */
+ #endif
+Index: crypt_blowfish-1.2/wrapper.c
+===================================================================
+--- crypt_blowfish-1.2.orig/wrapper.c
++++ crypt_blowfish-1.2/wrapper.c
+@@ -50,6 +50,10 @@
  #include "crypt.h"
  extern char *__md5_crypt_r(const char *key, const char *salt,
  	char *buffer, int buflen);
@@ -130,7 +134,7 @@ index 344053b..070d91d 100644
  /* crypt-entry.c needs to be patched to define __des_crypt_r rather than
   * __crypt_r, and not define crypt_r and crypt at all */
  extern char *__des_crypt_r(const char *key, const char *salt,
-@@ -112,6 +118,10 @@ static char *_crypt_retval_magic(char *retval, const char *setting,
+@@ -112,6 +116,10 @@ static char *_crypt_retval_magic(char *r
  char *__crypt_rn(__const char *key, __const char *setting,
  	void *data, int size)
  {
@@ -141,7 +145,7 @@ index 344053b..070d91d 100644
  	if (setting[0] == '$' && setting[1] == '2')
  		return _crypt_blowfish_rn(key, setting, (char *)data, size);
  	if (setting[0] == '$' && setting[1] == '1')
-@@ -129,6 +139,16 @@ char *__crypt_rn(__const char *key, __const char *setting,
+@@ -129,6 +137,16 @@ char *__crypt_rn(__const char *key, __co
  char *__crypt_ra(__const char *key, __const char *setting,
  	void **data, int *size)
  {
@@ -158,7 +162,7 @@ index 344053b..070d91d 100644
  	if (setting[0] == '$' && setting[1] == '2') {
  		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
  			return NULL;
-@@ -210,6 +230,9 @@ char *__crypt_gensalt_rn(const char *prefix, unsigned long count,
+@@ -210,6 +228,9 @@ char *__crypt_gensalt_rn(const char *pre
  		return NULL;
  	}
  
@@ -168,6 +172,3 @@ index 344053b..070d91d 100644
  	if (!strncmp(prefix, "$2a$", 4) || !strncmp(prefix, "$2y$", 4))
  		use = _crypt_gensalt_blowfish_rn;
  	else
--- 
-1.7.3.4
-
diff --git a/crypt_blowfish-1.2-versioning.diff b/crypt_blowfish-1.2-versioning.diff
deleted file mode 100644
index 2703d93..0000000
--- a/crypt_blowfish-1.2-versioning.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: crypt_blowfish-1.2/wrapper.c
-===================================================================
---- crypt_blowfish-1.2.orig/wrapper.c
-+++ crypt_blowfish-1.2/wrapper.c
-@@ -38,6 +38,7 @@
- #define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
- 
- #if defined(__GLIBC__) && defined(_LIBC)
-+#include <shlib-compat.h>
- #define __SKIP_GNU
- #endif
- #include "ow-crypt.h"
-@@ -286,14 +287,36 @@ char *__crypt_gensalt(const char *prefix
- }
- 
- #if defined(__GLIBC__) && defined(_LIBC)
--weak_alias(__crypt_rn, crypt_rn)
--weak_alias(__crypt_ra, crypt_ra)
-+#include <shlib-compat.h>
- weak_alias(__crypt_r, crypt_r)
- weak_alias(__crypt, crypt)
--weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
--weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
--weak_alias(__crypt_gensalt, crypt_gensalt)
--weak_alias(crypt, fcrypt)
-+weak_alias(__crypt, fcrypt)
-+#if SHARED
-+/* Owl has crypt_gensalt as GLIBC_2_0 so keep for compatibility */
-+#if SHLIB_COMPAT (libcrypt, GLIBC_2_0, GLIBC_2_14)
-+#define ow_compat_symbol(name) \
-+	compat_symbol(libcrypt, _compat_##name, name, GLIBC_2_0); \
-+	weak_alias(__##name, _compat_##name)
-+#else
-+#define ow_compat_symbol(name)
-+#endif
-+
-+#define ow_versioned(name) \
-+	ow_compat_symbol(name) \
-+	versioned_symbol(libcrypt, _owl_##name, name, OW_CRYPT_1_0);
-+#else
-+#define ow_versioned(name)
-+#endif // SHARED
-+
-+#define ow_symbol(name) \
-+	ow_versioned(name) \
-+	weak_alias(__##name, _owl_##name) \
-+
-+ow_symbol(crypt_rn)
-+ow_symbol(crypt_ra)
-+ow_symbol(crypt_gensalt)
-+ow_symbol(crypt_gensalt_rn)
-+ow_symbol(crypt_gensalt_ra)
- #endif
- 
- #ifdef TEST
diff --git a/crypt_blowfish-const.patch b/crypt_blowfish-const.patch
new file mode 100644
index 0000000..0d4a8d0
--- /dev/null
+++ b/crypt_blowfish-const.patch
@@ -0,0 +1,46 @@
+Index: crypt_blowfish-1.2/crypt_blowfish.c
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_blowfish.c
++++ crypt_blowfish-1.2/crypt_blowfish.c
+@@ -81,7 +81,7 @@ typedef struct {
+  * Magic IV for 64 Blowfish encryptions that we do at the end.
+  * The string is "OrpheanBeholderScryDoubt" on big-endian.
+  */
+-static BF_word BF_magic_w[6] = {
++static const BF_word BF_magic_w[6] = {
+ 	0x4F727068, 0x65616E42, 0x65686F6C,
+ 	0x64657253, 0x63727944, 0x6F756274
+ };
+@@ -89,7 +89,7 @@ static BF_word BF_magic_w[6] = {
+ /*
+  * P-box and S-box tables initialized with digits of Pi.
+  */
+-static BF_ctx BF_init_state = {
++static const BF_ctx BF_init_state = {
+ 	{
+ 		{
+ 			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+@@ -361,10 +361,10 @@ static BF_ctx BF_init_state = {
+ 	}
+ };
+ 
+-static unsigned char BF_itoa64[64 + 1] =
++static const unsigned char BF_itoa64[64 + 1] =
+ 	"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ 
+-static unsigned char BF_atoi64[0x60] = {
++static const unsigned char BF_atoi64[0x60] = {
+ 	64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
+ 	54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
+ 	64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+@@ -440,8 +440,8 @@ static void BF_encode(char *dst, const B
+ 
+ static void BF_swap(BF_word *x, int count)
+ {
+-	static int endianness_check = 1;
+-	char *is_little_endian = (char *)&endianness_check;
++	static const int endianness_check = 1;
++	const char *is_little_endian = (const char *)&endianness_check;
+ 	BF_word tmp;
+ 
+ 	if (*is_little_endian)
diff --git a/crypt_blowfish-gensalt.patch b/crypt_blowfish-gensalt.patch
new file mode 100644
index 0000000..7062fc9
--- /dev/null
+++ b/crypt_blowfish-gensalt.patch
@@ -0,0 +1,380 @@
+Index: crypt_blowfish-1.2/compat-gensalt.c
+===================================================================
+--- /dev/null
++++ crypt_blowfish-1.2/compat-gensalt.c
+@@ -0,0 +1 @@
++#include "wrapper-gensalt.c"
+Index: crypt_blowfish-1.2/crypt_blowfish.c
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_blowfish.c
++++ crypt_blowfish-1.2/crypt_blowfish.c
+@@ -872,31 +872,3 @@ char *_crypt_blowfish_rn(const char *key
+ 	__set_errno(EINVAL); /* pretend we don't support this hash type */
+ 	return NULL;
+ }
+-
+-char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
+-	const char *input, int size, char *output, int output_size)
+-{
+-	if (size < 16 || output_size < 7 + 22 + 1 ||
+-	    (count && (count < 4 || count > 31)) ||
+-	    prefix[0] != '$' || prefix[1] != '2' ||
+-	    (prefix[2] != 'a' && prefix[2] != 'y')) {
+-		if (output_size > 0) output[0] = '\0';
+-		__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
+-		return NULL;
+-	}
+-
+-	if (!count) count = 5;
+-
+-	output[0] = '$';
+-	output[1] = '2';
+-	output[2] = prefix[2];
+-	output[3] = '$';
+-	output[4] = '0' + count / 10;
+-	output[5] = '0' + count % 10;
+-	output[6] = '$';
+-
+-	BF_encode(&output[7], (const BF_word *)input, 16);
+-	output[7 + 22] = '\0';
+-
+-	return output;
+-}
+Index: crypt_blowfish-1.2/crypt_blowfish.h
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_blowfish.h
++++ crypt_blowfish-1.2/crypt_blowfish.h
+@@ -20,8 +20,5 @@
+ extern int _crypt_output_magic(const char *setting, char *output, int size);
+ extern char *_crypt_blowfish_rn(const char *key, const char *setting,
+ 	char *output, int size);
+-extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
+-	unsigned long count,
+-	const char *input, int size, char *output, int output_size);
+ 
+ #endif
+Index: crypt_blowfish-1.2/crypt_gensalt.c
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_gensalt.c
++++ crypt_blowfish-1.2/crypt_gensalt.c
+@@ -180,3 +180,69 @@ error:
+ 	errno = ENOMEM;
+ 	return NULL;
+ }
++
++
++typedef unsigned int BF_word;
++
++static const unsigned char BF_itoa64[64 + 1] =
++	"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
++
++static void BF_encode(char *dst, const BF_word *src, int size)
++{
++	const unsigned char *sptr = (const unsigned char *)src;
++	const unsigned char *end = sptr + size;
++	unsigned char *dptr = (unsigned char *)dst;
++	unsigned int c1, c2;
++
++	do {
++		c1 = *sptr++;
++		*dptr++ = BF_itoa64[c1 >> 2];
++		c1 = (c1 & 0x03) << 4;
++		if (sptr >= end) {
++			*dptr++ = BF_itoa64[c1];
++			break;
++		}
++
++		c2 = *sptr++;
++		c1 |= c2 >> 4;
++		*dptr++ = BF_itoa64[c1];
++		c1 = (c2 & 0x0f) << 2;
++		if (sptr >= end) {
++			*dptr++ = BF_itoa64[c1];
++			break;
++		}
++
++		c2 = *sptr++;
++		c1 |= c2 >> 6;
++		*dptr++ = BF_itoa64[c1];
++		*dptr++ = BF_itoa64[c2 & 0x3f];
++	} while (sptr < end);
++}
++
++char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
++	const char *input, int size, char *output, int output_size)
++{
++	if (size < 16 || output_size < 7 + 22 + 1 ||
++	    (count && (count < 4 || count > 31)) ||
++	    prefix[0] != '$' || prefix[1] != '2' ||
++	    (prefix[2] != 'a' && prefix[2] != 'y')) {
++		if (output_size > 0) output[0] = '\0';
++		__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
++		return NULL;
++	}
++
++	if (!count) count = 5;
++
++	output[0] = '$';
++	output[1] = '2';
++	output[2] = prefix[2];
++	output[3] = '$';
++	output[4] = '0' + count / 10;
++	output[5] = '0' + count % 10;
++	output[6] = '$';
++
++	BF_encode(&output[7], (const BF_word *)input, 16);
++	output[7 + 22] = '\0';
++
++	return output;
++}
+Index: crypt_blowfish-1.2/crypt_gensalt.h
+===================================================================
+--- crypt_blowfish-1.2.orig/crypt_gensalt.h
++++ crypt_blowfish-1.2/crypt_gensalt.h
+@@ -28,5 +28,8 @@ extern char *_crypt_gensalt_md5_rn(const
+ 	const char *input, int size, char *output, int output_size);
+ extern char *_crypt_gensalt_sha2_rn(const char *prefix, unsigned long count,
+ 	const char *input, int size, char *output, int output_size);
++extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
++	unsigned long count,
++	const char *input, int size, char *output, int output_size);
+ 
+ #endif
+Index: crypt_blowfish-1.2/wrapper-gensalt.c
+===================================================================
+--- /dev/null
++++ crypt_blowfish-1.2/wrapper-gensalt.c
+@@ -0,0 +1,124 @@
++/*
++ * Written by Solar Designer <solar at openwall.com> in 2000-2011.
++ * No copyright is claimed, and the software is hereby placed in the public
++ * domain.  In case this attempt to disclaim copyright and place the software
++ * in the public domain is deemed null and void, then the software is
++ * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
++ * general public under the following terms:
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted.
++ *
++ * There's ABSOLUTELY NO WARRANTY, express or implied.
++ *
++ * See crypt_blowfish.c for more information.
++ */
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <errno.h>
++#ifndef __set_errno
++#define __set_errno(val) errno = (val)
++#endif
++
++#define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
++
++#if defined(__GLIBC__) && defined(_LIBC)
++#define __SKIP_GNU
++#endif
++#include "ow-crypt.h"
++
++#include "crypt_gensalt.h"
++
++#if !(defined(__GLIBC__) && defined(_LIBC))
++#define __crypt_gensalt_rn crypt_gensalt_rn
++#define __crypt_gensalt_ra crypt_gensalt_ra
++#define __crypt_gensalt crypt_gensalt
++#endif
++
++char *__crypt_gensalt_rn(const char *prefix, unsigned long count,
++	const char *input, int size, char *output, int output_size)
++{
++	char *(*use)(const char *_prefix, unsigned long _count,
++		const char *_input, int _size,
++		char *_output, int _output_size);
++
++	/* This may be supported on some platforms in the future */
++	if (!input) {
++		__set_errno(EINVAL);
++		return NULL;
++	}
++
++	if (!strncmp(prefix, "$5$", 3) || !strncmp(prefix, "$6$", 3))
++		use = _crypt_gensalt_sha2_rn;
++	else
++	if (!strncmp(prefix, "$2a$", 4) || !strncmp(prefix, "$2y$", 4))
++		use = _crypt_gensalt_blowfish_rn;
++	else
++	if (!strncmp(prefix, "$1$", 3))
++		use = _crypt_gensalt_md5_rn;
++	else
++	if (prefix[0] == '_')
++		use = _crypt_gensalt_extended_rn;
++	else
++	if (!prefix[0] ||
++	    (prefix[0] && prefix[1] &&
++	    memchr(_crypt_itoa64, prefix[0], 64) &&
++	    memchr(_crypt_itoa64, prefix[1], 64)))
++		use = _crypt_gensalt_traditional_rn;
++	else {
++		__set_errno(EINVAL);
++		return NULL;
++	}
++
++	return use(prefix, count, input, size, output, output_size);
++}
++
++char *__crypt_gensalt_ra(const char *prefix, unsigned long count,
++	const char *input, int size)
++{
++	char output[CRYPT_GENSALT_OUTPUT_SIZE];
++	char *retval;
++
++	retval = __crypt_gensalt_rn(prefix, count,
++		input, size, output, sizeof(output));
++
++	if (retval) {
++		retval = strdup(retval);
++#ifndef __GLIBC__
++		/* strdup(3) on glibc sets errno, so we don't need to bother */
++		if (!retval)
++			__set_errno(ENOMEM);
++#endif
++	}
++
++	return retval;
++}
++
++char *__crypt_gensalt(const char *prefix, unsigned long count,
++	const char *input, int size)
++{
++	static char output[CRYPT_GENSALT_OUTPUT_SIZE];
++
++	return __crypt_gensalt_rn(prefix, count,
++		input, size, output, sizeof(output));
++}
++
++#if defined(__GLIBC__) && defined(_LIBC)
++#if IS_IN_libowcrypt
++weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
++weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
++weak_alias(__crypt_gensalt, crypt_gensalt)
++#else
++#include <shlib-compat.h>
++#define ow_symbol(name) \
++  symbol_version (__##name, name, OW_CRYPT_1.0); \
++  hidden_ver (__##name, name)
++
++ow_symbol (crypt_gensalt)
++ow_symbol (crypt_gensalt_rn)
++ow_symbol (crypt_gensalt_ra)
++#endif
++#endif
++
+Index: crypt_blowfish-1.2/wrapper.c
+===================================================================
+--- crypt_blowfish-1.2.orig/wrapper.c
++++ crypt_blowfish-1.2/wrapper.c
+@@ -35,7 +35,6 @@
+ #endif
+ 
+ #define CRYPT_OUTPUT_SIZE		(7 + 22 + 31 + 1)
+-#define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
+ 
+ #if defined(__GLIBC__) && defined(_LIBC)
+ #define __SKIP_GNU
+@@ -43,7 +42,6 @@
+ #include "ow-crypt.h"
+ 
+ #include "crypt_blowfish.h"
+-#include "crypt_gensalt.h"
+ 
+ #if defined(__GLIBC__) && defined(_LIBC)
+ /* crypt.h from glibc-crypt-2.1 will define struct crypt_data for us */
+@@ -209,88 +207,11 @@ char *crypt(const char *key, const char
+ 		crypt_rn(key, setting, output, sizeof(output)),
+ 		setting, output, sizeof(output));
+ }
+-
+-#define __crypt_gensalt_rn crypt_gensalt_rn
+-#define __crypt_gensalt_ra crypt_gensalt_ra
+-#define __crypt_gensalt crypt_gensalt
+-#endif
+-
+-char *__crypt_gensalt_rn(const char *prefix, unsigned long count,
+-	const char *input, int size, char *output, int output_size)
+-{
+-	char *(*use)(const char *_prefix, unsigned long _count,
+-		const char *_input, int _size,
+-		char *_output, int _output_size);
+-
+-	/* This may be supported on some platforms in the future */
+-	if (!input) {
+-		__set_errno(EINVAL);
+-		return NULL;
+-	}
+-
+-	if (!strncmp(prefix, "$5$", 3) || !strncmp(prefix, "$6$", 3))
+-		use = _crypt_gensalt_sha2_rn;
+-	else
+-	if (!strncmp(prefix, "$2a$", 4) || !strncmp(prefix, "$2y$", 4))
+-		use = _crypt_gensalt_blowfish_rn;
+-	else
+-	if (!strncmp(prefix, "$1$", 3))
+-		use = _crypt_gensalt_md5_rn;
+-	else
+-	if (prefix[0] == '_')
+-		use = _crypt_gensalt_extended_rn;
+-	else
+-	if (!prefix[0] ||
+-	    (prefix[0] && prefix[1] &&
+-	    memchr(_crypt_itoa64, prefix[0], 64) &&
+-	    memchr(_crypt_itoa64, prefix[1], 64)))
+-		use = _crypt_gensalt_traditional_rn;
+-	else {
+-		__set_errno(EINVAL);
+-		return NULL;
+-	}
+-
+-	return use(prefix, count, input, size, output, output_size);
+-}
+-
+-char *__crypt_gensalt_ra(const char *prefix, unsigned long count,
+-	const char *input, int size)
+-{
+-	char output[CRYPT_GENSALT_OUTPUT_SIZE];
+-	char *retval;
+-
+-	retval = __crypt_gensalt_rn(prefix, count,
+-		input, size, output, sizeof(output));
+-
+-	if (retval) {
+-		retval = strdup(retval);
+-#ifndef __GLIBC__
+-		/* strdup(3) on glibc sets errno, so we don't need to bother */
+-		if (!retval)
+-			__set_errno(ENOMEM);
+ #endif
+-	}
+-
+-	return retval;
+-}
+-
+-char *__crypt_gensalt(const char *prefix, unsigned long count,
+-	const char *input, int size)
+-{
+-	static char output[CRYPT_GENSALT_OUTPUT_SIZE];
+-
+-	return __crypt_gensalt_rn(prefix, count,
+-		input, size, output, sizeof(output));
+-}
+ 
+ #if defined(__GLIBC__) && defined(_LIBC)
+-weak_alias(__crypt_rn, crypt_rn)
+-weak_alias(__crypt_ra, crypt_ra)
+ weak_alias(__crypt_r, crypt_r)
+ weak_alias(__crypt, crypt)
+-weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
+-weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
+-weak_alias(__crypt_gensalt, crypt_gensalt)
+ weak_alias(crypt, fcrypt)
+ #endif
+ 
diff --git a/glibc-2.14-crypt-versioning.diff b/glibc-2.14-crypt-versioning.diff
deleted file mode 100644
index a1dc9e1..0000000
--- a/glibc-2.14-crypt-versioning.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: glibc-2.17/Versions.def
-===================================================================
---- glibc-2.17.orig/Versions.def
-+++ glibc-2.17/Versions.def
-@@ -42,6 +42,8 @@ libc {
- }
- libcrypt {
-   GLIBC_2.0
-+  GLIBC_2.14
-+  OW_CRYPT_1.0
- }
- libdl {
-   GLIBC_2.0
-Index: glibc-2.17/crypt/Versions
-===================================================================
---- glibc-2.17.orig/crypt/Versions
-+++ glibc-2.17/crypt/Versions
-@@ -1,6 +1,15 @@
-+%define SHARED
-+%define IS_IN_libcrypt 1
-+%include <shlib-compat.h>
-+
- libcrypt {
-   GLIBC_2.0 {
-     crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
-+%if SHLIB_COMPAT (libcrypt, GLIBC_2_0, GLIBC_2_14)
-+    crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
-+%endif
-+  }
-+  OW_CRYPT_1.0 {
-     crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
-   }
- }
diff --git a/glibc-2.14-crypt.diff b/glibc-2.14-crypt.diff
index 8ee6549..82a0ec7 100644
--- a/glibc-2.14-crypt.diff
+++ b/glibc-2.14-crypt.diff
@@ -1,39 +1,65 @@
-Index: glibc-2.16.90/crypt/Makefile
+Index: glibc-2.17/Versions.def
 ===================================================================
---- glibc-2.16.90.orig/crypt/Makefile
-+++ glibc-2.16.90/crypt/Makefile
-@@ -21,6 +21,7 @@
+--- glibc-2.17.orig/Versions.def
++++ glibc-2.17/Versions.def
+@@ -42,6 +42,10 @@ libc {
+ }
+ libcrypt {
+   GLIBC_2.0
++  OW_CRYPT_1.0
++}
++libowcrypt {
++  OW_CRYPT_1.0
+ }
+ libdl {
+   GLIBC_2.0
+Index: glibc-2.17/crypt/Makefile
+===================================================================
+--- glibc-2.17.orig/crypt/Makefile
++++ glibc-2.17/crypt/Makefile
+@@ -21,14 +21,19 @@
  subdir	:= crypt
  
  headers := crypt.h
 +headers += gnu-crypt.h ow-crypt.h
  
- extra-libs := libcrypt
+-extra-libs := libcrypt
++extra-libs := libcrypt libowcrypt
  extra-libs-others := $(extra-libs)
-@@ -28,6 +29,8 @@ extra-libs-others := $(extra-libs)
+ 
  libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
  		     crypt_util
  
-+libcrypt-routines += crypt_blowfish x86 crypt_gensalt wrapper
+-tests := cert md5c-test sha256c-test sha512c-test badsalttest
++libcrypt-routines += crypt_blowfish x86 wrapper crypt_gensalt compat-gensalt
++libcrypt-shared-only-routines = crypt_gensalt compat-gensalt
++libowcrypt-routines := crypt_gensalt wrapper-gensalt
 +
- tests := cert md5c-test sha256c-test sha512c-test badsalttest
++tests := cert md5c-test sha256c-test sha512c-test
  
  include ../Makeconfig
-Index: glibc-2.16.90/crypt/Versions
+ 
+Index: glibc-2.17/crypt/Versions
 ===================================================================
---- glibc-2.16.90.orig/crypt/Versions
-+++ glibc-2.16.90/crypt/Versions
-@@ -1,5 +1,6 @@
- libcrypt {
+--- glibc-2.17.orig/crypt/Versions
++++ glibc-2.17/crypt/Versions
+@@ -2,4 +2,12 @@ libcrypt {
    GLIBC_2.0 {
      crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
-+    crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
    }
++  OW_CRYPT_1.0 {
++    crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
++  }
++}
++libowcrypt {
++  OW_CRYPT_1.0 {
++    crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
++  }
  }
-Index: glibc-2.16.90/crypt/crypt-entry.c
+Index: glibc-2.17/crypt/crypt-entry.c
 ===================================================================
---- glibc-2.16.90.orig/crypt/crypt-entry.c
-+++ glibc-2.16.90/crypt/crypt-entry.c
+--- glibc-2.17.orig/crypt/crypt-entry.c
++++ glibc-2.17/crypt/crypt-entry.c
 @@ -81,7 +81,7 @@ extern struct crypt_data _ufc_foobar;
   */
  
@@ -56,3 +82,544 @@ Index: glibc-2.16.90/crypt/crypt-entry.c
  }
  #endif
 +#endif
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.17
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.4
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.4
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
+@@ -9,3 +9,8 @@ GLIBC_2.0
+  setkey_r F
+ _gp_disp
+  _gp_disp A
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.12
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.12
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.12
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/shlib-versions
+===================================================================
+--- glibc-2.17.orig/shlib-versions
++++ glibc-2.17/shlib-versions
+@@ -92,6 +92,7 @@ sh.*-.*-linux.*		ld=ld-linux.so.2	GLIBC_
+ 
+ # This defines the shared library version numbers we will install.
+ .*-.*-.*		libcrypt=1
++.*-.*-.*		libowcrypt=1
+ 
+ # The gross patch for programs assuming broken locale implementations.
+ sh.*-.*-.*		libBrokenLocale=1	GLIBC_2.2
+Index: glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.3
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.2
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.0
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.2.5
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
++++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
+@@ -7,3 +7,8 @@ GLIBC_2.16
+  fcrypt F
+  setkey F
+  setkey_r F
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libowcrypt.abilist
+===================================================================
+--- /dev/null
++++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libowcrypt.abilist
+@@ -0,0 +1,5 @@
++OW_CRYPT_1.0
++ OW_CRYPT_1.0 A
++ crypt_gensalt F
++ crypt_gensalt_ra F
++ crypt_gensalt_rn F
diff --git a/glibc-crypt-badsalttest.patch b/glibc-crypt-badsalttest.patch
deleted file mode 100644
index faa9ef3..0000000
--- a/glibc-crypt-badsalttest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-badsalttest expects that crypt fails for unknown salt, but crypt-blowfish
-doesn't.
-
-Index: glibc-2.17/crypt/Makefile
-===================================================================
---- glibc-2.17.orig/crypt/Makefile
-+++ glibc-2.17/crypt/Makefile
-@@ -31,7 +31,7 @@ libcrypt-routines := crypt-entry md5-cry
- 
- libcrypt-routines += crypt_blowfish x86 crypt_gensalt wrapper
- 
--tests := cert md5c-test sha256c-test sha512c-test badsalttest
-+tests := cert md5c-test sha256c-test sha512c-test
- 
- include ../Makeconfig
- 
diff --git a/glibc-fix-check-abi.patch b/glibc-fix-check-abi.patch
deleted file mode 100644
index 0344fd1..0000000
--- a/glibc-fix-check-abi.patch
+++ /dev/null
@@ -1,581 +0,0 @@
-The addition of the Blowfish cipher functions also requires updating
-the ABI check list for all targets.
-
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
-@@ -7,3 +7,10 @@ GLIBC_2.17
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.4
-  GLIBC_2.4 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.4
-  GLIBC_2.4 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
-@@ -1,7 +1,12 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-@@ -9,3 +14,10 @@ GLIBC_2.0
-  setkey_r F
- _gp_disp
-  _gp_disp A
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.12
-  GLIBC_2.12 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.12
-  GLIBC_2.12 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
-+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.12
-  GLIBC_2.12 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.3
-  GLIBC_2.3 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.2
-  GLIBC_2.2 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.0
-  GLIBC_2.0 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.2.5
-  GLIBC_2.2.5 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
-Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
-+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
-@@ -7,3 +7,10 @@ GLIBC_2.16
-  fcrypt F
-  setkey F
-  setkey_r F
-+OW_CRYPT_1.0
-+ OW_CRYPT_1.0 A
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-+ crypt_ra F
-+ crypt_rn F
diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index e4993c3..ed5849f 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jul  4 12:14:27 UTC 2013 - schwab@suse.de
+
+- crypt_blowfish-gensalt.patch: separare crypt_gensalt into its own
+  library libowcrypt, remove crypt_rn and crypt_ra (fate#314945)
+- glibc-2.14-crypt-versioning.diff, glibc-fix-check-abi.patch,
+  glibc-crypt-badsalttest.patch: folded into glibc-2.14-crypt.diff
+- crypt_blowfish-const.patch: constify crypt_blowfish
+- crypt_blowfish-1.2-sha.diff: refresh
+
+-------------------------------------------------------------------
+Fri Jun 28 12:26:38 UTC 2013 - dmueller@suse.com
+
+- add ld-linux.so.3 compat symlink also for armv6hl 
+- remove deprecated armv7l
+
 -------------------------------------------------------------------
 Wed Jun 19 09:29:55 UTC 2013 - coolo@suse.com
 
diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec
index a3a0130..9857f3c 100644
--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@@ -141,7 +141,7 @@ Obsoletes:      glibc-64bit
 %ifarch ppc
 Obsoletes:      glibc-32bit
 %endif
-%ifarch armv7l armv7hl
+%ifarch armv6hl armv7hl
 # The old runtime linker link gets not provided by rpm find.provides, but it exists
 Provides:       ld-linux.so.3
 Provides:       ld-linux.so.3(GLIBC_2.4)
@@ -178,13 +178,13 @@ NoSource:       0
 ### openSUSE extensions, configuration
 # PATCH-FEATURE-OPENSUSE -- add crypt_blowfish support - bnc#700876
 Patch1:         glibc-2.14-crypt.diff
-# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
-Patch2:         glibc-2.14-crypt-versioning.diff
+# PATCH-FEATURE-OPENSUSE constify crypt_blowfish
+Patch2:         crypt_blowfish-const.patch
 # PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de
 Patch3:         crypt_blowfish-1.2-sha.diff
-# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
-Patch4:         crypt_blowfish-1.2-versioning.diff
-# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
+# PATCH-FEATURE-OPENSUSE Move crypt_gensalt_rn to separate library
+Patch4:         crypt_blowfish-gensalt.patch
+# PATCH-FEATURE-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
 Patch5:         crypt_blowfish-1.2-hack_around_arm.diff
 # PATCH-FIX-OPENSUSE Fix path for nscd databases
 Patch6:         glibc-2.3.3-nscd-db-path.diff
@@ -208,10 +208,6 @@ Patch14:        glibc-bindresvport-blacklist.diff
 Patch15:        glibc-2.3.90-langpackdir.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
 Patch18:        glibc-cpusetsize.diff
-# PATCH-FIX-OPENSUSE Fix check abi for crypt additions
-Patch21:        glibc-fix-check-abi.patch
-# PATCH-FIX-OPENSUSE Disable badsalttest which expects that crypt can fail
-Patch22:        glibc-crypt-badsalttest.patch
 
 ### Locale related patches
 # PATCH-FIX-OPENSUSE Add additional locales
@@ -439,6 +435,7 @@ versions of your software.
 # Owl crypt_blowfish
 tar -xzf %SOURCE50
 pushd crypt_blowfish-%{crypt_bf_version}
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5
@@ -447,7 +444,6 @@ mv crypt/{crypt.h,gnu-crypt.h}
 mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
 #
 %patch1 -p1
-%patch2 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -464,8 +460,6 @@ rm nscd/s-stamp
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
-%patch21 -p1
-%patch22 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -939,7 +933,7 @@ install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p %{buildroot}/usr/lib/systemd/system
 install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
 
-%ifarch armv7l armv7hl
+%ifarch armv6hl armv7hl
 # Provide compatibility link
 ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
 %endif
@@ -1068,7 +1062,7 @@ exit 0
 
 # Each architecture has a different name for the dynamic linker:
 %ifarch %arm
-%ifarch armv7l armv7hl
+%ifarch armv6hl armv7hl
 /%{_lib}/ld-linux-armhf.so.3
 # Keep compatibility link
 /%{_lib}/ld-linux.so.3
@@ -1111,6 +1105,8 @@ exit 0
 /%{_lib}/libcidn.so.1
 /%{_lib}/libcrypt-%{glibc_major_version}.so
 /%{_lib}/libcrypt.so.1
+/%{_lib}/libowcrypt-%{glibc_major_version}.so
+/%{_lib}/libowcrypt.so.1
 /%{_lib}/libdl-%{glibc_major_version}.so
 /%{_lib}/libdl.so.2*
 /%{_lib}/libm-%{glibc_major_version}.so
@@ -1237,6 +1233,7 @@ exit 0
 %{_libdir}/libanl.a
 %{_libdir}/libc.a
 %{_libdir}/libcrypt.a
+%{_libdir}/libowcrypt.a
 %{_libdir}/libdl.a
 %{_libdir}/libm.a
 %{_libdir}/libnsl.a
@@ -1284,6 +1281,7 @@ exit 0
 %{_libdir}/libanl_p.a
 %{_libdir}/libm_p.a
 %{_libdir}/libcrypt_p.a
+%{_libdir}/libowcrypt_p.a
 %{_libdir}/libpthread_p.a
 %{_libdir}/libresolv_p.a
 %{_libdir}/libnsl_p.a
diff --git a/glibc-utils.changes b/glibc-utils.changes
index e4993c3..ed5849f 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jul  4 12:14:27 UTC 2013 - schwab@suse.de
+
+- crypt_blowfish-gensalt.patch: separare crypt_gensalt into its own
+  library libowcrypt, remove crypt_rn and crypt_ra (fate#314945)
+- glibc-2.14-crypt-versioning.diff, glibc-fix-check-abi.patch,
+  glibc-crypt-badsalttest.patch: folded into glibc-2.14-crypt.diff
+- crypt_blowfish-const.patch: constify crypt_blowfish
+- crypt_blowfish-1.2-sha.diff: refresh
+
+-------------------------------------------------------------------
+Fri Jun 28 12:26:38 UTC 2013 - dmueller@suse.com
+
+- add ld-linux.so.3 compat symlink also for armv6hl 
+- remove deprecated armv7l
+
 -------------------------------------------------------------------
 Wed Jun 19 09:29:55 UTC 2013 - coolo@suse.com
 
diff --git a/glibc-utils.spec b/glibc-utils.spec
index 1a1aa92..b278caf 100644
--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@@ -140,7 +140,7 @@ Obsoletes:      glibc-64bit
 %ifarch ppc
 Obsoletes:      glibc-32bit
 %endif
-%ifarch armv7l armv7hl
+%ifarch armv6hl armv7hl
 # The old runtime linker link gets not provided by rpm find.provides, but it exists
 Provides:       ld-linux.so.3
 Provides:       ld-linux.so.3(GLIBC_2.4)
@@ -177,13 +177,13 @@ NoSource:       0
 ### openSUSE extensions, configuration
 # PATCH-FEATURE-OPENSUSE -- add crypt_blowfish support - bnc#700876
 Patch1:         glibc-2.14-crypt.diff
-# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
-Patch2:         glibc-2.14-crypt-versioning.diff
+# PATCH-FEATURE-OPENSUSE constify crypt_blowfish
+Patch2:         crypt_blowfish-const.patch
 # PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de
 Patch3:         crypt_blowfish-1.2-sha.diff
-# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
-Patch4:         crypt_blowfish-1.2-versioning.diff
-# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
+# PATCH-FEATURE-OPENSUSE Move crypt_gensalt_rn to separate library
+Patch4:         crypt_blowfish-gensalt.patch
+# PATCH-FEATURE-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
 Patch5:         crypt_blowfish-1.2-hack_around_arm.diff
 # PATCH-FIX-OPENSUSE Fix path for nscd databases
 Patch6:         glibc-2.3.3-nscd-db-path.diff
@@ -207,10 +207,6 @@ Patch14:        glibc-bindresvport-blacklist.diff
 Patch15:        glibc-2.3.90-langpackdir.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
 Patch18:        glibc-cpusetsize.diff
-# PATCH-FIX-OPENSUSE Fix check abi for crypt additions
-Patch21:        glibc-fix-check-abi.patch
-# PATCH-FIX-OPENSUSE Disable badsalttest which expects that crypt can fail
-Patch22:        glibc-crypt-badsalttest.patch
 
 ### Locale related patches
 # PATCH-FIX-OPENSUSE Add additional locales
@@ -439,6 +435,7 @@ versions of your software.
 # Owl crypt_blowfish
 tar -xzf %SOURCE50
 pushd crypt_blowfish-%{crypt_bf_version}
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5
@@ -447,7 +444,6 @@ mv crypt/{crypt.h,gnu-crypt.h}
 mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
 #
 %patch1 -p1
-%patch2 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -464,8 +460,6 @@ rm nscd/s-stamp
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
-%patch21 -p1
-%patch22 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -939,7 +933,7 @@ install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p %{buildroot}/usr/lib/systemd/system
 install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
 
-%ifarch armv7l armv7hl
+%ifarch armv6hl armv7hl
 # Provide compatibility link
 ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
 %endif
@@ -1068,7 +1062,7 @@ exit 0
 
 # Each architecture has a different name for the dynamic linker:
 %ifarch %arm
-%ifarch armv7l armv7hl
+%ifarch armv6hl armv7hl
 /%{_lib}/ld-linux-armhf.so.3
 # Keep compatibility link
 /%{_lib}/ld-linux.so.3
@@ -1111,6 +1105,8 @@ exit 0
 /%{_lib}/libcidn.so.1
 /%{_lib}/libcrypt-%{glibc_major_version}.so
 /%{_lib}/libcrypt.so.1
+/%{_lib}/libowcrypt-%{glibc_major_version}.so
+/%{_lib}/libowcrypt.so.1
 /%{_lib}/libdl-%{glibc_major_version}.so
 /%{_lib}/libdl.so.2*
 /%{_lib}/libm-%{glibc_major_version}.so
@@ -1237,6 +1233,7 @@ exit 0
 %{_libdir}/libanl.a
 %{_libdir}/libc.a
 %{_libdir}/libcrypt.a
+%{_libdir}/libowcrypt.a
 %{_libdir}/libdl.a
 %{_libdir}/libm.a
 %{_libdir}/libnsl.a
@@ -1284,6 +1281,7 @@ exit 0
 %{_libdir}/libanl_p.a
 %{_libdir}/libm_p.a
 %{_libdir}/libcrypt_p.a
+%{_libdir}/libowcrypt_p.a
 %{_libdir}/libpthread_p.a
 %{_libdir}/libresolv_p.a
 %{_libdir}/libnsl_p.a
diff --git a/glibc.changes b/glibc.changes
index 57c5d85..ed5849f 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jul  4 12:14:27 UTC 2013 - schwab@suse.de
+
+- crypt_blowfish-gensalt.patch: separare crypt_gensalt into its own
+  library libowcrypt, remove crypt_rn and crypt_ra (fate#314945)
+- glibc-2.14-crypt-versioning.diff, glibc-fix-check-abi.patch,
+  glibc-crypt-badsalttest.patch: folded into glibc-2.14-crypt.diff
+- crypt_blowfish-const.patch: constify crypt_blowfish
+- crypt_blowfish-1.2-sha.diff: refresh
+
 -------------------------------------------------------------------
 Fri Jun 28 12:26:38 UTC 2013 - dmueller@suse.com
 
diff --git a/glibc.spec b/glibc.spec
index bf7ec5f..f53aba6 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -178,13 +178,13 @@ NoSource:       0
 ### openSUSE extensions, configuration
 # PATCH-FEATURE-OPENSUSE -- add crypt_blowfish support - bnc#700876
 Patch1:         glibc-2.14-crypt.diff
-# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
-Patch2:         glibc-2.14-crypt-versioning.diff
+# PATCH-FEATURE-OPENSUSE constify crypt_blowfish
+Patch2:         crypt_blowfish-const.patch
 # PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de
 Patch3:         crypt_blowfish-1.2-sha.diff
-# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
-Patch4:         crypt_blowfish-1.2-versioning.diff
-# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
+# PATCH-FEATURE-OPENSUSE Move crypt_gensalt_rn to separate library
+Patch4:         crypt_blowfish-gensalt.patch
+# PATCH-FEATURE-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
 Patch5:         crypt_blowfish-1.2-hack_around_arm.diff
 # PATCH-FIX-OPENSUSE Fix path for nscd databases
 Patch6:         glibc-2.3.3-nscd-db-path.diff
@@ -208,10 +208,6 @@ Patch14:        glibc-bindresvport-blacklist.diff
 Patch15:        glibc-2.3.90-langpackdir.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
 Patch18:        glibc-cpusetsize.diff
-# PATCH-FIX-OPENSUSE Fix check abi for crypt additions
-Patch21:        glibc-fix-check-abi.patch
-# PATCH-FIX-OPENSUSE Disable badsalttest which expects that crypt can fail
-Patch22:        glibc-crypt-badsalttest.patch
 
 ### Locale related patches
 # PATCH-FIX-OPENSUSE Add additional locales
@@ -439,6 +435,7 @@ versions of your software.
 # Owl crypt_blowfish
 tar -xzf %SOURCE50
 pushd crypt_blowfish-%{crypt_bf_version}
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5
@@ -447,7 +444,6 @@ mv crypt/{crypt.h,gnu-crypt.h}
 mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
 #
 %patch1 -p1
-%patch2 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -464,8 +460,6 @@ rm nscd/s-stamp
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
-%patch21 -p1
-%patch22 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -1111,6 +1105,8 @@ exit 0
 /%{_lib}/libcidn.so.1
 /%{_lib}/libcrypt-%{glibc_major_version}.so
 /%{_lib}/libcrypt.so.1
+/%{_lib}/libowcrypt-%{glibc_major_version}.so
+/%{_lib}/libowcrypt.so.1
 /%{_lib}/libdl-%{glibc_major_version}.so
 /%{_lib}/libdl.so.2*
 /%{_lib}/libm-%{glibc_major_version}.so
@@ -1237,6 +1233,7 @@ exit 0
 %{_libdir}/libanl.a
 %{_libdir}/libc.a
 %{_libdir}/libcrypt.a
+%{_libdir}/libowcrypt.a
 %{_libdir}/libdl.a
 %{_libdir}/libm.a
 %{_libdir}/libnsl.a
@@ -1284,6 +1281,7 @@ exit 0
 %{_libdir}/libanl_p.a
 %{_libdir}/libm_p.a
 %{_libdir}/libcrypt_p.a
+%{_libdir}/libowcrypt_p.a
 %{_libdir}/libpthread_p.a
 %{_libdir}/libresolv_p.a
 %{_libdir}/libnsl_p.a