aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-02-03 17:28:06 +0100
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-02-03 17:28:06 +0100
commit01bd5053ba9903e328973ba68a1488fc0587c1e1 (patch)
tree2a57f4d27ce47ed6f4a55a6b591e5e8edf7aa664 /x11-libs/xview/files
parentRevert "Revert "sci-chemistry/ccpn numpy USE flag removed"" (diff)
downloadsci-01bd5053ba9903e328973ba68a1488fc0587c1e1.tar.gz
sci-01bd5053ba9903e328973ba68a1488fc0587c1e1.tar.bz2
sci-01bd5053ba9903e328973ba68a1488fc0587c1e1.zip
x11-libs/xview bump and sci-chemistry/nmrpipe
Diffstat (limited to 'x11-libs/xview/files')
-rw-r--r--x11-libs/xview/files/CAN-2005-0076.patch29
-rw-r--r--x11-libs/xview/files/lseek.diff26
-rw-r--r--x11-libs/xview/files/lseek2.diff22
3 files changed, 77 insertions, 0 deletions
diff --git a/x11-libs/xview/files/CAN-2005-0076.patch b/x11-libs/xview/files/CAN-2005-0076.patch
new file mode 100644
index 000000000..53952e100
--- /dev/null
+++ b/x11-libs/xview/files/CAN-2005-0076.patch
@@ -0,0 +1,29 @@
+--- lib/libxview/base/xv_parse.c~ 2005-01-15 17:11:54.000000000 +0100
++++ lib/libxview/base/xv_parse.c 2005-01-15 17:20:23.000000000 +0100
+@@ -312,7 +312,7 @@ xv_parse_one(app_name, argc, argv)
+ if (argc <= slot->num_args) {
+ char dummy[128];
+
+- (void) sprintf(dummy,
++ (void) snprintf(dummy, sizeof(dummy),
+ XV_MSG("%s: missing argument after %s"),
+ app_name,
+ argv[0]);
+@@ -392,7 +392,7 @@ xv_parse_one(app_name, argc, argv)
+ if (defaults_lookup(argv[1], known_scales) == -1) {
+ char dummy[1024];
+
+- (void) sprintf(dummy,
++ (void) snprintf(dummy, sizeof(dummy),
+ XV_MSG("%s: unknown scale \"%s\" used with %s option"),
+ app_name, argv[1], argv[0]);
+ xv_error(XV_NULL,
+@@ -611,7 +611,7 @@ NegArg:
+ {
+ char dummy[128];
+
+- (void) sprintf(dummy,
++ (void) snprintf(dummy, sizeof(dummy),
+ XV_MSG("%s: can't have negative argument %s after %s"),
+ app_name, argv[bad_arg], argv[0]);
+ xv_error(XV_NULL,
diff --git a/x11-libs/xview/files/lseek.diff b/x11-libs/xview/files/lseek.diff
new file mode 100644
index 000000000..6a9ea51e6
--- /dev/null
+++ b/x11-libs/xview/files/lseek.diff
@@ -0,0 +1,26 @@
+--- lib/libxview/textsw/es_file.c.old 2006-02-18 23:26:14.000000000 -0500
++++ lib/libxview/textsw/es_file.c 2006-02-18 23:26:37.000000000 -0500
+@@ -119,9 +119,7 @@
+ extern int errno, sys_nerr;
+ extern char *sys_errlist[];
+ #endif
+-#ifndef __CYGWIN__
+-extern long lseek();
+-#endif
++extern off_t lseek();
+
+ static void update_read_buf(); /* update the read buf if overlaps write buf */
+ static Es_status es_file_commit();
+--- lib/libxview/sel/sel_agent.c.old 2006-02-18 23:17:33.000000000 -0500
++++ lib/libxview/sel/sel_agent.c 2006-02-18 23:18:23.000000000 -0500
+@@ -314,9 +314,7 @@
+ struct stat stat_buf;
+ int count, size;
+ char *destp;
+-#ifndef __CYGWIN__
+- extern long lseek();
+-#endif
++ extern off_t lseek();
+ if (fstat(fd, &stat_buf) != 0) {
+ perror(XV_MSG("Agent couldn't reply about a file"));
+ return SELN_FAILED;
diff --git a/x11-libs/xview/files/lseek2.diff b/x11-libs/xview/files/lseek2.diff
new file mode 100644
index 000000000..7f8715f78
--- /dev/null
+++ b/x11-libs/xview/files/lseek2.diff
@@ -0,0 +1,22 @@
+--- lib/libxview/textsw/es_file.c 1997-04-28 14:45:37.000000000 +0200
++++ lib/libxview/textsw/es_file.c.new 2009-02-03 09:51:34.000000000 +0100
+@@ -114,7 +114,7 @@
+
+ extern int errno, sys_nerr;
+ extern char *sys_errlist[];
+-extern long lseek();
++extern off_t lseek();
+
+ static void update_read_buf(); /* update the read buf if overlaps write buf */
+ static Es_status es_file_commit();
+--- lib/libxview/sel/sel_agent.c 1997-06-19 22:45:57.000000000 +0200
++++ lib/libxview/sel/sel_agent.c.new 2009-02-03 09:53:34.000000000 +0100
+@@ -309,7 +309,7 @@
+ struct stat stat_buf;
+ int count, size;
+ char *destp;
+- extern long lseek();
++ extern off_t lseek();
+
+ if (fstat(fd, &stat_buf) != 0) {
+ perror(XV_MSG("Agent couldn't reply about a file"));