Remove librtkaio support.

The principal purpose of this change is to remove librtkaio support. The Fedora system wide change request is here: https://fedoraproject.org/wiki/Changes/GLIBC223_librtkaio_removal - Build require gcc-c++ for the C++ tests. - Support --without testsuite option to disable testing after build. - Support --without benchtests option to disable microbenchmarks. - Update --with bootstrap to disable benchtests, valgrind, documentation, selinux, and nss-crypt during bootstrap. - Support --without werror to disable building with -Werror. - Support --without docs to disable build requirement on texinfo. - Support --without valgrind to disable testing with valgrind. - Remove c_stubs add-on and enable fuller support for static binaries. - Remove librtkaio support (#1227855).
2015-08-28 15:29:26 -04:00 · 2015-08-28 15:29:26 -04:00 · 6e8e9f6f52
commit 6e8e9f6f52
parent ac22d64886
10 changed files with 127 additions and 6087 deletions
--- a/gen-quilt-series.sh
+++ b/gen-quilt-series.sh
@ -4,7 +4,7 @@
 rm -f series.new
 count=0
 # Filter out the patches, and use `_` as our pseudo-IFS to prevent expansion.
-for i in `grep '%patch' glibc.spec | sed -e 's,%patch,,g' -e 's, ,_,g'`; do
+for i in `grep '^%patch' glibc.spec | sed -e 's,%patch,,g' -e 's, ,_,g'`; do
    # Split the patch into number and arguments.
    # 1 - Patch number.
    # 2-N - Patch arguments.
@ -12,12 +12,15 @@ for i in `grep '%patch' glibc.spec | sed -e 's,%patch,,g' -e 's, ,_,g'`; do
    elements=(`echo $i | sed -e 's,_, ,g'`)
    num=${elements[0]}
    args=${elements[@]:1}
-    grep "Patch${num}" glibc.spec | sed -e 's,Patch.*: ,,g' -e "s,\$, ${args[@]},g" >> series.new
+    # Find the next patch that applies in order and write it out.
    # This way we transform the patch # list into a patch file list in order.
    grep "Patch${num}: " glibc.spec | sed -e 's,Patch.*: ,,g' -e "s,\$, ${args[@]},g" >> series.new
    ((count++))
 done
 # Double check we processed the correct number of patches.
 fcount=`wc -l series.new | sed -e 's, .*$,,g'`
 if [ $fcount -ne $count ]; then
-    echo "Error! Processed less patches than in spec file ($fcount != $count)."
+    echo "Error! Processed patch count doesn't match spec file count ($fcount != $count)."
    exit 1
 fi
 echo "Processed $count patches."
--- a/glibc-c_stubs.patch
+++ b/glibc-c_stubs.patch
@ -1,754 +0,0 @@
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/Banner glibc-2.17-931-g30bbc0c.new/c_stubs/Banner
 --- glibc-2.17-931-g30bbc0c/c_stubs/Banner	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/Banner	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1 @@
 +The C stubs add-on version 2.1.2.
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/ChangeLog glibc-2.17-931-g30bbc0c.new/c_stubs/ChangeLog
 --- glibc-2.17-931-g30bbc0c/c_stubs/ChangeLog	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/ChangeLog	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1,46 @@
 +2006-03-01  Jakub Jelinek  <jakub@redhat.com>
 +
 +	* configure (libc_add_on_canonical, libc_add_on_subdir): Set.
 +
 +2001-08-07  Jakub Jelinek  <jakub@redhat.com>
 +
 +	* gconv_stubs.c (__gconv_lookup_alias): Remove.
 +	(__gconv_NOOP, __gconv_compare_alias, __gconv_release_cache,
 +	__gconv_release_step): New.
 +
 +2001-06-07  Jakub Jelinek  <jakub@redhat.com>
 +
 +	* gconv_stubs.c (__gconv_lookup_alias): New.
 +
 +2000-02-27  Cristian Gafton  <gafton@redhat.com>
 +
 +	* gconv_stubs.c: Return __gconv_OK for:
 +	__gconv_transform_ascii_internal
 +	__gconv_transform_ucs2little_internal
 +	__gconv_transform_utf16_internal
 +	__gconv_transform_utf8_internal
 +	__gconv_transform_ucs2_internal
 +
 +2000-02-25  Cristian Gafton  <gafton@redhat.com>
 +
 +	* gconv_stubs.c: add __c_stubs_is_compiled_in so we can detect when
 +	the library is linked in.
 +
 +Wed Dec  8 13:47:25 1999  Ivan Brunello <ivan.brunello@tiscalinet.it>
 +
 +	* Makefile (extra-objs): Changed stubs.o to gconv_stubs.o.
 +
 +Sun Dec  5 11:32:17 1999  H.J. Lu  <hjl@gnu.org>
 +
 +	* gconv_stubs.c: Renamed from stubs.c.
 +	Support glibc 2.1.x.
 +
 +Mon Aug 23 16:42:05 1999  H.J. Lu  <hjl@gnu.org>
 +
 +	* Banner: New.
 +	* COPYING.LIB: Likewise.
 +	* Makefile: Likewise.
 +	* README: Likewise.
 +	* configure: Likewise.
 +	* stubs.c: Likewise.
 +	* test-stdio.c: Likewise.
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/configure glibc-2.17-931-g30bbc0c.new/c_stubs/configure
 --- glibc-2.17-931-g30bbc0c/c_stubs/configure	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/configure	2013-08-16 16:26:11.637020805 +0530
