Browse Source

xap/uzbl: Upgraded to uzbl-20151023.

slackware-14.2
Damien Goutte-Gattat 6 years ago
parent
commit
98c6a2fe65
  1. 4
      xap/uzbl/uzbl-20151023-incenp-local.diff
  2. 22
      xap/uzbl/uzbl-20151023-incenp.diff
  3. 10
      xap/uzbl/uzbl.SlackBuild

4
xap/uzbl/uzbl-20150901-incenp-local.diff → xap/uzbl/uzbl-20151023-incenp-local.diff

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index 955e596..33b9e39 100644
index ba4207e..98b5e1e 100644
--- a/Makefile
+++ b/Makefile
@@ -287,6 +287,14 @@ install-uzbl-browser: uzbl-browser install-dirs install-uzbl-core install-event-
@@ -289,6 +289,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

22
xap/uzbl/uzbl-20150901-incenp.diff → xap/uzbl/uzbl-20151023-incenp.diff

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index 7e40453..955e596 100644
index cb11f89..ba4207e 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,7 @@ SOURCES := \
@@ -97,6 +97,7 @@ SOURCES := \
inspector.c \
io.c \
js.c \
@ -10,7 +10,7 @@ index 7e40453..955e596 100644
requests.c \
scheme.c \
status-bar.c \
@@ -113,6 +114,7 @@ HEADERS := \
@@ -114,6 +115,7 @@ HEADERS := \
inspector.h \
io.h \
js.h \
@ -19,10 +19,10 @@ index 7e40453..955e596 100644
menu.h \
scheme.h \
diff --git a/README.md b/README.md
index 734d5b5..086fd60 100644
index c879306..29fe73e 100644
--- a/README.md
+++ b/README.md
@@ -1422,6 +1422,11 @@ uzbl itself and will be emitted based on what is happening within uzbl-core.
@@ -1421,6 +1421,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.
@ -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 d311f50..913f7af 100644
index 7752b83..f681196 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -781,6 +781,8 @@ struct _UzblGui {
@ -689,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..fd84310
index 0000000..28bfcde
--- /dev/null
+++ b/uzbl/plugins/tls_update.py
@@ -0,0 +1,591 @@
@@ -0,0 +1,597 @@
+# This plugin handles the TLS_UPDATE event.
+
+from uzbl.ext import PerInstancePlugin
@ -884,6 +884,7 @@ index 0000000..fd84310
+ super(DANEValidator, self).__init__()
+ self.resolver = Resolver()
+ self.resolver.ednsflags = dnsflags.DO
+ self.resolver.flags = dnsflags.AD
+
+
+ def _checkRecord(self, certificate, tlsa):
@ -916,6 +917,11 @@ index 0000000..fd84310
+ except NoNameservers:
+ return ValidationResult(self, ValidationResult.Error, "No non-broken nameservers are available to lookup for TLSA records.")
+
+ if rrset.response.flags & dnsflags.AD == 0:
+ # Records found, but with insecure or indeterminate DNSSEC status;
+ # Such records are unusable as per RFC 6609 §4.1
+ return ValidationResult(self, ValidationResult.Untrusted, "No secure TLSA records were found for host %s." % host)
+
+ for record in rrset:
+ if record.usage in (PKIX_TA, PKIX_EE) and not status == 'TLS_TRUSTED':
+ # Do not attempt to validate against this record: since the

10
xap/uzbl/uzbl.SlackBuild

@ -30,14 +30,14 @@
# Source package infos
NAMESRC=${NAMESRC:-uzbl}
VERSION=${VERSION:-20150901}
VERSION=${VERSION:-20151023}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
REPOS=${REPOS:-git://github.com/uzbl/uzbl.git}
REVISION=${REVISION:-b89e710c9ac2a3563a1ef54a6dcacccd7263c5d8}
REVISION=${REVISION:-d2b741cbec7f41c53332f4f7a1890c67b5e47168}
# Build infos
NAMEPKG=${NAMEPKG:-uzbl}
BUILD=${BUILD:-2GGD}
BUILD=${BUILD:-1GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -87,8 +87,8 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAMESRC-$VERSION
patch -p 1 < $CWD/uzbl-20150901-incenp.diff
patch -p 1 < $CWD/uzbl-20150901-incenp-local.diff
patch -p 1 < $CWD/uzbl-20151023-incenp.diff
patch -p 1 < $CWD/uzbl-20151023-incenp-local.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
make \

Loading…
Cancel
Save