From: Michael Tremer Date: Tue, 26 May 2015 12:27:32 +0000 (+0200) Subject: Merge remote-tracking branch 'mfischer/slang' into next X-Git-Tag: v2.17-core91~40 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f042e1d398bf4bade415773fe5849791f864444c;hp=1f8dddccb6f3f8f8b05074d8375708af9ddfb3eb Merge remote-tracking branch 'mfischer/slang' into next --- diff --git a/config/rootfiles/common/slang b/config/rootfiles/common/slang index 0ebef78c70..71802d4436 100644 --- a/config/rootfiles/common/slang +++ b/config/rootfiles/common/slang @@ -4,21 +4,26 @@ #usr/include/slcurses.h #usr/lib/libslang.so usr/lib/libslang.so.2 -usr/lib/libslang.so.2.2.4 +usr/lib/libslang.so.2.3.0 #usr/lib/pkgconfig/slang.pc #usr/lib/slang #usr/lib/slang/v2 #usr/lib/slang/v2/modules +usr/lib/slang/v2/modules/base64-module.so +usr/lib/slang/v2/modules/chksum-module.so usr/lib/slang/v2/modules/csv-module.so usr/lib/slang/v2/modules/fcntl-module.so usr/lib/slang/v2/modules/fork-module.so +usr/lib/slang/v2/modules/histogram-module.so usr/lib/slang/v2/modules/iconv-module.so +usr/lib/slang/v2/modules/json-module.so usr/lib/slang/v2/modules/pcre-module.so usr/lib/slang/v2/modules/png-module.so usr/lib/slang/v2/modules/rand-module.so usr/lib/slang/v2/modules/select-module.so usr/lib/slang/v2/modules/slsmg-module.so usr/lib/slang/v2/modules/socket-module.so +usr/lib/slang/v2/modules/stats-module.so usr/lib/slang/v2/modules/sysconf-module.so usr/lib/slang/v2/modules/termios-module.so usr/lib/slang/v2/modules/varray-module.so @@ -35,6 +40,10 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/doc/slsh #usr/share/doc/slsh/html #usr/share/doc/slsh/html/slshfun-1.html +#usr/share/doc/slsh/html/slshfun-10.html +#usr/share/doc/slsh/html/slshfun-11.html +#usr/share/doc/slsh/html/slshfun-12.html +#usr/share/doc/slsh/html/slshfun-13.html #usr/share/doc/slsh/html/slshfun-2.html #usr/share/doc/slsh/html/slshfun-3.html #usr/share/doc/slsh/html/slshfun-4.html @@ -48,13 +57,18 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh #usr/share/slsh/arrayfuns.sl #usr/share/slsh/autoload.sl +#usr/share/slsh/base64.sl +#usr/share/slsh/chksum.sl #usr/share/slsh/cmaps #usr/share/slsh/cmaps/cool.map #usr/share/slsh/cmaps/coolwarm.map #usr/share/slsh/cmaps/copper.map +#usr/share/slsh/cmaps/cubicl.map +#usr/share/slsh/cmaps/cubicyf.map #usr/share/slsh/cmaps/drywet.map #usr/share/slsh/cmaps/ds9b.map #usr/share/slsh/cmaps/ds9sls.map +#usr/share/slsh/cmaps/edge.map #usr/share/slsh/cmaps/gebco.map #usr/share/slsh/cmaps/globe.map #usr/share/slsh/cmaps/gray.map @@ -76,13 +90,20 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/csv.sl #usr/share/slsh/fcntl.sl #usr/share/slsh/fork.sl +#usr/share/slsh/fswalk.sl #usr/share/slsh/glob.sl #usr/share/slsh/help #usr/share/slsh/help/arrayfuns.hlp +#usr/share/slsh/help/base64funs.hlp +#usr/share/slsh/help/chksumfuns.hlp #usr/share/slsh/help/cmdopt.hlp #usr/share/slsh/help/csvfuns.hlp #usr/share/slsh/help/forkfuns.hlp +#usr/share/slsh/help/fswalk.hlp #usr/share/slsh/help/glob.hlp +#usr/share/slsh/help/histfuns.hlp +#usr/share/slsh/help/jsonfuns.hlp +#usr/share/slsh/help/listfuns.hlp #usr/share/slsh/help/onigfuns.hlp #usr/share/slsh/help/pcrefuns.hlp #usr/share/slsh/help/pngfuns.hlp @@ -95,8 +116,12 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/help/setfuns.hlp #usr/share/slsh/help/slsmg.hlp #usr/share/slsh/help/sockfuns.hlp +#usr/share/slsh/help/statsfuns.hlp #usr/share/slsh/help/structfuns.hlp +#usr/share/slsh/histogram.sl #usr/share/slsh/iconv.sl +#usr/share/slsh/json.sl +#usr/share/slsh/listfuns.sl #usr/share/slsh/local-packages #usr/share/slsh/onig.sl #usr/share/slsh/pcre.sl @@ -132,6 +157,7 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/slshrl.sl #usr/share/slsh/slsmg.sl #usr/share/slsh/socket.sl +#usr/share/slsh/stats.sl #usr/share/slsh/stkcheck.sl #usr/share/slsh/structfuns.sl #usr/share/slsh/sysconf.sl diff --git a/lfs/slang b/lfs/slang index 55590f7cb2..d913cdf254 100644 --- a/lfs/slang +++ b/lfs/slang @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # 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 @@ include Config -VER = 2.2.4 +VER = 2.3.0 THISAPP = slang-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 86cd8689cd71e281b4720fef8453ceeb +$(DL_FILE)_MD5 = 80f4e64189b6f28fd420b829b44a6723 install : $(TARGET)