testing/rpm
SHA256
6
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

update to rpm-4.9.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
This commit is contained in:
Michael Schröder
2011-05-16 16:07:44 +00:00
committed by Git OBS Bridge
parent 5d8f14209e
commit cebe6dd1a8
87 changed files with 1633 additions and 2481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
rpm-beecrypt.diff
View File

@@ -1,17 +1,5 @@
--- ./Makefile.am.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./Makefile.am 2010-03-24 15:39:14.000000000 +0000
@@ -87,7 +87,8 @@ DISTCLEANFILES += find-requires
rpm_SOURCES = rpmqv.c debug.h system.h
rpm_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
-rpm_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
+rpm_LDADD = lib/librpm.la rpmio/librpmio.la
+rpm_LDADD += build/.libs/spec.o build/.libs/misc.o build/.libs/names.o build/.libs/expression.o build/.libs/reqprov.o build/.libs/poptBT.o build/.libs/parse*.o
rpm_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmbuild_SOURCES = build.c rpmqv.c build.h debug.h system.h
--- ./config.h.in.orig 2010-01-08 08:35:12.000000000 +0000
+++ ./config.h.in 2010-03-24 15:39:14.000000000 +0000
--- ./config.h.in.orig 2011-03-02 06:46:47.000000000 +0000
+++ ./config.h.in 2011-05-10 15:54:41.000000000 +0000
@@ -13,6 +13,9 @@
/* Define to 1 if you have the `basename' function. */
#undef HAVE_BASENAME
@@ -22,16 +10,16 @@
/* Define as 1 if you bzip2 1.0 */
#undef HAVE_BZ2_1_0
@@ -110,7 +113,7 @@
/* Define as 1 if <netdb.h> defines h_errno */
#undef HAVE_HERRNO
@@ -77,7 +80,7 @@
/* Define as 1 if your zlib has gzseek() */
#undef HAVE_GZSEEK
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
/* Define to 1 if you have the `inet_aton' function. */
@@ -359,6 +362,10 @@
/* Define to 1 if you have the <inttypes.h> header file. */
@@ -224,6 +227,10 @@
*/
#undef LT_OBJDIR
@@ -42,7 +30,7 @@
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
*/
#undef MAJOR_IN_MKDEV
@@ -456,6 +463,9 @@
@@ -308,6 +315,9 @@
/* Build with acl support? */
#undef WITH_ACL
@@ -52,9 +40,9 @@
/* Build with capability support? */
#undef WITH_CAP
--- ./configure.ac.orig 2010-01-08 08:34:41.000000000 +0000
+++ ./configure.ac 2010-03-24 15:39:14.000000000 +0000
@@ -299,12 +299,43 @@ AC_CHECK_HEADERS([dwarf.h], [
--- ./configure.ac.orig 2011-03-02 06:46:20.000000000 +0000
+++ ./configure.ac 2011-05-10 15:54:41.000000000 +0000
@@ -246,12 +246,43 @@ AC_CHECK_HEADERS([dwarf.h], [
AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
#=================
@@ -98,7 +86,7 @@
AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
AC_MSG_ERROR([missing required NSPR / NSS header])
])
@@ -313,6 +344,7 @@ AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
@@ -260,6 +291,7 @@ AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
], [
AC_MSG_ERROR([missing required NSS library 'nss3'])
])
@@ -106,8 +94,8 @@
AC_SUBST(WITH_NSS_INCLUDE)
AC_SUBST(WITH_NSS_LIB)
--- ./rpmio/Makefile.am.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./rpmio/Makefile.am 2010-03-24 15:42:04.000000000 +0000
--- ./rpmio/Makefile.am.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./rpmio/Makefile.am 2011-05-10 15:56:13.000000000 +0000
@@ -2,6 +2,7 @@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
@@ -116,7 +104,7 @@
AM_CPPFLAGS += @WITH_LUA_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
@@ -19,10 +20,17 @@ librpmio_la_SOURCES = \
@@ -18,10 +19,17 @@ librpmio_la_SOURCES = \
rpmstring.c rpmfileutil.c \
rpmkeyring.c
@@ -126,7 +114,7 @@
+librpmio_la_SOURCES += digest_nss.c
+endif
+
librpmio_la_LDFLAGS = -version-info 1:0:0
librpmio_la_LDFLAGS = -version-info 2:0:0
librpmio_la_LIBADD = \
../misc/libmisc.la \
@WITH_NSS_LIB@ \
@@ -134,7 +122,7 @@
@WITH_LUA_LIB@ \
@WITH_BZ2_LIB@ \
@WITH_ZLIB_LIB@ \
@@ -31,6 +39,15 @@ librpmio_la_LIBADD = \
@@ -30,6 +38,15 @@ librpmio_la_LIBADD = \
@WITH_LZMA_LIB@ \
-lpthread
@@ -150,8 +138,8 @@
if WITH_LUAEXT
AM_CPPFLAGS += -I$(top_srcdir)/luaext/
librpmio_la_LIBADD += $(top_builddir)/luaext/libluaext.la
--- ./rpmio/base64.c.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./rpmio/base64.c 2010-03-24 15:39:14.000000000 +0000
--- ./rpmio/base64.c.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./rpmio/base64.c 2011-05-10 15:54:41.000000000 +0000
@@ -4,8 +4,11 @@
#include <arpa/inet.h>
#include <stdlib.h>
@@ -169,9 +157,9 @@
#endif
+#endif /* WITH_BEECRYPT */
--- ./rpmio/digest.c.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./rpmio/digest.c 2010-03-24 15:43:57.000000000 +0000
@@ -4,26 +4,12 @@
--- ./rpmio/digest.c.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./rpmio/digest.c 2011-05-10 16:00:19.000000000 +0000
@@ -4,25 +4,12 @@
#include "system.h"
@@ -194,13 +182,12 @@
-struct DIGEST_CTX_s {
- rpmDigestFlags flags; /*!< Bit(s) to control digest operation. */
- HASHContext *hashctx; /*!< Internal NSS hash context. */
- pgpHashAlgo algo; /*!< Used hash algorithm */
- int algo; /*!< Used hash algorithm */
-};
-
#define DIGESTS_MAX 11
struct rpmDigestBundle_s {
int index_min; /*!< Smallest index of active digest */
@@ -109,138 +95,3 @@ DIGEST_CTX rpmDigestBundleDupCtx(rpmDige
@@ -109,138 +96,3 @@ DIGEST_CTX rpmDigestBundleDupCtx(rpmDige
return dup;
}
@@ -219,7 +206,7 @@
-}
-
-RPM_GNUC_PURE
-static HASH_HashType getHashType(pgpHashAlgo hashalgo)
-static HASH_HashType getHashType(int hashalgo)
-{
- switch (hashalgo) {
- case PGPHASHALGO_MD5:
@@ -250,13 +237,13 @@
-}
-
-size_t
-rpmDigestLength(pgpHashAlgo hashalgo)
-rpmDigestLength(int hashalgo)
-{
- return HASH_ResultLen(getHashType(hashalgo));
-}
-
-DIGEST_CTX
-rpmDigestInit(pgpHashAlgo hashalgo, rpmDigestFlags flags)
-rpmDigestInit(int hashalgo, rpmDigestFlags flags)
-{
- HASH_HashType type = getHashType(hashalgo);
- HASHContext *hashctx = NULL;
@@ -339,8 +326,8 @@
- return 0;
-}
-
--- ./rpmio/digest.h.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./rpmio/digest.h 2010-03-24 15:56:12.000000000 +0000
--- ./rpmio/digest.h.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./rpmio/digest.h 2011-05-10 15:54:41.000000000 +0000
@@ -1,11 +1,6 @@
#ifndef _RPMDIGEST_H
#define _RPMDIGEST_H
@@ -374,8 +361,8 @@
+int pgpVerifyDSA(pgpDig dig, uint8_t *hash, size_t hashlen);
+
#endif /* _RPMDIGEST_H */
--- ./rpmio/digest_beecrypt.c.orig 2010-03-24 15:39:14.000000000 +0000
+++ ./rpmio/digest_beecrypt.c 2010-03-24 16:16:23.000000000 +0000
--- ./rpmio/digest_beecrypt.c.orig 2011-05-10 15:54:41.000000000 +0000
+++ ./rpmio/digest_beecrypt.c 2011-05-10 15:54:41.000000000 +0000
@@ -0,0 +1,493 @@
+#include "system.h"
+
@@ -698,7 +685,7 @@
+ */
+struct DIGEST_CTX_s {
+ rpmDigestFlags flags; /*!< Bit(s) to control digest operation. */
+ pgpHashAlgo algo; /*!< Used hash algorithm */
+ int algo; /*!< Used hash algorithm */
+ uint32_t datalen; /*!< No. bytes in block of plaintext data. */
+ uint32_t paramlen; /*!< No. bytes of digest parameters. */
+ uint32_t digestlen; /*!< No. bytes of digest. */
@@ -721,7 +708,7 @@
+}
+
+size_t
+rpmDigestLength(pgpHashAlgo hashalgo)
+rpmDigestLength(int hashalgo)
+{
+ switch (hashalgo) {
+ case PGPHASHALGO_MD5:
@@ -742,7 +729,7 @@
+}
+
+DIGEST_CTX
+rpmDigestInit(pgpHashAlgo hashalgo, rpmDigestFlags flags)
+rpmDigestInit(int hashalgo, rpmDigestFlags flags)
+{
+ DIGEST_CTX ctx = xcalloc(1, sizeof(*ctx));
+ int xx;
@@ -870,8 +857,8 @@
+ free(ctx);
+ return 0;
+}
--- ./rpmio/digest_nss.c.orig 2010-03-24 15:39:14.000000000 +0000
+++ ./rpmio/digest_nss.c 2010-03-24 16:14:36.000000000 +0000
--- ./rpmio/digest_nss.c.orig 2011-05-10 15:54:41.000000000 +0000
+++ ./rpmio/digest_nss.c 2011-05-10 15:54:41.000000000 +0000
@@ -0,0 +1,500 @@
+#include <nss.h>
+#include <sechash.h>
@@ -1238,7 +1225,7 @@
+struct DIGEST_CTX_s {
+ rpmDigestFlags flags; /*!< Bit(s) to control digest operation. */
+ HASHContext *hashctx; /*!< Internal NSS hash context. */
+ pgpHashAlgo algo; /*!< Used hash algorithm */
+ int algo; /*!< Used hash algorithm */
+};
+
+DIGEST_CTX
@@ -1255,7 +1242,7 @@
+}
+
+RPM_GNUC_PURE
+static HASH_HashType getHashType(pgpHashAlgo hashalgo)
+static HASH_HashType getHashType(int hashalgo)
+{
+ switch (hashalgo) {
+ case PGPHASHALGO_MD5:
@@ -1286,13 +1273,13 @@
+}
+
+size_t
+rpmDigestLength(pgpHashAlgo hashalgo)
+rpmDigestLength(int hashalgo)
+{
+ return HASH_ResultLen(getHashType(hashalgo));
+}
+
+DIGEST_CTX
+rpmDigestInit(pgpHashAlgo hashalgo, rpmDigestFlags flags)
+rpmDigestInit(int hashalgo, rpmDigestFlags flags)
+{
+ HASH_HashType type;
+ HASHContext *hashctx = NULL;
@@ -1373,8 +1360,8 @@
+ free(ctx);
+ return 0;
+}
--- ./rpmio/rpmpgp.c.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./rpmio/rpmpgp.c 2010-03-24 16:26:00.000000000 +0000
--- ./rpmio/rpmpgp.c.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./rpmio/rpmpgp.c 2011-05-10 16:01:58.000000000 +0000
@@ -20,9 +20,6 @@ static int _debug = 0;
static int _print = 0;
@@ -1382,10 +1369,10 @@
-static int _crypto_initialized = 0;
-static int _new_process = 1;
-
static struct pgpValTbl_s const pgpSigTypeTbl[] = {
{ PGPSIGTYPE_BINARY, "Binary document signature" },
{ PGPSIGTYPE_TEXT, "Text document signature" },
@@ -291,89 +288,6 @@ int pgpValTok(pgpValTbl vs, const char *
typedef const struct pgpValTbl_s {
int val;
char const * const str;
@@ -315,89 +312,6 @@ int pgpValTok(pgpValTbl vs, const char *
} while ((++vs)->val != -1);
return vs->val;
}
@@ -1393,12 +1380,12 @@
- * @return 0 on success
- */
-static int pgpMpiSet(const char * pre, unsigned int lbits,
- void *dest, const uint8_t * p, const uint8_t * pend)
- uint8_t *dest, const uint8_t * p, const uint8_t * pend)
-{
- unsigned int mbits = pgpMpiBits(p);
- unsigned int nbits;
- size_t nbytes;
- char *t = dest;
- uint8_t *t = dest;
- unsigned int ix;
-
- if ((p + ((mbits+7) >> 3)) > pend)
@@ -1475,7 +1462,7 @@
/** \ingroup rpmpgp
* Is buffer at beginning of an OpenPGP packet?
@@ -569,29 +483,16 @@ static int pgpPrtSigParams(pgpTag tag, u
@@ -593,29 +507,16 @@ static int pgpPrtSigParams(pgpTag tag, u
{
const uint8_t * pend = h + hlen;
size_t i;
@@ -1507,7 +1494,7 @@
}
pgpPrtStr("", pgpSigRSA[i]);
} else if (pubkey_algo == PGPPUBKEYALGO_DSA) {
@@ -599,30 +500,8 @@ static int pgpPrtSigParams(pgpTag tag, u
@@ -623,30 +524,8 @@ static int pgpPrtSigParams(pgpTag tag, u
if (_dig &&
(sigtype == PGPSIGTYPE_BINARY || sigtype == PGPSIGTYPE_TEXT))
{
@@ -1540,7 +1527,7 @@
}
pgpPrtStr("", pgpSigDSA[i]);
} else {
@@ -814,49 +693,11 @@ static const uint8_t * pgpPrtPubkeyParam
@@ -838,49 +717,11 @@ static const uint8_t * pgpPrtPubkeyParam
char * mpi;
if (pubkey_algo == PGPPUBKEYALGO_RSA) {
if (i >= 2) break;
@@ -1592,7 +1579,7 @@
pgpPrtStr("", pgpPublicDSA[i]);
} else if (pubkey_algo == PGPPUBKEYALGO_ELGAMAL_ENCRYPT) {
if (i >= 3) break;
@@ -1241,15 +1082,7 @@ void pgpCleanDig(pgpDig dig)
@@ -1265,15 +1106,7 @@ void pgpCleanDig(pgpDig dig)
memset(&dig->signature, 0, sizeof(dig->signature));
memset(&dig->pubkey, 0, sizeof(dig->pubkey));
@@ -1609,7 +1596,7 @@
}
return;
}
@@ -1291,39 +1124,6 @@ int pgpPrtPkts(const uint8_t * pkts, siz
@@ -1315,39 +1148,6 @@ int pgpPrtPkts(const uint8_t * pkts, siz
return 0;
}
@@ -1649,7 +1636,7 @@
char *pgpIdentItem(pgpDigParams digp)
{
char *id = NULL;
@@ -1372,30 +1172,12 @@ rpmRC pgpVerifySig(pgpDig dig, DIGEST_CT
@@ -1396,30 +1196,12 @@ rpmRC pgpVerifySig(pgpDig dig, DIGEST_CT
/* Compare leading 16 bits of digest for quick check. */
if (hash && memcmp(hash, sigp->signhash16, 2) == 0) {
@@ -1686,7 +1673,7 @@
}
}
@@ -1580,50 +1362,3 @@ char * pgpArmorWrap(int atype, const uns
@@ -1607,50 +1389,3 @@ char * pgpArmorWrap(int atype, const uns
return val;
}