Skip to content

Commit

Permalink
Drop LSOF_CCDATE in order to ensure reproducible builds
Browse files Browse the repository at this point in the history 
LSOF_CCDATE is used to embed the build time/date string into the lsof binary.
This string is displayed as part of 'lsof -v' output. However, having that
embedded string breaks reproducible builds - we want to ensure that subsequent
builds (using the same exact build environemnt) produce the same exact binary,
bit-for-bit.

We could override the variable (like we do for LSOF_HOST, for example), but
frankly it doesn't matter when the binary was built. That's what we have
'ls -l' and version strings for. Just drop the variable.
  • Loading branch information
@dilinger
dilinger committed Jan 26, 2021
1 parent c097e42 commit 94aab92
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 17 deletions.
2 changes: 0 additions & 2 deletions NEW/usage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,6 @@ usage(xv, fh, version)
(void) fprintf(stderr, " configuration info: %s\n", cp);
#endif /* defined(LSOF_CINFO) */

if ((cp = isnullstr(LSOF_CCDATE)))
(void) fprintf(stderr, " constructed: %s\n", cp);
cp = isnullstr(LSOF_HOST);
if (!(cp1 = isnullstr(LSOF_LOGNAME)))
cp1 = isnullstr(LSOF_USER);
Expand Down
1 change: 0 additions & 1 deletion dialects/aix/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/darwin/kmem/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/darwin/libproc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/du/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \
Expand Down
1 change: 0 additions & 1 deletion dialects/freebsd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \
Expand Down
1 change: 0 additions & 1 deletion dialects/hpux/kmem/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/hpux/pstat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/linux/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/n+obsd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \
Expand Down
1 change: 0 additions & 1 deletion dialects/n+os/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h
@if [ "X${LSOF_LOGNAME}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/osr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h
@if [ "X${LSOF_LOGNAME}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/sun/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
1 change: 0 additions & 1 deletion dialects/uw/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ version.h: FRC
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
@echo '#define LSOF_CC "${CC}"' >> version.h
@echo '#define LSOF_CCV "${CCV}"' >> version.h
@echo '#define LSOF_CCDATE "'`date`'"' >> version.h
@echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
@if [ "X${LSOF_HOST}" = "X" ]; then \
Expand Down
2 changes: 0 additions & 2 deletions usage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -929,8 +929,6 @@ usage(xv, fh, version)
(void) fprintf(stderr, " configuration info: %s\n", cp);
#endif /* defined(LSOF_CINFO) */

if ((cp = isnullstr(LSOF_CCDATE)))
(void) fprintf(stderr, " constructed: %s\n", cp);
cp = isnullstr(LSOF_HOST);
if (!(cp1 = isnullstr(LSOF_LOGNAME)))
cp1 = isnullstr(LSOF_USER);
Expand Down

0 comments on commit 94aab92

Please sign in to comment.