Author: wolf Date: Tue May 23 16:47:47 2006 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- ported for 4.4.2
---- Files affected:
SOURCES:
rpm-lzma2.patch (1.2 -> 1.2.2.1)
---- Diffs:
================================================================
Index: SOURCES/rpm-lzma2.patch
diff -u SOURCES/rpm-lzma2.patch:1.2 SOURCES/rpm-lzma2.patch:1.2.2.1
--- SOURCES/rpm-lzma2.patch:1.2 Sun Apr 23 18:33:44 2006
+++ SOURCES/rpm-lzma2.patch Tue May 23 18:47:41 2006
@@ -1,7 +1,7 @@
-diff -Nru rpm-4.4.5.old/build/pack.c rpm-4.4.5/build/pack.c
---- rpm-4.4.5.old/build/pack.c 2005-12-09 11:07:42.000000000 +0100
-+++ rpm-4.4.5/build/pack.c 2006-04-22 22:00:58.000000000 +0200
-@@ -499,6 +499,12 @@
+diff -ruN rpm-4.4.2./build/pack.c rpm-4.4.2/build/pack.c
+--- rpm-4.4.2./build/pack.c 2005-07-15 17:06:57.000000000 +0200
++++ rpm-4.4.2/build/pack.c 2006-05-23 18:15:38.359083760 +0200
+@@ -479,6 +479,12 @@
/* Add prereq on rpm version that understands bzip2 payloads */
(void) rpmlibNeedsFeature(h, "PayloadIsBzip2", "3.0.5-1");
}
@@ -14,34 +14,35 @@
strcpy(buf, rpmio_flags);
buf[s - rpmio_flags] = '\0';
(void) headerAddEntry(h, RPMTAG_PAYLOADFLAGS, RPM_STRING_TYPE, buf+1,
1);
-diff -Nru rpm-4.4.5.old/lib/psm.c rpm-4.4.5/lib/psm.c
---- rpm-4.4.5.old/lib/psm.c 2006-04-22 15:02:52.000000000 +0200
-+++ rpm-4.4.5/lib/psm.c 2006-04-22 17:18:55.000000000 +0200
-@@ -2154,6 +2154,8 @@
+diff -ruN rpm-4.4.2./lib/psm.c rpm-4.4.2/lib/psm.c
+--- rpm-4.4.2./lib/psm.c 2006-05-23 16:58:47.000000000 +0200
++++ rpm-4.4.2/lib/psm.c 2006-05-23 18:16:44.419041120 +0200
+@@ -2059,6 +2059,9 @@
t = stpcpy(t, ".gzdio");
if (!strcmp(payload_compressor, "bzip2"))
t = stpcpy(t, ".bzdio");
+ if (!strcmp(payload_compressor, "lzma"))
-+ t = stpcpy(t, ".lzdio");
++ t = strcpy(t, ".lzdio");
++
+ rc = RPMRC_OK;
+ } break;
- /[EMAIL PROTECTED]@*/
- if (!hge(fi->h, RPMTAG_PAYLOADFORMAT, NULL,
-diff -Nru rpm-4.4.5.old/lib/rpmds.c rpm-4.4.5/lib/rpmds.c
---- rpm-4.4.5.old/lib/rpmds.c 2005-12-09 10:52:23.000000000 +0100
-+++ rpm-4.4.5/lib/rpmds.c 2006-04-22 22:04:23.000000000 +0200
-@@ -1324,6 +1324,9 @@
- { "rpmlib(PayloadIsUstar)", "4.4.4-1",
- (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
- N_("package payload can be in ustar tar archive format.") },
+diff -ruN rpm-4.4.2./lib/rpmlibprov.c rpm-4.4.2/lib/rpmlibprov.c
+--- rpm-4.4.2./lib/rpmlibprov.c 2004-03-16 22:58:29.000000000 +0100
++++ rpm-4.4.2/lib/rpmlibprov.c 2006-05-23 18:21:13.235174856 +0200
+@@ -54,6 +54,9 @@
+ { "rpmlib(BuiltinLuaScripts)", "4.2.2-1",
+ ( RPMSENSE_EQUAL),
+ N_("internal support for lua scripts.") },
+ { "rpmlib(PayloadIsLzma)", "4.4.6-1",
-+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
++ ( RPMSENSE_EQUAL),
+ N_("package payload can be compressed using lzma.") },
{ NULL, NULL, 0, NULL }
};
-diff -Nru rpm-4.4.5.old/rpm2cpio.c rpm-4.4.5/rpm2cpio.c
---- rpm-4.4.5.old/rpm2cpio.c 2005-01-17 19:46:16.000000000 +0100
-+++ rpm-4.4.5/rpm2cpio.c 2006-04-22 17:18:55.000000000 +0200
+diff -ruN rpm-4.4.2./rpm2cpio.c rpm-4.4.2/rpm2cpio.c
+--- rpm-4.4.2./rpm2cpio.c 2005-01-17 19:46:16.000000000 +0100
++++ rpm-4.4.2/rpm2cpio.c 2006-05-23 18:15:38.364083000 +0200
@@ -76,6 +76,8 @@
t = stpcpy(t, ".gzdio");
if (!strcmp(payload_compressor, "bzip2"))
@@ -51,22 +52,11 @@
}
gzdi = Fdopen(fdi, rpmio_flags); /* XXX gzdi == fdi */
-diff -Nru rpm-4.4.5.old/rpmio/librpmio.vers rpm-4.4.5/rpmio/librpmio.vers
---- rpm-4.4.5.old/rpmio/librpmio.vers 2005-11-01 14:37:40.000000000 +0100
-+++ rpm-4.4.5/rpmio/librpmio.vers 2006-04-22 17:18:55.000000000 +0200
-@@ -85,6 +85,7 @@
- isCompressed;
- Link;
- Lstat;
-+ lzdio;
- max_macro_depth;
- Mkdir;
- noLibio;
-diff -Nru rpm-4.4.5.old/rpmio/Makefile.am rpm-4.4.5/rpmio/Makefile.am
---- rpm-4.4.5.old/rpmio/Makefile.am 2006-04-22 15:02:56.000000000 +0200
-+++ rpm-4.4.5/rpmio/Makefile.am 2006-04-23 13:31:09.000000000 +0200
+diff -ruN rpm-4.4.2./rpmio/Makefile.am rpm-4.4.2/rpmio/Makefile.am
+--- rpm-4.4.2./rpmio/Makefile.am 2006-05-23 16:58:47.000000000 +0200
++++ rpm-4.4.2/rpmio/Makefile.am 2006-05-23 18:22:45.116206816 +0200
@@ -22,14 +22,14 @@
- argv.h fts.h rmd128.h rmd160.h rpmdav.h \
+ argv.h fts.h rpmdav.h \
rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \
rpmsq.h rpmsw.h ugid.h
-noinst_HEADERS = rpmio_internal.h rpmlua.h rpmhook.h
@@ -77,15 +67,15 @@
usrlibdir = $(libdir)@MARK64@
usrlib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = \
-- argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \
-+ LzmaDecode.c argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \
+- argv.c digest.c fts.c macro.c rpmdav.c \
++ LzmaDecode.c argv.c digest.c fts.c macro.c rpmdav.c \
rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
- rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c strtolocale.c \
- stubs.c url.c ugid.c
-diff -Nru rpm-4.4.5.old/rpmio/rpmio.c rpm-4.4.5/rpmio/rpmio.c
---- rpm-4.4.5.old/rpmio/rpmio.c 2006-04-22 15:02:55.000000000 +0200
-+++ rpm-4.4.5/rpmio/rpmio.c 2006-04-23 14:43:10.000000000 +0200
-@@ -82,6 +82,7 @@
+ rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c
+ librpmio_la_LDFLAGS = -release 4.4 $(LDFLAGS) \
+diff -ruN rpm-4.4.2./rpmio/rpmio.c rpm-4.4.2/rpmio/rpmio.c
+--- rpm-4.4.2./rpmio/rpmio.c 2006-05-23 16:58:47.000000000 +0200
++++ rpm-4.4.2/rpmio/rpmio.c 2006-05-23 18:15:38.367082544 +0200
+@@ -80,6 +80,7 @@
#define FDONLY(fd) assert(fdGetIo(fd) == fdio)
#define GZDONLY(fd) assert(fdGetIo(fd) == gzdio)
#define BZDONLY(fd) assert(fdGetIo(fd) == bzdio)
@@ -93,7 +83,7 @@
#define UFDONLY(fd) /* assert(fdGetIo(fd) == ufdio) */
-@@ -182,6 +183,8 @@
+@@ -180,6 +181,8 @@
} else if (fps->io == bzdio) {
sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
#endif
@@ -102,7 +92,7 @@
} else if (fps->io == fpio) {
/[EMAIL PROTECTED]@*/
sprintf(be, "%s %p(%d) fdno %d",
-@@ -2370,6 +2373,327 @@
+@@ -2361,6 +2364,327 @@
/[EMAIL PROTECTED]@*/
#endif /* HAVE_BZLIB_H */
@@ -430,7 +420,7 @@
/* =============================================================== */
/[EMAIL PROTECTED]@*/
static const char * getFdErrstr (FD_t fd)
-@@ -2388,7 +2712,9 @@
+@@ -2379,7 +2703,9 @@
errstr = fd->errcookie;
} else
#endif /* HAVE_BZLIB_H */
@@ -441,7 +431,7 @@
{
errstr = (fd->syserrno ? strerror(fd->syserrno) : "");
}
-@@ -2683,6 +3009,9 @@
+@@ -2674,6 +3000,9 @@
fd = bzdFdopen(fd, zstdio);
/[EMAIL PROTECTED]@*/
#endif
@@ -451,7 +441,7 @@
} else if (!strcmp(end, "ufdio")) {
iof = ufdio;
} else if (!strcmp(end, "fpio")) {
-@@ -2849,6 +3178,9 @@
+@@ -2839,6 +3168,9 @@
ec = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0;
i--; /* XXX fdio under bzdio always has fdno == -1 */
#endif
@@ -461,10 +451,10 @@
} else {
/* XXX need to check ufdio/gzdio/bzdio/fdio errors correctly. */
ec = (fdFileno(fd) < 0 ? -1 : 0);
-diff -Nru rpm-4.4.5.old/rpmio/rpmio.h rpm-4.4.5/rpmio/rpmio.h
---- rpm-4.4.5.old/rpmio/rpmio.h 2005-11-04 00:19:54.000000000 +0100
-+++ rpm-4.4.5/rpmio/rpmio.h 2006-04-22 17:18:55.000000000 +0200
-@@ -673,6 +673,10 @@
+diff -ruN rpm-4.4.2./rpmio/rpmio.h rpm-4.4.2/rpmio/rpmio.h
+--- rpm-4.4.2./rpmio/rpmio.h 2005-06-11 22:03:14.000000000 +0200
++++ rpm-4.4.2/rpmio/rpmio.h 2006-05-23 18:15:38.373081632 +0200
+@@ -662,6 +662,10 @@
/**
*/
@@ -475,9 +465,9 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ extern FDIO_t fadio;
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]/
-diff -Nru rpm-4.4.5.old/tools/rpmtool.c rpm-4.4.5/tools/rpmtool.c
---- rpm-4.4.5.old/tools/rpmtool.c 2005-01-17 19:46:27.000000000 +0100
-+++ rpm-4.4.5/tools/rpmtool.c 2006-04-22 17:18:55.000000000 +0200
+diff -ruN rpm-4.4.2./tools/rpmtool.c rpm-4.4.2/tools/rpmtool.c
+--- rpm-4.4.2./tools/rpmtool.c 2005-01-17 19:46:27.000000000 +0100
++++ rpm-4.4.2/tools/rpmtool.c 2006-05-23 18:15:38.374081480 +0200
@@ -87,7 +87,8 @@
RPMIOBITS_UNCOMPRESS= (1 << 8),
RPMIOBITS_BINARY = (1 << 9),
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-lzma2.patch?r1=1.2&r2=1.2.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
