- permit UTF-8 as first char of dependency names (#455119) - handle RSA V4 signatures (#436812) - add alpha arch ISA-bits
This commit is contained in:
parent
4febce23b7
commit
513005792c
22
rpm-4.6.0-alpha-isa.patch
Normal file
22
rpm-4.6.0-alpha-isa.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
commit ac13da00266b1d0c6e6d76002d5f3d1114b6265b
|
||||||
|
Author: Panu Matilainen <pmatilai@redhat.com>
|
||||||
|
Date: Tue Mar 3 08:48:12 2009 +0200
|
||||||
|
|
||||||
|
Add ISA bits for alpha (Oliver Falk)
|
||||||
|
(cherry picked from commit d39a6c7de51c0d01ce69ee1f464b94ca70309751)
|
||||||
|
|
||||||
|
diff --git a/installplatform b/installplatform
|
||||||
|
index eaef958..cacbeca 100755
|
||||||
|
--- a/installplatform
|
||||||
|
+++ b/installplatform
|
||||||
|
@@ -124,6 +124,10 @@ for SUBST in $SUBSTS ; do
|
||||||
|
ISANAME=`echo ${ARCH} | sed "s/^\([^-]*\)-.*/\1/"`
|
||||||
|
ISABITS=32
|
||||||
|
;;
|
||||||
|
+ alpha*)
|
||||||
|
+ ISANAME=alpha
|
||||||
|
+ ISABITS=64
|
||||||
|
+ ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ -n "$MULTILIBNO" ]; then
|
30
rpm-4.6.0-dssingle-null.patch
Normal file
30
rpm-4.6.0-dssingle-null.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
commit 3448b552964a526641d2e85b4ed27ebe3465f100
|
||||||
|
Author: Panu Matilainen <pmatilai@redhat.com>
|
||||||
|
Date: Thu Feb 26 10:49:38 2009 +0200
|
||||||
|
|
||||||
|
Handle empty argv passed to rpmdsDupArgv()
|
||||||
|
- same as 94552b96256c3620b4be407c501d0d926c081963, apt-rpm expects to
|
||||||
|
pass empty version as NULL to rpmdsSingle()
|
||||||
|
|
||||||
|
diff --git a/lib/rpmds.c b/lib/rpmds.c
|
||||||
|
index 02b539c..bc829f4 100644
|
||||||
|
--- a/lib/rpmds.c
|
||||||
|
+++ b/lib/rpmds.c
|
||||||
|
@@ -508,15 +508,14 @@ const char ** rpmdsDupArgv(const char ** argv, int argc)
|
||||||
|
|
||||||
|
if (argv == NULL)
|
||||||
|
return NULL;
|
||||||
|
- for (ac = 0; ac < argc; ac++) {
|
||||||
|
-assert(argv[ac] != NULL);
|
||||||
|
+ for (ac = 0; ac < argc && argv[ac]; ac++) {
|
||||||
|
nb += strlen(argv[ac]) + 1;
|
||||||
|
}
|
||||||
|
nb += (ac + 1) * sizeof(*av);
|
||||||
|
|
||||||
|
av = xmalloc(nb);
|
||||||
|
t = (char *) (av + ac + 1);
|
||||||
|
- for (ac = 0; ac < argc; ac++) {
|
||||||
|
+ for (ac = 0; ac < argc && argv[ac]; ac++) {
|
||||||
|
av[ac] = t;
|
||||||
|
t = stpcpy(t, argv[ac]) + 1;
|
||||||
|
}
|
34
rpm-4.6.0-rsa-v4.patch
Normal file
34
rpm-4.6.0-rsa-v4.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
commit fbb16d025ecdae96f9301e47c2dab8b3e37bb5a8
|
||||||
|
Author: Panu Matilainen <pmatilai@redhat.com>
|
||||||
|
Date: Wed Mar 4 13:08:30 2009 +0200
|
||||||
|
|
||||||
|
Handle V4 signature trailer for RSA too (ticket #34)
|
||||||
|
(cherry picked from commit d50db40ceed7083467f7b548da7b2fbe96aaec61)
|
||||||
|
|
||||||
|
diff --git a/lib/signature.c b/lib/signature.c
|
||||||
|
index 67f70ab..2416e53 100644
|
||||||
|
--- a/lib/signature.c
|
||||||
|
+++ b/lib/signature.c
|
||||||
|
@@ -1199,17 +1199,16 @@ verifyRSASignature(rpmKeyring keyring, rpmtd sigtd, pgpDig dig, char ** msg,
|
||||||
|
if (sigp->hash != NULL)
|
||||||
|
xx = rpmDigestUpdate(ctx, sigp->hash, sigp->hashlen);
|
||||||
|
|
||||||
|
-#ifdef NOTYET /* XXX not for binary/text signatures as in packages. */
|
||||||
|
- if (!(sigp->sigtype == PGPSIGTYPE_BINARY || sigp->sigtype == PGP_SIGTYPE_TEXT)) {
|
||||||
|
- size_t nb = dig->nbytes + sigp->hashlen;
|
||||||
|
+ if (sigp->version == 4) {
|
||||||
|
+ /* V4 trailer is six octets long (rfc4880) */
|
||||||
|
uint8_t trailer[6];
|
||||||
|
+ uint32_t nb = sigp->hashlen;
|
||||||
|
nb = htonl(nb);
|
||||||
|
- trailer[0] = 0x4;
|
||||||
|
+ trailer[0] = sigp->version;
|
||||||
|
trailer[1] = 0xff;
|
||||||
|
- memcpy(trailer+2, &nb, sizeof(nb));
|
||||||
|
+ memcpy(trailer+2, &nb, 4);
|
||||||
|
xx = rpmDigestUpdate(ctx, trailer, sizeof(trailer));
|
||||||
|
}
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
xx = rpmDigestFinal(ctx, (void **)&dig->md5, &dig->md5len, 0);
|
||||||
|
|
29
rpm-4.6.0-utf-depnames.patch
Normal file
29
rpm-4.6.0-utf-depnames.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
commit 58e92b976aebe43ebddbe2d2ec41bff0dd46b6fc
|
||||||
|
Author: Panu Matilainen <pmatilai@redhat.com>
|
||||||
|
Date: Sat Feb 21 12:11:54 2009 +0200
|
||||||
|
|
||||||
|
Loosen up restrictions on dependency token names (rhbz#455119)
|
||||||
|
- Package names aren't restricted to ascii, no point restricting
|
||||||
|
dependency names either.
|
||||||
|
- This lets UTF-8 to go through but also all sorts of other junk but
|
||||||
|
as we haven't got a clue about the specs encoding, no can do. So we
|
||||||
|
only check for bad characters from plain ascii.
|
||||||
|
|
||||||
|
diff --git a/build/parseReqs.c b/build/parseReqs.c
|
||||||
|
index 54230c7..f2130ec 100644
|
||||||
|
--- a/build/parseReqs.c
|
||||||
|
+++ b/build/parseReqs.c
|
||||||
|
@@ -100,8 +100,11 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN,
|
||||||
|
|
||||||
|
Flags = (tagflags & ~RPMSENSE_SENSEMASK);
|
||||||
|
|
||||||
|
- /* Tokens must begin with alphanumeric, _, or / */
|
||||||
|
- if (!(risalnum(r[0]) || r[0] == '_' || r[0] == '/')) {
|
||||||
|
+ /*
|
||||||
|
+ * Tokens must begin with alphanumeric, _, or /, but we don't know
|
||||||
|
+ * the spec's encoding so we only check what we can: plain ascii.
|
||||||
|
+ */
|
||||||
|
+ if (isascii(r[0]) && !(risalnum(r[0]) || r[0] == '_' || r[0] == '/')) {
|
||||||
|
rpmlog(RPMLOG_ERR,
|
||||||
|
_("line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"),
|
||||||
|
spec->lineNum, spec->line);
|
16
rpm.spec
16
rpm.spec
@ -17,7 +17,7 @@
|
|||||||
Summary: The RPM package management system
|
Summary: The RPM package management system
|
||||||
Name: rpm
|
Name: rpm
|
||||||
Version: %{rpmver}
|
Version: %{rpmver}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.rpm.org/
|
Url: http://www.rpm.org/
|
||||||
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
|
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
|
||||||
@ -37,6 +37,10 @@ Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
|
|||||||
|
|
||||||
# Patches already in upstream
|
# Patches already in upstream
|
||||||
Patch200: rpm-4.6.0-rc1-defaultdocdir.patch
|
Patch200: rpm-4.6.0-rc1-defaultdocdir.patch
|
||||||
|
Patch201: rpm-4.6.0-dssingle-null.patch
|
||||||
|
Patch202: rpm-4.6.0-utf-depnames.patch
|
||||||
|
Patch203: rpm-4.6.0-alpha-isa.patch
|
||||||
|
Patch204: rpm-4.6.0-rsa-v4.patch
|
||||||
|
|
||||||
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
||||||
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
||||||
@ -170,6 +174,10 @@ that will manipulate RPM packages and databases.
|
|||||||
%patch100 -p1 -b .pkgconfig-deps
|
%patch100 -p1 -b .pkgconfig-deps
|
||||||
|
|
||||||
%patch200 -p1 -b .defaultdocdir
|
%patch200 -p1 -b .defaultdocdir
|
||||||
|
%patch201 -p1 -b .dssingle-null
|
||||||
|
%patch202 -p1 -b .utf-depnames
|
||||||
|
%patch203 -p1 -b .alpha-isa
|
||||||
|
%patch204 -p1 -b .rsa-v4
|
||||||
|
|
||||||
%if %{with int_bdb}
|
%if %{with int_bdb}
|
||||||
ln -s db-%{bdbver} db
|
ln -s db-%{bdbver} db
|
||||||
@ -366,6 +374,12 @@ exit 0
|
|||||||
%doc doc/librpm/html/*
|
%doc doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 12 2009 Panu Matilainen <pmatilai@redhat.com> - 4.6.0-2
|
||||||
|
- handle NULL as EVR to rpmdsSingle() (#487881, #485616)
|
||||||
|
- permit UTF-8 as first char of dependency names (#455119)
|
||||||
|
- handle RSA V4 signatures (#436812)
|
||||||
|
- add alpha arch ISA-bits
|
||||||
|
|
||||||
* Sat Feb 07 2009 Panu Matilainen <pmatilai@redhat.com>
|
* Sat Feb 07 2009 Panu Matilainen <pmatilai@redhat.com>
|
||||||
- update to 4.6.0 final: http://rpm.org/wiki/Releases/4.6.0, fixing
|
- update to 4.6.0 final: http://rpm.org/wiki/Releases/4.6.0, fixing
|
||||||
#475582, #478907, #476737, #479869, #476201
|
#475582, #478907, #476737, #479869, #476201
|
||||||
|
Loading…
Reference in New Issue
Block a user