2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2007-07-17 20:14:25 +02:00
|
|
|
#
|
|
|
|
|
# vpnc
|
|
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2007-07-17 20:14:25 +02:00
|
|
|
|
2016-06-05 19:52:06 +02:00
|
|
|
VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740
|
2016-02-11 00:03:09 +01:00
|
|
|
VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION))
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
VPNC_LICENSE = GPLv2+
|
2012-09-21 14:28:37 +02:00
|
|
|
VPNC_LICENSE_FILES = COPYING
|
2007-07-17 20:14:25 +02:00
|
|
|
|
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
|
|
|
VPNC_DEPENDENCIES = libgcrypt libgpg-error gnutls host-pkgconf
|
2007-07-17 20:14:25 +02:00
|
|
|
|
2012-09-21 14:28:37 +02:00
|
|
|
define VPNC_BUILD_CMDS
|
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
|
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
|
|
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
|
|
|
LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
|
|
|
|
|
VERSION=$(VPNC_VERSION) MANS=
|
2012-09-21 14:28:37 +02:00
|
|
|
endef
|
2007-07-17 20:14:25 +02:00
|
|
|
|
2012-09-21 14:28:37 +02:00
|
|
|
define VPNC_INSTALL_TARGET_CMDS
|
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
|
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) \
|
|
|
|
|
VERSION=$(VPNC_VERSION) MANS= \
|
2012-09-21 14:28:37 +02:00
|
|
|
DESTDIR="$(TARGET_DIR)" PREFIX=/usr
|
|
|
|
|
endef
|
2007-07-17 20:14:25 +02:00
|
|
|
|
2012-09-21 14:28:37 +02:00
|
|
|
$(eval $(generic-package))
|
