[CVS] RPM: popt/ poptint.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: popt Date: 09-Aug-2010 19:31:45 Branch: HEAD Handle: 2010080917314500 Modified files: poptpoptint.c Log: - fix: obscure iconv mis-call error path could lead to strdup(NULL) (coverity). Summary: RevisionChanges Path 1.28+1 -1 popt/poptint.c patch -p0 <<'@@ .' Index: popt/poptint.c $ cvs diff -u -r1.27 -r1.28 poptint.c --- popt/poptint.c18 Jun 2010 02:03:29 - 1.27 +++ popt/poptint.c9 Aug 2010 17:31:45 - 1.28 @@ -145,7 +145,7 @@ } (void) iconv_close(cd); *pout = '\0'; - ostr = xstrdup(dstr); + ostr = xstrdup(dstr ? dstr : istr); free(dstr); } else ostr = xstrdup(istr); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ .gitignore rpm/build/ .gitignore rpm/po/ .gitignore rp...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 09-Aug-2010 13:57:19 Branch: HEAD Handle: 2010080911571701 Added files: rpm/build .gitignore rpm/po .gitignore rpm/rpmio .gitignore rpm/tools .gitignore Modified files: rpm .gitignore Log: add some .gitignore Summary: RevisionChanges Path 1.2 +5 -0 rpm/.gitignore 1.1 +12 -0 rpm/build/.gitignore 1.1 +16 -0 rpm/po/.gitignore 1.1 +57 -0 rpm/rpmio/.gitignore 1.1 +50 -0 rpm/tools/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r1.1 -r1.2 .gitignore --- rpm/.gitignore27 Nov 2009 16:07:04 - 1.1 +++ rpm/.gitignore9 Aug 2010 11:57:17 - 1.2 @@ -51,3 +51,8 @@ rpm-*.tar.gz ylwrap CVS +*.o +*.lo +*.la +*.in + @@ . patch -p0 <<'@@ .' Index: rpm/build/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:18.134070558 +0200 @@ -0,0 +1,12 @@ +.created +.deps +.depend +Makefile +Makefile.in +.libs +*.gcda +*.gcno +*.la +*.lcd +*.lo +tfr @@ . patch -p0 <<'@@ .' Index: rpm/po/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:18.424086285 +0200 @@ -0,0 +1,16 @@ +ChangeLog +Makefile +Makefile.in +Makefile.in.in +Makevars.template +POTFILES +Rules-quot +stamp-cat-id +stamp-po +cat-id-tbl.c +LINGUAS +*.header +*.mo +*.gmo +*.sed +*.sin @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:18.724100955 +0200 @@ -0,0 +1,57 @@ +.created +.gnupg +.deps +.depend +Makefile +Makefile.in +.libs +*.gcda +*.gcno +*.la +*.lcd +*.lo +dumpasn1 +gengpg.h +getdate.c +lcov +lookup3 +bsdiff +bspatch +rpmborg +rpmgrep +rpmcpio +rpmcurl +rpmdigest +rpmdpkg +rpmgenpkglist +rpmgensrclist +rpmgpg +rpmpbzip2 +rpmpigz +rpmtar +rpmwget +rpmz +teststderr +testtry +tasn +tdigest +tdir +tfts +tget +tglob +thkp +tinv +tkey +tmacro +tmagic +tmire +tperl +tput +tpw +tpython +tring +trpmio +truby +tsexp +tsw +ttcl @@ . patch -p0 <<'@@ .' Index: rpm/tools/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:19.044117143 +0200 @@ -0,0 +1,50 @@ +.deps +.depend +Makefile +Makefile.in +.libs +*.gcda +*.gcno +augtool +chroot +convertdb1 +cp +cudftool +db_sql_codegen +db_tool +dbsql +debugedit +find +grep +mtree +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +rpm2cpio +rpmcache +rpmcmp +rpmdeps +rpmdigest +rpmkey +rpmrepo +rpmspecdump +sandbox +semodule +spooktool +sqlite3 +txar +wget +xiu-echo +xiu-instantiate +xiu-store @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/rpmio/ Makefile.am rpmtpm.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 09-Aug-2010 13:45:07 Branch: HEAD Handle: 2010080911450501 Modified files: rpm configure.ac rpm/rpmio Makefile.am rpmtpm.c Log: Honor the -without-tpm configure option Summary: RevisionChanges Path 2.445 +5 -1 rpm/configure.ac 1.282 +6 -1 rpm/rpmio/Makefile.am 1.4 +3 -0 rpm/rpmio/rpmtpm.c patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.444 -r2.445 configure.ac --- rpm/configure.ac 31 Jul 2010 19:00:03 - 2.444 +++ rpm/configure.ac 9 Aug 2010 11:45:05 - 2.445 @@ -1253,7 +1253,11 @@ [tpm], [TPM_Init], [tpm.h], [no,external:none], [], [ AC_DEFINE(WITH_TPM, 1, [Define if building with IBM TPM 1.2 emulator]) -], []) + AM_CONDITIONAL([WITH_TPM], [true]) +],[ + AM_CONDITIONAL([WITH_TPM], [false]) + ]) + dnl # select default Cryptography implementation to use (default for CLI option --usecrypto) AC_ARG_WITH([usecrypto], @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.281 -r1.282 Makefile.am --- rpm/rpmio/Makefile.am 24 Jul 2010 18:05:50 - 1.281 +++ rpm/rpmio/Makefile.am 9 Aug 2010 11:45:05 - 1.282 @@ -19,9 +19,12 @@ rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \ rpmpbzip2 rpmpigz rpmtar rpmz \ tasn tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \ - tperl tpython tput tpw trpmio tsexp tsw ttcl ttpm \ + tperl tpython tput tpw trpmio tsexp tsw ttcl \ dumpasn1 lookup3 +if WITH_TPM +EXTRA_PROGRAMS += ttpm +endif bin_PROGRAMS = man_MANS = @@ -382,8 +385,10 @@ ttcl_SOURCES = ttcl.c ttcl_LDADD = $(RPMIO_LDADD_COMMON) -ltcl +if WITH_TPM ttpm_SOURCES = ttpm.c ttpm_LDADD = $(RPMIO_LDADD_COMMON) +endif dumpasn1_SOURCES = dumpasn1.c dumpasn1_LDFLAGS = $(RPMIO_LDADD_COMMON) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmtpm.c $ cvs diff -u -r1.3 -r1.4 rpmtpm.c --- rpm/rpmio/rpmtpm.c25 Jul 2010 15:00:38 - 1.3 +++ rpm/rpmio/rpmtpm.c9 Aug 2010 11:45:06 - 1.4 @@ -28,6 +28,7 @@ /*...@unchecked@*/ int _rpmtpm_debug = -1; +#if defined(WITH_TPM) static int rpmtpmErr(rpmtpm tpm, const char * msg, uint32_t rc) /*...@*/ @@ -72,6 +73,7 @@ /*==*/ +#endif /*...@-mustmod@*//* XXX splint on crack */ static void rpmtpmFini(void * _tpm) /*...@globals fileSystem @*/ @@ -88,6 +90,7 @@ /*...@unchecked@*/ /*...@only@*/ /*...@null@*/ rpmioPool _rpmtpmPool = NULL; + static rpmtpm rpmtpmGetPool(/*...@null@*/ rpmioPool pool) /*...@globals _rpmtpmPool, fileSystem @*/ /*...@modifies pool, _rpmtpmPool, fileSystem @*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
