Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #111 from equinox0815/uanytun-gcrypt

Browse source 
reenabled libgcrypt and make it the default again
This commit is contained in:
sbyx 2014-07-22 18:05:20 +02:00
commit f94dce1ab4
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
net/uanytun/Makefile
View file

@ -37,9 +37,9 @@ endef
define Package/uanytun define Package/uanytun
$(call Package/uanytun/template) $(call Package/uanytun/template)
TITLE+= (nettle) TITLE+= (gcrypt)
VARIANT:=nettle VARIANT:=gcrypt
DEPENDS+=+libnettle DEPENDS+=+libgcrypt
endef endef
define Package/uanytun/conffiles define Package/uanytun/conffiles
@ -61,6 +61,17 @@ uAnytun is a tiny implementation of SATP the secure anycast tunneling protocol.
endef endef
define Package/uanytun-nettle
$(call Package/uanytun/template)
TITLE+= (nettle)
VARIANT:=nettle
DEPENDS+=+libnettle
endef
Package/uanytun-nettle/conffiles=$(Package/uanytun/conffiles)
Package/uanytun-nettle/description=$(Package/uanytun/description)
define Package/uanytun-sslcrypt define Package/uanytun-sslcrypt
$(call Package/uanytun/template) $(call Package/uanytun/template)
TITLE+= (openssl) TITLE+= (openssl)
@ -101,6 +112,11 @@ VARIANT_CFLAGS:=
VARIANT_LDFLAGS:=-ldl VARIANT_LDFLAGS:=-ldl
VARIANT_MAKE_OPTS:= VARIANT_MAKE_OPTS:=
ifeq ($(BUILD_VARIANT),gcrypt)
VARIANT_CFLAGS+=-DUSE_GCRYPT
VARIANT_LDFLAGS+=-lgpg-error -lgcrypt
endif
ifeq ($(BUILD_VARIANT),nettle) ifeq ($(BUILD_VARIANT),nettle)
VARIANT_CFLAGS+=-DUSE_NETTLE VARIANT_CFLAGS+=-DUSE_NETTLE
VARIANT_LDFLAGS+=-lnettle VARIANT_LDFLAGS+=-lnettle
@ -140,6 +156,10 @@ define Package/uanytun/install
$(call Package/uanytun/install-generic,$(1),uanytun.config) $(call Package/uanytun/install-generic,$(1),uanytun.config)
endef endef
define Package/uanytun-nettle/install
$(call Package/uanytun/install-generic,$(1),uanytun.config)
endef
define Package/uanytun-sslcrypt/install define Package/uanytun-sslcrypt/install
$(call Package/uanytun/install-generic,$(1),uanytun.config) $(call Package/uanytun/install-generic,$(1),uanytun.config)
endef endef
@ -150,5 +170,6 @@ endef
$(eval $(call BuildPackage,uanytun)) $(eval $(call BuildPackage,uanytun))
$(eval $(call BuildPackage,uanytun-nettle))
$(eval $(call BuildPackage,uanytun-sslcrypt)) $(eval $(call BuildPackage,uanytun-sslcrypt))
$(eval $(call BuildPackage,uanytun-nocrypt)) $(eval $(call BuildPackage,uanytun-nocrypt))