Skip to content

Commit 096f148

Browse files
committed
Fix ./makedist wrt. to GH move
We can no longer export from git.php.net, and apparently exporting from Github is not supported. We apply a quick fix to export from the local clone by default, still leaving an option to export from some other repo. This is, unfortunately, a minor BC break in a security release. Co-authored-by: Remi Collet <[email protected]> Closes GH-6919.
1 parent 60a68a4 commit 096f148

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.3.28
44

5+
- Core:
6+
. Fixed ./makedist wrt. to GH move. (cmb, Remi)
7+
58
- Imap:
69
. Fixed bug #80710 (imap_mail_compose() header injection). (cmb, Stas)
710

makedist

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ if test "${2}" -lt "13" -o "${2}" -eq "13" -a "${3}" -lt "5"; then
4040
fi
4141
IFS="$old_IFS"
4242

43-
if test "x$PHPROOT" = "x"; then
44-
[email protected]:php-src.git;
43+
if test "x$PHPROOT" != "x"; then
44+
remote_option=--remote=$PHPROOT
45+
else
46+
remote_option=
4547
fi
4648

4749
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
@@ -72,7 +74,7 @@ fi
7274

7375
# Export PHP
7476
$ECHO_N "makedist: exporting tag 'php-$VER' from '$PHPROOT'...$ECHO_C"
75-
git archive --format=tar --remote=$PHPROOT refs/tags/php-$VER --prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
77+
git archive --format=tar $remote_option refs/tags/php-$VER --prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
7678
echo ""
7779

7880
cd $DIR || exit 5

0 commit comments

Comments
 (0)