Merge remote-tracking branch 'openwrt/for-15.05' into for-15.05

This commit is contained in:
Henning Rogge 2015-08-10 14:13:43 +02:00
commit 79325157d0
7 changed files with 18 additions and 18 deletions

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=babeld PKG_NAME:=babeld
PKG_VERSION:=1.6.0 PKG_VERSION:=1.6.1
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/ PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
PKG_MD5SUM:=b0602a6124ddafb37225bd1a2d8abb13 PKG_MD5SUM:=74290f6c3678f314c79bdc0ab99d9f22
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View File

@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
PKG_SOURCE_URL:=git://github.com/axn/bmx6.git PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
PKG_REV:=b6107880b5460625b7ce9359dbeac0cfe863f58c PKG_REV:=2a87b770d3f9c254e3927dc159e2f425f2e0e83a
PKG_VERSION:=r2015060501 PKG_VERSION:=r2015080701
PKG_RELEASE:=4 PKG_RELEASE:=4
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -49,7 +49,7 @@ TARGET_CFLAGS += $(FPIC)
MAKE_ARGS += \ MAKE_ARGS += \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \
EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \
REVISION_VERSION="$(PKG_REV)" \ GIT_REV="$(PKG_REV)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
INSTALL_DIR="$(PKG_INSTALL_DIR)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)" \
STRIP="/bin/false" \ STRIP="/bin/false" \

View File

@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hnetd PKG_NAME:=hnetd
PKG_SOURCE_VERSION:=86da3551277dc5b21e9382233c3ce66a154ab670 PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9
PKG_VERSION:=2015-05-28-$(PKG_SOURCE_VERSION) PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if [ `uci get -q upnpd.config._pcproxy_configured` = "1" ] if [ `uci -q get upnpd.config._pcproxy_configured` = "1" ]
then then
exit exit
fi fi

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd PKG_NAME:=miniupnpd
PKG_VERSION:=1.9.20150430 PKG_VERSION:=1.9.20150609
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE_URL:=http://miniupnp.free.fr/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=996ccae8aa2535a83ed4618c63080978 PKG_MD5SUM:=01ee891286683891240a29b7272d790e
PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi> PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
@ -46,7 +46,7 @@ endef
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
echo "OpenWrt/$(OPENWRTVERSION)" | tr \(\)\ _ >$(PKG_BUILD_DIR)/os.openwrt echo "OpenWrt" | tr \(\)\ _ >$(PKG_BUILD_DIR)/os.openwrt
endef endef
MAKE_FLAGS += \ MAKE_FLAGS += \

View File

@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=nat46 PKG_NAME:=nat46
PKG_VERSION:=4 PKG_VERSION:=6
PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_RELEASE:=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=ccbba8595d7ccbc2ccb1e7d81b420e9587f07fe5 PKG_SOURCE_VERSION:=8ff2ae59ec9840a7b8b45f976c51cae80abe0226
PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org> PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=olsrd PKG_NAME:=olsrd
PKG_VERSION:=0.6.8 PKG_VERSION:=0.9.0.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
PKG_MD5SUM:=feabdd611391dcb30af5795e834cc258 PKG_MD5SUM:=8a2675c33990706cc291b59934024783
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause