gentoo resync : 14.07.2018

4 files changed, 207 insertions, 0 deletions

diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
new file mode 100644
index 000000000000..8dc8bc097b05
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
@@ -0,0 +1,144 @@
+diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
+--- jfbterm-0.4.7.orig/fbcommon.c	2003-09-03 00:23:17.000000000 +0900
++++ jfbterm-0.4.7/fbcommon.c	2007-08-18 10:55:30.000000000 +0900
+@@ -46,7 +46,6 @@
+ #endif
+ #include <linux/vt.h>
+ #include <linux/fb.h>
+-#include <asm/page.h>
+ 
+ #include "mytypes.h"
+ #include "fbcommon.h"
+@@ -475,6 +474,9 @@
+ 			perror("ioctl FBIOGET_CON2FBMAP");
+ 			c2m.framebuffer = 0;
+ 		}
++		if (-1 == c2m.framebuffer) {
++			c2m.framebuffer = 0;
++		}
+ 		close(fd);
+ 		snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer);
+ 	}
+diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample
+--- jfbterm-0.4.7.orig/jfbterm.conf.sample	2003-09-16 00:16:35.000000000 +0900
++++ jfbterm-0.4.7/jfbterm.conf.sample	2007-08-18 10:19:00.000000000 +0900
+@@ -19,29 +19,29 @@
+ #	Absolute path or relative path to PWD
+ #
+ ###############################################################################
+-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz
+ +fontset: ansix3.4-1968,alias,L,iso646-1973irv
+-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
+++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz
+ +fontset: jisx0208-1983,alias,L,jisc6226-1978
+-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
+++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz
+ +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
+-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
+-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
+-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
+-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
+-+fontset: iso8859.3-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
+-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
+-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
+-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
+-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
+-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
+-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz
+++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz
+++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz
+++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz
+++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz
+++fontset: iso8859.3-1988,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz
+++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz
+++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz
+++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz
+++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz
+++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz
+++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz
+++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz
+++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz
+++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz
+ +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
+-+fontset: iso10646.1,pcf,U,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
+++fontset: iso10646.1,pcf,U,/usr/share/fonts/unifont/unifont.pcf.gz
+ 
+ 
+ ###############################################################################
+diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja
+--- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja	2003-09-16 00:16:35.000000000 +0900
++++ jfbterm-0.4.7/jfbterm.conf.sample.ja	2007-08-18 10:19:11.000000000 +0900
+@@ -25,29 +25,29 @@
+ #	絶対パス or PWDからの相対パス
+ #
+ ################################################################################
+-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz
+ +fontset: ansix3.4-1968,alias,L,iso646-1973irv
+-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
+++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz
+ +fontset: jisx0208-1983,alias,L,jisc6226-1978
+-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
+++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz
+ +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
+-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
+-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
+-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
+-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
+-+fontset: iso8859.3-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
+-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
+-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
+-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
+-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
+-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
+-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz
+++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz
+++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz
+++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz
+++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz
+++fontset: iso8859.3-1987,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz
+++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz
+++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz
+++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz
+++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz
+++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz
+++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz
+++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz
+++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz
+++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz
+ +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
+-+fontset: iso10646.1,pcf,L,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
+++fontset: iso10646.1,pcf,L,/usr/share/fonts/unifont/unifont.pcf.gz
+ 
+ ################################################################################
+ #
+diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h
+--- jfbterm-0.4.7.orig/util.h	2003-09-16 00:45:31.000000000 +0900
++++ jfbterm-0.4.7/util.h	2007-08-18 08:48:49.000000000 +0900
+@@ -31,6 +31,7 @@
+ 
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ void util_privilege_init();
+ void util_privilege_on();
+@@ -49,4 +50,7 @@
+ 
+ int util_search_string(const char* s, const char** array);
+ 
++#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
++#define PAGE_MASK (~(PAGE_SIZE-1))
++
+ #endif /* INCLUDE_UTIL_H */
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
new file mode 100644
index 000000000000..06c6e6033488
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
@@ -0,0 +1,17 @@
+Remove usage of kernel headers, deprecated since linux-headers-2.6.18.
+Patch by Shunichi Fuji <palgowr@gmail.com>.
+
+See bug #156306
+
+--- jfbterm-0.4.7.orig/fbdpsp.c	2003-08-30 03:48:16.000000000 +0900
++++ jfbterm-0.4.7/fbdpsp.c	2006-11-27 01:22:20.000000000 +0900
+@@ -827,8 +827,7 @@
+ 
+ #ifdef JFB_VGA16FB
+ 
+-#include <asm/io.h>
+-#include <asm/system.h>
++#include <sys/io.h>
+ 
+ #define GRAPHICS_ADDR_REG 0x3ce         /* Graphics address register. */
+ #define GRAPHICS_DATA_REG 0x3cf         /* Graphics data register. */
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
new file mode 100644
index 000000000000..2e8036400770
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
@@ -0,0 +1,22 @@
+--- jfbterm-0.4.7.orig/main.c
++++ jfbterm-0.4.7/main.c
+@@ -184,7 +184,7 @@
+ 	p->gExecShellArgv = NULL;
+ 	p->gConfFile = FILE_JFBTERM_CONF;
+ 	p->gConfEncoding = NULL;
+-
++	signal(SIGCHLD, sigchld);
+ 	atexit(tapp_final_at_exit);
+ }
+ 
+--- jfbterm-0.4.7.orig/term.h
++++ jfbterm-0.4.7/term.h
+@@ -44,7 +44,7 @@
+ } TTerm;
+ 
+ void tterm_start(TTerm* p, const char* tn, const char* en);
+-
++void sigchld(int sig);
+ extern TTerm gTerm;
+ 
+ #endif /* INCLUDE_TERM_H */
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
new file mode 100644
index 000000000000..974ccbc41307
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
@@ -0,0 +1,24 @@
+Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch
+
+--- jfbterm-0.4.7/pen.c.inline_gcc5	2003-08-30 03:48:16.000000000 +0900
++++ jfbterm-0.4.7/pen.c	2015-02-09 10:36:47.182751545 +0900
+@@ -62,7 +62,7 @@
+ 	p->attr = q->attr;
+ }
+ 
+-inline void tpen_off_all_attribute(TPen* p)
++void tpen_off_all_attribute(TPen* p)
+ {
+ 	p->bcol = 0;
+ 	p->fcol = 7;
+--- jfbterm-0.4.7/pen.h.inline_gcc5	2002-07-17 01:21:23.000000000 +0900
++++ jfbterm-0.4.7/pen.h	2015-02-09 10:36:52.058705503 +0900
+@@ -58,7 +58,7 @@
+ void tpen_init(TPen* p);
+ void tpen_final(TPen* p);
+ void tpen_copy(TPen* p, TPen* q);
+-inline void tpen_off_all_attribute(TPen* p);
++void tpen_off_all_attribute(TPen* p);
+ void tpen_higlight(TPen* p);
+ void tpen_dehiglight(TPen* p);
+ void tpen_underline(TPen* p);