Hi, The patch below contains a couple of minor bug fixes, which are supposed to render currently non-buildable test programs buildable again.
Ralf
diff -r 425cce5ee453 rpmdb/tdbi.c --- a/rpmdb/tdbi.c Sun Aug 05 11:30:55 2007 +0300 +++ b/rpmdb/tdbi.c Mon Aug 06 09:36:34 2007 +0200 @@ -25,7 +25,7 @@ main(int argc, char *argv[]) exit (1); } -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) rc = db->open(db, txnid, dbfile, NULL, DB_UNKNOWN, DB_RDONLY, 0664); #else rc = db->open(db, dbfile, NULL, DB_UNKNOWN, DB_RDONLY, 0664); diff -r 425cce5ee453 rpmdb/tjfn.c --- a/rpmdb/tjfn.c Sun Aug 05 11:30:55 2007 +0300 +++ b/rpmdb/tjfn.c Mon Aug 06 09:36:34 2007 +0200 @@ -1,3 +1,4 @@ +#include <sys/stat.h> #include <sys/types.h> #include <errno.h> @@ -69,7 +70,7 @@ db_open(const char * dbfn, DB_ENV * dben goto err; } -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ret = db->open(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664); #else ret = db->open(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664); diff -r 425cce5ee453 rpmio/tkey.c --- a/rpmio/tkey.c Sun Aug 05 11:30:55 2007 +0300 +++ b/rpmio/tkey.c Mon Aug 06 09:36:34 2007 +0200 @@ -64,40 +64,40 @@ static const char * fips_s = "41e2345f1f static const char * fips_s = "41e2345f1f56df2458f426d155b4ba2db6dcd8c8"; /* Secret key */ -static const char * jbjSecretDSA = " -lQFvBDu6XHwRAwCTIHRgKeIlOFUIEZeJVYSrXn0eUrM5S8OF471tTc+IV7AwiXBR -zCFCan4lO1ipmoAipyN2A6ZX0HWOcWdYlWz2adxA7l8JNiZTzkemA562xwex2wLy -AQWVTtRN6jv0LccAoN4UWZkIvkT6tV918sEvDEggGARxAv9190RhrDq/GMqd+AHm -qWrRkrBRHDUBBL2fYEuU3gFekYrW5CDIN6s3Mcq/yUsvwHl7bwmoqbf2qabbyfnv -Y66ETOPKLcw67ggcptHXHcwlvpfJmHKpjK+ByzgauPXXbRAC+gKDjzXL0kAQxjmT -2D+16O4vI8Emlx2JVcGLlq/aWhspvQWIzN6PytA3iKZ6uzesrM7yXmqzgodZUsJh -1wwl/0K5OIJn/oD41UayU8RXNER8SzDYvDYsJymFRwE1s58lL/8DAwJUAllw1pdZ -WmBIoAvRiv7kE6hWfeCvZzdBVgrHYrp8ceUa3OdulGfYw/0sIzpEU0FfZmFjdG9y -OgAA30gJ4JMFKVfthnDCHHL+O8lNxykKBmrgVPLClue0KUplZmYgSm9obnNvbiAo -QVJTIE4zTlBRKSA8amJqQHJlZGhhdC5jb20+iFcEExECABcFAju6XHwFCwcKAwQD -FQMCAxYCAQIXgAAKCRCB0qVW2I6DmQU6AJ490bVWZuM4yCOh8MWj6qApCr1/gwCf -f3+QgXFXAeTyPtMmReyWxThABtE= -"; +static const char * jbjSecretDSA = +"lQFvBDu6XHwRAwCTIHRgKeIlOFUIEZeJVYSrXn0eUrM5S8OF471tTc+IV7AwiXBR" +"zCFCan4lO1ipmoAipyN2A6ZX0HWOcWdYlWz2adxA7l8JNiZTzkemA562xwex2wLy" +"AQWVTtRN6jv0LccAoN4UWZkIvkT6tV918sEvDEggGARxAv9190RhrDq/GMqd+AHm" +"qWrRkrBRHDUBBL2fYEuU3gFekYrW5CDIN6s3Mcq/yUsvwHl7bwmoqbf2qabbyfnv" +"Y66ETOPKLcw67ggcptHXHcwlvpfJmHKpjK+ByzgauPXXbRAC+gKDjzXL0kAQxjmT" +"2D+16O4vI8Emlx2JVcGLlq/aWhspvQWIzN6PytA3iKZ6uzesrM7yXmqzgodZUsJh" +"1wwl/0K5OIJn/oD41UayU8RXNER8SzDYvDYsJymFRwE1s58lL/8DAwJUAllw1pdZ" +"WmBIoAvRiv7kE6hWfeCvZzdBVgrHYrp8ceUa3OdulGfYw/0sIzpEU0FfZmFjdG9y" +"OgAA30gJ4JMFKVfthnDCHHL+O8lNxykKBmrgVPLClue0KUplZmYgSm9obnNvbiAo" +"QVJTIE4zTlBRKSA8amJqQHJlZGhhdC5jb20+iFcEExECABcFAju6XHwFCwcKAwQD" +"FQMCAxYCAQIXgAAKCRCB0qVW2I6DmQU6AJ490bVWZuM4yCOh8MWj6qApCr1/gwCf" +"f3+QgXFXAeTyPtMmReyWxThABtE=" +; /* Public key */ -static const char * jbjPublicDSA = " -mQFCBDu6XHwRAwCTIHRgKeIlOFUIEZeJVYSrXn0eUrM5S8OF471tTc+IV7AwiXBR -zCFCan4lO1ipmoAipyN2A6ZX0HWOcWdYlWz2adxA7l8JNiZTzkemA562xwex2wLy -AQWVTtRN6jv0LccAoN4UWZkIvkT6tV918sEvDEggGARxAv9190RhrDq/GMqd+AHm -qWrRkrBRHDUBBL2fYEuU3gFekYrW5CDIN6s3Mcq/yUsvwHl7bwmoqbf2qabbyfnv -Y66ETOPKLcw67ggcptHXHcwlvpfJmHKpjK+ByzgauPXXbRAC+gKDjzXL0kAQxjmT -2D+16O4vI8Emlx2JVcGLlq/aWhspvQWIzN6PytA3iKZ6uzesrM7yXmqzgodZUsJh -1wwl/0K5OIJn/oD41UayU8RXNER8SzDYvDYsJymFRwE1s58lL7QpSmVmZiBKb2hu -c29uIChBUlMgTjNOUFEpIDxqYmpAcmVkaGF0LmNvbT6IVwQTEQIAFwUCO7pcfAUL -BwoDBAMVAwIDFgIBAheAAAoJEIHSpVbYjoOZBToAn3TXaAI+bhg51EeyaiFip/6W -OVwBAJ44rTtNsgZBQxXISjB64CWxl4VaWQ== -"; +static const char * jbjPublicDSA = +"mQFCBDu6XHwRAwCTIHRgKeIlOFUIEZeJVYSrXn0eUrM5S8OF471tTc+IV7AwiXBR" +"zCFCan4lO1ipmoAipyN2A6ZX0HWOcWdYlWz2adxA7l8JNiZTzkemA562xwex2wLy" +"AQWVTtRN6jv0LccAoN4UWZkIvkT6tV918sEvDEggGARxAv9190RhrDq/GMqd+AHm" +"qWrRkrBRHDUBBL2fYEuU3gFekYrW5CDIN6s3Mcq/yUsvwHl7bwmoqbf2qabbyfnv" +"Y66ETOPKLcw67ggcptHXHcwlvpfJmHKpjK+ByzgauPXXbRAC+gKDjzXL0kAQxjmT" +"2D+16O4vI8Emlx2JVcGLlq/aWhspvQWIzN6PytA3iKZ6uzesrM7yXmqzgodZUsJh" +"1wwl/0K5OIJn/oD41UayU8RXNER8SzDYvDYsJymFRwE1s58lL7QpSmVmZiBKb2hu" +"c29uIChBUlMgTjNOUFEpIDxqYmpAcmVkaGF0LmNvbT6IVwQTEQIAFwUCO7pcfAUL" +"BwoDBAMVAwIDFgIBAheAAAoJEIHSpVbYjoOZBToAn3TXaAI+bhg51EeyaiFip/6W" +"OVwBAJ44rTtNsgZBQxXISjB64CWxl4VaWQ==" +; /* Signature */ -static const char * abcSignatureDSA = " -iD8DBQA7vII+gdKlVtiOg5kRAvg4AJ0fV3gDBADobAnK2HOkV88bfmFMEgCeNysO -nP3dWWJnp0Pnbor7pIob4Dk= -"; +static const char * abcSignatureDSA = +"iD8DBQA7vII+gdKlVtiOg5kRAvg4AJ0fV3gDBADobAnK2HOkV88bfmFMEgCeNysO" +"nP3dWWJnp0Pnbor7pIob4Dk=" +; int main (int argc, char *argv[])
_______________________________________________ Rpm-maint mailing list Rpm-maint@lists.rpm.org https://lists.rpm.org/mailman/listinfo/rpm-maint