RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 04-Oct-2008 18:31:04
Branch: HEAD Handle: 2008100416310301
Modified files:
rpm CHANGES
rpm/rpmio lzdio.c
Log:
lzdio: fix build with recent api changes.
Summary:
Revision Changes Path
1.2583 +1 -0 rpm/CHANGES
1.15 +29 -6 rpm/rpmio/lzdio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2582 -r1.2583 CHANGES
--- rpm/CHANGES 2 Oct 2008 15:05:26 -0000 1.2582
+++ rpm/CHANGES 4 Oct 2008 16:31:03 -0000 1.2583
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - proyvind: lzdio: fix build with recent api changes.
- jbj: fix: initialize next element of rpmlog store correctly.
- rpm.org: python: cleanup & exit callback immediately on error.
- jbj: add FNM_EXTMATCH to default flags w RPMMIRE_GLOB.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/lzdio.c
============================================================================
$ cvs diff -u -r1.14 -r1.15 lzdio.c
--- rpm/rpmio/lzdio.c 2 Aug 2008 22:37:38 -0000 1.14
+++ rpm/rpmio/lzdio.c 4 Oct 2008 16:31:04 -0000 1.15
@@ -86,16 +86,39 @@
lzfile->fp = fp;
lzfile->encoding = encoding;
lzfile->eof = 0;
- lzfile->strm = LZMA_STREAM_INIT_VAR;
+ lzma_stream tmp =
+#if LZMA_VERSION == 49990030
+ LZMA_STREAM_INIT_VAR;
+#else
+ LZMA_STREAM_INIT;
+#endif
+ lzfile->strm = tmp;
if (encoding) {
- lzma_options_alone alone;
+#if LZMA_VERSION == 49990030
+ lzma_options_alone options;
/[EMAIL PROTECTED]@*/
- alone.uncompressed_size = LZMA_VLI_VALUE_UNKNOWN;
+ options.uncompressed_size = LZMA_VLI_VALUE_UNKNOWN;
/[EMAIL PROTECTED]@*/
- memcpy(&alone.lzma, &lzma_preset_lzma[level - 1], sizeof(alone.lzma));
- ret = lzma_alone_encoder(&lzfile->strm, &alone);
+ memcpy(&options.lzma, &lzma_preset_lzma[level - 1],
sizeof(options.lzma));
+#else
+ lzma_options_lzma options;
+ lzma_lzma_preset(&options, level - 1);
+#endif
+ ret = lzma_alone_encoder(&lzfile->strm, &options);
} else {
- ret = lzma_auto_decoder(&lzfile->strm, 0, 0);
+ ret = lzma_auto_decoder(&lzfile->strm,
+#if LZMA_VERSION == 49990030
+ NULL
+#else
+ /* FIXME: second argument now sets memory limit,
setting it to
+ * '-1' means unlimited and isn't really recommended. A
sane
+ * default value when setting it to '0' will probably
be
+ * implemented in liblzma soon, so then we should
switch
+ * back to '0'.
+ */
+ -1
+#endif
+ , 0);
}
if (ret != LZMA_OK) {
(void) fclose(fp);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
