From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea6fa9de5afc5a0d0b258ff08fe7bfbc0c6dbb30 Date: Fri, 11 Dec 2015 19:56:32 +0100 Message-ID: <20151211185632.D9D7D2143E@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7629500219878299940==" List-Id: --===============7629500219878299940== 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 ea6fa9de5afc5a0d0b258ff08fe7bfbc0c6dbb30 (commit) via 600ac5c6573a2c942c462c0f2aa844a417da310d (commit) via db1404051fa3f84ede679969ace44c0020946a7a (commit) via b7488afd894de0ca908563d4b058f7f9ed0f92fc (commit) via 4955d7239b2d42347a246d610eaf294f7ab4966d (commit) via db7d2b13124e5388214f55564c6eab36373ed125 (commit) from e0eb23de56d5a207d755ea8380f9f5e2abfbaace (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 ea6fa9de5afc5a0d0b258ff08fe7bfbc0c6dbb30 Author: Michael Tremer Date: Fri Dec 11 18:48:19 2015 +0000 core96: Ship missing libnet =20 Signed-off-by: Michael Tremer commit 600ac5c6573a2c942c462c0f2aa844a417da310d Author: Matthias Fischer Date: Sat Dec 5 20:11:59 2015 +0100 libnet 1.1.6: Fix for rootfile =20 libnet 1.1.6: Fix for rootfile =20 See: https://forum.ipfire.org/viewtopic.php?f=3D27&t=3D15377, "error with arping and libnet.so.1" Should fix: Bug #10996 / https://bugzilla.ipfire.org/show_bug.cgi?id=3D10= 996 =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit db1404051fa3f84ede679969ace44c0020946a7a Author: Matthias Fischer Date: Sat Dec 5 04:12:51 2015 +0100 clamav: Update to 0.99 =20 clamav: Update to 0.99 =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit b7488afd894de0ca908563d4b058f7f9ed0f92fc Author: Michael Tremer Date: Fri Dec 11 18:43:39 2015 +0000 core96: Ship updated rrdtool =20 Signed-off-by: Michael Tremer commit 4955d7239b2d42347a246d610eaf294f7ab4966d Author: Matthias Fischer Date: Sat Dec 5 04:08:49 2015 +0100 rrdtool: Update to 1.5.5 =20 rrdtool: Update to 1.5.5 =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit db7d2b13124e5388214f55564c6eab36373ed125 Author: Matthias Fischer Date: Thu Dec 3 19:09:45 2015 +0100 Midnight Commander: Update to 4.8.15 =20 Removed uncognized option: --with-samba =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libnet | 6 +- config/rootfiles/common/rrdtool | 188 ++++++++++---------= -- .../{oldcore/91 =3D> core/96}/filelists/libnet | 0 .../{oldcore/94 =3D> core/96}/filelists/rrdtool | 0 config/rootfiles/packages/clamav | 12 +- lfs/clamav | 8 +- lfs/mc | 11 +- lfs/rrdtool | 4 +- 8 files changed, 114 insertions(+), 115 deletions(-) copy config/rootfiles/{oldcore/91 =3D> core/96}/filelists/libnet (100%) copy config/rootfiles/{oldcore/94 =3D> core/96}/filelists/rrdtool (100%) Difference in files: diff --git a/config/rootfiles/common/libnet b/config/rootfiles/common/libnet index e36695e..ffa20fd 100644 --- a/config/rootfiles/common/libnet +++ b/config/rootfiles/common/libnet @@ -9,9 +9,9 @@ #usr/include/libnet/libnet-types.h #usr/lib/libnet.a #usr/lib/libnet.la -#usr/lib/libnet.so -#usr/lib/libnet.so.1 -#usr/lib/libnet.so.1.7.0 +usr/lib/libnet.so +usr/lib/libnet.so.1 +usr/lib/libnet.so.1.7.0 #usr/share/man/man3/libnet-functions.h.3 #usr/share/man/man3/libnet-macros.h.3 #usr/share/man/man3/libnet.h.3 diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index 6a79679..98d76b5 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -11,12 +11,12 @@ usr/bin/rrdupdate #usr/lib/librrd.la #usr/lib/librrd.so usr/lib/librrd.so.4 -usr/lib/librrd.so.4.3.0 +usr/lib/librrd.so.4.3.5 #usr/lib/librrd_th.a #usr/lib/librrd_th.la #usr/lib/librrd_th.so usr/lib/librrd_th.so.4 -usr/lib/librrd_th.so.4.3.0 +usr/lib/librrd_th.so.4.3.5 usr/lib/perl5/site_perl/5.12.3/RRDp.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp @@ -26,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi= /RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc -#usr/share/doc/rrdtool-1.5.4 -#usr/share/doc/rrdtool-1.5.4/html -#usr/share/doc/rrdtool-1.5.4/html/RRDp.html -#usr/share/doc/rrdtool-1.5.4/html/RRDs.html -#usr/share/doc/rrdtool-1.5.4/html/bin_dec_hex.html -#usr/share/doc/rrdtool-1.5.4/html/cdeftutorial.html -#usr/share/doc/rrdtool-1.5.4/html/index.html -#usr/share/doc/rrdtool-1.5.4/html/librrd.html -#usr/share/doc/rrdtool-1.5.4/html/rpntutorial.html -#usr/share/doc/rrdtool-1.5.4/html/rrd-beginners.html -#usr/share/doc/rrdtool-1.5.4/html/rrdbuild.html -#usr/share/doc/rrdtool-1.5.4/html/rrdcached.html -#usr/share/doc/rrdtool-1.5.4/html/rrdcgi.html -#usr/share/doc/rrdtool-1.5.4/html/rrdcreate.html -#usr/share/doc/rrdtool-1.5.4/html/rrddump.html -#usr/share/doc/rrdtool-1.5.4/html/rrdfetch.html -#usr/share/doc/rrdtool-1.5.4/html/rrdfirst.html -#usr/share/doc/rrdtool-1.5.4/html/rrdflushcached.html -#usr/share/doc/rrdtool-1.5.4/html/rrdgraph.html -#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_data.html -#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_examples.html -#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_graph.html -#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_rpn.html -#usr/share/doc/rrdtool-1.5.4/html/rrdinfo.html -#usr/share/doc/rrdtool-1.5.4/html/rrdlast.html -#usr/share/doc/rrdtool-1.5.4/html/rrdlastupdate.html -#usr/share/doc/rrdtool-1.5.4/html/rrdresize.html -#usr/share/doc/rrdtool-1.5.4/html/rrdrestore.html -#usr/share/doc/rrdtool-1.5.4/html/rrdthreads.html -#usr/share/doc/rrdtool-1.5.4/html/rrdtool.html -#usr/share/doc/rrdtool-1.5.4/html/rrdtune.html -#usr/share/doc/rrdtool-1.5.4/html/rrdtutorial.html -#usr/share/doc/rrdtool-1.5.4/html/rrdupdate.html -#usr/share/doc/rrdtool-1.5.4/html/rrdxport.html -#usr/share/doc/rrdtool-1.5.4/txt -#usr/share/doc/rrdtool-1.5.4/txt/bin_dec_hex.pod -#usr/share/doc/rrdtool-1.5.4/txt/bin_dec_hex.txt -#usr/share/doc/rrdtool-1.5.4/txt/cdeftutorial.pod -#usr/share/doc/rrdtool-1.5.4/txt/cdeftutorial.txt -#usr/share/doc/rrdtool-1.5.4/txt/librrd.txt -#usr/share/doc/rrdtool-1.5.4/txt/rpntutorial.pod -#usr/share/doc/rrdtool-1.5.4/txt/rpntutorial.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrd-beginners.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrd-beginners.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdbuild.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdbuild.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdcached.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdcached.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdcgi.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdcgi.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdcreate.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdcreate.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrddump.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrddump.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdfetch.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdfetch.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdfirst.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdfirst.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdflushcached.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdflushcached.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_data.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_data.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_examples.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_examples.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_graph.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_graph.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_rpn.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_rpn.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdinfo.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdinfo.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdlast.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdlast.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdlastupdate.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdlastupdate.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdresize.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdresize.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdrestore.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdrestore.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdthreads.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdthreads.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdtool.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdtool.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdtune.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdtune.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdtutorial.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdtutorial.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdupdate.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdupdate.txt -#usr/share/doc/rrdtool-1.5.4/txt/rrdxport.pod -#usr/share/doc/rrdtool-1.5.4/txt/rrdxport.txt +#usr/share/doc/rrdtool-1.5.5 +#usr/share/doc/rrdtool-1.5.5/html +#usr/share/doc/rrdtool-1.5.5/html/RRDp.html +#usr/share/doc/rrdtool-1.5.5/html/RRDs.html +#usr/share/doc/rrdtool-1.5.5/html/bin_dec_hex.html +#usr/share/doc/rrdtool-1.5.5/html/cdeftutorial.html +#usr/share/doc/rrdtool-1.5.5/html/index.html +#usr/share/doc/rrdtool-1.5.5/html/librrd.html +#usr/share/doc/rrdtool-1.5.5/html/rpntutorial.html +#usr/share/doc/rrdtool-1.5.5/html/rrd-beginners.html +#usr/share/doc/rrdtool-1.5.5/html/rrdbuild.html +#usr/share/doc/rrdtool-1.5.5/html/rrdcached.html +#usr/share/doc/rrdtool-1.5.5/html/rrdcgi.html +#usr/share/doc/rrdtool-1.5.5/html/rrdcreate.html +#usr/share/doc/rrdtool-1.5.5/html/rrddump.html +#usr/share/doc/rrdtool-1.5.5/html/rrdfetch.html +#usr/share/doc/rrdtool-1.5.5/html/rrdfirst.html +#usr/share/doc/rrdtool-1.5.5/html/rrdflushcached.html +#usr/share/doc/rrdtool-1.5.5/html/rrdgraph.html +#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_data.html +#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_examples.html +#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_graph.html +#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_rpn.html +#usr/share/doc/rrdtool-1.5.5/html/rrdinfo.html +#usr/share/doc/rrdtool-1.5.5/html/rrdlast.html +#usr/share/doc/rrdtool-1.5.5/html/rrdlastupdate.html +#usr/share/doc/rrdtool-1.5.5/html/rrdresize.html +#usr/share/doc/rrdtool-1.5.5/html/rrdrestore.html +#usr/share/doc/rrdtool-1.5.5/html/rrdthreads.html +#usr/share/doc/rrdtool-1.5.5/html/rrdtool.html +#usr/share/doc/rrdtool-1.5.5/html/rrdtune.html +#usr/share/doc/rrdtool-1.5.5/html/rrdtutorial.html +#usr/share/doc/rrdtool-1.5.5/html/rrdupdate.html +#usr/share/doc/rrdtool-1.5.5/html/rrdxport.html +#usr/share/doc/rrdtool-1.5.5/txt +#usr/share/doc/rrdtool-1.5.5/txt/bin_dec_hex.pod +#usr/share/doc/rrdtool-1.5.5/txt/bin_dec_hex.txt +#usr/share/doc/rrdtool-1.5.5/txt/cdeftutorial.pod +#usr/share/doc/rrdtool-1.5.5/txt/cdeftutorial.txt +#usr/share/doc/rrdtool-1.5.5/txt/librrd.txt +#usr/share/doc/rrdtool-1.5.5/txt/rpntutorial.pod +#usr/share/doc/rrdtool-1.5.5/txt/rpntutorial.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrd-beginners.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrd-beginners.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdbuild.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdbuild.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdcached.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdcached.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdcgi.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdcgi.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdcreate.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdcreate.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrddump.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrddump.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdfetch.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdfetch.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdfirst.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdfirst.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdflushcached.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdflushcached.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_data.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_data.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_examples.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_examples.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_graph.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_graph.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_rpn.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_rpn.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdinfo.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdinfo.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdlast.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdlast.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdlastupdate.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdlastupdate.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdresize.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdresize.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdrestore.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdrestore.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdthreads.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdthreads.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdtool.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdtool.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdtune.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdtune.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdtutorial.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdtutorial.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdupdate.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdupdate.txt +#usr/share/doc/rrdtool-1.5.5/txt/rrdxport.pod +#usr/share/doc/rrdtool-1.5.5/txt/rrdxport.txt #usr/share/man/man1/bin_dec_hex.1 #usr/share/man/man1/cdeftutorial.1 #usr/share/man/man1/rpntutorial.1 diff --git a/config/rootfiles/core/96/filelists/libnet b/config/rootfiles/cor= e/96/filelists/libnet new file mode 120000 index 0000000..26e5f79 --- /dev/null +++ b/config/rootfiles/core/96/filelists/libnet @@ -0,0 +1 @@ +../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/core/96/filelists/rrdtool b/config/rootfiles/co= re/96/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/96/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/cla= mav index d79f6e6..d7636e9 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,16 +10,16 @@ usr/bin/sigtool #usr/include/clamav.h #usr/lib/libclamav.la usr/lib/libclamav.so -usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.26 +usr/lib/libclamav.so.7 +usr/lib/libclamav.so.7.1.1 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so -usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.26 +usr/lib/libclamunrar.so.7 +usr/lib/libclamunrar.so.7.1.1 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so -usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.26 +usr/lib/libclamunrar_iface.so.7 +usr/lib/libclamunrar_iface.so.7.1.1 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index 5fd8426..ea6efc3 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 0.98.7 +VER =3D 0.99 =20 THISAPP =3D clamav-$(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 clamav -PAK_VER =3D 29 +PAK_VER =3D 30 =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 157c601161da1c2d5a0e48ea1b49e067 +$(DL_FILE)_MD5 =3D ae79c3982761ba1815dbce17f846bab6 =20 install : $(TARGET) =20 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) =20 md5 : $(subst %,%_MD5,$(objects)) =20 -dist:=20 +dist: $(PAK) =20 ############################################################################= ### diff --git a/lfs/mc b/lfs/mc index 4dc937c..091b58a 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2014 IPFire Team = # +# Copyright (C) 2007-2015 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 4.8.13 +VER =3D 4.8.15 =20 THISAPP =3D mc-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D mc -PAK_VER =3D 10 +PAK_VER =3D 11 =20 DEPS =3D "" =20 @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D d967caa12765eb86e52a6a63ca202500 +$(DL_FILE)_MD5 =3D 7c1935433866fdf59a3c2d9b7dae81ad =20 install : $(TARGET) =20 @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) =20 md5 : $(subst %,%_MD5,$(objects)) =20 -dist:=20 +dist: @$(PAK) =20 ############################################################################= ### @@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=3D/usr \ --sysconfdir=3D/etc \ --without-x --disable-nls \ - --with-samba \ --with-screen=3Dncurses cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/rrdtool b/lfs/rrdtool index f156400..b85c797 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.5.4 +VER =3D 1.5.5 =20 THISAPP =3D rrdtool-$(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 4daea1e628e1c70d91800d6a06427dc1 +$(DL_FILE)_MD5 =3D d8b3dcb3d193c2d6ad0a282bde69ee11 =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============7629500219878299940==--