Use more recent commit where StrictSSL enabled by default

3 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d90728a9a37a..bbbc745f9f7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = surf
 	pkgdesc = A simple web browser based on WebKit/GTK+.
-	pkgver = 2.0
-	pkgrel = 2
+	pkgver = 2.0+9+g5c52733
+	pkgrel = 1
 	url = https://surf.suckless.org/
 	install = surf.install
 	arch = x86_64
@@ -13,10 +13,10 @@ pkgbase = surf
 	optdepends = ca-certificates: SSL verification
 	optdepends = xterm: default download handler
 	optdepends = curl: default download handler
-	source = git+git://git.suckless.org/surf#commit=b814567e2bf8bda07cea8de1c7a062f4aa437b65
+	source = git+git://git.suckless.org/surf#commit=5c527339842fdd06411eaf25547aef0902f96915
 	source = config.h
 	sha256sums = SKIP
-	sha256sums = 3a746f6f3a48e42b1779686421cf6b34157292e34e571b67de8d614c3ea1565c
+	sha256sums = 439b6812d6aff2fe9f69f6e2d0b8fa521bc4466ea072510409617d25778b5fba
 
 pkgname = surf
 
diff --git a/PKGBUILD b/PKGBUILD
index 6217f1a06555..723138c6bb47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Raphael Proust <raphlalou at gmail dot com>
 
 pkgname=surf
-pkgver=2.0
-pkgrel=2
+pkgver=2.0+9+g5c52733
+pkgrel=1
 pkgdesc='A simple web browser based on WebKit/GTK+.'
 arch=('x86_64')
 url='https://surf.suckless.org/'
@@ -19,21 +19,21 @@ optdepends=('dmenu: URL-bar'
             'curl: default download handler')
 makedepends=('git')
 install='surf.install'
-_commit=b814567e2bf8bda07cea8de1c7a062f4aa437b65
+_commit=5c527339842fdd06411eaf25547aef0902f96915
 source=("git+git://git.suckless.org/surf#commit=$_commit"
         'config.h')
 sha256sums=('SKIP'
-            '3a746f6f3a48e42b1779686421cf6b34157292e34e571b67de8d614c3ea1565c')
+            '439b6812d6aff2fe9f69f6e2d0b8fa521bc4466ea072510409617d25778b5fba')
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
-  git describe --tags | sed 's/-/+/g' | sed 's/0.6/0.7/'
+  git describe --tags | sed 's/-/+/g'
 }
 
 build() {
   cd "${srcdir}/${pkgname}"
 
-#  cp "${srcdir}/config.h" config.h
+  cp "${srcdir}/config.h" config.h
 
   sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
   sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
diff --git a/config.h b/config.h
index 6d3135ef4000..dce76f8f44ef 100644
--- a/config.h
+++ b/config.h
@@ -30,7 +30,7 @@ static Parameter defconfig[ParameterLast] = {
 	SETB(SiteQuirks,         1),
 	SETB(SpellChecking,      0),
 	SETV(SpellLanguages,     ((char *[]){ "en_US", NULL })),
-	SETB(StrictSSL,          0),
+	SETB(StrictTLS,          1),
 	SETB(Style,              1),
 	SETF(ZoomLevel,          1.0),
 };
@@ -42,6 +42,9 @@ static UriParameters uriparams[] = {
 	}, },
 };
 
+/* default window size: width, height */
+static int winsize[] = { 800, 600 };
+
 static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
                                     WEBKIT_FIND_OPTIONS_WRAP_AROUND;
 
@@ -150,6 +153,7 @@ static Key keys[] = {
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .i = LoadImages } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_v,      toggle,     { .i = Plugins } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_b,      toggle,     { .i = ScrollBars } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_t,      toggle,     { .i = StrictTLS } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      toggle,     { .i = Style } },
 };