diff -urN yum-3.2.24/docs/yum.conf.5 yum-3.2.24-new/docs/yum.conf.5
--- yum-3.2.24/docs/yum.conf.5 2009-08-27 11:49:42.000000000 -0400
+++ yum-3.2.24-new/docs/yum.conf.5 2009-09-03 15:11:34.000000000 -0400
@@ -254,26 +254,6 @@
ignored. Default is `0' (no bandwidth throttling).
.IP
-\fBsslcacert \fR
-Path to the directory containing the databases of the certificate authorities
-yum should use to verify ssl certificates. Defaults to none - uses system
-default
-
-.IP
-\fBsslverify \fR
-Boolean - should yum verify ssl certificates/hosts at all. Defaults to True
-
-.IP
-\fBsslclientcert \fR
-Path to the ssl client certificate yum should use to connect to repos/remote sites
-Defaults to none.
-
-.IP
-\fBsslclientkey \fR
-Path to the ssl client key yum should use to connect to repos/remote sites
-Defaults to none.
-
-.IP
\fBcommands\fR
List of functional commands to run if no functional commands are specified
on the command line (eg. "update foo bar baz quux"). None of the short options
@@ -625,28 +605,6 @@
Overrides the \fBbandwidth\fR option from the [main] section for this
repository.
-
-.IP
-\fBsslcacert \fR
-Overrides the \fBsslcacert\fR option from the [main] section for this
-repository.
-
-.IP
-\fBsslverify \fR
-Overrides the \fBsslverify\fR option from the [main] section for this
-repository.
-
-.IP
-\fBsslclientcert \fR
-Overrides the \fBsslclientcert\fR option from the [main] section for this
-repository.
-
-.IP
-\fBsslclientkey \fR
-Overrides the \fBsslclientkey\fR option from the [main] section for this
-repository.
-
-
.IP
\fBmetadata_expire \fR
Overrides the \fBmetadata_expire\fR option from the [main] section for this
diff -urN yum-3.2.24/yum/config.py yum-3.2.24-new/yum/config.py
--- yum-3.2.24/yum/config.py 2009-08-13 09:50:13.000000000 -0400
+++ yum-3.2.24-new/yum/config.py 2009-09-03 15:11:49.000000000 -0400
@@ -698,12 +698,6 @@
color_search_match = Option('bold')
- sslcacert = Option()
- sslverify = BoolOption(True)
- sslclientcert = Option()
- sslclientkey = Option()
-
-
_reposlist = []
class RepoConf(BaseConfig):
@@ -757,12 +751,6 @@
mdpolicy = Inherit(YumConf.mdpolicy)
cost = IntOption(1000)
- sslcacert = Inherit(YumConf.sslcacert)
- sslverify = Inherit(YumConf.sslverify)
- sslclientcert = Inherit(YumConf.sslclientcert)
- sslclientkey = Inherit(YumConf.sslclientkey)
-
-
def readStartupConfig(configfile, root):
'''
Parse Yum's main configuration file and return a StartupConf instance.
diff -urN yum-3.2.24/yum/yumRepo.py yum-3.2.24-new/yum/yumRepo.py
--- yum-3.2.24/yum/yumRepo.py 2009-08-27 16:33:42.000000000 -0400
+++ yum-3.2.24-new/yum/yumRepo.py 2009-09-03 15:11:49.000000000 -0400
@@ -475,12 +475,7 @@
timeout=self.timeout,
copy_local=self.copy_local,
http_headers=headers,
- reget='simple',
- ssl_verify_peer=self.sslverify,
- ssl_verify_host=self.sslverify,
- ssl_ca_cert=self.sslcacert,
- ssl_cert=self.sslclientcert,
- ssl_key=self.sslclientkey)
+ reget='simple')
self._grabfunc.opts.user_agent = default_grabber.opts.user_agent
@@ -672,12 +667,7 @@
retry = self.retries,
throttle = self.throttle,
progress_obj = self.callback,
- proxies=self.proxy_dict,
- ssl_verify_peer=self.sslverify,
- ssl_verify_host=self.sslverify,
- ssl_ca_cert=self.sslcacert,
- ssl_cert=self.sslclientcert,
- ssl_key=self.sslclientkey)
+ proxies=self.proxy_dict)
ug.opts.user_agent = default_grabber.opts.user_agent
result = ug.urlgrab(url, local, text=self.id + "/metalink")
@@ -780,11 +770,6 @@
timeout=self.timeout,
checkfunc=checkfunc,
http_headers=headers,
- ssl_verify_peer=self.sslverify,
- ssl_verify_host=self.sslverify,
- ssl_ca_cert=self.sslcacert,
- ssl_cert=self.sslclientcert,
- ssl_key=self.sslclientkey
)
ug.opts.user_agent = default_grabber.opts.user_agent