[arch-commits] Commit in dillo/trunk (PKGBUILD dillo.desktop openssl.patch)

[Balló György]

    Date: Thursday, April 15, 2021 @ 11:11:14
  Author: bgyorgy
Revision: 918989

upgpkg: dillo 3.0.5-10: Build with OpenSSL 1.1 and backup all config files (FS#64079)

Added:
  dillo/trunk/openssl.patch
Modified:
  dillo/trunk/PKGBUILD
  dillo/trunk/dillo.desktop

---------------+
 PKGBUILD      |   25 +++++++++++++++----------
 dillo.desktop |    5 +++--
 openssl.patch |   27 +++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-15 10:44:49 UTC (rev 918988)
+++ PKGBUILD	2021-04-15 11:11:14 UTC (rev 918989)
@@ -1,31 +1,36 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=dillo
 pkgver=3.0.5
-pkgrel=9
+pkgrel=10
 pkgdesc="A small, fast graphical web browser built on FLTK"
 arch=(x86_64)
 url="https://www.dillo.org"
 license=('GPL')
-depends=('fltk' 'libjpeg' 'perl' 'libpng' 'gcc-libs' 'libxcursor'
-         'libxi' 'libxinerama' 'openssl-1.0')
-backup=(etc/dillo/{dillorc,dpidrc})
+depends=('fltk' 'libjpeg' 'libpng' 'openssl' 'perl' 'zlib')
+backup=(etc/dillo/{dillorc,domainrc,dpidrc,keysrc})
 validpgpkeys=('D91CE08D8679CF2A6F8792E05B1004E936929CEE')
 source=(https://www.dillo.org/download/$pkgname-$pkgver.tar.bz2{,.asc}
+        openssl.patch
         dillo.desktop
         https://www.dillo.org/Icons/ProgramIcon128.png)
 sha256sums=('db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b'
             'SKIP'
-            '54848080de1911a2af8ff786fbe92bdad8fe8b7b8a0d580c9c79b0a98f9fdcde'
+            'ddd097b30b95a5ac5638f57d04dc2e421d5c2fa3d0985747921e1bfc5b55fb23'
+            'e94ead3a359c2eceb934b07af0fac4864251b9721fa7f4855331daa017b66202'
             '72ecb57983117b17f0777caf6cf935a2ad5d72aca7b07b11f5b75562cb420778')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../openssl.patch
+  autoreconf -fi
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
-  CFLAGS+=" -I/usr/include/openssl-1.0" LDFLAGS+=" -L/usr/lib/openssl-1.0" \
-      ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \
-              --enable-ssl
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-ssl
   make
 }
 

Modified: dillo.desktop
===================================================================
--- dillo.desktop	2021-04-15 10:44:49 UTC (rev 918988)
+++ dillo.desktop	2021-04-15 11:11:14 UTC (rev 918989)
@@ -2,8 +2,9 @@
 Name=Dillo
 GenericName=Web Browser
 Comment=Very small and fast GUI web browser
-Exec=dillo
+Exec=dillo %U
 Icon=dillo
 Terminal=false
 Type=Application
-Categories=Network;GTK;WebBrowser;
+Categories=Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;

Added: openssl.patch
===================================================================
--- openssl.patch	                        (rev 0)
+++ openssl.patch	2021-04-15 11:11:14 UTC (rev 918989)
@@ -0,0 +1,27 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe at debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,7 +286,7 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++    AC_CHECK_LIB(ssl, SSL_new, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;