RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 25-Apr-2012 22:41:43
Branch: rpm-5_4 Handle: 2012042520414201
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/python rpmmodule.c
rpm/rpmio rpmiotypes.h
Log:
- crypto: eliminate _RPMVSF_{NOHEADER,NOPAYLOAD}.
Summary:
Revision Changes Path
1.3501.2.248+2 -1 rpm/CHANGES
1.180.2.4 +0 -2 rpm/python/rpmmodule.c
1.47.2.10 +0 -12 rpm/rpmio/rpmiotypes.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.247 -r1.3501.2.248 CHANGES
--- rpm/CHANGES 25 Apr 2012 20:34:47 -0000 1.3501.2.247
+++ rpm/CHANGES 25 Apr 2012 20:41:42 -0000 1.3501.2.248
@@ -1,5 +1,6 @@
5.4.8 -> 5.4.9:
- - jbj: crypto: refactore/iminate _RPMVSF_{NOSIGNATURES,NODIGESTS}.
+ - jbj: crypto: eliminate _RPMVSF_{NOHEADER,NOPAYLOAD}.
+ - jbj: crypto: refactor/eliminate _RPMVSF_{NOSIGNATURES,NODIGESTS}.
- devzero2000: add @rpm.org brp-python-hardlink in a more
portable way
- mdawkins: doxygen-1.7.4 bug
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmmodule.c
============================================================================
$ cvs diff -u -r1.180.2.3 -r1.180.2.4 rpmmodule.c
--- rpm/python/rpmmodule.c 25 Apr 2012 20:34:49 -0000 1.180.2.3
+++ rpm/python/rpmmodule.c 25 Apr 2012 20:41:43 -0000 1.180.2.4
@@ -601,8 +601,6 @@
REGISTER_ENUM(RPMVSF_NOMD5);
REGISTER_ENUM(RPMVSF_NODSA);
REGISTER_ENUM(RPMVSF_NORSA);
- REGISTER_ENUM(_RPMVSF_NOHEADER);
- REGISTER_ENUM(_RPMVSF_NOPAYLOAD);
REGISTER_ENUM(TR_ADDED);
REGISTER_ENUM(TR_REMOVED);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmiotypes.h
============================================================================
$ cvs diff -u -r1.47.2.9 -r1.47.2.10 rpmiotypes.h
--- rpm/rpmio/rpmiotypes.h 25 Apr 2012 20:34:49 -0000 1.47.2.9
+++ rpm/rpmio/rpmiotypes.h 25 Apr 2012 20:41:43 -0000 1.47.2.10
@@ -114,18 +114,6 @@
/* bit(s) 20-31 unused */
} pgpVSFlags;
-#define _RPMVSF_NOHEADER \
- ( RPMVSF_NOSHA1HEADER | \
- RPMVSF_NOMD5HEADER | \
- RPMVSF_NODSAHEADER | \
- RPMVSF_NORSAHEADER )
-
-#define _RPMVSF_NOPAYLOAD \
- ( RPMVSF_NOSHA1 | \
- RPMVSF_NOMD5 | \
- RPMVSF_NODSA | \
- RPMVSF_NORSA )
-
/*@-redef@*/ /* LCL: ??? */
typedef /*@abstract@*/ const void * fnpyKey;
/*@=redef@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
