rpms/cabextract/devel .cvsignore, 1.3, 1.4 cabextract-macro.patch, 1.1, 1.2 cabextract.spec, 1.13, 1.14 sources, 1.3, 1.4
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Mon Feb 11 15:26:54 UTC 2008
Author: pertusus
Update of /cvs/extras/rpms/cabextract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646
Modified Files:
.cvsignore cabextract-macro.patch cabextract.spec sources
Log Message:
* Mon Feb 11 2008 Patrice Dumas <pertusus at free.fr> - 1.2-1
- update to 1.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 Aug 2007 01:42:28 -0000 1.3
+++ .cvsignore 11 Feb 2008 15:26:05 -0000 1.4
@@ -1,2 +1 @@
-cabextract-1.0.tar.gz
-cabextract-1.1.tar.gz
+cabextract-1.2.tar.gz
cabextract-macro.patch:
Index: cabextract-macro.patch
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/cabextract-macro.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cabextract-macro.patch 18 Mar 2005 09:27:54 -0000 1.1
+++ cabextract-macro.patch 11 Feb 2008 15:26:05 -0000 1.2
@@ -1,72 +1,111 @@
-diff -NarU1 cabextract-1.1.orig/mspack/cabd.c cabextract-1.1/mspack/cabd.c
---- cabextract-1.1.orig/mspack/cabd.c 2004-10-18 11:10:15.000000000 +0300
-+++ cabextract-1.1/mspack/cabd.c 2005-03-18 01:24:26.000000000 +0200
-@@ -331,3 +331,3 @@
+diff -up cabextract-1.2/mspack/qtmd.c.macro cabextract-1.2/mspack/qtmd.c
+--- cabextract-1.2/mspack/qtmd.c.macro 2006-09-21 01:13:14.000000000 +0200
++++ cabextract-1.2/mspack/qtmd.c 2008-02-11 15:53:19.000000000 +0100
+@@ -89,7 +89,7 @@
+ } while (0)
+
+ static int qtmd_read_input(struct qtmd_stream *qtm) {
+- int read = qtm->sys->read(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
++ int read = (qtm->sys->read)(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
+ if (read < 0) return qtm->error = MSPACK_ERR_READ;
+
+ qtm->i_ptr = &qtm->inbuf[0];
+diff -up cabextract-1.2/mspack/cabd.c.macro cabextract-1.2/mspack/cabd.c
+--- cabextract-1.2/mspack/cabd.c.macro 2006-09-21 01:13:14.000000000 +0200
++++ cabextract-1.2/mspack/cabd.c 2008-02-11 15:53:19.000000000 +0100
+@@ -340,7 +340,7 @@ static int cabd_read_headers(struct mspa
+ }
+
/* read in the CFHEADER */
- if (sys->read(fh, &buf[0], cfhead_SIZEOF) != cfhead_SIZEOF) {
+ if ((sys->read)(fh, &buf[0], cfhead_SIZEOF) != cfhead_SIZEOF) {
return MSPACK_ERR_READ;
-@@ -367,3 +367,3 @@
+ }
+
+@@ -376,7 +376,7 @@ static int cabd_read_headers(struct mspa
+ /* read the reserved-sizes part of header, if present */
+ cab->base.flags = EndGetI16(&buf[cfhead_Flags]);
if (cab->base.flags & cfheadRESERVE_PRESENT) {
- if (sys->read(fh, &buf[0], cfheadext_SIZEOF) != cfheadext_SIZEOF) {
+ if ((sys->read)(fh, &buf[0], cfheadext_SIZEOF) != cfheadext_SIZEOF) {
return MSPACK_ERR_READ;
-@@ -405,3 +405,3 @@
+ }
+ cab->base.header_resv = EndGetI16(&buf[cfheadext_HeaderReserved]);
+@@ -414,7 +414,7 @@ static int cabd_read_headers(struct mspa
+
+ /* read folders */
for (i = 0; i < num_folders; i++) {
- if (sys->read(fh, &buf[0], cffold_SIZEOF) != cffold_SIZEOF) {
+ if ((sys->read)(fh, &buf[0], cffold_SIZEOF) != cffold_SIZEOF) {
return MSPACK_ERR_READ;
-@@ -435,3 +435,3 @@
+ }
+ if (folder_resv) {
+@@ -444,7 +444,7 @@ static int cabd_read_headers(struct mspa
+
+ /* read files */
for (i = 0; i < num_files; i++) {
- if (sys->read(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
+ if ((sys->read)(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
return MSPACK_ERR_READ;
-@@ -528,3 +528,3 @@
+ }
+
+@@ -537,7 +537,7 @@ static char *cabd_read_string(struct msp
+ unsigned int len, i, ok;
+
/* read up to 256 bytes */
- len = sys->read(fh, &buf[0], 256);
+ len = (sys->read)(fh, &buf[0], 256);
-@@ -641,3 +641,3 @@
- /* fill the search buffer with data from disk */
-- if (sys->read(fh, &buf[0], length) != length) {
-+ if ((sys->read)(fh, &buf[0], length) != length) {
- return MSPACK_ERR_READ;
-@@ -1213,3 +1213,3 @@
+ /* search for a null terminator in the buffer */
+ for (i = 0, ok = 0; i < len; i++) if (!buf[i]) { ok = 1; break; }
+@@ -1240,7 +1240,7 @@ static int cabd_sys_read_block(struct ms
+
+ do {
/* read the block header */
- if (sys->read(d->infh, &hdr[0], cfdata_SIZEOF) != cfdata_SIZEOF) {
+ if ((sys->read)(d->infh, &hdr[0], cfdata_SIZEOF) != cfdata_SIZEOF) {
return MSPACK_ERR_READ;
-@@ -1239,3 +1239,3 @@
+ }
+
+@@ -1266,7 +1266,7 @@ static int cabd_sys_read_block(struct ms
+ }
+
/* read the block data */
- if (sys->read(d->infh, d->i_end, len) != len) {
+ if ((sys->read)(d->infh, d->i_end, len) != len) {
return MSPACK_ERR_READ;
-@@ -1353,3 +1353,3 @@
+ }
+
+@@ -1380,7 +1380,7 @@ static int noned_decompress(struct noned
+ int run;
+ while (bytes > 0) {
run = (bytes > s->bufsize) ? s->bufsize : (int) bytes;
- if (s->sys->read(s->i, &s->buf[0], run) != run) return MSPACK_ERR_READ;
+ if ((s->sys->read)(s->i, &s->buf[0], run) != run) return MSPACK_ERR_READ;
if (s->sys->write(s->o, &s->buf[0], run) != run) return MSPACK_ERR_WRITE;
-diff -NarU1 cabextract-1.1.orig/mspack/lzxd.c cabextract-1.1/mspack/lzxd.c
---- cabextract-1.1.orig/mspack/lzxd.c 2004-10-18 11:10:15.000000000 +0300
-+++ cabextract-1.1/mspack/lzxd.c 2005-03-18 01:23:01.000000000 +0200
-@@ -128,3 +128,3 @@
- static int lzxd_read_input(struct lzxd_stream *lzx) {
-- int read = lzx->sys->read(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
-+ int read = (lzx->sys->read)(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
- if (read < 0) return lzx->error = MSPACK_ERR_READ;
-diff -NarU1 cabextract-1.1.orig/mspack/mszipd.c cabextract-1.1/mspack/mszipd.c
---- cabextract-1.1.orig/mspack/mszipd.c 2004-10-18 11:10:15.000000000 +0300
-+++ cabextract-1.1/mspack/mszipd.c 2005-03-18 01:23:59.000000000 +0200
-@@ -91,3 +91,3 @@
+ bytes -= run;
+ }
+diff -up cabextract-1.2/mspack/mszipd.c.macro cabextract-1.2/mspack/mszipd.c
+--- cabextract-1.2/mspack/mszipd.c.macro 2006-09-21 01:13:14.000000000 +0200
++++ cabextract-1.2/mspack/mszipd.c 2008-02-11 15:53:19.000000000 +0100
+@@ -89,7 +89,7 @@ static const unsigned short bit_mask[17]
+ } while (0)
+
static int zipd_read_input(struct mszipd_stream *zip) {
- int read = zip->sys->read(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);
+ int read = (zip->sys->read)(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);
if (read < 0) return zip->error = MSPACK_ERR_READ;
-diff -NarU1 cabextract-1.1.orig/mspack/qtmd.c cabextract-1.1/mspack/qtmd.c
---- cabextract-1.1.orig/mspack/qtmd.c 2004-10-18 11:10:15.000000000 +0300
-+++ cabextract-1.1/mspack/qtmd.c 2005-03-18 01:25:06.000000000 +0200
-@@ -91,3 +91,3 @@
- static int qtmd_read_input(struct qtmd_stream *qtm) {
-- int read = qtm->sys->read(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
-+ int read = (qtm->sys->read)(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
- if (read < 0) return qtm->error = MSPACK_ERR_READ;
+ zip->i_ptr = &zip->inbuf[0];
+ zip->i_end = &zip->inbuf[read];
+diff -up cabextract-1.2/mspack/lzxd.c.macro cabextract-1.2/mspack/lzxd.c
+--- cabextract-1.2/mspack/lzxd.c.macro 2006-09-21 01:13:14.000000000 +0200
++++ cabextract-1.2/mspack/lzxd.c 2008-02-11 15:53:19.000000000 +0100
+@@ -133,7 +133,7 @@
+ } while (0)
+
+ static int lzxd_read_input(struct lzxd_stream *lzx) {
+- int read = lzx->sys->read(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
++ int read = (lzx->sys->read)(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
+ if (read < 0) return lzx->error = MSPACK_ERR_READ;
+
+ /* huff decode's ENSURE_BYTES(16) might overrun the input stream, even
Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/cabextract.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cabextract.spec 11 Feb 2008 13:22:52 -0000 1.13
+++ cabextract.spec 11 Feb 2008 15:26:05 -0000 1.14
@@ -1,13 +1,13 @@
Name: cabextract
-Version: 1.1
-Release: 8%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: Utility for extracting cabinet (.cab) archives
Group: Applications/Archiving
License: GPLv2+
URL: http://www.kyz.uklinux.net/cabextract.php
-Source: http://www.kyz.uklinux.net/downloads/%{name}-%{version}.tar.gz
+Source: http://www.cabextract.org.uk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: cabextract-macro.patch
@@ -26,7 +26,6 @@
chmod -x mspack/mspack.h
-
%build
%configure
@@ -51,6 +50,9 @@
%changelog
+* Mon Feb 11 2008 Patrice Dumas <pertusus at free.fr> - 1.2-1
+- update to 1.2
+
* Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1-8
- respin (gcc43)
- cosmetics
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 Nov 2004 21:16:20 -0000 1.3
+++ sources 11 Feb 2008 15:26:05 -0000 1.4
@@ -1 +1 @@
-f4b729c0be7d288660f4fc167de199a1 cabextract-1.1.tar.gz
+dc421a690648b503265c82ade84e143e cabextract-1.2.tar.gz
More information about the fedora-extras-commits
mailing list