From c0f984cb7feb7fafdc0cd54defc1197e79c1f5e6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:11:12 +0000 Subject: [PATCH 01/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index 102d8c3..7b5a4b9 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -68,6 +68,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Dec 23 2014 Gabriel Somlo 3.0.3-11 - enhanced service file (remove "KillMode", use default "cgroup" mode) From eebb079d6d5f99f76388de89f9b711cd1637efc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 22 Jun 2015 13:53:17 +0200 Subject: [PATCH 02/25] Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility issues. Fix FTBFS). --- vtun.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/vtun.spec b/vtun.spec index 7b5a4b9..f3c6489 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -35,7 +35,10 @@ require modification to any kernel parts. %build %{__autoconf} -%configure +# FIXME: Package suffers from c11/inline issues. +# Workaround by appending --std=gnu89 to CFLAGS +# Proper fix would be to fix the source-code +%configure CFLAGS="${RPM_OPT_FLAGS} --std=gnu89" make %{?_smp_mflags} %install @@ -68,6 +71,10 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Mon Jun 22 2015 Ralf Corsépius - 3.0.3-13 +- Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility + issues. Fix FTBFS). + * Fri Jun 19 2015 Fedora Release Engineering - 3.0.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e19ff0f94cb25c8ab27a90ffe1e7d545d132e75a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:52:11 +0000 Subject: [PATCH 03/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index f3c6489..4af910a 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -71,6 +71,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jun 22 2015 Ralf Corsépius - 3.0.3-13 - Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility issues. Fix FTBFS). From 721d8ef88a3ca7e453c7ac32c709cfa02e884072 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 21 Mar 2016 17:42:46 -0400 Subject: [PATCH 04/25] patch to fix RHBZ 1319858, 1319859 --- vtun-client-sighup.patch | 33 +++++++++++++++++++++++++++++++++ vtun.spec | 22 ++++++++++++++++++++-- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 vtun-client-sighup.patch diff --git a/vtun-client-sighup.patch b/vtun-client-sighup.patch new file mode 100644 index 0000000..c67bc91 --- /dev/null +++ b/vtun-client-sighup.patch @@ -0,0 +1,33 @@ +When sending a SIGHUP to a vtun client process which is unable to connect +to the remote server, it will attempt to reconnect without sleeping between +consecutive attempts. This results in a CPU usage spike, and a flood of +data sent to syslog. +This patch causes the first sleep after SIGHUP to be discarded, then allows +sleep to be used again in subsequent iterations. +diff -NarU5 a/client.c b/client.c +--- a/client.c 2012-07-08 01:32:57.000000000 -0400 ++++ b/client.c 2016-03-21 17:17:34.111775616 -0400 +@@ -131,10 +131,11 @@ + + if( connect_t(s,(struct sockaddr *) &svr_addr, host->timeout) ){ + if (!vtun.quiet || errno != ETIMEDOUT) + vtun_syslog(LOG_INFO,"Connect to %s failed. %s(%d)", vtun.svr_name, + strerror(errno), errno); ++ client_term = 0; + } else { + if( auth_client(s, host) ){ + vtun_syslog(LOG_INFO,"Session %s[%s] opened",host->host,vtun.svr_name); + + host->rmt_fd = s; +@@ -143,10 +144,11 @@ + client_term = tunnel(host); + + vtun_syslog(LOG_INFO,"Session %s[%s] closed",host->host,vtun.svr_name); + } else { + vtun_syslog(LOG_INFO,"Connection denied by %s",vtun.svr_name); ++ client_term = 0; + } + } + close(s); + free_sopt(&host->sopt); + } diff --git a/vtun.spec b/vtun.spec index 102d8c3..cbda083 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 11%{?dist} +Release: 15%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -10,6 +10,7 @@ Source1: vtun.socket Source2: vtun.service Source3: vtun.sysconfig Patch0: vtun-nostrip.patch +Patch1: vtun-client-sighup.patch Requires(post): systemd-units Requires(preun): systemd-units @@ -32,10 +33,14 @@ require modification to any kernel parts. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__autoconf} -%configure +# FIXME: Package suffers from c11/inline issues. +# Workaround by appending --std=gnu89 to CFLAGS +# Proper fix would be to fix the source-code +%configure CFLAGS="${RPM_OPT_FLAGS} --std=gnu89" make %{?_smp_mflags} %install @@ -68,6 +73,19 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Mon Mar 21 2016 Gabriel Somlo 3.0.3-15 +- patch to fix #1319858,#1319859,#1319861 + +* Fri Feb 05 2016 Fedora Release Engineering - 3.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jun 22 2015 Ralf Corsépius - 3.0.3-13 +- Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility + issues. Fix FTBFS). + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Dec 23 2014 Gabriel Somlo 3.0.3-11 - enhanced service file (remove "KillMode", use default "cgroup" mode) From 95e451ea73dc2ae865178b7dda470f6d4cce7678 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 21 Mar 2016 17:45:07 -0400 Subject: [PATCH 05/25] patch to fix RHBZ 1319858, 1319859 --- vtun-client-sighup.patch | 33 +++++++++++++++++++++++++++++++++ vtun.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 vtun-client-sighup.patch diff --git a/vtun-client-sighup.patch b/vtun-client-sighup.patch new file mode 100644 index 0000000..c67bc91 --- /dev/null +++ b/vtun-client-sighup.patch @@ -0,0 +1,33 @@ +When sending a SIGHUP to a vtun client process which is unable to connect +to the remote server, it will attempt to reconnect without sleeping between +consecutive attempts. This results in a CPU usage spike, and a flood of +data sent to syslog. +This patch causes the first sleep after SIGHUP to be discarded, then allows +sleep to be used again in subsequent iterations. +diff -NarU5 a/client.c b/client.c +--- a/client.c 2012-07-08 01:32:57.000000000 -0400 ++++ b/client.c 2016-03-21 17:17:34.111775616 -0400 +@@ -131,10 +131,11 @@ + + if( connect_t(s,(struct sockaddr *) &svr_addr, host->timeout) ){ + if (!vtun.quiet || errno != ETIMEDOUT) + vtun_syslog(LOG_INFO,"Connect to %s failed. %s(%d)", vtun.svr_name, + strerror(errno), errno); ++ client_term = 0; + } else { + if( auth_client(s, host) ){ + vtun_syslog(LOG_INFO,"Session %s[%s] opened",host->host,vtun.svr_name); + + host->rmt_fd = s; +@@ -143,10 +144,11 @@ + client_term = tunnel(host); + + vtun_syslog(LOG_INFO,"Session %s[%s] closed",host->host,vtun.svr_name); + } else { + vtun_syslog(LOG_INFO,"Connection denied by %s",vtun.svr_name); ++ client_term = 0; + } + } + close(s); + free_sopt(&host->sopt); + } diff --git a/vtun.spec b/vtun.spec index 4af910a..cbda083 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -10,6 +10,7 @@ Source1: vtun.socket Source2: vtun.service Source3: vtun.sysconfig Patch0: vtun-nostrip.patch +Patch1: vtun-client-sighup.patch Requires(post): systemd-units Requires(preun): systemd-units @@ -32,6 +33,7 @@ require modification to any kernel parts. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__autoconf} @@ -71,6 +73,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Mon Mar 21 2016 Gabriel Somlo 3.0.3-15 +- patch to fix #1319858,#1319859,#1319861 + * Fri Feb 05 2016 Fedora Release Engineering - 3.0.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 98ee663d07898489c556981606972c5dc6a7b30b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:13:18 +0000 Subject: [PATCH 06/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index cbda083..bb1ac44 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -73,6 +73,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.0.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Mar 21 2016 Gabriel Somlo 3.0.3-15 - patch to fix #1319858,#1319859,#1319861 From 83ee6d9c2f1483da2e72cf52c7494fe95989a1ed Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 20 Mar 2017 09:04:14 -0400 Subject: [PATCH 07/25] update to 3.0.4; fix openssl-1.1 build (BZ1424526) --- vtun-client-sighup.patch | 33 ----- vtun-nostrip.patch | 10 +- vtun-openssl.patch | 287 +++++++++++++++++++++++++++++++++++++++ vtun.spec | 10 +- 4 files changed, 300 insertions(+), 40 deletions(-) delete mode 100644 vtun-client-sighup.patch create mode 100644 vtun-openssl.patch diff --git a/vtun-client-sighup.patch b/vtun-client-sighup.patch deleted file mode 100644 index c67bc91..0000000 --- a/vtun-client-sighup.patch +++ /dev/null @@ -1,33 +0,0 @@ -When sending a SIGHUP to a vtun client process which is unable to connect -to the remote server, it will attempt to reconnect without sleeping between -consecutive attempts. This results in a CPU usage spike, and a flood of -data sent to syslog. -This patch causes the first sleep after SIGHUP to be discarded, then allows -sleep to be used again in subsequent iterations. -diff -NarU5 a/client.c b/client.c ---- a/client.c 2012-07-08 01:32:57.000000000 -0400 -+++ b/client.c 2016-03-21 17:17:34.111775616 -0400 -@@ -131,10 +131,11 @@ - - if( connect_t(s,(struct sockaddr *) &svr_addr, host->timeout) ){ - if (!vtun.quiet || errno != ETIMEDOUT) - vtun_syslog(LOG_INFO,"Connect to %s failed. %s(%d)", vtun.svr_name, - strerror(errno), errno); -+ client_term = 0; - } else { - if( auth_client(s, host) ){ - vtun_syslog(LOG_INFO,"Session %s[%s] opened",host->host,vtun.svr_name); - - host->rmt_fd = s; -@@ -143,10 +144,11 @@ - client_term = tunnel(host); - - vtun_syslog(LOG_INFO,"Session %s[%s] closed",host->host,vtun.svr_name); - } else { - vtun_syslog(LOG_INFO,"Connection denied by %s",vtun.svr_name); -+ client_term = 0; - } - } - close(s); - free_sopt(&host->sopt); - } diff --git a/vtun-nostrip.patch b/vtun-nostrip.patch index fb4aa65..cd07a1a 100644 --- a/vtun-nostrip.patch +++ b/vtun-nostrip.patch @@ -1,7 +1,9 @@ -diff -up vtun-3.0.3/Makefile.in~ vtun-3.0.3/Makefile.in ---- vtun-3.0.3/Makefile.in~ 2012-07-09 07:55:38.000000000 +0300 -+++ vtun-3.0.3/Makefile.in 2012-09-16 16:12:41.176283091 +0300 -@@ -99,6 +99,5 @@ install: vtund install_config install_ma +diff -NarU5 a/Makefile.in b/Makefile.in +--- a/Makefile.in 2016-10-01 17:46:00.000000000 -0400 ++++ b/Makefile.in 2017-03-17 16:49:16.195772745 -0400 +@@ -97,8 +97,7 @@ + $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run + $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) diff --git a/vtun-openssl.patch b/vtun-openssl.patch new file mode 100644 index 0000000..c375789 --- /dev/null +++ b/vtun-openssl.patch @@ -0,0 +1,287 @@ +diff -NarU5 a/lfd_encrypt.c b/lfd_encrypt.c +--- a/lfd_encrypt.c 2016-10-01 17:27:51.000000000 -0400 ++++ b/lfd_encrypt.c 2017-03-20 08:43:48.013308435 -0400 +@@ -93,15 +93,15 @@ + static int dec_init_first_time; + static unsigned long sequence_num; + static char * pkey; + static char * iv_buf; + +-static EVP_CIPHER_CTX ctx_enc; /* encrypt */ +-static EVP_CIPHER_CTX ctx_dec; /* decrypt */ ++static EVP_CIPHER_CTX *ctx_enc; /* encrypt */ ++static EVP_CIPHER_CTX *ctx_dec; /* decrypt */ + +-static EVP_CIPHER_CTX ctx_enc_ecb; /* sideband ecb encrypt */ +-static EVP_CIPHER_CTX ctx_dec_ecb; /* sideband ecb decrypt */ ++static EVP_CIPHER_CTX *ctx_enc_ecb; /* sideband ecb encrypt */ ++static EVP_CIPHER_CTX *ctx_dec_ecb; /* sideband ecb decrypt */ + + static int send_msg(int len, char *in, char **out); + static int recv_msg(int len, char *in, char **out); + static int send_ib_mesg(int *len, char **in); + static int recv_ib_mesg(int *len, char **in); +@@ -180,37 +180,37 @@ + case VTUN_ENC_AES256CBC: + blocksize = 16; + keysize = 32; + sb_init = 1; + cipher_type = EVP_aes_256_ecb(); +- pctx_enc = &ctx_enc_ecb; +- pctx_dec = &ctx_dec_ecb; ++ pctx_enc = ctx_enc_ecb; ++ pctx_dec = ctx_dec_ecb; + break; + + case VTUN_ENC_AES256ECB: + blocksize = 16; + keysize = 32; +- pctx_enc = &ctx_enc; +- pctx_dec = &ctx_dec; ++ pctx_enc = ctx_enc; ++ pctx_dec = ctx_dec; + cipher_type = EVP_aes_256_ecb(); + strcpy(cipher_name,"AES-256-ECB"); + break; + case VTUN_ENC_AES128OFB: + case VTUN_ENC_AES128CFB: + case VTUN_ENC_AES128CBC: + blocksize = 16; + keysize = 16; + sb_init=1; + cipher_type = EVP_aes_128_ecb(); +- pctx_enc = &ctx_enc_ecb; +- pctx_dec = &ctx_dec_ecb; ++ pctx_enc = ctx_enc_ecb; ++ pctx_dec = ctx_dec_ecb; + break; + case VTUN_ENC_AES128ECB: + blocksize = 16; + keysize = 16; +- pctx_enc = &ctx_enc; +- pctx_dec = &ctx_dec; ++ pctx_enc = ctx_enc; ++ pctx_dec = ctx_dec; + cipher_type = EVP_aes_128_ecb(); + strcpy(cipher_name,"AES-128-ECB"); + break; + + case VTUN_ENC_BF256OFB: +@@ -219,20 +219,20 @@ + blocksize = 8; + keysize = 32; + var_key = 1; + sb_init = 1; + cipher_type = EVP_bf_ecb(); +- pctx_enc = &ctx_enc_ecb; +- pctx_dec = &ctx_dec_ecb; ++ pctx_enc = ctx_enc_ecb; ++ pctx_dec = ctx_dec_ecb; + break; + + case VTUN_ENC_BF256ECB: + blocksize = 8; + keysize = 32; + var_key = 1; +- pctx_enc = &ctx_enc; +- pctx_dec = &ctx_dec; ++ pctx_enc = ctx_enc; ++ pctx_dec = ctx_dec; + cipher_type = EVP_bf_ecb(); + strcpy(cipher_name,"Blowfish-256-ECB"); + break; + + case VTUN_ENC_BF128OFB: +@@ -241,26 +241,28 @@ + blocksize = 8; + keysize = 16; + var_key = 1; + sb_init = 1; + cipher_type = EVP_bf_ecb(); +- pctx_enc = &ctx_enc_ecb; +- pctx_dec = &ctx_dec_ecb; ++ pctx_enc = ctx_enc_ecb; ++ pctx_dec = ctx_dec_ecb; + break; + case VTUN_ENC_BF128ECB: /* blowfish 128 ecb is the default */ + default: + blocksize = 8; + keysize = 16; + var_key = 1; +- pctx_enc = &ctx_enc; +- pctx_dec = &ctx_dec; ++ pctx_enc = ctx_enc; ++ pctx_dec = ctx_dec; + cipher_type = EVP_bf_ecb(); + strcpy(cipher_name,"Blowfish-128-ECB"); + break; + } /* switch(host->cipher) */ + + if (prep_key(&pkey, keysize, host) != 0) return -1; ++ pctx_enc = EVP_CIPHER_CTX_new(); ++ pctx_dec = EVP_CIPHER_CTX_new(); + EVP_CIPHER_CTX_init(pctx_enc); + EVP_CIPHER_CTX_init(pctx_dec); + EVP_EncryptInit_ex(pctx_enc, cipher_type, NULL, NULL, NULL); + EVP_DecryptInit_ex(pctx_dec, cipher_type, NULL, NULL, NULL); + if (var_key) +@@ -292,14 +294,14 @@ + free_key(pkey); pkey = NULL; + + lfd_free(enc_buf); enc_buf = NULL; + lfd_free(dec_buf); dec_buf = NULL; + +- EVP_CIPHER_CTX_cleanup(&ctx_enc); +- EVP_CIPHER_CTX_cleanup(&ctx_dec); +- EVP_CIPHER_CTX_cleanup(&ctx_enc_ecb); +- EVP_CIPHER_CTX_cleanup(&ctx_dec_ecb); ++ EVP_CIPHER_CTX_free(ctx_enc); ++ EVP_CIPHER_CTX_free(ctx_dec); ++ EVP_CIPHER_CTX_free(ctx_enc_ecb); ++ EVP_CIPHER_CTX_free(ctx_dec_ecb); + + return 0; + } + + static int encrypt_buf(int len, char *in, char **out) +@@ -321,11 +323,11 @@ + + memset(in_ptr+len, pad, pad); + outlen=len+pad; + if (pad == blocksize) + RAND_bytes(in_ptr+len, blocksize-1); +- EVP_EncryptUpdate(&ctx_enc, out_ptr, &outlen, in_ptr, len+pad); ++ EVP_EncryptUpdate(ctx_enc, out_ptr, &outlen, in_ptr, len+pad); + *out = enc_buf; + + sequence_num++; + + return outlen+msg_len; +@@ -341,11 +343,11 @@ + in = *out; + in_ptr = in; + + outlen=len; + if (!len) return 0; +- EVP_DecryptUpdate(&ctx_dec, out_ptr, &outlen, in_ptr, len); ++ EVP_DecryptUpdate(ctx_dec, out_ptr, &outlen, in_ptr, len); + recv_ib_mesg(&outlen, &out_ptr); + if (!outlen) return 0; + tmp_ptr = out_ptr + outlen; tmp_ptr--; + pad = *tmp_ptr; + if (pad < 1 || pad > blocksize) { +@@ -429,17 +431,18 @@ + /* if we're here, something weird's going on */ + return -1; + break; + } /* switch(cipher) */ + +- EVP_CIPHER_CTX_init(&ctx_enc); +- EVP_EncryptInit_ex(&ctx_enc, cipher_type, NULL, NULL, NULL); ++ ctx_enc = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx_enc); ++ EVP_EncryptInit_ex(ctx_enc, cipher_type, NULL, NULL, NULL); + if (var_key) +- EVP_CIPHER_CTX_set_key_length(&ctx_enc, keysize); +- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, pkey, NULL); +- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, NULL, iv); +- EVP_CIPHER_CTX_set_padding(&ctx_enc, 0); ++ EVP_CIPHER_CTX_set_key_length(ctx_enc, keysize); ++ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, pkey, NULL); ++ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, NULL, iv); ++ EVP_CIPHER_CTX_set_padding(ctx_enc, 0); + if (enc_init_first_time) + { + sprintf(tmpstr,"%s encryption initialized", cipher_name); + vtun_syslog(LOG_INFO, tmpstr); + enc_init_first_time = 0; +@@ -519,17 +522,18 @@ + /* if we're here, something weird's going on */ + return -1; + break; + } /* switch(cipher) */ + +- EVP_CIPHER_CTX_init(&ctx_dec); +- EVP_DecryptInit_ex(&ctx_dec, cipher_type, NULL, NULL, NULL); ++ ctx_dec = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx_dec); ++ EVP_DecryptInit_ex(ctx_dec, cipher_type, NULL, NULL, NULL); + if (var_key) +- EVP_CIPHER_CTX_set_key_length(&ctx_dec, keysize); +- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, pkey, NULL); +- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, NULL, iv); +- EVP_CIPHER_CTX_set_padding(&ctx_dec, 0); ++ EVP_CIPHER_CTX_set_key_length(ctx_dec, keysize); ++ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, pkey, NULL); ++ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, NULL, iv); ++ EVP_CIPHER_CTX_set_padding(ctx_dec, 0); + if (dec_init_first_time) + { + sprintf(tmpstr,"%s decryption initialized", cipher_name); + vtun_syslog(LOG_INFO, tmpstr); + dec_init_first_time = 0; +@@ -557,11 +561,11 @@ + memset(iv,0,blocksize); free(iv); iv = NULL; + RAND_bytes(in_ptr, in - in_ptr); + + in_ptr = in - blocksize*2; + outlen = blocksize*2; +- EVP_EncryptUpdate(&ctx_enc_ecb, in_ptr, ++ EVP_EncryptUpdate(ctx_enc_ecb, in_ptr, + &outlen, in_ptr, blocksize*2); + *out = in_ptr; + len = outlen; + cipher_enc_state = CIPHER_SEQUENCE; + break; +@@ -584,11 +588,11 @@ + { + case CIPHER_INIT: + in_ptr = in; + iv = malloc(blocksize); + outlen = blocksize*2; +- EVP_DecryptUpdate(&ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2); ++ EVP_DecryptUpdate(ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2); + + if ( !strncmp(in_ptr, "ivec", 4) ) + { + memcpy(iv, in_ptr+4, blocksize); + cipher_dec_init(iv); +@@ -627,11 +631,11 @@ + "Max. gibberish threshold reached"); + #endif + if (cipher_enc_state != CIPHER_INIT) + { + cipher_enc_state = CIPHER_INIT; +- EVP_CIPHER_CTX_cleanup(&ctx_enc); ++ EVP_CIPHER_CTX_free(ctx_enc); + #ifdef LFD_ENCRYPT_DEBUG + vtun_syslog(LOG_INFO, + "Forcing local encryptor re-init"); + #endif + } +@@ -708,11 +712,11 @@ + *len -= blocksize; + + if (cipher_enc_state != CIPHER_INIT) + { + cipher_enc_state = CIPHER_INIT; +- EVP_CIPHER_CTX_cleanup(&ctx_enc); ++ EVP_CIPHER_CTX_free(ctx_enc); + } + #ifdef LFD_ENCRYPT_DEBUG + vtun_syslog(LOG_INFO, "Remote requests encryptor re-init"); + #endif + } +@@ -722,11 +726,11 @@ + + if (cipher_dec_state != CIPHER_INIT && + cipher_enc_state != CIPHER_REQ_INIT && + cipher_enc_state != CIPHER_INIT) + { +- EVP_CIPHER_CTX_cleanup (&ctx_dec); ++ EVP_CIPHER_CTX_free (ctx_dec); + cipher_dec_state = CIPHER_INIT; + cipher_enc_state = CIPHER_REQ_INIT; + } + #ifdef LFD_ENCRYPT_DEBUG + vtun_syslog(LOG_INFO, "Local decryptor out of sync"); diff --git a/vtun.spec b/vtun.spec index bb1ac44..bbd3c7d 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun -Version: 3.0.3 -Release: 16%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -10,7 +10,7 @@ Source1: vtun.socket Source2: vtun.service Source3: vtun.sysconfig Patch0: vtun-nostrip.patch -Patch1: vtun-client-sighup.patch +Patch1: vtun-openssl.patch Requires(post): systemd-units Requires(preun): systemd-units @@ -73,6 +73,10 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Fri Mar 17 2017 Gabriel Somlo 3.0.3-1 +- update to 3.0.4 +- patch for openssl-1.1 transition + * Sat Feb 11 2017 Fedora Release Engineering - 3.0.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2e411b90b742ddf4df773c089264bb006b75a155 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Wed, 22 Mar 2017 09:10:15 -0400 Subject: [PATCH 08/25] push new vtun sources to lookaside cache --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f9c375d..2711247 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vtun-3.0.1.tar.gz /vtun-3.0.1.tar.gz /vtun-3.0.3.tar.gz +/vtun-3.0.4.tar.gz diff --git a/sources b/sources index d62f2f2..1487886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f3becf2a0270910a841060c08d1db824 vtun-3.0.3.tar.gz +SHA512 (vtun-3.0.4.tar.gz) = b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781 From 7ab437d6519c26d572e8660f0b71d422e27bfd40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:27:31 +0000 Subject: [PATCH 09/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index bbd3c7d..a32baa9 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -73,6 +73,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Mar 17 2017 Gabriel Somlo 3.0.3-1 - update to 3.0.4 - patch for openssl-1.1 transition From 266a063f3a914b83fb4e4a84f50c43d746896696 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 31 Jul 2017 14:44:47 -0400 Subject: [PATCH 10/25] add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs --- vtun.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vtun.spec b/vtun.spec index a32baa9..f98c756 100644 --- a/vtun.spec +++ b/vtun.spec @@ -48,6 +48,11 @@ install -D -m 0644 -p %{SOURCE1} %{buildroot}/%{_unitdir}/vtun.socket install -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service install -D -m 0644 -p %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/vtun make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" +# tmpfiles.d configuration for /var/lock/vtund: +mkdir -p %{buildroot}/%{_tmpfilesdir} +cat > %{buildroot}/%{_tmpfilesdir}/%{name}.conf << EOT +d %{_localstatedir}/lock/vtund 0755 root root - +EOT %post %systemd_post vtun.service vtun.socket @@ -66,15 +71,16 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_unitdir}/vtun.socket %{_unitdir}/vtun.service %{_sbindir}/vtund +%{_tmpfilesdir}/%{name}.conf %dir %{_localstatedir}/log/vtund -%ghost %dir %{_localstatedir}/lock/vtund +%dir %{_localstatedir}/lock/vtund %{_mandir}/man5/vtund.conf.5* %{_mandir}/man8/vtun.8* %{_mandir}/man8/vtund.8* %changelog -* Thu Jul 27 2017 Fedora Release Engineering - 3.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Mon Jul 31 2017 Gabriel Somlo 3.0.3-2 +- add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs * Fri Mar 17 2017 Gabriel Somlo 3.0.3-1 - update to 3.0.4 From f4f3570aab41c6a94248b545f08b68815a11213d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:09:58 +0000 Subject: [PATCH 11/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index f98c756..b46e596 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -79,6 +79,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Mon Jul 31 2017 Gabriel Somlo 3.0.3-2 - add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs From 8014407ad0671f92a8da72ff9fddb25b8de173d4 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Sat, 2 Sep 2017 18:36:24 -0400 Subject: [PATCH 12/25] apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) --- vtun.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vtun.spec b/vtun.spec index b46e596..8f135f1 100644 --- a/vtun.spec +++ b/vtun.spec @@ -33,7 +33,9 @@ require modification to any kernel parts. %prep %setup -q %patch0 -p1 +%if 0%{?fedora} >= 26 %patch1 -p1 +%endif %build %{__autoconf} @@ -79,8 +81,8 @@ EOT %{_mandir}/man8/vtund.8* %changelog -* Thu Aug 03 2017 Fedora Release Engineering - 3.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +* Sat Sep 02 2017 Gabriel Somlo 3.0.3-3 +- apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) * Mon Jul 31 2017 Gabriel Somlo 3.0.3-2 - add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs From 4fcfb7b37543d862385c49312a29137164be46f1 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Sat, 2 Sep 2017 18:40:57 -0400 Subject: [PATCH 13/25] apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) --- vtun.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtun.spec b/vtun.spec index 8f135f1..dd77184 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -81,9 +81,12 @@ EOT %{_mandir}/man8/vtund.8* %changelog -* Sat Sep 02 2017 Gabriel Somlo 3.0.3-3 +* Sat Sep 02 2017 Gabriel Somlo 3.0.3-4 - apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) +* Thu Aug 03 2017 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Mon Jul 31 2017 Gabriel Somlo 3.0.3-2 - add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs From f288dfa08f289e6f546dc783a05bcf36f6d1c9b2 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Wed, 11 Oct 2017 13:56:32 -0400 Subject: [PATCH 14/25] requiring compat-openssl1.0 on >= f26 --- vtun-openssl.patch | 287 --------------------------------------------- vtun.spec | 16 ++- 2 files changed, 10 insertions(+), 293 deletions(-) delete mode 100644 vtun-openssl.patch diff --git a/vtun-openssl.patch b/vtun-openssl.patch deleted file mode 100644 index c375789..0000000 --- a/vtun-openssl.patch +++ /dev/null @@ -1,287 +0,0 @@ -diff -NarU5 a/lfd_encrypt.c b/lfd_encrypt.c ---- a/lfd_encrypt.c 2016-10-01 17:27:51.000000000 -0400 -+++ b/lfd_encrypt.c 2017-03-20 08:43:48.013308435 -0400 -@@ -93,15 +93,15 @@ - static int dec_init_first_time; - static unsigned long sequence_num; - static char * pkey; - static char * iv_buf; - --static EVP_CIPHER_CTX ctx_enc; /* encrypt */ --static EVP_CIPHER_CTX ctx_dec; /* decrypt */ -+static EVP_CIPHER_CTX *ctx_enc; /* encrypt */ -+static EVP_CIPHER_CTX *ctx_dec; /* decrypt */ - --static EVP_CIPHER_CTX ctx_enc_ecb; /* sideband ecb encrypt */ --static EVP_CIPHER_CTX ctx_dec_ecb; /* sideband ecb decrypt */ -+static EVP_CIPHER_CTX *ctx_enc_ecb; /* sideband ecb encrypt */ -+static EVP_CIPHER_CTX *ctx_dec_ecb; /* sideband ecb decrypt */ - - static int send_msg(int len, char *in, char **out); - static int recv_msg(int len, char *in, char **out); - static int send_ib_mesg(int *len, char **in); - static int recv_ib_mesg(int *len, char **in); -@@ -180,37 +180,37 @@ - case VTUN_ENC_AES256CBC: - blocksize = 16; - keysize = 32; - sb_init = 1; - cipher_type = EVP_aes_256_ecb(); -- pctx_enc = &ctx_enc_ecb; -- pctx_dec = &ctx_dec_ecb; -+ pctx_enc = ctx_enc_ecb; -+ pctx_dec = ctx_dec_ecb; - break; - - case VTUN_ENC_AES256ECB: - blocksize = 16; - keysize = 32; -- pctx_enc = &ctx_enc; -- pctx_dec = &ctx_dec; -+ pctx_enc = ctx_enc; -+ pctx_dec = ctx_dec; - cipher_type = EVP_aes_256_ecb(); - strcpy(cipher_name,"AES-256-ECB"); - break; - case VTUN_ENC_AES128OFB: - case VTUN_ENC_AES128CFB: - case VTUN_ENC_AES128CBC: - blocksize = 16; - keysize = 16; - sb_init=1; - cipher_type = EVP_aes_128_ecb(); -- pctx_enc = &ctx_enc_ecb; -- pctx_dec = &ctx_dec_ecb; -+ pctx_enc = ctx_enc_ecb; -+ pctx_dec = ctx_dec_ecb; - break; - case VTUN_ENC_AES128ECB: - blocksize = 16; - keysize = 16; -- pctx_enc = &ctx_enc; -- pctx_dec = &ctx_dec; -+ pctx_enc = ctx_enc; -+ pctx_dec = ctx_dec; - cipher_type = EVP_aes_128_ecb(); - strcpy(cipher_name,"AES-128-ECB"); - break; - - case VTUN_ENC_BF256OFB: -@@ -219,20 +219,20 @@ - blocksize = 8; - keysize = 32; - var_key = 1; - sb_init = 1; - cipher_type = EVP_bf_ecb(); -- pctx_enc = &ctx_enc_ecb; -- pctx_dec = &ctx_dec_ecb; -+ pctx_enc = ctx_enc_ecb; -+ pctx_dec = ctx_dec_ecb; - break; - - case VTUN_ENC_BF256ECB: - blocksize = 8; - keysize = 32; - var_key = 1; -- pctx_enc = &ctx_enc; -- pctx_dec = &ctx_dec; -+ pctx_enc = ctx_enc; -+ pctx_dec = ctx_dec; - cipher_type = EVP_bf_ecb(); - strcpy(cipher_name,"Blowfish-256-ECB"); - break; - - case VTUN_ENC_BF128OFB: -@@ -241,26 +241,28 @@ - blocksize = 8; - keysize = 16; - var_key = 1; - sb_init = 1; - cipher_type = EVP_bf_ecb(); -- pctx_enc = &ctx_enc_ecb; -- pctx_dec = &ctx_dec_ecb; -+ pctx_enc = ctx_enc_ecb; -+ pctx_dec = ctx_dec_ecb; - break; - case VTUN_ENC_BF128ECB: /* blowfish 128 ecb is the default */ - default: - blocksize = 8; - keysize = 16; - var_key = 1; -- pctx_enc = &ctx_enc; -- pctx_dec = &ctx_dec; -+ pctx_enc = ctx_enc; -+ pctx_dec = ctx_dec; - cipher_type = EVP_bf_ecb(); - strcpy(cipher_name,"Blowfish-128-ECB"); - break; - } /* switch(host->cipher) */ - - if (prep_key(&pkey, keysize, host) != 0) return -1; -+ pctx_enc = EVP_CIPHER_CTX_new(); -+ pctx_dec = EVP_CIPHER_CTX_new(); - EVP_CIPHER_CTX_init(pctx_enc); - EVP_CIPHER_CTX_init(pctx_dec); - EVP_EncryptInit_ex(pctx_enc, cipher_type, NULL, NULL, NULL); - EVP_DecryptInit_ex(pctx_dec, cipher_type, NULL, NULL, NULL); - if (var_key) -@@ -292,14 +294,14 @@ - free_key(pkey); pkey = NULL; - - lfd_free(enc_buf); enc_buf = NULL; - lfd_free(dec_buf); dec_buf = NULL; - -- EVP_CIPHER_CTX_cleanup(&ctx_enc); -- EVP_CIPHER_CTX_cleanup(&ctx_dec); -- EVP_CIPHER_CTX_cleanup(&ctx_enc_ecb); -- EVP_CIPHER_CTX_cleanup(&ctx_dec_ecb); -+ EVP_CIPHER_CTX_free(ctx_enc); -+ EVP_CIPHER_CTX_free(ctx_dec); -+ EVP_CIPHER_CTX_free(ctx_enc_ecb); -+ EVP_CIPHER_CTX_free(ctx_dec_ecb); - - return 0; - } - - static int encrypt_buf(int len, char *in, char **out) -@@ -321,11 +323,11 @@ - - memset(in_ptr+len, pad, pad); - outlen=len+pad; - if (pad == blocksize) - RAND_bytes(in_ptr+len, blocksize-1); -- EVP_EncryptUpdate(&ctx_enc, out_ptr, &outlen, in_ptr, len+pad); -+ EVP_EncryptUpdate(ctx_enc, out_ptr, &outlen, in_ptr, len+pad); - *out = enc_buf; - - sequence_num++; - - return outlen+msg_len; -@@ -341,11 +343,11 @@ - in = *out; - in_ptr = in; - - outlen=len; - if (!len) return 0; -- EVP_DecryptUpdate(&ctx_dec, out_ptr, &outlen, in_ptr, len); -+ EVP_DecryptUpdate(ctx_dec, out_ptr, &outlen, in_ptr, len); - recv_ib_mesg(&outlen, &out_ptr); - if (!outlen) return 0; - tmp_ptr = out_ptr + outlen; tmp_ptr--; - pad = *tmp_ptr; - if (pad < 1 || pad > blocksize) { -@@ -429,17 +431,18 @@ - /* if we're here, something weird's going on */ - return -1; - break; - } /* switch(cipher) */ - -- EVP_CIPHER_CTX_init(&ctx_enc); -- EVP_EncryptInit_ex(&ctx_enc, cipher_type, NULL, NULL, NULL); -+ ctx_enc = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(ctx_enc); -+ EVP_EncryptInit_ex(ctx_enc, cipher_type, NULL, NULL, NULL); - if (var_key) -- EVP_CIPHER_CTX_set_key_length(&ctx_enc, keysize); -- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, pkey, NULL); -- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, NULL, iv); -- EVP_CIPHER_CTX_set_padding(&ctx_enc, 0); -+ EVP_CIPHER_CTX_set_key_length(ctx_enc, keysize); -+ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, pkey, NULL); -+ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, NULL, iv); -+ EVP_CIPHER_CTX_set_padding(ctx_enc, 0); - if (enc_init_first_time) - { - sprintf(tmpstr,"%s encryption initialized", cipher_name); - vtun_syslog(LOG_INFO, tmpstr); - enc_init_first_time = 0; -@@ -519,17 +522,18 @@ - /* if we're here, something weird's going on */ - return -1; - break; - } /* switch(cipher) */ - -- EVP_CIPHER_CTX_init(&ctx_dec); -- EVP_DecryptInit_ex(&ctx_dec, cipher_type, NULL, NULL, NULL); -+ ctx_dec = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(ctx_dec); -+ EVP_DecryptInit_ex(ctx_dec, cipher_type, NULL, NULL, NULL); - if (var_key) -- EVP_CIPHER_CTX_set_key_length(&ctx_dec, keysize); -- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, pkey, NULL); -- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, NULL, iv); -- EVP_CIPHER_CTX_set_padding(&ctx_dec, 0); -+ EVP_CIPHER_CTX_set_key_length(ctx_dec, keysize); -+ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, pkey, NULL); -+ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, NULL, iv); -+ EVP_CIPHER_CTX_set_padding(ctx_dec, 0); - if (dec_init_first_time) - { - sprintf(tmpstr,"%s decryption initialized", cipher_name); - vtun_syslog(LOG_INFO, tmpstr); - dec_init_first_time = 0; -@@ -557,11 +561,11 @@ - memset(iv,0,blocksize); free(iv); iv = NULL; - RAND_bytes(in_ptr, in - in_ptr); - - in_ptr = in - blocksize*2; - outlen = blocksize*2; -- EVP_EncryptUpdate(&ctx_enc_ecb, in_ptr, -+ EVP_EncryptUpdate(ctx_enc_ecb, in_ptr, - &outlen, in_ptr, blocksize*2); - *out = in_ptr; - len = outlen; - cipher_enc_state = CIPHER_SEQUENCE; - break; -@@ -584,11 +588,11 @@ - { - case CIPHER_INIT: - in_ptr = in; - iv = malloc(blocksize); - outlen = blocksize*2; -- EVP_DecryptUpdate(&ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2); -+ EVP_DecryptUpdate(ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2); - - if ( !strncmp(in_ptr, "ivec", 4) ) - { - memcpy(iv, in_ptr+4, blocksize); - cipher_dec_init(iv); -@@ -627,11 +631,11 @@ - "Max. gibberish threshold reached"); - #endif - if (cipher_enc_state != CIPHER_INIT) - { - cipher_enc_state = CIPHER_INIT; -- EVP_CIPHER_CTX_cleanup(&ctx_enc); -+ EVP_CIPHER_CTX_free(ctx_enc); - #ifdef LFD_ENCRYPT_DEBUG - vtun_syslog(LOG_INFO, - "Forcing local encryptor re-init"); - #endif - } -@@ -708,11 +712,11 @@ - *len -= blocksize; - - if (cipher_enc_state != CIPHER_INIT) - { - cipher_enc_state = CIPHER_INIT; -- EVP_CIPHER_CTX_cleanup(&ctx_enc); -+ EVP_CIPHER_CTX_free(ctx_enc); - } - #ifdef LFD_ENCRYPT_DEBUG - vtun_syslog(LOG_INFO, "Remote requests encryptor re-init"); - #endif - } -@@ -722,11 +726,11 @@ - - if (cipher_dec_state != CIPHER_INIT && - cipher_enc_state != CIPHER_REQ_INIT && - cipher_enc_state != CIPHER_INIT) - { -- EVP_CIPHER_CTX_cleanup (&ctx_dec); -+ EVP_CIPHER_CTX_free (ctx_dec); - cipher_dec_state = CIPHER_INIT; - cipher_enc_state = CIPHER_REQ_INIT; - } - #ifdef LFD_ENCRYPT_DEBUG - vtun_syslog(LOG_INFO, "Local decryptor out of sync"); diff --git a/vtun.spec b/vtun.spec index dd77184..8c642de 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -10,12 +10,16 @@ Source1: vtun.socket Source2: vtun.service Source3: vtun.sysconfig Patch0: vtun-nostrip.patch -Patch1: vtun-openssl.patch Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units autoconf +BuildRequires: zlib-devel lzo-devel bison flex systemd-units autoconf +%if 0%{?fedora} >= 26 +BuildRequires: compat-openssl10-devel +%else +BuildRequires: openssl-devel +%endif #enable PIE/PIC: %global _hardened_build 1 @@ -33,9 +37,6 @@ require modification to any kernel parts. %prep %setup -q %patch0 -p1 -%if 0%{?fedora} >= 26 -%patch1 -p1 -%endif %build %{__autoconf} @@ -81,6 +82,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Sat Sep 02 2017 Gabriel Somlo 3.0.3-5 +- remove segfaulting openssl-1.1 patch; use compat-openssl10 instead + * Sat Sep 02 2017 Gabriel Somlo 3.0.3-4 - apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) From b51c8f84af78a29f11ff26fc1013820d0abe0cb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:42:28 +0000 Subject: [PATCH 15/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index 8c642de..35506bb 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -82,6 +82,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.0.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Sep 02 2017 Gabriel Somlo 3.0.3-5 - remove segfaulting openssl-1.1 patch; use compat-openssl10 instead From 7f161bf488f1322ba04d9fc8ea5da44fab58b90f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 16/25] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vtun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtun.spec b/vtun.spec index 35506bb..0f84888 100644 --- a/vtun.spec +++ b/vtun.spec @@ -14,6 +14,7 @@ Patch0: vtun-nostrip.patch Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +BuildRequires: gcc BuildRequires: zlib-devel lzo-devel bison flex systemd-units autoconf %if 0%{?fedora} >= 26 BuildRequires: compat-openssl10-devel From 51f51041d2a0b465c025651b16c47919003e5079 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:43:57 -0500 Subject: [PATCH 17/25] Remove needless use of %defattr --- vtun.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index 0f84888..d1d0535 100644 --- a/vtun.spec +++ b/vtun.spec @@ -68,7 +68,6 @@ EOT %systemd_postun vtun.service vtun.socket %files -%defattr(-,root,root,-) %doc ChangeLog Credits FAQ README README.LZO README.Setup README.Shaper TODO vtund.conf %config(noreplace) %{_sysconfdir}/vtund.conf %config(noreplace) %{_sysconfdir}/sysconfig/vtun From 5c99ad0f2bac67503d96ce7bf3245f6d561e8d12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:40:58 +0000 Subject: [PATCH 18/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index d1d0535..4d0bdc7 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -82,6 +82,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 3.0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c9ea8c130443a3206958d16854e7a78e77887d47 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 19/25] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vtun.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index 4d0bdc7..f28a7cd 100644 --- a/vtun.spec +++ b/vtun.spec @@ -3,7 +3,6 @@ Version: 3.0.4 Release: 7%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ -Group: System Environment/Daemons Url: http://vtun.sourceforge.net Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: vtun.socket From 78922f8841f51a35ad9062247c090b2dccf39b66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:29:06 +0000 Subject: [PATCH 20/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index f28a7cd..51bf3a0 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 3.0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 81e15b3a03b89bffe0e6076a235720d40f343292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 19 Jun 2019 09:57:50 +0200 Subject: [PATCH 21/25] Drop use of __* macros that were removed in rpm-4.15 --- vtun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index 51bf3a0..be65c69 100644 --- a/vtun.spec +++ b/vtun.spec @@ -39,7 +39,7 @@ require modification to any kernel parts. %patch0 -p1 %build -%{__autoconf} +autoconf # FIXME: Package suffers from c11/inline issues. # Workaround by appending --std=gnu89 to CFLAGS # Proper fix would be to fix the source-code From aa8d4bc89ecdd71a838620428c57f64d99aab8fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:13:22 +0000 Subject: [PATCH 22/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index be65c69..c382200 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 82540dc39744fdb24054196fc989dffcde5ee0c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:25:41 +0000 Subject: [PATCH 23/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index c382200..b4f1933 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 3.0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4fa3359af56612b1b4539270a66c74212d916769 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:55:01 +0000 Subject: [PATCH 24/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index b4f1933..a64e256 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 3.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5f702d511109834de5650a8e545c9cf67b0ed872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 3 Nov 2020 00:13:25 +0100 Subject: [PATCH 25/25] Orphaned for 6+ weeks --- .gitignore | 4 - dead.package | 1 + sources | 1 - vtun-nostrip.patch | 12 --- vtun.service | 12 --- vtun.socket | 8 -- vtun.spec | 212 --------------------------------------------- vtun.sysconfig | 16 ---- 8 files changed, 1 insertion(+), 265 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vtun-nostrip.patch delete mode 100644 vtun.service delete mode 100644 vtun.socket delete mode 100644 vtun.spec delete mode 100644 vtun.sysconfig diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2711247..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -vtun-3.0.1.tar.gz -/vtun-3.0.1.tar.gz -/vtun-3.0.3.tar.gz -/vtun-3.0.4.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 1487886..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (vtun-3.0.4.tar.gz) = b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781 diff --git a/vtun-nostrip.patch b/vtun-nostrip.patch deleted file mode 100644 index cd07a1a..0000000 --- a/vtun-nostrip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -NarU5 a/Makefile.in b/Makefile.in ---- a/Makefile.in 2016-10-01 17:46:00.000000000 -0400 -+++ b/Makefile.in 2017-03-17 16:49:16.195772745 -0400 -@@ -97,8 +97,7 @@ - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) - $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) -- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund - - # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/vtun.service b/vtun.service deleted file mode 100644 index d26d83c..0000000 --- a/vtun.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Virtual Tunnels over TCP/IP networks -After=syslog.target network.target - -[Service] -EnvironmentFile=/etc/sysconfig/vtun -ExecStart=/usr/sbin/vtund -n $OPTIONS -ExecReload=/usr/bin/kill -HUP $MAINPID -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/vtun.socket b/vtun.socket deleted file mode 100644 index 07f9d3d..0000000 --- a/vtun.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Vtun Activation Socket - -[Socket] -ListenStream=5000 - -[Install] -WantedBy=sockets.target diff --git a/vtun.spec b/vtun.spec deleted file mode 100644 index a64e256..0000000 --- a/vtun.spec +++ /dev/null @@ -1,212 +0,0 @@ -Name: vtun -Version: 3.0.4 -Release: 11%{?dist} -Summary: Virtual tunnel over TCP/IP networks -License: GPLv2+ -Url: http://vtun.sourceforge.net -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: vtun.socket -Source2: vtun.service -Source3: vtun.sysconfig -Patch0: vtun-nostrip.patch - -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -BuildRequires: gcc -BuildRequires: zlib-devel lzo-devel bison flex systemd-units autoconf -%if 0%{?fedora} >= 26 -BuildRequires: compat-openssl10-devel -%else -BuildRequires: openssl-devel -%endif - -#enable PIE/PIC: -%global _hardened_build 1 - -%description -VTun provides a method for creating Virtual Tunnels over TCP/IP networks -and allows one to shape, compress, and encrypt traffic in those tunnels. -Supported types of tunnels are: PPP, IP, Ethernet and most other serial -protocols and programs. -VTun is easily and highly configurable: it can be used for various -network tasks like VPN, Mobile IP, Shaped Internet access, IP address -saving, etc. It is completely a user space implementation and does not -require modification to any kernel parts. - -%prep -%setup -q -%patch0 -p1 - -%build -autoconf -# FIXME: Package suffers from c11/inline issues. -# Workaround by appending --std=gnu89 to CFLAGS -# Proper fix would be to fix the source-code -%configure CFLAGS="${RPM_OPT_FLAGS} --std=gnu89" -make %{?_smp_mflags} - -%install -install -D -m 0644 -p %{SOURCE1} %{buildroot}/%{_unitdir}/vtun.socket -install -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service -install -D -m 0644 -p %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/vtun -make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" -# tmpfiles.d configuration for /var/lock/vtund: -mkdir -p %{buildroot}/%{_tmpfilesdir} -cat > %{buildroot}/%{_tmpfilesdir}/%{name}.conf << EOT -d %{_localstatedir}/lock/vtund 0755 root root - -EOT - -%post -%systemd_post vtun.service vtun.socket - -%preun -%systemd_preun vtun.service vtun.socket - -%postun -%systemd_postun vtun.service vtun.socket - -%files -%doc ChangeLog Credits FAQ README README.LZO README.Setup README.Shaper TODO vtund.conf -%config(noreplace) %{_sysconfdir}/vtund.conf -%config(noreplace) %{_sysconfdir}/sysconfig/vtun -%{_unitdir}/vtun.socket -%{_unitdir}/vtun.service -%{_sbindir}/vtund -%{_tmpfilesdir}/%{name}.conf -%dir %{_localstatedir}/log/vtund -%dir %{_localstatedir}/lock/vtund -%{_mandir}/man5/vtund.conf.5* -%{_mandir}/man8/vtun.8* -%{_mandir}/man8/vtund.8* - -%changelog -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 3.0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 3.0.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 3.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 3.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Sep 02 2017 Gabriel Somlo 3.0.3-5 -- remove segfaulting openssl-1.1 patch; use compat-openssl10 instead - -* Sat Sep 02 2017 Gabriel Somlo 3.0.3-4 -- apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) - -* Thu Aug 03 2017 Fedora Release Engineering - 3.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Mon Jul 31 2017 Gabriel Somlo 3.0.3-2 -- add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs - -* Fri Mar 17 2017 Gabriel Somlo 3.0.3-1 -- update to 3.0.4 -- patch for openssl-1.1 transition - -* Sat Feb 11 2017 Fedora Release Engineering - 3.0.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Mar 21 2016 Gabriel Somlo 3.0.3-15 -- patch to fix #1319858,#1319859,#1319861 - -* Fri Feb 05 2016 Fedora Release Engineering - 3.0.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jun 22 2015 Ralf Corsépius - 3.0.3-13 -- Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility - issues. Fix FTBFS). - -* Fri Jun 19 2015 Fedora Release Engineering - 3.0.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Dec 23 2014 Gabriel Somlo 3.0.3-11 -- enhanced service file (remove "KillMode", use default "cgroup" mode) - -* Thu Nov 20 2014 Gabriel Somlo 3.0.3-10 -- enhanced service file (-n to prevent daemonizing vtund) - -* Fri Nov 14 2014 Gabriel Somlo 3.0.3-9 -- added /etc/sysconfig/vtun environment file -- updated unit files - -* Mon Aug 18 2014 Fedora Release Engineering - 3.0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 3.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon May 13 2013 Gabriel Somlo 3.0.3-5 -- added autoconf step to support aarch64 (#926708) - -* Wed May 01 2013 Gabriel Somlo 3.0.3-4 -- rebuild with PIE (#955286) - -* Fri Feb 15 2013 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Sep 16 2012 Gabriel Somlo 3.0.3-2 -- avoid stripping too early to preserve debuginfo (#857716) - -* Thu Sep 13 2012 Gabriel Somlo 3.0.3-1 -- update to 3.0.3 -- new systemd-rpm macros (#850362) - -* Sun Jul 22 2012 Fedora Release Engineering - 3.0.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon May 21 2012 Peter Robinson - 3.0.1-14 -- Fix unit file location, cleanup and modernise spec - -* Sat Jan 14 2012 Fedora Release Engineering - 3.0.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Sep 10 2011 Gabriel Somlo 3.0.1-12 -- removed xinetd and sysvinit support - -* Sat Sep 10 2011 Gabriel Somlo 3.0.1-11 -- update support for systemd (#737195) - -* Mon Feb 07 2011 Fedora Release Engineering - 3.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 06 2011 Gabriel Somlo 3.0.1-9 -- add support for systemd (#661331) - -* Tue Nov 30 2010 Gabriel Somlo 3.0.1-8 -- using ghost on /var/lock/vtund directory (#656720) - -* Fri Aug 21 2009 Tomas Mraz - 3.0.1-7 -- rebuilt with new openssl - -* Sun Jul 26 2009 Fedora Release Engineering - 3.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Tomas Mraz 3.0.1-4 -- rebuild with new openssl - -* Mon Nov 17 2008 Gabriel Somlo 3.0.1-3 -- scriptlets fixes - -* Fri Nov 14 2008 Gabriel Somlo 3.0.1-2 -- spec file fixes: defattr, -p flag to install program - -* Mon Oct 20 2008 Gabriel Somlo 3.0.1-1 -- initial fedora package diff --git a/vtun.sysconfig b/vtun.sysconfig deleted file mode 100644 index 467bd8b..0000000 --- a/vtun.sysconfig +++ /dev/null @@ -1,16 +0,0 @@ -# Comment out one of the following for client or server mode -# -# To run vtun as a server: -# -#OPTIONS='-s' -# -# -# -#To run vtun as a client, we need: -# -# - session name, e.g. "lion"; must be present in both client and server -# config files. -# -# - server address or host name. -# -#OPTIONS='lion vtun-server.example.com'