From 783118944874d559e30eea1600352e3feb5263a7 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 31 Mar 2024 09:35:05 +0200
Subject: [PATCH] libcares: update to 1.28.0
---
tools/perl-integrate-module | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 46 deletions(-)
diff --git a/tools/perl-integrate-module b/tools/perl-integrate-module
index 05a8f4d..a4b8e24 100755
--- a/tools/perl-integrate-module
+++ b/tools/perl-integrate-module
@@ -107,6 +107,7 @@
# Following variables could be set by the hook-begin snippet
VERSION=
DOWNLOAD_URL=
+LICENSE_FILE=
# Execute hook-begin snippet
if [[ -f "$CONF" ]] ; then
@@ -131,13 +132,11 @@
# Is this new module, or just a rebuild?
NEW=1
-REBUILD=0
PREV_VER=
PREV_HVER=
PREV_REV=0
if git ls-files --error-unmatch Makefile > /dev/null 2>&1 ; then
NEW=0
- REBUILD=1
PREV_VER=$($GMAKE print-value-COMPONENT_VERSION 2>/dev/null)
(($? != 0)) && printf "FATAL: 'gmake print-value-COMPONENT_VERSION' failed!\n" >&2 && exit 1
PREV_REV=$($GMAKE print-value-COMPONENT_REVISION 2>/dev/null)
@@ -176,8 +175,12 @@
fi
-# Remove everything from git (except known patches, history, and $CONF)
+# Remove everything that is not in git
+rm -rf *
+git checkout . > /dev/null 2>&1
+# Remove everything from git (except known patches, files, history, and $CONF)
[[ -f "$CONF" ]] && grep "^%patch%" "$CONF" | while read TAG PATCH ; do rm -f "patches/$PATCH" ; done
+[[ -f "$CONF" ]] && grep "^%file%" "$CONF" | while read TAG FILE ; do rm -f "files/$FILE" ; done
rm -f history "$CONF"
find . -type f | while read f ; do git rm "$f" > /dev/null 2>&1 ; done
rm -rf "$DIR" 2>/dev/null
@@ -187,19 +190,26 @@
git checkout "patches/$PATCH" > /dev/null 2>&1
[[ -f "patches/$PATCH" ]] || printf "WARNING: Patch %s not found\n" "$PATCH" >&2
done
+[[ -f "$CONF" ]] && grep "^%file%" "$CONF" | while read TAG FILE ; do
+ git checkout "files/$FILE" > /dev/null 2>&1
+ [[ -f "files/$FILE" ]] || printf "WARNING: File %s not found\n" "$FILE" >&2
+done
# Makefile template
+GENERATE_CMD="\$WS_TOOLS/$THIS"
+[[ "$DIRECTORY" != "perl/$DISTRIBUTION" ]] && GENERATE_CMD="$GENERATE_CMD -d $DIRECTORY"
+GENERATE_CMD="$GENERATE_CMD $MODULE"
(
cat $WS_TOP/transforms/copyright-template | sed -e '/^$/,$d'
cat <<EOF
#
# This file was automatically generated using the following command:
-# \$WS_TOOLS/$THIS $MODULE
+# $GENERATE_CMD
#
-BUILD_STYLE = modulebuild
+BUILD_STYLE = makemaker
USE_COMMON_TEST_MASTER = no
EOF
[[ -f "$CONF" ]] && gsed -e '0,/^%include-1%/d' -e '/^%/,$d' < "$CONF"
@@ -232,11 +242,11 @@
COMPONENT_ARCHIVE_URL=$($GMAKE print-value-COMPONENT_ARCHIVE_URL)
[[ "$COMPONENT_ARCHIVE_URL" == "$DOWNLOAD_URL" ]] && DOWNLOAD_URL=
fi
-[[ -n "$DOWNLOAD_URL" ]] && sed -i -e $'s|^COMPONENT_CPAN_AUTHOR.*|COMPONENT_ARCHIVE_URL=\t\t'"$DOWNLOAD_URL"'|' Makefile
+[[ -n "$DOWNLOAD_URL" ]] && sed -i -e $'s|^COMPONENT_CPAN_AUTHOR.*|COMPONENT_ARCHIVE_URL =\t\t\\\\\\\n\t'"$DOWNLOAD_URL"'|' Makefile
# Remove COMPONENT_REVISION if not needed
COMPONENT_VERSION=$($GMAKE print-value-COMPONENT_VERSION)
-[[ "$PREV_VER" != "$COMPONENT_VERSION" ]] && REBUILD=0 && sed -i -e '/^COMPONENT_REVISION/d' Makefile
+[[ "$PREV_VER" != "$COMPONENT_VERSION" ]] && sed -i -e '/^COMPONENT_REVISION/d' Makefile
git add Makefile
# Calculate sham256 sum for source package
@@ -248,14 +258,28 @@
sed -i -e 's/sha256:TODO/sha256:'"$SHA256"'/g' Makefile
git add Makefile
-# Unpack sources
+# Unpack sources and apply patches
+! $GMAKE patch > /dev/null 2>&1 && printf "FATAL: 'gmake patch' failed!\n" >&2 && exit 1
+
+# Refresh patches
+if $GMAKE refresh-patches > /dev/null 2>&1 ; then
+ git add patches 2>/dev/null
+else
+ printf "ERROR: 'gmake refresh-patches' failed!\n" >&2
+ git checkout patches 2>/dev/null
+fi
+
+# Cleanup after patch refresh
+$GMAKE clobber > /dev/null 2>&1
+
+# Prepare sources
! $GMAKE prep > /dev/null 2>&1 && printf "FATAL: 'gmake prep' failed!\n" >&2 && exit 1
SOURCE_DIR=$($GMAKE print-value-SOURCE_DIR)
COMPONENT_SUBDIR=$($GMAKE print-value-COMPONENT_SUBDIR)
[[ -n "$COMPONENT_SUBDIR" ]] && COMPONENT_SUBDIR="/$COMPONENT_SUBDIR"
-# Switch to makemaker if needed
-[[ ! -f "$SOURCE_DIR$COMPONENT_SUBDIR/Build.PL" && -f "$SOURCE_DIR$COMPONENT_SUBDIR/Makefile.PL" ]] && sed -i -e 's/modulebuild/makemaker/g' Makefile
+# Switch to modulebuild if possible
+[[ -f "$SOURCE_DIR$COMPONENT_SUBDIR/Build.PL" ]] && sed -i -e 's/makemaker/modulebuild/g' Makefile
# Get abstract. Either from metacpan, or directly from sources.
ABSTRACT=$(printf "%s" "$METACPAN_MODULE" | /usr/bin/jq -r '.abstract')
@@ -308,7 +332,7 @@
LICENSE=
LICFILE=
COPYRIGHT=
-for f in LICENSE LICENCE COPYING COPYRIGHT ; do
+for f in $LICENSE_FILE LICENSE LICENCE COPYING COPYRIGHT ; do
[[ -f "$SOURCE_DIR$COMPONENT_SUBDIR/$f" ]] || continue
LICFILE="$SOURCE_DIR$COMPONENT_SUBDIR/$f"
@@ -454,6 +478,36 @@
! $GMAKE env-check > /dev/null 2>&1 && printf "FATAL: 'gmake env-check' failed!\n" >&2 && exit 1
+# Handle history
+COMPONENT_FMRI=$($GMAKE print-value-COMPONENT_FMRI)
+PERL_VERSIONS_OBSOLETING=$($GMAKE print-value-PERL_VERSIONS_OBSOLETING)
+OV=
+OV_PLURAL=
+for o in $(echo $OBSOLETE $PERL_VERSIONS_OBSOLETING | LC_ALL=C sort -u) ; do
+ PLV=${o//.}
+ FMRI=$(pkg list -nvH "$COMPONENT_FMRI-$PLV" 2>/dev/null | egrep -v '(o|r)$' | sed -e 's|^.*\('"$COMPONENT_FMRI"'\)|\1|g' -e 's/:[^:]*$//g' -e 's/\(-[^-]*\)$/,5.11\1/g')
+ [[ -n "$FMRI" ]] || continue
+ FMRI_H=${FMRI%.*}
+ FMRI_T=${FMRI##*.}
+ if [[ "$FMRI_H" == "$FMRI" ]] ; then
+ printf "WARNING: Wrong fmri format: %s\n" "$FMRI" >&2
+ continue
+ fi
+ FMRI_T=$((FMRI_T + 1))
+ printf "%s.%s noincorporate\n" "$FMRI_H" "$FMRI_T" >> history
+
+ [[ -n "$OV" ]] && OV="${OV/ and /, } and " && OV_PLURAL="s"
+ OV="$OV$o"
+done
+if [[ -f history ]] ; then
+ LC_ALL=C sort -u history > history.new
+ mv history.new history
+ git add history
+
+ awk '$2 == "noincorporate" {printf("WARNING: Unincorporated package: %s\n", $1)}' < history >&2
+fi
+
+
# Cleanup before we try to publish to make sure there are no leftovers from
# previous steps
$GMAKE clobber > /dev/null 2>&1
@@ -522,42 +576,13 @@
fi
-# Handle history
-COMPONENT_FMRI=$($GMAKE print-value-COMPONENT_FMRI)
-PERL_VERSIONS_OBSOLETING=$($GMAKE print-value-PERL_VERSIONS_OBSOLETING)
-OV=
-OV_PLURAL=
-for o in $(echo $OBSOLETE $PERL_VERSIONS_OBSOLETING | LC_ALL=C sort -u) ; do
- PLV=${o//.}
- FMRI=$(pkg list -nvH "$COMPONENT_FMRI-$PLV" 2>/dev/null | egrep -v '(o|r)$' | sed -e 's|^.*\('"$COMPONENT_FMRI"'\)|\1|g' -e 's/:[^:]*$//g' -e 's/\(-[^-]*\)$/,5.11\1/g')
- [[ -n "$FMRI" ]] || continue
- FMRI_H=${FMRI%.*}
- FMRI_T=${FMRI##*.}
- if [[ "$FMRI_H" == "$FMRI" ]] ; then
- printf "WARNING: Wrong fmri format: %s\n" "$FMRI" >&2
- continue
- fi
- FMRI_T=$((FMRI_T + 1))
- printf "%s.%s noincorporate\n" "$FMRI_H" "$FMRI_T" >> history
-
- [[ -n "$OV" ]] && OV="$OV and " && OV_PLURAL="s"
- OV="$OV$o"
-done
-if [[ -f history ]] ; then
- LC_ALL=C sort -u history > history.new
- mv history.new history
- git add history
-fi
-
-
# Construct the commit message
MSG=
if ((NEW)) ; then
- MSG="Add $MODULE perl module"
+ MSG="Add $MODULE Perl module"
else
- if ((REBUILD == 0)) ; then
- [[ "$PREV_HVER" != "$VERSION" ]] && MSG="update to $VERSION" || MSG="change version format"
- fi
+ [[ "$PREV_VER" != "$COMPONENT_VERSION" ]] && MSG="change version format"
+ [[ "$PREV_HVER" != "$VERSION" ]] && MSG="update to $VERSION"
REBUILDMSG=
@@ -569,12 +594,12 @@
[[ -n "$NV" ]] && NV="$NV and "
NV="$NV$v"
done
- [[ -n "$NV" ]] && REBUILDMSG="rebuild for perl $NV"
+ [[ -n "$NV" ]] && REBUILDMSG="rebuild for Perl $NV"
fi
if [[ -n "$OV" ]] ; then
- [[ -n "$REBUILDMSG" ]] && REBUILDMSG="$REBUILDMSG and" || REBUILDMSG="rebuild"
- REBUILDMSG="$REBUILDMSG to get package$OV_PLURAL for perl $OV obsoleted"
+ [[ -n "$REBUILDMSG" ]] && REBUILDMSG="$REBUILDMSG and "
+ REBUILDMSG="${REBUILDMSG}obsolete package$OV_PLURAL for Perl $OV"
fi
if [[ -n "$REBUILDMSG" ]] ; then
--
Gitblit v1.9.3