git: 4e6ca5e6b0a0 - main - security/seclists: Remove workaround

From: Lorenzo Salvadore <salvadore_at_FreeBSD.org>
Date: Mon, 27 Jun 2022 18:47:37 UTC
The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4e6ca5e6b0a02c8605bda8fadfd208eadc922ec5

commit 4e6ca5e6b0a02c8605bda8fadfd208eadc922ec5
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2022-06-23 13:45:45 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-06-27 18:45:06 +0000

    security/seclists: Remove workaround
    
    Remove workaround to deal with a filename which was too long. The
    workaround is obsolete now that pkg has been update to 1.18.3.
---
 security/seclists/Makefile    | 16 +---------------
 security/seclists/pkg-message | 15 ---------------
 security/seclists/pkg-plist   |  2 +-
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/security/seclists/Makefile b/security/seclists/Makefile
index 3adec74435a1..f25732d4c892 100644
--- a/security/seclists/Makefile
+++ b/security/seclists/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	seclists
 DISTVERSION=	2022.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security www
 
 MAINTAINER=	salvadore@FreeBSD.org
@@ -37,19 +37,5 @@ DIRS_TO_BE_REMOVED=	.bin .github/workflows .github
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	cd ${STAGEDIR}${DATADIR} && ${RM} ${FILES_TO_BE_REMOVED} && ${RMDIR} ${DIRS_TO_BE_REMOVED}
-#
-# The following is necessary because of a too long filename for pkg to work properly.
-# The error reported is:
-#
-# pkg-static: Fail to create temporary file: /usr/local/share/seclists/Payloads/File-Names/max-length/.pkgtemp.AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.php.gif.E8InfduP3cVP:File name too long
-#
-# The following commit should fix the issue with pkg:
-#
-# https://github.com/freebsd/pkg/commit/ce75303c613f2f5d04fdd7c9edd6f4cd40eb9dac
-#
-# The workaround should be removed once pkg has been updated to a version
-# including this commit (remember to also remove pkg-message).
-#
-	cd ${STAGEDIR}${DATADIR} && ${MV} Payloads/File-Names/max-length/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.php.gif Payloads/File-Names/max-length/232A.php.gif
 
 .include <bsd.port.mk>
diff --git a/security/seclists/pkg-message b/security/seclists/pkg-message
deleted file mode 100644
index 9b4090ed9b2c..000000000000
--- a/security/seclists/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    type: install
-    message: <<EOM
-Warning: the file Payloads/File-Names/max-length/232A.php.gif has not been
-installed with its original name due to technical limitations of pkg.
-If you want to use this file, you need to copy it and to name
-the copy by replacing the string "232A" with 232 times the single character
-"A", then add the ".php.gif" extension.
-
-The need for this workaround is only temporary and it should be removed from the
-port soon.
-EOM
-  }
-]
diff --git a/security/seclists/pkg-plist b/security/seclists/pkg-plist
index a4842c1446e7..77f02d85e199 100644
--- a/security/seclists/pkg-plist
+++ b/security/seclists/pkg-plist
@@ -5264,8 +5264,8 @@
 %%DATADIR%%/Payloads/Anti-Virus/eicar-com.txt
 %%DATADIR%%/Payloads/File-Names/exec/Hello$(hostname)World.txt
 %%DATADIR%%/Payloads/File-Names/exec/Hello`hostname`World.txt
-%%DATADIR%%/Payloads/File-Names/max-length/232A.php.gif
 %%DATADIR%%/Payloads/File-Names/max-length/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+%%DATADIR%%/Payloads/File-Names/max-length/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.php.gif
 %%DATADIR%%/Payloads/File-Names/max-length/make-255.sh
 %%DATADIR%%/Payloads/File-Names/null-byte/Hello%00World.txt
 %%DATADIR%%/Payloads/File-Names/null-byte/Hello.php%00World.txt