summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-07-15 19:44:02 +0000
committerMike Frysinger <vapier@gentoo.org>2007-07-15 19:44:02 +0000
commite3677e64751577f5579bdabc57f46455d586df2f (patch)
tree93482abaa0a2367047de006989a0d2bbe1769cfb /sys-libs
parentChanged maintainer to hawking (diff)
downloadhistorical-e3677e64751577f5579bdabc57f46455d586df2f.tar.gz
historical-e3677e64751577f5579bdabc57f46455d586df2f.tar.bz2
historical-e3677e64751577f5579bdabc57f46455d586df2f.zip
also stub out _SSP_NSIG and fix typo in DO_CONNECT
Package-Manager: portage-2.1.3_rc8
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/Manifest14
-rw-r--r--sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c3
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b603b9a61bf6..59327694172c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -405,10 +405,10 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93
MD5 43fbcad7f8dbfcc0dd3efed283ae2d0a files/2.5/glibc-2.5-hardened-pie.patch 1569
RMD160 8746aeb9f9c68ca153d93cf92c9df93d0fb324d6 files/2.5/glibc-2.5-hardened-pie.patch 1569
SHA256 ff9cde8857c5da89faa4039e2a81748674fbeaaa49d85c378d80711d55f2b0c1 files/2.5/glibc-2.5-hardened-pie.patch 1569
-AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9519 RMD160 50a89ca522b4d8739600be554dc1ea3ba8c88a5c SHA1 345d65bbacfe9f7f4d1cd6d623a5c8aaf1ab5fe2 SHA256 cd7a948eceb0b4704a988282356ce6d748e300d3abc2aacce77f5efaf175f491
-MD5 3e07a5bec4f35dde6eb7c31ef0f2d66c files/2.6/glibc-2.6-gentoo-stack_chk_fail.c 9519
-RMD160 50a89ca522b4d8739600be554dc1ea3ba8c88a5c files/2.6/glibc-2.6-gentoo-stack_chk_fail.c 9519
-SHA256 cd7a948eceb0b4704a988282356ce6d748e300d3abc2aacce77f5efaf175f491 files/2.6/glibc-2.6-gentoo-stack_chk_fail.c 9519
+AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a
+MD5 6a6b9992c76a9bece219eb00a16d7549 files/2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545
+RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f files/2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545
+SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a files/2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545
AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
MD5 cebca9f412d4c393f32f9cca68575a5f files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674
RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674
@@ -574,7 +574,7 @@ SHA256 f51eeddc285765fd2b6001d0e2dec497496bc7e9e540fe25e0d99168bbf5c1a3 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.5 (GNU/Linux)
-iD8DBQFGmnM5p/wUKkr7RBoRAjw/AJ93ZRDVgsltN37HyJLTfzNpCVPrlQCeK5ta
-RET6Nc7Z5PnLBOYr36DZHP4=
-=XEJD
+iD8DBQFGmnktp/wUKkr7RBoRAiGZAKDN7cSCnYpMb5RQEBhe5FA8fm2F5ACeK3bw
+6PfQQPvrfqKMSRDeP89WILA=
+=7zgI
-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c
index c696993477c2..217bf1a90790 100644
--- a/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c
+++ b/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c
@@ -107,6 +107,7 @@
# define _SSP_NSIG _NSIG
# endif
#else
+# define _SSP_NSIG 0
# define ENABLE_SSP_SMASH_DUMPS_CORE 0
#endif
@@ -157,7 +158,7 @@
socketargs[3] = 0; \
result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
} else \
- result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
+ result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
} while (0)
#ifndef _PATH_LOG