From 8854e46a50a0272578599d2fcd8d1fb363e19c38 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 23 Jan 2017 11:03:56 +0100 Subject: Add a git suffix to the version number used by all programs. This uses a setlocalversion script derived from the kernel's scripts/setlocalversion. Signed-off-by: Ralf Baechle --- 6pack/m6pack.c | 5 +++-- ax25/ax25d.c | 3 ++- ax25/axctl.c | 3 ++- ax25/axgetput/axgetput.c | 3 ++- ax25/axparms.c | 3 ++- ax25/beacon.c | 4 +++- ax25/bpqparms.c | 5 +++-- ax25/mheard.c | 3 ++- ax25/mheardd.c | 3 ++- ax25/rxecho.c | 3 ++- hdlcutil/fl/xfhdlcchpar_main.cxx | 3 ++- hdlcutil/fl/xfhdlcst_main.cxx | 3 ++- hdlcutil/fl/xfsmdiag_main.cxx | 3 ++- hdlcutil/fl/xfsmmixer_main.cxx | 3 ++- hdlcutil/sethdlc.c | 3 ++- hdlcutil/smdiag.c | 3 ++- hdlcutil/smmixer.c | 3 ++- kiss/kissattach.c | 3 ++- kiss/kissnetd.c | 9 +++++---- kiss/kissparms.c | 3 ++- kiss/mkiss.c | 5 +++-- netrom/netromd.c | 3 ++- netrom/nodesave.c | 3 ++- netrom/nrattach.c | 3 ++- netrom/nrparms.c | 3 ++- netrom/nrsdrv.c | 3 ++- rose/rsattach.c | 3 ++- rose/rsparms.c | 3 ++- tcpip/rip98d.c | 3 ++- tcpip/ttylinkd.c | 3 ++- 30 files changed, 67 insertions(+), 36 deletions(-) diff --git a/6pack/m6pack.c b/6pack/m6pack.c index 5b63801..6703639 100644 --- a/6pack/m6pack.c +++ b/6pack/m6pack.c @@ -53,6 +53,7 @@ #include #include +#include typedef unsigned char __u8; typedef enum {data, command} frame_t; @@ -387,7 +388,7 @@ static void report(struct iface *tty, struct iface **pty, int numptys) long t; time(&t); - syslog(LOG_INFO, "version %s.", VERSION); + syslog(LOG_INFO, "version %s.", FULL_VER); syslog(LOG_INFO, "Status report at %s", ctime(&t)); syslog(LOG_INFO, "ttyinterface is %s (fd=%d)", tty->name, tty->fd); for (i = 0; i < numptys; i++) @@ -439,7 +440,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("m6pack: %s\n", VERSION); + printf("m6pack: %s\n", FULL_VER); return 1; case ':': case '?': diff --git a/ax25/ax25d.c b/ax25/ax25d.c index 8140b4f..8da0038 100644 --- a/ax25/ax25d.c +++ b/ax25/ax25d.c @@ -138,6 +138,7 @@ #include #include +#include #include "../pathnames.h" @@ -277,7 +278,7 @@ int main(int argc, char *argv[]) break; case 'v': - printf("ax25d: %s\n", VERSION); + printf("ax25d: %s\n", FULL_VER); return 1; default: diff --git a/ax25/axctl.c b/ax25/axctl.c index f1116a7..c27bcdf 100644 --- a/ax25/axctl.c +++ b/ax25/axctl.c @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -25,7 +26,7 @@ int main(int argc, char **argv) int s; if (argc == 2 && strncmp(argv[1], "-v", 2) == 0) { - printf("axctl: %s\n", VERSION); + printf("axctl: %s\n", FULL_VER); return 0; } diff --git a/ax25/axgetput/axgetput.c b/ax25/axgetput/axgetput.c index de21bc5..8620c72 100644 --- a/ax25/axgetput/axgetput.c +++ b/ax25/axgetput/axgetput.c @@ -17,6 +17,7 @@ #ifdef HAVE_CONFIG_H #include #endif +#include #include "includes.h" @@ -144,7 +145,7 @@ static void signal_handler(int sig) void do_version(void) { - fprintf(stderr, MYNAME " " VERSION "\n"); + fprintf(stderr, MYNAME " " FULL_VER "\n"); fprintf(stderr, " (c) 2002 Thomas Osterried \n"); fprintf(stderr, " License: GPL. See http://www.fsf.org/\n"); fprintf(stderr, " Sources: http://x-berg.in-berlin.de/cgi-bin/viewcvs.cgi/ampr/axgetput/\n"); diff --git a/ax25/axparms.c b/ax25/axparms.c index 5c49e58..7f09b06 100644 --- a/ax25/axparms.c +++ b/ax25/axparms.c @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -352,7 +353,7 @@ int main(int argc, char **argv) } if (strncmp(argv[1], "--v", 3) == 0 || strncmp(argv[1], "-v", 2) == 0) { - printf("axparms: %s\n", VERSION); + printf("axparms: %s\n", FULL_VER); return 0; } diff --git a/ax25/beacon.c b/ax25/beacon.c index 18ccc93..f8f8d68 100644 --- a/ax25/beacon.c +++ b/ax25/beacon.c @@ -17,6 +17,8 @@ #include #include +#include + static int logging = FALSE; static int mail = FALSE; static int single = FALSE; @@ -75,7 +77,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("beacon: %s\n", VERSION); + printf("beacon: %s\n", FULL_VER); return 0; case '?': case ':': diff --git a/ax25/bpqparms.c b/ax25/bpqparms.c index 83734a8..27007dc 100644 --- a/ax25/bpqparms.c +++ b/ax25/bpqparms.c @@ -36,6 +36,7 @@ #include /* xlz - dammit, we need this again */ #include +#include void usage(void) { @@ -96,7 +97,7 @@ int main(int argc, char **argv) break; case 'V': - printf("bpqparms version " VERSION "\n"); + printf("bpqparms version " FULL_VER "\n"); printf("Copyright 1996, Jörg Reuter (jreuter@poboxes.com)\n"); printf("This program is free software; you can redistribute it and/or modify\n"); printf("it under the terms of the GNU General Public License as published by\n"); @@ -108,7 +109,7 @@ int main(int argc, char **argv) return 0; case 'v': - printf("bpqparms: %s\n", VERSION); + printf("bpqparms: %s\n", FULL_VER); return 0; case 'h': diff --git a/ax25/mheard.c b/ax25/mheard.c index cba5e11..8156ab5 100644 --- a/ax25/mheard.c +++ b/ax25/mheard.c @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -423,7 +424,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("mheard: %s\n", VERSION); + printf("mheard: %s\n", FULL_VER); return 0; case '?': case ':': diff --git a/ax25/mheardd.c b/ax25/mheardd.c index 3f61f86..cbe5e26 100644 --- a/ax25/mheardd.c +++ b/ax25/mheardd.c @@ -33,6 +33,7 @@ #include #include +#include #include "../pathnames.h" @@ -149,7 +150,7 @@ int main(int argc, char **argv) } break; case 'v': - printf("mheardd: %s\n", VERSION); + printf("mheardd: %s\n", FULL_VER); return 0; case ':': fprintf(stderr, "mheardd: option -n needs an argument\n"); diff --git a/ax25/rxecho.c b/ax25/rxecho.c index c67b95e..597e6cb 100644 --- a/ax25/rxecho.c +++ b/ax25/rxecho.c @@ -64,6 +64,7 @@ #include #include +#include #include @@ -386,7 +387,7 @@ int main(int argc, char **argv) logging = TRUE; break; case 'v': - printf("rxecho: %s\n", VERSION); + printf("rxecho: %s\n", FULL_VER); return 0; default: fprintf(stderr, "usage: rxecho [-l] [-v]\n"); diff --git a/hdlcutil/fl/xfhdlcchpar_main.cxx b/hdlcutil/fl/xfhdlcchpar_main.cxx index 486412b..f03b101 100644 --- a/hdlcutil/fl/xfhdlcchpar_main.cxx +++ b/hdlcutil/fl/xfhdlcchpar_main.cxx @@ -42,6 +42,7 @@ #include "xfhdlcchpar.h" #include +#include /* ---------------------------------------------------------------------- */ @@ -86,7 +87,7 @@ int main(int argc, char *argv[]) struct hdrvc_channel_params cp; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", progname); + printf("%s: Version " FULL_VER "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", progname); hdrvc_args(&argc, argv, "bc0"); for (i = 1; i < argc; ) { c = i; diff --git a/hdlcutil/fl/xfhdlcst_main.cxx b/hdlcutil/fl/xfhdlcst_main.cxx index 5959d24..421805a 100644 --- a/hdlcutil/fl/xfhdlcst_main.cxx +++ b/hdlcutil/fl/xfhdlcst_main.cxx @@ -42,6 +42,7 @@ #include "xfhdlcst.h" #include +#include /* ---------------------------------------------------------------------- */ @@ -82,7 +83,7 @@ int main(int argc, char *argv[]) char name[64]; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", *argv); + printf("%s: Version " FULL_VER "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", *argv); hdrvc_args(&argc, argv, "bc0"); for (i = 1; i < argc; ) { c = i; diff --git a/hdlcutil/fl/xfsmdiag_main.cxx b/hdlcutil/fl/xfsmdiag_main.cxx index d56ebfa..fa58f0f 100644 --- a/hdlcutil/fl/xfsmdiag_main.cxx +++ b/hdlcutil/fl/xfsmdiag_main.cxx @@ -51,6 +51,7 @@ #include #include +#include /* ---------------------------------------------------------------------- */ @@ -357,7 +358,7 @@ int main(int argc, char *argv[]) char name[64]; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", *argv); + printf("%s: Version " FULL_VER "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", *argv); hdrvc_args(&argc, argv, "sm0"); for (i = 1; i < argc; ) { diff --git a/hdlcutil/fl/xfsmmixer_main.cxx b/hdlcutil/fl/xfsmmixer_main.cxx index 57e4701..fd7c222 100644 --- a/hdlcutil/fl/xfsmmixer_main.cxx +++ b/hdlcutil/fl/xfsmmixer_main.cxx @@ -42,6 +42,7 @@ #include "xfsmmixer.h" #include +#include /* ---------------------------------------------------------------------- */ @@ -316,7 +317,7 @@ int main(int argc, char *argv[]) unsigned char mdata; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", progname); + printf("%s: Version " FULL_VER "; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", progname); hdrvc_args(&argc, argv, "sm0"); for (i = 1; i < argc; ) { c = i; diff --git a/hdlcutil/sethdlc.c b/hdlcutil/sethdlc.c index 99e25cd..8cba1ac 100644 --- a/hdlcutil/sethdlc.c +++ b/hdlcutil/sethdlc.c @@ -46,6 +46,7 @@ #include "hdrvcomm.h" #include +#include /* ---------------------------------------------------------------------- */ @@ -486,7 +487,7 @@ int main(int argc, char *argv[]) char pktbuf[2048]; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996-1997 by Thomas Sailer HB9JNX/AE4WA\n", *argv); + printf("%s: Version " FULL_VER "; (C) 1996-1997 by Thomas Sailer HB9JNX/AE4WA\n", *argv); hdrvc_args(&argc, argv, "bc0"); while ((ret = getopt(argc, argv, "bsdhpc:a")) != -1) { switch (ret) { diff --git a/hdlcutil/smdiag.c b/hdlcutil/smdiag.c index 9238641..cb354f1 100644 --- a/hdlcutil/smdiag.c +++ b/hdlcutil/smdiag.c @@ -49,6 +49,7 @@ #include "hdrvcomm.h" #include +#include /* ---------------------------------------------------------------------- */ @@ -333,7 +334,7 @@ int main(int argc, char *argv[]) unsigned int samplesperbit; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996-1997 by Thomas Sailer HB9JNX/AE4WA\n", *argv); + printf("%s: Version " FULL_VER "; (C) 1996-1997 by Thomas Sailer HB9JNX/AE4WA\n", *argv); hdrvc_args(&argc, argv, "sm0"); while ((ret = getopt(argc, argv, "d:ecp")) != -1) { switch (ret) { diff --git a/hdlcutil/smmixer.c b/hdlcutil/smmixer.c index fa370f2..69c56f6 100644 --- a/hdlcutil/smmixer.c +++ b/hdlcutil/smmixer.c @@ -43,6 +43,7 @@ #include "hdrvcomm.h" #include +#include /* ---------------------------------------------------------------------- */ @@ -726,7 +727,7 @@ int main(int argc, char *argv[]) struct sm_mixer_data mixdat; progname = *argv; - printf("%s: Version " VERSION "; (C) 1996-1997 by Thomas Sailer HB9JNX/AE4WA\n", *argv); + printf("%s: Version " FULL_VER "; (C) 1996-1997 by Thomas Sailer HB9JNX/AE4WA\n", *argv); hdrvc_args(&argc, argv, "sm0"); while ((c = getopt(argc, argv, "")) != -1) { switch (c) { diff --git a/kiss/kissattach.c b/kiss/kissattach.c index e30ed05..f4ff5cb 100644 --- a/kiss/kissattach.c +++ b/kiss/kissattach.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -254,7 +255,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("%s: %s\n", progname, VERSION); + printf("%s: %s\n", progname, FULL_VER); return 0; case ':': case '?': diff --git a/kiss/kissnetd.c b/kiss/kissnetd.c index 366bb89..7b64ad9 100644 --- a/kiss/kissnetd.c +++ b/kiss/kissnetd.c @@ -25,6 +25,7 @@ #include #include +#include static int VerboseMode; static int MaxFrameSize = 512; @@ -58,7 +59,7 @@ static void Usage(void) static void Banner(int Small) { if (Small) { - printf("kissnetd V %s by Frederic RIBLE F1OAT - ATEPRA FPAC/Linux Project\n", VERSION); + printf("kissnetd V %s by Frederic RIBLE F1OAT - ATEPRA FPAC/Linux Project\n", FULL_VER); } else { printf("****************************************\n"); @@ -66,9 +67,9 @@ static void Banner(int Small) printf("* ATEPRA FPAC/Linux Project *\n"); printf("****************************************\n"); printf("* %*skissnetd Version %s%*s*\n", - (int) (10 - strlen(VERSION) / 2), "", - VERSION, - (int) (10 - (strlen(VERSION) + 1)) / 2, ""); + (int) (10 - strlen(FULL_VER) / 2), "", + FULL_VER, + (int) (10 - (strlen(FULL_VER) + 1)) / 2, ""); printf("* by Frederic RIBLE F1OAT *\n"); printf("****************************************\n"); } diff --git a/kiss/kissparms.c b/kiss/kissparms.c index fc57f7b..6a27dc7 100644 --- a/kiss/kissparms.c +++ b/kiss/kissparms.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -127,7 +128,7 @@ int main(int argc, char *argv[]) break; case 'v': - printf("kissparms: %s\n", VERSION); + printf("kissparms: %s\n", FULL_VER); return 0; case 'x': diff --git a/kiss/mkiss.c b/kiss/mkiss.c index a50e91c..3d709de 100644 --- a/kiss/mkiss.c +++ b/kiss/mkiss.c @@ -58,6 +58,7 @@ #include #include +#include #define FLEX_CRC 2 #define G8BPQ_CRC 1 @@ -385,7 +386,7 @@ static void report(void) long t; time(&t); - syslog(LOG_INFO, "version %s.", VERSION); + syslog(LOG_INFO, "version %s.", FULL_VER); syslog(LOG_INFO, "Status report at %s", ctime(&t)); syslog(LOG_INFO, "Hardware handshaking %sabled.", hwflag ? "en" : "dis"); @@ -462,7 +463,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("mkiss: %s\n", VERSION); + printf("mkiss: %s\n", FULL_VER); return 1; case ':': case '?': diff --git a/netrom/netromd.c b/netrom/netromd.c index fbad930..394e75f 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -172,7 +173,7 @@ int main(int argc, char **argv) } break; case 'v': - printf("netromd: %s\n", VERSION); + printf("netromd: %s\n", FULL_VER); return 0; case '?': case ':': diff --git a/netrom/nodesave.c b/netrom/nodesave.c index ce6c106..c5f1487 100644 --- a/netrom/nodesave.c +++ b/netrom/nodesave.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -45,7 +46,7 @@ int main(int argc, char **argv) Nrparms = strdup(buf); break; case 'v': - printf("nodesave: %s\n", VERSION); + printf("nodesave: %s\n", FULL_VER); return 0; case ':': case '?': diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 804e4b8..c8e1a82 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -10,6 +10,7 @@ #include #include +#include #include @@ -214,7 +215,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("nrattach: %s\n", VERSION); + printf("nrattach: %s\n", FULL_VER); return 0; case ':': case '?': diff --git a/netrom/nrparms.c b/netrom/nrparms.c index db7ce31..fd06eb1 100644 --- a/netrom/nrparms.c +++ b/netrom/nrparms.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -199,7 +200,7 @@ int main(int argc, char *argv[]) } if (strncmp(argv[1], "-v", 2) == 0) { - printf("nrparms: %s\n", VERSION); + printf("nrparms: %s\n", FULL_VER); return 0; } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index e75ecda..90b7635 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -19,6 +19,7 @@ #include #include +#include #include "../pathnames.h" @@ -326,7 +327,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("kissattach: %s\n", VERSION); + printf("kissattach: %s\n", FULL_VER); return 0; case ':': case '?': diff --git a/rose/rsattach.c b/rose/rsattach.c index df042aa..8523962 100644 --- a/rose/rsattach.c +++ b/rose/rsattach.c @@ -10,6 +10,7 @@ #include #include +#include #include @@ -192,7 +193,7 @@ int main(int argc, char *argv[]) } break; case 'v': - printf("rsattach: %s\n", VERSION); + printf("rsattach: %s\n", FULL_VER); return 0; case ':': case '?': diff --git a/rose/rsparms.c b/rose/rsparms.c index fd38711..7ab3844 100644 --- a/rose/rsparms.c +++ b/rose/rsparms.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -204,7 +205,7 @@ int main(int argc, char *argv[]) } if (strncmp(argv[1], "-v", 2) == 0) { - printf("rsparms: %s\n", VERSION); + printf("rsparms: %s\n", FULL_VER); return 0; } diff --git a/tcpip/rip98d.c b/tcpip/rip98d.c index ca9a7b5..bb85e66 100644 --- a/tcpip/rip98d.c +++ b/tcpip/rip98d.c @@ -2,6 +2,7 @@ #ifdef HAVE_CONFIG_H #include #endif +#include #include #include @@ -296,7 +297,7 @@ int main(int argc, char **argv) } break; case 'v': - printf("rip98d: %s\n", VERSION); + printf("rip98d: %s\n", FULL_VER); return 0; case ':': fprintf(stderr, "rip98d: invalid time interval\n"); diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c index a0764f4..68c0450 100644 --- a/tcpip/ttylinkd.c +++ b/tcpip/ttylinkd.c @@ -37,6 +37,7 @@ #include #include +#include #include @@ -53,7 +54,7 @@ #include "../pathnames.h" -static char version[] = "ttylink daemon (Version " VERSION ") ready.\n"; +static char version[] = "ttylink daemon (Version " FULL_VER ") ready.\n"; #define SYSOP_USER "root" -- cgit v1.2.3