November 2010 - Zypp Development - openSUSE Mailing Lists

[zypp-devel] [PATCH 2/2] Add support for using libproxy to find proxies
by David Woodhouse 20 Dec '10

20 Dec '10

This one probably isn't ready to apply as-is, but it's working for me right now. Problems include: - it should have proper CMake magic to find and build against (and optionally *not* build against) libproxy. - it probably shouldn't unconditionally subvert the old code which looks in /etc/sysconfig/proxy for per-url-scheme information. - There's a memory leak when we return a proxy specified by libproxy. I figured that all of those were probably best handled by someone who knows the code (or just knows CMake/C++) better than me. --- zypp/CMakeLists.txt | 3 + zypp/media/MediaCurl.cc | 2 +- zypp/media/proxyinfo/ProxyInfoLibproxy.cc | 87 +++++++++++++++++++++++++++++ zypp/media/proxyinfo/ProxyInfoLibproxy.h | 57 +++++++++++++++++++ zypp/media/proxyinfo/ProxyInfos.h | 1 + 5 files changed, 149 insertions(+), 1 deletions(-) create mode 100644 zypp/media/proxyinfo/ProxyInfoLibproxy.cc create mode 100644 zypp/media/proxyinfo/ProxyInfoLibproxy.h diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index d4f4682..796968f 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -326,11 +326,13 @@ INSTALL( FILES SET( zypp_media_proxyinfo_SRCS media/proxyinfo/ProxyInfoSysconfig.cc + media/proxyinfo/ProxyInfoLibproxy.cc ) SET( zypp_media_proxyinfo_HEADERS media/proxyinfo/ProxyInfoImpl.h media/proxyinfo/ProxyInfoSysconfig.h + media/proxyinfo/ProxyInfoLibproxy.h media/proxyinfo/ProxyInfos.h ) @@ -912,6 +914,7 @@ TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} ) TARGET_LINK_LIBRARIES(zypp ${CRYPTO_LIBRARIES} ) TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} ) TARGET_LINK_LIBRARIES(zypp ${UDEV_LIBRARY} ) +TARGET_LINK_LIBRARIES(zypp -lproxy ) INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc index bf06908..b0c6635 100644 --- a/zypp/media/MediaCurl.cc +++ b/zypp/media/MediaCurl.cc @@ -326,7 +326,7 @@ void fillSettingsFromUrl( const Url &url, TransferSettings &s ) */ void fillSettingsSystemProxy( const Url&url, TransferSettings &s ) { - ProxyInfo proxy_info (ProxyInfo::ImplPtr(new ProxyInfoSysconfig("proxy"))); + ProxyInfo proxy_info (ProxyInfo::ImplPtr(new ProxyInfoLibproxy())); s.setProxyEnabled( proxy_info.useProxyFor( url ) ); if ( s.proxyEnabled() ) s.setProxy(proxy_info.proxy(url)); diff --git a/zypp/media/proxyinfo/ProxyInfoLibproxy.cc b/zypp/media/proxyinfo/ProxyInfoLibproxy.cc new file mode 100644 index 0000000..ef7bdac --- /dev/null +++ b/zypp/media/proxyinfo/ProxyInfoLibproxy.cc @@ -0,0 +1,87 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/media/proxyinfo/ProxyInfoLibproxy.cc + * +*/ + +#include <iostream> +#include <fstream> + +#include "zypp/base/Logger.h" +#include "zypp/base/String.h" +#include "zypp/Pathname.h" + +#include "zypp/media/proxyinfo/ProxyInfoLibproxy.h" + +using namespace std; +using namespace zypp::base; + +namespace zypp { + namespace media { + + ProxyInfoLibproxy::ProxyInfoLibproxy() + : ProxyInfo::Impl() + { + _factory = px_proxy_factory_new(); + _enabled = !(_factory == NULL); + } + + ProxyInfoLibproxy::~ProxyInfoLibproxy() + { + if (_enabled) { + px_proxy_factory_free(_factory); + _factory = NULL; + _enabled = false; + } + } + + std::string ProxyInfoLibproxy::proxy(const Url & url_r) const + { + if (!_enabled) + return ""; + + const url::ViewOption vopt = + url::ViewOption::WITH_SCHEME + + url::ViewOption::WITH_HOST + + url::ViewOption::WITH_PORT + + url::ViewOption::WITH_PATH_NAME; + + char **proxies = px_proxy_factory_get_proxies(_factory, + (char *)url_r.asString(vopt).c_str()); + if (!proxies) + return ""; + + /* cURL can only handle HTTP proxies, not SOCKS. And can only handle + one. So look through the list and find an appropriate one. */ + char *result = NULL; + + for (int i = 0; proxies[i]; i++) { + if (!result && + !strncmp(proxies[i], "http://", 7)) + result = proxies[i]; + else + free(proxies[i]); + } + free(proxies); + + if (!result) + return ""; + + /* Yes, there's a memory leak here */ + return result; + } + + ProxyInfo::NoProxyIterator ProxyInfoLibproxy::noProxyBegin() const + { return _no_proxy.begin(); } + + ProxyInfo::NoProxyIterator ProxyInfoLibproxy::noProxyEnd() const + { return _no_proxy.end(); } + + } // namespace media +} // namespace zypp diff --git a/zypp/media/proxyinfo/ProxyInfoLibproxy.h b/zypp/media/proxyinfo/ProxyInfoLibproxy.h new file mode 100644 index 0000000..b181064 --- /dev/null +++ b/zypp/media/proxyinfo/ProxyInfoLibproxy.h @@ -0,0 +1,57 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/media/proxyinfo/ProxyInfoLibproxy.h + * +*/ +#ifndef ZYPP_MEDIA_PROXYINFO_PROXYINFOLIBPROXY_H +#define ZYPP_MEDIA_PROXYINFO_PROXYINFOLIBPROXY_H + +#include <string> +#include <map> + +#include <proxy.h> + +#include "zypp/base/DefaultIntegral.h" +#include "zypp/media/ProxyInfo.h" +#include "zypp/media/proxyinfo/ProxyInfoImpl.h" + +namespace zypp { + namespace media { + + + class ProxyInfoLibproxy : public ProxyInfo::Impl + { + public: + ProxyInfoLibproxy(); + /** */ + ~ProxyInfoLibproxy(); + /** */ + bool enabled() const + { return _enabled; } + /** */ + std::string proxy(const Url & url_r) const; + /** */ + ProxyInfo::NoProxyList noProxy() const + { return _no_proxy; } + /** */ + virtual ProxyInfo::NoProxyIterator noProxyBegin() const; + /** */ + virtual ProxyInfo::NoProxyIterator noProxyEnd() const; + private: + DefaultIntegral<bool,false> _enabled; + ProxyInfo::NoProxyList _no_proxy; + pxProxyFactory *_factory; + }; + +/////////////////////////////////////////////////////////////////// + + } // namespace media +} // namespace zypp + +#endif // ZYPP_MEDIA_PROXYINFO_PROXYINFOLIBPROXY_H diff --git a/zypp/media/proxyinfo/ProxyInfos.h b/zypp/media/proxyinfo/ProxyInfos.h index 9cfe78a..3f0682a 100644 --- a/zypp/media/proxyinfo/ProxyInfos.h +++ b/zypp/media/proxyinfo/ProxyInfos.h @@ -16,5 +16,6 @@ #include <list> #include "zypp/media/proxyinfo/ProxyInfoSysconfig.h" +#include "zypp/media/proxyinfo/ProxyInfoLibproxy.h" #endif // ZYPP_MEDIA_PROXYINFO_PROXYINFOS_H -- 1.7.3.2 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

3 5

[zypp-devel] How to use libzypp-bindings to create a sysroot from a repo?
by Yi Yang 08 Dec '10

08 Dec '10

Hi, all i'm using libzypp-bindings to create an MeeGo sysroot, i know zypper command can do this. zypper --root /meego-sysroot ar http://repo.meego.com/MeeGo/builds/trunk/1.1.80.0.20101005.1/core/repos/ia3… core zypper --root /meego-sysroot install -t pattern meego-core zypper can do it, i believe libzypp-bindings also can do it, but unfortunately , i can't find a tutorial for this, so i only can read zypper and libzypp code to understand how to do it. I tried to do such a script: -----------Cut here---------------------- #! /usr/bin/python import sys import zypp zypp.KeyRing.setDefaultAccept( zypp.KeyRing.ACCEPT_UNSIGNED_FILE | zypp.KeyRing.ACCEPT_VERIFICATION_FAILED ) repoManagerOptions = zypp.RepoManagerOptions(zypp.Pathname("/meego-sysroot")) repoManager = zypp.RepoManager(repoManagerOptions) repoManager.addRepositories(zypp.Url("file:///home/yangyi/test.repo")) repos = repoManager.knownRepositories() for repo in repos: if not repo.enabled(): continue print "Build cache for repo %s" % repo.url() if not repoManager.isCached( repo ): repoManager.buildCache( repo, zypp.RepoManager.BuildIfNeeded ) repoManager.loadFromCache( repo ); Z = zypp.ZYppFactory_instance().getZYpp() Z.initializeTarget( zypp.Pathname("/zypper-root") ) Z.target().load(); sys.exit(0) --------------Cut here---------------------- $ cat test.repo [core] name=core enabled=1 autorefresh=0 baseurl=http://repo.meego.com/MeeGo/builds/trunk/1.1.80.0.20101005.1/core/r… type=NONE keeppackages=0 $ When i run this script, the error is below: Traceback (most recent call last): File "list_resolvables.py", line 6, in <module> zypp.KeyRing.setDefaultAccept( zypp.KeyRing.ACCEPT_UNSIGNED_FILE | zypp.KeyRing.ACCEPT_VERIFICATION_FAILED ) TypeError: in method 'KeyRing_setDefaultAccept', argument 1 of type 'zypp::KeyRing::DefaultAccept' This is just a beginning, i want to install many packages and groups/patterns from a kickstart file into /meego-sysroot once, is it possible? anybody can give an sample to do this. -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

4 30

[zypp-devel] Some feedback from the MeeGo Conference 2010 in Dublin
by Jano Kupec 30 Nov '10

30 Nov '10

First, it seems MeeGo has finally decided to adopt the zypp stack as their default software managment solution. Hurray! Here is some feedback i got after the zypp talk [1] and during the conference. Mostly they were small enhancements or fixes that people miss after switching from yum: * limit the number of multiversion pkgs installed (yum has that) * install source rpm file into home dir, without root (yum has that) * package cache proxy - one more vote for making a package cache proxy setup easy on zypp-managed machines * we should support multiple values for various keys in .repo files as yum does, looking at `man yum.conf`, this would be gpgkey, but i have a feeling we were discussing also something else (maybe the way how baseurl and mirrorlist work together) I asked the people to report these things in our bugzilla. There was also a question about managing software remotely from one machine on another machine, usually having different architecture and not having zypp. This question comes from a specific need to manage software on all the little devices. Unfortunately i don't have more details on this. Hopefully we'll see more feedback and also patches (like the libproxy support) in the months to come! For example getting the python bindings in good shape would be really mutually beneficial. [1] http://conference2010.meego.com/session/zypp-software-management-stack -- cheers, jano Ján Kupec Appliances team ---------------------------------------------------------(PGP)--- Key ID: 637EE901 Fingerprint: 93B9 C79B 2D20 51C3 800B E09B 8048 46A6 637E E901 ---------------------------------------------------------(IRC)--- Server: irc.freenode.net Nick: jniq Channels: #zypp #yast #suse #susecz ---------------------------------------------------------(EOF)---

1 0

[zypp-devel] [patch for sat-solver] Fix header file db.h path issue
by Yi Yang 24 Nov '10

24 Nov '10

>From 58a83071711fda84924b85aeade69df3bdc47744 Mon Sep 17 00:00:00 2001 From: Yi Yang <yi.y.yang(a)intel.com> Date: Wed, 24 Nov 2010 11:25:08 +0800 Subject: <db.h> is better than <db4/db.h> Note: db.h can be found under /usr/include on Fedora, Debian and Ubuntu. Signed-off-by: Yi Yang <yi.y.yang(a)intel.com> --- ext/repo_rpmdb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 34f2b65..a42a7fd 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -29,7 +29,7 @@ #ifndef DB_CREATE # ifdef FEDORA -# include <db4/db.h> +# include <db.h> # else # include <rpm/db.h> # endif -- 1.6.0.6 -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 1

[zypp-devel] [PATCH 0/0] libproxy support
by David Woodhouse 22 Nov '10

22 Nov '10

The following two patches attempt to add support to libzypp for dynamic detection of HTTP proxies. On a mobile device, a simple static configuration of proxies per scheme (http/ftp/etc.) is not sufficient. Complex corporate environments may provide a proxy autoconfig script which returns *different* proxies for different URLs (especially internal vs. external), and there may be no single proxy which can satisfy all requests. And the whole thing changes when you take the machine *outside* the corporate environment, and you want the system to cope with that change without manual reconfiguration. The solution to this problem is libproxy — a library which applications can use to ask the simple question "which proxy do I use for this URL?". Multiple implementations of the trivial libproxy API are possible; in future versions of MeeGo we won't actually use the original, which has various implementation issues — instead we'll provide a simple library called 'libproxy.so.0' which just makes D-Bus calls to a 'PacRunner' dæmon that receives proxy information from ConnMan based on the current network connections, and serves clients based on that information. -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 1

[zypp-devel] [PATCH 1/2] Pass full Url to ProxyInfo::proxy() function
by David Woodhouse 20 Nov '10

20 Nov '10

Sometimes the decision about which proxy to use is based on more than just the URL scheme. If a proxy autoconfigure script is in effect, we need the full URL to be available. So pass it. --- zypp/media/MediaCurl.cc | 2 +- zypp/media/ProxyInfo.cc | 4 ++-- zypp/media/ProxyInfo.h | 2 +- zypp/media/proxyinfo/ProxyInfoImpl.h | 4 ++-- zypp/media/proxyinfo/ProxyInfoSysconfig.cc | 4 ++-- zypp/media/proxyinfo/ProxyInfoSysconfig.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc index a26585c..bf06908 100644 --- a/zypp/media/MediaCurl.cc +++ b/zypp/media/MediaCurl.cc @@ -329,7 +329,7 @@ void fillSettingsSystemProxy( const Url&url, TransferSettings &s ) ProxyInfo proxy_info (ProxyInfo::ImplPtr(new ProxyInfoSysconfig("proxy"))); s.setProxyEnabled( proxy_info.useProxyFor( url ) ); if ( s.proxyEnabled() ) - s.setProxy(proxy_info.proxy(url.getScheme())); + s.setProxy(proxy_info.proxy(url)); } Pathname MediaCurl::_cookieFile = "/var/lib/YaST2/cookies"; diff --git a/zypp/media/ProxyInfo.cc b/zypp/media/ProxyInfo.cc index 0b496ec..6e05271 100644 --- a/zypp/media/ProxyInfo.cc +++ b/zypp/media/ProxyInfo.cc @@ -35,8 +35,8 @@ namespace zypp { bool ProxyInfo::enabled() const { return _pimpl->enabled(); } - std::string ProxyInfo::proxy(const std::string & protocol_r) const - { return _pimpl->proxy(protocol_r); } + std::string ProxyInfo::proxy(const Url & url_r) const + { return _pimpl->proxy(url_r); } ProxyInfo::NoProxyList ProxyInfo::noProxy() const { return _pimpl->noProxy(); } diff --git a/zypp/media/ProxyInfo.h b/zypp/media/ProxyInfo.h index 2c7bed8..2e790b2 100644 --- a/zypp/media/ProxyInfo.h +++ b/zypp/media/ProxyInfo.h @@ -42,7 +42,7 @@ namespace zypp { /** Ctor */ ProxyInfo(ProxyInfo::ImplPtr pimpl_r); bool enabled() const; - std::string proxy(const std::string & protocol_r) const; + std::string proxy(const Url & url) const; NoProxyList noProxy() const; NoProxyIterator noProxyBegin() const; NoProxyIterator noProxyEnd() const; diff --git a/zypp/media/proxyinfo/ProxyInfoImpl.h b/zypp/media/proxyinfo/ProxyInfoImpl.h index 550d88c..93e0432 100644 --- a/zypp/media/proxyinfo/ProxyInfoImpl.h +++ b/zypp/media/proxyinfo/ProxyInfoImpl.h @@ -36,7 +36,7 @@ namespace zypp { /** */ virtual bool enabled() const = 0; /** */ - virtual std::string proxy(const std::string & prorocol_r) const = 0; + virtual std::string proxy(const Url & url_r) const = 0; /** */ virtual ProxyInfo::NoProxyList noProxy() const = 0; /** */ @@ -47,7 +47,7 @@ namespace zypp { /** Return \c true if \ref enabled and \a url_r does not match \ref noProxy. */ bool useProxyFor( const Url & url_r ) const { - if ( ! enabled() || proxy( url_r.getScheme() ).empty() ) + if ( ! enabled() && proxy( url_r ).empty() ) return false; ProxyInfo::NoProxyList noproxy( noProxy() ); diff --git a/zypp/media/proxyinfo/ProxyInfoSysconfig.cc b/zypp/media/proxyinfo/ProxyInfoSysconfig.cc index bd14f59..0af3daf 100644 --- a/zypp/media/proxyinfo/ProxyInfoSysconfig.cc +++ b/zypp/media/proxyinfo/ProxyInfoSysconfig.cc @@ -49,9 +49,9 @@ namespace zypp { str::split(it->second, std::back_inserter(_no_proxy), ", \t"); } - std::string ProxyInfoSysconfig::proxy(const std::string & protocol_r) const + std::string ProxyInfoSysconfig::proxy(const Url & url_r) const { - map<string,string>::const_iterator it = _proxies.find(protocol_r); + map<string,string>::const_iterator it = _proxies.find(url_r.getScheme()); if (it != _proxies.end()) return it->second; return ""; diff --git a/zypp/media/proxyinfo/ProxyInfoSysconfig.h b/zypp/media/proxyinfo/ProxyInfoSysconfig.h index e7e511f..cb9577b 100644 --- a/zypp/media/proxyinfo/ProxyInfoSysconfig.h +++ b/zypp/media/proxyinfo/ProxyInfoSysconfig.h @@ -32,7 +32,7 @@ namespace zypp { bool enabled() const { return _enabled; } /** */ - std::string proxy(const std::string & protocol_r) const; + std::string proxy(const Url & url_r) const; /** */ ProxyInfo::NoProxyList noProxy() const { return _no_proxy; } -- 1.7.3.2 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] Simplifying RPM groups
by Pavol Rusnak 11 Nov '10

11 Nov '10

Hi! I forgot to put this list in CC of this mail [1]. Sorry for that. If you have any comments please respond in the thread on opensuse-packaging. Thanks! [1] http://lists.opensuse.org/opensuse-packaging/2010-11/msg00079.html -- Best Regards / S pozdravom, Pavol RUSNAK SUSE LINUX, s.r.o openSUSE Boosters Team Lihovarska 1060/12 PGP 0xA6917144 19000 Praha 9 prusnak[at]opensuse.org Czech Republic -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] some features that may simplify client code
by Duncan Mac-Vicar P. 05 Nov '10

05 Nov '10

I have been reading the PackageKit backend code and with my knowledge of zypper and YaST code, I thought some cleanups and features that may be useful to remove code duplication. I accept feedback on how they could be approached: - A more transparent/direct way to add a plain rpm file to be installed Affected: zypper, PK Right now both create temporary plaindir repositories, and then remove them after installing the packages, with all the required error handling - A better updates Pool "View" Affected: PK PK does some acrobatics getting all required patches, then all package updates, and then removing the package updates that are included in the required patches. May be this could be made a kind of updates Pool view that automatically iterates over patches, packages not included in the patches, and that can easily turn patches or shypackages on/off On the other hand the following features would increase usability (as discussed in the conference): - gpg key trust transitivity... however a whole review of the keyring code would be good -- Duncan Mac-Vicar P. - Novell® Making IT Work As One™ SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nuernberg) -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 1