Skip to content
Snippets Groups Projects
Verified Commit ee5f62bb authored by Antonio Rojas's avatar Antonio Rojas
Browse files

upgpkg: 3.1.0-1: Update to 3.1.0

parent 4bf61d51
No related branches found
Tags 1.26.0-2
No related merge requests found
.SRCINFO 0 → 100644
pkgbase = dillo
pkgdesc = A small, fast graphical web browser built on FLTK
pkgver = 3.1.0
pkgrel = 1
url = https://www.dillo.org
arch = x86_64
license = GPL
depends = fltk
depends = libjpeg
depends = libpng
depends = openssl
depends = perl
depends = zlib
backup = etc/dillo/dillorc
backup = etc/dillo/domainrc
backup = etc/dillo/dpidrc
backup = etc/dillo/keysrc
source = https://github.com/dillo-browser/dillo/releases/download/v3.1.0/dillo-3.1.0.tar.gz
source = https://github.com/dillo-browser/dillo/releases/download/v3.1.0/dillo-3.1.0.tar.gz.asc
source = dillo.desktop
validpgpkeys = 32E65EC501A1B6FDF8190D293EE6BA977EB2A253
sha256sums = bb627c976350c3aa8aa82aefcd34b931bb32d1fa52541f145a6837acf1b992b0
sha256sums = SKIP
sha256sums = e94ead3a359c2eceb934b07af0fac4864251b9721fa7f4855331daa017b66202
pkgname = dillo
[dillo]
source = "git"
git = "https://github.com/dillo-browser/dillo.git"
prefix = "v"
......@@ -2,42 +2,31 @@
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=dillo
pkgver=3.0.5
pkgrel=12
pkgver=3.1.0
pkgrel=1
pkgdesc="A small, fast graphical web browser built on FLTK"
arch=(x86_64)
url="https://www.dillo.org"
license=('GPL')
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'
validpgpkeys=('32E65EC501A1B6FDF8190D293EE6BA977EB2A253') # Rodrigo Arias Mallo <rodarima@gmail.com>
source=(https://github.com/dillo-browser/dillo/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc}
dillo.desktop)
sha256sums=('bb627c976350c3aa8aa82aefcd34b931bb32d1fa52541f145a6837acf1b992b0'
'SKIP'
'ddd097b30b95a5ac5638f57d04dc2e421d5c2fa3d0985747921e1bfc5b55fb23'
'e94ead3a359c2eceb934b07af0fac4864251b9721fa7f4855331daa017b66202'
'72ecb57983117b17f0777caf6cf935a2ad5d72aca7b07b11f5b75562cb420778')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
patch -Np1 -i ../openssl.patch
autoreconf -fi
}
'e94ead3a359c2eceb934b07af0fac4864251b9721fa7f4855331daa017b66202')
build() {
cd "$srcdir/$pkgname-$pkgver"
CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-ssl
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-tls
make
}
package() {
cd "$srcdir/$pkgname-$pkgver"
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 ../dillo.desktop "$pkgdir/usr/share/applications/dillo.desktop"
install -Dm644 ../ProgramIcon128.png "$pkgdir/usr/share/pixmaps/dillo.png"
# install -Dm644 ../ProgramIcon128.png "$pkgdir/usr/share/pixmaps/dillo.png"
}
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFMBYhIBCACkRzrR0CeiuCu4VXXFtzM15t6UefYvBfBcvdBNDMyN3vxMXXvS
aVj0FsHbhK7xyT1n1EdQpLABshFeY2woVhbc/TttTRLlIEdWMRB6MSadlPWate03
OOI4eigkKKdXAPrQ0MErrHMZEG5HVRh49CKxDUW+D0yTQeMagGdweCoD7iJzhMTq
xtK/xGAjwHKP3b1obB+3avdrEIRHICDAKBc77W4YOv7XLpse9uIXA2xv6AxmQUal
1XaAIHLD+48Q2Exv/Cgz4jUQiw8Vu/NEDU8WT2lYE5GpyA+O53YViYvINRj9vM8D
unoxLVNqNvzLQVr5R/fb4sEF6qVRRT47H8eZABEBAAG0KFJvZHJpZ28gQXJpYXMg
TWFsbG8gPHJvZGFyaW1hQGdtYWlsLmNvbT6JAVYEEwEIAEACGwMHCwkIBwMCAQYV
CAIJCgsEFgIDAQIeAQIXgBYhBDLmXsUBobb9+BkNKT7mupd+sqJTBQJkgzYgBQka
59WOAAoJED7mupd+sqJTxY4H/Ao9c0rfufjMxQ22LvGGWExJs+KKNvfTRuAuz9Sm
bIulE1bmWTH2GZR0ReoeT2I83fLYfE+pceL41RxkAZO8dp8cLscWT+CYOJw9IJiC
DoSN0HhxdlwSqUNpc4SaAkm0Z50uo0PRWd4tQ9Hi+BFTGNt1TC80JnnKcr81kPCY
z6zZMNfSI7qgy/4c56fnFSn0YWQopKx2DiMWR+dxRc17TZjc/z7apIcoNwrfJx1+
89dKp+FWw7P6sSuyO9bH4gNp9Jh9dx+RWPAof1b41uemGBtWguvp28a1jkfGvRtL
6UlHIcIaAuvoayv0Rqs86ppbLzQ0K8jhr5ywyVE2kW5ocX65AQ0EUwFiEgEIAN+0
lUnZ3GlqwwQ93aPXJ5rQDh7tpLL92j4fV8x484ttK/fdTg+b1AIoKJjlk+NNtRTb
1XdI+i5ba2fcWKMahAL9XVgtGJGO1/UuMtUZ/C4qBqK0+wh47N1lll3sYb3Ja4yD
MrzXpLsc5uNpMLiY+tEeZg5LcacGxK0mC95BeXtgIIwEc7OIQQ8YF+biYgjb+RVf
RdbJcsBaDN5hjcJ/YMVWR5cmseWW/hkw+kN9qbVhjghKic9Y/AZxiFQXuJwwc5hw
Ntna2XyV9+1legYW3dCeO3yJ6d3mQ9RrlXukoFWl9FKYBJbJUrPtLuLse8z5u5H7
mhqHDF43DBotSaSJWPcAEQEAAYkBPAQYAQgAJgIbDBYhBDLmXsUBobb9+BkNKT7m
upd+sqJTBQJkgzY4BQka59WmAAoJED7mupd+sqJT2aoH/0epqrLYGJZxy8Oml8qg
8KQyY3VnrVLzB67zQyWr+3iSW9pOb7n/eYxrmc9zdUcu2IYOEeglicM92NSKJIKb
u4LT+nPSkVl7WM0gwtckF4rVzkun/ApS6dtcVob3NolBKYa4j99qR9/tc/yrt5hH
qTsZjsYe4ob1qMNt3zdFVwXFsgtRJ9LnHQxrBNW1CrJh74cN1SKE5605EVTO+LG0
27aWNkG82OCt48e9kQYdtg4wPlb7VP2hZOgAYuJylQDxSx1YtFnYmPVhz8lNAXrM
/VeQYpELBOAskiDko1KAGv9Q1MEO4lEPU5eysgyzPXmJ6F2EChmYRoQnMGSxwsDe
Vto=
=qg38
-----END PGP PUBLIC KEY BLOCK-----
Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
Bug-Debian: https://bugs.debian.org/845035
Author: Axel Beckert <abe@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;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment