From e498a9b1fe5964a18eb2a3a99dc52160d2768261 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <daniel@yesql.se>
Date: Wed, 20 Apr 2022 15:26:13 +0200
Subject: macos: set .plist version in autoconf

Set the libcurl version in libcurl.plist like how libcurl.vers is
created.

Closes: #8692
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Nick Zitzmann <nickzman@gmail.com>
---
 MacOSX-Framework                |  2 +-
 configure.ac                    |  5 +++++
 lib/.gitignore                  |  1 +
 lib/libcurl.plist               | 35 -----------------------------------
 lib/libcurl.plist.in            | 35 +++++++++++++++++++++++++++++++++++
 maketgz                         |  4 ----
 packages/vms/clean_gnv_curl.com |  3 +++
 scripts/copyright.pl            |  2 +-
 8 files changed, 46 insertions(+), 41 deletions(-)
 delete mode 100644 lib/libcurl.plist
 create mode 100644 lib/libcurl.plist.in

diff --git a/MacOSX-Framework b/MacOSX-Framework
index 3c8452774..69a4f477a 100755
--- a/MacOSX-Framework
+++ b/MacOSX-Framework
@@ -116,7 +116,7 @@ if test ! -z $SDK32; then
   mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources
   cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl
   install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl
-  /usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
+  cp lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
   mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
   cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
   pushd libcurl.framework
diff --git a/configure.ac b/configure.ac
index 2580f6a8d..d24daeab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2333,6 +2333,10 @@ AC_SUBST([CURL_LT_SHLIB_VERSIONED_FLAVOUR],
 AM_CONDITIONAL([CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS],
   [test "x$versioned_symbols" = 'xyes'])
 
+dnl Update .plist file with current version
+AC_SUBST([CURL_PLIST_VERSION],
+  ["$CURLVERSION"])
+
 dnl -------------------------------------------------
 dnl check winidn option before other IDN libraries
 dnl -------------------------------------------------
@@ -4382,6 +4386,7 @@ AC_CONFIG_FILES([Makefile \
            lib/Makefile \
            scripts/Makefile \
            lib/libcurl.vers \
+           lib/libcurl.plist \
            tests/Makefile \
            tests/certs/Makefile \
            tests/certs/scripts/Makefile \
diff --git a/lib/.gitignore b/lib/.gitignore
index 719fc977f..93ae0dec5 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -8,5 +8,6 @@ TAGS
 curl_config.h
 curl_config.h.in
 libcurl.plist.dist
+libcurl.plist
 libcurl.vers
 stamp-h1
diff --git a/lib/libcurl.plist b/lib/libcurl.plist
deleted file mode 100644
index c5df75e1f..000000000
--- a/lib/libcurl.plist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-
-	<key>CFBundleExecutable</key>
-	<string>curl</string>
-
-	<key>CFBundleIdentifier</key>
-	<string>se.curl.libcurl</string>
-
-	<key>CFBundleVersion</key>
-	<string>7.12.3</string>
-
-	<key>CFBundleName</key>
-	<string>libcurl</string>
-
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-
-	<key>CFBundleSignature</key>
-	<string>????</string>
-
-	<key>CFBundleShortVersionString</key>
-	<string>libcurl 7.12.3</string>
-
-	<key>CFBundleGetInfoString</key>
-	<string>libcurl.plist 7.12.3</string>
-</dict>
-</plist>
diff --git a/lib/libcurl.plist.in b/lib/libcurl.plist.in
new file mode 100644
index 000000000..d2e6492f6
--- /dev/null
+++ b/lib/libcurl.plist.in
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+
+	<key>CFBundleExecutable</key>
+	<string>curl</string>
+
+	<key>CFBundleIdentifier</key>
+	<string>se.curl.libcurl</string>
+
+	<key>CFBundleVersion</key>
+	<string>@CURL_PLIST_VERSION@</string>
+
+	<key>CFBundleName</key>
+	<string>libcurl</string>
+
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+
+	<key>CFBundleSignature</key>
+	<string>????</string>
+
+	<key>CFBundleShortVersionString</key>
+	<string>libcurl @CURL_PLIST_VERSION@</string>
+
+	<key>CFBundleGetInfoString</key>
+	<string>libcurl.plist @CURL_PLIST_VERSION@</string>
+</dict>
+</plist>
diff --git a/maketgz b/maketgz
index c8ab8a289..9869aa105 100755
--- a/maketgz
+++ b/maketgz
@@ -92,10 +92,6 @@ rm -f "$HEADER.bak"
 sed -i.bak 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER
 rm -f "$CHEADER.bak"
 
-# Replace version number in plist file:
-sed -i.bak "s/7\.12\.3/$libversion/g" $PLIST
-rm -f "$PLIST.bak"
-
 if test -n "$only"; then
   # done!
   exit;
diff --git a/packages/vms/clean_gnv_curl.com b/packages/vms/clean_gnv_curl.com
index 5846739e4..fa79193f5 100644
--- a/packages/vms/clean_gnv_curl.com
+++ b/packages/vms/clean_gnv_curl.com
@@ -181,6 +181,9 @@ $!
 $ file = "lcl_root:[.lib]libcurl.vers"
 $ if f$search(file) .nes. "" then delete 'file';*
 $!
+$ file = "lcl_root:[.lib]libcurl.plist"
+$ if f$search(file) .nes. "" then delete 'file';*
+$!
 $ file = "lcl_root:[]ca-bundle.h"
 $ if f$search(file) .nes. "" then delete 'file';*
 $!
diff --git a/scripts/copyright.pl b/scripts/copyright.pl
index d0e886b64..a5f7264f5 100755
--- a/scripts/copyright.pl
+++ b/scripts/copyright.pl
@@ -60,7 +60,7 @@ my @skiplist=(
     'options-in-versions',
 
     # macos-framework files
-    '^lib\/libcurl.plist',
+    '^lib\/libcurl.plist.in',
     '^lib\/libcurl.vers.in',
 
     # vms files
-- 
cgit v1.2.1