Skip to content
Snippets Groups Projects
Commit ba35bce99a6d authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Merge branch 'renovate/libtiff-libtiff-4.x' into 'master'

Update dependency libtiff/libtiff to v4.7.0

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7941



Merged-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Approved-by: default avatarGabriel Mazetto <gabriel@gitlab.com>
Approved-by: default avatarLucas Li <lli@gitlab.com>
Approved-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Co-authored-by: default avatardustinmm80 <dcollins@gitlab.com>
Co-authored-by: default avatarGitLab Renovate Bot <gitlab-bot@gitlab.com>
No related branches found
No related tags found
1 merge request!161Merge upstream Omnibus GitLab into Omnibus Heptapod
commit 4b33bc00cd49e98b93cf999bf8405909c24cf17a
Author: Balasankar "Balu" C <balasankarc@autistici.org>
Date: Thu Apr 22 16:40:21 2021 +0530
Remove code to download config.guess and config.sub
Signed-off-by: Balasankar "Balu" C <balasankarc@autistici.org>
diff --git a/autogen.sh b/autogen.sh
......@@ -9,4 +1,4 @@
diff --git a/autogen.sh b/autogen.sh
index 9ef71b53..db8c38e7 100755
index 2e6c6bd0..544c99aa 100755
--- a/autogen.sh
+++ b/autogen.sh
......@@ -11,9 +3,9 @@
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,16 +5,3 @@ aclocal -I ./m4
autoheader
automake --foreign --add-missing --copy
autoconf
@@ -16,16 +16,5 @@ aclocal -I ./m4 || retval=$?
autoheader || retval=$?
automake --foreign --add-missing --copy || retval=$?
autoconf || retval=$?
-# Get latest config.guess and config.sub from upstream master since
-# these are often out of date.
-for file in config.guess config.sub
......@@ -22,6 +14,5 @@
- wget -q --timeout=5 -O config/$file.tmp \
- "https://git.savannah.gnu.org/cgit/config.git/plain/${file}" \
- && mv -f config/$file.tmp config/$file \
- && chmod a+x config/$file
- retval=$?
- && chmod a+x config/$file || retval=$?
- rm -f config/$file.tmp
......@@ -27,3 +18,2 @@
- rm -f config/$file.tmp
- test $retval -eq 0 || exit $retval
-done
......@@ -29,1 +19,3 @@
-done
exit $retval
......@@ -15,7 +15,7 @@
#
name 'libtiff'
version = Gitlab::Version.new('libtiff', 'v4.6.0')
version = Gitlab::Version.new('libtiff', 'v4.7.0')
default_version version.print(false)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment