From 8dd99f4f7fd3d7ca5333fba58b709a235919dbb0 Mon Sep 17 00:00:00 2001 From: Dominik Menke Date: Tue, 13 Dec 2016 15:42:41 +0100 Subject: [PATCH 1/2] libuecc: use shared instead of static library This patch prepares for another future package (ecdsautils), which builds multiple binaries all linked to libuecc. The changes are a direct copy of [1]. The original commit message was: > commit cb2ecbfdf0c478568a28aacb99d30fd6ee5c0dd1 > From: Matthias Schiffer > Date: Tue, 3 May 2016 21:33:34 +0200 > Subject: libuecc: use shared instead of static library > > Signed-off-by: Matthias Schiffer [1]: https://github.com/freifunk-gluon/gluon/blob/cb2ecbfdf0c478568a28aacb99d30fd6ee5c0dd1/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch Signed-off-by: Dominik Menke --- libs/libuecc/Makefile | 9 +++++++-- net/fastd/Makefile | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile index c1ba53f85..811106242 100644 --- a/libs/libuecc/Makefile +++ b/libs/libuecc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuecc PKG_VERSION:=7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Matthias Schiffer PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -35,11 +35,16 @@ CMAKE_OPTIONS += \ -DCMAKE_BUILD_TYPE:String="MINSIZEREL" +define Package/libuecc/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.so* $(1)/usr/lib/ +endef + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libuecc-$(PKG_VERSION) $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.a $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libuecc.pc $(1)/usr/lib/pkgconfig/ endef diff --git a/net/fastd/Makefile b/net/fastd/Makefile index 5c550d8a5..aeaa1dfcf 100644 --- a/net/fastd/Makefile +++ b/net/fastd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fastd PKG_VERSION:=18 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Matthias Schiffer PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -43,7 +43,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_WITH_STATUS_SOCKET -PKG_BUILD_DEPENDS:=nacl libuecc +PKG_BUILD_DEPENDS:=nacl include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -51,7 +51,7 @@ include $(INCLUDE_DIR)/cmake.mk define Package/fastd SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap + DEPENDS:=+kmod-tun +librt +libpthread +libuecc +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap TITLE:=Fast and Secure Tunneling Daemon URL:=https://projects.universe-factory.net/projects/fastd SUBMENU:=VPN From 8d441a568cbc881aae55c63d5a3ade8ba5ce92f2 Mon Sep 17 00:00:00 2001 From: Dominik Menke Date: Tue, 13 Dec 2016 15:52:36 +0100 Subject: [PATCH 2/2] ecdsautils/libecdsautil: add 0.3.2.20160630 These changes are a direct copy of [1]. The original commit messages were: > commit 0a6411b56b9edeba1809ffe45c03dbb7261bf45c > Author: Matthias Schiffer > Date: Sun May 8 11:39:22 2016 +0200 > > ecdsautils: update to current git, add libecdsautil > > The addition of libecdsautil required us to switch from statically > linked libuecc to a shared library (as we also want shared > libecdsautil). > commit 05bc59f3196b1dc05afe845e1df0073e40f0757d > Author: Nils Schneider > Date: Mon Jul 21 14:51:42 2014 +0200 > > ecdsautils: update to v0.3.2 > commit db7d9410b3e21f5770f28a3c537ba6a681c24e62 > Author: Nils Schneider > Date: Thu Jul 10 16:28:10 2014 +0200 > > ecdsautils: download using git instead of http > commit 3a1b6541b43d4801608c391d64582af41e7a155a > Author: Nils Schneider > Date: Wed Feb 6 13:30:26 2013 +0100 > > Add ecdsautils v0.2 [1]: https://github.com/freifunk-gluon/packages/blob/0a6411b56b9edeba1809ffe45c03dbb7261bf45c/utils/ecdsautils/Makefile Signed-off-by: Dominik Menke --- utils/ecdsautils/Makefile | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 utils/ecdsautils/Makefile diff --git a/utils/ecdsautils/Makefile b/utils/ecdsautils/Makefile new file mode 100644 index 000000000..e5f3567a8 --- /dev/null +++ b/utils/ecdsautils/Makefile @@ -0,0 +1,72 @@ +# +# Copyright (C) 2012-2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ecdsautils +PKG_VERSION:=0.3.2.20160630 +PKG_RELEASE:=1 +PKG_REV:=07538893fb6c2a9539678c45f9dbbf1e4f222b46 +PKG_MAINTAINER:=Matthias Schiffer +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=git://github.com/tcatm/$(PKG_NAME).git +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_PROTO:=git + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/libecdsautil + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libuecc + TITLE:=ECDSA library + URL:=https://github.com/tcatm/ecdsautils +endef + +define Package/ecdsautils + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libecdsautil +libuecc + TITLE:=ECDSA Utilities + URL:=https://github.com/tcatm/ecdsautils +endef + +CMAKE_OPTIONS += \ + -DCMAKE_BUILD_TYPE:String="MINSIZEREL" \ + + +define Package/libecdsautil/description + Library to sign and verify checksums using ECDSA. +endef + +define Package/ecdsautils/description + Utilities to sign and verify checksums using ECDSA. +endef + +define Package/libecdsautil/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libecdsautil.so* $(1)/usr/lib/ +endef + +define Package/ecdsautils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ecdsautil $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ecdsakeygen $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ecdsasign $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ecdsaverify $(1)/usr/bin/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/ + $(CP) $(PKG_INSTALL_DIR)/usr/include $(1)/usr/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/ +endef + +$(eval $(call BuildPackage,libecdsautil)) +$(eval $(call BuildPackage,ecdsautils))