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

Update to feh-2.9.3.

Browse Source
This commit is contained in:
dcoppa 2013-06-17 13:40:53 +00:00
parent 09d3947a14
commit 6b1bfa624e
4 changed files with 9 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/feh/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.52 2013/06/04 18:41:47 naddy Exp $
# $OpenBSD: Makefile,v 1.53 2013/06/17 13:40:53 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-2.9.2
DISTNAME= feh-2.9.3
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics

4
graphics/feh/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (feh-2.9.2.tar.bz2) = JNC+AEsWIHmBqjeiTanrcnGJeP/sKL4e7qZLlUHWbT4=
SIZE (feh-2.9.2.tar.bz2) = 2081602
SHA256 (feh-2.9.3.tar.bz2) = tOjWAwM68Sr6d66AILz0/1HGlQuaaICg/jKwT99ykPI=
SIZE (feh-2.9.3.tar.bz2) = 2082188

10
graphics/feh/patches/patch-man_feh_pre
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-man_feh_pre,v 1.21 2013/03/14 13:25:30 dcoppa Exp $
--- man/feh.pre.orig Thu Feb 14 12:53:26 2013
+++ man/feh.pre Thu Mar 14 13:45:54 2013
@@ -913,7 +913,7 @@ which
$OpenBSD: patch-man_feh_pre,v 1.22 2013/06/17 13:40:53 dcoppa Exp $
--- man/feh.pre.orig Tue Jun 11 08:28:26 2013
+++ man/feh.pre Mon Jun 17 15:31:13 2013
@@ -917,7 +917,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
@ -10,7 +10,7 @@ $OpenBSD: patch-man_feh_pre,v 1.21 2013/03/14 13:25:30 dcoppa Exp $
.Pp
All config files treat lines starting with a
.Qq #
@@ -1471,7 +1471,7 @@ order it finds them on the hard disk, which is usually
@@ -1475,7 +1475,7 @@ order it finds them on the hard disk, which is usually
.
Show 128x128 pixel thumbnails, limit window width to 1024 pixels.
.

148
graphics/feh/patches/patch-src_slideshow_c
View File

@ -1,148 +0,0 @@
$OpenBSD: patch-src_slideshow_c,v 1.7 2013/05/20 07:56:48 dcoppa Exp $
commit 27a1fb87555b40e0ad4d0f24640801dd527ed4a4
Author: Daniel Friesel <derf@finalrewind.org>
Date: Thu May 9 20:59:02 2013 +0200
Fix feh_printf buffer overflows
--- src/slideshow.c.orig Mon May 20 09:30:12 2013
+++ src/slideshow.c Mon May 20 09:39:04 2013
@@ -476,107 +476,107 @@ char *feh_printf(char *str, feh_file * file, winwidget
switch (*c) {
case 'f':
if (file)
- strcat(ret, file->filename);
+ strncat(ret, file->filename, sizeof(ret) - strlen(ret));
break;
case 'F':
if (file)
- strcat(ret, shell_escape(file->filename));
+ strncat(ret, shell_escape(file->filename), sizeof(ret) - strlen(ret));
break;
case 'h':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
snprintf(buf, sizeof(buf), "%d", file->info->height);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case 'l':
snprintf(buf, sizeof(buf), "%d", gib_list_length(filelist));
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
break;
case 'm':
- strcat(ret, mode);
+ strncat(ret, mode, sizeof(ret) - strlen(ret));
break;
case 'n':
if (file)
- strcat(ret, file->name);
+ strncat(ret, file->name, sizeof(ret) - strlen(ret));
break;
case 'N':
if (file)
- strcat(ret, shell_escape(file->name));
+ strncat(ret, shell_escape(file->name), sizeof(ret) - strlen(ret));
break;
case 'o':
if (winwid) {
snprintf(buf, sizeof(buf), "%d,%d", winwid->im_x,
winwid->im_y);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case 'p':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
snprintf(buf, sizeof(buf), "%d", file->info->pixels);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case 'P':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
- strcat(ret, format_size(file->info->pixels));
+ strncat(ret, format_size(file->info->pixels), sizeof(ret) - strlen(ret));
}
break;
case 'r':
if (winwid) {
snprintf(buf, sizeof(buf), "%.1f", winwid->im_angle);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case 's':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
snprintf(buf, sizeof(buf), "%d", file->info->size);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case 'S':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
- strcat(ret, format_size(file->info->size));
+ strncat(ret, format_size(file->info->size), sizeof(ret) - strlen(ret));
}
break;
case 't':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
- strcat(ret, file->info->format);
+ strncat(ret, file->info->format, sizeof(ret) - strlen(ret));
}
break;
case 'u':
snprintf(buf, sizeof(buf), "%d",
current_file != NULL ? gib_list_num(filelist, current_file)
+ 1 : 0);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
break;
case 'v':
- strcat(ret, VERSION);
+ strncat(ret, VERSION, sizeof(ret) - strlen(ret));
break;
case 'V':
snprintf(buf, sizeof(buf), "%d", getpid());
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
break;
case 'w':
if (file && (file->info || !feh_file_info_load(file, NULL))) {
snprintf(buf, sizeof(buf), "%d", file->info->width);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case 'z':
if (winwid) {
snprintf(buf, sizeof(buf), "%.2f", winwid->zoom);
- strcat(ret, buf);
+ strncat(ret, buf, sizeof(ret) - strlen(ret));
}
break;
case '%':
- strcat(ret, "%");
+ strncat(ret, "%", sizeof(ret) - strlen(ret));
break;
default:
weprintf("Unrecognized format specifier %%%c", *c);
strncat(ret, c - 1, 2);
break;
}
- } else if ((*c == '\\') && (*(c+1) != '\0')) {
+ } else if ((*c == '\\') && (*(c+1) != '\0') && ((strlen(ret) + 3) < sizeof(ret))) {
c++;
switch (*c) {
case 'n':
@@ -586,7 +586,7 @@ char *feh_printf(char *str, feh_file * file, winwidget
strncat(ret, c - 1, 2);
break;
}
- } else
+ } else if ((strlen(ret) + 2) < sizeof(ret))
strncat(ret, c, 1);
}
return(ret);