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

ddns-scripts: no longer build public_suffix_list.dat.gz during build

Browse source 
- no longer build public_suffix_list.dat.gz during build #3678
- replace "\s" with "[[:space:]]" inside Makefile because "\s" ignored by some sed versions
- tools/public_suffix_list.sh still available to rebuild public_suffix_list.dat.gz outside OpenWRT/LEDE build system

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
This commit is contained in:
Christian Schoenebeck 2016-12-25 16:02:52 +01:00
parent 558f0b563b
commit 10e0400a23
3 changed files with 12384 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
net/ddns-scripts/Makefile
View file

@ -12,7 +12,7 @@ PKG_NAME:=ddns-scripts
PKG_VERSION:=2.7.6 PKG_VERSION:=2.7.6
# Release == build # Release == build
# increase on changes of services files or tld_names.dat # increase on changes of services files or tld_names.dat
PKG_RELEASE:=8 PKG_RELEASE:=9
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com> PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
@ -117,21 +117,19 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(CP) ./files $(PKG_BUILD_DIR) $(CP) ./files $(PKG_BUILD_DIR)
for FILE in `find $(PKG_BUILD_DIR)/files -type f`; do \
$(SED) 's/^\s*#/#/' \
-e '/^#\s\|^#$$$$/d' \
-e 's/\s#\s.*$$$$//' \
-e 's/\s*$$$$//' \
-e '/^\/\/\s/d' \
-e '/^\s*$$$$/d' $$$$FILE; \
done
# ensure that VERSION inside dynamic_dns_functions.sh reflect PKG_VERSION of Makefile # ensure that VERSION inside dynamic_dns_functions.sh reflect PKG_VERSION of Makefile
$(SED) '/^VERSION=*/s/.*/VERSION="$(PKG_VERSION)-$(PKG_RELEASE)"/' $(PKG_BUILD_DIR)/files/dynamic_dns_functions.sh $(SED) '/^VERSION=*/s/.*/VERSION="$(PKG_VERSION)-$(PKG_RELEASE)"/' $(PKG_BUILD_DIR)/files/dynamic_dns_functions.sh
$(CP) ./tools $(PKG_BUILD_DIR) # remove comments, white spaces and empty lines
chmod 755 $(PKG_BUILD_DIR)/tools/* for FILE in `find $(PKG_BUILD_DIR)/files -type f`; do \
$(PKG_BUILD_DIR)/tools/public_suffix_list.sh $(SED) 's/^[[:space:]]*//' \
mv -f $(PKG_BUILD_DIR)/tools/public_suffix_list.dat.gz \ -e '/^#[[:space:]]\|^#$$$$/d' \
$(PKG_BUILD_DIR)/files/public_suffix_list.dat.gz -e 's/[[:space:]]#[[:space:]].*$$$$//' \
-e 's/[[:space:]]*$$$$//' \
-e '/^\/\/[[:space:]]/d' \
-e '/^[[:space:]]*$$$$/d' $$$$FILE; \
done
# compress public_suffix_list.dat
gzip -f9 $(PKG_BUILD_DIR)/files/public_suffix_list.dat
endef endef
define Package/$(PKG_NAME)/conffiles define Package/$(PKG_NAME)/conffiles

12371
net/ddns-scripts/files/public_suffix_list.dat Normal file
View file

File diff suppressed because it is too large Load diff

2
net/ddns-scripts/tools/public_suffix_list.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
URL="http://publicsuffix.org/list/public_suffix_list.dat" URL="https://publicsuffix.org/list/public_suffix_list.dat"
TMPFILE=$(dirname $0)/public_suffix_list.tmp TMPFILE=$(dirname $0)/public_suffix_list.tmp
DATFILE=$(dirname $0)/public_suffix_list.dat DATFILE=$(dirname $0)/public_suffix_list.dat