[arch-commits] Commit in elinks/repos/community-x86_64 (3 files)

[Alad Wenter]

    Date: Sunday, January 6, 2019 @ 18:35:21
  Author: alad
Revision: 420730

archrelease: copy trunk to community-x86_64

Added:
  elinks/repos/community-x86_64/0001-enable-SSL-verification-by-default.patch
    (from rev 420729, elinks/trunk/0001-enable-SSL-verification-by-default.patch)
  elinks/repos/community-x86_64/PKGBUILD
    (from rev 420729, elinks/trunk/PKGBUILD)
Deleted:
  elinks/repos/community-x86_64/PKGBUILD

-----------------------------------------------+
 0001-enable-SSL-verification-by-default.patch |   40 ++++++++++
 PKGBUILD                                      |   96 ++++++++++++------------
 2 files changed, 91 insertions(+), 45 deletions(-)

Copied: elinks/repos/community-x86_64/0001-enable-SSL-verification-by-default.patch (from rev 420729, elinks/trunk/0001-enable-SSL-verification-by-default.patch)
===================================================================
--- 0001-enable-SSL-verification-by-default.patch	                        (rev 0)
+++ 0001-enable-SSL-verification-by-default.patch	2019-01-06 18:35:21 UTC (rev 420730)
@@ -0,0 +1,40 @@
+From f96265f5141944e559aae2e6df6c9594b335e9e2 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad at archlinux.org>
+Date: Sun, 6 Jan 2019 18:52:09 +0100
+Subject: [PATCH] enable SSL verification by default
+
+FS#57747
+---
+ doc/man/man5/elinks.conf.5 | 2 +-
+ src/network/ssl/ssl.c      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5
+index f6c54d44..a708e1c7 100644
+--- a/doc/man/man5/elinks.conf.5
++++ b/doc/man/man5/elinks.conf.5
+@@ -199,7 +199,7 @@ Timeout for non\-restartable connections (in seconds)\&.
+ .SS "connection\&.ssl (SSL)"
+ SSL options\&.
+ .PP
+-connection\&.ssl\&.cert_verify \fB[0|1]\fR (default: 0)
++connection\&.ssl\&.cert_verify \fB[0|1]\fR (default: 1)
+ .RS 4
+ Verify the peer\'s SSL certificate\&. Note that this needs extensive configuration of OpenSSL by the user\&.
+ .RE
+diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
+index 5ed57543..c2683e01 100644
+--- a/src/network/ssl/ssl.c
++++ b/src/network/ssl/ssl.c
+@@ -114,7 +114,7 @@ done_openssl(struct module *module)
+ 
+ static union option_info openssl_options[] = {
+ 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
+-		"cert_verify", 0, 0,
++		"cert_verify", 0, 1,
+ 		N_("Verify the peer's SSL certificate. Note that this "
+ 		"needs extensive configuration of OpenSSL by the user.")),
+ 
+-- 
+2.20.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-06 18:34:56 UTC (rev 420729)
+++ PKGBUILD	2019-01-06 18:35:21 UTC (rev 420730)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Ben <contrasutra at myrealbox.com>
-
-pkgname=elinks
-pkgver=0.13
-_commit="25c2850b597ee9a89bda8920e7f3d65ac3ac7e01"
-# 2017-03-06 gcc6
-pkgrel=20
-pkgdesc="An advanced and well-established feature-rich text mode web browser."
-arch=("x86_64")
-url="http://elinks.or.cz"
-license=('GPL')
-depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn'
-	 'gc' 'tre' 'zlib')
-makedepends=('git')
-source=("git+http://elinks.cz/elinks.git#commit=$_commit")
-md5sums=('SKIP')
-
-# todo: make it work with a modern 'js' package
-# (upstream has no interest in writing that)
-
-build() {
-  cd elinks
-  sed -i 's/Terminal=1/Terminal=true/' "contrib/debian/$pkgname.desktop"
-  [ -x configure ] || sh autogen.sh
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --sysconfdir=/etc \
-              --disable-smb --without-x --enable-cgi \
-              --enable-leds --enable-256-colors --enable-html-highlight \
-              --with-zlib
-  make
-}
-
-package() {
-  cd elinks
-  make DESTDIR="$pkgdir" install
-  rm -f "$pkgdir/usr/share/locale/locale.alias"
-
-  install -D -m644 "contrib/debian/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-}

Copied: elinks/repos/community-x86_64/PKGBUILD (from rev 420729, elinks/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-06 18:35:21 UTC (rev 420730)
@@ -0,0 +1,51 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Ben <contrasutra at myrealbox.com>
+
+pkgname=elinks
+pkgver=0.13
+_commit="25c2850b597ee9a89bda8920e7f3d65ac3ac7e01"
+# 2017-03-06 gcc6
+pkgrel=21
+pkgdesc="An advanced and well-established feature-rich text mode web browser."
+arch=("x86_64")
+url="http://elinks.or.cz"
+license=('GPL')
+depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn'
+	 'gc' 'tre' 'zlib')
+makedepends=('git')
+source=("git+https://repo.or.cz/elinks.git#commit=$_commit"
+	"0001-enable-SSL-verification-by-default.patch")
+md5sums=('SKIP'
+         '0bdeaeed54d24415db9b59d9fdcf03f9')
+
+# todo: make it work with a modern 'js' package
+# (upstream has no interest in writing that)
+
+prepare() {
+  cd elinks
+  patch -p1 < "$srcdir"/0001-enable-SSL-verification-by-default.patch
+}
+ 
+build() {
+  cd elinks
+  sed -i 's/Terminal=1/Terminal=true/' "contrib/debian/$pkgname.desktop"
+  [ -x configure ] || sh autogen.sh
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+              --sysconfdir=/etc \
+              --disable-smb --without-x --enable-cgi \
+              --enable-leds --enable-256-colors --enable-html-highlight \
+              --with-zlib
+  make
+}
+
+package() {
+  cd elinks
+  make DESTDIR="$pkgdir" install
+  rm -f "$pkgdir/usr/share/locale/locale.alias"
+
+  install -D -m644 "contrib/debian/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+}