Commit fresh-snapshots/main - tayga

+4

-4

debian/patches/0001-use-var-spool.patch less more

6	6	tayga.conf.example \| 2 +-
7	7	1 file changed, 1 insertion(+), 1 deletion(-)
8	8
9		diff --git a/tayga.conf.example b/tayga.conf.example
10		index e5603d7..99b23c1 100644
11		--- a/tayga.conf.example
12		+++ b/tayga.conf.example
	9	Index: tayga/tayga.conf.example
	10	===================================================================
	11	--- tayga.orig/tayga.conf.example
	12	+++ tayga/tayga.conf.example
13	13	@@ -84,7 +84,7 @@ dynamic-pool 192.168.255.0/24
14	14	#
15	15	# Optional.

+5

-5

debian/patches/0002-manpage.patch less more

6	6	tayga.8 \| 2 +-
7	7	1 file changed, 1 insertion(+), 1 deletion(-)
8	8
9		diff --git a/tayga.8 b/tayga.8
10		index d13d9ac..efb746f 100644
11		--- a/tayga.8
12		+++ b/tayga.8
13		@@ -53,7 +53,7 @@ not running. This allows host-side network parameters and firewall rules to
	9	Index: tayga/tayga.8
	10	===================================================================
	11	--- tayga.orig/tayga.8
	12	+++ tayga/tayga.8
	13	@@ -53,7 +53,7 @@ not running. This allows host-side netw
14	14	be configured prior to commencement of packet translation. This may simplify
15	15	network configuration on the host; for example, systems which use a
16	16	Debian-style /etc/network/interfaces file may configure TAYGA's TUN device at

+4

-4

debian/patches/0003-configure-no-CFLAGS.patch less more

6	6	configure.ac \| 2 --
7	7	1 file changed, 2 deletions(-)
8	8
9		diff --git a/configure.ac b/configure.ac
10		index 3d2a6c9..5640305 100644
11		--- a/configure.ac
12		+++ b/configure.ac
	9	Index: tayga/configure.ac
	10	===================================================================
	11	--- tayga.orig/configure.ac
	12	+++ tayga/configure.ac
13	13	@@ -5,8 +5,6 @@ AC_CONFIG_HEADERS(config.h)
14	14
15	15	AC_PROG_CC

+4

-4

debian/patches/0004-quote-make-var.patch less more

6	6	configure.ac \| 2 +-
7	7	1 file changed, 1 insertion(+), 1 deletion(-)
8	8
9		diff --git a/configure.ac b/configure.ac
10		index 5640305..fa99305 100644
11		--- a/configure.ac
12		+++ b/configure.ac
	9	Index: tayga/configure.ac
	10	===================================================================
	11	--- tayga.orig/configure.ac
	12	+++ tayga/configure.ac
13	13	@@ -5,7 +5,7 @@ AC_CONFIG_HEADERS(config.h)
14	14
15	15	AC_PROG_CC

+4

-4

debian/patches/0005-guard-chdir.patch less more

6	6	tayga.c \| 12 ++++++++++--
7	7	1 file changed, 10 insertions(+), 2 deletions(-)
8	8
9		diff --git a/tayga.c b/tayga.c
10		index fbd2e64..3886831 100644
11		--- a/tayga.c
12		+++ b/tayga.c
	9	Index: tayga/tayga.c
	10	===================================================================
	11	--- tayga.orig/tayga.c
	12	+++ tayga/tayga.c
13	13	@@ -388,7 +388,11 @@ int main(int argc, char **argv)
14	14	"is specified in %s\n", conffile);
15	15	exit(1);

+4

-4

debian/patches/0006-guard-write.patch less more

14	14	tayga.c \| 5 ++++-
15	15	1 file changed, 4 insertions(+), 1 deletion(-)
16	16
17		diff --git a/tayga.c b/tayga.c
18		index 3886831..5027d0a 100644
19		--- a/tayga.c
20		+++ b/tayga.c
	17	Index: tayga/tayga.c
	18	===================================================================
	19	--- tayga.orig/tayga.c
	20	+++ tayga/tayga.c
