- start glibc 2.16 update; bunch of patches needs reevaluation; fails on install

Changed files:
    glibc-crypt-blowfish.patch -> 1.7
    glibc-restore-rpc+nis.patch -> 1.2
    glibc.spec -> 1.961

diff --git a/glibc-crypt-blowfish.patch b/glibc-crypt-blowfish.patch
index c2a2dc4eb506492e1400cb9167e79673e769e475..961a44a77abf12ace2f5620eadabc079f36b6cfe 100644 (file)
--- a/glibc-crypt-blowfish.patch
+++ b/glibc-crypt-blowfish.patch
@@ -763,15 +763,15 @@ Index: crypt/crypt-entry.c
 ===================================================================
 --- crypt/crypt-entry.c.orig
 +++ crypt/crypt-entry.c
-@@ -61,6 +61,8 @@ extern char *__sha256_crypt (const char
+@@ -59,6 +59,8 @@ extern char *__sha256_crypt (const char
  extern char *__sha512_crypt_r (const char *key, const char *salt,
                               char *buffer, int buflen);
  extern char *__sha512_crypt (const char *key, const char *salt);
 +extern char *_crypt_blowfish_rn (const char *key, const char *setting,
-+                               char *output, int size);
- #endif
++                              char *output, int size);
  
  /* Define our magic string to mark salt for MD5 encryption
+    replacement.  This is meant to be the same as for other MD5 based
 @@ -74,6 +76,9 @@ static const char sha256_salt_prefix[] =
  /* Magic string for SHA512 encryption.  */
  static const char sha512_salt_prefix[] = "$6$";

diff --git a/glibc-restore-rpc+nis.patch b/glibc-restore-rpc+nis.patch
deleted file mode 100644 (file)
index deb9128..0000000
--- a/glibc-restore-rpc+nis.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- glibc-2.14/nis/Makefile
-+++ glibc-2.14-2/nis/Makefile
-@@ -23,9 +23,9 @@ subdir       := nis
- 
- aux                   := nis_hash
- 
-+headers                       := $(wildcard rpcsvc/*.[hx])
- distribute            := nss-nis.h nss-nisplus.h nis_intern.h Banner \
--                         nisplus-parser.h nis_xdr.h nss \
--                         $(wildcard rpcsvc/*.[hx])
-+                         nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
-@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
- 
- include ../Rules
- 
-+CFLAGS-nis_findserv.c += -fno-strict-aliasing
-+CFLAGS-ypclnt.c += -fno-strict-aliasing
- 
- $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
- $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
---- glibc-2.14/sunrpc/Makefile
-+++ glibc-2.14-2/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
-                                   des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
-                      $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
-           $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
-@@ -152,6 +152,10 @@ CFLAGS-openchild.c = -fexceptions
- 
- CPPFLAGS += -D_RPC_THREAD_SAFE_
- 
-+CFLAGS-clnt_tcp.c += -fno-strict-aliasing
-+CFLAGS-clnt_udp.c += -fno-strict-aliasing
-+CFLAGS-clnt_unix.c += -fno-strict-aliasing
-+
- $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
- $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
- $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
---- glibc-2.14/include/libc-symbols.h
-+++ glibc-2.14-2/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)

diff --git a/glibc.spec b/glibc.spec
index d014ed1a04c1baaf0cb589e75ba0d8fed9c77d38..bb12cb20d230541b23c51ce5a1c63242c53ecc58 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -32,13 +32,13 @@ Summary(ru.UTF-8):  GNU libc версии
 Summary(tr.UTF-8):     GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
-Version:       2.15
-Release:       10
+Version:       2.16.0
+Release:       0.1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 4f9f3b0e780a8c7179a372d34e9452bc
+# Source0-md5: 80b181b02ab249524ec92822c0174cf7
 Source1:       http://ftp.gnu.org/gnu/glibc/%{name}-ports-%{ports_version}.tar.xz
 # Source1-md5: fef73c8b7885b02ec5f7ce8fa00ba30c
 Source2:       nscd.init
@@ -51,7 +51,6 @@ Source6:      %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source8:       nscd.upstart
 Source9:       nscd.tmpfiles
-Patch0:                %{name}-restore-rpc+nis.patch
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -915,21 +914,25 @@ Narzędzie do profilowania zużycia pamięci.
 %prep
 %setup -q -a1
 mv %{name}-ports-%{ports_version} ports
-%patch0 -p1
 
 %patch2 -p1
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+# OBSOLETE?
+#%patch7 -p1
+# NEEDS MISSING INCLUDES
+#%patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
+# CHECK, POSSIBLY UPDATE
+#%patch11 -p1
+# CHECK, LIKELY OBSOLETE
+#%patch12 -p1
 %patch14 -p0
-%patch15 -p1
+# UPDATE ME
+#%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
@@ -941,20 +944,25 @@ mv %{name}-ports-%{ports_version} ports
 
 %patch25 -p1
 %patch26 -p1
-%patch27 -p1
+# SHOULD BE OBSOLETE
+#%patch27 -p1
 %patch29 -p1
 %patch30 -p0
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
 
-%patch35 -p1
+# SHOULD BE OBSOLETE
+#%patch35 -p1
 
-%patch37 -p1
+# SHOULD BE OBSOLETE
+#%patch37 -p1
 %patch38 -p1
 
-%patch40 -p1
-%patch41 -p1
+# SHOULD BE OBSOLETE
+#%patch40 -p1
+# SHOULD BE OBSOLETE
+#%patch41 -p1
 %patch42 -p1
 
 # cleanup backups after patching
@@ -999,6 +1007,7 @@ AWK="gawk" \
        --with-headers=%{_includedir} \
        --with%{!?with_selinux:out}-selinux \
        --with-tls \
+       --enable-obsolete-rpc \
        --enable-add-ons=$AddOns \
 %if "%{pld_release}" != "ti"
        --enable-nss-crypt \