vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
From 627a45d88acf236cb36326919e4a2fa975c688bd Mon Sep 17 00:00:00 2001
|
2016-02-11 00:03:09 +01:00
|
|
|
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
|
|
|
|
Date: Mon, 8 Feb 2016 23:05:23 +0100
|
vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
Subject: [PATCH] config.c: Replace deprecated SUSv3 functions with POSIX
|
|
|
|
|
equivalents
|
2016-02-11 00:03:09 +01:00
|
|
|
|
|
|
|
|
Replace the deprecated SUSv3 function index() by its POSIX equivalent
|
vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
strchr(). This is necessary to successfully build vpnc with uClibc,
|
|
|
|
|
when SUSv3 compatibility functions are not compiled in.
|
2016-02-11 00:03:09 +01:00
|
|
|
|
|
|
|
|
Patch originally from Bernhard Reutner-Fischer
|
|
|
|
|
<rep.dot.nop@gmail.com>.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
---
|
vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
|
|
|
|
|
config.c | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
2016-02-11 00:03:09 +01:00
|
|
|
|
|
|
|
|
diff --git a/config.c b/config.c
|
vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
index 57778e3..11b363b 100644
|
2016-02-11 00:03:09 +01:00
|
|
|
--- a/config.c
|
|
|
|
|
+++ b/config.c
|
vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
@@ -657,8 +657,7 @@ static const struct config_names_s {
|
|
|
|
|
static char *get_config_filename(const char *name, int add_dot_conf)
|
2016-02-11 00:03:09 +01:00
|
|
|
{
|
|
|
|
|
char *realname;
|
vpnc: bump to newer upstream version
While the official upstream has not published any new tarball, they
have continued to update their Subversion repository with additional
changes. This commit therefore updates the vpnc package to a newer
version, using the Github repository that replicates the original
Subversion repository.
Since the update required some updates to the patches, we took this
opportunity to split them in more fine-grained changes, and document
them more properly. Consequently:
- The patch 0001 that fixes the Makefile gets split into 3 patches,
0001, 0002 and 0003, each for one specific issue.
- Patch 0002 to disable building the manpages gets changed into a
solution that is potentially upstreamable, and is now patch 0004.
- A new patch 0005 is added to specify a custom libgcrypt-config
path, since this tool is now used to know how to link with
libgcrypt.
- The SUSv3 function removal patch is now patch 0006, and gains a
better commit log.
Also, this vpnc version now depends on gnutls, which basically is a
better replacement for OpenSSL, whose support was not enabled by
default due to licensing issues (vpnc is under the GPL, which isn't
compatible with the OpenSSL license).
Patches have been submitted upstream:
http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2016-June/004186.html
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-10 23:40:23 +01:00
|
|
|
-
|
2016-02-11 00:03:09 +01:00
|
|
|
- asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
|
|
|
|
|
+ asprintf(&realname, "%s%s%s", strchr(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
|
|
|
|
|
return realname;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.6.4
|
|
|
|
|
|