luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dist: fix reproducible build from release tarball

Browse Source 
Make it possible to rebuild an identical copy from a release tarball. It
was previously only possible from a checked out git repository.

- add release-tools.sh to dist
- keep Makefile.dist around to include it in dist
- regenerate tool_huge.c with the new version in dist
- fix the dist CI job to not do make clean like before

Closes #14336
This commit is contained in:
Daniel Stenberg 2024-08-01 13:51:43 +02:00
parent c73b80a3cd
commit 754acd1a9d
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/distcheck.yml vendored
View File

@ -35,8 +35,8 @@ jobs:
- run: ./configure --without-ssl --without-libpsl - run: ./configure --without-ssl --without-libpsl
name: 'configure' name: 'configure'
- run: make V=1 && make V=1 clean - run: make V=1
name: 'make and clean' name: 'make'
- name: 'maketgz' - name: 'maketgz'
run: | run: |
@ -45,7 +45,7 @@ jobs:
- name: 'maketgz reproducibility test' - name: 'maketgz reproducibility test'
run: | run: |
mkdir run1; mv ./curl-99.98.97.* run1/ mkdir run1; mv ./curl-99.98.97.* run1/
make V=1 && make V=1 clean make V=1 clean && make V=1
SOURCE_DATE_EPOCH=1711526400 ./maketgz 99.98.97 SOURCE_DATE_EPOCH=1711526400 ./maketgz 99.98.97
mkdir run2; cp -p ./curl-99.98.97.* run2/ mkdir run2; cp -p ./curl-99.98.97.* run2/
diff run1 run2 diff run1 run2

4
Makefile.am
View File

@ -101,8 +101,8 @@ include src/Makefile.inc
dist-hook: dist-hook:
rm -rf $(top_builddir)/tests/log rm -rf $(top_builddir)/tests/log
find $(distdir) -name "*.dist" -exec rm {} \; find $(distdir) -name "*.dist" -a \! -name Makefile.dist -exec rm {} \;
(distit=`find $(srcdir) -name "*.dist" | grep -v ./ares/`; \ (distit=`find $(srcdir) -name "*.dist"`; \
for file in $$distit; do \ for file in $$distit; do \
strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \ strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \
cp -p $$file $(distdir)$$strip; \ cp -p $$file $(distdir)$$strip; \

11
maketgz
View File

@ -87,7 +87,7 @@ datestamp=$(date -d "@$timestamp" +"%F")
filestamp=$(date -d "@$timestamp" +"%Y%m%d%H%M.%S") filestamp=$(date -d "@$timestamp" +"%Y%m%d%H%M.%S")
# Replace version number in header file: # Replace version number in header file:
sed -i.bak \ sed -i \
-e "s/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION \"$libversion\"/g" \ -e "s/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION \"$libversion\"/g" \
-e "s/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x$numeric/g" \ -e "s/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x$numeric/g" \
-e "s/^#define LIBCURL_VERSION_MAJOR .*/#define LIBCURL_VERSION_MAJOR $major/g" \ -e "s/^#define LIBCURL_VERSION_MAJOR .*/#define LIBCURL_VERSION_MAJOR $major/g" \
@ -95,11 +95,9 @@ sed -i.bak \
-e "s/^#define LIBCURL_VERSION_PATCH .*/#define LIBCURL_VERSION_PATCH $patch/g" \ -e "s/^#define LIBCURL_VERSION_PATCH .*/#define LIBCURL_VERSION_PATCH $patch/g" \
-e "s/^#define LIBCURL_TIMESTAMP .*/#define LIBCURL_TIMESTAMP \"$datestamp\"/g" \ -e "s/^#define LIBCURL_TIMESTAMP .*/#define LIBCURL_TIMESTAMP \"$datestamp\"/g" \
"$HEADER" "$HEADER"
rm -f "$HEADER.bak"
# Replace version number in header file: # Replace version number in header file:
sed -i.bak "s/#define CURL_VERSION .*/#define CURL_VERSION \"$curlversion\"/g" "$CHEADER" sed -i "s/#define CURL_VERSION .*/#define CURL_VERSION \"$curlversion\"/g" "$CHEADER"
rm -f "$CHEADER.bak"
if test -n "$only"; then if test -n "$only"; then
# done! # done!
@ -133,6 +131,11 @@ findprog() {
echo "Re-running config.status" echo "Re-running config.status"
./config.status --recheck >/dev/null ./config.status --recheck >/dev/null
echo "Recreate the built-in manual (with correct version)"
export CURL_MAKETGZ_VERSION="$version"
rm -f docs/cmdline-opts/curl.txt
make -C src
############################################################################ ############################################################################
# #
# automake is needed to run to make a non-GNU Makefile.in if Makefile.am has # automake is needed to run to make a non-GNU Makefile.in if Makefile.am has

2
scripts/Makefile.am
View File

@ -24,7 +24,7 @@
EXTRA_DIST = coverage.sh completion.pl firefox-db2pem.sh checksrc.pl \ EXTRA_DIST = coverage.sh completion.pl firefox-db2pem.sh checksrc.pl \
mk-ca-bundle.pl schemetable.c cd2nroff nroff2cd cdall cd2cd managen \ mk-ca-bundle.pl schemetable.c cd2nroff nroff2cd cdall cd2cd managen \
dmaketgz dmaketgz release-tools.sh
ZSH_FUNCTIONS_DIR = @ZSH_FUNCTIONS_DIR@ ZSH_FUNCTIONS_DIR = @ZSH_FUNCTIONS_DIR@
FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@

20
scripts/managen
View File

@ -1205,14 +1205,20 @@ elsif($cmd eq "-c") {
my @files = @ARGV; # the rest are the files my @files = @ARGV; # the rest are the files
open(INC, "<$include/curl/curlver.h"); # can be overriden for releases
while(<INC>) { if($ENV{'CURL_MAKETGZ_VERSION'}) {
if($_ =~ /^#define LIBCURL_VERSION \"([0-9.]*)/) { $version = $ENV{'CURL_MAKETGZ_VERSION'};
$version = $1; }
last; else {
} open(INC, "<$include/curl/curlver.h");
while(<INC>) {
if($_ =~ /^#define LIBCURL_VERSION \"([0-9.]*)/) {
$version = $1;
last;
}
}
close(INC);
} }
close(INC);
# learn all existing options # learn all existing options
indexoptions($dir, @files); indexoptions($dir, @files);