From fc7d9af9fdd1715fc321029d9da824b5bc93f84e Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 19 Jul 2002 21:34:07 +0000
Subject: [PATCH] - security fix for overflow in resolver (when using dns for
 networks in   nsswitch.conf - i.e. default configuration!) - removed libpng
 1.2.2 hack - removed %%ghost from dirs - it caused problems: rpm -V
 complained about   missing dirs and permissions weren't set correctly during
 upgrade - release 17

Changed files:
    glibc-nss_dns-overflow.patch -> 1.1
    glibc.spec -> 1.243
---
 glibc-nss_dns-overflow.patch | 13 +++++++++++++
 glibc.spec                   | 13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 glibc-nss_dns-overflow.patch

diff --git a/glibc-nss_dns-overflow.patch b/glibc-nss_dns-overflow.patch
new file mode 100644
index 0000000..284b951
--- /dev/null
+++ b/glibc-nss_dns-overflow.patch
@@ -0,0 +1,13 @@
+--- glibc-2.2.5/resolv/nss_dns/dns-network.c.orig	Fri Jul  6 06:55:39 2001
++++ glibc-2.2.5/resolv/nss_dns/dns-network.c	Fri Jul 19 21:47:19 2002
+@@ -328,7 +328,9 @@
+ 	    }
+ 	  cp += n;
+ 	  *alias_pointer++ = bp;
+-	  bp += strlen (bp) + 1;
++	  n = strlen (bp) + 1;
++	  bp += n;
++	  linebuflen -= n;
+ 	  result->n_addrtype = class == C_IN ? AF_INET : AF_UNSPEC;
+ 	  ++have_answer;
+ 	}
diff --git a/glibc.spec b/glibc.spec
index cf85834..54e11ac 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -13,7 +13,7 @@ Summary(tr):	GNU libc
 Summary(uk):	GNU libc ×ÅÒÓ¦§ 2.2
 Name:		glibc
 Version:	2.2.5
-Release:	16
+Release:	17
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -39,6 +39,7 @@ Patch10:	%{name}-vaargs.patch
 Patch11:	%{name}-getaddrinfo-workaround.patch
 Patch12:	%{name}-use-int-not-arpa.patch
 Patch13:	%{name}-divdi3.patch
+Patch14:	%{name}-nss_dns-overflow.patch
 URL:		http://www.gnu.org/software/libc/
 BuildRequires:	gd-devel >= 2.0.1
 BuildRequires:	gettext-devel >= 0.10.36
@@ -439,14 +440,13 @@ Zabawka.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 chmod +x scripts/cpp
 
 %build
+# avoid stripping ld.so by -s in rpmldflags
 LDFLAGS=" " ; export LDFLAGS
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
-	CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
 %configure2_13 \
 	--enable-add-ons=linuxthreads \
 	--enable-kernel="%{?kernel:%{kernel}}%{!?kernel:%{min_kernel}}" \
@@ -553,7 +553,7 @@ for i in af az bg de_AT el en eo es_ES et eu fi gr he hr hu id is ja_JP.SJIS \
 	if [ ! -d $i ]; then
 		install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
 		lang=`echo $i | sed -e 's/_.*//'`
-		echo "%lang($lang) %ghost %{_datadir}/locale/$i" >> glibc.lang
+		echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
 	fi
 done
 
@@ -563,7 +563,8 @@ install -m755 postshell $RPM_BUILD_ROOT/sbin
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# not run iconvconfig in %%postun -n iconv because iconvconfig don't exist when %%postun is runned
+# don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
+# when %%postun is run
 
 %post	-p /sbin/postshell
 /sbin/ldconfig
-- 
2.44.0