forked from pool/glibc
Accepting request 18871 from Base:System
Copy from Base:System/glibc based on submit request 18871 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18871 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=8
This commit is contained in:
parent
8c7de03fe6
commit
1f65f4bc21
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c07cb9113c217c4e6b60994ce065b656a0e39440108f3054b0e3c4c4156b4383
|
|
||||||
size 15594411
|
|
3
glibc-2.10.1-aa152ec6ad.tar.bz2
Normal file
3
glibc-2.10.1-aa152ec6ad.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:471795a00773501701112c90b7d0f4925e83d9922d9c300ad7c7c39804678326
|
||||||
|
size 15601511
|
@ -16,7 +16,7 @@ Index: nscd/aicache.c
|
|||||||
+ dh->usable = false;
|
+ dh->usable = false;
|
||||||
+ dataset = NULL;
|
+ dataset = NULL;
|
||||||
+ }
|
+ }
|
||||||
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) == NULL)
|
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
|
||||||
{
|
{
|
||||||
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
||||||
dataset->head.recsize = total;
|
dataset->head.recsize = total;
|
||||||
@ -38,7 +38,7 @@ Index: nscd/grpcache.c
|
|||||||
+ if (dh != NULL)
|
+ if (dh != NULL)
|
||||||
+ dh->usable = false;
|
+ dh->usable = false;
|
||||||
+ }
|
+ }
|
||||||
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) == NULL)
|
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
|
||||||
{
|
{
|
||||||
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
||||||
dataset->head.recsize = total;
|
dataset->head.recsize = total;
|
||||||
@ -60,7 +60,7 @@ Index: nscd/hstcache.c
|
|||||||
+ if (dh != NULL)
|
+ if (dh != NULL)
|
||||||
+ dh->usable = false;
|
+ dh->usable = false;
|
||||||
+ }
|
+ }
|
||||||
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) == NULL)
|
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
|
||||||
{
|
{
|
||||||
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
||||||
dataset->head.recsize = total;
|
dataset->head.recsize = total;
|
||||||
@ -82,7 +82,7 @@ Index: nscd/initgrcache.c
|
|||||||
+ if (dh != NULL)
|
+ if (dh != NULL)
|
||||||
+ dh->usable = false;
|
+ dh->usable = false;
|
||||||
+ }
|
+ }
|
||||||
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) == NULL)
|
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
|
||||||
{
|
{
|
||||||
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
||||||
dataset->head.recsize = total;
|
dataset->head.recsize = total;
|
||||||
@ -104,7 +104,7 @@ Index: nscd/pwdcache.c
|
|||||||
+ if (dh != NULL)
|
+ if (dh != NULL)
|
||||||
+ dh->usable = false;
|
+ dh->usable = false;
|
||||||
+ }
|
+ }
|
||||||
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) == NULL)
|
+ else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
|
||||||
{
|
{
|
||||||
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
|
||||||
dataset->head.recsize = total;
|
dataset->head.recsize = total;
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
||||||
|
|
||||||
|
- make patch0 usage consistent
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 20 19:02:31 CEST 2009 - pbaudis@suse.cz
|
||||||
|
|
||||||
|
- Update to glibc-2.10.1-aa152ec6ad of release/2.10/master branch
|
||||||
|
(Still the same source is used for glibc-ports.) - random minor fixes
|
||||||
|
* REVERTED invalid fix of broken locking within nscd [bnc#510788]
|
||||||
|
- Fix nscd handling of zero negative timeout for some databases
|
||||||
|
[bnc#523154,bnc#510788]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 17 01:14:16 CEST 2009 - pbaudis@suse.cz
|
Fri Jul 17 01:14:16 CEST 2009 - pbaudis@suse.cz
|
||||||
|
|
||||||
|
@ -69,13 +69,13 @@ Obsoletes: glibc-32bit
|
|||||||
Provides: rtld(GNU_HASH)
|
Provides: rtld(GNU_HASH)
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 2.10.1
|
Version: 2.10.1
|
||||||
Release: 5
|
Release: 6
|
||||||
Url: http://www.gnu.org/software/libc/libc.html
|
Url: http://www.gnu.org/software/libc/libc.html
|
||||||
PreReq: filesystem
|
PreReq: filesystem
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
# The glibc source comes from http://repo.or.cz/w/glibc/pb-stable.git
|
# The glibc source comes from http://repo.or.cz/w/glibc/pb-stable.git
|
||||||
# glibc-2.10-branch.
|
# glibc-2.10-branch.
|
||||||
Source: glibc-%{version}-4253a1e0b2.tar.bz2
|
Source: glibc-%{version}-aa152ec6ad.tar.bz2
|
||||||
Source2: glibc-ports-%{version}-2b2b217196.tar.bz2
|
Source2: glibc-ports-%{version}-2b2b217196.tar.bz2
|
||||||
Source3: noversion.tar.bz2
|
Source3: noversion.tar.bz2
|
||||||
Source4: manpages.tar.bz2
|
Source4: manpages.tar.bz2
|
||||||
@ -294,7 +294,7 @@ versions of your software.
|
|||||||
# any other leave out ports
|
# any other leave out ports
|
||||||
%setup -n glibc-%{version} -q -a 3 -a 4 -a 14
|
%setup -n glibc-%{version} -q -a 3 -a 4 -a 14
|
||||||
%endif
|
%endif
|
||||||
%patch
|
%patch0
|
||||||
# libNoVersion part is only active on ix86
|
# libNoVersion part is only active on ix86
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
|
Loading…
Reference in New Issue
Block a user