Skip to content
Snippets Groups Projects
Commit ab10be9f authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

We're on Chaos Calmer now

parent 63165e80
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 343 deletions
patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch deleted 100644 → 0
+ 0
− 33
View file @ 63165e80
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 26 Jul 2014 18:06:07 +0200
Subject: haveged: start directly after initial setup and disable tests
diff --git a/utils/haveged/Makefile b/utils/haveged/Makefile
index aff998d..94c8c34 100644
--- a/utils/haveged/Makefile
+++ b/utils/haveged/Makefile
@@ -42,8 +42,9 @@ define Package/libhavege
endef
CONFIGURE_ARGS+= \
- --enable-daemon=yes
- --enable-threads=no
+ --enable-daemon=yes \
+ --enable-threads=no \
+ --enable-olt=no
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init
index ce28e61..113d64f 100644
--- a/utils/haveged/files/haveged.init
+++ b/utils/haveged/files/haveged.init
@@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2012 OpenWrt.org
-START=98
+START=13
HAVEGED_THRESHOLD=1024
HAVEGED_DCACHE=32
patches/packages/openwrt/0002-libuecc-update-to-v5.patch deleted 100644 → 0
+ 0
− 35
View file @ 63165e80
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 29 Jan 2015 07:46:26 +0100
Subject: libuecc: update to v5
diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile
index 0fe4833..63b6ebe 100644
--- a/libs/libuecc/Makefile
+++ b/libs/libuecc/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2012-2014 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,13 +8,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libuecc
-PKG_VERSION:=4
+PKG_VERSION:=5
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/71
-PKG_MD5SUM:=7f44df5dc69cb8686947562e2a11eea9
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/80
+PKG_MD5SUM:=cd03c947931c2f4b0eea0bf45654bd34
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=COPYRIGHT
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
patches/packages/openwrt/0003-fastd-update-to-v17.patch deleted 100644 → 0
+ 0
− 213
View file @ 63165e80
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 29 Jan 2015 07:48:03 +0100
Subject: fastd: update to v17
diff --git a/net/fastd/Config.in b/net/fastd/Config.in
index ca4045c..5820b97 100644
--- a/net/fastd/Config.in
+++ b/net/fastd/Config.in
@@ -11,6 +11,11 @@ config FASTD_ENABLE_METHOD_COMPOSED_GMAC
depends on PACKAGE_fastd
default y
+config FASTD_ENABLE_METHOD_COMPOSED_UMAC
+ bool "Enable composed-umac method provider"
+ depends on PACKAGE_fastd
+ default y
+
config FASTD_ENABLE_METHOD_GENERIC_GMAC
bool "Enable generic-gmac method provider"
depends on PACKAGE_fastd
@@ -21,6 +26,11 @@ config FASTD_ENABLE_METHOD_GENERIC_POLY1305
depends on PACKAGE_fastd
default n
+config FASTD_ENABLE_METHOD_GENERIC_UMAC
+ bool "Enable generic-umac method provider"
+ depends on PACKAGE_fastd
+ default y
+
config FASTD_ENABLE_METHOD_NULL
bool "Enable null method"
depends on PACKAGE_fastd
@@ -58,6 +68,11 @@ config FASTD_ENABLE_MAC_GHASH
depends on PACKAGE_fastd
default y
+config FASTD_ENABLE_MAC_UHASH
+ bool "Enable the UHASH message authentication code"
+ depends on PACKAGE_fastd
+ default y
+
config FASTD_WITH_CMDLINE_USER
bool "Include support for setting user/group related options on the command line"
@@ -79,9 +94,15 @@ config FASTD_WITH_CMDLINE_COMMANDS
depends on PACKAGE_fastd
default n
-config FASTD_WITH_VERIFY
- bool "Include support for on-verify handlers"
- depends on PACKAGE_fastd
- default n
+config FASTD_WITH_DYNAMIC_PEERS
+ bool "Include support for on-verify handlers"
+ depends on PACKAGE_fastd
+ default n
+
+config FASTD_WITH_STATUS_SOCKET
+ bool "Include support for status sockets"
+ depends on PACKAGE_fastd
+ default y
+
endmenu
diff --git a/net/fastd/Makefile b/net/fastd/Makefile
index 0629cd7..027f549 100644
--- a/net/fastd/Makefile
+++ b/net/fastd/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2012-2014 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,19 +8,24 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fastd
-PKG_VERSION:=14
+PKG_VERSION:=17
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/75
-PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/81
+PKG_MD5SUM:=bad4f1948702f418b799578f83a0edb8
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=COPYRIGHT
PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC \
+ CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC \
CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \
CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \
+ CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \
CONFIG_FASTD_ENABLE_METHOD_NULL \
CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \
CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \
@@ -28,11 +33,13 @@ PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \
CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
CONFIG_FASTD_ENABLE_MAC_GHASH \
+ CONFIG_FASTD_ENABLE_MAC_UHASH \
CONFIG_FASTD_WITH_CMDLINE_USER \
CONFIG_FASTD_WITH_CMDLINE_LOGGING \
CONFIG_FASTD_WITH_CMDLINE_OPERATION \
CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
- CONFIG_FASTD_WITH_VERIFY
+ CONFIG_FASTD_WITH_DYNAMIC_PEERS \
+ CONFIG_FASTD_WITH_STATUS_SOCKET
PKG_BUILD_DEPENDS:=nacl libuecc
@@ -43,7 +50,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/fastd
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+kmod-tun +librt +libpthread
+ DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c
TITLE:=Fast and Secure Tunneling Daemon
URL:=https://projects.universe-factory.net/projects/fastd
SUBMENU:=VPN
@@ -60,8 +67,10 @@ CMAKE_OPTIONS += \
-DCMAKE_BUILD_TYPE:STRING=MINSIZEREL \
-DWITH_METHOD_CIPHER_TEST:BOOL=FALSE \
-DWITH_METHOD_COMPOSED_GMAC:BOOL=FALSE \
+ -DWITH_METHOD_COMPOSED_UMAC:BOOL=FALSE \
-DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \
-DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \
+ -DWITH_METHOD_GENERIC_UMAC:BOOL=FALSE \
-DWITH_METHOD_NULL:BOOL=FALSE \
-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \
-DWITH_CIPHER_AES128_CTR:BOOL=FALSE \
@@ -69,11 +78,13 @@ CMAKE_OPTIONS += \
-DWITH_CIPHER_SALSA20:BOOL=FALSE \
-DWITH_CIPHER_SALSA2012:BOOL=FALSE \
-DWITH_MAC_GHASH:BOOL=FALSE \
+ -DWITH_MAC_UHASH:BOOL=FALSE \
-DWITH_CMDLINE_USER:BOOL=FALSE \
-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
- -DWITH_VERIFY:BOOL=FALSE \
+ -DWITH_DYNAMIC_PEERS:BOOL=FALSE \
+ -DWITH_STATUS_SOCKET:BOOL=FALSE \
-DWITH_CAPABILITIES:BOOL=FALSE \
-DENABLE_SYSTEMD:BOOL=FALSE \
-DENABLE_LIBSODIUM:BOOL=FALSE \
@@ -88,6 +99,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC),y)
CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_GMAC:BOOL=TRUE
endif
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC),y)
+CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_UMAC:BOOL=TRUE
+endif
+
ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC),y)
CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_GMAC:BOOL=TRUE
endif
@@ -96,6 +111,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305),y)
CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_POLY1305:BOOL=TRUE
endif
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC),y)
+CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_UMAC:BOOL=TRUE
+endif
+
ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y)
CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE
endif
@@ -126,6 +145,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_MAC_GHASH),y)
CMAKE_OPTIONS += -DWITH_MAC_GHASH:BOOL=TRUE
endif
+ifeq ($(CONFIG_FASTD_ENABLE_MAC_UHASH),y)
+CMAKE_OPTIONS += -DWITH_MAC_UHASH:BOOL=TRUE
+endif
+
ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
@@ -143,8 +166,12 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y)
CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
endif
-ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
-CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
+ifeq ($(CONFIG_FASTD_WITH_DYNAMIC_PEERS),y)
+CMAKE_OPTIONS += -DWITH_DYNAMIC_PEERS:BOOL=TRUE
+endif
+
+ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y)
+CMAKE_OPTIONS += -DWITH_STATUS_SOCKET:BOOL=TRUE
endif
@@ -161,9 +188,9 @@ define Package/fastd/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fastd $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_BIN) files/fastd.init $(1)/etc/init.d/fastd
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.init $(1)/etc/init.d/fastd
$(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_CONF) files/fastd.config $(1)/etc/config/fastd
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.config $(1)/etc/config/fastd
$(INSTALL_DIR) $(1)/etc/fastd
$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
$(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd
patches/packages/routing/0001-Update-batman-adv-and-alfred-to-v2014.4.patch deleted 100644 → 0
+ 0
− 52
View file @ 63165e80
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 7 Jan 2015 16:40:43 +0100
Subject: Update batman-adv and alfred to v2014.4
diff --git a/alfred/Makefile b/alfred/Makefile
index 648a5ef..0a5fcac 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
# The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
#
PKG_NAME:=alfred
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
PKG_RELEASE:=0
-PKG_MD5SUM:=b8ab5677ed73d817b02b0e4fae10357a
+PKG_MD5SUM:=053cb5d9e7ca9384598e82944343dea2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batctl/Makefile b/batctl/Makefile
index ae22286..1009b03 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batctl
-PKG_VERSION:=2014.2.0
+PKG_VERSION:=2014.4.0
PKG_RELEASE:=1
-PKG_MD5SUM:=c196cf95b7324d9123b701a56b06b31d
+PKG_MD5SUM:=f3a14565699313258ee6ba3de783eb0a
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 889dea7..0d5ed33 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
-PKG_VERSION:=2014.2.0
+PKG_VERSION:=2014.4.0
PKG_RELEASE:=1
-PKG_MD5SUM:=1243029b3a3e2f4fa721d1a59c2faaf5
+PKG_MD5SUM:=b1518e84ce530883d224c6ca4c673ce8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
targets/ar71xx-generic/profiles.mk
+ 7
− 4
View file @ ab10be9f
......@@ -112,10 +112,13 @@ $(eval $(call GluonProfile,TLMR3040))
$(eval $(call GluonModel,TLMR3040,tl-mr3040-v1,tp-link-tl-mr3040-v1))
$(eval $(call GluonModel,TLMR3040,tl-mr3040-v2,tp-link-tl-mr3040-v2))
# TL-MR3220 v1, v2
$(eval $(call GluonProfile,TLMR3220))
$(eval $(call GluonModel,TLMR3220,tl-mr3220-v1,tp-link-tl-mr3220-v1))
$(eval $(call GluonModel,TLMR3220,tl-mr3220-v2,tp-link-tl-mr3220-v2))
# TL-MR3220 v1
$(eval $(call GluonProfile,TLMR3220V1))
$(eval $(call GluonModel,TLMR3220V1,tl-mr3220-v1,tp-link-tl-mr3220-v1))
# TL-MR3220 v2
$(eval $(call GluonProfile,TLMR3220V2))
$(eval $(call GluonModel,TLMR3220V2,tl-mr3220-v2,tp-link-tl-mr3220-v2))
# TL-MR3420 v1, v2
$(eval $(call GluonProfile,TLMR3420))
......
targets/ar71xx-generic/vermagic
+ 1
− 1
View file @ ab10be9f
0114c71ed85677c9c1e4911437af4743
c9110281555cccc9dd13e092c2acaeaf
targets/ar71xx-nand/vermagic
+ 1
− 1
View file @ ab10be9f
41123e63bc43f61af09d064504300966
689cae9c23d40bdba3f46c59a12ca179
targets/mpc85xx-generic/vermagic
+ 1
− 1
View file @ ab10be9f
c1a44dd429e530bed2958b8e6cb54a52
18b3b28a5f70d5040f741bd44916dc57
targets/ramips-rt305x/vermagic
+ 1
− 1
View file @ ab10be9f
194d0e9ee3ca8df976c737e78e8b2194
4d806b94ed2b1e50df33a69891888e4a
targets/x86-generic/vermagic
+ 1
− 1
View file @ ab10be9f
3051dee8f07064b727e9d57fbfeb05ec
6581cdee9837e0761056ab3c80d05a2e
targets/x86-kvm_guest/vermagic
+ 1
− 1
View file @ ab10be9f
5e81ad3c25d4a4f02e749f398f1868c5
23b9575454f0084518a8c2f51423207c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz