From 8e7e2a92f586adf3100b27e4cd58e14912fd981f Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 19 Mar 2024 13:28:09 +0100
Subject: [PATCH] wget: update to 1.24.5 & switch to default openssl
---
components/web/wget/wget.p5m | 49 +++++++++---------------
components/web/wget/pkg5 | 5 +-
components/web/wget/Makefile | 12 ++++--
components/web/wget/test/results-all.master | 24 ++++++------
components/web/wget/manifests/sample-manifest.p5m | 2
5 files changed, 43 insertions(+), 49 deletions(-)
diff --git a/components/web/wget/Makefile b/components/web/wget/Makefile
index eead92f..4937278 100644
--- a/components/web/wget/Makefile
+++ b/components/web/wget/Makefile
@@ -24,16 +24,19 @@
#
BUILD_BITS= 64
-USE_OPENSSL11= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= wget
-COMPONENT_VERSION= 1.21.4
+COMPONENT_VERSION= 1.24.5
+COMPONENT_SUMMARY= GNU wget - a utility to retrieve files from the World Wide Web
COMPONENT_PROJECT_URL= https://www.gnu.org/software/wget/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.lz
-COMPONENT_ARCHIVE_HASH= sha256:3683619a5f50edcbccb1720a79006fa37bf9b9a255a8c5b48048bc3c7a874bd9
+COMPONENT_ARCHIVE_HASH= sha256:57a107151e4ef94fdf94affecfac598963f372f13293ed9c74032105390b36ee
COMPONENT_ARCHIVE_URL= https://ftp.gnu.org/gnu/wget/$(COMPONENT_ARCHIVE)
+COMPONENT_FMRI= web/wget
+COMPONENT_CLASSIFICATION= Applications/Internet
+COMPONENT_LICENSE= GPLv3, FDLv1.2
include $(WS_MAKE_RULES)/common.mk
@@ -65,7 +68,8 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += library/libidn2
REQUIRED_PACKAGES += library/libpsl
+REQUIRED_PACKAGES += library/libunistring
REQUIRED_PACKAGES += library/pcre2
-REQUIRED_PACKAGES += library/security/openssl-11
+REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
diff --git a/components/web/wget/manifests/sample-manifest.p5m b/components/web/wget/manifests/sample-manifest.p5m
index 59b643a..7331c2c 100644
--- a/components/web/wget/manifests/sample-manifest.p5m
+++ b/components/web/wget/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/web/wget/pkg5 b/components/web/wget/pkg5
index 7852167..8b94375 100644
--- a/components/web/wget/pkg5
+++ b/components/web/wget/pkg5
@@ -2,8 +2,9 @@
"dependencies": [
"library/libidn2",
"library/libpsl",
+ "library/libunistring",
"library/pcre2",
- "library/security/openssl-11",
+ "library/security/openssl-31",
"library/zlib",
"system/library"
],
@@ -11,4 +12,4 @@
"web/wget"
],
"name": "wget"
-}
\ No newline at end of file
+}
diff --git a/components/web/wget/test/results-all.master b/components/web/wget/test/results-all.master
index 3cd976d..d2540a1 100644
--- a/components/web/wget/test/results-all.master
+++ b/components/web/wget/test/results-all.master
@@ -1,9 +1,4 @@
-PASS: ./unit-tests
-PASS: Test-auth-basic.px
-PASS: Test-auth-no-challenge.px
-PASS: Test-auth-no-challenge-url.px
-PASS: Test-auth-with-content-disposition.px
-PASS: Test-auth-retcode.px
+PASS: unit-tests
PASS: Test-c-full.px
PASS: Test-c-partial.px
PASS: Test-c.px
@@ -44,7 +39,6 @@
PASS: Test-iri-disabled.px
PASS: Test-iri-forced-remote.px
PASS: Test-iri-list.px
-PASS: Test-k.px
PASS: Test-meta-robots.px
PASS: Test-N-current.px
PASS: Test-N-HTTP-Content-Disposition.px
@@ -84,8 +78,8 @@
PASS: Test-ftp-pasv-not-supported.px
============================================================================
============================================================================
-# TOTAL: 94
-# PASS: 84
+# TOTAL: 88
+# PASS: 78
# SKIP: 10
# XFAIL: 0
# FAIL: 0
@@ -110,6 +104,7 @@
PASS: Test-condget.py
PASS: Test-Content-disposition-2.py
PASS: Test-Content-disposition.py
+PASS: test_css_url.py
PASS: Test--convert-links--content-on-error.py
PASS: Test-cookie-401.py
PASS: Test-cookie-domain-mismatch.py
@@ -117,8 +112,10 @@
PASS: Test-cookie.py
PASS: Test-Head.py
PASS: Test-hsts.py
+PASS: Test-https-k.py
PASS: Test--https.py
PASS: Test--https-crl.py
+FAIL: Test-k.py
PASS: Test-missing-scheme-retval.py
PASS: Test-O.py
PASS: Test-pinnedpubkey-der-https.py
@@ -138,11 +135,14 @@
PASS: Test--spider-r.py
============================================================================
============================================================================
-# TOTAL: 45
-# PASS: 44
+# TOTAL: 48
+# PASS: 46
# SKIP: 1
# XFAIL: 0
-# FAIL: 0
+# FAIL: 1
# XPASS: 0
# ERROR: 0
============================================================================
+See testenv/test-suite.log
+Please report to bug-wget@gnu.org
+============================================================================
diff --git a/components/web/wget/wget.p5m b/components/web/wget/wget.p5m
index a095a34..ec0129d 100644
--- a/components/web/wget/wget.p5m
+++ b/components/web/wget/wget.p5m
@@ -1,44 +1,34 @@
#
-# CDDL HEADER START
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
+
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2021 Nona Hansel
#
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-
-set name=pkg.fmri value=pkg:/web/wget@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="wget - GNU wget"
-set name=pkg.description \
- value="GNU wget - a utility to retrieve files from the World Wide Web"
-set name=com.oracle.info.description value="GNU wget"
-set name=info.classification \
- value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY)"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+<transform file path=.+/share/info/dir -> drop>
file path=etc/wgetrc group=sys mode=0644 preserve=true
file path=usr/bin/wget
-#file path=usr/share/info/dir
+file path=usr/share/info/dir
file path=usr/share/info/wget.info
file path=usr/share/locale/af/LC_MESSAGES/wget-gnulib.mo
file path=usr/share/locale/be/LC_MESSAGES/wget-gnulib.mo
@@ -121,4 +111,3 @@
file path=usr/share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/wget.mo
file path=usr/share/man/man1/wget.1
-license wget.license license="GPLv3, FDLv1.2"
--
Gitblit v1.9.3