June 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10479 - in /trunk/sat-solver: src/knownid.h tools/repo2solv.sh tools/repo_rpmdb.c tools/repo_rpmmd.c
by mlschroe＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlschroe Date: Fri Jun 27 15:50:38 2008 New Revision: 10479 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10479&view=rev Log: - add support for the package's URL [bnc#402434] - unset CDPATH in repo2solv.sh [bnc#402597] Modified: trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo2solv.sh trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=104… ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Fri Jun 27 15:50:38 2008 @@ -10,6 +10,11 @@ * */ +/* + * Warning: you're free to append new entries, but insert/delete breaks + * the ABI! + */ + #undef KNOWNID #ifdef KNOWNID_INITIALIZE # define KNOWNID(a, b) b @@ -82,6 +87,7 @@ KNOWNID(SOLVABLE_DESCRIPTION, "solvable:description"), KNOWNID(SOLVABLE_AUTHORS, "solvable:authors"), KNOWNID(SOLVABLE_GROUP, "solvable:group"), +KNOWNID(SOLVABLE_URL, "solvable:url"), KNOWNID(SOLVABLE_KEYWORDS, "solvable:keywords"), KNOWNID(SOLVABLE_LICENSE, "solvable:license"), KNOWNID(SOLVABLE_BUILDTIME, "solvable:buildtime"), Modified: trunk/sat-solver/tools/repo2solv.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo2solv.sh?re… ============================================================================== --- trunk/sat-solver/tools/repo2solv.sh (original) +++ trunk/sat-solver/tools/repo2solv.sh Fri Jun 27 15:50:38 2008 @@ -21,6 +21,7 @@ set -e LANG=C +unset CDPATH parser_options=${PARSER_OPTIONS:-} Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Fri Jun 27 15:50:38 2008 @@ -30,7 +30,7 @@ #include "util.h" #include "repo_rpmdb.h" -#define RPMDB_COOKIE_VERSION 1 +#define RPMDB_COOKIE_VERSION 2 #define TAG_NAME 1000 #define TAG_VERSION 1001 @@ -44,6 +44,7 @@ #define TAG_VENDOR 1011 #define TAG_LICENSE 1014 #define TAG_GROUP 1016 +#define TAG_URL 1020 #define TAG_ARCH 1022 #define TAG_FILESIZES 1028 #define TAG_FILEMODES 1030 @@ -896,6 +897,9 @@ str = headstring(rpmhead, TAG_LICENSE); if (str) repodata_set_poolstr(repodata, handle, SOLVABLE_LICENSE, str); + str = headstring(rpmhead, TAG_URL); + if (str) + repodata_set_str(repodata, handle, SOLVABLE_URL, str); u32 = headint32(rpmhead, TAG_BUILDTIME); if (u32) repodata_set_num(repodata, handle, SOLVABLE_BUILDTIME, u32); Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Fri Jun 27 15:50:38 2008 @@ -39,6 +39,7 @@ /* resobject attributes */ STATE_SUMMARY, STATE_DESCRIPTION, + STATE_URL, STATE_INSNOTIFY, STATE_DELNOTIFY, STATE_VENDOR, @@ -147,6 +148,7 @@ { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, + { STATE_SOLVABLE, "url", STATE_URL, 1 }, //{ STATE_SOLVABLE, "???", STATE_INSNOTIFY, 1 }, //{ STATE_SOLVABLE, "??", STATE_DELNOTIFY, 1 }, { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, @@ -833,6 +835,10 @@ pd->lang = 0; set_desciption_author(pd->data, handle, pd->content); break; + case STATE_URL: + if (pd->content[0]) + repodata_set_str(pd->data, handle, SOLVABLE_URL, pd->content); + break; case STATE_SOURCERPM: set_sourcerpm(pd->data, s, handle, pd->content); break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10478 - in /branches/SuSE-Linux-11_0-Branch/sat-solver: src/knownid.h tools/repo2solv.sh tools/repo_rpmdb.c tools/repo_rpmmd.c
by mlschroe＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlschroe Date: Fri Jun 27 15:45:46 2008 New Revision: 10478 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10478&view=rev Log: - add support for the package's URL [bnc#402434] - unset CDPATH in repo2solv.sh [bnc#402597] Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h Fri Jun 27 15:45:46 2008 @@ -10,6 +10,12 @@ * */ + +/* + * Warning: you're free to append new entries, but insert/delete breaks + * the ABI! + */ + #undef KNOWNID #ifdef KNOWNID_INITIALIZE # define KNOWNID(a, b) b @@ -163,6 +169,8 @@ KNOWNID(DELTA_SEQ_EVR, "delta:seqevr"), KNOWNID(DELTA_SEQ_NUM, "delta:seqnum"), +KNOWNID(SOLVABLE_URL, "solvable:url"), + KNOWNID(ID_NUM_INTERNAL, 0) #ifdef KNOWNID_INITIALIZE Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh Fri Jun 27 15:45:46 2008 @@ -21,6 +21,7 @@ set -e LANG=C +unset CDPATH parser_options=${PARSER_OPTIONS:-} Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c Fri Jun 27 15:45:46 2008 @@ -30,7 +30,7 @@ #include "util.h" #include "repo_rpmdb.h" -#define RPMDB_COOKIE_VERSION 1 +#define RPMDB_COOKIE_VERSION 2 #define TAG_NAME 1000 #define TAG_VERSION 1001 @@ -44,6 +44,7 @@ #define TAG_VENDOR 1011 #define TAG_LICENSE 1014 #define TAG_GROUP 1016 +#define TAG_URL 1020 #define TAG_ARCH 1022 #define TAG_FILESIZES 1028 #define TAG_FILEMODES 1030 @@ -896,6 +897,9 @@ str = headstring(rpmhead, TAG_LICENSE); if (str) repodata_set_poolstr(repodata, handle, SOLVABLE_LICENSE, str); + str = headstring(rpmhead, TAG_URL); + if (str) + repodata_set_str(repodata, handle, SOLVABLE_URL, str); u32 = headint32(rpmhead, TAG_BUILDTIME); if (u32) repodata_set_num(repodata, handle, SOLVABLE_BUILDTIME, u32); Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c Fri Jun 27 15:45:46 2008 @@ -39,6 +39,7 @@ /* resobject attributes */ STATE_SUMMARY, STATE_DESCRIPTION, + STATE_URL, STATE_INSNOTIFY, STATE_DELNOTIFY, STATE_VENDOR, @@ -147,6 +148,7 @@ { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, + { STATE_SOLVABLE, "url", STATE_URL, 1 }, //{ STATE_SOLVABLE, "???", STATE_INSNOTIFY, 1 }, //{ STATE_SOLVABLE, "??", STATE_DELNOTIFY, 1 }, { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, @@ -833,6 +835,10 @@ pd->lang = 0; set_desciption_author(pd->data, handle, pd->content); break; + case STATE_URL: + if (pd->content[0]) + repodata_set_str(pd->data, handle, SOLVABLE_URL, pd->content); + break; case STATE_SOURCERPM: set_sourcerpm(pd->data, s, handle, pd->content); break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10477 - /branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 13:38:58 2008 New Revision: 10477 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10477&view=rev Log: fix changelog sequence Modified: branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes Modified: branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes Fri Jun 27 13:38:58 2008 @@ -2868,7 +2868,7 @@ - calculate product architecture (#158198) ------------------------------------------------------------------- -Wed Mar 29 23:12:30 CEST 2006 - ma(a)suse.de +Wed Mar 29 23:32:30 CEST 2006 - ma(a)suse.de - Auto protect installed packages from unknown vendor. (#157446) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10476 - in /branches/SuSE-Linux-10_2-Branch/libzypp: ./ devel/devel.ma/ package/ zypp/ zypp/base/ zypp/target/rpm/
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 11:31:23 2008 New Revision: 10476 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10476&view=rev Log: - Import newer gpg keys if a trusted key is updated (bnc#393160) Added: branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/GpgKeyz.cc Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/Tools.h branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-10_2-Branch/libzypp/zypp/KeyRing.cc branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.h branches/SuSE-Linux-10_2-Branch/libzypp/zypp/base/String.h branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.cc branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.h Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/VERSION (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/VERSION Fri Jun 27 11:31:23 2008 @@ -49,17 +49,17 @@ dnl dnl ************************************************** dnl -dnl CAUTION: SuSE-SLE-10-SP2-Branch starts with 2.16.50 +dnl CAUTION: SuSE-SLE-10-SP2-Branch starts with 2.16.50 dnl dnl KEEP LIBZYPP_PATCH BELOW 50 !!! -dnl +dnl dnl ************************************************** dnl ================================================== m4_define([LIBZYPP_MAJOR], [2]) dnl ================================================== -m4_define([LIBZYPP_MINOR], [16]) +dnl KEEP LLIBZYPP_MINOR BELOW 30 !!! +m4_define([LIBZYPP_MINOR], [17]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -dnl KEEP LIBZYPP_PATCH BELOW 50 !!! -m4_define([LIBZYPP_PATCH], [3]) +m4_define([LIBZYPP_PATCH], [0]) dnl ================================================== Added: branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/GpgKeyz.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/GpgKeyz.cc (added) +++ branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/GpgKeyz.cc Fri Jun 27 11:31:23 2008 @@ -0,0 +1,135 @@ +#include "Tools.h" +#include <iostream> +#include <fstream> +#include <list> +#include <map> +#include <set> + +#include <zypp/base/Hash.h> +#include <zypp/base/LogControl.h> +#include <zypp/base/LogTools.h> +#include "zypp/base/Exception.h" +#include "zypp/base/InputStream.h" +#include "zypp/base/DefaultIntegral.h" +#include <zypp/base/Function.h> +#include <zypp/base/Iterator.h> +#include <zypp/Pathname.h> +#include <zypp/ResStatus.h> +#include <zypp/Edition.h> +#include <zypp/CheckSum.h> +#include <zypp/Date.h> +#include <zypp/Rel.h> +#include <zypp/KeyRing.h> +#include <zypp/ZYpp.h> +#include <zypp/ZYppFactory.h> + +using namespace std; +using namespace zypp; + +/////////////////////////////////////////////////////////////////// + +static const Pathname sysRoot( "/Local/ma/GPG" ); + +/////////////////////////////////////////////////////////////////// + +struct KeyRingSignalsReceive : public callback::ReceiveReport<KeyRingSignals> +{ + KeyRingSignalsReceive() + { + connect(); + } + virtual void trustedKeyAdded( const KeyRing &/*keyring*/, const PublicKey &/*key*/ ) + { + USR << endl; + } + virtual void trustedKeyRemoved( const KeyRing &/*keyring*/, const PublicKey &/*key*/ ) + { + USR << endl; + } +}; + +/////////////////////////////////////////////////////////////////// + +void ltrusted() +{ + list<PublicKey> trustedPublicKeys; + { + //zypp::base::LogControl::TmpLineWriter shutUp; + KeyRing_Ptr p( getZYpp()->keyRing() ); + trustedPublicKeys = p->trustedPublicKeys(); + } + USR << "Trusted Keys " << trustedPublicKeys.size() << endl; + for_( it, trustedPublicKeys.begin(), trustedPublicKeys.end() ) + { + USR << *it << endl; + USR << " Creat: " << (*it).created() << endl; + USR << " Expir: " << (*it).expires() << endl; + } +} + +/////////////////////////////////////////////////////////////////// +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + --argc; + ++argv; + KeyRingSignalsReceive r; + + if ( 1 ) + { + //zypp::base::LogControl::TmpLineWriter shutUp; + getZYpp()->initTarget( sysRoot ); + } + + Source_Ref a( createSource( "dir:///schnell/CD-ARCHIVE/11.0/GM/DVD/i386/DVD1", "fifi" ) ); + + INT << "===[DONE]===========================================" << endl; + zypp::base::LogControl::TmpLineWriter shutUp; + return 0; +} + +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main2( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + --argc; + ++argv; + KeyRingSignalsReceive r; + + + KeyRing_Ptr p( getZYpp()->keyRing() ); + + //PublicKey ka("/Local/ma/GPG/all-keys/build-9c800aca-40d8063e.asc"); + PublicKey kb("/Local/ma/GPG/all-keys/build-9c800aca-481f343a.asc"); + + SEC << "============================================" << endl; + ltrusted(); + //p->importKey( ka, true ); + //ltrusted(); + p->importKey( kb, true ); + ltrusted(); + + SEC << "============================================" << endl; + + if ( 1 ) + { + zypp::base::LogControl::TmpLineWriter shutUp; + getZYpp()->initTarget( sysRoot ); + } + + + + INT << "===[DONE]===========================================" << endl; + zypp::base::LogControl::TmpLineWriter shutUp; + return 0; +} + Modified: branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/Tools.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/Tools.h (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/devel/devel.ma/Tools.h Fri Jun 27 11:31:23 2008 @@ -20,6 +20,10 @@ using std::endl; /////////////////////////////////////////////////////////////////// + +#define for_(IT,BEG,END) for ( typeof(BEG) IT = BEG; IT != END; ++IT ) + +/////////////////////////////////////////////////////////////////// // template<class _Condition> Modified: branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes Fri Jun 27 11:31:23 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 27 11:29:09 CEST 2008 - ma(a)suse.de + +- Import newer gpg keys if a trusted key is updated + (bnc#393160) +- version 2.17.0 +- revision 10476 + +------------------------------------------------------------------- Fri Oct 12 12:36:49 CEST 2007 - ma(a)suse.de - SMBIOS DMI modalias matching added (#333152) Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/KeyRing.cc (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/KeyRing.cc Fri Jun 27 11:31:23 2008 @@ -75,10 +75,10 @@ bool KeyRingReport::askUserToImportKey( const PublicKey &key) { return _keyRingDefaultAccept; } - + bool KeyRingReport::askUserToAcceptVerificationFailed( const std::string &file, const PublicKey &key ) { return _keyRingDefaultAccept; } - + /////////////////////////////////////////////////////////////////// // // CLASS NAME : KeyRing::Impl @@ -107,12 +107,12 @@ void importKey( const PublicKey &key, bool trusted = false); void deleteKey( const std::string &id, bool trusted ); - + std::string readSignatureKeyId( const Pathname &signature ); - + bool isKeyTrusted( const std::string &id); bool isKeyKnown( const std::string &id ); - + std::list<PublicKey> trustedPublicKeys(); std::list<PublicKey> publicKeys(); @@ -168,9 +168,11 @@ void KeyRing::Impl::importKey( const PublicKey &key, bool trusted) { - callback::SendReport<KeyRingSignals> emitSignal; - importKey( key.path(), trusted ? trustedKeyRing() : generalKeyRing() ); + if ( trusted ) + { + callback::SendReport<KeyRingSignals>()->trustedKeyAdded( trustedKeyRing(), key ); + } } void KeyRing::Impl::deleteKey( const std::string &id, bool trusted) @@ -202,7 +204,7 @@ { return publicKeyExists( id, trustedKeyRing() ); } - + bool KeyRing::Impl::isKeyKnown( const std::string &id ) { if ( publicKeyExists( id, trustedKeyRing() ) ) @@ -210,7 +212,7 @@ else return publicKeyExists( id, generalKeyRing() ); } - + bool KeyRing::Impl::publicKeyExists( std::string id, const Pathname &keyring) { MIL << "Searching key [" << id << "] in keyring " << keyring << std::endl; @@ -222,13 +224,13 @@ } return false; } - + PublicKey KeyRing::Impl::exportKey( std::string id, const Pathname &keyring) { TmpFile tmp_file( _base_dir, "pubkey-"+id+"-" ); Pathname keyfile = tmp_file.path(); MIL << "Going to export key " << id << " from " << keyring << " to " << keyfile << endl; - + try { std::ofstream os(keyfile.asString().c_str()); dumpPublicKey( id, keyring, os ); @@ -252,7 +254,7 @@ { dumpPublicKey( id, ( trusted ? trustedKeyRing() : generalKeyRing() ), stream ); } - + void KeyRing::Impl::dumpPublicKey( const std::string &id, const Pathname &keyring, std::ostream &stream ) { const char* argv[] = @@ -303,7 +305,20 @@ if ( publicKeyExists( id, trustedKeyRing() ) ) { PublicKey key = exportKey( id, trustedKeyRing() ); - + + // lets look if there is an updated key in the + // general keyring + if ( publicKeyExists( id, generalKeyRing() ) ) + { + PublicKey untkey = exportKey( id, generalKeyRing() ); + if ( untkey.created() > key.created() ) + { + MIL << "Key " << key << " was updated. Saving new version into trusted keyring." << endl; + importKey( untkey, true ); + key = untkey; + } + } + MIL << "Key " << id << " " << key.name() << " is trusted" << std::endl; // it exists, is trusted, does it validates? if ( verifyFile( file, signature, trustedKeyRing() ) ) @@ -422,9 +437,9 @@ if ( what[1] == "pub" ) { id = what[5]; - + std::string line2; - for(line2 = prog.receiveLine(); !line2.empty(); line2 = prog.receiveLine(), count++ ) + for( line2 = prog.receiveLine(); !line2.empty(); line2 = prog.receiveLine(), count++ ) { str::smatch what2; if (str::regex_match(line2, what2, rxColonsFpr, str::match_extra)) @@ -446,12 +461,12 @@ prog.close(); return keys; } - + void KeyRing::Impl::importKey( const Pathname &keyfile, const Pathname &keyring) { if ( ! PathInfo(keyfile).isExist() ) ZYPP_THROW(KeyRingException("Tried to import not existant key " + keyfile.asString() + " into keyring " + keyring.asString())); - + const char* argv[] = { "gpg", @@ -629,12 +644,12 @@ // /////////////////////////////////////////////////////////////////// - + void KeyRing::importKey( const PublicKey &key, bool trusted ) { - _pimpl->importKey( key.path(), trusted ); + _pimpl->importKey( key, trusted ); } - + std::string KeyRing::readSignatureKeyId( const Pathname &signature ) { return _pimpl->readSignatureKeyId(signature); @@ -679,12 +694,12 @@ { return _pimpl->isKeyTrusted(id); } - + bool KeyRing::isKeyKnown( const std::string &id ) { return _pimpl->isKeyTrusted(id); } - + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 11:31:23 2008 @@ -10,21 +10,25 @@ * */ #include <iostream> -//#include "zypp/base/Logger.h" +#include <vector> +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" #include "zypp/base/String.h" -#include "zypp/PublicKey.h" + #include "zypp/ExternalProgram.h" +#include "zypp/PublicKey.h" #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" -#include "zypp/base/Exception.h" -#include "zypp/base/Logger.h" +#include "zypp/Date.h" + +//#include <ctime> using std::endl; /////////////////////////////////////////////////////////////////// namespace zypp -{ ///////////////////////////////////////////////////////////////// +{ ///////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey::Impl // @@ -39,7 +43,7 @@ readFromFile(file); MIL << "Done reading key" << std::endl; } - + public: /** Offer default Impl. */ static shared_ptr<Impl> nullimpl() @@ -48,51 +52,55 @@ return _nullimpl; } - +#warning FIX asString ==================================================================================== std::string asString() const { - return "[" + id() + "] [" + name() + "] [" + fingerprint() + "]"; + return "[" + id() + "-" + str::hexstring(created(),8).substr(2) + "] [" + name() + "] [" + fingerprint() + "]"; } - + std::string armoredData() const { return _data; } - + std::string id() const { return _id; } - + std::string name() const { return _name; } - + std::string fingerprint() const { return _fingerprint; } - + + Date created() const + { return _created; } + + Date expires() const + { return _expires; } + Pathname path() const - { + { return _data_file.path(); //return _data_file; } - + protected: - + void readFromFile( const Pathname &keyfile) { + PathInfo info(keyfile); - MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; + MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; if ( !info.isExist() ) ZYPP_THROW(Exception("Can't read public key from " + keyfile.asString() + ", file not found")); - + if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); - - filesystem::TmpDir dir; - const char* argv[] = { "gpg", + "-v", "--no-default-keyring", - "--homedir", - dir.path().asString().c_str(), + "--fixed-list-mode", "--with-fingerprint", "--with-colons", "--quiet", @@ -104,47 +112,85 @@ _data_file.path().asString().c_str(), NULL }; - + ExternalProgram prog(argv,ExternalProgram::Discard_Stderr, false, -1, true); - + std::string line; - int count = 0; - - str::regex rxColons("^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):\n$"); - - // pub:-:1024:17:A84EDAE89C800ACA:2000-10-19:2008-06-21::-:SuSE Package Signing Key <build(a)suse.de>: - - for(line = prog.receiveLine(), count=0; !line.empty(); line = prog.receiveLine(), count++ ) + bool sawpub = false; + bool sawsig = false; + + // pub:-:1024:17:A84EDAE89C800ACA:971961473:1214043198::-:SuSE Package Signing Key <build(a)suse.de>: + // fpr:::::::::79C179B2E1C820C1890F9994A84EDAE89C800ACA: + // sig:::17:A84EDAE89C800ACA:1087899198:::::[selfsig]::13x: + // sig:::17:9E40E310000AABA4:980442706::::[User ID not found]:10x: + // sig:::1:77B2E6003D25D3D9:980443247::::[User ID not found]:10x: + // sub:-:2048:16:197448E88495160C:971961490:1214043258::: [expires: 2008-06-21] + // sig:::17:A84EDAE89C800ACA:1087899258:::::[keybind]::18x: + + for ( line = prog.receiveLine(); !line.empty(); line = prog.receiveLine() ) { - //MIL << "[" << line << "]" << std::endl; - str::smatch what; - if(str::regex_match(line, what, rxColons, str::match_extra)) + // trim trailing NL. + if ( line.empty() ) + continue; + if ( line[line.size()-1] == '\n' ) + line.erase( line.size()-1 ); + + // split at ':' + std::vector<std::string> words; + str::splitFields( line, std::back_inserter(words), ":" ); + if( words.empty() ) + continue; + + if ( words[0] == "pub" ) + { + if ( sawpub ) + continue; + sawpub = true; + // take default from pub + _id = words[4]; + _name = words[9]; + _created = Date(str::strtonum<Date::ValueType>(words[5])); + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + + } + else if ( words[0] == "sig" ) + { + if ( sawsig || words[words.size()-2] != "13x" ) + continue; + sawsig = true; + // update creation and expire dates from 1st signature type "13x" + if ( ! words[5].empty() ) + _created = Date(str::strtonum<Date::ValueType>(words[5])); + if ( ! words[6].empty() ) + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + } + else if ( words[0] == "fpr" ) { - if ( what[1] == "pub" ) - { - _id = what[5]; - _name = what[10]; - //return key; - } - else if ( what[1] == "fpr" ) - { - _fingerprint = what[10]; - } - //dumpRegexpResults(what); + _fingerprint = words[9]; + } + else if ( words[0] == "uid" ) + { + if ( ! words[9].empty() ) + _name = words[9]; } } prog.close(); - - if (_id.size() == 0 ) - ZYPP_THROW(BadKeyException("File " + keyfile.asString() + " doesn't contain public key data" , keyfile)); + + if ( _id.size() == 0 ) + ZYPP_THROW( BadKeyException( "File " + keyfile.asString() + " doesn't contain public key data" , keyfile ) ); + + //replace all escaped semicolon with real ':' + str::replace_all( _name, "\\x3a", ":" ); } - + private: std::string _id; std::string _name; std::string _fingerprint; std::string _data; filesystem::TmpFile _data_file; + Date _created; + Date _expires; //Pathname _data_file; private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); @@ -165,7 +211,9 @@ PublicKey::PublicKey( const Pathname &file ) : _pimpl( new Impl(file) ) - {} + { + MIL << *this << endl; + } /////////////////////////////////////////////////////////////////// // // METHOD NAME : PublicKey::~PublicKey @@ -184,22 +232,51 @@ { return _pimpl->asString(); } - + std::string PublicKey::armoredData() const { return _pimpl->armoredData(); } - + std::string PublicKey::id() const { return _pimpl->id(); } - + std::string PublicKey::name() const { return _pimpl->name(); } - + std::string PublicKey::fingerprint() const { return _pimpl->fingerprint(); } - + + Date PublicKey::created() const + { return _pimpl->created(); } + + Date PublicKey::expires() const + { return _pimpl->expires(); } + Pathname PublicKey::path() const { return _pimpl->path(); } + bool PublicKey::operator==( PublicKey b ) const + { + return( b.id() == id() + && b.fingerprint() == fingerprint() + && b.created() == created() ); + } + + bool PublicKey::operator==( std::string sid ) const + { + return sid == id(); + } + + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ) + { + str << "[" << obj.name() << "]" << endl; + str << " fpr " << obj.fingerprint() << endl; + str << " id " << obj.id() << endl; + str << " cre " << obj.created() << endl; + str << " exp " << obj.expires() << endl; + str << "]"; + return str; + } + ///////////////////////////////////////////////////////////////// } // namespace zypp -/////////////////////////////////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.h (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.h Fri Jun 27 11:31:23 2008 @@ -25,8 +25,11 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - - + + /** + * Exception thrown when the supplied key is + * not a valid gpg key + */ class BadKeyException : public Exception { public: @@ -36,10 +39,10 @@ BadKeyException() : Exception( "Bad Key Exception" ) {} - + Pathname keyFile() const { return _keyfile; } - + /** Ctor taking message. * Use \ref ZYPP_THROW to throw exceptions. */ @@ -51,14 +54,18 @@ private: Pathname _keyfile; }; - - + + + // forward declaration of class Date + class Date; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey // - /** Class that represent a GPG Public Key - */ + /** + * Class that represent a GPG Public Key + */ class PublicKey { friend std::ostream & operator<<( std::ostream & str, const PublicKey & obj ); @@ -69,29 +76,38 @@ public: PublicKey(); - /** Ctor + /** Ctor * \throws when data does not make a key */ PublicKey(const Pathname &file); - + ~PublicKey(); - + bool isValid() const { return ( ! id().empty() && ! fingerprint().empty() && !path().empty() ); } - + std::string asString() const; std::string armoredData() const; std::string id() const; std::string name() const; std::string fingerprint() const; - Pathname path() const; - - bool operator==( PublicKey b ) - { return (b.id() == id()) && (b.fingerprint() == fingerprint() ); } - - bool operator==( std::string sid ) - { return sid == id(); } - + + /** + * Date when the key was created (time is 00:00:00) + */ + Date created() const; + + /** + * Date when the key expires (time is 00:00:00) + * If the key never expires the date is Date() (i.e. 0 seconds since the epoch (1.1.1970)) + */ + Date expires() const; + + Pathname path() const; + + bool operator==( PublicKey b ) const; + bool operator==( std::string sid ) const; + private: /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; @@ -102,7 +118,10 @@ inline std::ostream & operator<<( std::ostream & str, const PublicKey & obj ) { return str << obj.asString(); } - ///////////////////////////////////////////////////////////////// + /** \relates PublicKey Detailed stream output */ + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ); + + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// #endif // ZYPP_PUBLICKEY_H Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/base/String.h (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/base/String.h Fri Jun 27 11:31:23 2008 @@ -204,6 +204,23 @@ inline _It strtonum( const std::string & str, _It & i ) { return i = strtonum<_It>( str ); } //@} + /////////////////////////////////////////////////////////////////// + + /** + * Looks for text in string and replaces it in place + * + * \note It only performs substtution in one pass + */ + inline std::string & replace_all( std::string & str, const std::string & from, const std::string & to ) + { + std::string::size_type pos = 0; + while( pos < str.length() && (pos = str.find( from, pos )) != std::string::npos ) + { + str.replace( pos, from.size(), to ); + pos += to.size(); + } + return str; + } /////////////////////////////////////////////////////////////////// /** \name Split. */ @@ -241,6 +258,57 @@ } return ret; } + + /** Split \a line_r into fields. + * Any single character in \a sepchars_r is treated as a + * field separator. The words are passed to OutputIterator + * \a result_r. + * \code + * "" -> words 0 + * ":" -> words 2 ||| + * "a" -> words 1 |a| + * ":a" -> words 2 ||a| + * "a:" -> words 2 |a|| + * ":a:" -> words 3 ||a|| + * + * \endcode + * + * \code + * std::vector<std::string> words; + * str::split( "some line", std::back_inserter(words) ) + * \endcode + * + */ + template<class _OutputIterator> + unsigned splitFields( const std::string & line_r, + _OutputIterator result_r, + const std::string & sepchars_r = ":" ) + { + const char * beg = line_r.c_str(); + const char * cur = beg; + unsigned ret = 0; + for ( beg = cur; *beg; beg = cur, ++result_r ) + { + // skip non sepchars + while( *cur && !::strchr( sepchars_r.c_str(), *cur ) ) + ++cur; + // build string + *result_r = std::string( beg, cur-beg ); + ++ret; + // skip sepchar + if ( *cur ) + { + ++cur; + if ( ! *cur ) // ending with sepchar + { + *result_r = std::string(); // add final empty field + ++ret; + break; + } + } + } + return ret; + } //@} /////////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.cc Fri Jun 27 11:31:23 2008 @@ -87,15 +87,23 @@ disconnect(); } - virtual void trustedKeyAdded( const KeyRing &keyring, const PublicKey &key ) + virtual void trustedKeyAdded( const KeyRing &, const PublicKey &key ) { - MIL << "trusted key added to zypp Keyring. Syncronizing keys with rpm keyring" << std::endl; - _rpmdb.importZyppKeyRingTrustedKeys(); - _rpmdb.exportTrustedKeysInZyppKeyRing(); + MIL << "Trusted key added to zypp Keyring. Importing" << endl; + // now import the key in rpm + try + { + _rpmdb.importPubkey( key ); + } + catch (RpmException &e) + { + ERR << "Could not import key " << key.id() << " (" << key.name() << " from " << key.path() << " in rpm database" << endl; + } } - virtual void trustedKeyRemoved( const KeyRing &keyring, const PublicKey &key ) + virtual void trustedKeyRemoved( const KeyRing &, const PublicKey &key ) { + ERR << "Can't remove key " << key << " from rpm database." << endl; } RpmDb &_rpmdb; @@ -957,7 +965,7 @@ // now import the key in rpm try { - importPubkey((*it).path()); + importPubkey(*it); MIL << "Trusted key " << (*it).id() << " (" << (*it).name() << ") imported in rpm database." << std::endl; } catch (RpmException &e) @@ -975,13 +983,47 @@ // METHOD TYPE : PMError // void RpmDb::importPubkey( const Pathname & pubkey_r ) + { importPubkey( PublicKey(pubkey_r) ); } + + void RpmDb::importPubkey( const PublicKey & pubkey_r ) { FAILIFNOTINITIALIZED; + // check if the key is already in the rpm database and just + // return if it does. + set<Edition> rpm_keys = pubkeyEditions(); + string keyshortid = pubkey_r.id().substr(8,8); + MIL << "Comparing '" << keyshortid << "' to: "; + for ( set<Edition>::const_iterator it = rpm_keys.begin(); it != rpm_keys.end(); ++it) + { + string id = str::toUpper( (*it).version() ); + MIL << ", '" << id << "'"; + if ( id == keyshortid ) + { + // they match id + // now check if timestamp is different + Date date = Date(str::strtonum<Date::ValueType>("0x" + (*it).release())); + if ( date == pubkey_r.created() ) + { + + MIL << endl << "Key " << pubkey_r << " is already in the rpm trusted keyring." << endl; + return; + } + else + { + MIL << endl << "Key " << pubkey_r << " has another version in keyring. ( " << date << " & " << pubkey_r.created() << ")" << endl; + + } + + } + } + // key does not exists, lets import it + MIL << endl; + RpmArgVec opts; opts.push_back ( "--import" ); opts.push_back ( "--" ); - opts.push_back ( pubkey_r.asString().c_str() ); + opts.push_back ( pubkey_r.path().asString().c_str() ); // don't call modifyDatabase because it would remove the old // rpm3 database, if the current database is a temporary one. @@ -1006,11 +1048,11 @@ if ( rpm_status != 0 ) { - ZYPP_THROW(RpmSubprocessException(string("Failed to import public key from file ") + pubkey_r.asString() + string(": rpm returned ") + str::numstring(rpm_status))); + ZYPP_THROW(RpmSubprocessException(string("Failed to import public key from file ") + pubkey_r.path().asString() + string(": rpm returned ") + str::numstring(rpm_status))); } else { - MIL << "Imported public key from file " << pubkey_r << endl; + MIL << "Imported public key from file " << pubkey_r.path() << endl; } } Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.h (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/target/rpm/RpmDb.h Fri Jun 27 11:31:23 2008 @@ -220,7 +220,15 @@ **/ void importPubkey( const Pathname & pubkey_r ); - /** + /** + * Import ascii armored public key in file pubkey_r. + * + * \throws RpmException + * + **/ + void importPubkey( const PublicKey & pubkey_r ); + + /** * Return the long ids of all installed public keys. **/ std::list<PublicKey> pubkeys() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10475 - in /branches/SuSE-Linux-11_0-Branch/zypper: VERSION.cmake doc/zypper.8 package/zypper.changes zypper.spec.cmake
by jkupec＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: jkupec Date: Thu Jun 26 15:49:35 2008 New Revision: 10475 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10475&view=rev Log: - changes & version - man page update Modified: branches/SuSE-Linux-11_0-Branch/zypper/VERSION.cmake branches/SuSE-Linux-11_0-Branch/zypper/doc/zypper.8 branches/SuSE-Linux-11_0-Branch/zypper/package/zypper.changes branches/SuSE-Linux-11_0-Branch/zypper/zypper.spec.cmake Modified: branches/SuSE-Linux-11_0-Branch/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/zypper/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/zypper/VERSION.cmake Thu Jun 26 15:49:35 2008 @@ -20,4 +20,4 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "11") -SET(VERSION_PATCH "8") +SET(VERSION_PATCH "9") Modified: branches/SuSE-Linux-11_0-Branch/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/zypper/doc/zypper.8 (original) +++ branches/SuSE-Linux-11_0-Branch/zypper/doc/zypper.8 Thu Jun 26 15:49:35 2008 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "0.11.7" "zypper" "System Tools" +.TH "zypper" "8" "0.11.9" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR] @@ -443,11 +443,48 @@ Search only in the repository specified by the alias, number or URI. Multiple \-r options are allowed. .TP -\fI \-\-sort\-by\-name\fR +.I \ \ \ \ \-\-sort\-by\-name Sort packages by name (default). .TP -\fI \-\-sort\-by\-repo\fR +.I \ \ \ \ \-\-sort\-by\-repo Sort packages by catalog, not by name. +.TP +.I \-s, \-\-details +Show all available versions of found packages, each version in each repository +on a separate line. + +.TP +.B patterns (pt) [options] [repository] ... +List all available patterns or all patterns from specified repositories. +Similar to \fBzypper search -s -t pattern\fR +.TP +.I \-r, \-\-repo <alias|#|URI> +Just another means to specify repositories. +.TP +.I \-i, \-\-installed\-only +Show only installed patterns. +.TP +.I \-u, \-\-uninstalled\-only +Show only patterns which are not installed. + +.TP +.B products (pd) [options] [repository] ... +List all available products or all products from specified repositories. +Similar to \fBzypper search -s -t product\fR, but shows also the type of the product +(base, add-on). +.TP +.I \-r, \-\-repo <alias|#|URI> +Just another means to specify repositories. +.TP +.I \-i, \-\-installed\-only +Show only installed products. +.TP +.I \-u, \-\-uninstalled\-only +Show only products which are not installed. + +.TP +.B what-provides (wp) <capability> +List all packages providing the specified capability. See also the \fBinstall\fR command for hint about capabilities. .SS Patch Management @@ -662,6 +699,36 @@ .I \-a, \-\-all Clean both repository metadata and package caches. +.SS Package Locks Management +Package locks server the purpose of preventing changes to the set of installed +packages on the system. The locks are stored in form of a \fIquery\fR in +/etc/zypp/locks file (see also locks(5)). +Packages matching this query are then forbidden to change their installed +status; an installed package can't be removed, not installed package can't be installed. +When requesting to install or remove such locked package, you will get a dependency problem +dialog. + +.TP +.B locks (ll) +List currently active package locks. + +.TP +.B addlock (al) [options] <package-name> +Add a package lock. Specify packages to lock by exact name or by a glob pattern using '*' and '?' +wildcard characters. + +.TP +.I \-r, \-\-repo <alias|#|URI> +Restrict the lock to the specified repository. +.TP +.I \-t, \-\-type <type> +Type of resolvable (package, patch, pattern, product). Default: package. + +.TP +.B removelock (rl) <lock-number|package-name> +Remove specified package lock. Specify the lock to remove by its number obtained with 'zypper locks' +or by the package name. + .SH "GLOBAL OPTIONS" .TP @@ -992,6 +1059,8 @@ Jan Kupec <jkupec(a)suse.cz> .br Stanislav Visnovsky <visnov(a)suse.cz> +.br +Josef Reidinger <jreidinger(a)suse.cz> .SH "SEE ALSO" .LP Modified: branches/SuSE-Linux-11_0-Branch/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/zypper/package/zypper.changes (original) +++ branches/SuSE-Linux-11_0-Branch/zypper/package/zypper.changes Thu Jun 26 15:49:35 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jun 26 14:41:55 CEST 2008 - jkupec(a)suse.cz + +- zypp-refresh-wrapper: don't close stderr (bnc #398530) +- set correct solver flags in 'verify' and '--debug-solver' +- r10469 +- 0.11.9 + +------------------------------------------------------------------- Fri Jun 20 13:21:51 CEST 2008 - jkupec(a)suse.cz - adapted to new patch message and script handling (bnc #401220) Modified: branches/SuSE-Linux-11_0-Branch/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/zypper/zypper.spec.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/zypper/zypper.spec.cmake Thu Jun 26 15:49:35 2008 @@ -37,6 +37,7 @@ Jan Kupec <jkupec(a)suse.cz> Duncan Mac-Vicar <dmacvicar(a)suse.de> Martin Vidner <mvidner(a)suse.cz> + Josef Reidinger <jreidinger(a)suse.cz> %prep %setup -q -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10474 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: jkupec Date: Thu Jun 26 15:46:28 2008 New Revision: 10474 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10474&view=rev Log: - some updates Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=10474&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Thu Jun 26 15:46:28 2008 @@ -450,9 +450,42 @@ Sort packages by catalog, not by name. .TP .I \-s, \-\-details -Show all available version of found packages, each version in each repository +Show all available versions of found packages, each version in each repository on a separate line. +.TP +.B patterns (pt) [options] [repository] ... +List all available patterns or all patterns from specified repositories. +Similar to \fBzypper search -s -t pattern\fR +.TP +.I \-r, \-\-repo <alias|#|URI> +Just another means to specify repositories. +.TP +.I \-i, \-\-installed\-only +Show only installed patterns. +.TP +.I \-u, \-\-uninstalled\-only +Show only patterns which are not installed. + +.TP +.B products (pd) [options] [repository] ... +List all available products or all products from specified repositories. +Similar to \fBzypper search -s -t product\fR, but shows also the type of the product +(base, add-on). +.TP +.I \-r, \-\-repo <alias|#|URI> +Just another means to specify repositories. +.TP +.I \-i, \-\-installed\-only +Show only installed products. +.TP +.I \-u, \-\-uninstalled\-only +Show only products which are not installed. + +.TP +.B what-provides (wp) <capability> +List all packages providing the specified capability. See also the \fBinstall\fR command for hint about capabilities. + .SS Patch Management .TP @@ -666,6 +699,36 @@ .I \-a, \-\-all Clean both repository metadata and package caches. +.SS Package Locks Management +Package locks server the purpose of preventing changes to the set of installed +packages on the system. The locks are stored in form of a \fIquery\fR in +/etc/zypp/locks file (see also locks(5)). +Packages matching this query are then forbidden to change their installed +status; an installed package can't be removed, not installed package can't be installed. +When requesting to install or remove such locked package, you will get a dependency problem +dialog. + +.TP +.B locks (ll) +List currently active package locks. + +.TP +.B addlock (al) [options] <package-name> +Add a package lock. Specify packages to lock by exact name or by a glob pattern using '*' and '?' +wildcard characters. + +.TP +.I \-r, \-\-repo <alias|#|URI> +Restrict the lock to the specified repository. +.TP +.I \-t, \-\-type <type> +Type of resolvable (package, patch, pattern, product). Default: package. + +.TP +.B removelock (rl) <lock-number|package-name> +Remove specified package lock. Specify the lock to remove by its number obtained with 'zypper locks' +or by the package name. + .SH "GLOBAL OPTIONS" .TP @@ -996,6 +1059,8 @@ Jan Kupec <jkupec(a)suse.cz> .br Stanislav Visnovsky <visnov(a)suse.cz> +.br +Josef Reidinger <jreidinger(a)suse.cz> .SH "SEE ALSO" .LP -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10473 - in /branches/SuSE-Linux-10_3-Branch/libzypp: ./ devel/devel.ma/ package/ zypp/ zypp/base/ zypp/target/rpm/
by mlandres＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: mlandres Date: Thu Jun 26 15:32:36 2008 New Revision: 10473 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10473&view=rev Log: - Import newer gpg keys if a trusted key is updated (bnc#393160) Added: branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/GpgKeyz.cc Modified: branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/CMakeLists.txt branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/Tools.h branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-10_3-Branch/libzypp/zypp/KeyRing.cc branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.h branches/SuSE-Linux-10_3-Branch/libzypp/zypp/base/String.h branches/SuSE-Linux-10_3-Branch/libzypp/zypp/target/rpm/RpmDb.cc Modified: branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake Thu Jun 26 15:32:36 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "3") -SET(LIBZYPP_MINOR "26") +SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "8") +SET(LIBZYPP_PATCH "0") Modified: branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/CMakeLists.txt (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/CMakeLists.txt Thu Jun 26 15:32:36 2008 @@ -29,7 +29,7 @@ ## ############################################################ -FOREACH( loop_var ScanSource Iorder Xml Ex Main FakePool AOUT Parse Test Basic) +FOREACH( loop_var ScanSource Iorder Xml Ex Main FakePool AOUT Parse Test Basic GpgKeyz) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc ) Added: branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/GpgKeyz.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/GpgKeyz.cc (added) +++ branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/GpgKeyz.cc Thu Jun 26 15:32:36 2008 @@ -0,0 +1,155 @@ +#include "Tools.h" +#include <iostream> +#include <fstream> +#include <list> +#include <map> +#include <set> + +#include <zypp/base/Hash.h> +#include <zypp/base/LogControl.h> +#include <zypp/base/LogTools.h> +#include "zypp/base/Exception.h" +#include "zypp/base/InputStream.h" +#include "zypp/base/DefaultIntegral.h" +#include <zypp/base/Function.h> +#include <zypp/base/Iterator.h> +#include <zypp/Pathname.h> +#include <zypp/ResStatus.h> +#include <zypp/Edition.h> +#include <zypp/CheckSum.h> +#include <zypp/Date.h> +#include <zypp/Rel.h> + +using namespace std; +using namespace zypp; + +/////////////////////////////////////////////////////////////////// + +static const Pathname sysRoot( "/Local/ma/GPG" ); + +/////////////////////////////////////////////////////////////////// + +struct KeyRingSignalsReceive : public callback::ReceiveReport<KeyRingSignals> +{ + KeyRingSignalsReceive() + { + connect(); + } + virtual void trustedKeyAdded( const KeyRing &/*keyring*/, const PublicKey &/*key*/ ) + { + USR << endl; + } + virtual void trustedKeyRemoved( const KeyRing &/*keyring*/, const PublicKey &/*key*/ ) + { + USR << endl; + } +}; + +/////////////////////////////////////////////////////////////////// + +void ltrusted() +{ + list<PublicKey> trustedPublicKeys; + { + //zypp::base::LogControl::TmpLineWriter shutUp; + KeyRing_Ptr p( getZYpp()->keyRing() ); + trustedPublicKeys = p->trustedPublicKeys(); + } + USR << "Trusted Keys " << trustedPublicKeys.size() << endl; + for_( it, trustedPublicKeys.begin(), trustedPublicKeys.end() ) + { + USR << *it << endl; + USR << " Creat: " << (*it).created() << endl; + USR << " Expir: " << (*it).expires() << endl; + } +} + +/////////////////////////////////////////////////////////////////// +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + --argc; + ++argv; + KeyRingSignalsReceive r; + + filesystem::unlink("/Local/ma/GPG/repos.d/newgpgkey.repo"); + + if ( true ) + { + RepoManager repoManager( makeRepoManager( sysRoot ) ); + RepoInfo nrepo; + nrepo + .setAlias( "newgpgkey" ) + .setName( "Test Repo with new gpg key" ) + .setEnabled( true ) + .setAutorefresh( false ) + .addBaseUrl( Url("dir:///schnell/CD-ARCHIVE/11.0/GM/DVD/i386/DVD1") ); + + repoManager.addRepository( nrepo ); + SEC << "refreshMetadat" << endl; + repoManager.refreshMetadata( nrepo, RepoManager::RefreshForced ); + SEC << "buildCache" << endl; + repoManager.buildCache( nrepo ); + SEC << "------" << endl; + } + + ltrusted(); + + if ( 1 ) + { + //zypp::base::LogControl::TmpLineWriter shutUp; + getZYpp()->initTarget( sysRoot ); + } + + ltrusted(); + + INT << "===[DONE]===========================================" << endl; + zypp::base::LogControl::TmpLineWriter shutUp; + return 0; +} + +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main2( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + --argc; + ++argv; + KeyRingSignalsReceive r; + + + KeyRing_Ptr p( getZYpp()->keyRing() ); + + //PublicKey ka("/Local/ma/GPG/all-keys/build-9c800aca-40d8063e.asc"); + PublicKey kb("/Local/ma/GPG/all-keys/build-9c800aca-481f343a.asc"); + + SEC << "============================================" << endl; + ltrusted(); + //p->importKey( ka, true ); + //ltrusted(); + p->importKey( kb, true ); + ltrusted(); + + SEC << "============================================" << endl; + + if ( 1 ) + { + zypp::base::LogControl::TmpLineWriter shutUp; + getZYpp()->initTarget( sysRoot ); + } + + + + INT << "===[DONE]===========================================" << endl; + zypp::base::LogControl::TmpLineWriter shutUp; + return 0; +} + Modified: branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/Tools.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/Tools.h (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/devel/devel.ma/Tools.h Thu Jun 26 15:32:36 2008 @@ -109,7 +109,7 @@ RepoManagerOptions mgropt; mgropt.repoCachePath = mgrdir_r/"cache"; mgropt.repoRawCachePath = mgrdir_r/"raw_cache"; - mgropt.knownReposPath = mgrdir_r; + mgropt.knownReposPath = mgrdir_r/"repos.d"; return RepoManager( mgropt ); } Modified: branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes Thu Jun 26 15:32:36 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jun 26 15:31:24 CEST 2008 - ma(a)suse.de + +- Import newer gpg keys if a trusted key is updated + (bnc#393160) +- version 3.27.0 +- revision 10473 + +------------------------------------------------------------------- Wed Feb 20 18:15:11 CET 2008 - dmacvicar(a)suse.de - Fetcher::reset() should not reset cache directories. Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/KeyRing.cc (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/KeyRing.cc Thu Jun 26 15:32:36 2008 @@ -316,6 +316,19 @@ { PublicKey key = exportKey( id, trustedKeyRing() ); + // lets look if there is an updated key in the + // general keyring + if ( publicKeyExists( id, generalKeyRing() ) ) + { + PublicKey untkey = exportKey( id, generalKeyRing() ); + if ( untkey.created() > key.created() ) + { + MIL << "Key " << key << " was updated. Saving new version into trusted keyring." << endl; + importKey( untkey, true ); + key = untkey; + } + } + MIL << "Key " << id << " " << key.name() << " is trusted" << endl; // it exists, is trusted, does it validates? if ( verifyFile( file, signature, trustedKeyRing() ) ) Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc Thu Jun 26 15:32:36 2008 @@ -10,22 +10,25 @@ * */ #include <iostream> -//#include "zypp/base/Logger.h" +#include <vector> +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" #include "zypp/base/String.h" -#include "zypp/base/Regex.h" -#include "zypp/PublicKey.h" + #include "zypp/ExternalProgram.h" +#include "zypp/PublicKey.h" #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" -#include "zypp/base/Exception.h" -#include "zypp/base/Logger.h" +#include "zypp/Date.h" + +//#include <ctime> using std::endl; /////////////////////////////////////////////////////////////////// namespace zypp -{ ///////////////////////////////////////////////////////////////// +{ ///////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey::Impl // @@ -40,7 +43,7 @@ readFromFile(file); MIL << "Done reading key" << std::endl; } - + public: /** Offer default Impl. */ static shared_ptr<Impl> nullimpl() @@ -49,53 +52,54 @@ return _nullimpl; } - std::string asString() const { - return "[" + id() + "] [" + name() + "] [" + fingerprint() + "]"; + return "[" + id() + "-" + str::hexstring(created(),8).substr(2) + "] [" + name() + "] [" + fingerprint() + "]"; } - + std::string armoredData() const { return _data; } - + std::string id() const { return _id; } - + std::string name() const { return _name; } - + std::string fingerprint() const { return _fingerprint; } - + + Date created() const + { return _created; } + + Date expires() const + { return _expires; } + Pathname path() const - { + { return _data_file.path(); //return _data_file; } - + protected: - + void readFromFile( const Pathname &keyfile) { - static str::regex rxColons("^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):\n$"); - + PathInfo info(keyfile); - MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; + MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; if ( !info.isExist() ) ZYPP_THROW(Exception("Can't read public key from " + keyfile.asString() + ", file not found")); - + if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); - - filesystem::TmpDir dir; - const char* argv[] = { "gpg", + "-v", "--no-default-keyring", - "--homedir", - dir.path().asString().c_str(), + "--fixed-list-mode", "--with-fingerprint", "--with-colons", "--quiet", @@ -107,45 +111,85 @@ _data_file.path().asString().c_str(), NULL }; - + ExternalProgram prog(argv,ExternalProgram::Discard_Stderr, false, -1, true); - + std::string line; - int count = 0; - - // pub:-:1024:17:A84EDAE89C800ACA:2000-10-19:2008-06-21::-:SuSE Package Signing Key <build(a)suse.de>: - - for(line = prog.receiveLine(), count=0; !line.empty(); line = prog.receiveLine(), count++ ) + bool sawpub = false; + bool sawsig = false; + + // pub:-:1024:17:A84EDAE89C800ACA:971961473:1214043198::-:SuSE Package Signing Key <build(a)suse.de>: + // fpr:::::::::79C179B2E1C820C1890F9994A84EDAE89C800ACA: + // sig:::17:A84EDAE89C800ACA:1087899198:::::[selfsig]::13x: + // sig:::17:9E40E310000AABA4:980442706::::[User ID not found]:10x: + // sig:::1:77B2E6003D25D3D9:980443247::::[User ID not found]:10x: + // sub:-:2048:16:197448E88495160C:971961490:1214043258::: [expires: 2008-06-21] + // sig:::17:A84EDAE89C800ACA:1087899258:::::[keybind]::18x: + + for ( line = prog.receiveLine(); !line.empty(); line = prog.receiveLine() ) { - //MIL << "[" << line << "]" << std::endl; - str::smatch what; - if(str::regex_match(line, what, rxColons)) + // trim trailing NL. + if ( line.empty() ) + continue; + if ( line[line.size()-1] == '\n' ) + line.erase( line.size()-1 ); + + // split at ':' + std::vector<std::string> words; + str::splitFields( line, std::back_inserter(words), ":" ); + if( words.empty() ) + continue; + + if ( words[0] == "pub" ) { - if ( what[1] == "pub" ) - { - _id = what[5]; - _name = what[10]; - //return key; - } - else if ( what[1] == "fpr" ) - { - _fingerprint = what[10]; - } - //dumpRegexpResults(what); + if ( sawpub ) + continue; + sawpub = true; + // take default from pub + _id = words[4]; + _name = words[9]; + _created = Date(str::strtonum<Date::ValueType>(words[5])); + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + + } + else if ( words[0] == "sig" ) + { + if ( sawsig || words[words.size()-2] != "13x" ) + continue; + sawsig = true; + // update creation and expire dates from 1st signature type "13x" + if ( ! words[5].empty() ) + _created = Date(str::strtonum<Date::ValueType>(words[5])); + if ( ! words[6].empty() ) + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + } + else if ( words[0] == "fpr" ) + { + _fingerprint = words[9]; + } + else if ( words[0] == "uid" ) + { + if ( ! words[9].empty() ) + _name = words[9]; } } prog.close(); - - if (_id.size() == 0 ) - ZYPP_THROW(BadKeyException("File " + keyfile.asString() + " doesn't contain public key data" , keyfile)); + + if ( _id.size() == 0 ) + ZYPP_THROW( BadKeyException( "File " + keyfile.asString() + " doesn't contain public key data" , keyfile ) ); + + //replace all escaped semicolon with real ':' + str::replace_all( _name, "\\x3a", ":" ); } - + private: std::string _id; std::string _name; std::string _fingerprint; std::string _data; filesystem::TmpFile _data_file; + Date _created; + Date _expires; //Pathname _data_file; private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); @@ -166,7 +210,9 @@ PublicKey::PublicKey( const Pathname &file ) : _pimpl( new Impl(file) ) - {} + { + MIL << *this << endl; + } /////////////////////////////////////////////////////////////////// // // METHOD NAME : PublicKey::~PublicKey @@ -185,32 +231,51 @@ { return _pimpl->asString(); } - + std::string PublicKey::armoredData() const { return _pimpl->armoredData(); } - + std::string PublicKey::id() const { return _pimpl->id(); } - + std::string PublicKey::name() const { return _pimpl->name(); } - + std::string PublicKey::fingerprint() const { return _pimpl->fingerprint(); } - + + Date PublicKey::created() const + { return _pimpl->created(); } + + Date PublicKey::expires() const + { return _pimpl->expires(); } + Pathname PublicKey::path() const { return _pimpl->path(); } bool PublicKey::operator==( PublicKey b ) const { - return (b.id() == id()) && (b.fingerprint() == fingerprint() ); + return( b.id() == id() + && b.fingerprint() == fingerprint() + && b.created() == created() ); } - + bool PublicKey::operator==( std::string sid ) const { return sid == id(); } - + + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ) + { + str << "[" << obj.name() << "]" << endl; + str << " fpr " << obj.fingerprint() << endl; + str << " id " << obj.id() << endl; + str << " cre " << obj.created() << endl; + str << " exp " << obj.expires() << endl; + str << "]"; + return str; + } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.h (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.h Thu Jun 26 15:32:36 2008 @@ -25,7 +25,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - + /** * Exception thrown when the supplied key is * not a valid gpg key @@ -39,10 +39,10 @@ BadKeyException() : Exception( "Bad Key Exception" ) {} - + Pathname keyFile() const { return _keyfile; } - + /** Ctor taking message. * Use \ref ZYPP_THROW to throw exceptions. */ @@ -54,13 +54,16 @@ private: Pathname _keyfile; }; - - + + + // forward declaration of class Date + class Date; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey // - /** + /** * Class that represent a GPG Public Key */ class PublicKey @@ -73,26 +76,38 @@ public: PublicKey(); - /** Ctor + /** Ctor * \throws when data does not make a key */ PublicKey(const Pathname &file); - + ~PublicKey(); - + bool isValid() const { return ( ! id().empty() && ! fingerprint().empty() && !path().empty() ); } - + std::string asString() const; std::string armoredData() const; std::string id() const; std::string name() const; std::string fingerprint() const; - Pathname path() const; - + + /** + * Date when the key was created (time is 00:00:00) + */ + Date created() const; + + /** + * Date when the key expires (time is 00:00:00) + * If the key never expires the date is Date() (i.e. 0 seconds since the epoch (1.1.1970)) + */ + Date expires() const; + + Pathname path() const; + bool operator==( PublicKey b ) const; bool operator==( std::string sid ) const; - + private: /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; @@ -103,7 +118,10 @@ inline std::ostream & operator<<( std::ostream & str, const PublicKey & obj ) { return str << obj.asString(); } - ///////////////////////////////////////////////////////////////// + /** \relates PublicKey Detailed stream output */ + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ); + + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// #endif // ZYPP_PUBLICKEY_H Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/base/String.h (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/base/String.h Thu Jun 26 15:32:36 2008 @@ -229,6 +229,23 @@ inline bool strToBool( const std::string & str, bool default_r ) { return( default_r ? strToFalse( str ) : strToTrue( str ) ); } //@} + /////////////////////////////////////////////////////////////////// + + /** + * Looks for text in string and replaces it in place + * + * \note It only performs substtution in one pass + */ + inline std::string & replace_all( std::string & str, const std::string & from, const std::string & to ) + { + std::string::size_type pos = 0; + while( pos < str.length() && (pos = str.find( from, pos )) != std::string::npos ) + { + str.replace( pos, from.size(), to ); + pos += to.size(); + } + return str; + } /////////////////////////////////////////////////////////////////// /** \name Split. */ @@ -266,6 +283,57 @@ } return ret; } + + /** Split \a line_r into fields. + * Any single character in \a sepchars_r is treated as a + * field separator. The words are passed to OutputIterator + * \a result_r. + * \code + * "" -> words 0 + * ":" -> words 2 ||| + * "a" -> words 1 |a| + * ":a" -> words 2 ||a| + * "a:" -> words 2 |a|| + * ":a:" -> words 3 ||a|| + * + * \endcode + * + * \code + * std::vector<std::string> words; + * str::split( "some line", std::back_inserter(words) ) + * \endcode + * + */ + template<class _OutputIterator> + unsigned splitFields( const std::string & line_r, + _OutputIterator result_r, + const std::string & sepchars_r = ":" ) + { + const char * beg = line_r.c_str(); + const char * cur = beg; + unsigned ret = 0; + for ( beg = cur; *beg; beg = cur, ++result_r ) + { + // skip non sepchars + while( *cur && !::strchr( sepchars_r.c_str(), *cur ) ) + ++cur; + // build string + *result_r = std::string( beg, cur-beg ); + ++ret; + // skip sepchar + if ( *cur ) + { + ++cur; + if ( ! *cur ) // ending with sepchar + { + *result_r = std::string(); // add final empty field + ++ret; + break; + } + } + } + return ret; + } //@} /////////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/target/rpm/RpmDb.cc Thu Jun 26 15:32:36 2008 @@ -909,7 +909,7 @@ // now import the key in rpm try { - importPubkey((*it).path()); + importPubkey(*it); MIL << "Trusted key " << (*it).id() << " (" << (*it).name() << ") imported in rpm database." << std::endl; } catch (RpmException &e) @@ -989,20 +989,33 @@ // check if the key is already in the rpm database and just // return if it does. set<Edition> rpm_keys = pubkeyEditions(); + string keyshortid = pubkey_r.id().substr(8,8); + MIL << "Comparing '" << keyshortid << "' to: "; for ( set<Edition>::const_iterator it = rpm_keys.begin(); it != rpm_keys.end(); ++it) { string id = str::toUpper( (*it).version() ); - string keyshortid = pubkey_r.id().substr(8,8); - MIL << "Comparing '" << id << "' to '" << keyshortid << "'" << endl; + MIL << ", '" << id << "'"; if ( id == keyshortid ) { // they match id - // FIXME id is not sufficient? - MIL << "Key " << pubkey_r << " is already in the rpm trusted keyring." << endl; - return; + // now check if timestamp is different + Date date = Date(str::strtonum<Date::ValueType>("0x" + (*it).release())); + if ( date == pubkey_r.created() ) + { + + MIL << endl << "Key " << pubkey_r << " is already in the rpm trusted keyring." << endl; + return; + } + else + { + MIL << endl << "Key " << pubkey_r << " has another version in keyring. ( " << date << " & " << pubkey_r.created() << ")" << endl; + + } + } } - // key does not exists, lets import it + // key does not exists, lets import it + MIL << endl; RpmArgVec opts; opts.push_back ( "--import" ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10472 - in /trunk/zypper: ./ package/zypper.changes
by jkupec＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: jkupec Date: Thu Jun 26 15:02:04 2008 New Revision: 10472 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10472&view=rev Log: changes Modified: trunk/zypper/ (props changed) trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Thu Jun 26 15:02:04 2008 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jun 26 14:55:25 CEST 2008 - jkupec(a)suse.cz + +- zypp-refresh-wrapper: don't close stderr (#398530) +- r10471 + +------------------------------------------------------------------- +Wed Jun 25 14:30:29 CEST 2008 - jkupec(a)suse.cz + +- 'xu' removed, replaced by + zypper --xmlout install -t package -t patch. r10470 +- source tree cleanup. r10454-10456 + +------------------------------------------------------------------- Fri Jun 20 13:52:31 CEST 2008 - jkupec(a)suse.cz - adapted to new patch message and script handling (#401220) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10471 - /trunk/zypper/src/zypp-refresh-wrapper.c
by jkupec＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: jkupec Date: Thu Jun 26 14:55:20 2008 New Revision: 10471 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10471&view=rev Log: - don't close stderr (#398530) Modified: trunk/zypper/src/zypp-refresh-wrapper.c Modified: trunk/zypper/src/zypp-refresh-wrapper.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypp-refresh-wrapper.… ============================================================================== --- trunk/zypper/src/zypp-refresh-wrapper.c (original) +++ trunk/zypper/src/zypp-refresh-wrapper.c Thu Jun 26 14:55:20 2008 @@ -34,7 +34,7 @@ /* see http://rechner.lst.de/~okir/blackhats/node35.html */ int fd = getdtablesize(); - while (fd-- > 2) + while (--fd > 2) close(fd); /* cd / to avoid NFS problems */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10470 - in /trunk/zypper/src: Command.cc Command.h Zypper.cc
by jkupec＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: jkupec Date: Thu Jun 26 14:54:36 2008 New Revision: 10470 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10470&view=rev Log: - removed deprecated 'xu', replaced by zypper --xmlout install -t package -t patch Modified: trunk/zypper/src/Command.cc trunk/zypper/src/Command.h trunk/zypper/src/Zypper.cc Modified: trunk/zypper/src/Command.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Command.cc?rev=10470&… ============================================================================== --- trunk/zypper/src/Command.cc (original) +++ trunk/zypper/src/Command.cc Thu Jun 26 14:54:36 2008 @@ -42,7 +42,6 @@ const ZypperCommand ZypperCommand::WHAT_PROVIDES(ZypperCommand::WHAT_PROVIDES_e); //const ZypperCommand ZypperCommand::WHAT_REQUIRES(ZypperCommand::WHAT_REQUIRES_e); //const ZypperCommand ZypperCommand::WHAT_CONFLICTS(ZypperCommand::WHAT_CONFLICTS_e); -const ZypperCommand ZypperCommand::XML_LIST_UPDATES_PATCHES(ZypperCommand::XML_LIST_UPDATES_PATCHES_e); const ZypperCommand ZypperCommand::ADD_LOCK(ZypperCommand::ADD_LOCK_e); const ZypperCommand ZypperCommand::REMOVE_LOCK(ZypperCommand::REMOVE_LOCK_e); @@ -105,7 +104,6 @@ _table["what-provides"] = _table["wp"] = ZypperCommand::WHAT_PROVIDES_e; //_table["what-requires"] = _table["wr"] = ZypperCommand::WHAT_REQUIRES_e; //_table["what-conflicts"] = _table["wc"] = ZypperCommand::WHAT_CONFLICTS_e; - _table["xml-updates"] = _table["xu"] = ZypperCommand::XML_LIST_UPDATES_PATCHES_e; _table["addlock"] = _table["al"] = _table["lock-add"] = _table["la"] = ZypperCommand::ADD_LOCK_e; _table["removelock"] = _table["rl"] = _table["lock-delete"] = _table["ld"] = ZypperCommand::REMOVE_LOCK_e; Modified: trunk/zypper/src/Command.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Command.h?rev=10470&r… ============================================================================== --- trunk/zypper/src/Command.h (original) +++ trunk/zypper/src/Command.h Thu Jun 26 14:54:36 2008 @@ -37,7 +37,6 @@ static const ZypperCommand WHAT_PROVIDES; //static const ZypperCommand WHAT_REQUIRES; //static const ZypperCommand WHAT_CONFLICTS; - static const ZypperCommand XML_LIST_UPDATES_PATCHES; static const ZypperCommand ADD_LOCK; static const ZypperCommand REMOVE_LOCK; @@ -96,7 +95,6 @@ WHAT_PROVIDES_e, //WHAT_REQUIRES_e, //WHAT_CONFLICTS_e, - XML_LIST_UPDATES_PATCHES_e, ADD_LOCK_e, REMOVE_LOCK_e, Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10470&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Thu Jun 26 14:54:36 2008 @@ -1637,26 +1637,6 @@ break; } - case ZypperCommand::XML_LIST_UPDATES_PATCHES_e: - { - static struct option xml_updates_options[] = { - {"repo", required_argument, 0, 'r'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; - specific_options = xml_updates_options; - _command_help = str::form(_( - "xml-updates\n" - "\n" - "Show updates and patches in xml format. This command is deprecated and will" - " eventually be dropped in favor of '%s'.\n" - "\n" - " Command options:\n" - "-r, --repo <alias|#|URI> Work only with updates from the specified repository.\n" - ), "zypper --xmlout install -t package -t patch"); - break; - } - case ZypperCommand::ADD_LOCK_e: { static struct option options[] = @@ -2889,32 +2869,6 @@ break; } - // -----------------( xml list updates and patches )------------------------ - - //! \todo remove this command - case ZypperCommand::XML_LIST_UPDATES_PATCHES_e: - { - if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } - - init_target(*this); - init_repos(*this); - if (exitCode() != ZYPPER_EXIT_OK) - return; - load_resolvables(*this); - // needed to compute status of PPP - resolve(*this); - - cout << "<update-status version=\"0.6\">" << endl; - cout << "<update-list>" << endl; - ResKindSet kinds; kinds.insert(ResTraits<Package>::kind); - if (!xml_list_patches ()) // Only list updates if no - xml_list_updates (kinds); // affects-pkg-mgr patches are available - cout << "</update-list>" << endl; - cout << "</update-status>" << endl; - - break; - } - // -----------------------------( update )---------------------------------- case ZypperCommand::UPDATE_e: -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0