Browse Source

xap/uzbl: Upgraded to uzbl-20160228.

slackware-14.2
Damien Goutte-Gattat 6 years ago
parent
commit
a6e4afe0ec
  1. 4
      xap/uzbl/uzbl-20160228-incenp-local.diff
  2. 45
      xap/uzbl/uzbl-20160228-incenp.diff
  3. 10
      xap/uzbl/uzbl.SlackBuild

4
xap/uzbl/uzbl-20151025-incenp-local.diff → xap/uzbl/uzbl-20160228-incenp-local.diff

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index ba4207e..98b5e1e 100644
index 0b6f7af..2a5d083 100644
--- a/Makefile
+++ b/Makefile
@@ -289,6 +289,14 @@ install-uzbl-browser: uzbl-browser install-dirs install-uzbl-core install-event-
@@ -303,6 +303,14 @@ install-uzbl-browser: uzbl-browser install-dirs install-uzbl-core install-event-
install-uzbl-tabbed: install-dirs
$(INSTALL) -m755 bin/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed

45
xap/uzbl/uzbl-20151025-incenp.diff → xap/uzbl/uzbl-20160228-incenp.diff

@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
index cb11f89..ba4207e 100644
index 6ce211f..0b6f7af 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ SOURCES := \
@ -19,10 +19,10 @@ index cb11f89..ba4207e 100644
menu.h \
scheme.h \
diff --git a/README.md b/README.md
index c879306..29fe73e 100644
index df2a3ad..5051638 100644
--- a/README.md
+++ b/README.md
@@ -1421,6 +1421,11 @@ uzbl itself and will be emitted based on what is happening within uzbl-core.
@@ -1418,6 +1418,11 @@ uzbl itself and will be emitted based on what is happening within uzbl-core.
- Sent when a request has been sent to the server.
* `REQUEST_FINISHED <URI>`
- Sent when a request has completed.
@ -35,7 +35,7 @@ index c879306..29fe73e 100644
##### Input
diff --git a/bin/uzbl-browser.in b/bin/uzbl-browser.in
index 3de99b7..6aa819b 100755
index f0fa68a..9b02049 100755
--- a/bin/uzbl-browser.in
+++ b/bin/uzbl-browser.in
@@ -24,6 +24,9 @@ export XDG_CACHE_HOME
@ -49,7 +49,7 @@ index 3de99b7..6aa819b 100755
status="$1"
shift
diff --git a/bin/uzbl-tabbed b/bin/uzbl-tabbed
index fb8254d..e83ee3d 100755
index f7b66d2..afeb53a 100755
--- a/bin/uzbl-tabbed
+++ b/bin/uzbl-tabbed
@@ -191,6 +191,13 @@ def xdghome(key, default):
@ -90,7 +90,7 @@ index aac76e1..627ef93 100644
call (CLOSE_NOTIFICATION), \
/* Must be last entry. */ \
diff --git a/src/gui.c b/src/gui.c
index 7467965..ef111f5 100644
index 2fefabc..6001024 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -818,6 +818,8 @@ struct _UzblGui {
@ -671,28 +671,6 @@ 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
@ -711,10 +689,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..25982f2
index 0000000..d6746a6
--- /dev/null
+++ b/uzbl/plugins/tls_update.py
@@ -0,0 +1,589 @@
@@ -0,0 +1,588 @@
+# This plugin handles the TLS_UPDATE event.
+
+from uzbl.ext import PerInstancePlugin
@ -905,8 +883,7 @@ index 0000000..25982f2
+ def __init__(self):
+ super(DANEValidator, self).__init__()
+ self.resolver = Resolver()
+ self.resolver.ednsflags = dnsflags.DO
+ self.resolver.flags = dnsflags.AD
+ self.resolver.use_edns(0, dnsflags.DO, 4096)
+
+
+ def _checkRecord(self, certificate, tlsa):
@ -927,11 +904,11 @@ index 0000000..25982f2
+
+ def validate(self, host, status, certificate, chain):
+ try:
+ rrset = self.resolver.query('_443._tcp.' + host, rdtype='TLSA')
+ rrset = self.resolver.query('_443._tcp.%s.' % host, rdtype='TLSA')
+ except NXDOMAIN:
+ return ValidationResult(self, ValidationResult.Untrusted, "No TLSA records were found for host %s." % host)
+ except NoAnswer:
+ return ValidationResult(self, ValidationResult.Error, "No TLSA records were found for host %s, although suitable names do exist in the DNS zone." % host)
+ return ValidationResult(self, ValidationResult.Untrusted, "No TLSA records were found for host %s, although suitable names do exist in the DNS zone." % host)
+ except YXDOMAIN:
+ return ValidationResult(self, ValidationResult.Error, "Too much DNAME substitution in the query for TLSA records.")
+ except Timeout:

10
xap/uzbl/uzbl.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2013,2014,2015 Damien Goutte-Gattat
# Copyright (C) 2013,2014,2015,2016 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -30,10 +30,10 @@
# Source package infos
NAMESRC=${NAMESRC:-uzbl}
VERSION=${VERSION:-20151025}
VERSION=${VERSION:-20160228}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
REPOS=${REPOS:-git://github.com/uzbl/uzbl.git}
REVISION=${REVISION:-8cdee12ef829e8f20088e645cb378a33913e3a1a}
REVISION=${REVISION:-ea2d72ea7be7fbdadd3840d602d5f86ce9c1b748}
# 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-20151025-incenp.diff
patch -p 1 < $CWD/uzbl-20151025-incenp-local.diff
patch -p 1 < $CWD/uzbl-20160228-incenp.diff
patch -p 1 < $CWD/uzbl-20160228-incenp-local.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
make \

Loading…
Cancel
Save