Accepting request 142184 from home:a_jaeger:my-factory-packages

Update to current head

OBS-URL: https://build.opensuse.org/request/show/142184
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=228
This commit is contained in:
Andreas Jaeger 2012-11-21 18:55:43 +00:00 committed by Git OBS Bridge
parent 2b52d0268e
commit 25a49c19bd
5 changed files with 30 additions and 19 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca5cd6de3eb414d7114c9ed966ed7f4afcfd523eb5e515b5b0528533dd397a37
size 11120836

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06e746e24a1b764fe87c9143db6666fad6a0c1135c400f56f63a8e243880d5fd
size 11138300

View File

@ -1,20 +1,20 @@
Index: glibc-2.15/sunrpc/bindrsvprt.c
Index: glibc-2.16.90/sunrpc/bindrsvprt.c
===================================================================
--- glibc-2.15.orig/sunrpc/bindrsvprt.c
+++ glibc-2.15/sunrpc/bindrsvprt.c
@@ -29,28 +29,108 @@
--- glibc-2.16.90.orig/sunrpc/bindrsvprt.c
+++ glibc-2.16.90/sunrpc/bindrsvprt.c
@@ -29,6 +29,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <stdio.h>
+#include <ctype.h>
#include <errno.h>
+#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -42,21 +45,102 @@
*/
__libc_lock_define_initialized (static, lock);
+#define STARTPORT 600
+#define LOWPORT 512
@ -38,6 +38,7 @@ Index: glibc-2.15/sunrpc/bindrsvprt.c
+ size_t buflen = 0;
+ int size = 0, ptr = 0;
+
+ __libc_lock_lock (lock);
+ blacklist_read = 1;
+
+ fp = fopen ("/etc/bindresvport.blacklist", "r");
@ -93,7 +94,10 @@ Index: glibc-2.15/sunrpc/bindrsvprt.c
+ free (buf);
+
+ list_size = ptr;
+
+ __libc_lock_unlock (lock);
+}
+
+
/*
* Bind a socket to a privileged IP port
@ -116,7 +120,7 @@ Index: glibc-2.15/sunrpc/bindrsvprt.c
if (sin == (struct sockaddr_in *) 0)
{
@@ -69,6 +149,7 @@ bindresvport (int sd, struct sockaddr_in
@@ -75,6 +159,7 @@ bindresvport (int sd, struct sockaddr_in
port = (__getpid () % NPORTS) + STARTPORT;
}
@ -124,7 +128,7 @@ Index: glibc-2.15/sunrpc/bindrsvprt.c
/* Initialize to make gcc happy. */
int res = -1;
@@ -77,12 +158,22 @@ bindresvport (int sd, struct sockaddr_in
@@ -86,12 +171,22 @@ bindresvport (int sd, struct sockaddr_in
again:
for (i = 0; i < nports; ++i)
{

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Nov 20 08:06:49 UTC 2012 - aj@suse.de
- Update to f59cba71d848:
* Various bug fixes
* Add new locales szl_PL, ayc_PE, nhn_MX, doi_IN, mni_IN, sat_IN.
* Remove patch glibc-compiled-binaries.diff since getconf can not be
cross-compiled
* Refresh patch glibc-2.3.90-bindresvport.blacklist.diff
-------------------------------------------------------------------
Sun Nov 11 09:54:43 UTC 2012 - aj@suse.de

View File

@ -122,7 +122,7 @@ Provides: ld-linux.so.3(GLIBC_2.4)
Version: 2.16.90
Release: 0
%define glibc_major_version 2.16.90
%define git_id 7e2bd01fcf3c
%define git_id f59cba71d848
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
@ -197,8 +197,6 @@ Patch13: glibc-2.3.2.no_archive.diff
Patch14: glibc-2.3.90-bindresvport.blacklist.diff
# PATCH-FIX-OPENSUSE prefer -lang rpm packages
Patch15: glibc-2.3.90-langpackdir.diff
# PATCH-FIX-OPENSUSE add option --enable-runbinaries to disable running of compiled binaries
Patch17: glibc-compiled-binaries.diff
# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
Patch18: glibc-cpusetsize.diff
# PATCH-FIX-OPENSUSE Allow ARM binaries with old linker path to run - aj@suse.de
@ -456,7 +454,6 @@ rm nscd/s-stamp
%patch13 -p1
%patch14 -p1
%patch15 -p1
#%patch17 -p1
%patch18 -p1
%patch21 -p1
@ -680,11 +677,11 @@ configure_and_build_glibc() {
%endif
; do
configure_and_build_glibc $pcpu "$BuildFlags -mcpu=$pcpu" "$add_ons" \
--with-cpu=$pcpu --disable-runbinaries
--with-cpu=$pcpu
done
# Eventually, special Cell variant:
%if %{powerpc_optimize_cpu_cell}
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons" --disable-runbinaries
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons"
%endif
%endif # optimize_power