packages: glibc/glibc-crypt-blowfish.patch, glibc/glibc.spec, glibc/glibc-r...

[arekm]

Author: arekm                        Date: Sat Jun 30 21:14:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- start glibc 2.16 update; bunch of patches needs reevaluation; fails on install

---- Files affected:
packages/glibc:
   glibc-crypt-blowfish.patch (1.6 -> 1.7) , glibc.spec (1.960 -> 1.961) , glibc-restore-rpc+nis.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/glibc/glibc-crypt-blowfish.patch
diff -u packages/glibc/glibc-crypt-blowfish.patch:1.6 packages/glibc/glibc-crypt-blowfish.patch:1.7
--- packages/glibc/glibc-crypt-blowfish.patch:1.6	Wed Jun 22 22:22:56 2011
+++ packages/glibc/glibc-crypt-blowfish.patch	Sat Jun 30 23:13:57 2012
@@ -763,15 +763,15 @@
 ===================================================================
 --- 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$";

================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.960 packages/glibc/glibc.spec:1.961
--- packages/glibc/glibc.spec:1.960	Thu Apr 19 17:11:23 2012
+++ packages/glibc/glibc.spec	Sat Jun 30 23:13:57 2012
@@ -33,13 +33,13 @@
 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
@@ -52,7 +52,6 @@
 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
@@ -916,21 +915,25 @@
 %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
@@ -942,20 +945,25 @@
 
 %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
@@ -1000,6 +1008,7 @@
 	--with-headers=%{_includedir} \
 	--with%{!?with_selinux:out}-selinux \
 	--with-tls \
+	--enable-obsolete-rpc \
 	--enable-add-ons=$AddOns \
 %if "%{pld_release}" != "ti"
 	--enable-nss-crypt \
@@ -1803,6 +1812,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.961  2012/06/30 21:13:57  arekm
+- start glibc 2.16 update; bunch of patches needs reevaluation; fails on install
+
 Revision 1.960  2012/04/19 15:11:23  qboosh
 - added dir for bo LC_MESSAGES
 - release 10
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/glibc/glibc-crypt-blowfish.patch?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/packages/glibc/glibc.spec?r1=1.960&r2=1.961