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: 18-Oct-2010 07:18:47
Branch: rpm-5_3 Handle: 2010101805184601
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/rpmio rpmbc.h
Log:
- beecrypt: fix: polluted builds due to my brain fart. revert.
Summary:
Revision Changes Path
1.3296.2.101+1 -0 rpm/CHANGES
2.432.2.30 +1 -1 rpm/configure.ac
2.7.2.4 +20 -20 rpm/rpmio/rpmbc.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.100 -r1.3296.2.101 CHANGES
--- rpm/CHANGES 18 Oct 2010 04:22:04 -0000 1.3296.2.100
+++ rpm/CHANGES 18 Oct 2010 05:18:46 -0000 1.3296.2.101
@@ -1,4 +1,5 @@
5.3.4 -> 5.3.5:
+ - jbj: beecrypt: fix: polluted builds due to my brain fart. revert.
- jbj: popt: permit builds with --with-popt=internal all over again.
todo++.
- jbj: tests: fix: eliminate the need to jump start "make check"
by copy macros from within tree to /usr/lib/rpm.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.432.2.29 -r2.432.2.30 configure.ac
--- rpm/configure.ac 18 Oct 2010 04:22:04 -0000 2.432.2.29
+++ rpm/configure.ac 18 Oct 2010 05:18:46 -0000 2.432.2.30
@@ -1225,7 +1225,7 @@
RPM_CHECK_LIB(
[BeeCrypt], [beecrypt],
[beecrypt], [mpfprintln], [beecrypt/api.h],
- [yes,internal:external], [beecrypt:include/beecrypt],
+ [yes,internal:external], [beecrypt:include],
[], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ])
if test ".$WITH_BEECRYPT" = .no; then
AC_MSG_ERROR([BEECRYPT is mandatory])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.h
============================================================================
$ cvs diff -u -r2.7.2.3 -r2.7.2.4 rpmbc.h
--- rpm/rpmio/rpmbc.h 17 Oct 2010 18:24:28 -0000 2.7.2.3
+++ rpm/rpmio/rpmbc.h 18 Oct 2010 05:18:47 -0000 2.7.2.4
@@ -5,32 +5,32 @@
* \file rpmio/rpmbc.h
*/
-#include <api.h>
+#include <beecrypt/api.h>
#include <rpmiotypes.h>
#include <rpmpgp.h>
#include <rpmsw.h>
/* Drag in the beecrypt includes. */
-#include <beecrypt.h>
-#include <base64.h>
-#include <dsa.h>
-#include <endianness.h>
-#include <md4.h>
-#include <md5.h>
-#include <mp.h>
-#include <rsa.h>
-#include <rsapk.h>
-#include <elgamal.h>
-#include <ripemd128.h>
-#include <ripemd160.h>
-#include <ripemd256.h>
-#include <ripemd320.h>
-#include <sha1.h>
-#include <sha224.h>
-#include <sha256.h>
-#include <sha384.h>
-#include <sha512.h>
+#include <beecrypt/beecrypt.h>
+#include <beecrypt/base64.h>
+#include <beecrypt/dsa.h>
+#include <beecrypt/endianness.h>
+#include <beecrypt/md4.h>
+#include <beecrypt/md5.h>
+#include <beecrypt/mp.h>
+#include <beecrypt/rsa.h>
+#include <beecrypt/rsapk.h>
+#include <beecrypt/elgamal.h>
+#include <beecrypt/ripemd128.h>
+#include <beecrypt/ripemd160.h>
+#include <beecrypt/ripemd256.h>
+#include <beecrypt/ripemd320.h>
+#include <beecrypt/sha1.h>
+#include <beecrypt/sha224.h>
+#include <beecrypt/sha256.h>
+#include <beecrypt/sha384.h>
+#include <beecrypt/sha512.h>
/**
*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
