Attachment 239590 Details for Bug 269051 – git format-patch, update to 7.9 and clean up Makefile

[patch] git format-patch, update to 7.9 and clean up Makefile

0001-www-awstats-update-to-7.9.patch (text/plain), 4.08 KB, created by Vidar Karlsen on 2023-01-19 13:46:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vidar Karlsen

Created: 2023-01-19 13:46:06 UTC

Size: 4.08 KB

patch

obsolete

>From c18b9cd2b63bd53b4ee359fa0dcbffce1d6f2cca Mon Sep 17 00:00:00 2001
>From: Vidar Karlsen <vidar@karlsen.tech>
>Date: Thu, 19 Jan 2023 14:36:44 +0100
>Subject: [PATCH] www/awstats: update to 7.9
>
>Changelog: https://awstats.sourceforge.io/docs/awstats_changelog.txt
>
>Fixes CVE-2020-35176 path traversal flaw (score 5.3)
>
>While here, re-order the Makefile to make portclippy happy.
>
>QA:
>- poudriere testport ok on 12.3-amd64, 12.3-i386, 13.1-amd64
>- run-time tested ok on 13.1-amd64
>---
> www/awstats/Makefile  | 16 ++++++++--------
> www/awstats/distinfo  |  6 +++---
> www/awstats/pkg-plist |  8 ++++++++
> 3 files changed, 19 insertions(+), 11 deletions(-)
>
>diff --git a/www/awstats/Makefile b/www/awstats/Makefile
>index a6233356a8a4..46eb5118e8d4 100644
>--- a/www/awstats/Makefile
>+++ b/www/awstats/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	awstats
>-PORTVERSION=	7.8
>+PORTVERSION=	7.9
> PORTEPOCH=	1
> CATEGORIES=	www
> MASTER_SITES=	SF/${PORTNAME}/AWStats/${PORTVERSION}
>@@ -13,30 +13,30 @@ LICENSE_FILE=	${WRKSRC}/docs/LICENSE.TXT
> 
> USES=		cpe dos2unix perl5 shebangfix
> CPE_VENDOR=	laurent_destailleur
>+DOS2UNIX_GLOB=	*.xml *.pm
>+USE_PERL5=	run
> 
> SHEBANG_GLOB=	*.pl *.pm
>-DOS2UNIX_GLOB=	*.xml *.pm
> 
>-NO_BUILD=	yes
> NO_ARCH=	yes
>-USE_PERL5=	run
>+NO_BUILD=	yes
> 
> SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=			DOCS GEOIPFREE IPV6
>-OPTIONS_GROUP=			MODULES
> OPTIONS_DEFAULT=		HOSTINFO
>+OPTIONS_GROUP=			MODULES
> 
> OPTIONS_GROUP_MODULES=		DECODEUTFKEYS HOSTINFO
>-MODULES_DESC=			Plugin support not present in Perl CORE
> DECODEUTFKEYS_DESC=		DecodeUTFKeys (requires p5-URI)
> GEOIPFREE_DESC=			Country lookups via Geo::IPfree
> HOSTINFO_DESC=			HostInfo (requires p5-Net-XWhois)
>+MODULES_DESC=			Plugin support not present in Perl CORE
>+DECODEUTFKEYS_RUN_DEPENDS=	p5-URI>0:net/p5-URI
> GEOIPFREE_RUN_DEPENDS=		p5-Geo-IPfree>=0:net/p5-Geo-IPfree
>+HOSTINFO_RUN_DEPENDS=		p5-Net-XWhois>=0:net/p5-Net-XWhois
> IPV6_RUN_DEPENDS=		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
> 				p5-Net-DNS>=0:dns/p5-Net-DNS
>-DECODEUTFKEYS_RUN_DEPENDS=	p5-URI>0:net/p5-URI
>-HOSTINFO_RUN_DEPENDS=		p5-Net-XWhois>=0:net/p5-Net-XWhois
> 
> pre-patch:
> # This file is so messed up, not even dos2unix can fix it
>diff --git a/www/awstats/distinfo b/www/awstats/distinfo
>index da7e39b54b38..cb1cb43fdeea 100644
>--- a/www/awstats/distinfo
>+++ b/www/awstats/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1602848441
>-SHA256 (awstats-7.8.tar.gz) = 4a65867e01bef6a9bdba3e9e411fb2a0e0d87bc4c85ff02e3cbfca001a04d4b8
>-SIZE (awstats-7.8.tar.gz) = 2938878
>+TIMESTAMP = 1674072959
>+SHA256 (awstats-7.9.tar.gz) = 615178ed313d34315f15a522db1a5d12ca9c395e3785bb06280abff95d9a0546
>+SIZE (awstats-7.9.tar.gz) = 2948602
>diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
>index 87688ee31812..e72ebfb8ad99 100644
>--- a/www/awstats/pkg-plist
>+++ b/www/awstats/pkg-plist
>@@ -128,6 +128,7 @@
> %%WWWDIR%%/cgi-bin/lang/awstats-si.txt
> %%WWWDIR%%/cgi-bin/lang/awstats-sk.txt
> %%WWWDIR%%/cgi-bin/lang/awstats-sr.txt
>+%%WWWDIR%%/cgi-bin/lang/awstats-tg.txt
> %%WWWDIR%%/cgi-bin/lang/awstats-th.txt
> %%WWWDIR%%/cgi-bin/lang/awstats-tr.txt
> %%WWWDIR%%/cgi-bin/lang/awstats-tw.txt
>@@ -673,6 +674,9 @@
> %%WWWDIR%%/icon/os/amigaos.png
> %%WWWDIR%%/icon/os/android.png
> %%WWWDIR%%/icon/os/android10.png
>+%%WWWDIR%%/icon/os/android11.png
>+%%WWWDIR%%/icon/os/android12.png
>+%%WWWDIR%%/icon/os/android13.png
> %%WWWDIR%%/icon/os/androidcupcake.png
> %%WWWDIR%%/icon/os/androiddonut.png
> %%WWWDIR%%/icon/os/androideclair.png
>@@ -706,6 +710,7 @@
> %%WWWDIR%%/icon/os/dreamcast.png
> %%WWWDIR%%/icon/os/freebsd.png
> %%WWWDIR%%/icon/os/gnu.png
>+%%WWWDIR%%/icon/os/haiku.png
> %%WWWDIR%%/icon/os/hpux.png
> %%WWWDIR%%/icon/os/ibm.png
> %%WWWDIR%%/icon/os/imode.png
>@@ -734,6 +739,8 @@
> %%WWWDIR%%/icon/os/linuxzenwalk.png
> %%WWWDIR%%/icon/os/mac.png
> %%WWWDIR%%/icon/os/macintosh.png
>+%%WWWDIR%%/icon/os/macos11.png
>+%%WWWDIR%%/icon/os/macos12.png
> %%WWWDIR%%/icon/os/macosx.png
> %%WWWDIR%%/icon/os/macosx10.png
> %%WWWDIR%%/icon/os/macosx11.png
>@@ -768,6 +775,7 @@
> %%WWWDIR%%/icon/os/wii.png
> %%WWWDIR%%/icon/os/win.png
> %%WWWDIR%%/icon/os/win10.png
>+%%WWWDIR%%/icon/os/win11.png
> %%WWWDIR%%/icon/os/win16.png
> %%WWWDIR%%/icon/os/win2000.png
> %%WWWDIR%%/icon/os/win2003.png
>-- 
>2.38.1
>

Flags:

vidar: maintainer-approval+

Actions: View | Diff

Attachments on bug 269051: 239590