[arch-commits] Commit in dillo/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Apr 25 07:13:47 UTC 2022
Date: Monday, April 25, 2022 @ 07:13:47
Author: arojas
Revision: 1189984
archrelease: copy trunk to community-x86_64
Added:
dillo/repos/community-x86_64/PKGBUILD
(from rev 1189983, dillo/trunk/PKGBUILD)
dillo/repos/community-x86_64/dillo.desktop
(from rev 1189983, dillo/trunk/dillo.desktop)
dillo/repos/community-x86_64/openssl.patch
(from rev 1189983, dillo/trunk/openssl.patch)
Deleted:
dillo/repos/community-x86_64/PKGBUILD
dillo/repos/community-x86_64/dillo.desktop
dillo/repos/community-x86_64/openssl.patch
---------------+
PKGBUILD | 86 ++++++++++++++++++++++++++++----------------------------
dillo.desktop | 20 ++++++-------
openssl.patch | 54 +++++++++++++++++------------------
3 files changed, 80 insertions(+), 80 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-25 07:13:34 UTC (rev 1189983)
+++ PKGBUILD 2022-04-25 07:13:47 UTC (rev 1189984)
@@ -1,43 +0,0 @@
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=dillo
-pkgver=3.0.5
-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' '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'
- '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
- ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-ssl
- make
-}
-
-package() {
- cd "$srcdir/$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"
-}
Copied: dillo/repos/community-x86_64/PKGBUILD (from rev 1189983, dillo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-25 07:13:47 UTC (rev 1189984)
@@ -0,0 +1,43 @@
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=dillo
+pkgver=3.0.5
+pkgrel=11
+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'
+ 'SKIP'
+ '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
+ ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-ssl
+ make
+}
+
+package() {
+ cd "$srcdir/$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"
+}
Deleted: dillo.desktop
===================================================================
--- dillo.desktop 2022-04-25 07:13:34 UTC (rev 1189983)
+++ dillo.desktop 2022-04-25 07:13:47 UTC (rev 1189984)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Dillo
-GenericName=Web Browser
-Comment=Very small and fast GUI web browser
-Exec=dillo %U
-Icon=dillo
-Terminal=false
-Type=Application
-Categories=Network;WebBrowser;
-MimeType=text/html;application/xhtml+xml;
Copied: dillo/repos/community-x86_64/dillo.desktop (from rev 1189983, dillo/trunk/dillo.desktop)
===================================================================
--- dillo.desktop (rev 0)
+++ dillo.desktop 2022-04-25 07:13:47 UTC (rev 1189984)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Dillo
+GenericName=Web Browser
+Comment=Very small and fast GUI web browser
+Exec=dillo %U
+Icon=dillo
+Terminal=false
+Type=Application
+Categories=Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;
Deleted: openssl.patch
===================================================================
--- openssl.patch 2022-04-25 07:13:34 UTC (rev 1189983)
+++ openssl.patch 2022-04-25 07:13:47 UTC (rev 1189984)
@@ -1,27 +0,0 @@
-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;
Copied: dillo/repos/community-x86_64/openssl.patch (from rev 1189983, dillo/trunk/openssl.patch)
===================================================================
--- openssl.patch (rev 0)
+++ openssl.patch 2022-04-25 07:13:47 UTC (rev 1189984)
@@ -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;
More information about the arch-commits
mailing list