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

update to cabextract 1.4, ok Steve Shockley (maintainer)

Browse Source
This commit is contained in:
sthen 2013-05-13 12:57:41 +00:00
parent 824008ad45
commit a213ab3143
5 changed files with 5 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archivers/cabextract/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2013/03/10 22:28:04 espie Exp $
# $OpenBSD: Makefile,v 1.12 2013/05/13 12:57:41 sthen Exp $
COMMENT= extracts files from Microsoft CAB archives
DISTNAME= cabextract-1.3
DISTNAME= cabextract-1.4
CATEGORIES= archivers
HOMEPAGE= http://www.cabextract.org.uk/
@ -17,5 +17,6 @@ WANTLIB= c
MASTER_SITES= ${HOMEPAGE}
CONFIGURE_STYLE= gnu
SEPARATE_BUILD= Yes
.include <bsd.port.mk>

4
archivers/cabextract/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cabextract-1.3.tar.gz) = 1GQ4OjW0jVSjmQwC+JrL/Gd+ZV70YZTq5k+49DPDwAE=
SIZE (cabextract-1.3.tar.gz) = 217633
SHA256 (cabextract-1.4.tar.gz) = 97qLosLXGRKEbqqivtkgCnci7wrd7sMtt0ccNQpI5B4=
SIZE (cabextract-1.4.tar.gz) = 222490

21
archivers/cabextract/patches/patch-mspack_cabd_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-mspack_cabd_c,v 1.2 2010/07/31 00:30:27 kevlo Exp $
--- mspack/cabd.c.orig Tue Jul 20 00:39:26 2010
+++ mspack/cabd.c Fri Jul 30 16:20:40 2010
@@ -688,7 +688,7 @@ static int cabd_find(struct mscab_decompressor_p *this
/* if off_t is only 32-bits signed, there will be overflow problems
* with cabinets reaching past the 2GB barrier (or just claiming to)
*/
-#ifndef LARGEFILE_SUPPORT
+ if (sizeof(off_t) <= sizeof(uint32_t)) {
if (cablen_u32 & ~0x7FFFFFFF) {
sys->message(fh, largefile_msg);
cablen_u32 = 0x7FFFFFFF;
@@ -697,7 +697,7 @@ static int cabd_find(struct mscab_decompressor_p *this
sys->message(fh, largefile_msg);
foffset_u32 = 0x7FFFFFFF;
}
-#endif
+ }
/* copy the unsigned 32-bit offsets to signed off_t variables */
foffset = (off_t) foffset_u32;
cablen = (off_t) cablen_u32;

12
archivers/cabextract/patches/patch-mspack_mspack_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mspack_mspack_h,v 1.1 2010/07/31 00:30:27 kevlo Exp $
--- mspack/mspack.h.orig Fri Jul 30 16:35:48 2010
+++ mspack/mspack.h Fri Jul 30 16:36:00 2010
@@ -360,7 +360,7 @@ struct mspack_system {
* @see open()
*/
void (*message)(struct mspack_file *file,
- char *format,
+ const char *format,
...);
/**

21
archivers/cabextract/patches/patch-src_cabextract_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_cabextract_c,v 1.1 2010/07/31 00:30:27 kevlo Exp $
--- src/cabextract.c.orig Mon Jul 12 22:53:12 2010
+++ src/cabextract.c Fri Jul 30 16:48:06 2010
@@ -229,7 +229,7 @@ static int cabx_read(struct mspack_file *file, void *b
static int cabx_write(struct mspack_file *file, void *buffer, int bytes);
static int cabx_seek(struct mspack_file *file, off_t offset, int mode);
static off_t cabx_tell(struct mspack_file *file);
-static void cabx_msg(struct mspack_file *file, char *format, ...);
+static void cabx_msg(struct mspack_file *file, const char *format, ...);
static void *cabx_alloc(struct mspack_system *this, size_t bytes);
static void cabx_free(void *buffer);
static void cabx_copy(void *src, void *dest, size_t bytes);
@@ -1191,7 +1191,7 @@ static off_t cabx_tell(struct mspack_file *file) {
#endif
}
-static void cabx_msg(struct mspack_file *file, char *format, ...) {
+static void cabx_msg(struct mspack_file *file, const char *format, ...) {
va_list ap;
if (file) {
fprintf(stderr, "%s: ", ((struct mspack_file_p *) file)->name);