Skip to content

Commit

Permalink
Merge 1b2722b into 55e891c
Browse files Browse the repository at this point in the history
  • Loading branch information
@dilinger
dilinger committed Feb 15, 2021
2 parents 55e891c + 1b2722b commit e545fdb
Show file tree
Hide file tree
Showing 16 changed files with 9 additions and 28 deletions.
9 changes: 9 additions & 0 deletions 00DIST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5229,6 +5229,15 @@ July 14, 2018
Provided by @dilinger (Andres Salomon) in #149.
A commit in the pull request includes work of Nicholas Bamber.

Drop LSOF_CCDATE across all dialects to ensure reproducible builds
Simplify things for reproducible builds by just getting rid of
the embedded date/time string. With LSOF_CCDATE gone, keeping
SOURCE_DATE_EPOCH around doesn't make much sense, so drop that as
well. Folks doing reproducible builds should still override the
LSOF_HOST, LSOF_LOGNAME, LSOF_SYSINFO, and LSOF_USER variables (as
they were previously doing before SOURCE_DATE_EPOCH).
Provided by @dilinger (Andres Salomon) in #150.


The lsof-org team at GitHub
November 11, 2020
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
12 changes: 0 additions & 12 deletions dialects/linux/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,6 @@ SHELL= /bin/sh

SOURCE= Makefile ${OTHER} ${MAN} ${HDR} ${SRC}

ifneq ($(SOURCE_DATE_EPOCH),)
LSOF_HOST= none
LSOF_LOGNAME= none
LSOF_SYSINFO= none
LSOF_USER= none
BUILD_DATE= $(shell date --utc --date=@$(SOURCE_DATE_EPOCH))
export LSOF_HOST LSOF_LOGNAME LSOF_SYSINFO LSOF_USER
else
BUILD_DATE= $(shell date)
endif

all: ${PROG}

${PROG}: ${P} ${LIB} ${OBJ}
Expand Down Expand Up @@ -97,7 +86,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 e545fdb

Please sign in to comment.