Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10793 from micmac1/dnsdist-no-bomb

Browse source 
dnsdist: fix various build failures
This commit is contained in:
Rosen Penev 2019-12-15 21:37:46 -08:00 committed by GitHub
commit ce89774942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libs/tinycdb/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tinycdb PKG_NAME:=tinycdb
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=http://www.corpit.ru/mjt/tinycdb/ PKG_SOURCE_URL:=http://www.corpit.ru/mjt/tinycdb/
PKG_VERSION:=0.78 PKG_VERSION:=0.78
PKG_HASH:=50678f432d8ada8d69f728ec11c3140e151813a7847cf30a62d86f3a720ed63c PKG_HASH:=50678f432d8ada8d69f728ec11c3140e151813a7847cf30a62d86f3a720ed63c
@ -17,23 +17,47 @@ PKG_LICENSE:=NLPL
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# Pass CPPFLAGS in the CFLAGS as otherwise the build system will
# ignore them.
TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
MAKE_FLAGS+= \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"
CDB_INST_STRING:=prefix=/usr install install-sharedlib install-piclib
define Package/tinycdb define Package/tinycdb
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=a Constant DataBase TITLE:=a Constant DataBase
URL:=http://www.corpit.ru/mjt/tinycdb.html URL:=http://www.corpit.ru/mjt/tinycdb.html
ABI_VERSION=1
endef endef
define Package/tinycdb/description define Package/tinycdb/description
TinyCDB is a very fast and simple package for creating and reading constant data bases TinyCDB is a very fast and simple package for creating and reading constant data bases
endef endef
define Build/InstallDev define Package/tinycdb/install
cd $(PKG_BUILD_DIR); $(MAKE) DESTDIR=$(1) prefix=/usr install $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcdb.so.$(ABI_VERSION) $(1)/usr/lib
endef endef
define Build/Compile
$(call Build/Compile/Default,shared staticlib piclib)
endef
define Build/Install
$(call Build/Install/Default,$(CDB_INST_STRING))
endef
define Build/InstallDev
cd $(PKG_BUILD_DIR); $(MAKE) DESTDIR=$(1) $(CDB_INST_STRING)
endef
$(eval $(call BuildPackage,tinycdb)) $(eval $(call BuildPackage,tinycdb))

5
mail/postfix/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=postfix PKG_NAME:=postfix
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_VERSION:=3.4.6 PKG_VERSION:=3.4.6
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
https://cdn.postfix.johnriley.me/mirrors/postfix-release/official/ \ https://cdn.postfix.johnriley.me/mirrors/postfix-release/official/ \
@ -21,7 +21,6 @@ PKG_LICENSE:=IPL-1.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:postfix:postfix PKG_CPE_ID:=cpe:/a:postfix:postfix
PKG_BUILD_DEPENDS:=POSTFIX_CDB:tinycdb
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_POSTFIX_TLS \ CONFIG_POSTFIX_TLS \
CONFIG_POSTFIX_SASL \ CONFIG_POSTFIX_SASL \
@ -44,7 +43,7 @@ define Package/postfix
postfix=25:postfix=25 \ postfix=25:postfix=25 \
postdrop=26:postdrop=26 postdrop=26:postdrop=26
URL:=http://www.postfix.org/ URL:=http://www.postfix.org/
DEPENDS:=+POSTFIX_TLS:libopenssl +POSTFIX_SASL:libsasl2 +POSTFIX_LDAP:libopenldap +POSTFIX_DB:libdb47 +POSTFIX_SQLITE:libsqlite3 +POSTFIX_MYSQL:libmysqlclient +POSTFIX_PGSQL:libpq +POSTFIX_EAI:icu +POSTFIX_PCRE:libpcre DEPENDS:=+POSTFIX_CDB:tinycdb +POSTFIX_TLS:libopenssl +POSTFIX_SASL:libsasl2 +POSTFIX_LDAP:libopenldap +POSTFIX_DB:libdb47 +POSTFIX_SQLITE:libsqlite3 +POSTFIX_MYSQL:libmysqlclient +POSTFIX_PGSQL:libpq +POSTFIX_EAI:icu +POSTFIX_PCRE:libpcre
endef endef
define Package/postfix/description define Package/postfix/description

21
net/dnsdist/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsdist PKG_NAME:=dnsdist
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
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:=https://downloads.powerdns.com/releases/ PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
@ -15,6 +15,8 @@ PKG_CPE_ID:=cpe:/a:powerdns:dnsdist
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=protobuf/host
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_DNSDIST_GNUTLS \ CONFIG_DNSDIST_GNUTLS \
CONFIG_DNSDIST_OPENSSL CONFIG_DNSDIST_OPENSSL
@ -66,7 +68,22 @@ define Package/dnsdist
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=IP Addresses and Names SUBMENU:=IP Addresses and Names
TITLE:=dnsdist DNS-, DOS- and abuse-aware loadbalancer TITLE:=dnsdist DNS-, DOS- and abuse-aware loadbalancer
DEPENDS:=+DNSDIST_OPENSSL:libopenssl +DNSDIST_GNUTLS:libgnutls +protobuf +re2 +libcap +libedit +libfstrm +lua +boost +libnetsnmp +libatomic +libsodium +DNSDIST_DNS_OVER_HTTPS:libh2o-evloop DEPENDS:= \
+DNSDIST_DNS_OVER_HTTPS:libh2o-evloop \
+DNSDIST_GNUTLS:libgnutls \
+DNSDIST_OPENSSL:libopenssl \
+boost \
+libatomic \
+libcap \
+libedit \
+libfstrm \
+libnetsnmp \
+libsodium \
+lmdb \
+lua \
+protobuf \
+re2 \
+tinycdb
URL:=https://dnsdist.org/ URL:=https://dnsdist.org/
endef endef