- added format patch (to build with -Werror=format-security)

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index e8c3f8e48bb4a8691eaecb06e9cc7c6152de29f9..b3cae4a7220ae29d90b820a5e83ae8a62ef40cc7 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - --enable-systemtap
 # - look at locale fixes/updates in bugzilla
 # - no more chicken-egg problem (postshell is no more dynamically linked with libc), remove SONAME symlinks? see files section.
 # [OLD]
@@ -34,7 +35,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}.0
-Release:       0.1
+Release:       2
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -59,11 +60,11 @@ Patch3:             %{name}-crypt-blowfish.patch
 Patch4:                %{name}-sotruss-sh.patch
 Patch5:                %{name}-sparc-softfp-gcc.patch
 Patch6:                %{name}-paths.patch
-Patch7:                %{name}-no_opt_override.patch
+Patch7:                1070_all_glibc-fadvise64_64.patch
 Patch8:                %{name}-missing-nls.patch
 Patch9:                %{name}-java-libc-wait.patch
 Patch10:       %{name}-info.patch
-Patch11:       %{name}-no_debuggable_objects.patch
+Patch11:       %{name}-format.patch
 Patch12:       %{name}-rh-bug-769421.patch
 Patch14:       %{name}-sparc-errno_fix.patch
 Patch15:       %{name}-new-charsets.patch
@@ -77,17 +78,15 @@ Patch22:    %{name}-with-stroke.patch
 Patch23:       %{name}-pt_pax.patch
 Patch25:       %{name}-cv_gnu89_inline.patch
 Patch26:       %{name}-posix-sh.patch
-Patch27:       %{name}-i686.patch
+
 Patch29:       %{name}-arm-alignment-fix.patch
 Patch30:       %{name}-bug-12492.patch
 Patch31:       %{name}-origin.patch
 Patch32:       %{name}-Os-fail-workaround.patch
 Patch33:       0020_all_glibc-tweak-rfc1918-lookup.patch
-Patch35:       0055_all_glibc-2.12-static-shared-getpagesize.patch
-Patch37:       0061_all_glibc-2.13-static-memset.patch
+
 Patch38:       1055_all_glibc-resolv-dynamic.patch
-Patch40:       %{name}-bad-fix.patch
-Patch41:       glibc-bug-13618.patch
+
 Patch42:       %{name}-pr13013.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
@@ -141,6 +140,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                filterout_ld            (-Wl,)?-[sS] (-Wl,)?--strip.*
 # avoid -D_FORTIFY_SOURCE=X
 %define                filterout_cpp           -D_FORTIFY_SOURCE=[0-9]+
+%define                filterout_c             (-Wp,)?-D_FORTIFY_SOURCE=[0-9]+ -fstack-protector(-all)?
 
 %define                specflags_sparcv9       -mcpu=ultrasparc -mvis -fcall-used-g6
 %define                specflags_sparc64       -mcpu=ultrasparc -mvis -fcall-used-g6
@@ -921,15 +921,12 @@ mv %{name}-ports-%{ports_version} ports
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-# OBSOLETE?
-#%patch7 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-# CHECK, POSSIBLY UPDATE
-#%patch11 -p1
-# CHECK, LIKELY OBSOLETE
-#%patch12 -p1
+%patch11 -p1
+%patch12 -p1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
@@ -943,25 +940,15 @@ mv %{name}-ports-%{ports_version} ports
 
 %patch25 -p1
 %patch26 -p1
-# SHOULD BE OBSOLETE
-#%patch27 -p1
+
 %patch29 -p1
 %patch30 -p0
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
 
-# SHOULD BE OBSOLETE
-#%patch35 -p1
-
-# SHOULD BE OBSOLETE
-#%patch37 -p1
 %patch38 -p1
 
-# SHOULD BE OBSOLETE
-#%patch40 -p1
-# SHOULD BE OBSOLETE
-#%patch41 -p1
 %patch42 -p1
 
 # cleanup backups after patching
@@ -1002,7 +989,6 @@ AWK="gawk" \
 ../%configure \
        --with-binutils=$(pwd)/alt-tools \
        --enable-kernel="%{min_kernel}" \
-       --enable-omitfp \
        --with-headers=%{_includedir} \
        --with%{!?with_selinux:out}-selinux \
        --with-tls \
@@ -1159,9 +1145,11 @@ done
 #   sr@ije (use LANGUAGE=sr_ME@ije/sr_RS@ije) (gnome)
 #
 # To be added when they become supported by glibc:
+#   ach (vlc)
 #   az_IR (gtk+2)
 #   bal (newt,pessulus)
 #   bem (alacarte)
+#   cgg (vlc)
 #   co  (vlc)
 #   fil (stellarium)
 #   frp (xfce, lxlauncher)
@@ -1171,6 +1159,7 @@ done
 #   ilo (kudzu)
 #   io  (gtk+2, gnome, alacarte)
 #   jv  (gmpc, avant-window-navigator, kdesudo)
+#   kmr (vlc)
 #   kok (iso-codes)
 #   lb  (geany,miro,deluge)
 #   man (ccsm; incorrectly named md)
@@ -1202,6 +1191,7 @@ done
 # eo=common
 # es=es_ES
 # eu=eu_ES
+# ff=ff_SN
 # fr=fr_FR
 # fy=fy_NL
 # gez=gez_ET (?)
@@ -1232,7 +1222,7 @@ for i in aa aa@saaho af am an ang ar ar_TN as ast az be@latin be@tarask \
        bg bn bn_IN bo br bs byn ca@valencia ckb crh csb cy de_AT de_CH dv dz en \
        en@boldquot en@quot en@shaw en_AU en_CA en_NZ en_US eo es_AR es_CL es_CO es_CR \
        es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY \
-       es_VE et eu fa fil fo fr_BE fr_CA fr_CH fur fy ga gd gez gu gv ha he \
+       es_VE et eu fa ff fil fo fr_BE fr_CA fr_CH fur fy ga gd gez gu gv ha he \
        hi hne hsb hy ia id ig ik is it_CH iu ka kg kk kl km kn ks ku kw ky la \
        lg li lo lt lv mai mg mi mk ml mn mr ms mt my nds ne nl_BE nn nr nso \
        oc om or pa pap ps pt ps rm ro sa sc se si sid sl so sq sr sr@Latn tl \