Date: Thu, 15 Nov 2001 09:37:48 +1100 From: Andrew Johns <johnsa@kpi.com.au> To: Kerberus <kerberus@microbsd.net> Cc: freebsd-questions@FreeBSD.ORG Subject: Re: GCC stack smashing protection for 4.4-STABLE? Message-ID: <3BF2F23C.EEB77DCD@kpi.com.au> References: <3BF1EE29.49275AED@kpi.com.au> <20011113213920.A46774@xor.obsecurity.org> <1005755318.13317.2.camel@devel.netwolves.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------CBB163EB884BDD892477A6F9
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Kerberus wrote:
>
> try this it worked for me, just patch from /usr/src and follow the
> directions
>
> On Wed, 2001-11-14 at 00:39, Kris Kennaway wrote:
>
> -----------------------------------------------------------------
> Name: gcc-propolice.patch
> gcc-propolice.patch Type: Plain Text (text/plain)
> Encoding: quoted-printable
No such luck - looks like a manual patching process. Oh well, it
can't take *that* long.
See attached error output.
--
Andrew Johns
================================================================
BUGS:This utility is a prototype which lasted several years past
its expiration date and is greatly in need of death.
- from FreeBSD sysinstall man page
--------------CBB163EB884BDD892477A6F9
Content-Type: text/plain; charset=us-ascii;
name="typescript"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="typescript"
Script started on Thu Nov 15 09:33:05 2001
/usr/src [0] # patch < gcc-propolice.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/Makefile.in
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/Makefile.in,v
|retrieving revision 1.4
|diff -u -r1.4 Makefile.in
|--- contrib/gcc/Makefile.in 1999/10/16 08:21:54 1.4
|+++ contrib/gcc/Makefile.in 2000/11/17 22:06:11
--------------------------
Patching file contrib/gcc/Makefile.in using Plan A...
Hunk #1 failed at 684.
Hunk #2 failed at 735.
2 out of 2 hunks failed--saving rejects to contrib/gcc/Makefile.in.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/choose-temp.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/choose-temp.c,v
|retrieving revision 1.3
|diff -u -r1.3 choose-temp.c
|--- contrib/gcc/choose-temp.c 1999/11/04 10:23:25 1.3
|+++ contrib/gcc/choose-temp.c 2000/11/03 19:17:33
--------------------------
Patching file contrib/gcc/choose-temp.c using Plan A...
Hunk #1 failed at 73.
1 out of 1 hunks failed--saving rejects to contrib/gcc/choose-temp.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/cse.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/cse.c,v
|retrieving revision 1.1.1.6
|diff -u -r1.1.1.6 cse.c
|--- contrib/gcc/cse.c 2000/01/22 02:59:02 1.1.1.6
|+++ contrib/gcc/cse.c 2000/11/17 22:06:11
--------------------------
Patching file contrib/gcc/cse.c using Plan A...
Hunk #1 failed at 6482.
1 out of 1 hunks failed--saving rejects to contrib/gcc/cse.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/dbxout.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/dbxout.c,v
|retrieving revision 1.4
|diff -u -r1.4 dbxout.c
|--- contrib/gcc/dbxout.c 1999/10/26 08:47:58 1.4
|+++ contrib/gcc/dbxout.c 2000/11/17 22:05:36
--------------------------
Patching file contrib/gcc/dbxout.c using Plan A...
Hunk #1 failed at 2253.
1 out of 1 hunks failed--saving rejects to contrib/gcc/dbxout.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/expr.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/expr.c,v
|retrieving revision 1.1.1.4
|diff -u -r1.1.1.4 expr.c
|--- contrib/gcc/expr.c 1999/10/16 06:04:52 1.1.1.4
|+++ contrib/gcc/expr.c 2000/11/17 22:05:36
--------------------------
Patching file contrib/gcc/expr.c using Plan A...
Hunk #1 failed at 40.
Hunk #2 failed at 6241.
Hunk #3 failed at 8682.
3 out of 3 hunks failed--saving rejects to contrib/gcc/expr.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/function.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/function.c,v
|retrieving revision 1.6
|diff -u -r1.6 function.c
|--- contrib/gcc/function.c 1999/11/01 18:56:02 1.6
|+++ contrib/gcc/function.c 2000/11/17 22:05:36
--------------------------
Patching file contrib/gcc/function.c using Plan A...
Hunk #1 failed at 59.
Hunk #2 failed at 432.
Hunk #3 failed at 453.
Hunk #4 failed at 940.
Hunk #5 failed at 973.
Hunk #6 failed at 1012.
Hunk #7 failed at 1074.
Hunk #8 failed at 1199.
Hunk #9 failed at 1708.
Hunk #10 succeeded at 6980 with fuzz 2.
9 out of 10 hunks failed--saving rejects to contrib/gcc/function.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/gcse.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/gcse.c,v
|retrieving revision 1.1.1.3
|diff -u -r1.1.1.3 gcse.c
|--- contrib/gcc/gcse.c 1999/11/01 08:26:03 1.1.1.3
|+++ contrib/gcc/gcse.c 2000/11/17 22:05:36
--------------------------
Patching file contrib/gcc/gcse.c using Plan A...
Hunk #1 failed at 3718.
1 out of 1 hunks failed--saving rejects to contrib/gcc/gcse.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/integrate.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/integrate.c,v
|retrieving revision 1.1.1.3
|diff -u -r1.1.1.3 integrate.c
|--- contrib/gcc/integrate.c 1999/10/16 06:05:22 1.1.1.3
|+++ contrib/gcc/integrate.c 2000/11/17 22:05:37
--------------------------
Patching file contrib/gcc/integrate.c using Plan A...
Hunk #1 failed at 38.
Hunk #2 failed at 1504.
2 out of 2 hunks failed--saving rejects to contrib/gcc/integrate.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/libgcc2.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/libgcc2.c,v
|retrieving revision 1.4
|diff -u -r1.4 libgcc2.c
|--- contrib/gcc/libgcc2.c 1999/10/27 09:45:47 1.4
|+++ contrib/gcc/libgcc2.c 2000/11/17 22:05:37
--------------------------
Patching file contrib/gcc/libgcc2.c using Plan A...
Hunk #1 succeeded at 4014 with fuzz 2.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/reload1.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/reload1.c,v
|retrieving revision 1.1.1.4
|diff -u -r1.1.1.4 reload1.c
|--- contrib/gcc/reload1.c 2000/03/09 09:21:40 1.1.1.4
|+++ contrib/gcc/reload1.c 2000/11/17 22:05:37
--------------------------
Patching file contrib/gcc/reload1.c using Plan A...
Hunk #1 failed at 38.
Hunk #2 failed at 2420.
2 out of 2 hunks failed--saving rejects to contrib/gcc/reload1.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/gcc/toplev.c
|===================================================================
|RCS file: /mnt/ncvs/src/contrib/gcc/toplev.c,v
|retrieving revision 1.7
|diff -u -r1.7 toplev.c
|--- contrib/gcc/toplev.c 2000/03/26 12:56:54 1.7
|+++ contrib/gcc/toplev.c 2000/11/17 22:05:37
--------------------------
Patching file contrib/gcc/toplev.c using Plan A...
Hunk #1 failed at 776.
Hunk #2 failed at 992.
Hunk #3 failed at 3662.
3 out of 3 hunks failed--saving rejects to contrib/gcc/toplev.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- /dev/null Fri Nov 17 15:02:17 2000
|+++ contrib/gcc/protector.h Fri Nov 17 14:06:24 2000
--------------------------
(Creating file contrib/gcc/protector.h...)
Patching file contrib/gcc/protector.h using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- /dev/null Fri Nov 17 15:02:17 2000
|+++ contrib/gcc/protector.c Fri Nov 17 14:06:24 2000
--------------------------
(Creating file contrib/gcc/protector.c...)
Patching file contrib/gcc/protector.c using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: gnu/lib/libgcc/Makefile
|===================================================================
|RCS file: /mnt/ncvs/src/gnu/lib/libgcc/Makefile,v
|retrieving revision 1.33
|diff -u -r1.33 Makefile
|--- gnu/lib/libgcc/Makefile 2000/06/04 06:56:21 1.33
|+++ gnu/lib/libgcc/Makefile 2000/11/17 22:09:12
--------------------------
Patching file gnu/lib/libgcc/Makefile using Plan A...
Hunk #1 failed at 46.
1 out of 1 hunks failed--saving rejects to gnu/lib/libgcc/Makefile.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: gnu/usr.bin/cc/cc_int/Makefile
|===================================================================
|RCS file: /mnt/ncvs/src/gnu/usr.bin/cc/cc_int/Makefile,v
|retrieving revision 1.26
|diff -u -r1.26 Makefile
|--- gnu/usr.bin/cc/cc_int/Makefile 2000/05/24 20:02:21 1.26
|+++ gnu/usr.bin/cc/cc_int/Makefile 2000/11/17 22:08:27
--------------------------
Patching file gnu/usr.bin/cc/cc_int/Makefile using Plan A...
Hunk #1 failed at 22.
1 out of 1 hunks failed--saving rejects to gnu/usr.bin/cc/cc_int/Makefile.rej
done
/usr/src [27] # ^Dexit
Script done on Thu Nov 15 09:33:42 2001
--------------CBB163EB884BDD892477A6F9--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3BF2F23C.EEB77DCD>