Attachment 106050 Details for Bug 137834 – rpm diffs between -13 and -20

[patch] rpm diffs between -13 and -20

rpm-diffs (text/plain), 4.36 KB, created by Bill Nottingham on 2004-11-01 22:06:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2004-11-01 22:06:08 UTC

Size: 4.36 KB

patch

obsolete

>diff -ru --exclude CVS rpm-4.3.2-foo/CHANGES rpm-4.3.2/CHANGES
>--- rpm-4.3.2-foo/CHANGES	2004-10-15 11:26:59.000000000 -0400
>+++ rpm-4.3.2/CHANGES	2004-10-31 13:22:32.000000000 -0500
>@@ -29,6 +29,12 @@
> 	- honor inherited SIG_IGN when establishing rpmdb signal exit (#134474).
> 	- python: remove ".A" from creaky ts.check() tuple return (#135008).
> 	- fix: don't set handler if SIG_IGN is already set (#134474).
>+	- don't add time stamp to compressed man pages (#132526).
>+	- selinux: set "ldconfig_t" for /sbin/ldconfig, else "rpm_script_t".
>+	- python: fix RPMPROB_BADRELOCATE segfault return in ts.check (#137116).
>+	- revert selinux patch until fc3 release.
>+	- reprise file conflicts yet again, flip/flop/flip/flop ...
>+	- fix: buffer overrun displaying ko_KR (#135389).
> 
> 4.3 -> 4.3.1:
> 	- fix: don't add leading space to %* argv expansion (#119059).
>diff -ru --exclude CVS rpm-4.3.2-foo/lib/formats.c rpm-4.3.2/lib/formats.c
>--- rpm-4.3.2-foo/lib/formats.c	2004-09-04 12:58:23.000000000 -0400
>+++ rpm-4.3.2/lib/formats.c	2004-10-31 13:18:39.000000000 -0500
>@@ -432,11 +432,15 @@
> 	} else {
> 	    pgpDig dig = pgpNewDig();
> 	    pgpDigParams sigp = &dig->signature;
>-	    size_t nb = 80;
>+	    size_t nb = 0;
>+	    const char *tempstr;
> 
> 	    (void) pgpPrtPkts(pkt, pktlen, dig, 0);
> 
>-	    val = t = xmalloc(nb + 1);
>+	    val = NULL;
>+	again:
>+	    nb += 100;
>+	    val = t = xrealloc(val, nb + 1);
> 
> /*@-boundswrite@*/
> 	    switch (sigp->pubkey_algo) {
>@@ -447,10 +451,12 @@
> 		t = stpcpy(t, "RSA");
> 		break;
> 	    default:
>-		sprintf(t, "%d", sigp->pubkey_algo);
>+		snprintf(t, nb - (t - val), "%d", sigp->pubkey_algo);
> 		t += strlen(t);
> 		break;
> 	    }
>+	    if (t + 5 >= val + nb)
>+		goto again;
> 	    *t++ = '/';
> 	    switch (sigp->hash_algo) {
> 	    case PGPHASHALGO_MD5:
>@@ -460,10 +466,12 @@
> 		t = stpcpy(t, "SHA1");
> 		break;
> 	    default:
>-		sprintf(t, "%d", sigp->hash_algo);
>+		snprintf(t, nb - (t - val), "%d", sigp->hash_algo);
> 		t += strlen(t);
> 		break;
> 	    }
>+	    if (t + strlen (", ") + 1 >= val + nb)
>+		goto again;
> 
> 	    t = stpcpy(t, ", ");
> 
>@@ -474,8 +482,13 @@
>  		    (void) strftime(t, (nb - (t - val)), "%c", tstruct);
> 	    }
> 	    t += strlen(t);
>+	    if (t + strlen (", Key ID ") + 1 >= val + nb)
>+		goto again;
> 	    t = stpcpy(t, ", Key ID ");
>-	    t = stpcpy(t, pgpHexStr(sigp->signid, sizeof(sigp->signid)));
>+	    tempstr = pgpHexStr(sigp->signid, sizeof(sigp->signid));
>+	    if (t + strlen (tempstr) > val + nb)
>+		goto again;
>+	    t = stpcpy(t, tempstr);
> /*@=boundswrite@*/
> 
> 	    dig = pgpFreeDig(dig);
>diff -ru --exclude CVS rpm-4.3.2-foo/lib/poptI.c rpm-4.3.2/lib/poptI.c
>--- rpm-4.3.2-foo/lib/poptI.c	2004-09-15 12:43:54.000000000 -0400
>+++ rpm-4.3.2/lib/poptI.c	2004-10-30 21:54:01.000000000 -0400
>@@ -16,8 +16,7 @@
> /*@unchecked@*/
> struct rpmInstallArguments_s rpmIArgs = {
>     0,			/* transFlags */
>-			/* probFilter */
>-    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
>+    0,			/* probFilter */
>     0,			/* installInterfaceFlags */
>     0,			/* eraseInterfaceFlags */
>     0,			/* qva_flags */
>diff -ru --exclude CVS rpm-4.3.2-foo/lib/psm.c rpm-4.3.2/lib/psm.c
>--- rpm-4.3.2-foo/lib/psm.c	2004-10-08 13:23:08.000000000 -0400
>+++ rpm-4.3.2/lib/psm.c	2004-10-29 18:07:00.000000000 -0400
>@@ -858,8 +858,13 @@
> 
> 	    /* Set "rpm_script_t" identity for scriptlets under selinux. */
> 	    if (rpmtsSELinuxEnabled(ts) == 1) {	
>-		/* Set rpm_script_t for /bin/sh, default /sbin/ldconfig et al */
>+		/* Set "ldconfig_t" for /sbin/ldconfig else "rpm_script_t" */
>+#if 0
>+		xx = switchExecType(psm,
>+	(!strcmp(argv[0],"/sbin/ldconfig") ? "ldconfig_t" : "rpm_script_t"));
>+#else
> 		xx = switchExecType(psm, "rpm_script_t");
>+#endif
> 		if (xx != 0)
> 		    break;
> 	    }
>diff -ru --exclude CVS rpm-4.3.2-foo/python/rpmts-py.c rpm-4.3.2/python/rpmts-py.c
>--- rpm-4.3.2-foo/python/rpmts-py.c	2004-10-11 11:35:21.000000000 -0400
>+++ rpm-4.3.2/python/rpmts-py.c	2004-10-29 18:02:03.000000000 -0400
>@@ -363,6 +363,8 @@
>     int i;
>     int xx;
> 
>+rpmIncreaseVerbosity();
>+rpmIncreaseVerbosity();
>     memset(&cbInfo, 0, sizeof(cbInfo));
>     if (!PyArg_ParseTuple(args, "|O:Check", &cbInfo.cb))
> 	return NULL;
>@@ -417,6 +419,9 @@
> 
> 	    p = ps->probs + i;
> 
>+	    /* XXX autorelocated i386 on ia64, fix system-config-packages! */
>+	    if (p->type == RPMPROB_BADRELOCATE)
>+		continue;
> 	    byName = p->pkgNEVR;
> 	    if ((byArch= strrchr(byName, '.')) != NULL)
> 		*byArch++ = '\0';

Actions: View | Diff

Attachments on bug 137834: 106050 | 106056