projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 389940c)
Merge pull request #750 from bk138/gcc-include-libgcc-a
authorSteven Barth <steven@midlink.org>
Thu, 8 Jan 2015 06:15:04 +0000 (07:15 +0100)
committerSteven Barth <steven@midlink.org>
Thu, 8 Jan 2015 06:15:04 +0000 (07:15 +0100)
GCC: include libgcc.a

libs/libvorbisidec/Makefile patch | blob | history
net/fastd/Config.in patch | blob | history
net/fastd/Makefile patch | blob | history
net/linknx/Makefile patch | blob | history
sound/mpd/Makefile patch | blob | history

diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile
index cb87ee91a40aa89642df8f4c5dd13822f896bb57..5a026d701f8876e8ac3d068abb9e7bd8192743f4 100644 (file)
--- a/libs/libvorbisidec/Makefile
+++ b/libs/libvorbisidec/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvorbisidec
-PKG_VERSION:=1.0.2+svn18153
-PKG_RELEASE:=2
+PKG_REV:=20150104
+PKG_VERSION:=1.0.3-$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.xiph.org/tremor.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=b56ffce0c0773ec5ca04c466bc00b1bbcaf65aef
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
-PKG_MD5SUM:=4190859414c5d6760e316b5cf00fe7c5
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -21,6 +27,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/fastd/Config.in b/net/fastd/Config.in
index 8292245e6c00ef6bde077c85446d55f5c85f9893..5820b9796562cd11826f8bbefbb02806fe516c61 100644 (file)
--- 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,7 +94,7 @@ config FASTD_WITH_CMDLINE_COMMANDS
        depends on PACKAGE_fastd
        default n
 
-config FASTD_WITH_VERIFY
+config FASTD_WITH_DYNAMIC_PEERS
        bool "Include support for on-verify handlers"
        depends on PACKAGE_fastd
        default n
diff --git a/net/fastd/Makefile b/net/fastd/Makefile
index e6a87283464cb228a93aaa3a279548f1f846a475..5140029297336a1e7241f1b8cc7340dbff95a79c 100644 (file)
--- a/net/fastd/Makefile
+++ b/net/fastd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fastd
 PKG_VERSION:=16
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -22,8 +22,10 @@ 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 \
@@ -31,11 +33,12 @@ 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
 
 
@@ -64,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 \
@@ -73,11 +78,12 @@ 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 \
@@ -93,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
@@ -101,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
@@ -131,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
@@ -148,8 +166,8 @@ 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)
diff --git a/net/linknx/Makefile b/net/linknx/Makefile
index 370656735840d4b4bb977432edff6c9917b1691e..9121fa1c8c60bb820b2c90fc7729e112b0baca1f 100644 (file)
--- a/net/linknx/Makefile
+++ b/net/linknx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linknx
 PKG_VERSION:=0.0.1.32
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=7ecc1208f59bceb05068c752b2250b63
 
 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
@@ -53,11 +53,16 @@ define Package/linknx/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/linknx $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DATA) ./files/linknx.init $(1)/etc/init.d/linknx
+       $(INSTALL_BIN) ./files/linknx.init $(1)/etc/init.d/linknx
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./files/linknx.config $(1)/etc/config/linknx
        $(INSTALL_DATA) ./files/linknx.xml.dist $(1)/etc/linknx.xml.dist
-       $(INSTALL_DIR) $(1)/var/lib/linknx/persist
+       $(INSTALL_DIR) $(1)/tmp/linknx/persist
+endef
+
+define Package/linknx/conffiles
+/etc/config/linknx
+/etc/linknx.xml.dist
 endef
 
 $(eval $(call BuildPackage,linknx))
diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 58b897425aff0bfd076f988f655e05b5c30afd4d..1b1e8686e67b80ad8079ecd4e832d779d4691677 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2014 OpenWrt.org
+# Copyright (C) 2007-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.18.20
+PKG_VERSION:=0.18.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.18/
-PKG_MD5SUM:=88ba076000e13dbf094b3e32a6472944
+PKG_MD5SUM:=945879f55acc256d30a5f69787338ceb
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=GPL-2.0
Mirror of packages feed