From 0bfe75e285262599d90804aa74cb7151d7590fe2 Mon Sep 17 00:00:00 2001
From: klausz65 <61782506+klausz65@users.noreply.github.com>
Date: Wed, 08 Sep 2021 07:10:32 +0200
Subject: [PATCH] Fix perl arch names in userland.py
---
components/perl/authen_pam/Makefile | 2 +-
components/perl/DBI-MySQL/Makefile | 2 +-
components/perl/DBI-PostgreSQL/Makefile | 2 +-
components/perl/DBI/DBI-PERLVER.p5m | 3 ---
components/perl/net-ssleay/Makefile | 2 +-
components/perl/DBI-MySQL/dbi-mysql-PERLVER.p5m | 3 ---
components/perl/HTML-Parser/HTML-Parser-PERLVER.p5m | 3 ---
components/perl/DBI-SQLite/Makefile | 2 +-
components/perl/xml-parser/Makefile | 2 +-
components/perl/DBI-SQLite/dbi-sqlite-PERLVER.p5m | 3 ---
components/perl/xml-parser/xml-parser-PERLVER.p5m | 3 ---
tools/python/pkglint/userland.py | 4 ++--
components/perl/authen_pam/authen-pam-PERLVER.p5m | 3 ---
components/perl/net-ssleay/net-ssleay-PERLVER.p5m | 3 ---
components/perl/DBI/Makefile | 2 +-
components/perl/perl-524/Makefile | 2 +-
components/perl/HTML-Parser/Makefile | 2 +-
components/perl/perl-524/perl-524.p5m | 3 ---
components/perl/DBI-PostgreSQL/dbi-postgresql-PERLVER.p5m | 3 ---
19 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/components/perl/DBI-MySQL/Makefile b/components/perl/DBI-MySQL/Makefile
index 1674130..ee0a9e8 100644
--- a/components/perl/DBI-MySQL/Makefile
+++ b/components/perl/DBI-MySQL/Makefile
@@ -28,7 +28,7 @@
COMPONENT_NAME= DBI-MySQL
COMPONENT_VERSION= 4.0.41
-COMPONENT_REVISION= 3
+COMPONENT_REVISION= 4
COMPONENT_SUMMARY= The DBI MySQL Interface for Perl
COMPONENT_SRC= DBD-mysql-4.041
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
diff --git a/components/perl/DBI-MySQL/dbi-mysql-PERLVER.p5m b/components/perl/DBI-MySQL/dbi-mysql-PERLVER.p5m
index 131b3b7..8662920 100644
--- a/components/perl/DBI-MySQL/dbi-mysql-PERLVER.p5m
+++ b/components/perl/DBI-MySQL/dbi-mysql-PERLVER.p5m
@@ -22,9 +22,6 @@
license dbi-mysql.license license="Artistic"
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
file path=usr/perl5/$(PERLVER)/man/man3/Bundle::DBD::mysql.3
file path=usr/perl5/$(PERLVER)/man/man3/DBD::mysql.3
file path=usr/perl5/$(PERLVER)/man/man3/DBD::mysql::INSTALL.3
diff --git a/components/perl/DBI-PostgreSQL/Makefile b/components/perl/DBI-PostgreSQL/Makefile
index 01dde9a..32aa481 100644
--- a/components/perl/DBI-PostgreSQL/Makefile
+++ b/components/perl/DBI-PostgreSQL/Makefile
@@ -30,7 +30,7 @@
COMPONENT_NAME= DBI-PostgreSQL
COMPONENT_VERSION= 3.10.0
-COMPONENT_REVISION= 2
+COMPONENT_REVISION= 3
COMPONENT_SUMMARY= The DBI PostgreSQL Interface for Perl
COMPONENT_SRC= DBD-Pg-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
diff --git a/components/perl/DBI-PostgreSQL/dbi-postgresql-PERLVER.p5m b/components/perl/DBI-PostgreSQL/dbi-postgresql-PERLVER.p5m
index 14bc683..0fb052a 100644
--- a/components/perl/DBI-PostgreSQL/dbi-postgresql-PERLVER.p5m
+++ b/components/perl/DBI-PostgreSQL/dbi-postgresql-PERLVER.p5m
@@ -22,9 +22,6 @@
license dbi-postgresql.license license="Artistic"
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
file path=usr/perl5/$(PERLVER)/man/man3/Bundle::DBD::Pg.3
file path=usr/perl5/$(PERLVER)/man/man3/DBD::Pg.3
file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Bundle/DBD/Pg.pm
diff --git a/components/perl/DBI-SQLite/Makefile b/components/perl/DBI-SQLite/Makefile
index cebe028..c30de4d 100644
--- a/components/perl/DBI-SQLite/Makefile
+++ b/components/perl/DBI-SQLite/Makefile
@@ -16,7 +16,7 @@
COMPONENT_NAME= DBI-SQLite
COMPONENT_VERSION= 1.52
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SUMMARY= The DBI SQLite Interface for Perl
COMPONENT_SRC= DBD-SQLite-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
diff --git a/components/perl/DBI-SQLite/dbi-sqlite-PERLVER.p5m b/components/perl/DBI-SQLite/dbi-sqlite-PERLVER.p5m
index cacfeb7..c5a794c 100644
--- a/components/perl/DBI-SQLite/dbi-sqlite-PERLVER.p5m
+++ b/components/perl/DBI-SQLite/dbi-sqlite-PERLVER.p5m
@@ -22,9 +22,6 @@
license dbi-sqlite.license license='Artistic'
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
file path=usr/perl5/$(PERLVER)/man/man3/DBD::SQLite.3
file path=usr/perl5/$(PERLVER)/man/man3/DBD::SQLite::Constants.3
file path=usr/perl5/$(PERLVER)/man/man3/DBD::SQLite::Cookbook.3
diff --git a/components/perl/DBI/DBI-PERLVER.p5m b/components/perl/DBI/DBI-PERLVER.p5m
index 13ea4ae..ee37376 100644
--- a/components/perl/DBI/DBI-PERLVER.p5m
+++ b/components/perl/DBI/DBI-PERLVER.p5m
@@ -35,9 +35,6 @@
license DBI.license license="Artistic"
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
# force a dependency on the Perl runtime
depend fmri=__TBD pkg.debug.depend.file=perl \
pkg.debug.depend.path=usr/perl5/$(PERLVER)/bin type=require
diff --git a/components/perl/DBI/Makefile b/components/perl/DBI/Makefile
index f22571e..6bb1d7d 100644
--- a/components/perl/DBI/Makefile
+++ b/components/perl/DBI/Makefile
@@ -24,7 +24,7 @@
COMPONENT_NAME= DBI
COMPONENT_VERSION= 1.636
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
diff --git a/components/perl/HTML-Parser/HTML-Parser-PERLVER.p5m b/components/perl/HTML-Parser/HTML-Parser-PERLVER.p5m
index 1fd320a..7759261 100644
--- a/components/perl/HTML-Parser/HTML-Parser-PERLVER.p5m
+++ b/components/perl/HTML-Parser/HTML-Parser-PERLVER.p5m
@@ -22,9 +22,6 @@
license HTML-Parser.license license="Artistic"
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
file path=usr/perl5/$(PERLVER)/man/man3/HTML::Entities.3
diff --git a/components/perl/HTML-Parser/Makefile b/components/perl/HTML-Parser/Makefile
index 7085144..6af88fd 100644
--- a/components/perl/HTML-Parser/Makefile
+++ b/components/perl/HTML-Parser/Makefile
@@ -29,7 +29,7 @@
COMPONENT_NAME= HTML-Parser
COMPONENT_VERSION= 3.72
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_PROJECT_URL= http://search.cpan.org/~gaas/HTML-Parser/
diff --git a/components/perl/authen_pam/Makefile b/components/perl/authen_pam/Makefile
index 660e52e..fb90256 100644
--- a/components/perl/authen_pam/Makefile
+++ b/components/perl/authen_pam/Makefile
@@ -25,7 +25,7 @@
COMPONENT_NAME= Authen-PAM
COMPONENT_VERSION= 16
-COMPONENT_REVISION= 3
+COMPONENT_REVISION= 4
COMPONENT_SRC= $(COMPONENT_NAME)-0.16
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
diff --git a/components/perl/authen_pam/authen-pam-PERLVER.p5m b/components/perl/authen_pam/authen-pam-PERLVER.p5m
index 2c40ede..f72b460 100644
--- a/components/perl/authen_pam/authen-pam-PERLVER.p5m
+++ b/components/perl/authen_pam/authen-pam-PERLVER.p5m
@@ -26,9 +26,6 @@
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
license authen-pam.license license='Artistic'
file path=usr/perl5/$(PERLVER)/man/man3/Authen::PAM.3
diff --git a/components/perl/net-ssleay/Makefile b/components/perl/net-ssleay/Makefile
index 9bce488..0de847b 100644
--- a/components/perl/net-ssleay/Makefile
+++ b/components/perl/net-ssleay/Makefile
@@ -27,7 +27,7 @@
COMPONENT_NAME= Net-SSLeay
COMPONENT_VERSION= 1.80
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_PROJECT_URL= http://search.cpan.org/dist/Net-SSLeay/
diff --git a/components/perl/net-ssleay/net-ssleay-PERLVER.p5m b/components/perl/net-ssleay/net-ssleay-PERLVER.p5m
index 5a5e32e..0bb0f3b 100644
--- a/components/perl/net-ssleay/net-ssleay-PERLVER.p5m
+++ b/components/perl/net-ssleay/net-ssleay-PERLVER.p5m
@@ -37,9 +37,6 @@
license net-ssleay.copyright license='OpenSSL, SSLeay'
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
depend fmri=library/zlib@1.2.3-0.169 type=require
#file path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
diff --git a/components/perl/perl-524/Makefile b/components/perl/perl-524/Makefile
index 535bb28..568fede 100644
--- a/components/perl/perl-524/Makefile
+++ b/components/perl/perl-524/Makefile
@@ -32,7 +32,7 @@
COMPONENT_NAME= perl
COMPONENT_VERSION= 5.24.3
-COMPONENT_REVISION= 2
+COMPONENT_REVISION= 3
COMPONENT_SUMMARY= Perl 5.24
PERL_VERSION= 5.24
COMPONENT_PROJECT_URL= http://www.perl.org/
diff --git a/components/perl/perl-524/perl-524.p5m b/components/perl/perl-524/perl-524.p5m
index e5d2842..380ec78 100644
--- a/components/perl/perl-524/perl-524.p5m
+++ b/components/perl/perl-524/perl-524.p5m
@@ -22,9 +22,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
# This link is always mediated.
link path=usr/bin/perl target=../perl5/5.24/bin/perl \
mediator=perl mediator-version=5.24
diff --git a/components/perl/xml-parser/Makefile b/components/perl/xml-parser/Makefile
index 7406d75..06118c7 100644
--- a/components/perl/xml-parser/Makefile
+++ b/components/perl/xml-parser/Makefile
@@ -31,7 +31,7 @@
COMPONENT_NAME= XML-Parser
COMPONENT_VERSION= 2.44
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
diff --git a/components/perl/xml-parser/xml-parser-PERLVER.p5m b/components/perl/xml-parser/xml-parser-PERLVER.p5m
index 6706d15..c5f70e4 100644
--- a/components/perl/xml-parser/xml-parser-PERLVER.p5m
+++ b/components/perl/xml-parser/xml-parser-PERLVER.p5m
@@ -37,9 +37,6 @@
license xml-parser.license license='Artistic'
-# We deliver 64-bit objects under usr/perl5/5.24/lib, pkglint dislikes this
-<transform file path=.* -> default pkg.linted.userland.action001.2 true >
-
file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser.3
file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Expat.3
file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Style::Debug.3
diff --git a/tools/python/pkglint/userland.py b/tools/python/pkglint/userland.py
index 39a7852..68caa44 100644
--- a/tools/python/pkglint/userland.py
+++ b/tools/python/pkglint/userland.py
@@ -65,8 +65,8 @@
"amd64",
"sparcv9",
"64",
- "i86pc-solaris-64", # perl path
- "sun4-solaris-64" # perl path
+ "i86pc-solaris-thread-multi-64", # perl path
+ "sun4-solaris-thread-multi-64" # perl path
]
self.runpath_re = [
re.compile('^/lib(/.*)?$'),
--
Gitblit v1.9.3