Merge pull request #1059 from stintel/ssp

Remove optional dependency on libssp from packages
This commit is contained in:
Ted Hess 2015-03-20 14:15:53 -04:00
commit bd5a3304c4
4 changed files with 5 additions and 7 deletions

View file

@ -56,7 +56,7 @@ define Package/libavahi/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
PROVIDES:=libavahi PROVIDES:=libavahi
DEPENDS:=+libpthread +SSP_SUPPORT:libssp DEPENDS:=+libpthread
endef endef
define Package/libavahi/description define Package/libavahi/description
@ -70,7 +70,7 @@ endef
define Package/avahi-autoipd define Package/avahi-autoipd
$(call Package/avahi/Default) $(call Package/avahi/Default)
SUBMENU:=IP Addresses and Names SUBMENU:=IP Addresses and Names
DEPENDS:=+libdaemon +SSP_SUPPORT:libssp DEPENDS:=+libdaemon
TITLE:=IPv4LL network address configuration daemon TITLE:=IPv4LL network address configuration daemon
endef endef
@ -155,7 +155,7 @@ endef
define Package/avahi-dnsconfd define Package/avahi-dnsconfd
$(call Package/avahi/Default) $(call Package/avahi/Default)
SUBMENU:=IP Addresses and Names SUBMENU:=IP Addresses and Names
DEPENDS:=+libavahi +libdaemon +libpthread +SSP_SUPPORT:libssp DEPENDS:=+libavahi +libdaemon +libpthread
TITLE:=A Unicast DNS server using avahi-daemon TITLE:=A Unicast DNS server using avahi-daemon
endef endef

View file

@ -29,7 +29,6 @@ define Package/ethtool
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=Display or change ethernet card settings TITLE:=Display or change ethernet card settings
DEPENDS:=+SSP_SUPPORT:libssp
URL:=http://www.kernel.org/pub/software/network/ethtool/ URL:=http://www.kernel.org/pub/software/network/ethtool/
endef endef

View file

@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/openssh/Default define Package/openssh/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libopenssl +zlib +SSP_SUPPORT:libssp DEPENDS:=+libopenssl +zlib
TITLE:=OpenSSH TITLE:=OpenSSH
MAINTAINER:=Peter Wagner <tripolar@gmx.at> MAINTAINER:=Peter Wagner <tripolar@gmx.at>
URL:=http://www.openssh.com/ URL:=http://www.openssh.com/
@ -124,7 +124,6 @@ endef
define Package/openssh-sftp-server define Package/openssh-sftp-server
$(call Package/openssh/Default) $(call Package/openssh/Default)
TITLE+= SFTP server TITLE+= SFTP server
DEPENDS:=+SSP_SUPPORT:libssp
endef endef
define Package/openssh-sftp-server/description define Package/openssh-sftp-server/description

View file

@ -41,7 +41,7 @@ endef
define Package/tor define Package/tor
$(call Package/tor/Default) $(call Package/tor/Default)
TITLE:=An anonymous Internet communication system TITLE:=An anonymous Internet communication system
DEPENDS:=+libevent2 +libopenssl +libpthread +librt +SSP_SUPPORT:libssp DEPENDS:=+libevent2 +libopenssl +libpthread +librt
endef endef
define Package/tor/description define Package/tor/description