summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-terms/multi-aterm/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-terms/multi-aterm/files')
-rw-r--r--x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch11
-rw-r--r--x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch23
-rw-r--r--x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch20
3 files changed, 54 insertions, 0 deletions
diff --git a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
new file mode 100644
index 000000000000..58be689bb961
--- /dev/null
+++ b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
@@ -0,0 +1,11 @@
+--- src/command.c
++++ src/command.c
+@@ -1487,7 +1487,7 @@
+ static XComposeStatus compose = { NULL, 0 };
+ static unsigned char kbuf[KBUFSZ];
+ int ctrl, meta, shft, len;
+- KeySym keysym;
++ KeySym keysym = 0;
+
+ /*
+ * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
new file mode 100644
index 000000000000..939785484030
--- /dev/null
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/219754
+
+--- src/main.c
++++ src/main.c
+@@ -1853,15 +1853,13 @@
+ //get_options(argc, argv);
+ //display_options();
+
+- if (display_name == NULL)
+- if ((display_name = getenv("DISPLAY")) == NULL)
+- display_name = ":0";
+-
+ Xdisplay = XOpenDisplay(display_name);
+
+ if (!Xdisplay)
+ {
+- print_error("can't open display %s", display_name);
++ print_error("can't open display %s", display_name?display_name:
++ getenv("DISPLAY")?getenv("DISPLAY"):
++ "as no -d given and DISPLAY not set");
+ exit(EXIT_FAILURE);
+ }
+
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
new file mode 100644
index 000000000000..6aeadc47780e
--- /dev/null
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
@@ -0,0 +1,20 @@
+--- src/png.c
++++ src/png.c
+@@ -86,7 +86,7 @@
+ display_depth = XDefaultDepth(display,XDefaultScreen(display));
+
+ fread(sig, 1, 8, ifile);
+- if (!png_check_sig(sig, 8)){
++ if (png_sig_cmp (sig, 0, 8)){
+ fclose(ifile);
+ return -1;
+ }
+@@ -116,7 +116,7 @@
+
+ if (png_depth < 8){
+ if (png_color_type == PNG_COLOR_TYPE_GRAY ){
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ png_row_bytes = png_width;
+ }else{
+ png_set_expand(png_ptr);