New upstream version 3.1.1

This commit is contained in:
billchenchina 2022-11-15 08:50:35 +08:00
parent 4e9934e5ec
commit e7b41df57b
229 changed files with 57000 additions and 12055 deletions

View file

@ -1,8 +0,0 @@
--- a/edge.8.old 2008-12-02 20:33:54.000000000 -0500
+++ b/edge.8 2008-12-02 20:34:13.000000000 -0500
@@ -1,4 +1,4 @@
-.TH edge 1 "Jan 3, 2009" "revision 3679" "SUPERUSER COMMANDS"
+.TH edge 8 "Jan 3, 2009" "revision 3679" "SUPERUSER COMMANDS"
.SH NAME
edge \- n2n edge node daemon
.SH SYNOPSIS

View file

@ -1,22 +0,0 @@
Description: Make the build reproducible
Author: Chris Lamb <lamby@debian.org>
Last-Update: 2016-08-08
X-Bug: https://bugs.debian.org/833819
Make the build reproducible:
https://wiki.debian.org/ReproducibleBuilds
--- n2n-1.3.1~svn3789.orig/Makefile
+++ n2n-1.3.1~svn3789/Makefile
@@ -57,7 +57,11 @@ $(N2N_LIB): $(N2N_OBJS)
version.c:
@echo $(N2N_VERSION) | sed -e 's/.*/const char * version = "&";/' > version.c
@uname -p | sed -e 's/.*/const char * osName = "&";/' >> version.c
+ifdef SOURCE_DATE_EPOCH
+ @LC_ALL=C date --utc --date="@$(SOURCE_DATE_EPOCH)" +"%D %r" | sed -e 's/.*/const char * buildDate = "&";/' >> version.c
+else
@date +"%D %r" | sed -e 's/.*/const char * buildDate = "&";/' >> version.c
+endif
clean:
rm -rf $(N2N_OBJS) $(N2N_LIB) $(APPS) $(DOCS) *.dSYM *~ version.c

View file

@ -1,13 +0,0 @@
diff --git a/Makefile b/Makefile
index 485adc3..191845a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs
PLATOPTS_SPARC64=-mcpu=ultrasparc -pipe -fomit-frame-pointer -ffast-math -finline-functions -fweb -frename-registers -mapp-regs
-CFLAGS+=$(DEBUG) $(WARN) $(OPTIONS) $(PLATOPTS)
+CFLAGS+=$(DEBUG) $(WARN) $(LDFLAGS) $(CPPFLAGS) $(OPTIONS) $(PLATOPTS)
INSTALL=install
MKDIR=mkdir -p

View file

@ -1,4 +0,0 @@
01-edge.8.diff
upstream-svn4235.patch
makefile.patch
02-reproducible-build.diff

View file

@ -1,13 +0,0 @@
diff --git a/n2n.c b/n2n.c
index cfcfb74..ac98ad6 100644
--- a/n2n.c
+++ b/n2n.c
@@ -120,7 +120,7 @@ void traceEvent(int eventTraceLevel, char* file, int line, char * format, ...) {
}
snprintf(out_buf, sizeof(out_buf), "%s%s", extra_msg, buf);
- syslog(LOG_INFO, out_buf);
+ syslog(LOG_INFO, "%s", out_buf);
} else {
snprintf(out_buf, sizeof(out_buf), "%s [%11s:%4d] %s%s", theDate, file, line, extra_msg, buf);
printf("%s\n", out_buf);