Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ur freetz/CHANGELOG FHEM/CHANGELOG
- --- freetz/CHANGELOG 2018-09-21 06:38:47.481016162 +0200
- +++ FHEM/CHANGELOG 2018-09-21 06:29:44.493658162 +0200
- @@ -1,4 +1,4 @@
- -$Id: CHANGELOG 14874 2018-09-20 22:10:08Z er13 $
- +$Id$
- Latest changes:
- @@ -36,6 +36,7 @@
- - New patches (read online help for more info):
- - New packages, libs, modules:
- + * argp-standalone 1.3
- * asterisk 11.25.3
- * asterisk-chan-capi post-1.1.6 with asterisk11 adjustments by Mihai Moldovan
- * asterisk-chan-dongle 1.1-git (asterisk11 branch)
- @@ -48,39 +49,57 @@
- * bvi 1.4.0
- * cntlm 0.93beta5
- * decrypt FRITZ!OS configs v0.2 (renamed version of PeterPawn's script decode_passwords)
- + * dovecot 2.3.2.1
- + * EIBD BCUSDK 0.0.5
- * ISC dhcp 4.3.6-P1
- * E-MailRelay 1.9
- * getdns 1.4.2
- * gptfdisk 1.0.1
- + * gzip 1.6
- * iksemel 1.5-git
- * iperf 3.6
- * jansson 2.7
- * jq 1.5
- + * letsencrypt (certbot script) 1.0
- * libavmacl2 (taken from AVM's 7490.06.30 open-source package)
- * libcap 2.24
- * libgsm-1.0.13
- + * libmcrypt 2.5.8
- * libmnl 1.0.4
- * libnettle 3.4
- * liblz4 1.8.2
- * libonig 6.7.1
- + * libpthsem 2.0.8
- * libsrtp-1.4.4+20100615
- * libssh2 1.8.0
- * libusb-compat 0.1.5
- + * Linknx 0.0.1.30
- * lzma1 4.65
- - * mbed TLS 2.7.6
- + * mbed TLS 2.7.5
- * nzbget 14.1
- * PJProject 2.2.1
- * Fritz!Box private key password framework v0.7-git (by PeterPawn)
- * python-cheetah 2.4.4
- + * python-configobj 5.0.6
- + * python-googlechart 0.3.0
- + * python-lxml 3.4.0
- * python-mechanize 0.2.5
- + * python-six 1.8.0
- + * python-usb 1.0.0b2
- + * python-yaml 3.11
- * python-yEnc 0.4.0
- + * roundcubemail 1.0.9
- * serf 1.3.9
- * ScanButton 0.2.3.cvs20090713
- * speex 1.2rc1
- * spandsp 0.0.6pre21
- * squashfs-tools 3.4
- * squashfs-tools 4.3 (modified to support AVM-BE format)
- + * tar 1.28
- + * tar-cgi 0.1 (backup cgi)
- + * wfrog 0.8.2+svn953
- * WireGuard 0.0.20180809
- + * ws28xx master
- * xz 5.2.4
- - Updated tools and hooks:
- diff -ur freetz/config/avm/availability.in FHEM/config/avm/availability.in
- --- freetz/config/avm/availability.in 2018-09-21 06:39:08.315428162 +0200
- +++ FHEM/config/avm/availability.in 2018-09-21 06:29:44.537680162 +0200
- @@ -220,7 +220,6 @@
- )) \
- || \
- ( FREETZ_TYPE_LANG_EN && ( \
- - FREETZ_TYPE_7490 || \
- FREETZ_TYPE_7560 || \
- FREETZ_TYPE_7590 \
- ))
- diff -ur freetz/config/mod/download.in FHEM/config/mod/download.in
- --- freetz/config/mod/download.in 2018-09-21 06:39:08.283412162 +0200
- +++ FHEM/config/mod/download.in 2018-09-21 06:29:44.541682161 +0200
- @@ -348,7 +348,6 @@
- default "@AVM/{fritzbox-7490/{other,belgium}/fritz.os,fritzbox.7490/firmware/{english,belgium}}" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_2X
- default "@AVM/{fritzbox-7490/{other,belgium}/fritz.os,fritzbox.7490/firmware/{english,belgium}}" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_5X
- default "@AVM/{fritzbox-7490/{other,belgium}/fritz.os,fritzbox.7490/firmware/{english,belgium}}" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_8X
- - default "@AVM/{fritzbox-7490/{other,belgium}/fritz.os,fritzbox.7490/firmware/{english,belgium}}" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_07_0X
- # default "@AVM/fileadmin/user_upload/DE/Labor/Download,@AVM/beta,@AVM/beta/frisch-aus-der-entwicklung" if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7490
- #
- default "@AVM/{fritzbox-7560/deutschland/fritz.os,fritzbox.7560/firmware/deutsch},@1&1/7560" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7560 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
- @@ -570,7 +569,6 @@
- default "FRITZ.Box_7490.en-de-es-it-fr-pl.113.06.31.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_2X
- default "FRITZ.Box_7490.en-de-es-it-fr-pl.113.06.53.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_5X
- default "FRITZ.Box_7490.en-de-es-it-fr-pl.113.06.84.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_8X
- - default "FRITZ.Box_7490.en-de-es-it-fr-pl.113.07.01.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_07_0X
- #
- default "FRITZ.Box_7560.149.06.53.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7560 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
- default "FRITZ.Box_7560.149.06.83.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7560 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_8X
- @@ -584,7 +582,7 @@
- default "FRITZ.Box_7580.153.06.54.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
- default "FRITZ.Box_7580.153.06.83.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_8X
- default "FRITZ.Box_7580.153.06.92.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_9X
- - default "FRITZ.Box_7580.153.07.01.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_07_0X
- + default "FRITZ.Box_7580.153.07.00.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_07_0X
- #
- default "FRITZ.Box_7590.154.06.86.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7590 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_8X
- default "FRITZ.Box_7590.154.06.92.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7590 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_9X
- @@ -788,7 +786,6 @@
- default "f7cf6f0bf972e7026133d088dad4d86b" if FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_2X
- default "2f05f8a6f4ee3d676068228315c4477a" if FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_5X
- default "3245344121f23077764e51099fd7111b" if FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_8X
- - default "a5241911ab7b612e4e28a58b68b4d26a" if FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_07_0X
- #
- default "d971ac5a27864b3284ddbd38d4efbaef" if FREETZ_TYPE_7560 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
- default "f1698e218e20cce40d109ef1937592ce" if FREETZ_TYPE_7560 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_8X
- @@ -802,7 +799,7 @@
- default "f9c0f0284f0b8c1024e43d2f1c1ee1a2" if FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
- default "4301434de4fc74fd6485e936ce4b9c1c" if FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_8X
- default "3737b57f0efc04ac5607c8a45593bbe8" if FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_9X
- - default "3997991bce1333f3faa83fe2191ebf82" if FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_07_0X
- + default "222099705f0c9c6a03e7b251d73badcc" if FREETZ_TYPE_7580 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_07_0X
- #
- default "d4aaca6e08639b532489415bb719b3b2" if FREETZ_TYPE_7590 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_8X
- default "e7a940dd13debd5531cefef1b68d4cce" if FREETZ_TYPE_7590 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_9X
- diff -ur freetz/FIRMWARES FHEM/FIRMWARES
- --- freetz/FIRMWARES 2018-09-21 06:39:05.690116162 +0200
- +++ FHEM/FIRMWARES 2018-09-21 06:29:44.493658162 +0200
- @@ -1,4 +1,4 @@
- -$Id: FIRMWARES 14873 2018-09-20 21:52:09Z er13 $
- +$Id$
- Currently supported boxes and firmwares
- =======================================
- @@ -237,7 +237,6 @@
- * 113.06.31 rev32500 (International, Belgian release)
- * 113.06.53 rev38152 (International, Belgian release)
- * 113.06.84 rev48533 (International)
- - * 113.07.01 rev61484 (International)
- ====== Fritz!Box Fon WLAN (75xx) ======
- @@ -256,7 +255,7 @@
- * 153.06.54 rev41655
- * 153.06.83 rev44004
- * 153.06.92 rev47571
- - * 153.07.01 rev61517
- + * 153.07.00 rev59665
- * Fritz!Box Fon WLAN 7590
- * 154.06.86 rev45533
- Nur in FHEM/: .git.
- Nur in FHEM/include: .gitignore.
- diff -ur freetz/make/apache2/apache2.mk FHEM/make/apache2/apache2.mk
- --- freetz/make/apache2/apache2.mk 2018-09-21 06:40:04.063288162 +0200
- +++ FHEM/make/apache2/apache2.mk 2018-09-21 06:29:44.549686162 +0200
- @@ -2,24 +2,78 @@
- $(PKG)_SOURCE:=httpd-$($(PKG)_VERSION).tar.bz2
- $(PKG)_SOURCE_SHA1:=94d6e274273903ed153479c7701fa03761abf93d
- $(PKG)_SITE:=@APACHE/httpd
- +# if ssl is configured, then it will be somehow picked up by apache2 configure, therefore enable it anyway
- +$(PKG)_WITH_SSL:=
- +ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_SSL)),y)
- +$(PKG)_WITH_SSL:=y
- +endif
- +ifeq ($(strip $(FREETZ_LIB_libssl)),y)
- +$(PKG)_WITH_SSL:=y
- +endif
- +
- +$(PKG)_CONDITIONAL_PATCHES+=$(FREETZ_PACKAGE_APACHE2_MPM)
- +ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_SMALL)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=small
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_WITH_MYCONFIG)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=myconfig
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_ROUNDCUBEMAIL)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=roundcubemail
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_LINKNX)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=linknx
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_WFROG)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=wfrog
- +endif
- +ifeq ($(strip $(APACHE2_WITH_SSL)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=ssl
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_FHEM)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=fhem
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_PROXY)),y)
- +$(PKG)_CONDITIONAL_PATCHES+=proxy
- +endif
- +ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_SSL_WITH_CERT)),y)
- +$(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -e 's/www.example.com/$(shell echo $(FREETZ_PACKAGE_APACHE2_SSL_CERT_USE_DOMAINNAME) | tr -d "")/' $(abspath $($(PKG)_DIR))/docs/conf/extra/httpd-ssl.conf.in;
- +endif
- +
- +# patch PidFile to /var/run/apache2/httpd.pid
- +$(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -e 's~@rel_runtimedir@~/var/run/apache2~g' $(abspath $($(PKG)_DIR))/docs/conf/extra/httpd-mpm.conf.in;
- +$(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -e 's~@rel_runtimedir@~/var/run/apache2~g' $(abspath $($(PKG)_DIR))/include/ap_config_layout.h.in;
- $(PKG)_BINARY:=$($(PKG)_DIR)/$(pkg)
- $(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/$(pkg)
- +$(PKG)_TAR_CONFIG := $($(PKG)_DEST_DIR)/etc/default.$(pkg)/default_config/default_config.tar
- +$(PKG)_TAR_HTDOC := $($(PKG)_DEST_DIR)/etc/default.$(pkg)/default_htdoc/default_htdoc.tar
- $(PKG)_APXS_SCRIPT:=$($(PKG)_DIR)/support/apxs
- $(PKG)_APXS_SCRIPT_STAGING_DIR:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apxs
- +$(PKG)_HTPW_BINARY:=$($(PKG)_DIR)/support/htpasswd
- +$(PKG)_HTPW_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/htpasswd
- +
- +$(PKG)_CERT_KEY_TARGET := $($(PKG)_DEST_DIR)/etc/default.$(pkg)/ssl/server.key
- +$(PKG)_CERT_CRT_TARGET := $($(PKG)_DEST_DIR)/etc/default.$(pkg)/ssl/server.crt
- +$(PKG)_CERT_CHAIN_TARGET := $($(PKG)_DEST_DIR)/etc/default.$(pkg)/ssl/server-ca.crt
- +$(PKG)_CERT_CSR := $($(PKG)_DIR)/server.csr
- +
- $(PKG)_DEPENDS_ON += apr apr-util pcre
- ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_DEFLATE)),y)
- $(PKG)_DEPENDS_ON += zlib
- endif
- -ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_SSL)),y)
- +ifeq ($(strip $(APACHE2_WITH_SSL)),y)
- $(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
- $(PKG)_DEPENDS_ON += openssl
- endif
- ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_LIBXML)),y)
- $(PKG)_DEPENDS_ON += libxml2
- endif
- +ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_SSL_WITH_CERT)),y)
- +$(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -e 's/www\.example\.com/$(shell echo $(FREETZ_PACKAGE_APACHE2_SSL_CERT_USE_DOMAINNAME) | tr -d "" | sed s~\\\.~\\\\\\.~g)/' docs/conf/extra/httpd-ssl.conf.in;
- +endif
- $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_APACHE2_DEFLATE
- $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_APACHE2_SSL
- @@ -32,7 +86,7 @@
- $(PKG)_CONFIGURE_OPTIONS += --with-apr="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apr-1-config"
- $(PKG)_CONFIGURE_OPTIONS += --with-apr-util="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apu-1-config"
- $(PKG)_CONFIGURE_OPTIONS += --with-pcre="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/pcre-config"
- -$(PKG)_CONFIGURE_OPTIONS += --with-ssl=$(if $(FREETZ_PACKAGE_APACHE2_SSL),"$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",no)
- +$(PKG)_CONFIGURE_OPTIONS += --with-ssl=$(if $(APACHE2_WITH_SSL),"$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",no)
- $(PKG)_CONFIGURE_OPTIONS += --with-z=$(if $(FREETZ_PACKAGE_APACHE2_DEFLATE),"$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",no)
- $(PKG)_CONFIGURE_PRE_CMDS += $(call PKG_MAKE_AC_VARIABLES_PACKAGE_SPECIFIC,libxml2)
- @@ -41,10 +95,10 @@
- $(PKG)_LIBEXECDIR := /usr/lib/$(pkg)
- $(PKG)_CONFIGURE_OPTIONS += --with-program-name=$(pkg)
- $(PKG)_CONFIGURE_OPTIONS += --with-suexec-bin=/usr/sbin/suexec2
- -$(PKG)_CONFIGURE_OPTIONS += --sysconfdir=/etc/$(pkg)
- +$(PKG)_CONFIGURE_OPTIONS += --sysconfdir=/mod/etc/$(pkg)
- $(PKG)_CONFIGURE_OPTIONS += --includedir=/usr/include/$(pkg)
- $(PKG)_CONFIGURE_OPTIONS += --libexecdir=$($(PKG)_LIBEXECDIR)
- -$(PKG)_CONFIGURE_OPTIONS += --datadir=/usr/share/$(pkg)
- +$(PKG)_CONFIGURE_OPTIONS += --datadir=/mod/usr/share/$(pkg)
- $(PKG)_CONFIGURE_OPTIONS += --localstatedir=/var/$(pkg)
- $(PKG)_CONFIGURE_OPTIONS += --enable-substitute
- @@ -53,7 +107,8 @@
- $(PKG)_CONFIGURE_OPTIONS += --enable-headers
- $(PKG)_CONFIGURE_OPTIONS += --enable-unique-id
- $(PKG)_CONFIGURE_OPTIONS += --enable-proxy
- -$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_APACHE2_SSL),--enable-ssl,--disable-ssl)
- +$(PKG)_CONFIGURE_OPTIONS += $(if $(APACHE2_WITH_SSL),--enable-ssl,--disable-ssl)
- +$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_APACHE2_MPM_PREFORK),--with-mpm=prefork,--with-mpm=worker)
- $(PKG)_CONFIGURE_OPTIONS += --enable-dav
- $(PKG)_CONFIGURE_OPTIONS += --enable-dav-fs
- $(PKG)_CONFIGURE_OPTIONS += --enable-suexec
- @@ -63,6 +118,10 @@
- $(PKG)_CONFIGURE_OPTIONS += --disable-lua
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_APACHE2_LIBXML),--enable-xml2enc --enable-proxy-html,--disable-xml2enc --disable-proxy-html)
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_APACHE2_COMPILEINMODS),--enable-mods-static=all --disable-so,--enable-mods-shared=all --enable-so)
- +ifeq ($(strip $(APACHE2_WITH_SSL)),y)
- +$(PKG)_CONFIGURE_OPTIONS += --with-sslport=$(if $(FREETZ_PACKAGE_APACHE2_SSL_WITH_SSLPORT),$(FREETZ_PACKAGE_APACHE2_SSL_WITH_SSLPORT),443)
- +endif
- +$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_APACHE2_PROXY), --enable-proxy-http,)
- $(PKG_SOURCE_DOWNLOAD)
- $(PKG_UNPACKED)
- @@ -80,35 +139,65 @@
- DESTDIR="$(FREETZ_BASE_DIR)/$(APACHE2_DEST_DIR)"
- # remove unneeded files
- $(RM) -r \
- - $(APACHE2_DEST_DIR)/etc/apache2/original \
- + $(APACHE2_DEST_DIR)/mod/etc/apache2/original \
- $(APACHE2_DEST_DIR)/usr/{bin,include,sbin/envvars-std,share/man} \
- - $(APACHE2_DEST_DIR)/usr/share/apache2/{build,cgi-bin/*,error/README*,icons/README*,icons/*.gif,icons/*/*.gif,manual} \
- + $(APACHE2_DEST_DIR)/mod/usr/share/apache2/{build,cgi-bin/*,error/README*,icons/README*,icons/*.gif,icons/*/*.gif,manual} \
- $(APACHE2_DEST_DIR)/var
- # strip binaries & modules
- -$(TARGET_STRIP) $(APACHE2_DEST_DIR)/usr/sbin/* $(APACHE2_DEST_DIR)/usr/lib/apache2/*.so
- # rename suexec to suexec2 manually, apache ignores --with-suexec-bin option
- mv $(APACHE2_DEST_DIR)/usr/sbin/suexec $(APACHE2_DEST_DIR)/usr/sbin/suexec2
- +$($(PKG)_HTPW_TARGET_BINARY): $($(PKG)_TARGET_BINARY)
- + cp $(APACHE2_HTPW_BINARY) $@
- + -$(TARGET_STRIP) $@
- +
- +$($(PKG)_CERT_CRT_TARGET): $($(PKG)_CERT_KEY_TARGET) $($(PKG)_CERT_CSR)
- + openssl x509 -req -in $(APACHE2_CERT_CSR) -out $@ -signkey $< -days 1001
- +
- +$($(PKG)_CERT_KEY_TARGET) $($(PKG)_CERT_CSR):
- + mkdir -p $(dir $@)
- + mkdir -p $(dir $(APACHE2_CERT_CSR))
- + openssl req -nodes -newkey rsa:2048 -keyout $(APACHE2_CERT_KEY_TARGET) -out $(APACHE2_CERT_CSR) -subj "/CN=$(strip $(FREETZ_PACKAGE_APACHE2_SSL_CERT_USE_DOMAINNAME))" && \
- + chmod 600 $(APACHE2_CERT_KEY_TARGET)
- +
- +$($(PKG)_CERT_CHAIN_TARGET): $($(PKG)_CERT_CRT_TARGET)
- + mkdir -p $(dir $@)
- + openssl x509 -inform PEM -in $(APACHE2_CERT_CRT_TARGET) -out $@
- +
- $($(PKG)_APXS_SCRIPT_STAGING_DIR): $($(PKG)_APXS_SCRIPT)
- $(SUBMAKE1) -C $(APACHE2_DIR) \
- install-include install-build \
- DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)"
- $(SED) -i -r -e 's,^(includedir[ \t]*=[ \t]*)(.*),\1$(TARGET_TOOLCHAIN_STAGING_DIR)\2,' \
- - $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/share/apache2/build/config_vars.mk
- + $(TARGET_TOOLCHAIN_STAGING_DIR)/mod/usr/share/apache2/build/config_vars.mk
- $(INSTALL_FILE)
- chmod 755 $@
- $(SED) -i -r -e 's,my \$$STAGING_DIR = "";,my \$$STAGING_DIR = "$(TARGET_TOOLCHAIN_STAGING_DIR)";,' $@
- +$($(PKG)_TAR_CONFIG): $($(PKG)_TARGET_BINARY) $($(PKG)_DIR)/docs/conf
- + mkdir -p $(dir $@)
- + tar -C $(APACHE2_DEST_DIR)/mod/etc/apache2 -cf $@ .
- + $(RM) -r $(APACHE2_DEST_DIR)/mod/etc
- + [ ! -d $(APACHE2_DEST_DIR)/mod/usr ] && $(RM) -r $(APACHE2_DEST_DIR)/mod ||:
- +
- +$($(PKG)_TAR_HTDOC): $($(PKG)_TARGET_BINARY)
- + mkdir -p $(dir $@)
- + tar -C $(APACHE2_DEST_DIR)/mod/usr/share/apache2 -cf $@ .
- + $(RM) -r $(APACHE2_DEST_DIR)/mod/usr
- + [ ! -d $(APACHE2_DEST_DIR)/mod/etc ] && $(RM) -r $(APACHE2_DEST_DIR)/mod ||:
- +
- $(pkg):
- -$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_APXS_SCRIPT_STAGING_DIR)
- +$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_APXS_SCRIPT_STAGING_DIR) $($(PKG)_TAR_CONFIG) $($(PKG)_TAR_HTDOC) $($(PKG)_HTPW_TARGET_BINARY) $(if $(FREETZ_PACKAGE_APACHE2_SSL_WITH_CERT),$($(PKG)_CERT_CHAIN_TARGET),)
- $(pkg)-clean:
- -$(SUBMAKE) -C $(APACHE2_DIR) clean
- $(RM) -r \
- $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apxs \
- $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/apache2 \
- - $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/share/apache2
- + $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/share/apache2 \
- + $(APACHE2_CERT_CSR)
- $(pkg)-uninstall:
- $(RM) -r $(APACHE2_DEST_DIR)
- diff -ur freetz/make/apache2/Config.in FHEM/make/apache2/Config.in
- --- freetz/make/apache2/Config.in 2018-09-21 06:40:03.995254162 +0200
- +++ FHEM/make/apache2/Config.in 2018-09-21 06:29:44.549686162 +0200
- @@ -13,6 +13,10 @@
- select FREETZ_OPENSSL_VERSION_PROMPT if FREETZ_PACKAGE_APACHE2_STATIC && FREETZ_PACKAGE_APACHE2_SSL
- select FREETZ_LIB_libxml2 if ! FREETZ_PACKAGE_APACHE2_STATIC && FREETZ_PACKAGE_APACHE2_LIBXML
- select FREETZ_LIB_libxml2_WITH_HTML if FREETZ_PACKAGE_APACHE2_LIBXML
- + select FREETZ_PACKAGE_PHP_WITH_APACHE2 if FREETZ_PACKAGE_APACHE2_PHP_MOD
- + select FREETZ_PACKAGE_APACHE2_MPM_PREFORK if FREETZ_PACKAGE_APACHE2_PHP_MOD
- + select FREETZ_PACKAGE_APACHE2_MPM_WORKER if ! FREETZ_PACKAGE_APACHE2_PHP_MOD
- + select FREETZ_PACKAGE_APACHE2_LIBXML if FREETZ_PACKAGE_APACHE2_PROXY
- default n
- help
- The Apache httpd server
- @@ -24,6 +28,56 @@
- help
- Enables the deflate compression. Requires libz.
- +config FREETZ_PACKAGE_APACHE2_PHP_MOD
- + bool "Enable PHP Module"
- + depends on FREETZ_PACKAGE_APACHE2
- + default n
- + help
- + Enables the PHP module. Requires php5 module.
- +
- +choice
- +depends on FREETZ_PACKAGE_APACHE2_PHP_MOD
- + prompt "config_mpm"
- + default FREETZ_PACKAGE_APACHE2_MPM_PREFORK if FREETZ_PACKAGE_APACHE2_PHP_MOD
- + default FREETZ_PACKAGE_APACHE2_MPM_WORKER
- +
- + config FREETZ_PACKAGE_APACHE2_MPM_PREFORK
- + bool "Prefork"
- +#
- +# config FREETZ_PACKAGE_APACHE2_MPM_WORKER
- +# bool "Worker"
- +endchoice
- +
- +config FREETZ_PACKAGE_APACHE2_MPM
- + depends on FREETZ_PACKAGE_APACHE2
- + string
- + default "prefork" if FREETZ_PACKAGE_APACHE2_MPM_PREFORK
- + default "worker" if FREETZ_PACKAGE_APACHE2_MPM_WORKER
- +
- +config FREETZ_PACKAGE_APACHE2_SMALL
- + bool "Enable configuration with small memory foot print"
- + depends on FREETZ_PACKAGE_APACHE2
- + default y
- + help
- + Changes number of threads and workers in mpm configuration file.
- +
- +config FREETZ_PACKAGE_APACHE2_PROXY
- + bool "Enable configuration as freetz proxy"
- + depends on FREETZ_PACKAGE_APACHE2
- + select FREETZ_PACKAGE_APACHE2_LIBXML
- + default n
- + help
- + Adds configuration in order that apache works as freetz proxy.
- +
- +config FREETZ_PACKAGE_APACHE2_WITH_MYCONFIG
- + bool "Enable additional configuration accessable via web interface"
- + depends on FREETZ_PACKAGE_APACHE2
- + default n
- + help
- + Provides additional configuration file, which is accessible via
- + freetz web interface to override external access rights and
- + other configuration itmes.
- +
- config FREETZ_PACKAGE_APACHE2_SSL
- bool "Enable SSL"
- depends on FREETZ_PACKAGE_APACHE2
- @@ -31,6 +85,27 @@
- help
- Enables the SSL module. Requires openssl.
- + config FREETZ_PACKAGE_APACHE2_SSL_WITH_CERT
- + depends on FREETZ_PACKAGE_APACHE2_SSL
- + bool "Create self signed certificate"
- + default n
- + help
- + Creates self signed certificate. Needs the domain name of
- + of the web server to be entered.
- +
- + config FREETZ_PACKAGE_APACHE2_SSL_CERT_USE_DOMAINNAME
- + depends on FREETZ_PACKAGE_APACHE2_SSL_WITH_CERT
- + string "enter domain name"
- + default "fritz.box"
- +
- + config FREETZ_PACKAGE_APACHE2_SSL_WITH_SSLPORT
- + depends on FREETZ_PACKAGE_APACHE2_SSL
- + string "enter ssl port"
- + default "443"
- + help
- + Change ssl port to different port,
- + might be changed in conjunction with SSLH package.
- +
- config FREETZ_PACKAGE_APACHE2_LIBXML
- bool "Enable libxml dependent modules"
- depends on FREETZ_PACKAGE_APACHE2
- Nur in FHEM/make/apache2: external.services.
- Nur in FHEM/make/apache2: files.
- Nur in FHEM/make/apache2/patches: 203-adapt-config-to-freetz-environment.patch.
- Nur in FHEM/make/apache2/patches: 208-add-logout-access-rules.patch.
- Nur in FHEM/make/apache2/patches: 300-restrict-htdocs-root-access.patch.
- Nur in FHEM/make/apache2/patches: fhem.
- Nur in FHEM/make/apache2/patches: linknx.
- Nur in FHEM/make/apache2/patches: myconfig.
- Nur in FHEM/make/apache2/patches: prefork.
- Nur in FHEM/make/apache2/patches: proxy.
- Nur in FHEM/make/apache2/patches: roundcubemail.
- Nur in FHEM/make/apache2/patches: small.
- Nur in FHEM/make/apache2/patches: ssl.
- Nur in FHEM/make/apache2/patches: wfrog.
- Nur in FHEM/make: certbot-cgi.
- Nur in freetz/make/debootstrap: patches.
- Nur in FHEM/make: dev-tools.
- Nur in FHEM/make: dev-tools-autoconf.
- Nur in FHEM/make: dev-tools-automake.
- Nur in FHEM/make: dev-tools-bison.
- Nur in FHEM/make: dev-tools-flex.
- Nur in FHEM/make: dev-tools-m4.
- Nur in FHEM/make/dnsmasq/patches: 030-allow-acme-challenge-response-for-certbot.patch.
- Nur in FHEM/make: dovecot.
- diff -ur freetz/make/dropbear/files/root/etc/default.dropbear/dropbear.cfg FHEM/make/dropbear/files/root/etc/default.dropbear/dropbear.cfg
- --- freetz/make/dropbear/files/root/etc/default.dropbear/dropbear.cfg 2018-09-21 06:40:13.087798162 +0200
- +++ FHEM/make/dropbear/files/root/etc/default.dropbear/dropbear.cfg 2018-09-21 06:29:45.089956162 +0200
- @@ -3,3 +3,5 @@
- export DROPBEAR_PORT='22'
- export DROPBEAR_PWDAUTH='yes'
- export DROPBEAR_ROOTONLY='yes'
- +export DROPBEAR_LOGINONLYASUSER=''
- +export DROPBEAR_LOGINONLYUSERID=''
- diff -ur freetz/make/dropbear/files/root/etc/default.dropbear/dropbear.inetd FHEM/make/dropbear/files/root/etc/default.dropbear/dropbear.inetd
- --- freetz/make/dropbear/files/root/etc/default.dropbear/dropbear.inetd 2018-09-21 06:40:13.131820162 +0200
- +++ FHEM/make/dropbear/files/root/etc/default.dropbear/dropbear.inetd 2018-09-21 06:29:45.093958162 +0200
- @@ -7,4 +7,4 @@
- inetdcfg_user=root
- inetdcfg_exe=/usr/sbin/dropbear
- inetdcfg_arg0=dropbear
- -inetdcfg_args="-i$([ "$DROPBEAR_PWDAUTH" = "yes" ] || echo " -s")$([ "$DROPBEAR_ROOTONLY" = "yes" ] && echo " -0") $DROPBEAR_OPTIONS"
- +inetdcfg_args="-i$([ "$DROPBEAR_PWDAUTH" = "yes" ] || echo " -s")$([ "$DROPBEAR_ROOTONLY" = "yes" ] && echo " -0")$([ -n "$DROPBEAR_LOGINONLYUSERID" ] && echo " -U $DROPBEAR_LOGINONLYUSERID") $DROPBEAR_OPTIONS"
- diff -ur freetz/make/dropbear/files/root/etc/init.d/rc.dropbear FHEM/make/dropbear/files/root/etc/init.d/rc.dropbear
- --- freetz/make/dropbear/files/root/etc/init.d/rc.dropbear 2018-09-21 06:40:13.123816162 +0200
- +++ FHEM/make/dropbear/files/root/etc/init.d/rc.dropbear 2018-09-21 06:29:45.093958162 +0200
- @@ -32,6 +32,36 @@
- fi
- }
- +update_option() {
- + local userid do_save=false
- + if [ -n "$DROPBEAR_LOGINONLYASUSER" ]; then
- + userid=`cat /etc/passwd | grep -s '^'"$DROPBEAR_LOGINONLYASUSER" | cut -d: -f3`
- + if [ -z "$userid" ]; then
- + echo "Error[$DAEMON]: userid for $DROPBEAR_LOGINONLYASUSER not found - run 'adduser $DROPBEAR_LOGINONLYASUSER'" 1>&2
- + exit 1
- + elif cat /etc/shadow | grep -q '^'$DROPBEAR_LOGINONLYASUSER':[*!]:' && cat /etc/passwd | grep -q '^'$DROPBEAR_LOGINONLYASUSER'::'; then
- + echo "Error[$DAEMON]: for $DROPBEAR_LOGINONLYASUSER no password set - run 'passwd $DROPBEAR_LOGINONLYASUSER'" 1>&2
- + exit 1
- + else
- + if [ -z "$DROPBEAR_LOGINONLYUSERID" ]; then
- + do_save=true
- + elif [ "$DROPBEAR_LOGINONLYUSERID" != "$userid" ]; then
- + do_save=true
- + fi
- + DROPBEAR_OPTIONS=" -U $userid $DROPBEAR_OPTIONS"
- + fi
- + elif [ -n "$DROPBEAR_LOGINONLYUSERID" ]; then
- + userid=''
- + do_save=true
- + fi
- + if $do_save; then
- + echo -n " ... Saving userid=$userid ... "
- + modconf set ${DAEMON} DROPBEAR_LOGINONLYUSERID=$userid
- + modconf save ${DAEMON}
- + modsave flash
- + fi
- +}
- +
- start() {
- if [ "$DROPBEAR_PWDAUTH" = "yes" ]; then
- if cat /etc/shadow | grep -q '^root:[*!]:'; then
- @@ -58,6 +88,8 @@
- modreg cgi 'dropbear' 'Dropbear'
- modreg daemon $DAEMON
- + update_option
- +
- modlib_start $DROPBEAR_ENABLED
- ;;
- unload)
- @@ -66,6 +98,8 @@
- modlib_stop
- ;;
- start)
- + update_option
- +
- modlib_start
- ;;
- stop)
- diff -ur freetz/make/dropbear/files/root/usr/lib/cgi-bin/dropbear.cgi FHEM/make/dropbear/files/root/usr/lib/cgi-bin/dropbear.cgi
- --- freetz/make/dropbear/files/root/usr/lib/cgi-bin/dropbear.cgi 2018-09-21 06:40:13.091800162 +0200
- +++ FHEM/make/dropbear/files/root/usr/lib/cgi-bin/dropbear.cgi 2018-09-21 06:29:45.093958162 +0200
- @@ -29,6 +29,7 @@
- cgi_print_checkbox_br "pwdauth" "$DROPBEAR_PWDAUTH" "$(lang de:"Passwort-Login erlauben" en:"Allow password login")"
- cgi_print_checkbox_br "rootonly" "$DROPBEAR_ROOTONLY" "$(lang de:"Login nur für root erlauben" en:"Allow only root login")"
- +cgi_print_textline_p "loginonlyasuser" "$DROPBEAR_LOGINONLYASUSER" 20/30 "$(lang de:"Login nur für folgenden Benutzer erlauben" en:"Allow login only for user"):"
- cat << EOF
- <p style="font-size:10px;">$(lang de:"Bitte beachte, dass die FRITZ!Box keine adäquate Benutzerverwaltung bietet. Die Dateien /etc/passwd und /etc/shadow müssen mit <b>modsave</b> gespeichert werden. Bitte aktiviere die Unterstützung für normale Benutzer nur, wenn Du genau weißt, was Du tust." en:"Please note that the FRITZ!Box does not support normal user management. The files /etc/passwd and /etc/shadow have to be saved with <b>modsave</b>. Please activate the support for regular users only if you know what you are doing.")</p>
- diff -ur freetz/make/dropbear/patches/100-root-login-only.patch FHEM/make/dropbear/patches/100-root-login-only.patch
- --- freetz/make/dropbear/patches/100-root-login-only.patch 2018-09-21 06:40:13.347928162 +0200
- +++ FHEM/make/dropbear/patches/100-root-login-only.patch 2018-09-21 06:29:45.093958162 +0200
- @@ -1,46 +1,73 @@
- --- runopts.h
- +++ runopts.h
- -@@ -101,6 +101,9 @@
- +@@ -101,6 +101,10 @@
- gid_t restrict_group_gid;
- #endif
- + /* FRITZ!box */
- + int rootonlylogin;
- ++ int useronlylogin;
- +
- int noauthpass;
- int norootpass;
- int allowblankpass;
- --- svr-runopts.c
- +++ svr-runopts.c
- -@@ -70,6 +70,7 @@
- +@@ -70,6 +70,8 @@
- "-m Don't display the motd on login\n"
- #endif
- "-w Disallow root logins\n"
- + "-0 Allow only root logins\n"
- ++ "-U <user_id> Allow login only from user with id\n"
- #ifdef HAVE_GETGROUPLIST
- "-G Restrict logins to members of specified group\n"
- #endif
- -@@ -137,6 +138,7 @@
- - svr_opts.forced_command = NULL;
- +@@ -118,3 +120,4 @@
- + char* recv_window_arg = NULL;
- + char* keepalive_arg = NULL;
- ++ char* user_id_arg = NULL;
- + char* idle_timeout_arg = NULL;
- +@@ -137,5 +138,8 @@
- ++ svr_opts.forced_command = NULL;
- svr_opts.forkbg = 1;
- svr_opts.norootlogin = 0;
- + svr_opts.rootonlylogin = 0;
- ++ svr_opts.useronlylogin = 0;
- #ifdef HAVE_GETGROUPLIST
- svr_opts.restrict_group = NULL;
- svr_opts.restrict_group_gid = 0;
- -@@ -239,6 +241,9 @@
- +@@ -239,6 +241,12 @@
- case 'w':
- svr_opts.norootlogin = 1;
- break;
- + case '0':
- + svr_opts.rootonlylogin = 1;
- + break;
- ++ case 'U':
- ++ next = &user_id_arg;
- ++ break;
- #ifdef HAVE_GETGROUPLIST
- case 'G':
- next = &svr_opts.restrict_group;
- +--- svr-runopts.c
- ++++ svr-runopts.c
- +@@ -344,5 +354,13 @@
- + opts.keepalive_secs = val;
- + }
- +
- ++ if (user_id_arg) {
- ++ unsigned int val;
- ++ if (m_str_to_uint(user_id_arg, &val) == DROPBEAR_FAILURE) {
- ++ dropbear_exit("Bad user_id_arg '%s'", user_id_arg);
- ++ }
- ++ svr_opts.useronlylogin = val;
- ++ }
- ++
- + if (idle_timeout_arg) {
- + unsigned int val;
- --- svr-auth.c
- +++ svr-auth.c
- -@@ -305,6 +305,14 @@
- +@@ -314,6 +314,21 @@
- }
- #endif HAVE_GETGROUPLIST
- @@ -51,6 +78,13 @@
- + send_msg_userauth_failure(0, 1);
- + return DROPBEAR_FAILURE;
- + }
- ++
- ++ if (svr_opts.useronlylogin && ses.authstate.pw_uid != svr_opts.useronlylogin) {
- ++ TRACE(("leave checkusername: only user login enabled"))
- ++ dropbear_log(LOG_WARNING, "wrong user login rejected");
- ++ send_msg_userauth_failure(0, 1);
- ++ return DROPBEAR_FAILURE;
- ++ }
- +
- TRACE(("shell is %s", ses.authstate.pw_shell))
- Nur in FHEM/make: eibd.
- Nur in FHEM/make: fhem.
- diff -ur freetz/make/.gitignore FHEM/make/.gitignore
- --- freetz/make/.gitignore 2018-09-21 06:40:14.212360162 +0200
- +++ FHEM/make/.gitignore 2018-09-21 06:29:44.549686162 +0200
- @@ -1 +1,2 @@
- -!*.patch
- \ Kein Zeilenumbruch am Dateiende.
- +!*.patch
- +*.in.generated
- \ Kein Zeilenumbruch am Dateiende.
- Nur in FHEM/make: gzip.
- Nur in FHEM/make: knxd.
- Nur in FHEM/make/libs: argp-standalone.
- diff -ur freetz/make/libs/Config.in FHEM/make/libs/Config.in
- --- freetz/make/libs/Config.in 2018-09-21 06:39:37.257892162 +0200
- +++ FHEM/make/libs/Config.in 2018-09-21 06:29:46.678750162 +0200
- @@ -98,6 +98,7 @@
- menu "Graphics & fonts"
- source make/libs/freetype/Config.in
- +source make/libs/libaugeas/Config.in
- source make/libs/libart_lgpl/Config.in
- source make/libs/libexif/Config.in
- source make/libs/jpeg/Config.in
- @@ -172,6 +173,7 @@
- source make/libs/libgsm/Config.in
- source make/libs/iksemel/Config.in
- source make/libs/libpcap/Config.in
- +source make/libs/libmcrypt/Config.in
- source make/libs/libmnl/Config.in
- source make/libs/libnet/Config.in
- source make/libs/liboping/Config.in
- @@ -230,6 +232,7 @@
- endmenu ### "XML & XSLT"
- +source make/libs/argp-standalone/Config.in
- source make/libs/attr/Config.in
- source make/libs/libcap/Config.in
- source make/dbus/Config.in.libs
- @@ -241,12 +244,14 @@
- source make/libs/libev/Config.in
- source make/libs/libevent/Config.in
- source make/libs/libffi/Config.in
- +source make/libs/libfmt/Config.in
- source make/libs/libctlmgr/Config.in
- source make/libs/libmultid/Config.in
- source make/libs/libtool/Config.in
- source make/lua/Config.in.libs
- source make/pcsc-lite/Config.in.libs
- source make/libs/popt/Config.in
- +source make/libs/pthsem/Config.in
- source make/privatekeypassword/Config.in.libs
- source make/libs/protobuf-c/Config.in
- source make/python/Config.in.libs
- diff -ur freetz/make/libs/external.in FHEM/make/libs/external.in
- --- freetz/make/libs/external.in 2018-09-21 06:39:37.105816162 +0200
- +++ FHEM/make/libs/external.in 2018-09-21 06:29:46.678750162 +0200
- @@ -2,6 +2,7 @@
- depends on EXTERNAL_ENABLED
- source make/libs/apr/external.in
- source make/libs/apr-util/external.in
- +source make/libs/libaugeas/external.in
- source make/libs/libart_lgpl/external.in
- source make/libs/linux-atm/external.in
- source make/libs/attr/external.in
- @@ -57,6 +58,7 @@
- source make/libs/mpc/external.in
- source make/libs/mpfr/external.in
- source make/libs/neon/external.in
- +source make/libs/libmcrypt/external.in
- source make/libs/libnet/external.in
- source make/netpbm/external.in.libs
- source make/libs/nettle/external.in
- @@ -78,6 +80,7 @@
- source make/libs/polarssl13/external.in
- source make/libs/popt/external.in
- source make/libs/protobuf-c/external.in
- +source make/libs/pthsem/external.in
- source make/python/external.in.libs
- source make/libs/serf/external.in
- source make/slang/external.in.libs
- Nur in FHEM/make/libs: libaugeas.
- Nur in FHEM/make/libs: libfmt.
- Nur in FHEM/make/libs: libmcrypt.
- diff -ur freetz/make/libs/mbedtls/external.files FHEM/make/libs/mbedtls/external.files
- --- freetz/make/libs/mbedtls/external.files 2018-09-21 06:39:37.105816162 +0200
- +++ FHEM/make/libs/mbedtls/external.files 2018-09-21 06:29:46.694758162 +0200
- @@ -1,3 +1,3 @@
- -[ "$EXTERNAL_FREETZ_LIB_libmbedcrypto" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libmbedcrypto.so.2.7.6"
- -[ "$EXTERNAL_FREETZ_LIB_libmbedtls" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libmbedtls.so.2.7.6"
- -[ "$EXTERNAL_FREETZ_LIB_libmbedx509" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libmbedx509.so.2.7.6"
- +[ "$EXTERNAL_FREETZ_LIB_libmbedcrypto" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libmbedcrypto.so.2.7.5"
- +[ "$EXTERNAL_FREETZ_LIB_libmbedtls" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libmbedtls.so.2.7.5"
- +[ "$EXTERNAL_FREETZ_LIB_libmbedx509" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libmbedx509.so.2.7.5"
- diff -ur freetz/make/libs/mbedtls/external.in FHEM/make/libs/mbedtls/external.in
- --- freetz/make/libs/mbedtls/external.in 2018-09-21 06:39:37.141834162 +0200
- +++ FHEM/make/libs/mbedtls/external.in 2018-09-21 06:29:46.694758162 +0200
- @@ -4,7 +4,7 @@
- default n
- help
- externals the following file(s):
- - ${FREETZ_LIBRARY_DIR}/libmbedcrypto.so.2.7.6
- + ${FREETZ_LIBRARY_DIR}/libmbedcrypto.so.2.7.5
- config EXTERNAL_FREETZ_LIB_libmbedtls
- depends on EXTERNAL_ENABLED && FREETZ_LIB_libmbedtls
- @@ -12,7 +12,7 @@
- default n
- help
- externals the following file(s):
- - ${FREETZ_LIBRARY_DIR}/libmbedtls.so.2.7.6
- + ${FREETZ_LIBRARY_DIR}/libmbedtls.so.2.7.5
- config EXTERNAL_FREETZ_LIB_libmbedx509
- depends on EXTERNAL_ENABLED && FREETZ_LIB_libmbedx509
- @@ -20,4 +20,4 @@
- default n
- help
- externals the following file(s):
- - ${FREETZ_LIBRARY_DIR}/libmbedx509.so.2.7.6
- + ${FREETZ_LIBRARY_DIR}/libmbedx509.so.2.7.5
- diff -ur freetz/make/libs/mbedtls/mbedtls.mk FHEM/make/libs/mbedtls/mbedtls.mk
- --- freetz/make/libs/mbedtls/mbedtls.mk 2018-09-21 06:39:37.141834162 +0200
- +++ FHEM/make/libs/mbedtls/mbedtls.mk 2018-09-21 06:29:46.694758162 +0200
- @@ -1,6 +1,6 @@
- -$(call PKG_INIT_LIB, 2.7.6)
- +$(call PKG_INIT_LIB, 2.7.5)
- $(PKG)_SOURCE:=mbedtls-$($(PKG)_VERSION)-gpl.tgz
- -$(PKG)_SOURCE_SHA1:=85098a0c7740df396d3df44d6c8e089dc182e346
- +$(PKG)_SOURCE_SHA1:=0f74d60421f304155a9fdcdbfeccddc2852d5f82
- $(PKG)_SITE:=https://tls.mbed.org/download
- $(PKG)_LIBNAMES_SHORT := crypto tls x509
- Nur in FHEM/make/libs: pthsem.
- Nur in FHEM/make: linknx.
- diff -ur freetz/make/mod/files/root/usr/bin/kernel_args FHEM/make/mod/files/root/usr/bin/kernel_args
- --- freetz/make/mod/files/root/usr/bin/kernel_args 2018-09-21 06:39:24.523528161 +0200
- +++ FHEM/make/mod/files/root/usr/bin/kernel_args 2018-09-21 06:29:47.179000162 +0200
- @@ -1,6 +1,6 @@
- #!/bin/sh
- -# $Id: kernel_args 4689 2010-04-10 06:17:23Z buehmann $
- +# $Id$
- #
- # Written by Alexander Kriegisch (user 'kriegaex', ip-phone-forum.de)
- #
- diff -ur freetz/make/openssl/openssl.mk FHEM/make/openssl/openssl.mk
- --- freetz/make/openssl/openssl.mk 2018-09-21 06:39:49.403962162 +0200
- +++ FHEM/make/openssl/openssl.mk 2018-09-21 06:29:47.695258162 +0200
- @@ -33,7 +33,7 @@
- $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENSSL_TRACE
- $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENSSL_STATIC
- -$(PKG)_NO_CIPHERS := no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 no-ssl2 no-ssl3
- +$(PKG)_NO_CIPHERS := no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime no-rmd160 no-aes192 no-camellia no-ans1 no-krb5 no-ssl2 no-ssl3
- $(PKG)_NO_CIPHERS += $(if $(FREETZ_LIB_libcrypto_WITH_RC4),,no-rc4)
- $(PKG)_OPTIONS := shared no-err no-fips no-hw no-engines no-sse2 no-capieng no-seed
- Nur in FHEM/make: perl.
- diff -ur freetz/make/php/Config.in FHEM/make/php/Config.in
- --- freetz/make/php/Config.in 2018-09-21 06:39:16.847692162 +0200
- +++ FHEM/make/php/Config.in 2018-09-21 06:29:47.903362162 +0200
- @@ -53,6 +53,19 @@
- menu "PHP features"
- depends on FREETZ_PACKAGE_PHP
- +config FREETZ_PACKAGE_PHP_WITH_APACHE2
- + bool "build php APACHE2 module"
- + depends on FREETZ_PACKAGE_PHP
- + default n
- + help
- + This option enables the PHP support for APACHE2
- +
- +config FREETZ_PACKAGE_PHP_WITH_CLI
- + bool "build with CLI support"
- + default n
- + help
- + This option enables the CLI support for PHP
- +
- config FREETZ_PACKAGE_PHP_WITH_CURL
- bool "build with CURL support"
- select FREETZ_LIB_libcurl if ! FREETZ_PACKAGE_PHP_STATIC
- @@ -104,12 +117,26 @@
- than supported by libc (ISO-8859-1 and UTF-8 only) or your application
- relies on libiconv specific features like TRANSLIT, IGNORE, etc.
- +#config FREETZ_PACKAGE_PHP_WITH_INTL
- +# bool "build with INTL support"
- +# select FREETZ_LIB_libintl if ! FREETZ_PACKAGE_PHP_STATIC
- +# default n
- +# help
- +# This option enables the INTL support for PHP
- +
- config FREETZ_PACKAGE_PHP_WITH_JSON
- bool "build with JSON support"
- default n
- help
- This option enables the JSON support for PHP
- +config FREETZ_PACKAGE_PHP_WITH_MCRYPT
- + bool "build with MCRYPT support"
- + select FREETZ_LIB_libmcrypt if ! FREETZ_PACKAGE_PHP_STATIC
- + default n
- + help
- + This option enables the MCRYPT support for PHP
- +
- config FREETZ_PACKAGE_PHP_WITH_MEMORY_LIMIT
- bool "build with MEMORY_LIMIT support"
- default n
- diff -ur freetz/make/php/php.mk FHEM/make/php/php.mk
- --- freetz/make/php/php.mk 2018-09-21 06:39:16.479508162 +0200
- +++ FHEM/make/php/php.mk 2018-09-21 06:29:47.903362162 +0200
- @@ -6,14 +6,12 @@
- $(PKG)_CONDITIONAL_PATCHES+=$(call GET_MAJOR_VERSION,$($(PKG)_VERSION))
- -$(PKG)_BINARY := $($(PKG)_DIR)/sapi/cgi/php-cgi
- -$(PKG)_TARGET_BINARY := $($(PKG)_DEST_DIR)/usr/bin/php-cgi
- -
- -$(PKG)_CLI_BINARY := $($(PKG)_DIR)/sapi/cli/php
- -$(PKG)_CLI_TARGET_BINARY := $($(PKG)_DEST_DIR)/usr/bin/php
- -
- -$(PKG)_APXS2_BINARY := $($(PKG)_DIR)/libs/libphp5.so
- -$(PKG)_APXS2_TARGET_BINARY := $($(PKG)_DEST_DIR)/usr/lib/apache2/libphp5.so
- +$(PKG)_BINARY :=$($(PKG)_DIR)/sapi/cgi/php-cgi
- +$(PKG)_TARGET_BINARY :=$($(PKG)_DEST_DIR)/usr/bin/php-cgi
- +$(PKG)_APXS2_BINARY :=$(if $(FREETZ_PACKAGE_PHP_WITH_APACHE2),$($(PKG)_DIR)/libs/libphp5.so,)
- +$(PKG)_APXS2_TARGET_BINARY :=$(if $(FREETZ_PACKAGE_PHP_WITH_APACHE2),$($(PKG)_DEST_DIR)/usr/lib/apache2/libphp5.so,)
- +$(PKG)_CLI_BINARY :=$(if $(FREETZ_PACKAGE_PHP_WITH_CLI) ,$($(PKG)_DIR)/sapi/cli/php,)
- +$(PKG)_CLI_TARGET_BINARY :=$(if $(FREETZ_PACKAGE_PHP_WITH_CLI) ,$($(PKG)_DEST_DIR)/usr/bin/php,)
- $(PKG)_STARTLEVEL=90 # before lighttpd
- @@ -23,11 +21,18 @@
- $(PKG)_EXTRA_LDFLAGS += -all-static
- endif
- +ifeq ($(strip $(FREETZ_PACKAGE_PHP_WITH_APACHE2)),y)
- +$(PKG)_DEPENDS_ON += apache2
- +$(PKG)_CONFIGURE_OPTIONS += --with-apxs2="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apxs"
- +endif
- +
- $(PKG)_DEPENDS_ON += pcre
- $(PKG)_CONFIGURE_OPTIONS += --with-pcre-regex="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
- $(PKG)_CONFIGURE_OPTIONS += --enable-cli
- +ifneq ($(strip $(FREETZ_PACKAGE_PHP_WITH_CLI)),y)
- $(PKG)_EXCLUDED += $(if $(FREETZ_PACKAGE_PHP_cli),,$($(PKG)_CLI_TARGET_BINARY))
- +endif
- ifeq ($(strip $(FREETZ_PACKAGE_PHP_apxs2)),y)
- $(PKG)_DEPENDS_ON += apache2
- @@ -40,6 +45,16 @@
- $(PKG)_CONFIGURE_OPTIONS += --with-curl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
- endif
- +ifeq ($(strip $(FREETZ_PACKAGE_PHP_WITH_INTL)),y)
- +#prepare enable-intl does not work yet needs icu-config in icu-dir
- +$(PKG)_REBUILD_SUBOPTS += $(filter FREETZ_LIB_gettext_%,$(INTL_REBUILD_SUBOPTS))
- +$(PKG)_DEPENDS_ON += gettext
- +$(PKG)_CONFIGURE_OPTIONS += --enable-intl
- +$(PKG)_CONFIGURE_OPTIONS += --with-icu-dir="$(TARGET_TOOLCHAIN_STAGING_DIR)"
- +else
- +$(PKG)_CONFIGURE_OPTIONS += --disable-intl
- +endif
- +
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_FILEINFO),--enable-fileinfo,--disable-fileinfo)
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_FTP),--enable-ftp,--disable-ftp)
- @@ -77,6 +92,14 @@
- endif
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_JSON),--enable-json,--disable-json)
- +$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_MHASH) ,--with-mhash,--without-mhash)
- +$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_MEMORY_LIMIT),--enable-memory-limit,--disable-memory-limit)
- +
- +ifeq ($(strip $(FREETZ_PACKAGE_PHP_WITH_MCRYPT)),y)
- +$(PKG)_DEPENDS_ON += libmcrypt
- +$(PKG)_CONFIGURE_OPTIONS += --with-mcrypt="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
- +$(PKG)_CONFIGURE_POST_CMDS += sed -i -r -e '/EXTRA_LIBS/ s/-lltdl//g' ./Makefile;
- +endif
- ifeq ($(strip $(FREETZ_PACKAGE_PHP_WITH_LIBXML)),y)
- $(PKG)_DEPENDS_ON += libxml2
- @@ -91,18 +114,12 @@
- $(PKG)_CONFIGURE_OPTIONS += --$($(PKG)_XML_SUPPORT)-xmlreader
- $(PKG)_CONFIGURE_OPTIONS += --$($(PKG)_XML_SUPPORT)-xmlwriter
- -$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_MHASH),--with-mhash,--without-mhash)
- -
- -$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_MEMORY_LIMIT),--enable-memory-limit,--disable-memory-limit)
- -
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_PCNTL),--enable-pcntl,--disable-pcntl)
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_SESSION),--enable-session,--disable-session)
- $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_SOCKETS),--enable-sockets,--disable-sockets)
- -$(PKG)_CONFIGURE_OPTIONS += --without-sqlite
- -
- ifeq ($(strip $(FREETZ_PACKAGE_PHP_WITH_SQLITE3)),y)
- $(PKG)_DEPENDS_ON += sqlite
- $(PKG)_CONFIGURE_OPTIONS += --with-sqlite3="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
- @@ -192,6 +209,7 @@
- endif
- $(PKG)_CONFIGURE_OPTIONS += --enable-exif
- $(PKG)_CONFIGURE_OPTIONS += --enable-mbstring
- +$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_PHP_WITH_CLI) ,--enable-cli,--disable-cli)
- $(PKG)_CONFIGURE_OPTIONS += --disable-phar
- $(PKG)_CONFIGURE_OPTIONS += --disable-rpath
- $(PKG)_CONFIGURE_OPTIONS += --with-config-file-path=/tmp/flash
- diff -ur freetz/make/python/Config.in FHEM/make/python/Config.in
- --- freetz/make/python/Config.in 2018-09-21 06:39:31.695112162 +0200
- +++ FHEM/make/python/Config.in 2018-09-21 06:29:47.923372162 +0200
- @@ -131,11 +131,13 @@
- bool "ctypes"
- depends on FREETZ_PACKAGE_PYTHON
- select FREETZ_LIB_libffi
- + select FREETZ_PACKAGE_DEV_TOOLS
- default n
- help
- Foreign function library for Python, that provides C compatible
- data types and allows calling functions in DLLs or shared
- - libraries. Requires libffi.
- + libraries. Requires libffi
- + (needs objdump, ld gcc, therefore target DEV_TOOLS).
- For details, see: http://docs.python.org/2/library/ctypes.html
- config FREETZ_PACKAGE_PYTHON_MOD_CURSES
- @@ -358,14 +360,47 @@
- menu "3rd-party modules"
- depends on FREETZ_PACKAGE_PYTHON
- + source make/python-augeas/Config.in
- + source make/python-backports.ssl_match_hostname/Config.in
- source make/python-bjoern/Config.in
- + source make/python-certbot/Config.in
- + source make/python-cffi/Config.in
- source make/python-cheetah/Config.in
- + source make/python-configargparse/Config.in
- + source make/python-cryptography/Config.in
- + source make/python-configobj/Config.in
- + source make/python-enum34/Config.in
- + source make/python-future/Config.in
- + source make/python-idna/Config.in
- source make/python-imaging-library/Config.in
- + source make/python-ipaddress/Config.in
- + source make/python-josepy/Config.in
- source make/python-mechanize/Config.in
- + source make/python-mock/Config.in
- + source make/python-ndg_httpsclient/Config.in
- + source make/python-lxml/Config.in
- + source make/python-parsedatetime/Config.in
- + source make/python-platformer/Config.in
- + source make/python-pyasn1/Config.in
- + source make/python-pycparser/Config.in
- source make/python-pycrypto/Config.in
- source make/python-pycurl/Config.in
- + source make/python-pygooglechart/Config.in
- source make/python-pyopenssl/Config.in
- + source make/python-pyrfc3339/Config.in
- source make/python-pyrrd/Config.in
- source make/python-pyserial/Config.in
- + source make/python-pythondialog/Config.in
- + source make/python-pytz/Config.in
- + source make/python-pyusb/Config.in
- + source make/python-pyyaml/Config.in
- + source make/python-requests/Config.in
- + source make/python-samsungctl/Config.in
- + source make/python-setuptools/Config.in
- + source make/python-six/Config.in
- source make/python-yenc/Config.in
- + source make/python-websocket-client/Config.in
- + source make/python-zopecomponent/Config.in
- + source make/python-zopeevent/Config.in
- + source make/python-zopeinterface/Config.in
- endmenu
- diff -ur freetz/make/python/python.mk FHEM/make/python/python.mk
- --- freetz/make/python/python.mk 2018-09-21 06:39:31.615072162 +0200
- +++ FHEM/make/python/python.mk 2018-09-21 06:29:47.923372162 +0200
- @@ -32,7 +32,7 @@
- $(PKG)_BUILD_PREREQ += zip
- $(PKG)_BUILD_PREREQ_HINT := Hint: on Debian-like systems this binary is provided by the zip package (sudo apt-get install zip)
- -$(PKG)_HOST_DEPENDS_ON += python-host
- +$(PKG)_HOST_DEPENDS_ON += python-host python-cffi-host
- $(PKG)_DEPENDS_ON += expat libffi zlib
- $(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_PYTHON_MOD_BSDDB),db)
- $(PKG)_DEPENDS_ON += $(if $(or $(FREETZ_PACKAGE_PYTHON_MOD_CURSES),$(FREETZ_PACKAGE_PYTHON_MOD_READLINE)),ncurses)
- @@ -48,6 +48,7 @@
- $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_PYTHON_MOD_SSL
- $(PKG)_REBUILD_SUBOPTS += $(OPENSSL_REBUILD_SUBOPTS)
- $(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT
- +$(PKG)_REBUILD_SUBOPTS += $(if $(FREETZ_PACKAGE_PYTHON_MOD_CTYPES),FREETZ_TARGET_TOOLCHAIN)
- $(PKG)_CONFIGURE_ENV += ac_cv_have_chflags=no
- @@ -138,6 +139,7 @@
- ); \
- touch -c $@
- +
- ifneq ($(strip $(FREETZ_PACKAGE_PYTHON_STATIC)),y)
- $($(PKG)_LIB_PYTHON_TARGET_DIR): $($(PKG)_DIR)/.installed
- @mkdir -p $(dir $@); \
- @@ -189,6 +191,8 @@
- $(RM) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libpython$(PYTHON_MAJOR_VERSION).*
- $(RM) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/python*
- +
- +
- $(pkg)-uninstall:
- $(RM) -r \
- $(PYTHON_TARGET_BINARY) \
- @@ -199,4 +203,5 @@
- $(PYTHON_ZIPPED_PYC_TARGET_DIR) \
- $(PYTHON_DEST_DIR)/usr/include/python$(PYTHON_MAJOR_VERSION)
- +
- $(PKG_FINISH)
- diff -ur freetz/make/python/python-module-macros.mk.in FHEM/make/python/python-module-macros.mk.in
- --- freetz/make/python/python-module-macros.mk.in 2018-09-21 06:39:31.607068162 +0200
- +++ FHEM/make/python/python-module-macros.mk.in 2018-09-21 06:29:47.923372162 +0200
- @@ -19,7 +19,7 @@
- # $(2) => parameters to be passed to host-python
- define HostPython
- ( \
- - export PYTHONPATH="$(PYTHON_STAGING_LIB_DIR):$(TARGET_TOOLCHAIN_STAGING_DIR)/$(PYTHON_SITE_PKG_DIR)"; \
- + export PYTHONPATH="$(FREETZ_BASE_DIR)/tools/build$(PYTHON_SITE_PKG_DIR)/../lib-dynload:$(FREETZ_BASE_DIR)/tools/build$(PYTHON_SITE_PKG_DIR)/../site-packages:$(PYTHON_STAGING_LIB_DIR):$(TARGET_TOOLCHAIN_STAGING_DIR)/site-packages"; \
- export PYTHONOPTIMIZE=""; \
- export PYTHONDONTWRITEBYTECODE=1; \
- $(1) \
- Nur in FHEM/make: python-augeas.
- Nur in FHEM/make: python-backports.ssl_match_hostname.
- Nur in FHEM/make: python-certbot.
- Nur in FHEM/make: python-cffi.
- diff -ur freetz/make/python-cheetah/Config.in FHEM/make/python-cheetah/Config.in
- --- freetz/make/python-cheetah/Config.in 2018-09-21 06:40:04.379446162 +0200
- +++ FHEM/make/python-cheetah/Config.in 2018-09-21 06:29:47.915368162 +0200
- @@ -3,3 +3,5 @@
- depends on FREETZ_PACKAGE_PYTHON
- select FREETZ_LIB_libpython2 if !FREETZ_PACKAGE_PYTHON_STATIC
- default n
- + help
- + Cheetah is an open source template engine and code generation tool.
- diff -ur freetz/make/python-cheetah/python-cheetah.mk FHEM/make/python-cheetah/python-cheetah.mk
- --- freetz/make/python-cheetah/python-cheetah.mk 2018-09-21 06:40:04.379446162 +0200
- +++ FHEM/make/python-cheetah/python-cheetah.mk 2018-09-21 06:29:47.915368162 +0200
- @@ -25,6 +25,7 @@
- $(pkg)-uninstall:
- $(RM) -r \
- + $(PYTHON_CHEETAH_DEST_DIR)/usr/bin/cheetah* \
- $(PYTHON_CHEETAH_DEST_DIR)$(PYTHON_SITE_PKG_DIR)/Cheetah \
- $(PYTHON_CHEETAH_DEST_DIR)$(PYTHON_SITE_PKG_DIR)/Cheetah-*.egg-info
- Nur in FHEM/make: python-configargparse.
- Nur in FHEM/make: python-configobj.
- Nur in FHEM/make: python-cryptography.
- Nur in FHEM/make: python-enum34.
- Nur in FHEM/make: python-future.
- Nur in FHEM/make: python-idna.
- Nur in FHEM/make: python-ipaddress.
- Nur in FHEM/make: python-josepy.
- Nur in FHEM/make: python-lxml.
- Nur in FHEM/make: python-mock.
- Nur in FHEM/make: python-ndg_httpsclient.
- Nur in FHEM/make: python-parsedatetime.
- Nur in FHEM/make: python-platformer.
- Nur in FHEM/make: python-pyasn1.
- Nur in FHEM/make: python-pycparser.
- Nur in FHEM/make: python-pygooglechart.
- Nur in FHEM/make: python-pyrfc3339.
- Nur in FHEM/make: python-pythondialog.
- Nur in FHEM/make: python-pytz.
- Nur in FHEM/make: python-pyusb.
- Nur in FHEM/make: python-pyyaml.
- Nur in FHEM/make: python-requests.
- Nur in FHEM/make: python-samsungctl.
- Nur in FHEM/make: python-setuptools.
- Nur in FHEM/make: python-six.
- Nur in FHEM/make: python-websocket-client.
- Nur in FHEM/make: python-zopecomponent.
- Nur in FHEM/make: python-zopeevent.
- Nur in FHEM/make: python-zopeinterface.
- Nur in FHEM/make: roundcubemail.
- Nur in FHEM/make: tar.
- Nur in FHEM/make: tar-cgi.
- Nur in FHEM/make: wfrog.
- Nur in FHEM/make: wfrog-ws28xx.
- diff -ur freetz/make/xmail/files/.language FHEM/make/xmail/files/.language
- --- freetz/make/xmail/files/.language 2018-09-21 06:39:22.702618162 +0200
- +++ FHEM/make/xmail/files/.language 2018-09-21 06:29:47.987404162 +0200
- @@ -5,5 +5,7 @@
- files
- {
- etc/init.d/rc.xmail
- + etc/default.xmail/server_cert.def
- + etc/default.xmail/server_key.def
- usr/lib/cgi-bin/xmail.cgi
- }
- Nur in FHEM/make/xmail/files/root/etc/default.xmail: server_cert.def.
- Nur in FHEM/make/xmail/files/root/etc/default.xmail: server_key.def.
- diff -ur freetz/make/xmail/files/root/etc/default.xmail/xmail.cfg FHEM/make/xmail/files/root/etc/default.xmail/xmail.cfg
- --- freetz/make/xmail/files/root/etc/default.xmail/xmail.cfg 2018-09-21 06:39:22.702618162 +0200
- +++ FHEM/make/xmail/files/root/etc/default.xmail/xmail.cfg 2018-09-21 06:29:47.987404162 +0200
- @@ -15,3 +15,4 @@
- export XMAIL_CTRL='no'
- export XMAIL_CTRLS='no'
- export XMAIL_SPECIAL='-Qn 1 -PX 1 -SX 1 -Ln 1 -Yt 1 -CX 1 -Yi 600'
- +export XMAIL_USECERTBOT='no'
- diff -ur freetz/make/xmail/files/root/etc/init.d/rc.xmail FHEM/make/xmail/files/root/etc/init.d/rc.xmail
- --- freetz/make/xmail/files/root/etc/init.d/rc.xmail 2018-09-21 06:39:22.706620161 +0200
- +++ FHEM/make/xmail/files/root/etc/init.d/rc.xmail 2018-09-21 06:29:47.987404162 +0200
- @@ -55,6 +55,51 @@
- [ "$fat" = "0" ] && chown -hR xmail:xmail $XMAIL_MAILLOCATION || chmod -R 777 $XMAIL_MAILLOCATION
- fi
- + if [ ! -e /tmp/flash/${DAEMON} ]; then
- + mkdir -p /tmp/flash/${DAEMON}
- + fi
- + if [ ! -e /tmp/flash/${DAEMON}/server.key ]; then
- + touch /tmp/flash/${DAEMON}/server.key
- + fi
- + if [ ! -e /tmp/flash/${DAEMON}/server.cert ]; then
- + touch /tmp/flash/${DAEMON}/server.cert
- + fi
- + local use_certbot='no'
- + if [ "${XMAIL_USECERTBOT}" = 'yes' ]; then
- + if [ -e /mod/etc/conf/certbot.cfg ]; then
- + . /mod/etc/conf/certbot.cfg
- + if [ "$CERTBOT_ENABLED" = 'yes' ]; then
- + if [ ! -z ${CERTBOT_FLASH}/$(basename ${CERTBOT_CHAINPATH}) ] && [ ! -z ${CERTBOT_FLASH}/$(basename ${CERTBOT_CERTPATH}) ]; then
- + echo -n 'using certbot certs ... '
- + rm -f /mod/etc/$DAEMON/server.cert /mod/etc/$DAEMON/server.key /mod/etc/$DAEMON/server.crt
- + ln -s ${CERTBOT_FLASH}/$(basename ${CERTBOT_FULLCHAINPATH}) /mod/etc/$DAEMON/server.cert
- + ln -s ${CERTBOT_FLASH}/$(basename ${CERTBOT_FULLCHAINPATH}) /mod/etc/$DAEMON/server.crt
- + ln -s ${CERTBOT_FLASH}/server.key /mod/etc/$DAEMON/server.key
- + use_certbot='yes'
- + echo 'done.'
- + fi
- + fi
- + fi
- + fi
- + if [ "$use_certbot" = 'no' ]; then
- + if [ -s /tmp/flash/${DAEMON}/server.cert ] && [ -s /tmp/flash/${DAEMON}/server.key ]; then
- + echo -n 'using xmail certs from flash ... '
- + rm -f /mod/etc/$DAEMON/server.cert /mod/etc/$DAEMON/server.key /mod/etc/$DAEMON/server.crt
- + ln -s /tmp/flash/${DAEMON}/server.cert /mod/etc/$DAEMON/server.cert
- + ln -s /tmp/flash/${DAEMON}/server.crt /mod/etc/$DAEMON/server.crt
- + ln -s /tmp/flash/${DAEMON}/server.key /mod/etc/$DAEMON/server.key
- + echo 'done.'
- + else
- + if [ -e /mod/etc/$DAEMON/server.cert ] && [ -e /mod/etc/$DAEMON/server.key ]; then
- + echo -n 'use xmail certs from disk ... '
- + echo 'done.'
- + else
- + echo -n 'ERROR certs are ... missing '
- + exit 1
- + fi
- + fi
- + fi
- +
- [ ! -z "$XMAIL_SPECIAL" ] && CMDOPTS="$CMDOPTS $XMAIL_SPECIAL"
- if [ "$XMAIL_POP3" = "yes" ]; then
- [ -n "$XMAIL_POP3PORT" ] && CMDOPTS="$CMDOPTS -Pp $XMAIL_POP3PORT"
- @@ -130,6 +175,8 @@
- ""|load)
- modreg cgi 'xmail' 'XMail'
- modreg daemon $DAEMON
- + modreg file $DAEMON cert 'server.cert' 1 "server_cert"
- + modreg file $DAEMON key 'server.key' 1 "server_key"
- if [ "$XMAIL_ENABLED" != "yes" ]; then
- echo "$DAEMON is disabled." 1>&2
- @@ -142,6 +189,7 @@
- unload)
- modunreg daemon $DAEMON
- modunreg cgi xmail
- + modunreg file $DAEMON
- [ -s /var/run/rc.$DAEMON.pid ] && PID_FILE=/var/run/rc.$DAEMON.pid
- modlib_stop && cleanup
- ;;
- diff -ur freetz/make/xmail/files/root/usr/lib/cgi-bin/xmail.cgi FHEM/make/xmail/files/root/usr/lib/cgi-bin/xmail.cgi
- --- freetz/make/xmail/files/root/usr/lib/cgi-bin/xmail.cgi 2018-09-21 06:39:22.798666162 +0200
- +++ FHEM/make/xmail/files/root/usr/lib/cgi-bin/xmail.cgi 2018-09-21 06:29:47.987404162 +0200
- @@ -1,6 +1,7 @@
- #!/bin/sh
- . /usr/lib/libmodcgi.sh
- +[ -e /mod/etc/conf/certbot.cfg ] && . /mod/etc/conf/certbot.cfg
- XMAIL_SSLSUPPORT= XMAIL_SSLVISIBLE=
- @@ -9,6 +10,8 @@
- # Check for installed and running PHPXmail
- [ -e /mod/etc/init.d/rc.phpxmail ] && XMAIL_PHPXMAIL=1
- +check "$XMAIL_ENABLED" yes:auto "*":man
- +check "$XMAIL_USECERTBOT" yes:usecertbot "*":xmail
- check "$XMAIL_UNPRIV" yes:unpriv
- check "$XMAIL_SMTP" yes:smtp
- check "$XMAIL_SSMTP" yes:ssmtp
- @@ -43,6 +46,21 @@
- <hr>
- <p style="font-size:10px;">$(lang de:"Bitte ändern Sie diese Werte nur wenn Sie wissen was Sie tun." en:"Please change these values only if you know what you are doing.")</p>
- <p> $(lang de:"Startparameter" en:"Start parameters"): <input type="text" name="special" size="55" maxlength="255" value="$(html "$XMAIL_SPECIAL")"></p>
- +<hr>
- +EOF
- +if [ "$CERTBOT_ENABLED" = 'yes' ]; then
- +cat << EOF
- +<input id="c1" type="radio" name="usecertbot" value="yes"$usecertbot_chk><label for="c1"> $(lang de:"Benutze Certbots SSL Zertifikat" en:"Use Certbot SSL certificate")</label>
- +EOF
- +else
- +cat << EOF
- +<input id="c1" type="hidden" name="usecertbot" value="yes"$usecertbot_chk>
- +EOF
- +fi
- +cat << EOF
- +<br>
- +<input id="c2" type="radio" name="usecertbot" value="no"$xmail_chk><label for="c2"> $(lang de:"Benutze XMails SSL Zertifikat" en:"Use XMail SSL certificate")</label>
- +</p>
- EOF
- sec_end
- Nur in FHEM/make/xmail/files/root/usr: sbin.
- diff -ur freetz/make/xmail/xmail.mk FHEM/make/xmail/xmail.mk
- --- freetz/make/xmail/xmail.mk 2018-09-21 06:39:17.704120162 +0200
- +++ FHEM/make/xmail/xmail.mk 2018-09-21 06:29:47.987404162 +0200
- @@ -3,6 +3,8 @@
- $(PKG)_SOURCE_MD5:=73c9d95012709d7b11511dfb6dd6ab3d
- $(PKG)_SITE:=http://www.xmailserver.org
- +$(PKG)_STARTLEVEL=91 # before dovecot
- +
- $(PKG)_BINARIES := compartment sendmail XMail XMCrypt CtrlClnt MkUsers
- $(PKG)_BINARIES_BUILD_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DIR)/bin/%)
- $(PKG)_BINARIES_TARGET_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DEST_DIR)/usr/lib/MailRoot/bin/%)
- diff -ur freetz/Makefile FHEM/Makefile
- --- freetz/Makefile 2018-09-21 06:39:09.323932162 +0200
- +++ FHEM/Makefile 2018-09-21 06:29:44.493658162 +0200
- @@ -237,8 +237,13 @@
- TOOLCHAIN_SOURCE:=$(patsubst %,%-source,$(TOOLCHAIN))
- ifeq ($(strip $(FREETZ_BUILD_TOOLCHAIN)),y)
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- include $(TOOLCHAIN_DIR)/make/kernel-toolchain.mk
- +endif
- include $(TOOLCHAIN_DIR)/make/target-toolchain.mk
- +ifeq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- +include $(TOOLCHAIN_DIR)/make/download-toolchain.mk
- +endif
- else
- include $(TOOLCHAIN_DIR)/make/download-toolchain.mk
- endif
- diff -ur freetz/README FHEM/README
- --- freetz/README 2018-09-21 06:39:04.865704162 +0200
- +++ FHEM/README 2018-09-21 06:29:44.493658162 +0200
- @@ -3,7 +3,7 @@
- | |\ |__ |__ | /_
- -$Id: README 7068 2011-06-01 07:46:32Z oliver $
- +$Id$
- This mod is distributed without any warranty (not even the implied
- warranty of merchantability or fitness for a particular purpose).
- diff -ur freetz/STARTLEVEL FHEM/STARTLEVEL
- --- freetz/STARTLEVEL 2018-09-21 06:38:47.308930162 +0200
- +++ FHEM/STARTLEVEL 2018-09-21 06:29:44.493658162 +0200
- @@ -7,21 +7,21 @@
- webcfg
- #Basics
- -inotify-tools STARTLEVEL=10
- +inotify-tools STARTLEVEL=10
- usbroot STARTLEVEL=11
- syslogd-cgi STARTLEVEL=12
- downloader STARTLEVEL=13
- inetd STARTLEVEL=14
- #Interfaces
- -cpmaccfg-cgi STARTLEVEL=20
- -virtualip-cgi STARTLEVEL=20
- +cpmaccfg-cgi STARTLEVEL=20
- +virtualip-cgi STARTLEVEL=20
- #Firewall
- -iptables-cgi STARTLEVEL=25
- +iptables-cgi STARTLEVEL=25
- nhipt STARTLEVEL=25
- #SSH
- -authorized-keys STARTLEVEL=30
- +authorized-keys STARTLEVEL=30
- dropbear STARTLEVEL=30
- #DNS
- @@ -54,8 +54,9 @@
- #Misc
- dbus STARTLEVEL=90 # before avahi
- -php STARTLEVEL=90 # before lighttpd
- +php STARTLEVEL=90 # before lighttpd
- sundtek STARTLEVEL=90 # before rrdstats
- -
- +xmail STARTLEVEL=91 # before dovecot
- +dovecot STARTLEVEL=92 # after xmail
- # grep STARTLEVEL `find . -name *.mk` |sed 's/ #/\t#/g;s/.*\///g;s/.mk:\$(PKG)_/\t/g' |sort -k2
- Nur in freetz/: .svn.
- Nur in FHEM/toolchain/make/kernel/gcc/4.8: 200-gcc-config-host-linux-missing-SSIZE_MAX-definition.patch.
- Nur in freetz/toolchain/make/kernel/gcc/4.8: release.
- Nur in freetz/toolchain/make/kernel/gcc/4.8: snapshot.
- diff -ur freetz/toolchain/make/Makefile.in FHEM/toolchain/make/Makefile.in
- --- freetz/toolchain/make/Makefile.in 2018-09-21 06:38:41.858206162 +0200
- +++ FHEM/toolchain/make/Makefile.in 2018-09-21 06:29:48.015418162 +0200
- @@ -52,7 +52,9 @@
- TARGET_MAKE_PATH:=$(TARGET_TOOLCHAIN_STAGING_DIR)/bin
- ifeq ($(strip $(FREETZ_BUILD_TOOLCHAIN)),y)
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- TOOLCHAIN:=kernel-toolchain target-toolchain
- +endif
- else
- TOOLCHAIN:=download-toolchain
- endif
- diff -ur freetz/toolchain/make/target/binutils/binutils.mk FHEM/toolchain/make/target/binutils/binutils.mk
- --- freetz/toolchain/make/target/binutils/binutils.mk 2018-09-21 06:38:42.966760162 +0200
- +++ FHEM/toolchain/make/target/binutils/binutils.mk 2018-09-21 06:29:48.015418162 +0200
- @@ -71,7 +71,11 @@
- binutils-dirclean: binutils-clean binutils_target-dirclean
- $(RM) -r $(BINUTILS_DIR)
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- binutils: binutils-dependencies $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/ld
- +else
- +binutils: $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/ld
- +endif
- #############################################################
- #
- @@ -100,7 +104,7 @@
- touch $@
- $(BINUTILS_DIR2)/.compiled: $(BINUTILS_DIR2)/.configured
- - $(MAKE_ENV) $(MAKE) $(BINUTILS_EXTRA_MAKE_OPTIONS) -C $(BINUTILS_DIR2) all
- + LIB_PATH="/usr/lib/freetz:/usr/local/lib:/lib:/usr/lib" $(MAKE_ENV) $(MAKE) $(BINUTILS_EXTRA_MAKE_OPTIONS) -C $(BINUTILS_DIR2) all
- touch $@
- $(TARGET_UTILS_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/.compiled
- diff -ur freetz/toolchain/make/target/ccache/ccache.mk FHEM/toolchain/make/target/ccache/ccache.mk
- --- freetz/toolchain/make/target/ccache/ccache.mk 2018-09-21 06:38:42.878716162 +0200
- +++ FHEM/toolchain/make/target/ccache/ccache.mk 2018-09-21 06:29:48.015418162 +0200
- @@ -73,10 +73,14 @@
- )
- ifeq ($(strip $(FREETZ_BUILD_TOOLCHAIN)),y)
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- ccache: gcc $(TARGET_TOOLCHAIN_STAGING_DIR)/$(CCACHE_TARGET_BINARY)
- else
- ccache: $(TARGET_TOOLCHAIN_STAGING_DIR)/$(CCACHE_TARGET_BINARY)
- endif
- +else
- +ccache: $(TARGET_TOOLCHAIN_STAGING_DIR)/$(CCACHE_TARGET_BINARY)
- +endif
- ccache-clean:
- for i in gcc g++; do \
- Nur in FHEM/toolchain/make/target/gcc/4.8: 200-gcc-config-host-linux-missing-SSIZE_MAX-definition.patch.
- Nur in freetz/toolchain/make/target/gcc/4.8: release.
- Nur in freetz/toolchain/make/target/gcc/4.8: snapshot.
- diff -ur freetz/toolchain/make/target/gcc/gcc.mk FHEM/toolchain/make/target/gcc/gcc.mk
- --- freetz/toolchain/make/target/gcc/gcc.mk 2018-09-21 06:38:46.940746162 +0200
- +++ FHEM/toolchain/make/target/gcc/gcc.mk 2018-09-21 06:29:48.023422162 +0200
- @@ -36,6 +36,10 @@
- GCC_COMMON_CONFIGURE_OPTIONS += $(GCC_COMMON_CONFIGURE_OPTIONS_ARCH_ABI)
- GCC_COMMON_CONFIGURE_OPTIONS += --disable-nls
- GCC_COMMON_CONFIGURE_OPTIONS += $(QUIET)
- +# disable libatomic at least for 4.8 and 5.5 to prevent: configure: error: Pthreads are required to build libatomic
- +GCC_COMMON_CONFIGURE_OPTIONS += --disable-libatomic
- +
- +
- ifneq ($(strip $(FREETZ_TARGET_TOOLCHAIN_AVM_COMPATIBLE)),y)
- ifeq ($(strip $(FREETZ_TARGET_ARCH_MIPS)),y)
- @@ -212,7 +216,11 @@
- gcc-configured: $(GCC_BUILD_DIR2)/.configured
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- gcc: uclibc-configured binutils gcc_initial uclibc $(GCC_BUILD_DIR2)/.installed
- +else
- +gcc: uclibc-configured binutils uclibc
- +endif
- gcc-uninstall:
- $(RM) $(call TOOLCHAIN_BINARIES_LIST,$(TARGET_TOOLCHAIN_STAGING_DIR)/usr,$(GCC_BINARIES_BIN),$(REAL_GNU_TARGET_NAME))
- @@ -233,7 +241,11 @@
- #############################################################
- GCC_BUILD_DIR3:=$(TARGET_TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-target
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR2)/.installed $(GCC_TARGET_PREREQ) | binutils_target
- +else
- +$(GCC_BUILD_DIR3)/.configured: $(GCC_DIR)/.unpacked $(GCC_TARGET_PREREQ) | binutils_target
- +endif
- mkdir -p $(GCC_BUILD_DIR3)
- (cd $(GCC_BUILD_DIR3); $(RM) config.cache; \
- $(TARGET_CONFIGURE_ENV) \
- diff -ur freetz/toolchain/make/target/uclibc/uclibc.mk FHEM/toolchain/make/target/uclibc/uclibc.mk
- --- freetz/toolchain/make/target/uclibc/uclibc.mk 2018-09-21 06:38:42.210382162 +0200
- +++ FHEM/toolchain/make/target/uclibc/uclibc.mk 2018-09-21 06:29:48.111466162 +0200
- @@ -141,7 +141,11 @@
- cp -f $^ $(UCLIBC_CONFIG_FILE) && \
- touch $^
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured | $(UCLIBC_PREREQ_GCC_INITIAL)
- +else
- +$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured
- +endif
- $(UCLIBC_MAKE) -C $(UCLIBC_DIR) \
- $(UCLIBC_COMMON_BUILD_FLAGS) \
- PREFIX= \
- @@ -254,7 +258,11 @@
- $(call REMOVE_DOC_NLS_DIRS,$(TARGET_UTILS_DIR))
- touch -c $@
- +ifneq ($(strip $(FREETZ_BUILD_TOOLCHAIN_TARGET_ONLY)),y)
- uclibc_target: gcc uclibc $(TARGET_UTILS_DIR)/usr/lib/libc.a
- +else
- +uclibc_target: uclibc $(TARGET_UTILS_DIR)/usr/lib/libc.a
- +endif
- uclibc_target-clean: uclibc_target-dirclean
- $(RM) $(TARGET_UTILS_DIR)/lib/libc.a
- diff -ur freetz/tools/.gitignore FHEM/tools/.gitignore
- --- freetz/tools/.gitignore 2018-09-21 06:39:08.283412162 +0200
- +++ FHEM/tools/.gitignore 2018-09-21 06:29:48.111466162 +0200
- @@ -3,6 +3,7 @@
- avm_kernel_config.extract
- avm_kernel_config.bin2asm
- blkid
- +build
- bunzip2
- busybox
- bzcat
- Nur in FHEM/tools/make: autoconf-host.
- diff -ur freetz/tools/make/fakeroot/fakeroot.mk FHEM/tools/make/fakeroot/fakeroot.mk
- --- freetz/tools/make/fakeroot/fakeroot.mk 2018-09-21 06:39:07.422982163 +0200
- +++ FHEM/tools/make/fakeroot/fakeroot.mk 2018-09-21 06:29:48.127474162 +0200
- @@ -39,6 +39,7 @@
- ../../configure \
- --prefix=$(FAKEROOT_DESTDIR) \
- --enable-shared \
- + $(if $(findstring Microsoft,$(shell uname -r)),--with-ipc=tcp,) \
- $(DISABLE_NLS) \
- );
- touch $@
- @@ -54,6 +55,8 @@
- ../../configure \
- --prefix=$(FAKEROOT_DESTDIR) \
- --enable-shared \
- + $(if $(findstring Microsoft,$(shell uname -r)),--with-ipc=tcp,) \
- + $(if $(findstring Microsoft,$(shell uname -r)),--host=$(shell uname -m),) \
- $(DISABLE_NLS) \
- );
- touch $@
- Nur in FHEM/tools/make: libffi-host.
- Nur in FHEM/tools/make: python-cffi-host.
- diff -ur freetz/tools/make/python-host/python-host.mk FHEM/tools/make/python-host/python-host.mk
- --- freetz/tools/make/python-host/python-host.mk 2018-09-21 06:39:06.962752162 +0200
- +++ FHEM/tools/make/python-host/python-host.mk 2018-09-21 06:29:48.147484163 +0200
- @@ -1,17 +1,18 @@
- PYTHON_HOST_VERSION:=2.7.15
- +PYTHON_HOST_MAJOR_VERSION:=2.7
- PYTHON_HOST_SOURCE:=Python-$(PYTHON_HOST_VERSION).tar.xz
- PYTHON_HOST_MD5:=a80ae3cc478460b922242f43a1b4094d
- PYTHON_HOST_SITE:=http://www.python.org/ftp/python/$(PYTHON_HOST_VERSION)
- PYTHON_HOST_DIR:=$(TOOLS_SOURCE_DIR)/Python-$(PYTHON_HOST_VERSION)
- PYTHON_HOST_BINARY:=$(PYTHON_HOST_DIR)/python
- -PYTHON_HOST_TARGET_BINARY:=$(HOST_TOOLS_DIR)/usr/bin/python2.7
- +PYTHON_HOST_TARGET_BINARY:=$(HOST_TOOLS_DIR)/usr/bin/python$(PYTHON_HOST_MAJOR_VERSION)
- python-host-source: $(DL_DIR)/$(PYTHON_HOST_SOURCE)
- $(DL_DIR)/$(PYTHON_HOST_SOURCE): | $(DL_DIR)
- $(DL_TOOL) $(DL_DIR) $(PYTHON_HOST_SOURCE) $(PYTHON_HOST_SITE) $(PYTHON_HOST_MD5)
- -python-host-unpacked: $(PYTHON_HOST_DIR)/.unpacked
- +python-host-unpacked: $(PYTHON_HOST_DIR)/.unpacked
- $(PYTHON_HOST_DIR)/.unpacked: $(DL_DIR)/$(PYTHON_HOST_SOURCE) | $(TOOLS_SOURCE_DIR) $(UNPACK_TARBALL_PREREQUISITES)
- $(call UNPACK_TARBALL,$(DL_DIR)/$(PYTHON_HOST_SOURCE),$(TOOLS_SOURCE_DIR))
- @touch $@
- @@ -28,7 +29,7 @@
- --build=$(GNU_HOST_NAME) \
- --host=$(GNU_HOST_NAME) \
- --target=$(GNU_HOST_NAME) \
- - --prefix=/usr \
- + --prefix=$(HOST_TOOLS_DIR)/usr \
- );
- @touch $@
- @@ -41,10 +42,11 @@
- $(PYTHON_HOST_TARGET_BINARY): $(PYTHON_HOST_BINARY) | $(HOST_TOOLS_DIR)
- PATH=$(TARGET_PATH) \
- $(MAKE) -C $(PYTHON_HOST_DIR) \
- - DESTDIR="$(HOST_TOOLS_DIR)" \
- install
- cp -a $(PYTHON_HOST_BINARY) $(PYTHON_HOST_DIR)/Parser/pgen \
- $(HOST_TOOLS_DIR)/usr/bin
- + cp -a $(PYTHON_HOST_DIR)/Lib/site.py \
- + $(HOST_TOOLS_DIR)/usr/lib/python$(PYTHON_HOST_MAJOR_VERSION)
- python-host: $(PYTHON_HOST_TARGET_BINARY)
- Nur in FHEM/tools/make: python-pycparser-host.
- Nur in FHEM/tools/make: python-setuptools-host.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement