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

Merge pull request #12723 from jonathanunderwood/openwrt-19.07-stubby-0.3.0

Browse source 
[19.07] stubby: update to version 0.3.0
This commit is contained in:
Rosen Penev 2020-07-05 09:34:56 -07:00 committed by GitHub
commit 97aa95766a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/stubby/Makefile
View file

@ -5,23 +5,23 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=stubby PKG_NAME:=stubby
PKG_VERSION:=0.2.6 PKG_VERSION:=0.3.0
PKG_RELEASE:=5 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME) PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME)
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MIRROR_HASH:=af896c471ac67b31c2263d11fcdfcdb32a213621c2f8789f4b0a4ceca4437108 PKG_MIRROR_HASH:=f1585aa6881bf39c2c8f99df045d5739bb78403417a1e827644cb202fa4280f0
PKG_MAINTAINER:=Jonathan Underwood <jonathan.underwood@gmail.com> PKG_MAINTAINER:=Jonathan Underwood <jonathan.underwood@gmail.com>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf CMAKE_INSTALL:=1
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/stubby/Default define Package/stubby/Default
TITLE:=stubby TITLE:=stubby

35
net/stubby/patches/stubby-0.3.0-fix-config-install.patch Normal file
View file

@ -0,0 +1,35 @@
--- a/CMakeLists.txt 2020-07-01 22:17:14.424445933 +0100
+++ b/CMakeLists.txt 2020-07-01 22:17:57.032637638 +0100
@@ -115,14 +115,26 @@
# Ensure the file gets CRLF line endings on Windows.
file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubby.yml INPUT ${CMAKE_CURRENT_SOURCE_DIR}/stubby.yml.example)
-# Copy to destination iff no destination file exists.
+
+# Copy stubby.yml to destination iff no destination file exists.
+# This is complicated by (a) not being able to use generators, due to
+# CMake minimum version requirement, and (b) to account for DESTDIR.
+# And in the latter case, if we're adding DESTDIR to the start of the
+# path, we must on Windows remove any initial drive letter. That's what
+# INSTALL appears to do.
install(CODE "\
- set(targetdir ${STUBBYCONFDIR})\n\
- if (\$ENV{DESTDIR})\n\
- set(targetdir \$ENV{DESTDIR}/\${targetdir})\n\
+ set(targetdir \"${STUBBYCONFDIR}\")\n\
+ set(destdir \"\$ENV{DESTDIR}\")\n\
+ if (destdir)\n\
+ string(REGEX REPLACE \"^([A-Z]:)?/(.*)\" \"\\\\2\" newtarget \"\${targetdir}\")\n\
+ if (newtarget)\n\
+ set(targetdir \"\${newtarget}\")\n\
+ endif ()\n\
+ set(targetdir \"\${destdir}/\${newtarget}\")\n\
endif ()\n\
- if (NOT EXISTS \${targetdir}/stubby.yml)\n\
- file(COPY ${CMAKE_CURRENT_BINARY_DIR}/stubby.yml DESTINATION \${targetdir})\n\
+ if (NOT EXISTS \"\${targetdir}/stubby.yml\")\n\
+ file(COPY \"${CMAKE_CURRENT_BINARY_DIR}/stubby.yml\" DESTINATION \"\${targetdir}\")\n\
+ message(\"-- Installing: \${targetdir}/stubby.yml\")\n\
endif ()")
if (APPLE)