Mon Nov 16 15:48:44 2020 UTC ()
lhasa: avoid SIGSEGV on decoding 8bit char filenames on NetBSD/amd64.
Bump PKGREVISION.
(tsutsui)
diff -r1.9 -r1.10 pkgsrc/archivers/lhasa/Makefile
diff -r1.8 -r1.9 pkgsrc/archivers/lhasa/distinfo
diff -r0 -r1.1 pkgsrc/archivers/lhasa/patches/patch-lib_lha__file__header.c
--- pkgsrc/archivers/lhasa/Makefile 2020/01/18 23:29:56 1.9
+++ pkgsrc/archivers/lhasa/Makefile 2020/11/16 15:48:43 1.10
| @@ -1,16 +1,17 @@ | | | @@ -1,16 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.9 2020/01/18 23:29:56 rillig Exp $ | | 1 | # $NetBSD: Makefile,v 1.10 2020/11/16 15:48:43 tsutsui Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= lhasa-0.3.1 | | 3 | DISTNAME= lhasa-0.3.1 |
| | | 4 | PKGREVISION= 1 |
| 4 | CATEGORIES= archivers | | 5 | CATEGORIES= archivers |
| 5 | MASTER_SITES= https://soulsphere.org/projects/lhasa/ | | 6 | MASTER_SITES= https://soulsphere.org/projects/lhasa/ |
| 6 | | | 7 | |
| 7 | MAINTAINER= pkgsrc-users@NetBSD.org | | 8 | MAINTAINER= pkgsrc-users@NetBSD.org |
| 8 | HOMEPAGE= https://fragglet.github.com/lhasa/ | | 9 | HOMEPAGE= https://fragglet.github.com/lhasa/ |
| 9 | COMMENT= Freely licensed lha archiving tool (for .lzh and .lha files) | | 10 | COMMENT= Freely licensed lha archiving tool (for .lzh and .lha files) |
| 10 | LICENSE= isc | | 11 | LICENSE= isc |
| 11 | | | 12 | |
| 12 | USE_LIBTOOL= yes | | 13 | USE_LIBTOOL= yes |
| 13 | GNU_CONFIGURE= yes | | 14 | GNU_CONFIGURE= yes |
| 14 | PKGCONFIG_OVERRIDE= liblhasa.pc.in | | 15 | PKGCONFIG_OVERRIDE= liblhasa.pc.in |
| 15 | TEST_TARGET= check | | 16 | TEST_TARGET= check |
| 16 | | | 17 | |
--- pkgsrc/archivers/lhasa/distinfo 2016/06/22 10:30:18 1.8
+++ pkgsrc/archivers/lhasa/distinfo 2020/11/16 15:48:43 1.9
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.8 2016/06/22 10:30:18 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.9 2020/11/16 15:48:43 tsutsui Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (lhasa-0.3.1.tar.gz) = 1a5d827100d1e6445b377029b69b901af3ffa240 | | 3 | SHA1 (lhasa-0.3.1.tar.gz) = 1a5d827100d1e6445b377029b69b901af3ffa240 |
| 4 | RMD160 (lhasa-0.3.1.tar.gz) = 4e4cef0525d99c0b4cbe58529da8edaf6b01608b | | 4 | RMD160 (lhasa-0.3.1.tar.gz) = 4e4cef0525d99c0b4cbe58529da8edaf6b01608b |
| 5 | SHA512 (lhasa-0.3.1.tar.gz) = 6e4797aaa054f2ecd25069b32b809ab0111d0179adfd9c676e0609d69efbcc968ec6dce67fbd8ce6bccc102d09ee69996805a5542882b432731e3c273f132c05 | | 5 | SHA512 (lhasa-0.3.1.tar.gz) = 6e4797aaa054f2ecd25069b32b809ab0111d0179adfd9c676e0609d69efbcc968ec6dce67fbd8ce6bccc102d09ee69996805a5542882b432731e3c273f132c05 |
| 6 | Size (lhasa-0.3.1.tar.gz) = 2933084 bytes | | 6 | Size (lhasa-0.3.1.tar.gz) = 2933084 bytes |
| | | 7 | SHA1 (patch-lib_lha__file__header.c) = 5603af72663f9d154dd1bdae7839ece1ea22d54a |
$NetBSD: patch-lib_lha__file__header.c,v 1.1 2020/11/16 15:48:44 tsutsui Exp $
- avoid SIGSEGV on NetBSD/amd64 on decoding 8bit char filenames.
https://github.com/fragglet/lhasa/pull/33
--- lib/lha_file_header.c.orig 2016-03-30 02:28:14.000000000 +0000
+++ lib/lha_file_header.c
@@ -194,7 +194,7 @@ static void fix_msdos_allcaps(LHAFileHea
if (header->path != NULL) {
for (i = 0; header->path[i] != '\0'; ++i) {
- if (islower((unsigned) header->path[i])) {
+ if (islower((int)(unsigned char) header->path[i])) {
is_allcaps = 0;
break;
}
@@ -203,7 +203,7 @@ static void fix_msdos_allcaps(LHAFileHea
if (is_allcaps && header->filename != NULL) {
for (i = 0; header->filename[i] != '\0'; ++i) {
- if (islower((unsigned) header->filename[i])) {
+ if (islower((int)(unsigned char) header->filename[i])) {
is_allcaps = 0;
break;
}
@@ -216,13 +216,13 @@ static void fix_msdos_allcaps(LHAFileHea
if (header->path != NULL) {
for (i = 0; header->path[i] != '\0'; ++i) {
header->path[i]
- = tolower((unsigned) header->path[i]);
+ = tolower((int)(unsigned char) header->path[i]);
}
}
if (header->filename != NULL) {
for (i = 0; header->filename[i] != '\0'; ++i) {
header->filename[i]
- = tolower((unsigned) header->filename[i]);
+ = tolower((int)(unsigned char) header->filename[i]);
}
}
}