inadyn: Update to 2.5

Makefile cleanups.

Added PKG_BUILD_PARALLEL for faster compilation.

Added PKG_INSTALL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-06-06 22:37:56 -07:00
parent 9e25a6e528
commit dd41da3403
2 changed files with 17 additions and 33 deletions

View file

@ -8,17 +8,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=inadyn PKG_NAME:=inadyn
PKG_VERSION:=2.3.1 PKG_VERSION:=2.5
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/troglobit/inadyn/releases/download/v$(PKG_VERSION)
PKG_HASH:=4a9ad208671f62912428413da0282450b2d2c4da38f3c95c4ac975d048c41fcd
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_INSTALL:=1
PKG_SOURCE_URL:=https://github.com/troglobit/inadyn/releases/download/v$(PKG_VERSION) PKG_BUILD_PARALLEL:=1
PKG_HASH:=81c942db6eab27fa16e868175bdb7aff963eeee06d48bc5443e0dcd6f7c2da40
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -39,12 +41,18 @@ define Package/inadyn/conffiles
/etc/inadyn.conf /etc/inadyn.conf
endef endef
CONFIGURE_ARGS += --enable-shared --disable-static --enable-openssl TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
--enable-shared \
--disable-static \
--enable-openssl \
--without-pic
define Package/inadyn/install define Package/inadyn/install
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/inadyn $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/inadyn $(1)/usr/sbin/
endef endef
$(eval $(call BuildPackage,inadyn)) $(eval $(call BuildPackage,inadyn))

View file

@ -1,24 +0,0 @@
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -25,17 +25,21 @@
int ssl_init(void)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init();
SSL_load_error_strings();
OpenSSL_add_all_algorithms();
+#endif
return 0;
}
void ssl_exit(void)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_free_strings();
EVP_cleanup();
+#endif
}
static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)