@@ -0,0 +1,5 @@
 +# This is only to keep the GNU C library configure mechanism happy.
 +# This is a shell script fragment sourced by the main configure script.
 +
 +libc_add_on_canonical=
 +libc_add_on_subdirs=.
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/COPYING.LIB glibc-2.17-931-g30bbc0c.new/c_stubs/COPYING.LIB
 --- glibc-2.17-931-g30bbc0c/c_stubs/COPYING.LIB	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/COPYING.LIB	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1,482 @@
 +		  GNU LIBRARY GENERAL PUBLIC LICENSE
 +		       Version 2, June 1991
 +
 + Copyright (C) 1991 Free Software Foundation, Inc.
 + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 + Everyone is permitted to copy and distribute verbatim copies
 + of this license document, but changing it is not allowed.
 +
 +[This is the first released version of the library GPL.  It is
 + numbered 2 because it goes with version 2 of the ordinary GPL.]
 +
 +			    Preamble
 +
 +  The licenses for most software are designed to take away your
 +freedom to share and change it.  By contrast, the GNU General Public
 +Licenses are intended to guarantee your freedom to share and change
 +free software--to make sure the software is free for all its users.
 +
 +  This license, the Library General Public License, applies to some
 +specially designated Free Software Foundation software, and to any
 +other libraries whose authors decide to use it.  You can use it for
 +your libraries, too.
 +
 +  When we speak of free software, we are referring to freedom, not
 +price.  Our General Public Licenses are designed to make sure that you
 +have the freedom to distribute copies of free software (and charge for
 +this service if you wish), that you receive source code or can get it
 +if you want it, that you can change the software or use pieces of it
 +in new free programs; and that you know you can do these things.
 +
 +  To protect your rights, we need to make restrictions that forbid
 +anyone to deny you these rights or to ask you to surrender the rights.
 +These restrictions translate to certain responsibilities for you if
 +you distribute copies of the library, or if you modify it.
 +
 +  For example, if you distribute copies of the library, whether gratis
 +or for a fee, you must give the recipients all the rights that we gave
 +you.  You must make sure that they, too, receive or can get the source
 +code.  If you link a program with the library, you must provide
 +complete object files to the recipients so that they can relink them
 +with the library, after making changes to the library and recompiling
 +it.  And you must show them these terms so they know their rights.
 +
 +  Our method of protecting your rights has two steps: (1) copyright
 +the library, and (2) offer you this license which gives you legal
 +permission to copy, distribute and/or modify the library.
 +
 +  Also, for each distributor's protection, we want to make certain
 +that everyone understands that there is no warranty for this free
 +library.  If the library is modified by someone else and passed on, we
 +want its recipients to know that what they have is not the original
 +version, so that any problems introduced by others will not reflect on
 +the original authors' reputations.
 +
 +  Finally, any free program is threatened constantly by software
 +patents.  We wish to avoid the danger that companies distributing free
 +software will individually obtain patent licenses, thus in effect
 +transforming the program into proprietary software.  To prevent this,
 +we have made it clear that any patent must be licensed for everyone's
 +free use or not licensed at all.
 +
 +  Most GNU software, including some libraries, is covered by the ordinary
 +GNU General Public License, which was designed for utility programs.  This
 +license, the GNU Library General Public License, applies to certain
 +designated libraries.  This license is quite different from the ordinary
 +one; be sure to read it in full, and don't assume that anything in it is
 +the same as in the ordinary license.
 +
 +  The reason we have a separate public license for some libraries is that
 +they blur the distinction we usually make between modifying or adding to a
 +program and simply using it.  Linking a program with a library, without
 +changing the library, is in some sense simply using the library, and is
 +analogous to running a utility program or application program.  However, in
 +a textual and legal sense, the linked executable is a combined work, a
 +derivative of the original library, and the ordinary General Public License
 +treats it as such.
 +
 +  Because of this blurred distinction, using the ordinary General
 +Public License for libraries did not effectively promote software
 +sharing, because most developers did not use the libraries.  We
 +concluded that weaker conditions might promote sharing better.
 +
 +  However, unrestricted linking of non-free programs would deprive the
 +users of those programs of all benefit from the free status of the
 +libraries themselves.  This Library General Public License is intended to
 +permit developers of non-free programs to use free libraries, while
 +preserving your freedom as a user of such programs to change the free
 +libraries that are incorporated in them.  (We have not seen how to achieve
 +this as regards changes in header files, but we have achieved it as regards
 +changes in the actual functions of the Library.)  The hope is that this
 +will lead to faster development of free libraries.
 +
 +  The precise terms and conditions for copying, distribution and
 +modification follow.  Pay close attention to the difference between a
 +"work based on the library" and a "work that uses the library".  The
 +former contains code derived from the library, while the latter only
 +works together with the library.
 +
 +  Note that it is possible for a library to be covered by the ordinary
 +General Public License rather than by this special one.
 +
 +		  GNU LIBRARY GENERAL PUBLIC LICENSE
 +   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 +
 +  0. This License Agreement applies to any software library which
 +contains a notice placed by the copyright holder or other authorized
 +party saying it may be distributed under the terms of this Library
 +General Public License (also called "this License").  Each licensee is
 +addressed as "you".
 +
 +  A "library" means a collection of software functions and/or data
 +prepared so as to be conveniently linked with application programs
 +(which use some of those functions and data) to form executables.
 +
 +  The "Library", below, refers to any such software library or work
 +which has been distributed under these terms.  A "work based on the
 +Library" means either the Library or any derivative work under
 +copyright law: that is to say, a work containing the Library or a
 +portion of it, either verbatim or with modifications and/or translated
 +straightforwardly into another language.  (Hereinafter, translation is
 +included without limitation in the term "modification".)
 +
 +  "Source code" for a work means the preferred form of the work for
 +making modifications to it.  For a library, complete source code means
 +all the source code for all modules it contains, plus any associated
 +interface definition files, plus the scripts used to control compilation
 +and installation of the library.
 +
 +  Activities other than copying, distribution and modification are not
 +covered by this License; they are outside its scope.  The act of
 +running a program using the Library is not restricted, and output from
 +such a program is covered only if its contents constitute a work based
 +on the Library (independent of the use of the Library in a tool for
 +writing it).  Whether that is true depends on what the Library does
 +and what the program that uses the Library does.
 +  
 +  1. You may copy and distribute verbatim copies of the Library's
 +complete source code as you receive it, in any medium, provided that
 +you conspicuously and appropriately publish on each copy an
 +appropriate copyright notice and disclaimer of warranty; keep intact
 +all the notices that refer to this License and to the absence of any
 +warranty; and distribute a copy of this License along with the
 +Library.
 +
 +  You may charge a fee for the physical act of transferring a copy,
 +and you may at your option offer warranty protection in exchange for a
 +fee.
 +
 +  2. You may modify your copy or copies of the Library or any portion
 +of it, thus forming a work based on the Library, and copy and
 +distribute such modifications or work under the terms of Section 1
 +above, provided that you also meet all of these conditions:
 +
 +    a) The modified work must itself be a software library.
 +
 +    b) You must cause the files modified to carry prominent notices
 +    stating that you changed the files and the date of any change.
 +
 +    c) You must cause the whole of the work to be licensed at no
 +    charge to all third parties under the terms of this License.
 +
 +    d) If a facility in the modified Library refers to a function or a
 +    table of data to be supplied by an application program that uses
 +    the facility, other than as an argument passed when the facility
 +    is invoked, then you must make a good faith effort to ensure that,
 +    in the event an application does not supply such function or
 +    table, the facility still operates, and performs whatever part of
 +    its purpose remains meaningful.
 +
 +    (For example, a function in a library to compute square roots has
 +    a purpose that is entirely well-defined independent of the
 +    application.  Therefore, Subsection 2d requires that any
 +    application-supplied function or table used by this function must
 +    be optional: if the application does not supply it, the square
 +    root function must still compute square roots.)
 +
 +These requirements apply to the modified work as a whole.  If
 +identifiable sections of that work are not derived from the Library,
 +and can be reasonably considered independent and separate works in
 +themselves, then this License, and its terms, do not apply to those
 +sections when you distribute them as separate works.  But when you
 +distribute the same sections as part of a whole which is a work based
 +on the Library, the distribution of the whole must be on the terms of
 +this License, whose permissions for other licensees extend to the
 +entire whole, and thus to each and every part regardless of who wrote
 +it.
 +
 +Thus, it is not the intent of this section to claim rights or contest
 +your rights to work written entirely by you; rather, the intent is to
 +exercise the right to control the distribution of derivative or
 +collective works based on the Library.
 +
 +In addition, mere aggregation of another work not based on the Library
 +with the Library (or with a work based on the Library) on a volume of
 +a storage or distribution medium does not bring the other work under
 +the scope of this License.
 +
 +  3. You may opt to apply the terms of the ordinary GNU General Public
 +License instead of this License to a given copy of the Library.  To do
 +this, you must alter all the notices that refer to this License, so
 +that they refer to the ordinary GNU General Public License, version 2,
 +instead of to this License.  (If a newer version than version 2 of the
 +ordinary GNU General Public License has appeared, then you can specify
 +that version instead if you wish.)  Do not make any other change in
 +these notices.
 +
 +  Once this change is made in a given copy, it is irreversible for
 +that copy, so the ordinary GNU General Public License applies to all
 +subsequent copies and derivative works made from that copy.
 +
 +  This option is useful when you wish to copy part of the code of
 +the Library into a program that is not a library.
 +
 +  4. You may copy and distribute the Library (or a portion or
 +derivative of it, under Section 2) in object code or executable form
 +under the terms of Sections 1 and 2 above provided that you accompany
 +it with the complete corresponding machine-readable source code, which
 +must be distributed under the terms of Sections 1 and 2 above on a
 +medium customarily used for software interchange.
 +
 +  If distribution of object code is made by offering access to copy
 +from a designated place, then offering equivalent access to copy the
 +source code from the same place satisfies the requirement to
 +distribute the source code, even though third parties are not
 +compelled to copy the source along with the object code.
 +
 +  5. A program that contains no derivative of any portion of the
 +Library, but is designed to work with the Library by being compiled or
 +linked with it, is called a "work that uses the Library".  Such a
 +work, in isolation, is not a derivative work of the Library, and
 +therefore falls outside the scope of this License.
 +
 +  However, linking a "work that uses the Library" with the Library
 +creates an executable that is a derivative of the Library (because it
 +contains portions of the Library), rather than a "work that uses the
 +library".  The executable is therefore covered by this License.
 +Section 6 states terms for distribution of such executables.
 +
 +  When a "work that uses the Library" uses material from a header file
 +that is part of the Library, the object code for the work may be a
 +derivative work of the Library even though the source code is not.
 +Whether this is true is especially significant if the work can be
 +linked without the Library, or if the work is itself a library.  The
 +threshold for this to be true is not precisely defined by law.
 +
 +  If such an object file uses only numerical parameters, data
 +structure layouts and accessors, and small macros and small inline
 +functions (ten lines or less in length), then the use of the object
 +file is unrestricted, regardless of whether it is legally a derivative
 +work.  (Executables containing this object code plus portions of the
 +Library will still fall under Section 6.)
 +
 +  Otherwise, if the work is a derivative of the Library, you may
 +distribute the object code for the work under the terms of Section 6.
 +Any executables containing that work also fall under Section 6,
 +whether or not they are linked directly with the Library itself.
 +
 +  6. As an exception to the Sections above, you may also compile or
 +link a "work that uses the Library" with the Library to produce a
 +work containing portions of the Library, and distribute that work
 +under terms of your choice, provided that the terms permit
 +modification of the work for the customer's own use and reverse
 +engineering for debugging such modifications.
 +
 +  You must give prominent notice with each copy of the work that the
 +Library is used in it and that the Library and its use are covered by
 +this License.  You must supply a copy of this License.  If the work
 +during execution displays copyright notices, you must include the
 +copyright notice for the Library among them, as well as a reference
 +directing the user to the copy of this License.  Also, you must do one
 +of these things:
 +
 +    a) Accompany the work with the complete corresponding
 +    machine-readable source code for the Library including whatever
 +    changes were used in the work (which must be distributed under
 +    Sections 1 and 2 above); and, if the work is an executable linked
 +    with the Library, with the complete machine-readable "work that
 +    uses the Library", as object code and/or source code, so that the
 +    user can modify the Library and then relink to produce a modified
 +    executable containing the modified Library.  (It is understood
 +    that the user who changes the contents of definitions files in the
 +    Library will not necessarily be able to recompile the application
 +    to use the modified definitions.)
 +
 +    b) Accompany the work with a written offer, valid for at
 +    least three years, to give the same user the materials
 +    specified in Subsection 6a, above, for a charge no more
 +    than the cost of performing this distribution.
 +
 +    c) If distribution of the work is made by offering access to copy
 +    from a designated place, offer equivalent access to copy the above
 +    specified materials from the same place.
 +
 +    d) Verify that the user has already received a copy of these
 +    materials or that you have already sent this user a copy.
 +
 +  For an executable, the required form of the "work that uses the
 +Library" must include any data and utility programs needed for
 +reproducing the executable from it.  However, as a special exception,
 +the source code distributed need not include anything that is normally
 +distributed (in either source or binary form) with the major
 +components (compiler, kernel, and so on) of the operating system on
 +which the executable runs, unless that component itself accompanies
 +the executable.
 +
 +  It may happen that this requirement contradicts the license
 +restrictions of other proprietary libraries that do not normally
 +accompany the operating system.  Such a contradiction means you cannot
 +use both them and the Library together in an executable that you
 +distribute.
 +
 +  7. You may place library facilities that are a work based on the
 +Library side-by-side in a single library together with other library
 +facilities not covered by this License, and distribute such a combined
 +library, provided that the separate distribution of the work based on
 +the Library and of the other library facilities is otherwise
 +permitted, and provided that you do these two things:
 +
 +    a) Accompany the combined library with a copy of the same work
 +    based on the Library, uncombined with any other library
 +    facilities.  This must be distributed under the terms of the
 +    Sections above.
 +
 +    b) Give prominent notice with the combined library of the fact
 +    that part of it is a work based on the Library, and explaining
 +    where to find the accompanying uncombined form of the same work.
 +
 +  8. You may not copy, modify, sublicense, link with, or distribute
 +the Library except as expressly provided under this License.  Any
 +attempt otherwise to copy, modify, sublicense, link with, or
 +distribute the Library is void, and will automatically terminate your
 +rights under this License.  However, parties who have received copies,
 +or rights, from you under this License will not have their licenses
 +terminated so long as such parties remain in full compliance.
 +
 +  9. You are not required to accept this License, since you have not
 +signed it.  However, nothing else grants you permission to modify or
 +distribute the Library or its derivative works.  These actions are
 +prohibited by law if you do not accept this License.  Therefore, by
 +modifying or distributing the Library (or any work based on the
 +Library), you indicate your acceptance of this License to do so, and
 +all its terms and conditions for copying, distributing or modifying
 +the Library or works based on it.
 +
 +  10. Each time you redistribute the Library (or any work based on the
 +Library), the recipient automatically receives a license from the
 +original licensor to copy, distribute, link with or modify the Library
 +subject to these terms and conditions.  You may not impose any further
 +restrictions on the recipients' exercise of the rights granted herein.
 +You are not responsible for enforcing compliance by third parties to
 +this License.
 +
 +  11. If, as a consequence of a court judgment or allegation of patent
 +infringement or for any other reason (not limited to patent issues),
 +conditions are imposed on you (whether by court order, agreement or
 +otherwise) that contradict the conditions of this License, they do not
 +excuse you from the conditions of this License.  If you cannot
 +distribute so as to satisfy simultaneously your obligations under this
 +License and any other pertinent obligations, then as a consequence you
 +may not distribute the Library at all.  For example, if a patent
 +license would not permit royalty-free redistribution of the Library by
 +all those who receive copies directly or indirectly through you, then
 +the only way you could satisfy both it and this License would be to
 +refrain entirely from distribution of the Library.
 +
 +If any portion of this section is held invalid or unenforceable under any
 +particular circumstance, the balance of the section is intended to apply,
 +and the section as a whole is intended to apply in other circumstances.
 +
 +It is not the purpose of this section to induce you to infringe any
 +patents or other property right claims or to contest validity of any
 +such claims; this section has the sole purpose of protecting the
 +integrity of the free software distribution system which is
 +implemented by public license practices.  Many people have made
 +generous contributions to the wide range of software distributed
 +through that system in reliance on consistent application of that
 +system; it is up to the author/donor to decide if he or she is willing
 +to distribute software through any other system and a licensee cannot
 +impose that choice.
 +
 +This section is intended to make thoroughly clear what is believed to
 +be a consequence of the rest of this License.
 +
 +  12. If the distribution and/or use of the Library is restricted in
 +certain countries either by patents or by copyrighted interfaces, the
 +original copyright holder who places the Library under this License may add
 +an explicit geographical distribution limitation excluding those countries,
 +so that distribution is permitted only in or among countries not thus
 +excluded.  In such case, this License incorporates the limitation as if
 +written in the body of this License.
 +
 +  13. The Free Software Foundation may publish revised and/or new
 +versions of the Library General Public License from time to time.
 +Such new versions will be similar in spirit to the present version,
 +but may differ in detail to address new problems or concerns.
 +
 +Each version is given a distinguishing version number.  If the Library
 +specifies a version number of this License which applies to it and
 +"any later version", you have the option of following the terms and
 +conditions either of that version or of any later version published by
 +the Free Software Foundation.  If the Library does not specify a
 +license version number, you may choose any version ever published by
 +the Free Software Foundation.
 +
 +  14. If you wish to incorporate parts of the Library into other free
 +programs whose distribution conditions are incompatible with these,
 +write to the author to ask for permission.  For software which is
 +copyrighted by the Free Software Foundation, write to the Free
 +Software Foundation; we sometimes make exceptions for this.  Our
 +decision will be guided by the two goals of preserving the free status
 +of all derivatives of our free software and of promoting the sharing
 +and reuse of software generally.
 +
 +			    NO WARRANTY
 +
 +  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
 +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
 +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
 +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 +PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
 +LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
 +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 +
 +  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
 +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
 +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
 +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
 +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
 +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
 +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
 +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 +DAMAGES.
 +
 +		     END OF TERMS AND CONDITIONS
 +
 +     Appendix: How to Apply These Terms to Your New Libraries
 +
 +  If you develop a new library, and you want it to be of the greatest
 +possible use to the public, we recommend making it free software that
 +everyone can redistribute and change.  You can do so by permitting
 +redistribution under these terms (or, alternatively, under the terms of the
 +ordinary General Public License).
 +
 +  To apply these terms, attach the following notices to the library.  It is
 +safest to attach them to the start of each source file to most effectively
 +convey the exclusion of warranty; and each file should have at least the
 +"copyright" line and a pointer to where the full notice is found.
 +
 +    <one line to give the library's name and a brief idea of what it does.>
 +    Copyright (C) <year>  <name of author>
 +
 +    This library is free software; you can redistribute it and/or
 +    modify it under the terms of the GNU Library General Public
 +    License as published by the Free Software Foundation; either
 +    version 2 of the License, or (at your option) any later version.
 +
 +    This library is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +    Library General Public License for more details.
 +
 +    You should have received a copy of the GNU Library General Public
 +    License along with this library; if not, write to the Free
 +    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 +    MA 02111-1307, USA
 +
 +Also add information on how to contact you by electronic and paper mail.
 +
 +You should also get your employer (if you work as a programmer) or your
 +school, if any, to sign a "copyright disclaimer" for the library, if
 +necessary.  Here is a sample; alter the names:
 +
 +  Yoyodyne, Inc., hereby disclaims all copyright interest in the
 +  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 +
 +  <signature of Ty Coon>, 1 April 1990
 +  Ty Coon, President of Vice
 +
 +That's all there is to it!
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/gconv_stubs.c glibc-2.17-931-g30bbc0c.new/c_stubs/gconv_stubs.c
 --- glibc-2.17-931-g30bbc0c/c_stubs/gconv_stubs.c	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/gconv_stubs.c	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1,126 @@
 +/* Provide gconv stub functions for the minimum static binaries.
 +   Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
 +   The GNU C Library is free software; you can redistribute it and/or
 +   modify it under the terms of the GNU Library General Public License as
 +   published by the Free Software Foundation; either version 2 of the
 +   License, or (at your option) any later version.
 +
 +   The GNU C Library is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +   Library General Public License for more details.
 +
 +   You should have received a copy of the GNU Library General Public
 +   License along with the GNU C Library; see the file COPYING.LIB.  If not,
 +   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 +   Boston, MA 02111-1307, USA.  */
 +
 +#include <features.h>
 +#include <string.h>
 +#include <wchar.h>
 +#include <bits/libc-lock.h>
 +#if __GNUC_PREREQ(3, 3)
 +# include <gconv_int.h>
 +#else
 +# include <gconv.h>
 +#endif
 +
 +__libc_lock_define_initialized (, __gconv_lock)
 +
 +/* hack for self identification */
 +int __c_stubs_is_compiled_in;
 +
 +/* Don't drag in the dynamic linker. */
 +void *__libc_stack_end;
 +
 +int attribute_hidden
 +__gconv_OK (void)
 +{
 +#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 1
 +  return __GCONV_OK;
 +#else
 +  return GCONV_OK;
 +#endif
 +}
 +
 +int attribute_hidden
 +__gconv_NOCONV (void)
 +{
 +#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 1
 +  return __GCONV_NOCONV;
 +#else
 +  return GCONV_NOCONV;
 +#endif
 +}
 +
 +void attribute_hidden
 +__gconv_NOOP (void)
 +{
 +}
 +
 +int
 +internal_function
 +__gconv_compare_alias (const char *name1, const char *name2)
 +{
 +  return strcmp (name1, name2);
 +}
 +
 +wint_t
 +__gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c)
 +{
 +  if (c < 0x80)
 +    return c;
 +  else
 +    return WEOF;
 +}
 +
 +
 +#if __GNUC_PREREQ(3, 3)
 +# undef strong_alias
 +# define strong_alias(impl, name) \
 +  __typeof (name) name __attribute__ ((alias (#impl)))
 +#endif
 +
 +strong_alias (__gconv_OK,
 +	      __gconv_close_transform);
 +strong_alias (__gconv_OK,
 +	      __gconv_close);
 +
 +strong_alias (__gconv_NOCONV,
 +	      __gconv);
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_find_transform);
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_open);
 +
 +/* These transformations should not fail in normal conditions */
 +strong_alias (__gconv_OK,
 +	      __gconv_transform_ascii_internal);
 +strong_alias (__gconv_OK,
 +	      __gconv_transform_utf16_internal);
 +strong_alias (__gconv_OK,
 +	      __gconv_transform_utf8_internal);
 +strong_alias (__gconv_OK,
 +	      __gconv_transform_ucs2_internal);
 +
 +/* We can assume no conversion for these ones */
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_transform_internal_ascii);
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_transform_internal_ucs2);
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_transform_internal_ucs4);
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_transform_internal_utf16);
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_transform_internal_utf8);
 +
 +strong_alias (__gconv_NOCONV,
 +	      __gconv_transliterate);
 +
 +strong_alias (__gconv_NOOP,
 +	      __gconv_release_cache);
 +strong_alias (__gconv_NOOP,
 +	      __gconv_release_step);
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/Makefile glibc-2.17-931-g30bbc0c.new/c_stubs/Makefile
 --- glibc-2.17-931-g30bbc0c/c_stubs/Makefile	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/Makefile	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1,46 @@
 +# Copyright (C) 1999 Free Software Foundation, Inc.
 +# This file is part of the GNU C Library.
 +
 +# The GNU C Library is free software; you can redistribute it and/or
 +# modify it under the terms of the GNU Library General Public License as
 +# published by the Free Software Foundation; either version 2 of the
 +# License, or (at your option) any later version.
 +
 +# The GNU C Library is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# Library General Public License for more details.
 +
 +# You should have received a copy of the GNU Library General Public
 +# License along with the GNU C Library; see the file COPYING.LIB.  If not,
 +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 +# Boston, MA 02111-1307, USA.
 +
 +#
 +#	Sub-makefile for the C stub add-on library.
 +#
 +subdir	:= c_stubs
 +
 +tests-static := test-stdio
 +tests := $(tests-static)
 +
 +libc_stubs-objs := gconv_stubs.o
 +
 +install-lib := libc_stubs.a
 +non-lib.a := libc_stubs.a
 +
 +extra-objs := gconv_stubs.o libc_stubs.a
 +
 +include ../Makeconfig
 +
 +CPPFLAGS += -I../iconv
 +
 +include ../Rules
 +
 +$(objpfx)libc_stubs.a: $(addprefix $(objpfx), $(libc_stubs-objs))
 +	-rm -f $@
 +	$(CC) -nostdlib -nostartfiles -r -o $@ $^
 +
 +lib: $(objpfx)libc_stubs.a
 +
 +$(objpfx)test-stdio: $(objpfx)libc_stubs.a
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/README glibc-2.17-931-g30bbc0c.new/c_stubs/README
 --- glibc-2.17-931-g30bbc0c/c_stubs/README	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/README	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1,8 @@
 +This is a stub add-on library for the GNU C library version 2.1.2 and
 +above. It is used to create the smaller static binaries by stubbing
 +out the gconv related functions. The resulting binaries may not have
 +all the functionalities.
 +
 +H.J. Lu
 +hjl@gnu.org
 +12/05/1999
 diff -pruN glibc-2.17-931-g30bbc0c/c_stubs/test-stdio.c glibc-2.17-931-g30bbc0c.new/c_stubs/test-stdio.c
 --- glibc-2.17-931-g30bbc0c/c_stubs/test-stdio.c	1970-01-01 05:30:00.000000000 +0530
 +++ glibc-2.17-931-g30bbc0c.new/c_stubs/test-stdio.c	2011-10-19 16:34:41.000000000 +0530
