Browse Source

xap/uzbl: Upgraded to uzbl-20151025.

slackware-14.2
Damien Goutte-Gattat 6 years ago
parent
commit
4c26c08652
  1. 0
      xap/uzbl/uzbl-20151025-incenp-local.diff
  2. 74
      xap/uzbl/uzbl-20151025-incenp.diff
  3. 8
      xap/uzbl/uzbl.SlackBuild

0
xap/uzbl/uzbl-20151023-incenp-local.diff → xap/uzbl/uzbl-20151025-incenp-local.diff

74
xap/uzbl/uzbl-20151023-incenp.diff → xap/uzbl/uzbl-20151025-incenp.diff

@ -90,10 +90,10 @@ index aac76e1..627ef93 100644
call (CLOSE_NOTIFICATION), \
/* Must be last entry. */ \
diff --git a/src/gui.c b/src/gui.c
index 7752b83..f681196 100644
index 7467965..ef111f5 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -781,6 +781,8 @@ struct _UzblGui {
@@ -818,6 +818,8 @@ struct _UzblGui {
request_decision (const gchar *uri, gpointer data);
static void
send_load_status (WebKitLoadStatus status, const gchar *uri);
@ -102,7 +102,7 @@ index 7752b83..f681196 100644
static gboolean
send_load_error (const gchar *uri, GError *err);
@@ -873,6 +875,9 @@ struct _UzblGui {
@@ -910,6 +912,9 @@ struct _UzblGui {
const gchar *uri = webkit_web_view_get_uri (view);
send_load_status (event, uri);
@ -112,7 +112,7 @@ index 7752b83..f681196 100644
}
gboolean
@@ -1142,6 +1147,9 @@ struct _UzblGui {
@@ -1179,6 +1184,9 @@ struct _UzblGui {
const gchar *uri = webkit_web_view_get_uri (view);
send_load_status (status, uri);
@ -122,7 +122,7 @@ index 7752b83..f681196 100644
}
gboolean
@@ -2109,6 +2117,90 @@ struct _UzblGui {
@@ -2234,6 +2242,90 @@ struct _UzblGui {
return FALSE;
}
@ -671,6 +671,28 @@ index 0000000..76488ed
+ if not self._spki:
+ self._spki = SubjectPublicKeyInfo(self._tbs.getComponentByName('subjectPublicKeyInfo'))
+ return self._spki
diff --git a/uzbl/event_manager.py b/uzbl/event_manager.py
index 740e43c..1c011d5 100755
--- a/uzbl/event_manager.py
+++ b/uzbl/event_manager.py
@@ -206,7 +206,7 @@ def run(self):
daemonize()
# Update the pid file
- make_pid_file(opts.pid_file)
+ make_pid_file(self.opts.pid_file)
asyncore.loop()
@@ -517,7 +517,7 @@ def main():
else:
opts.pid_file = expandpath(opts.pid_file)
- config = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation)
+ config = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation())
config.read(opts.config)
# Set default log file location
diff --git a/uzbl/plugins/__init__.py b/uzbl/plugins/__init__.py
index 9bf04d3..711a4d2 100644
--- a/uzbl/plugins/__init__.py
@ -689,10 +711,10 @@ index 9bf04d3..711a4d2 100644
__path__ = list(map(os.path.expanduser, plugin_path)) + __path__
diff --git a/uzbl/plugins/tls_update.py b/uzbl/plugins/tls_update.py
new file mode 100644
index 0000000..28bfcde
index 0000000..25982f2
--- /dev/null
+++ b/uzbl/plugins/tls_update.py
@@ -0,0 +1,597 @@
@@ -0,0 +1,589 @@
+# This plugin handles the TLS_UPDATE event.
+
+from uzbl.ext import PerInstancePlugin
@ -1053,50 +1075,42 @@ index 0000000..28bfcde
+ the browser's status bar.
+
+ Supplementary validators are disabled by default. To enable them,
+ set the following variables to 1 in Uzbl's configuration file:
+ set the following variables to 'true' in the event manager's
+ configuration file:
+
+ * monkeysphere_enabled: for the Monkeysphere validator;
+ * dane_enabled: for the DNS-based (RFC 6698) validator;
+ * certtracker_enabled: for the tracking validator."""
+
+ * ssl_monkeysphere: for the Monkeysphere validator;
+ * ssl_dane: for the DNS-based (RFC 6698) validator."""
+ CONFIG_SECTION = 'tls_update'
+
+ def __init__(self, uzbl):
+ super(TlsPlugin, self).__init__(uzbl)
+ uzbl.connect('TLS_UPDATE', self.tlsUpdate)
+ self.initialized = False
+ self.validators = [PKIXValidator()]
+ self.tmpdir = getenv('XDG_RUNTIME_DIR', '/tmp')
+
+
+ # Variables from the config file may not be available at the
+ # time this plugin is instantiated, so we defer reading these
+ # variables until we actually need them for the first time.
+ def _initialize(self):
+ config = Config[self.uzbl]
+
+ if int(config.get('ssl_monkeysphere', 0)) == 1:
+ if self.plugin_config.getboolean('monkeysphere_enabled'):
+ self.validators.append(MonkeysphereValidator())
+
+ if int(config.get('ssl_dane', 0)) == 1:
+ if self.plugin_config.getboolean('dane_enabled'):
+ self.validators.append(DANEValidator())
+
+ if int(config.get('ssl_qualitycheck', 0)) == 1:
+ if self.plugin_config.getboolean('qualitychecker_enabled'):
+ self.validators.append(CertificateQualityValidator())
+
+ if int(config.get('ssl_track_certificates', 0)) == 1:
+ store = config.get('ssl_tracker_store', getenv('XDG_DATA_HOME') + '/uzbl/tls_host_certificates')
+ tofu = int(config.get('ssl_tracker_trustonfirstuse', 0)) == 1
+ if self.plugin_config.getboolean('certtracker_enabled'):
+ store = self.plugin_config.get('certtracker_store', fallback='%s/uzbl/tls_host_certificates' % getenv('XDG_DATA_HOME'))
+ tofu = self.plugin_config.getboolean('certtracker_tofu')
+
+ tracker = TrackingValidator(store, tofu=tofu)
+ self.validators.append(tracker)
+ self.uzbl.connect('TLS_TRACKER_RELOAD', tracker.loadHistory)
+
+ self.initialized = True
+ uzbl.connect('TLS_TRACKER_RELOAD', tracker.loadHistory)
+
+
+ def tlsUpdate(self, args):
+ host, tls_status, tls_cert = [arg[1:-1].replace('\\n', '\n') for arg in args.split(' ', maxsplit=2)]
+
+ if not self.initialized:
+ self._initialize()
+
+ if tls_status == 'NO_TLS': # Plaintext connection
+ self.uzbl.send('set tls_status')
+ return

8
xap/uzbl/uzbl.SlackBuild

@ -30,10 +30,10 @@
# Source package infos
NAMESRC=${NAMESRC:-uzbl}
VERSION=${VERSION:-20151023}
VERSION=${VERSION:-20151025}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
REPOS=${REPOS:-git://github.com/uzbl/uzbl.git}
REVISION=${REVISION:-d2b741cbec7f41c53332f4f7a1890c67b5e47168}
REVISION=${REVISION:-8cdee12ef829e8f20088e645cb378a33913e3a1a}
# Build infos
NAMEPKG=${NAMEPKG:-uzbl}
@ -87,8 +87,8 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAMESRC-$VERSION
patch -p 1 < $CWD/uzbl-20151023-incenp.diff
patch -p 1 < $CWD/uzbl-20151023-incenp-local.diff
patch -p 1 < $CWD/uzbl-20151025-incenp.diff
patch -p 1 < $CWD/uzbl-20151025-incenp-local.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
make \

Loading…
Cancel
Save