From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8b200f9c7e291e5d27a1bd5c3edde6dd0f4ab59a Date: Tue, 03 Sep 2019 11:33:39 +0000 Message-ID: <20190903113340.62BD660AF9@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8156758144770489184==" List-Id: --===============8156758144770489184== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 8b200f9c7e291e5d27a1bd5c3edde6dd0f4ab59a (commit) via 46b457393d6c5dc47f3af54ff8c9dd37651d3ec7 (commit) via 5d7f07e818d107b0f99db1fb45b1880487f6b3eb (commit) via 136ade454bdba4cf062217ab1a7f9ae1b13bebcc (commit) via d0fc3b200837fc6bb24d15a232008d423042bfac (commit) via 62f98a58b25d1c985d0de194b2333ee762b82358 (commit) via cf572f20640ae012a6aadcd4c5c8b20d1a124e01 (commit) via e301592fbe50076fd86d3e637b2f4814cf3cb3fb (commit) via 6fcd6aac88274db36011a0bac53770d8827543b1 (commit) from 8b626630dc59962566b92a4d84b4ea81e8f3336a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8b200f9c7e291e5d27a1bd5c3edde6dd0f4ab59a Merge: 46b457393 8b626630d Author: Arne Fitzenreiter Date: Tue Sep 3 11:33:06 2019 +0000 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 46b457393d6c5dc47f3af54ff8c9dd37651d3ec7 Author: Ramax Lo Date: Tue Aug 6 00:21:52 2019 +0800 usb_modeswitch_data: update to 20170806 =20 Signed-off-by: Ramax Lo Signed-off-by: Arne Fitzenreiter commit 5d7f07e818d107b0f99db1fb45b1880487f6b3eb Author: Ramax Lo Date: Tue Aug 6 00:21:51 2019 +0800 usb_modeswitch: update to 1.5.2 =20 Signed-off-by: Ramax Lo Signed-off-by: Arne Fitzenreiter commit 136ade454bdba4cf062217ab1a7f9ae1b13bebcc Author: Arne Fitzenreiter Date: Mon Sep 2 20:21:27 2019 +0000 core136: ship unbound =20 Signed-off-by: Arne Fitzenreiter commit d0fc3b200837fc6bb24d15a232008d423042bfac Author: Matthias Fischer Date: Sat Aug 31 13:07:56 2019 +0200 unbound: Update to 1.9.3 =20 For details see: https://nlnetlabs.nl/pipermail/unbound-users/2019-August/011765.html =20 Signed-off-by: Matthias Fischer Signed-off-by: Arne Fitzenreiter commit 62f98a58b25d1c985d0de194b2333ee762b82358 Author: Alex Koch Date: Sun Sep 1 23:34:58 2019 +0200 zabbix_agentd: Update to 4.2.6 =20 Release Notes: https://www.zabbix.com/rn/rn4.2.6 =20 Signed-off-by: Alex Koch Reviewed-by: Michael Tremer Signed-off-by: Arne Fitzenreiter commit cf572f20640ae012a6aadcd4c5c8b20d1a124e01 Author: Michael Tremer Date: Mon Sep 2 18:41:39 2019 +0000 Revert "freeradius: Build without SSL" =20 This reverts commit 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9. =20 Fixes: #12139 =20 Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter commit e301592fbe50076fd86d3e637b2f4814cf3cb3fb Author: Michael Tremer Date: Mon Sep 2 18:41:38 2019 +0000 freeradius: Update to 3.0.19 =20 Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter commit 6fcd6aac88274db36011a0bac53770d8827543b1 Author: Michael Tremer Date: Mon Sep 2 18:32:57 2019 +0000 haproxy: Update to 1.8.21 =20 Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/unbound | 2 +- config/rootfiles/common/usb_modeswitch_data | 19 +++++++++++---- .../{oldcore/106 =3D> core/136}/filelists/unbound | 0 config/rootfiles/packages/freeradius | 27 ++++++++++++++++++++= ++ config/zabbix_agentd/zabbix_agentd.conf | 12 ++++++---- lfs/freeradius | 12 +++++----- lfs/haproxy | 6 ++--- lfs/unbound | 4 ++-- lfs/usb_modeswitch | 4 ++-- lfs/usb_modeswitch_data | 4 ++-- lfs/zabbix_agentd | 6 ++--- 11 files changed, 68 insertions(+), 28 deletions(-) copy config/rootfiles/{oldcore/106 =3D> core/136}/filelists/unbound (100%) Difference in files: diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 7bab5a7dc..78a741377 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.2 +usr/lib/libunbound.so.8.1.3 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/c= ommon/usb_modeswitch_data index 665f28bba..b58851d88 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -2,6 +2,10 @@ etc/usb_modeswitch.d lib/udev/rules.d/40-usb_modeswitch.rules #usr/share/usb_modeswitch usr/share/usb_modeswitch/03f0:002a +usr/share/usb_modeswitch/03f0:032a +usr/share/usb_modeswitch/03f0:371d +usr/share/usb_modeswitch/03f0:4b1d +usr/share/usb_modeswitch/03f0:4e1d usr/share/usb_modeswitch/03f0:521d usr/share/usb_modeswitch/03f0:531d usr/share/usb_modeswitch/03f0:541d @@ -44,6 +48,7 @@ usr/share/usb_modeswitch/04e8:f000:sMo=3DU209 usr/share/usb_modeswitch/04fc:2140 usr/share/usb_modeswitch/057c:62ff usr/share/usb_modeswitch/057c:84ff +usr/share/usb_modeswitch/0586:2030 usr/share/usb_modeswitch/05c6:0010 usr/share/usb_modeswitch/05c6:1000:sVe=3DGT usr/share/usb_modeswitch/05c6:1000:sVe=3DOption @@ -68,6 +73,7 @@ usr/share/usb_modeswitch/072f:100d usr/share/usb_modeswitch/07d1:a800 usr/share/usb_modeswitch/07d1:a804 usr/share/usb_modeswitch/07d1:f000 +usr/share/usb_modeswitch/0846:0fff usr/share/usb_modeswitch/0922:1001 usr/share/usb_modeswitch/0922:1003 usr/share/usb_modeswitch/0922:1007 @@ -160,12 +166,10 @@ usr/share/usb_modeswitch/1004:613f usr/share/usb_modeswitch/1004:614e usr/share/usb_modeswitch/1004:6156 usr/share/usb_modeswitch/1004:6190 -usr/share/usb_modeswitch/1004:61aa usr/share/usb_modeswitch/1004:61dd usr/share/usb_modeswitch/1004:61e7 usr/share/usb_modeswitch/1004:61eb usr/share/usb_modeswitch/1004:6327 -usr/share/usb_modeswitch/1033:0035 usr/share/usb_modeswitch/106c:3b03 usr/share/usb_modeswitch/106c:3b05 usr/share/usb_modeswitch/106c:3b06 @@ -187,8 +191,6 @@ usr/share/usb_modeswitch/1199:9051 usr/share/usb_modeswitch/1199:9053 usr/share/usb_modeswitch/1199:9063 usr/share/usb_modeswitch/1266:1000 -usr/share/usb_modeswitch/12d1:#android -usr/share/usb_modeswitch/12d1:#linux usr/share/usb_modeswitch/12d1:1001 usr/share/usb_modeswitch/12d1:1003 usr/share/usb_modeswitch/12d1:1009 @@ -243,6 +245,7 @@ usr/share/usb_modeswitch/12d1:15cf usr/share/usb_modeswitch/12d1:15d0 usr/share/usb_modeswitch/12d1:15d2 usr/share/usb_modeswitch/12d1:15e7 +usr/share/usb_modeswitch/12d1:15ec usr/share/usb_modeswitch/12d1:15f0 usr/share/usb_modeswitch/12d1:1805 usr/share/usb_modeswitch/12d1:1c0b @@ -283,6 +286,7 @@ usr/share/usb_modeswitch/1410:7001 usr/share/usb_modeswitch/1410:9020 usr/share/usb_modeswitch/148e:a000 usr/share/usb_modeswitch/148f:2578 +usr/share/usb_modeswitch/148f:2878 usr/share/usb_modeswitch/15eb:7153 usr/share/usb_modeswitch/1614:0800 usr/share/usb_modeswitch/1614:0802 @@ -299,12 +303,13 @@ usr/share/usb_modeswitch/1782:0003 usr/share/usb_modeswitch/1782:0023 usr/share/usb_modeswitch/198a:0003 usr/share/usb_modeswitch/198f:bccd -usr/share/usb_modeswitch/19d2:#linux usr/share/usb_modeswitch/19d2:0003 usr/share/usb_modeswitch/19d2:0026 +usr/share/usb_modeswitch/19d2:0033 usr/share/usb_modeswitch/19d2:0040 usr/share/usb_modeswitch/19d2:0053 usr/share/usb_modeswitch/19d2:0083:uPr=3DWCDMA +usr/share/usb_modeswitch/19d2:0090 usr/share/usb_modeswitch/19d2:0101 usr/share/usb_modeswitch/19d2:0103 usr/share/usb_modeswitch/19d2:0110 @@ -428,6 +433,7 @@ usr/share/usb_modeswitch/1fac:0130 usr/share/usb_modeswitch/1fac:0150 usr/share/usb_modeswitch/1fac:0151 usr/share/usb_modeswitch/2001:00a6 +usr/share/usb_modeswitch/2001:00a7 usr/share/usb_modeswitch/2001:7600 usr/share/usb_modeswitch/2001:98ff usr/share/usb_modeswitch/2001:a401 @@ -441,7 +447,9 @@ usr/share/usb_modeswitch/2001:a706 usr/share/usb_modeswitch/2001:a707 usr/share/usb_modeswitch/2001:a708 usr/share/usb_modeswitch/2001:a805 +usr/share/usb_modeswitch/2001:a809 usr/share/usb_modeswitch/2001:a80b +usr/share/usb_modeswitch/2001:ab00 usr/share/usb_modeswitch/2015:0001 usr/share/usb_modeswitch/201e:1023 usr/share/usb_modeswitch/201e:2009 @@ -457,6 +465,7 @@ usr/share/usb_modeswitch/21f5:1000 usr/share/usb_modeswitch/21f5:3010 usr/share/usb_modeswitch/2262:0001 usr/share/usb_modeswitch/22de:6801 +usr/share/usb_modeswitch/22de:6802 usr/share/usb_modeswitch/22de:6803 usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 diff --git a/config/rootfiles/core/136/filelists/unbound b/config/rootfiles/c= ore/136/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/136/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages= /freeradius index 9cbd214ac..0cf0a1be9 100644 --- a/config/rootfiles/packages/freeradius +++ b/config/rootfiles/packages/freeradius @@ -1,3 +1,4 @@ +etc/logrotate.d/freeradius etc/raddb #etc/raddb/README.rst #etc/raddb/certs @@ -7,6 +8,7 @@ etc/raddb #etc/raddb/certs/ca.cnf #etc/raddb/certs/client.cnf #etc/raddb/certs/inner-server.cnf +#etc/raddb/certs/passwords.mk #etc/raddb/certs/server.cnf #etc/raddb/certs/xpextensions #etc/raddb/clients.conf @@ -135,6 +137,7 @@ etc/raddb #etc/raddb/mods-config/sql/ippool/mysql/queries.conf #etc/raddb/mods-config/sql/ippool/mysql/schema.sql #etc/raddb/mods-config/sql/ippool/postgresql +#etc/raddb/mods-config/sql/ippool/postgresql/procedure.sql #etc/raddb/mods-config/sql/ippool/postgresql/queries.conf #etc/raddb/mods-config/sql/ippool/postgresql/schema.sql #etc/raddb/mods-config/sql/ippool/sqlite @@ -327,6 +330,7 @@ usr/bin/smbencrypt #usr/include/freeradius/rfc7499.h #usr/include/freeradius/rfc7930.h #usr/include/freeradius/rfc8045.h +#usr/include/freeradius/rfc8559.h #usr/include/freeradius/sha1.h #usr/include/freeradius/stats.h #usr/include/freeradius/sysutmp.h @@ -394,6 +398,9 @@ usr/lib/freeradius/rlm_dynamic_clients.so #usr/lib/freeradius/rlm_eap.a #usr/lib/freeradius/rlm_eap.la usr/lib/freeradius/rlm_eap.so +#usr/lib/freeradius/rlm_eap_fast.a +#usr/lib/freeradius/rlm_eap_fast.la +usr/lib/freeradius/rlm_eap_fast.so #usr/lib/freeradius/rlm_eap_gtc.a #usr/lib/freeradius/rlm_eap_gtc.la usr/lib/freeradius/rlm_eap_gtc.so @@ -406,9 +413,21 @@ usr/lib/freeradius/rlm_eap_md5.so #usr/lib/freeradius/rlm_eap_mschapv2.a #usr/lib/freeradius/rlm_eap_mschapv2.la usr/lib/freeradius/rlm_eap_mschapv2.so +#usr/lib/freeradius/rlm_eap_peap.a +#usr/lib/freeradius/rlm_eap_peap.la +usr/lib/freeradius/rlm_eap_peap.so +#usr/lib/freeradius/rlm_eap_pwd.a +#usr/lib/freeradius/rlm_eap_pwd.la +usr/lib/freeradius/rlm_eap_pwd.so #usr/lib/freeradius/rlm_eap_sim.a #usr/lib/freeradius/rlm_eap_sim.la usr/lib/freeradius/rlm_eap_sim.so +#usr/lib/freeradius/rlm_eap_tls.a +#usr/lib/freeradius/rlm_eap_tls.la +usr/lib/freeradius/rlm_eap_tls.so +#usr/lib/freeradius/rlm_eap_ttls.a +#usr/lib/freeradius/rlm_eap_ttls.la +usr/lib/freeradius/rlm_eap_ttls.so #usr/lib/freeradius/rlm_exec.a #usr/lib/freeradius/rlm_exec.la usr/lib/freeradius/rlm_exec.so @@ -439,6 +458,9 @@ usr/lib/freeradius/rlm_logintime.so #usr/lib/freeradius/rlm_mschap.a #usr/lib/freeradius/rlm_mschap.la usr/lib/freeradius/rlm_mschap.so +#usr/lib/freeradius/rlm_otp.a +#usr/lib/freeradius/rlm_otp.la +usr/lib/freeradius/rlm_otp.so #usr/lib/freeradius/rlm_pam.a #usr/lib/freeradius/rlm_pam.la usr/lib/freeradius/rlm_pam.so @@ -498,6 +520,9 @@ usr/lib/freeradius/rlm_unpack.so #usr/lib/freeradius/rlm_utf8.a #usr/lib/freeradius/rlm_utf8.la usr/lib/freeradius/rlm_utf8.so +#usr/lib/freeradius/rlm_wimax.a +#usr/lib/freeradius/rlm_wimax.la +usr/lib/freeradius/rlm_wimax.so #usr/lib/freeradius/rlm_yubikey.a #usr/lib/freeradius/rlm_yubikey.la usr/lib/freeradius/rlm_yubikey.so @@ -792,6 +817,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.paloalto #usr/share/freeradius/dictionary.patton #usr/share/freeradius/dictionary.perle +#usr/share/freeradius/dictionary.pfsense #usr/share/freeradius/dictionary.propel #usr/share/freeradius/dictionary.prosoft #usr/share/freeradius/dictionary.proxim @@ -832,6 +858,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.rfc7499 #usr/share/freeradius/dictionary.rfc7930 #usr/share/freeradius/dictionary.rfc8045 +#usr/share/freeradius/dictionary.rfc8559 #usr/share/freeradius/dictionary.riverbed #usr/share/freeradius/dictionary.riverstone #usr/share/freeradius/dictionary.roaringpenguin diff --git a/config/zabbix_agentd/zabbix_agentd.conf b/config/zabbix_agentd/z= abbix_agentd.conf index 07f71c184..21b8e0122 100644 --- a/config/zabbix_agentd/zabbix_agentd.conf +++ b/config/zabbix_agentd/zabbix_agentd.conf @@ -305,8 +305,12 @@ LoadModulePath=3D/usr/lib/zabbix =20 ### Option: LoadModule # Module to load at agent startup. Modules are used to extend functionality = of the agent. -# Format: LoadModule=3D -# The modules must be located in directory specified by LoadModulePath. +# Formats: +# LoadModule=3D +# LoadModule=3D +# LoadModule=3D +# Either the module must be located in directory specified by LoadModulePath= or the path must precede the module name. +# If the preceding path is absolute (starts with '/') then LoadModulePath is= ignored. # It is allowed to include multiple LoadModule parameters. # # Mandatory: no @@ -353,14 +357,14 @@ LoadModulePath=3D/usr/lib/zabbix # TLSCRLFile=3D =20 ### Option: TLSServerCertIssuer -# Allowed server certificate issuer. +# Allowed server certificate issuer. # # Mandatory: no # Default: # TLSServerCertIssuer=3D =20 ### Option: TLSServerCertSubject -# Allowed server certificate subject. +# Allowed server certificate subject. # # Mandatory: no # Default: diff --git a/lfs/freeradius b/lfs/freeradius index 4afe55f18..1417f422d 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -24,15 +24,15 @@ =20 include Config =20 -VER =3D 3.0.18 +VER =3D 3.0.19 =20 THISAPP =3D freeradius-server-$(VER) -DL_FILE =3D $(THISAPP).tar.bz2 +DL_FILE =3D $(THISAPP).tar.gz DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D freeradius -PAK_VER =3D 8 +PAK_VER =3D 10 =20 DEPS =3D "samba" =20 @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 05f0c8c7ac79659f808ff31751daa857 +$(DL_FILE)_MD5 =3D 3e4048353931eda01f03ef89039f0651 =20 install : $(TARGET) =20 @@ -80,7 +80,7 @@ $(subst %,%_MD5,$(objects)) : =20 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/freeradius-no-buildtim= e-cert-gen.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && \ @@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-system-libtool \ --with-threads \ --with-thread-pool \ - --without-openssl \ --disable-ltdl-install \ + --disable-openssl-version-check \ --without-rlm_eap_ikev2 \ --without-rlm_sql_iodbc \ --without-rlm_sql_firebird \ diff --git a/lfs/haproxy b/lfs/haproxy index 3bdbd28fa..8917d30c9 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.8.14 +VER =3D 1.8.21 =20 THISAPP =3D haproxy-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D haproxy -PAK_VER =3D 10 +PAK_VER =3D 11 =20 DEPS =3D "" =20 @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D a050bcb90426d1c939b4b0ce3098a8c4 +$(DL_FILE)_MD5 =3D 6f86f1272c7daf5ea1d1bae5c9192183 =20 install : $(TARGET) =20 diff --git a/lfs/unbound b/lfs/unbound index e017dcd78..f81a4166d 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.9.2 +VER =3D 1.9.3 =20 THISAPP =3D unbound-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 244e10977d1453dff669caa3c0efba18 +$(DL_FILE)_MD5 =3D fe1af630616d7d88d621e300fb87e5d5 =20 install : $(TARGET) =20 diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index afa719936..c63ba395d 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 2.4.0 +VER =3D 2.5.2 =20 THISAPP =3D usb-modeswitch-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 6e1640db47768bb9012f91b7593116ef +$(DL_FILE)_MD5 =3D 16b9a8efa1bf8fbd7d5612757eae4f26 =20 install : $(TARGET) =20 diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 0ff0fce40..546a7a78c 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 20160803 +VER =3D 20170806 =20 THISAPP =3D usb-modeswitch-data-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D acc927e44827837eb23b2a7980b38a35 +$(DL_FILE)_MD5 =3D fb50d15b52e909d742dd16f0a9882316 =20 install : $(TARGET) =20 diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index d4d5a22fb..8aac4d000 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 4.2.1 +VER =3D 4.2.6 =20 THISAPP =3D zabbix-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D zabbix_agentd -PAK_VER =3D 3 +PAK_VER =3D 4 DEPS =3D "" =20 ############################################################################= ### @@ -43,7 +43,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D e55ba94060ba2548ae8a1c29fd7cb7dd +$(DL_FILE)_MD5 =3D 6cd55cd743d416d9ffbf2e6fdee680ee =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============8156758144770489184==--