RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 25-Dec-2010 22:30:59 Branch: rpm-5_4 Handle: 2010122521304411 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmio/auto Makefile.am desc.in types.in Log: - rpmio: rescusitate the ISPRAS markup. Summary: Revision Changes Path 1.3501.2.22 +1 -0 rpm/CHANGES 1.5.2.1 +2 -1 rpm/rpmio/auto/Makefile.am 1.2.4.1 +45 -9 rpm/rpmio/auto/desc.in 1.3.4.1 +13 -11 rpm/rpmio/auto/types.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.21 -r1.3501.2.22 CHANGES --- rpm/CHANGES 25 Dec 2010 19:32:37 -0000 1.3501.2.21 +++ rpm/CHANGES 25 Dec 2010 21:30:44 -0000 1.3501.2.22 @@ -1,4 +1,5 @@ 5.3.7 -> 5.4.0: + - jbj: rpmio: rescusitate the ISPRAS markup. - jbj: ISPRAS: upgrade to abi-compliance-checker-1.21.9. - jbj: ISPRAS: upgrade to api-sanity-autotest-1.11. - jbj: rpmdb: disable Depcache, --install and "make test" todo++. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/auto/Makefile.am ============================================================================ $ cvs diff -u -r1.5 -r1.5.2.1 Makefile.am --- rpm/rpmio/auto/Makefile.am 2 Nov 2010 16:55:56 -0000 1.5 +++ rpm/rpmio/auto/Makefile.am 25 Dec 2010 21:30:54 -0000 1.5.2.1 @@ -14,4 +14,5 @@ check-local: -[ -d tests ] && ${AUTOTEST} -l rpmio -d desc -clean - -${AUTOTEST} -l rpmio -d desc -st types -td test_data -gen -build -run + ${AUTOTEST} -l rpmio -d desc -st types -td test_data \ + -gen -splint-specs -build -run @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/auto/desc.in ============================================================================ $ cvs diff -u -r1.2 -r1.2.4.1 desc.in --- rpm/rpmio/auto/desc.in 8 Mar 2010 22:15:58 -0000 1.2 +++ rpm/rpmio/auto/desc.in 25 Dec 2010 21:30:55 -0000 1.2.4.1 @@ -10,7 +10,6 @@ <!-- cubehash.h --> <!-- echo.h --> <!-- edon-r.h --> -<!-- envvar.h --> <!-- fugue.h --> <!-- groestl.h --> <!-- hamsi.h --> @@ -34,8 +33,12 @@ cpio.h tar.h +<!-- bson.h FIXME: bson_malloc gets used. --> + mongo.h + argv.h crc.h +<!-- envvar.h --> <!-- fnmatch.h --> fts.h <!-- glob.h --> @@ -43,29 +46,39 @@ <!-- mire.h FIXME! --> <!-- poptIO.h --> rpmacl.h +<!-- rpmasn.h --> rpmaug.h +<!-- rpmbag.h --> rpmbc.h rpmbf.h rpmbz.h rpmcb.h + +<!-- rpmcdsa.h --> <!-- rpmcpio.h --> <!-- rpmcudf.h --> +<!-- rpmcvs.h --> <!-- rpmdav.h --> rpmdir.h rpmficl.h rpmgc.h +<!-- rpmgit.h --> rpmhash.h + rpmhkp.h <!-- rpmhook.h --> rpmio.h <!-- rpmio_internal.h --> rpmiotypes.h rpmjs.h +<!-- rpmjsio.h DELETE --> <!-- rpmkeyring.h --> <!-- rpmku.h FIXME: 1 --> rpmlog.h + rpmltc.h rpmlua.h rpmmacro.h rpmmg.h +<!-- rpmnix.h --> rpmnss.h rpmperl.h rpmpgp.h @@ -74,46 +87,69 @@ rpmsm.h rpmsp.h <!-- rpmsq.h FIXME: logout from stdin sighup?--> + rpmsql.h rpmsquirrel.h rpmssl.h +<!-- rpmsvn.h --> rpmsw.h <!-- rpmsx.h --> rpmsyck.h +<!-- rpmtar.h --> rpmtcl.h +<!-- rpmtpm.h --> rpmurl.h rpmuuid.h <!-- rpmxar.h --> +<!-- rpmz.h --> rpmzlog.h <!-- rpmzq.h --> ugid.h yarn.h - -<!-- rpmtar.h --> -<!-- rpmz.h --> </headers> <libs> @abs_top_builddir@/rpmio/.libs/librpmio.so - @abs_top_builddir@/misc/.libs/librpmmisc.so </libs> <include_paths> @abs_top_srcdir@/rpmio </include_paths> +<add_include_paths> +</add_include_paths> + <gcc_options> @CFLAGS@ </gcc_options> -<opaque_types> -</opaque_types> -<skip_interfaces> -</skip_interfaces> <include_preamble> stdint.h stdio.h stdlib.h string.h </include_preamble> + <libs_depend> + @abs_top_builddir@/misc/.libs/librpmmisc.so </libs_depend> + +<opaque_types> +</opaque_types> + +<skip_interfaces> +</skip_interfaces> + +<skip_headers> +</skip_headers> + +<skip_libs> +</skip_libs> + +<libgroup> +</libgroup> + +<out_params> +</out_params> + +<skip_warnings> +</skip_warnings> @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/auto/types.in ============================================================================ $ cvs diff -u -r1.3 -r1.3.4.1 types.in --- rpm/rpmio/auto/types.in 8 Mar 2010 22:15:58 -0000 1.3 +++ rpm/rpmio/auto/types.in 25 Dec 2010 21:30:55 -0000 1.3.4.1 @@ -370,7 +370,7 @@ </associating> </spec_type> -<!-- mire.h --> +<!-- mire.h <spec_type> <kind> common_param </kind> <data_type> miRE </data_type> @@ -441,6 +441,7 @@ <interfaces> mireLoadPatterns </interfaces> </associating> </spec_type> +--> <!-- poptIO.h --> @@ -600,7 +601,7 @@ <!-- rpmcb.h --> -<!-- rpmcudf.h --> +<!-- rpmcudf.h <spec_type> <kind> common_param </kind> <data_type> rpmcudf </data_type> @@ -660,6 +661,7 @@ <links> param1 </links> </associating> </spec_type> +--> <!-- rpmdav.h --> @@ -822,7 +824,7 @@ <spec_type> <kind> normal </kind> - <data_type> unsigned </data_type> + <data_type> unsigned int </data_type> <value> __LINE__ </value> <associating> <interfaces> XfdNew </interfaces> @@ -1032,7 +1034,6 @@ </associating> </spec_type> -<!-- <spec_type> <kind> common_param </kind> <data_type> rpmioItem </data_type> @@ -1048,9 +1049,7 @@ <data_type> rpmioItem </data_type> <constraint> $0 != NULL </constraint> </spec_type> ---> -<!-- <spec_type> <kind> normal </kind> <data_type> size_t </data_type> @@ -1069,6 +1068,7 @@ <links> param1 </links> </associating> </spec_type> + <spec_type> <kind> normal </kind> <data_type> poolItem </data_type> @@ -1078,11 +1078,10 @@ <links> retval </links> </associating> </spec_type> ---> <spec_type> <kind> normal </kind> - <data_type> unsigned </data_type> + <data_type> unsigned int </data_type> <value> __LINE__ </value> <associating> <interfaces> rpmioFreePoolItem </interfaces> @@ -1107,6 +1106,7 @@ <links> param2 </links> </associating> </spec_type> + <spec_type> <kind> normal </kind> <data_type> poolItem </data_type> @@ -1484,7 +1484,7 @@ <spec_type> <kind> common_param </kind> <data_type> pgpDig </data_type> - <value> pgpDigNew(RPMVSF_DEFAULT) </value> + <value> pgpDigNew(RPMVSF_DEFAULT, 0) </value> <final_code> $0 = pgpDigFree($0); </final_code> <associating> <except> pgpDigFree </except> @@ -1512,7 +1512,7 @@ <constraint> $0 != NULL </constraint> </spec_type> -<!-- rpmruby.h --> +<!-- rpmruby.h <spec_type> <kind> common_param </kind> <data_type> rpmruby </data_type> @@ -1527,6 +1527,7 @@ <data_type> rpmruby </data_type> <constraint> $0 != NULL </constraint> </spec_type> +--> <!-- rpmsm.h --> <spec_type> @@ -1594,7 +1595,7 @@ <global_code> static struct rpmop_s _op; </global_code> </spec_type> -<!-- rpmsx.h --> +<!-- rpmsx.h <spec_type> <kind> common_param </kind> <data_type> rpmsx </data_type> @@ -1609,6 +1610,7 @@ <data_type> rpmsx </data_type> <constraint> $0 != NULL </constraint> </spec_type> +--> <!-- rpmsyck.h --> @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
