Author: arekm Date: Mon Mar 28 12:23:37 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; fortify and make fixes from gentoo
---- Files affected: packages/bcc: bcc.spec (1.34 -> 1.35) , dev86-0.16.17-fortify.patch (NONE -> 1.1) (NEW), dev86-0.16.17-make382.patch (NONE -> 1.1) (NEW), dev86-pic.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/bcc/bcc.spec diff -u packages/bcc/bcc.spec:1.34 packages/bcc/bcc.spec:1.35 --- packages/bcc/bcc.spec:1.34 Mon Mar 28 14:16:09 2011 +++ packages/bcc/bcc.spec Mon Mar 28 14:23:32 2011 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Kompilator C Bruce'a Name: bcc Version: 0.16.17 -Release: 4 +Release: 5 License: GPL Group: Development/Languages #Source0Download: http://www.cix.co.uk/~mayday/ @@ -11,6 +11,9 @@ # Source0-md5: e7bbfdbe61c2fb964994a087e29b0087 Patch0: Dev86src-noroot.patch Patch1: Dev86src-opt.patch +Patch2: dev86-0.16.17-fortify.patch +Patch3: dev86-pic.patch +Patch4: dev86-0.16.17-make382.patch URL: http://homepage.ntlworld.com/robert.debath/ Requires: bin86 ExclusiveArch: %{ix86} @@ -36,6 +39,9 @@ %setup -q -n dev86-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p0 +%patch4 -p0 mv -f bootblocks/README README.bootblocks mv -f copt/README README.copt @@ -46,7 +52,7 @@ %build CC="%{__cc}" \ %{__make} -j1 all other \ - OPT="%{rpmcflags}" <<!FooBar! + OPT="%{rpmcppflags} %{rpmcflags}" <<!FooBar! 5 quit !FooBar! @@ -109,6 +115,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.35 2011/03/28 12:23:32 arekm +- rel 5; fortify and make fixes from gentoo + Revision 1.34 2011/03/28 12:16:09 arekm - release 4 ================================================================ Index: packages/bcc/dev86-0.16.17-fortify.patch diff -u /dev/null packages/bcc/dev86-0.16.17-fortify.patch:1.1 --- /dev/null Mon Mar 28 14:23:37 2011 +++ packages/bcc/dev86-0.16.17-fortify.patch Mon Mar 28 14:23:32 2011 @@ -0,0 +1,43 @@ +--- dev86-0.16.17/bcc/bcc.c ++++ dev86-0.16.17/bcc/bcc.c +@@ -19,6 +19,7 @@ + #ifdef __STDC__ + #include <stdlib.h> + #ifndef MSDOS ++#include <limits.h> + #include <unistd.h> + #endif + #else +@@ -596,12 +597,17 @@ + } + } + +-void +-command_reset() +-{ + #ifndef MAXPATHLEN ++#ifdef PATH_MAX ++#define MAXPATHLEN PATH_MAX ++#else + #define MAXPATHLEN 1024 + #endif ++#endif ++ ++void ++command_reset() ++{ + char buf[MAXPATHLEN]; + char ** prefix; + char * saved_cmd; +@@ -1308,11 +1314,7 @@ + + for(d=s=ptr; d && *s; s=d) + { +-#ifdef MAXPATHLEN + char buf[MAXPATHLEN]; +-#else +- char buf[1024]; +-#endif + + free(temp); + d=strchr(s, ':'); ================================================================ Index: packages/bcc/dev86-0.16.17-make382.patch diff -u /dev/null packages/bcc/dev86-0.16.17-make382.patch:1.1 --- /dev/null Mon Mar 28 14:23:37 2011 +++ packages/bcc/dev86-0.16.17-make382.patch Mon Mar 28 14:23:32 2011 @@ -0,0 +1,11 @@ +--- libc/i386sys/Makefile ++++ libc/i386sys/Makefile +@@ -12,7 +12,7 @@ + DOBJ=opendir.o closedir.o readdir.o + + ifeq ($(LIB_CPU)-$(LIB_OS),i386-ELKS) +-OBJ=$(LOBJ3) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o ++OBJ=$(LOBJ) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o + SYSCALLS=syscalls + + CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS) ================================================================ Index: packages/bcc/dev86-pic.patch diff -u /dev/null packages/bcc/dev86-pic.patch:1.1 --- /dev/null Mon Mar 28 14:23:37 2011 +++ packages/bcc/dev86-pic.patch Mon Mar 28 14:23:32 2011 @@ -0,0 +1,20 @@ +--- elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 ++++ elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 +@@ -129,8 +129,17 @@ + static inline int vm86_mine(struct vm86_struct* v86) + { + int __res; ++#ifndef __PIC__ + __asm__ __volatile__("int $0x80\n" + :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86)); ++#else ++ __asm__ __volatile__( ++ "movl %%ebx,%%ecx\n\t" ++ "movl %2,%%ebx\n\t" ++ "int $0x80\n\t" ++ "movl %%ecx,%%ebx\n\t" ++ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx"); ++#endif + return __res; + } + #endif ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bcc/bcc.spec?r1=1.34&r2=1.35&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
