Tue Dec 13 18:36:42 2022 UTC ()

Remove the importdate hack to make things more similar with the upstream
script.


(christos)

diff -r1.16 -r0 src/external/bsd/ntp/importdate
diff -r1.18 -r1.19 src/external/bsd/ntp/scripts/mkver

--- src/external/bsd/ntp/scripts/mkver 2022/12/13 18:27:45	1.18
+++ src/external/bsd/ntp/scripts/mkver 2022/12/13 18:36:41	1.19

 @@ -13,53 +13,39 @@ esac
 case "o" in
  '') ;;
  *) ConfStr="${ConfStr}-o" ;;
 esac
 if [ -n "$MKREPRO_TIMESTAMP" ]; then
    SOURCE_DATE_EPOCH=$MKREPRO_TIMESTAMP
 fi
 if [ -n "$SOURCE_DATE_EPOCH" ]; then
    ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -d@$SOURCE_DATE_EPOCH 2>/dev/null`" ||
    ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -r $SOURCE_DATE_EPOCH`"
 else
-   ifile="`dirname $0`/../importdate"
+   ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"
    if [ -f "$ifile" ]; then
        # NetBSD MKREPRO: Don't embed current date/time/run number
        ConfStr="$ConfStr "`cat "$ifile"`
    else
        ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"
    fi
 fi
 if [ -n "$MKREPRO_TIMESTAMP" ]; then
     RUN=1
 else
     if [ ! -f .version ]; then
       echo 0 > .version
     fi
     RUN="`cat .version`"
     RUN="`expr $RUN + 1`"
     echo $RUN > .version
 fi
-if [ -f "$ifile" ]; then
+ConfStr="$ConfStr (${RUN})"
   # NetBSD MKREPRO: Don't embed current date/time/run number
 else
   RUN="`cat .version`"
   RUN="`expr $RUN + 1`"
   echo $RUN > .version
   ConfStr="$ConfStr (${RUN})"
 fi
 echo "Version <${ConfStr}>";
 rm -f version.c
 cat > version.c << -EoF-
 /*
  * version file for $PROG
  */
 #include <config.h>
 const char * Version = "${ConfStr}";
 -EoF-