From 5a9394761a76843883ab7b09d15c336324e2be13 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Fri, 05 Apr 2024 16:14:27 +0200
Subject: [PATCH] apache-24: update to 2.4.59

---
 transforms/generate-cleanup |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/transforms/generate-cleanup b/transforms/generate-cleanup
index cf84917..13bc742 100644
--- a/transforms/generate-cleanup
+++ b/transforms/generate-cleanup
@@ -67,7 +67,7 @@
 <transform dir file link hardlink \
 	path=usr/perl5/.*/\.packlist$ -> drop>
 
-# python support
+# Python support
 <transform dir file link hardlink path=usr\/lib\/python2\.7\/.*\.pyc$ -> drop>
 <transform dir file link hardlink path=usr\/lib\/python2\.7\/.*\.pyo$ -> drop>
 <transform dir file link hardlink path=usr\/lib\/python3\.\d+\/(.*\/)?__pycache__\/ -> drop>
@@ -78,21 +78,22 @@
 # PEP 627 made the RECORD file optional.  Since we do not need the file and it
 # could contain inaccurate info we simply drop it.
 <transform dir file link hardlink path=usr\/lib\/python3\.\d+\/vendor-packages\/[^/]+\.dist-info/RECORD$ -> drop>
-# Strip Python 3 cpython ABI extension
+# Replace Python version by $(PYV)
 <transform file -> \
-	edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+)\.cpython-3\d+[dmu]*\.so$" "\1.so">
-# Strip Python 3 abi3 ABI extension
-<transform file -> \
-	edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+)\.abi3\.so$" "\1.so">
+	edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+\.cpython-)3\d+\.so$" "\1$!(PYV).so">
 # Replace Python version by $(PYVER)
-<transform dir file link hardlink -> \
-	edit path "^(usr/bin/[^/]+-)3\.\d+$" "\1$!(PYVER)">
+<transform file path=usr/bin/[^/]+-3\.\d+$ -> default tmp.fmri "$(COMPONENT_FMRI)">
+<transform file tmp.fmri=.*runtime/python -> edit path "^(usr/bin/[^/]+-)3\.\d+$" "\1$!(PYVER)">
+<transform file tmp.fmri=.*library/python/ -> edit path "^(usr/bin/[^/]+-)3\.\d+$" "\1$!(PYVER)">
+<transform file tmp.fmri=.* -> delete tmp.fmri .*>
 <transform dir file link hardlink -> \
 	edit path "^(usr/lib/python3\.\d+/vendor-packages/[^/]+-py)3\.\d+(\.egg-info(/.*)?)$" "\1$!(PYVER)\2">
 <transform dir file link hardlink -> \
 	edit path "^(usr/lib/python3\.\d+/vendor-packages/[^/]+-py)3\.\d+(-nspkg\.pth)$" "\1$!(PYVER)\2">
 <transform dir file link hardlink -> \
-	edit path "^(usr/lib/python)3\.\d+(/vendor-packages/)" "\1$!(PYVER)\2">
+	edit path "^(usr/lib/python)3\.\d+(/.*)?$" "\1$!(PYVER)\2">
+<transform dir file link hardlink -> \
+	edit path "^(usr/include/python)3\.\d+(/.*)?$" "\1$!(PYVER)\2">
 
 <transform dir file link hardlink -> \
 	edit target "/(sparcv9|amd64)$" "/$!(MACH64)">
@@ -115,9 +116,9 @@
 # 	edit target "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)">
 
 <transform dir file link hardlink -> \
-	edit path "$(HUMAN_VERSION)" "$!(HUMAN_VERSION)">
+	edit path "$(HUMAN_VERSION_RE)" "$!(HUMAN_VERSION)">
 <transform dir file link hardlink -> \
-	edit target "$(HUMAN_VERSION)" "$!(HUMAN_VERSION)">
+	edit target "$(HUMAN_VERSION_RE)" "$!(HUMAN_VERSION)">
 
 <transform dir file link hardlink -> \
 	edit path "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)">

--
Gitblit v1.9.3