@@ -0,0 +1,8 @@
 +#include <stdio.h>
 +
 +int
 +main (void)
 +{
 +  printf ("Hello world\n");
 +  return 0;
 +}
--- a/glibc-rh731833-rtkaio-2.patch
+++ b/glibc-rh731833-rtkaio-2.patch
@ -1,11 +0,0 @@
 diff -pruN glibc-2.17-c758a686/rtkaio/sysdeps/unix/sysv/linux/kaio_suspend.c glibc-2.17-c758a686.new/rtkaio/sysdeps/unix/sysv/linux/kaio_suspend.c
 --- glibc-2.17-c758a686/rtkaio/sysdeps/unix/sysv/linux/kaio_suspend.c	2011-10-19 16:34:41.000000000 +0530
 +++ glibc-2.17-c758a686.new/rtkaio/sysdeps/unix/sysv/linux/kaio_suspend.c	2013-08-16 10:22:30.457609558 +0530
@@ -59,6 +59,7 @@ struct clparam
 static void
 +__attribute__ ((noinline))
 cleanup (void *arg)
 {
 #ifdef DONT_NEED_AIO_MISC_COND
--- a/glibc-rh731833-rtkaio.patch
+++ b/glibc-rh731833-rtkaio.patch
@ -1,31 +0,0 @@
 diff -pruN glibc-2.17-c758a686/rtkaio/Makefile glibc-2.17-c758a686.new/rtkaio/Makefile
 --- glibc-2.17-c758a686/rtkaio/Makefile	2011-10-19 16:34:41.000000000 +0530
 +++ glibc-2.17-c758a686.new/rtkaio/Makefile	2013-08-13 18:23:21.064888432 +0530
@@ -55,7 +55,7 @@ extra-libs-others := $(extra-libs)
 include $(..)Makeconfig
 -ifeq (yesyes,$(build-shared)$(elf))
 +ifeq (yes,$(build-shared))
 generated += librt.so$(librt.so-version)
 $(objpfx)librt.so$(librt.so-version): $(objpfx)librtkaio.so; $(make-link)
@@ -73,7 +73,7 @@ CPPFLAGS-librtkaio += -DIS_IN_librt=1 -I
 rpath-dirs := $(patsubst rt,rtkaio,$(rpath-dirs))
 -ifeq (yesyes,$(build-shared)$(elf))
 +ifeq (yes,$(build-shared))
 others: $(objpfx)librt.so$(librt.so-version)
 endif
@@ -81,8 +81,7 @@ endif
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.
 $(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
 -		   $(shared-thread-library) \
 -		   $(if $(filter yes,$(elf)), $(elf-objpfx)ld.so)
 +		   $(shared-thread-library) $(elf-objpfx)ld.so
 ifeq (yes,$(build-shared))
 $(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)
--- a/glibc-rh970865.patch
+++ b/glibc-rh970865.patch
@ -1,24 +0,0 @@
 diff -pruN glibc-2.18/rtkaio/tst-aiod2.c glibc-2.18.new/rtkaio/tst-aiod2.c
 --- glibc-2.18/rtkaio/tst-aiod2.c	2013-08-22 14:53:31.326806349 +0530
 +++ glibc-2.18.new/rtkaio/tst-aiod2.c	2013-08-22 14:53:05.474807462 +0530
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "tst-aiod.h"
 -
 +#include <pthread.h>
 static pthread_barrier_t b;
 diff -pruN glibc-2.18/rtkaio/tst-aiod3.c glibc-2.18.new/rtkaio/tst-aiod3.c
 --- glibc-2.18/rtkaio/tst-aiod3.c	2013-08-22 14:53:31.326806349 +0530
 +++ glibc-2.18.new/rtkaio/tst-aiod3.c	2013-08-22 14:53:12.796807147 +0530
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "tst-aiod.h"
 -
 +#include <pthread.h>
 static pthread_barrier_t b;
--- a/glibc-rtkaio-clock.patch
+++ b/glibc-rtkaio-clock.patch
@ -1,102 +0,0 @@
 #
 # Based on the following upstream commit:
 #
 # commit 6e6249d0b461b952d0f544792372663feb6d792a
 # Author: Roland McGrath <roland@hack.frob.com>
 # Date:   Wed Oct 24 14:50:46 2012 -0700
 #
 #    BZ#14743: Move clock_* symbols from librt to libc.
 #
 # We remove the clock* functions from librtkaio.so.1 and
 # use those provided in libc.so.6, matching librt.so.
 #
 --- glibc-2.21-63-gebf27d1.mod/rtkaio/clock-compat.c	1969-12-31 19:00:00.000000000 -0500
 +++ glibc-2.21-63-gebf27d1/rtkaio/clock-compat.c	2015-02-12 01:28:59.615026597 -0500
@@ -0,0 +1,2 @@
 +#define librt librtkaio
 +#include <rt/clock-compat.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getcpuclockid.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_getcpuclockid.c
 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getcpuclockid.c	2015-02-11 13:00:55.105400863 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/kaio_clock_getcpuclockid.c	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
 -#include <clock_getcpuclockid.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getres.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_getres.c
 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getres.c	2015-02-11 13:00:55.105400863 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/kaio_clock_getres.c	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
 -#include <clock_getres.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_gettime.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_gettime.c
 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_gettime.c	2015-02-11 13:00:55.109400738 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/kaio_clock_gettime.c	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
 -#include <clock_gettime.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_nanosleep.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_nanosleep.c
 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_nanosleep.c	2015-02-11 13:00:55.115400552 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/kaio_clock_nanosleep.c	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
 -#include <clock_nanosleep.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_settime.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_settime.c
 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_settime.c	2015-02-11 13:00:55.110400708 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/kaio_clock_settime.c	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
 -#include <clock_settime.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_get_clockfreq.c glibc-2.21-59-gd35273f/rtkaio/kaio_get_clockfreq.c
 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_get_clockfreq.c	2015-02-11 13:00:55.118400459 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/kaio_get_clockfreq.c	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
 -#include <get_clockfreq.c>
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/Makefile glibc-2.21-59-gd35273f/rtkaio/Makefile
 --- glibc-2.21-59-gd35273f.mod/rtkaio/Makefile	2015-02-11 13:00:55.107400801 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/Makefile	2015-02-11 22:46:46.930374298 -0500
@@ -25,9 +25,6 @@
 		  aio_read64 aio_return aio_suspend aio_write		\
 		  aio_write64 lio_listio lio_listio64 aio_sigqueue	\
 		  aio_notify
 -clock-routines := get_clockfreq clock_getcpuclockid			\
 -		  clock_getres clock_gettime clock_settime		\
 -		  clock_nanosleep
 timer-routines := timer_create timer_delete timer_getoverr		\
 		  timer_gettime timer_settime
 shm-routines   := shm_open shm_unlink
@@ -36,8 +33,9 @@
 		  mq_timedreceive
 librtkaio-routines = $(patsubst %,k%,$(aio-routines)) \
 -		     $(patsubst %,kaio_%,$(clock-routines) $(timer-routines) \
 -					 $(shm-routines) $(mq-routines))
 +		     $(patsubst %,kaio_%,$(timer-routines) \
 +					 $(shm-routines) $(mq-routines)) \
 +		     clock-compat
 tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \
 	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
@@ -64,7 +62,6 @@
 include $(..)Rules
 CFLAGS-kaio_suspend.c = -fexceptions
 -CFLAGS-kaio_clock_nanosleep.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-kaio_librt-cancellation.c = -fasynchronous-unwind-tables
 LDFLAGS-rtkaio.so = -Wl,-soname=lib$(libprefix)rt.so$(librt.so-version) \
@@ -88,9 +85,6 @@
 else
 $(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.a $(static-thread-library)
 endif
 -ifeq (yes,$(build-bounded))
 -$(tests:%=$(objpfx)%-bp): $(objpfx)librtkaio_b.a $(bounded-thread-library)
 -endif
 tst-mqueue7-ARGS = -- $(built-program-file)
 diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/Versions glibc-2.21-59-gd35273f/rtkaio/Versions
 --- glibc-2.21-59-gd35273f.mod/rtkaio/Versions	2015-02-11 13:00:55.118400459 -0500
 +++ glibc-2.21-59-gd35273f/rtkaio/Versions	2015-02-11 22:36:11.974051389 -0500
@@ -6,7 +6,7 @@
     aio_suspend64; aio_write; aio_write64; lio_listio; lio_listio64;
   }
   GLIBC_2.2 {
 -    # c*
 +    # These have moved to libc and are still here only for compatibility.
     clock_getres; clock_gettime; clock_settime; clock_getcpuclockid;
     clock_nanosleep;
--- a/glibc-rtkaio-libof.patch
+++ b/glibc-rtkaio-libof.patch
@ -1,26 +0,0 @@
 diff -pruN glibc-2.21-649-gae5eae7/rtkaio/Makefile glibc-2.21-649-gae5eae7.new/rtkaio/Makefile
 --- glibc-2.21-649-gae5eae7/rtkaio/Makefile	2015-07-27 22:57:05.742601066 +0530
 +++ glibc-2.21-649-gae5eae7.new/rtkaio/Makefile	2015-07-27 23:33:09.892874337 +0530
@@ -66,7 +66,9 @@ CFLAGS-kaio_librt-cancellation.c = -fasy
 LDFLAGS-rtkaio.so = -Wl,-soname=lib$(libprefix)rt.so$(librt.so-version) \
 		    -Wl,--enable-new-dtags,-z,nodelete
 -CPPFLAGS-librtkaio += -DIS_IN_librt=1 -I$(..)rt
 +# Resort to this ugliness of undefining and defining MODULE_NAME because
 +# setting libof-<> to librt has many more side-effects that we want to avoid.
 +CPPFLAGS-librtkaio += -I$(..)rt -UMODULE_NAME -DMODULE_NAME=librt
 rpath-dirs := $(patsubst rt,rtkaio,$(rpath-dirs))
 diff -pruN glibc-2.21-649-gae5eae7/rtkaio/sysdeps/unix/sysv/linux/syscalls.list glibc-2.21-649-gae5eae7.new/rtkaio/sysdeps/unix/sysv/linux/syscalls.list
 --- glibc-2.21-649-gae5eae7/rtkaio/sysdeps/unix/sysv/linux/syscalls.list	2015-07-27 22:47:23.073776396 +0530
 +++ glibc-2.21-649-gae5eae7.new/rtkaio/sysdeps/unix/sysv/linux/syscalls.list	2015-07-27 23:33:09.892874337 +0530
@@ -1,5 +1,5 @@
 # File name		Caller	Syscall name	Args		Strong name		Weak names
 -kaio_mq_timedsend	-	mq_timedsend	Ci:ipiip	__GI_mq_timedsend	mq_timedsend
 -kaio_mq_timedreceive	-	mq_timedreceive	Ci:ipipp	__GI_mq_timedreceive	mq_timedreceive
 -kaio_mq_setattr		-	mq_getsetattr	i:ipp		__GI_mq_setattr		mq_setattr
 +kaio_mq_timedsend	-	mq_timedsend	Ci:ipiip	__mq_timedsend	mq_timedsend
 +kaio_mq_timedreceive	-	mq_timedreceive	Ci:ipipp	__mq_timedreceive	mq_timedreceive
 +kaio_mq_setattr	-	mq_getsetattr	i:ipp	mq_setattr
--- a/glibc-rtkaio.patch
+++ b/glibc-rtkaio.patch
--- a/glibc.spec
+++ b/glibc.spec
@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.22-70-gd5dff79
 %define glibcversion 2.22.90
-%define glibcrelease 3%{?dist}
+%define glibcrelease 4%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@ -11,21 +11,50 @@
 # glibc_release_url is only defined when we have a release tarball.
 # % define glibc_release_url http://ftp.gnu.org/gnu/glibc/
 ##############################################################################
-# If run_glibc_tests is zero then tests are not run for the build.
+# We support hte following options:
-# You must always set run_glibc_tests to one for production builds.
+# --with/--without,
-%define run_glibc_tests 1
+# * testsuite - Running the testsuite.
-%define build_benchtests 1
+# * benchtests - Running and building benchmark subpackage.
-# Run valgrind test to ensure compatibility.
+# * bootstrap - Bootstrapping the package.
-%ifarch %{ix86} x86_64 ppc ppc64le s390x armv7hl aarch64
+# * werror - Build with -Werror
-%define run_valgrind_tests 1
+# * docs - Build with documentation and the required dependencies.
-%endif
+# * valgrind - Run smoke tests with valgrind to verify dynamic loader.
-# Disable -Werror in builds for these architectures
+#
-%ifarch s390x
+# You must always run the testsuite for production builds.
-%define disable_werror 1
+# Default: Always run the testsuite.
-%endif
+%bcond_without testsuite
-# Disable -Werror if we're bootstrapping
+# Default: Always build the benchtests.
-%{!?_with_bootstrap: %global disable_werror 1}
+%bcond_without benchtests
 # Default: Not bootstrapping.
 %bcond_with bootstrap
 # Default: Enable using -Werror
 %bcond_without werror
 # Default: Always build documentation.
 %bcond_without docs
 # Default: Always run valgrind tests
 %bcond_without valgrind
 # Run a valgrind smoke test to ensure that the release is compatible and
 # doesn't any new feature that might cause valgrind to abort.
 %if %{with valgrind}
 %ifarch s390
 # There is no valgrind support for 31-bit s390.
 %undefine with_valgrind
 %endif
 %endif
 %if %{with werror}
 %ifarch s390x
 # The 64-bit s390x builds are not -Werror clean yet.
 %undefine with_werror
 %endif
 %endif
 %if %{with bootstrap}
 # Disable benchtests, -Werror, docs, and valgrind if we're bootstrapping
 %undefine with_benchtests
 %undefine with_werror
 %undefine with_docs
 %undefine with_valgrind
 %endif
 ##############################################################################
 # Auxiliary arches are those arches that can be built in addition
 # to the core supported arches. You either install an auxarch or
@ -63,12 +92,6 @@
 %define buildpower6 0
 %endif
 ##############################################################################
 # We build librtkaio for all rtkaioarches. The library is installed into
 # a distinct subdirectory in the lib dir. This define enables the rtkaio
 # add-on during the build. Upstream does not have rtkaio and it is provided
 # strictly as part of our builds.
 %define rtkaioarches %{ix86} x86_64 ppc %{power64} s390 s390x
 ##############################################################################
 # Any architecture/kernel combination that supports running 32-bit and 64-bit
 # code in userspace is considered a biarch arch.
 %define biarcharches %{ix86} x86_64 ppc %{power64} s390 s390x
@ -179,16 +202,6 @@ Patch0034: glibc-fedora-elf-init-hidden_undef.patch
 # Support mangling and demangling null pointers.
 Patch0037: glibc-rh952799.patch
 # rtkaio and c_stubs.  Note that despite the numbering, these are always
 # applied first.
 Patch0038: glibc-rtkaio.patch
 Patch0039: glibc-c_stubs.patch
 # Remove non-ELF support in rtkaio
 Patch0040: glibc-rh731833-rtkaio.patch
 Patch0041: glibc-rh731833-rtkaio-2.patch
 Patch0042: glibc-rh970865.patch
 # ARM: Accept that some objects marked hard ABI are now not because of a
 #      binutils bug.
 Patch0044: glibc-rh1009145.patch
@ -205,11 +218,6 @@ Patch0052: glibc-disable-rwlock-elision.patch
 # symlink to it.
 Patch0053: glibc-cs-path.patch
 # Remove the clock_* functions and use the ones in libc like librt does.
 Patch0054: glibc-rtkaio-clock.patch
 Patch0055: glibc-rtkaio-libof.patch
 ##############################################################################
 #
 # Patches from upstream
@ -286,12 +294,23 @@ Requires(pre): basesystem, libgcc
 # This is for building auxiliary programs like memusage, nscd
 # For initial glibc bootstraps it can be commented out
-BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3
+BuildRequires: gd-devel libpng-devel zlib-devel
-BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel
+%if %{with docs}
 # Removing texinfo will cause check-safety.sh test to fail because it seems to
 # trigger documentation generation based on dependencies.  We need to fix this
 # upstream in some way that doesn't depend on generating docs to validate the
 # texinfo.  I expect it's simply the wrong dependency for that target.
 BuildRequires: texinfo
 %endif
 %if %{without bootstrap}
 BuildRequires: libselinux-devel >= 1.33.4-3
 BuildRequires: nss-devel
 %endif
 BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext
 BuildRequires: /bin/ps, /bin/kill, /bin/awk
 BuildRequires: systemtap-sdt-devel
-%if 0%{?run_valgrind_tests}
+%if %{with valgrind}
 BuildRequires: /usr/bin/valgrind
 %endif
@ -351,8 +370,9 @@ BuildRequires: elfutils >= 0.72
 BuildRequires: rpm >= 4.2-0.56
 %endif
-# The testsuite builds static C++ binaries that require a static
+# The testsuite builds static C++ binaries that require a C++ compiler
-# C++ runtime from libstdc++-static.
+# and static C++ runtime from libstdc++-static.
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-static
 # Filter out all GLIBC_PRIVATE symbols since they are internal to
@ -475,7 +495,10 @@ libraries, as well as national language (locale) support.
 Summary: A Name Service Caching Daemon (nscd).
 Group: System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
-Requires: libselinux >= 1.17.10-1, audit-libs >= 1.1.3
+%if %{with bootstrap}
 Requires: libselinux >= 1.17.10-1
 %endif
 Requires: audit-libs >= 1.1.3
 Requires(pre): /usr/sbin/useradd, coreutils
 Requires(post): systemd
 Requires(preun): systemd
@ -550,7 +573,7 @@ package or when debugging this package.
 %endif # %{debuginfocommonarches}
 %endif # 0%{?_enable_debug_packages}
-%if %{build_benchtests}
+%if %{with benchtests}
 %package benchtests
 Summary: Benchmarking binaries and scripts for %{name}
 Group: Development/Debug
@ -565,11 +588,7 @@ microbenchmark tests on the system.
 %prep
 %setup -q -n %{glibcsrcdir}
-# Patch order is important as some patches depend on other patches and
+# Patch order matters.
 # therefore the order must not be changed.  First two are rtkaio and c_stubs;
 # we maintain this only in Fedora.
 %patch0038 -p1
 %patch0039 -p1
 %patch0001 -p1
 %patch0003 -p1
 %patch0004 -p1
@ -594,9 +613,6 @@ microbenchmark tests on the system.
 %patch0033 -p1
 %patch0034 -p1
 %patch0037 -p1
 %patch0040 -p1
 %patch0041 -p1
 %patch0042 -p1
 %patch0044 -p1
 %patch0046 -p1
 %patch2031 -p1
@ -605,7 +621,6 @@ microbenchmark tests on the system.
 %patch2034 -p1
 %patch0052 -p1
 %patch0053 -p1
 %patch0054 -p1
 %patch3002 -p1
 %patch2035 -p1
@ -614,7 +629,6 @@ microbenchmark tests on the system.
 %patch2103 -p1
 %patch2104 -p1
 %patch2105 -p1
 %patch0055 -p1
 ##############################################################################
 # %%prep - Additional prep required...
@ -725,10 +739,7 @@ EnableKernel="--enable-kernel=%{enablekernel}"
 # Save the used compiler and options into the file "Gcc" for use later
 # by %%install.
 echo "$GCC" > Gcc
-AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(nptl\|rtkaio\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
+AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(nptl\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
 %ifarch %{rtkaioarches}
 AddOns=,rtkaio$AddOns
 %endif
 ##############################################################################
 # build()
@ -764,10 +775,16 @@ build()
 %ifarch %{lock_elision_arches}
 		--enable-lock-elision \
 %endif
-%if 0%{?disable_werror}
+%if %{without werror}
-               --disable-werror \
+		--disable-werror \
 %endif
 		--disable-profile \
 %if %{with bootstrap}
 		--without-selinux \
 		--disable-nss-crypt ||
 %else
 		--enable-nss-crypt ||
 %endif
 		--disable-profile --enable-nss-crypt ||
 		{ cat config.log; false; }
 	make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" %{silentrules}
@ -860,20 +877,6 @@ make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT \
 popd
 %endif
 ##############################################################################
 # Install rtkaio libraries.
 ##############################################################################
 %ifarch %{rtkaioarches}
 librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
 rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.*
 rm -f $RPM_BUILD_ROOT%{_libdir}/librt.so.*
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio
 mv $RPM_BUILD_ROOT/%{_lib}/librtkaio-*.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/
 rm -f $RPM_BUILD_ROOT/%{_lib}/$librtso
 ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$librtso
 ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$librtso
 %endif
 # install_different:
 #	Install all core libraries into DESTDIR/SUBDIR. Either the file is
 #	installed as a copy or a symlink to the default install (if it is the
@ -919,18 +922,6 @@ install_different()
 		dlib=$libdestdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
 		ln -sf $libbaseso $dlib
 	done
 %ifarch %{rtkaioarches}
 	local rtkdestdir="$RPM_BUILD_ROOT/%{_lib}/rtkaio/$subdir"
 	local librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
 	mkdir -p $rtkdestdir
 	librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
 	if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then
 		ln -s %{nosegneg_subdir_up}/$librtkaioso $rtkdestdir/$librtkaioso
 	else
 		cp -a rtkaio/librtkaio.so $rtkdestdir/$librtkaioso
 	fi
 	ln -sf $librtkaioso $rtkdestdir/$librtso
 %endif
 }
 ##############################################################################
@ -965,14 +956,6 @@ pushd ${destdir}/%{power6_legacy}
 ln -sf %{power6_legacy_up}/%{power6_subdir}/*.so .
 cp -a %{power6_legacy_up}/%{power6_subdir}/*.so.* .
 popd
 %ifarch %{rtkaioarches}
 destdir=${destdir}/rtkaio
 mkdir -p ${destdir}/%{power6_legacy}
 pushd ${destdir}/%{power6_legacy}
 ln -sf ../power6/*.so .
 cp -a ../power6/*.so.* .
 popd
 %endif
 popd
 %endif # %{buildpower6}
@ -1000,6 +983,7 @@ rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1
 # Install info files
 ##############################################################################
 %if %{with docs}
 # Move the info files if glibc installed them into the wrong location.
 if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then
  mkdir -p $RPM_BUILD_ROOT%{_infodir}
@ -1009,6 +993,7 @@ fi
 # Compress all of the info files.
 gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc*
 %endif
 ##############################################################################
 # Install locale files
@ -1143,7 +1128,10 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/*_p.a
  # all directories in (and including) /usr/share/locale.
  find $RPM_BUILD_ROOT -type d \
       \( -path '*%{_prefix}/share/locale' -prune -o \
-       \( -path '*%{_prefix}/share/*' ! -path '*%{_infodir}' -o \
+       \( -path '*%{_prefix}/share/*' \
 %if %{with docs}
 	! -path '*%{_infodir}' -o \
 %endif
 	  -path "*%{_prefix}/include/*" \
       \) -printf "%%%%dir /%%P\n" \)
 } | {
@ -1179,8 +1167,10 @@ for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do
      -i $i
 done
 %if %{with docs}
 # Put the info files into the devel file list.
 grep '%{_infodir}' < rpm.filelist | grep -v '%{_infodir}/dir' > devel.filelist
 %endif
 # The glibc-headers package includes only common files which are identical
 # across all multilib packages. We must keep gnu/stubs.h and gnu/lib-names.h
@ -1198,7 +1188,10 @@ grep '%{_prefix}/include' < rpm.filelist \
 # the core glibc package.
 sed -i -e '\|%{_libdir}/lib.*_p.a|d' \
       -e '\|%{_prefix}/include|d' \
-       -e '\|%{_infodir}|d' rpm.filelist
+%if %{with docs}
       -e '\|%{_infodir}|d' \
 %endif
 	rpm.filelist
 # Put some static files into the devel package.
 grep '%{_libdir}/lib.*\.a' < rpm.filelist \
@ -1327,12 +1320,12 @@ ln -sf /%{_lib}/ld64.so.1 $RPM_BUILD_ROOT/lib/ld64.so.1
 ln -sf /lib/ld-linux-armhf.so.3 $RPM_BUILD_ROOT/lib/ld-linux.so.3
 %endif
 %if %{with benchtests}
 # Build benchmark binaries.  Ignore the output of the benchmark runs.
 pushd build-%{target}
 make BENCH_DURATION=1 bench-build
 popd
 %if %{build_benchtests}
 # Copy over benchmark binaries.
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/libexec/glibc-benchtests
 cp $(find build-%{target}/benchtests -type f -executable) $RPM_BUILD_ROOT%{_prefix}/libexec/glibc-benchtests/
@ -1404,7 +1397,11 @@ find_debuginfo_args="$find_debuginfo_args \
 	-p '.*/(sbin|libexec)/.*' \
 	-o debuginfocommon.filelist \
 	-l rpm.filelist \
 %if %{with benchtests}
 	-l nosegneg.filelist -l benchtests.filelist"
 %else
 	-l nosegneg.filelist"
 %endif
 %endif
 eval /usr/lib/rpm/find-debuginfo.sh \
 	"$find_debuginfo_args" \
@ -1497,9 +1494,11 @@ exclude_common_dirs debuginfo.filelist
 %endif # 0%{?_enable_debug_packages}
 %if %{with docs}
 # Remove the `dir' info-heirarchy file which will be maintained
 # by the system as it adds info files to the install.
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %endif
 %ifarch %{auxarches}
@ -1532,7 +1531,7 @@ truncate -s 0 $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache
 # Run the glibc testsuite
 ##############################################################################
 %check
-%if %{run_glibc_tests}
+%if %{with testsuite}
 # Run the glibc tests. If any tests fail to build we exit %check with an error
 # of 1, otherwise we print the test failure list and the failed test output
@ -1627,7 +1626,7 @@ echo ====================PLT RELOCS LIBC.SO==============
 readelf -Wr $RPM_BUILD_ROOT/%{_lib}/libc-*.so | sed -n -e "$PLTCMD"
 echo ====================PLT RELOCS END==================
-%if 0%{?run_valgrind_tests}
+%if %{with valgrind}
 # Finally, check if valgrind runs with the new glibc.
 # We want to fail building if valgrind is not able to run with this glibc so
 # that we can then coordinate with valgrind to get it fixed before we update
@ -1675,8 +1674,10 @@ if posix.access("/etc/ld.so.cache") then
  end
 end
 %if %{with docs}
 %post devel
 /sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
 %endif
 %pre headers
 # this used to be a link and it is causing nightmares now
@ -1684,10 +1685,12 @@ if [ -L %{_prefix}/include/scsi ] ; then
  rm -f %{_prefix}/include/scsi
 fi
 %if %{with docs}
 %preun devel
 if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 %endif
 %post utils -p /sbin/ldconfig
@ -1723,24 +1726,13 @@ rm -f *.filelist*
 %files -f rpm.filelist
 %defattr(-,root,root)
 %dir %{_prefix}/%{_lib}/audit
 %ifarch %{rtkaioarches}
 %dir /%{_lib}/rtkaio
 %endif
 %if %{buildxen} && !%{xenpackage}
 %dir /%{_lib}/%{nosegneg_subdir_base}
 %dir /%{_lib}/%{nosegneg_subdir}
 %ifarch %{rtkaioarches}
 %dir /%{_lib}/rtkaio/%{nosegneg_subdir_base}
 %dir /%{_lib}/rtkaio/%{nosegneg_subdir}
 %endif
 %endif
 %if %{buildpower6}
 %dir /%{_lib}/power6
 %dir /%{_lib}/power6x
 %ifarch %{rtkaioarches}
 %dir /%{_lib}/rtkaio/power6
 %dir /%{_lib}/rtkaio/power6x
 %endif
 %endif
 %ifarch s390x
 /lib/ld64.so.1
@ -1759,6 +1751,7 @@ rm -f *.filelist*
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/gai.conf
 %doc README NEWS INSTALL BUGS PROJECTS CONFORMANCE elf/rtld-debugger-interface.txt
 # If rpm doesn't support %license, then use %doc instead.
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LIB LICENSES
 %doc hesiod/README.hesiod
@ -1824,12 +1817,24 @@ rm -f *.filelist*
 %endif
 %endif
-%if %{build_benchtests}
+%if %{with benchtests}
 %files benchtests -f benchtests.filelist
 %defattr(-,root,root)
 %endif
 %changelog
 * Thu Aug 27 2015 Carlos O'Donell <carlos@redhat.com> - 2.22.90-4
 - Build require gcc-c++ for the C++ tests.
 - Support --without testsuite option to disable testing after build.
 - Support --without benchtests option to disable microbenchmarks.
 - Update --with bootstrap to disable benchtests, valgrind, documentation,
  selinux, and nss-crypt during bootstrap.
 - Support --without werror to disable building with -Werror.
 - Support --without docs to disable build requirement on texinfo.
 - Support --without valgrind to disable testing with valgrind.
 - Remove c_stubs add-on and enable fuller support for static binaries.
 - Remove librtkaio support (#1227855).
 * Sun Aug 16 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.22.90-3
 - Auto-sync with upstream master.
--- a/15
+++ b/15
@ -1,5 +1,3 @@
 glibc-rtkaio.patch -p1
 glibc-c_stubs.patch -p1
 glibc-fedora-nscd.patch -p1
 glibc-fedora-ldd.patch -p1
 glibc-fedora-ppc-unwind.patch -p1
@ -7,7 +5,6 @@ glibc-rh825061.patch -p1
 glibc-arm-hardfloat-3.patch -p1
 glibc-rh697421.patch -p1
 glibc-fedora-include-bits-ldbl.patch -p1
 glibc-rh757881.patch -p1
 glibc-fedora-linux-tcsetattr.patch -p1
 glibc-rh741105.patch -p1
 glibc-fedora-nptl-linklibc.patch -p1
@ -18,7 +15,6 @@ glibc-fedora-manual-dircategory.patch -p1
 glibc-rh827510.patch -p1
 glibc-fedora-locarchive.patch -p1
 glibc-fedora-streams-rh436349.patch -p1
 glibc-rh841787.patch -p1
 glibc-rh819430.patch -p1
 glibc-fedora-localedata-rh61908.patch -p1
 glibc-fedora-uname-getrlimit.patch -p1
@ -26,9 +22,6 @@ glibc-fedora-__libc_multiple_libcs.patch -p1
 glibc-fedora-elf-ORIGIN.patch -p1
 glibc-fedora-elf-init-hidden_undef.patch -p1
 glibc-rh952799.patch -p1
 glibc-rh731833-rtkaio.patch -p1
 glibc-rh731833-rtkaio-2.patch -p1
 glibc-rh970865.patch -p1
 glibc-rh1009145.patch -p1
 glibc-rh1013801.patch -p1
 glibc-rh1070416.patch -p1
@ -37,8 +30,10 @@ glibc-aarch64-tls-fixes.patch -p1
 glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch -p1
 glibc-disable-rwlock-elision.patch -p1
 glibc-cs-path.patch -p1
 glibc-rtkaio-clock.patch -p1
 glibc-revert-arena-threshold-fix.patch -p1 -R
 glibc-bench-compare.patch -p1
 glibc-bench-build.patch -p1
 glibc-new-condvar.patch -p1
 glibc-rh1238412-remove-duplicate-transliterations.patch -p1
 glibc-rh1238412-addition-and-fixes-for-translit_neutral.patch -p1
 glibc-rh1238412-update-the-translit-files-to-unicode-7.0.0.patch -p1
 glibc-rh1238412-add-translit-rules-for-da-nb-nn-sv-locales.patch -p1
 glibc-rh1238412-unicode-8.0.0-update.patch -p1