cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with github

Browse Source 
zap patches merged upstream
This commit is contained in:
gsoares 2017-04-08 23:39:06 +00:00
parent 6cd3a66e73
commit 82bc28c03b
4 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plan9/plan9port/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.20 2017/03/01 00:59:59 gsoares Exp $
# $OpenBSD: Makefile,v 1.21 2017/04/08 23:39:06 gsoares Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc
BROKEN-powerpc = threading issues
COMMENT = Plan 9 from user space
DISTNAME = plan9port-20161102
REVISION = 0
DISTNAME = plan9port-20170407
GH_ACCOUNT = 9fans
GH_PROJECT = plan9port
GH_COMMIT = 1b68dbef7b7dd7c4aa2b5755c1399cf66d2ea6fa
GH_COMMIT = 94b38bdb722052838eb0d940c05995b870db4ea0
CATEGORIES = plan9

4
plan9/plan9port/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (plan9port/1b68dbef7b7dd7c4aa2b5755c1399cf66d2ea6fa.tar.gz) = BMkJPJPnXOIMVv+eBMLwvJbeJFwyyIYhu0gIKRlNi94=
SHA256 (plan9port/94b38bdb722052838eb0d940c05995b870db4ea0.tar.gz) = 4iME9wcsCpoOSoRh1BGcPYVsBf9umRWFyUHVvpTeXEw=
SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw=
SHA256 (plan9port/roget.tar.bz2) = sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY=
SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4=
SIZE (plan9port/1b68dbef7b7dd7c4aa2b5755c1399cf66d2ea6fa.tar.gz) = 23459701
SIZE (plan9port/94b38bdb722052838eb0d940c05995b870db4ea0.tar.gz) = 23459072
SIZE (plan9port/pgw.tar.bz2) = 9404968
SIZE (plan9port/roget.tar.bz2) = 482956
SIZE (plan9port/scat.tgz) = 5145346

15
plan9/plan9port/patches/patch-src_cmd_9term_win_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_cmd_9term_win_c,v 1.1 2016/05/25 15:49:21 okan Exp $
# https://plan9port-review.googlesource.com/#/c/1540/
--- src/cmd/9term/win.c.orig Tue Apr 19 02:07:22 2016
+++ src/cmd/9term/win.c Mon May 23 22:28:05 2016
@@ -634,7 +634,7 @@ label(char *sr, int n)
el = r+1;
if(el-sr > sizeof wdir - strlen(name) - 20)
- sr = el - sizeof wdir - strlen(name) - 20;
+ sr = el - (sizeof wdir - strlen(name) - 20);
for(sl=el-3; sl>=sr; sl--)
if(sl[0]=='\033' && sl[1]==']' && sl[2]==';')
break;

24
plan9/plan9port/patches/patch-src_libdraw_font_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_libdraw_font_c,v 1.1 2016/05/25 15:49:21 okan Exp $
# https://plan9port-review.googlesource.com/#/c/1520/
--- src/libdraw/font.c.orig Fri Jan 22 19:52:32 2016
+++ src/libdraw/font.c Tue Apr 5 21:29:31 2016
@@ -222,16 +222,14 @@ loadchar(Font *f, Rune r, Cacheinfo *c, int h, int nof
subf->age = 0;
}else{ /* too recent; grow instead */
of = f->subf;
- f->subf = malloc((f->nsubf+DSUBF)*sizeof *subf);
+ f->subf = reallocarray(of, f->nsubf+DSUBF, sizeof *subf);
if(f->subf == nil){
f->subf = of;
goto Toss;
}
- memmove(f->subf, of, (f->nsubf+DSUBF)*sizeof *subf);
memset(f->subf+f->nsubf, 0, DSUBF*sizeof *subf);
subf = &f->subf[f->nsubf];
f->nsubf += DSUBF;
- free(of);
}
}
subf->age = 0;