[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/rpmdb/ fprint.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 07-Jun-2011 15:17:20
Branch: rpm-5_3 Handle: 2011060713171901
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/rpmdb fprint.c
Log:
data returned by hash should be of type struct rpmffi_s **i instead of
struct rpmffi_s * to avoid segfault. Patch by Qing He.
Summary:
RevisionChanges Path
1.3296.2.237+3 -0 rpm/CHANGES
1.40.2.1+3 -3 rpm/rpmdb/fprint.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.236 -r1.3296.2.237 CHANGES
--- rpm/CHANGES 7 Jun 2011 13:13:30 - 1.3296.2.236
+++ rpm/CHANGES 7 Jun 2011 13:17:19 - 1.3296.2.237
@@ -1,4 +1,7 @@
5.3.12 - 5.3.13
+- devzero2000: In fpLookupSubdir, data returned by hash should be of type
+ struct rpmffi_s ** instead of struct rpmffi_s * to avoid
+ segfault. Patch by Qing He.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/fprint.c
$ cvs diff -u -r1.40 -r1.40.2.1 fprint.c
--- rpm/rpmdb/fprint.c6 Mar 2010 16:20:46 - 1.40
+++ rpm/rpmdb/fprint.c7 Jun 2011 13:17:20 - 1.40.2.1
@@ -333,7 +333,7 @@
*te = '\0';
while (te se) {
- struct rpmffi_s * recs;
+ struct rpmffi_s ** recs;
int numRecs;
int i;
@@ -346,8 +346,8 @@
const char * link;
int fx;
- fx = recs[i].fileno;
- fi = recs[i].p-fi;
+ fx = recs[i]-fileno;
+ fi = recs[i]-p-fi;
flink = fi-flinks[fx];
if (!(flink *flink != '\0'))
continue;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/build/ parseChangelog.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 07-Jun-2011 18:33:25
Branch: rpm-5_4 Handle: 2011060716332401
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/build parseChangelog.c
Log:
fix implicit %clean not being run when %changelog is present.
Summary:
RevisionChanges Path
1.3501.2.138+2 -0 rpm/CHANGES
2.50.6.1+8 -0 rpm/build/parseChangelog.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.137 -r1.3501.2.138 CHANGES
--- rpm/CHANGES 7 Jun 2011 15:37:38 - 1.3501.2.137
+++ rpm/CHANGES 7 Jun 2011 16:33:24 - 1.3501.2.138
@@ -1,4 +1,6 @@
5.4.1 - 5.4.2
+- proyvind: mandriva: fix implicit %clean not being run when %changelog
is
+ present.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseChangelog.c
$ cvs diff -u -r2.50 -r2.50.6.1 parseChangelog.c
--- rpm/build/parseChangelog.c18 Jan 2009 17:19:58 - 2.50
+++ rpm/build/parseChangelog.c7 Jun 2011 16:33:25 - 2.50.6.1
@@ -269,7 +269,11 @@
/* There are no options to %changelog */
if ((rc = readLine(spec, STRIP_COMMENTS)) 0) {
iob = rpmiobFree(iob);
+#if defined(RPM_VENDOR_MANDRIVA)
+ return (spec-clean == NULL) ? PART_CLEAN : PART_NONE;
+#else
return PART_NONE;
+#endif
}
if (rc != RPMRC_OK)
return rc;
@@ -281,7 +285,11 @@
iob = rpmiobAppend(iob, spec-line, 0);
line = _free(line);
if ((rc = readLine(spec, STRIP_COMMENTS | STRIP_NOEXPAND)) 0) {
+#if defined(RPM_VENDOR_MANDRIVA)
+ nextPart = (spec-clean == NULL) ? PART_CLEAN : PART_NONE;
+#else
nextPart = PART_NONE;
+#endif
break;
}
if (rc != RPMRC_OK)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
