Permalink
Browse files

Merge branch 'master' of github.com:dtaht/ceropackages-3.3

Conflicts:
	utils/cerowrt-chrome/files/etc/cerowrt/credits.html
  • Loading branch information...
2 parents da77c5d + 2b70ca4 commit 2f4d7f1340ccd4e76f7431c06d5dafeb1627016d Dave Taht committed Oct 8, 2012
@@ -3,58 +3,59 @@
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
-# Please note this is not an officially released version of babelz
+# Please note this is not an officially released version of babelm
include $(TOPDIR)/rules.mk
PKG_NAME:=babeld
-PKG_VERSION:=20111019
-PKG_RELEASE:=7
+PKG_VERSION:=20120628-git-2
+PKG_RELEASE:=1
#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
#PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
-#PKG_MD5SUM:=e1a801aa48fe26401c29d2152c1a1887
+#PKG_MD5SUM:=c3d2a632d5ad1944d4767960109c867f04e09d5d
-PKG_REV:=8302ad91524e361d04ac6cb7ffb62b88bfaabc1b
+PKG_REV:=69348bb2163fc16dab6c4251b0b50bd703a1fd18
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://git.wifi.pps.jussieu.fr/babeld
+PKG_SOURCE_URL:=git://github.com/jech/babeld.git
PKG_SOURCE_SUBDIR:=babeld-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
+#PKG_SOURCE_VERSION:=origin/smoothed-metric
PKG_SOURCE_PROTO:=git
include $(INCLUDE_DIR)/package.mk
-define Package/babelz
+define Package/babelm
SECTION:=net
CATEGORY:=Network
SUBMENU:=Routing and Redirection
- TITLE:=A loop-free distance-vector routing protocol
+ TITLE:=Experimental convergence algo for babel, the distance-vector routing protocol
URL:=http://www.pps.jussieu.fr/~jch/software/babel/
MAINTAINER:=Dave Taht <d+babel@taht.net>
DEPENDS:=+kmod-ipv6 +librt
endef
-define Package/babelz/description
+define Package/babelm/description
Babel is a loop-avoiding distance-vector routing protocol roughly based
on DSDV and AODV, but with provisions for link cost estimation and
redistribution of routes from other routing protocols.
While it is optimised for wireless mesh networks, Babel will also work
efficiently on wired networks. It will generate between 1.2 and 2.4 times
the amount of routing traffic that RIPng would generate, while
never counting to infinity.
+ This experimental package contains a newer smoothed convergence algo.
endef
-define Package/babelz/conffiles
+define Package/babelm/conffiles
/etc/babel.conf
/etc/config/babeld
endef
MAKE_FLAGS+= \
CFLAGS="$(TARGET_CFLAGS)" \
-define Package/babelz/install
+define Package/babelm/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc
@@ -65,4 +66,4 @@ define Package/babelz/install
$(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld
endef
-$(eval $(call BuildPackage,babelz))
+$(eval $(call BuildPackage,babelm))
File renamed without changes.
@@ -10,6 +10,7 @@ config general
# experimental, don't use it unless you know what you are doing.
## option 'idle_hello_interval' '0'
# option 'diversity' '0,128'
+ option 'smoothed-metric' '4'
# option 'kernel_priority' '0'
# Do not use this option unless you know what you are doing, as it can
# cause persistent route flapping.
@@ -106,6 +106,7 @@ babel_config() {
append_parm "$cfg" 'wired_hello_interval' '-H'
append_parm "$cfg" 'idle_hello_interval' '-i'
append_parm "$cfg" 'diversity' '-z'
+ append_parm "$cfg" 'smoothed-metric' '-M'
append_parm "$cfg" 'kernel_priority' '-k'
append_parm "$cfg" 'duplication_priority' '-A'
append_parm "$cfg" 'debug' '-d'
View
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bind
-PKG_VERSION:=9.9.0
-PKG_RELEASE:=19
+PKG_VERSION:=9.9.1-P3
+PKG_RELEASE:=20
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION)/ \
http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)/
-PKG_MD5SUM:=9281d0b04f711d28153ba1ab04a54026
+PKG_MD5SUM:=8f407c9a988d7b447a54b4cb54230dcb
PKG_FIXUP:=libtool
@@ -24,13 +24,14 @@ include $(INCLUDE_DIR)/package.mk
define Package/bind-latest/Default
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+bind-latest-libs +libopenssl +xinetd
+ DEPENDS:=+bind-latest-libs +libopenssl +xinetd +libcap
TITLE:=bind
URL:=https://www.isc.org/software/bind
SUBMENU:=IP Addresses and Names
endef
define Package/bind-latest-libs
+ $(call Package/bind-latest/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=bind shared libraries
View
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=debloat
-PKG_VERSION:=2
-PKG_RELEASE:=2
+PKG_VERSION:=6
+PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
@@ -36,6 +36,7 @@ define Package/debloat/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) ./files/debloat.hotplug $(1)/etc/hotplug.d/iface/00-debloat
$(INSTALL_BIN) ./files/debloat $(1)/usr/sbin/debloat
+ $(INSTALL_BIN) ./files/simple_qos.sh $(1)/usr/sbin/simple_qos.sh
$(INSTALL_DATA) ./files/debloat.config $(1)/etc/config/debloat
endef
Oops, something went wrong.

0 comments on commit 2f4d7f1

Please sign in to comment.