[arch-commits] Commit in lynx/repos/extra-x86_64 (3 files)

[Jonas Witschel]

    Date: Monday, August 9, 2021 @ 15:57:49
  Author: diabonas
Revision: 421275

archrelease: copy trunk to extra-x86_64

Added:
  lynx/repos/extra-x86_64/CVE-2021-38165.diff
    (from rev 421274, lynx/trunk/CVE-2021-38165.diff)
  lynx/repos/extra-x86_64/PKGBUILD
    (from rev 421274, lynx/trunk/PKGBUILD)
Deleted:
  lynx/repos/extra-x86_64/PKGBUILD

---------------------+
 CVE-2021-38165.diff |   34 +++++++++++++++++++
 PKGBUILD            |   87 +++++++++++++++++++++++++++-----------------------
 2 files changed, 81 insertions(+), 40 deletions(-)

Copied: lynx/repos/extra-x86_64/CVE-2021-38165.diff (from rev 421274, lynx/trunk/CVE-2021-38165.diff)
===================================================================
--- CVE-2021-38165.diff	                        (rev 0)
+++ CVE-2021-38165.diff	2021-08-09 15:57:49 UTC (rev 421275)
@@ -0,0 +1,34 @@
+--- a/WWW/Library/Implementation/HTTP.c
++++ b/WWW/Library/Implementation/HTTP.c
+@@ -764,6 +764,23 @@ static char *StripIpv6Brackets(char *host)
+ }
+ #endif
+ 
++/*
++ * Remove user/password, if any, from the given host-string.
++ */
++#ifdef USE_SSL
++static char *StripUserAuthents(char *host)
++{
++    char *p = strchr(host, '@');
++
++    if (p != NULL) {
++	char *q = host;
++
++	while ((*q++ = *++p) != '\0') ;
++    }
++    return host;
++}
++#endif
++
+ /*		Load Document from HTTP Server			HTLoadHTTP()
+  *		==============================
+  *
+@@ -959,6 +976,7 @@ static int HTLoadHTTP(const char *arg,
+ 	/* get host we're connecting to */
+ 	ssl_host = HTParse(url, "", PARSE_HOST);
+ 	ssl_host = StripIpv6Brackets(ssl_host);
++	ssl_host = StripUserAuthents(ssl_host);
+ #if defined(USE_GNUTLS_FUNCS)
+ 	ret = gnutls_server_name_set(handle->gnutls_state,
+ 				     GNUTLS_NAME_DNS,

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-09 15:57:42 UTC (rev 421274)
+++ PKGBUILD	2021-08-09 15:57:49 UTC (rev 421275)
@@ -1,40 +0,0 @@
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=lynx
-pkgver=2.8.9
-_relver=${pkgver}rel.1
-pkgrel=3
-pkgdesc="A text browser for the World Wide Web"
-url="https://lynx.browser.org/"
-arch=('x86_64')
-license=('GPL')
-depends=('openssl' 'libidn')
-backup=('etc/lynx.cfg')
-source=(https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2{,.asc})
-sha256sums=('387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595'
-            'SKIP')
-validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB')
-  
-build() {
-  cd ${srcdir}/${pkgname}${_relver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-ssl=/usr \
-    --enable-nls \
-    --enable-ipv6 \
-    --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}${_relver}
-  make DESTDIR=${pkgdir} install
-
-  # FS#20404 - points to local help
-  sed -i -e "s|^HELPFILE.*$|HELPFILE:file:///usr/share/doc/lynx/lynx_help/lynx_help_main.html|" ${pkgdir}/etc/lynx.cfg
-
-  install -d ${pkgdir}/usr/share/doc/lynx
-  cp -rf lynx_help ${pkgdir}/usr/share/doc/lynx
-}

Copied: lynx/repos/extra-x86_64/PKGBUILD (from rev 421274, lynx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-08-09 15:57:49 UTC (rev 421275)
@@ -0,0 +1,47 @@
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=lynx
+pkgver=2.8.9
+_relver=${pkgver}rel.1
+pkgrel=4
+pkgdesc="A text browser for the World Wide Web"
+url="https://lynx.browser.org/"
+arch=('x86_64')
+license=('GPL')
+depends=('openssl' 'libidn')
+backup=('etc/lynx.cfg')
+source=("https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2"{,.asc}
+        'CVE-2021-38165.diff')
+sha256sums=('387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595'
+            'SKIP'
+            '693f025a6886b555cc8d7b655de8e62bd8af870a74909e6a4b6cec6e3736dd0d')
+validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB')
+
+prepare() {
+  cd "${srcdir}/${pkgname}${_relver}"
+  patch --forward --strip=1 --input="${srcdir}/CVE-2021-38165.diff"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}${_relver}"
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-ssl=/usr \
+    --enable-nls \
+    --enable-ipv6 \
+    --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}${_relver}"
+  make DESTDIR="${pkgdir}" install
+
+  # FS#20404 - points to local help
+  sed -i -e "s|^HELPFILE.*$|HELPFILE:file:///usr/share/doc/lynx/lynx_help/lynx_help_main.html|" "${pkgdir}/etc/lynx.cfg"
+
+  install -d "${pkgdir}/usr/share/doc/lynx"
+  cp -rf lynx_help "${pkgdir}/usr/share/doc/lynx"
+}