View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0000005 | Freifunk Franken Firmware | General | public | 2016-11-06 12:37 | 2019-10-02 12:49 |
Reporter | ChristianD | Assigned To | mayosemmel | ||
Priority | normal | Severity | block | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Platform | *alle* | OS | OpenWRT | OS Version | RFC v5 |
Summary | 0000005: Firmware baut nicht durch | ||||
Description | Es wird libuecc >=6 für ecdsautils benötigt. Unsere Firmware enthält nur libuecc5 | ||||
Tags | No tags attached. | ||||
Attached Files | 0001-backported-libuecc-update-to-v7.patch (4,738 bytes)
From 979767d3170fae2e633db041e1bd71bf0e005322 Mon Sep 17 00:00:00 2001 From: Jan Kraus <mayosemmel@gmail.com> Date: Tue, 15 Nov 2016 00:30:00 +0100 Subject: [PATCH] backported libuecc update to v7 Signed-off-by: Jan Kraus <mayosemmel@gmail.com> --- .../0001-backported-libuecc-update.patch | 26 ++++++++++ ...uecc-use-shared-instead-of-static-library.patch | 60 ++++++++++++++++++++++ buildscript | 5 ++ 3 files changed, 91 insertions(+) create mode 100644 build_patches/openwrt-packages/0001-backported-libuecc-update.patch create mode 100644 build_patches/openwrt-packages/0002-libuecc-use-shared-instead-of-static-library.patch diff --git a/build_patches/openwrt-packages/0001-backported-libuecc-update.patch b/build_patches/openwrt-packages/0001-backported-libuecc-update.patch new file mode 100644 index 0000000..c31b55d --- /dev/null +++ b/build_patches/openwrt-packages/0001-backported-libuecc-update.patch @@ -0,0 +1,26 @@ +--- libs/libuecc/Makefile 2016-11-14 23:42:38.215777463 +0100 ++++ libs/libuecc/Makefile 2016-11-14 23:47:44.859781597 +0100 +@@ -1,5 +1,5 @@ + # +-# Copyright (C) 2012-2015 OpenWrt.org ++# Copyright (C) 2012-2016 OpenWrt.org + # + # This is free software, licensed under the GNU General Public License v2. + # See /LICENSE for more information. +@@ -8,13 +8,13 @@ + include $(TOPDIR)/rules.mk + + PKG_NAME:=libuecc +-PKG_VERSION:=5 ++PKG_VERSION:=7 + PKG_RELEASE:=1 + + PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net> + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/80 +-PKG_MD5SUM:=cd03c947931c2f4b0eea0bf45654bd34 ++PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/85 ++PKG_MD5SUM:=5cd543cb8e7bce83a22c07a0579c95a1 + + PKG_LICENSE:=BSD-2-Clause + PKG_LICENSE_FILES:=COPYRIGHT diff --git a/build_patches/openwrt-packages/0002-libuecc-use-shared-instead-of-static-library.patch b/build_patches/openwrt-packages/0002-libuecc-use-shared-instead-of-static-library.patch new file mode 100644 index 0000000..747a30e --- /dev/null +++ b/build_patches/openwrt-packages/0002-libuecc-use-shared-instead-of-static-library.patch @@ -0,0 +1,60 @@ +--- libs/libuecc/Makefile ++++ 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 <mschiffer@universe-factory.net> + 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 5c550d8..aeaa1df 100644 +--- net/fastd/Makefile ++++ net/fastd/Makefile +@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk + + PKG_NAME:=fastd + PKG_VERSION:=17 +-PKG_RELEASE:=1 ++PKG_RELEASE:=2 + + PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net> + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +@@ -42,7 +42,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 +@@ -50,7 +50,7 @@ include $(INCLUDE_DIR)/cmake.mk + define Package/fastd + SECTION:=net + CATEGORY:=Network +- DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c ++ DEPENDS:=+kmod-tun +librt +libpthread +libuecc +FASTD_WITH_STATUS_SOCKET:libjson-c + TITLE:=Fast and Secure Tunneling Daemon + URL:=https://projects.universe-factory.net/projects/fastd + SUBMENU:=VPN diff --git a/buildscript b/buildscript index b0006ef..fe7f9ac 100755 --- a/buildscript +++ b/buildscript @@ -122,6 +122,11 @@ patch_target() { patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch" done fi + if [ "$(find "$PWD"/build_patches/openwrt-packages/*.patch 2> /dev/null | wc -l)" -ge 1 ]; then + for patch in "$PWD"/build_patches/openwrt-packages/*.patch; do + patch -N -r - --no-backup-if-mismatch -p0 -d "$PWD/src/packages/openwrt" -i "$patch" + done + fi } prepare() { -- 2.1.4 | ||||
|
Die Version von libuecc wurde nur im openwrt-packages master hochgezogen: https://github.com/openwrt/packages/commit/e47da635ad6da238b0e65ce4f21be90756b35b38 Nicht allerdings im for-15.05 branch, welchen wir verwenden: https://github.com/openwrt/packages/tree/for-15.05/libs/libuecc Ich habe jetzt mal einen backport vorbereitet und werde mal schauen ob es damit klappt. |
|
Ein reiner Backport hat nicht ausgereicht. Es war weiterhin noch folgender Patch notwendig: https://github.com/freifunk-gluon/gluon/blob/master/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch Das Problem ist nun behoben und die Firmware baut wieder durch. (Siehe angehängten Patch) Über die Mailingliste geht das, wenn die anderen Themen zum dezKeyExchange auch noch erledigt sind. |
Date Modified | Username | Field | Change |
---|---|---|---|
2016-11-06 12:37 | ChristianD | New Issue | |
2016-11-08 18:17 | mayosemmel | Assigned To | => mayosemmel |
2016-11-08 18:17 | mayosemmel | Status | new => confirmed |
2016-11-08 18:17 | mayosemmel | Platform | wr841v10 => *alle* |
2016-11-15 00:13 | mayosemmel | Note Added: 0000007 | |
2016-11-24 23:20 | mayosemmel | File Added: 0001-backported-libuecc-update-to-v7.patch | |
2016-11-24 23:22 | mayosemmel | Note Added: 0000008 | |
2016-11-24 23:22 | mayosemmel | Status | confirmed => resolved |
2016-11-24 23:22 | mayosemmel | Resolution | open => fixed |
2016-12-17 12:44 | reddog | Category | Freifunk Franken dezentraler KeyXchange => PATCHES |
2017-07-02 11:31 | reddog | Status | resolved => closed |
2019-10-02 12:47 | fbl | Category | PATCHES => General |
2019-10-02 12:48 | fbl | Category | General => General2 |
2019-10-02 12:49 | fbl | Category | General2 => General |