21	21	@@ -439,7 +439,10 @@ int main(int argc, char **argv)
22	22
23	23	if (pidfile) {

+15

-11

debian/patches/0007-static-EAM.patch less more

12	12	conffile.c \| 40 +++++++++++++++++++++++++++++++++++++---
13	13	2 files changed, 60 insertions(+), 9 deletions(-)
14	14
15		--- a/addrmap.c
16		+++ b/addrmap.c
17		@@ -22,10 +22,6 @@
	15	Index: tayga/addrmap.c
	16	===================================================================
	17	--- tayga.orig/addrmap.c
	18	+++ tayga/addrmap.c
	19	@@ -22,10 +22,6 @@ extern time_t now;
18	20
19	21	int validate_ip4_addr(const struct in_addr *a)
20	22	{

25	27	/* First octet == 127 */
26	28	if ((a->s_addr & htonl(0xff000000)) == htonl(0x7f000000))
27	29	return -1;
28		@@ -97,7 +93,7 @@
	30	@@ -97,7 +93,7 @@ int is_private_ip4_addr(const struct in_
29	31
30	32	int calc_ip4_mask(struct in_addr mask, const struct in_addr addr, int len)
31	33	{

34	36	if (addr && (addr->s_addr & ~mask->s_addr))
35	37	return -1;
36	38	return 0;
37		@@ -422,6 +418,9 @@
	39	@@ -422,6 +418,9 @@ int map_ip4_to_ip6(struct in6_addr *addr
38	40	case MAP_TYPE_STATIC:
39	41	s = container_of(map4, struct map_static, map4);
40	42	*addr6 = s->map6.addr;

44	46	break;
45	47	case MAP_TYPE_RFC6052:
46	48	s = container_of(map4, struct map_static, map4);
47		@@ -564,7 +563,13 @@
	49	@@ -564,7 +563,13 @@ int map_ip6_to_ip4(struct in_addr *addr4
48	50	switch (map6->type) {
49	51	case MAP_TYPE_STATIC:
50	52	s = container_of(map6, struct map_static, map6);

59	61	break;
60	62	case MAP_TYPE_RFC6052:
61	63	if (extract_from_prefix(addr4, addr6, map6->prefix_len) < 0)
62		@@ -629,3 +634,10 @@
	64	@@ -629,3 +634,10 @@ void addrmap_maint(void)
63	65	}
64	66	}
65	67	}

70	72	+indent-tabs-mode: t
71	73	+End:
72	74	+*/
73		--- a/conffile.c
74		+++ b/conffile.c
75		@@ -217,16 +217,43 @@
	75	Index: tayga/conffile.c
	76	===================================================================
	77	--- tayga.orig/conffile.c
	78	+++ tayga/conffile.c
	79	@@ -217,16 +217,43 @@ static void config_map(int ln, int arg_c
76	80
77	81	m = alloc_map_static(ln);
78	82

119	123	if (validate_ip4_addr(&m->map4.addr) < 0) {
120	124	slog(LOG_CRIT, "Cannot use reserved address %s in map "
121	125	"directive, aborting...\n", args[0]);
122		@@ -490,3 +517,10 @@
	126	@@ -490,3 +517,10 @@ malloc_fail:
123	127	slog(LOG_CRIT, "Unable to allocate config memory\n");
124	128	exit(1);
125	129	}

+9

-9

debian/patches/0008-manpage-RFC.patch less more

7	7	tayga.conf.5 \| 19 ++++++++++++++-----
8	8	2 files changed, 19 insertions(+), 10 deletions(-)
9	9
10		diff --git a/tayga.8 b/tayga.8
11		index efb746f..e69cfc3 100644
12		--- a/tayga.8
13		+++ b/tayga.8
	10	Index: tayga/tayga.8
	11	===================================================================
	12	--- tayga.orig/tayga.8
	13	+++ tayga/tayga.8
14	14	@@ -1,4 +1,4 @@
15	15	-.TH TAYGA "8" "June 2011" "TAYGA 0.9.2" ""
16	16	+.TH TAYGA "8" "Dec 2018" "TAYGA 0.9.2" ""
17	17
18	18	.SH NAME
19	19	tayga \- stateless NAT64 daemon
20		@@ -19,10 +19,10 @@ driver, TAYGA receives IPv4 and IPv6 packets from the host's network stack,
	20	@@ -19,10 +19,10 @@ driver, TAYGA receives IPv4 and IPv6 pac
21	21	translates them to the other protocol, and then sends the translated packets
22	22	back to the host using the same TUN interface.
23	23	.P

32	32	.P
33	33	As a stateless NAT, TAYGA requires a one-to-one mapping between IPv4 addresses
34	34	and IPv6 addresses. Mapping multiple IPv6 addresses onto a single IPv4
35		diff --git a/tayga.conf.5 b/tayga.conf.5
36		index 3e084aa..7522c9d 100644
37		--- a/tayga.conf.5
38		+++ b/tayga.conf.5
	35	Index: tayga/tayga.conf.5
	36	===================================================================
	37	--- tayga.orig/tayga.conf.5
	38	+++ tayga/tayga.conf.5
39	39	@@ -1,4 +1,4 @@
40	40	-.TH TAYGA.CONF "5" "June 2011" "TAYGA 0.9.2" ""
41	41	+.TH TAYGA.CONF "5" "Dec 2018" "TAYGA 0.9.2" ""

+11

-12

debian/patches/0009-systemd-service-file-for-tayga.patch less more

10	10	3 files changed, 55 insertions(+)
11	11	create mode 100644 tayga.service
12	12
13		diff --git a/Makefile.am b/Makefile.am
14		index 55fce24..b90354b 100644
15		--- a/Makefile.am
16		+++ b/Makefile.am
	13	Index: tayga/Makefile.am
	14	===================================================================
	15	--- tayga.orig/Makefile.am
	16	+++ tayga/Makefile.am
17	17	@@ -7,3 +7,10 @@ dist_sysconf_DATA = tayga.conf.example
18	18	dist_man_MANS = tayga.8 tayga.conf.5
19	19

25	25	+if HAVE_SYSTEMD
26	26	+systemdsystemunit_DATA = tayga.service
27	27	+endif
28		diff --git a/configure.ac b/configure.ac
29		index fa99305..ca65097 100644
30		--- a/configure.ac
31		+++ b/configure.ac
	28	Index: tayga/configure.ac
	29	===================================================================
	30	--- tayga.orig/configure.ac
	31	+++ tayga/configure.ac
32	32	@@ -3,6 +3,23 @@ AC_CONFIG_SRCDIR(nat64.c)
33	33	AM_INIT_AUTOMAKE([foreign dist-bzip2])
34	34	AC_CONFIG_HEADERS(config.h)

53	53	AC_PROG_CC
54	54
55	55	tayga_conf_path='${sysconfdir}/tayga.conf'
56		diff --git a/tayga.service b/tayga.service
57		new file mode 100644
58		index 0000000..939b5c4
	56	Index: tayga/tayga.service
	57	===================================================================
59	58	--- /dev/null
60		+++ b/tayga.service
	59	+++ tayga/tayga.service
61	60	@@ -0,0 +1,31 @@
62	61	+[Unit]
63	62	+Description=Simple, no-fuss NAT64

+4

-4

debian/patches/0010-include-for-writev.patch less more

9	9	tayga.h \| 1 +
10	10	1 file changed, 1 insertion(+)
11	11
12		diff --git a/tayga.h b/tayga.h
13		index 2284d2a..c8aadb8 100644
14		--- a/tayga.h
15		+++ b/tayga.h
	12	Index: tayga/tayga.h
	13	===================================================================
	14	--- tayga.orig/tayga.h
	15	+++ tayga/tayga.h
16	16	@@ -20,6 +20,7 @@
17	17	#include <sys/stat.h>
18	18	#include <sys/ioctl.h>

+6

-6

debian/patches/0011-null-char.patch less more

11	11	conffile.c \| 4 ++--
12	12	1 file changed, 2 insertions(+), 2 deletions(-)
13	13
14		diff --git a/conffile.c b/conffile.c
15		index dd4193c..0406cfd 100644
16		--- a/conffile.c
17		+++ b/conffile.c
18		@@ -222,7 +222,7 @@ static void config_map(int ln, int arg_count, char **args)
	14	Index: tayga/conffile.c
	15	===================================================================
	16	--- tayga.orig/conffile.c
	17	+++ tayga/conffile.c
	18	@@ -222,7 +222,7 @@ static void config_map(int ln, int arg_c
19	19	unsigned int prefix4 = 32;
20	20	if (slash) {
21	21	prefix4 = atoi(slash+1);

24	24	}
25	25
26	26	if (!inet_pton(AF_INET, args[0], &m->map4.addr)) {
27		@@ -237,7 +237,7 @@ static void config_map(int ln, int arg_count, char **args)
	27	@@ -237,7 +237,7 @@ static void config_map(int ln, int arg_c
28	28	slash = strchr(args[1], '/');
29	29	if (slash) {
30	30	prefix6 = atoi(slash+1);