IPFire-SCM June 2010

ipfire-scm@lists.ipfire.org

1 participants
87 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fac786647c8d931e93b190c790fb1b2a1c95f94d
by git＠ipfire.org 21 Jun '10

21 Jun '10

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, master has been updated via fac786647c8d931e93b190c790fb1b2a1c95f94d (commit) from 90070fc927c8d8a3a37d0eb818a2c611c4e62fc7 (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 fac786647c8d931e93b190c790fb1b2a1c95f94d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jun 21 23:22:58 2010 +0200 Vpn-watch: it is faster to restart the whole ipsec. ----------------------------------------------------------------------- Summary of changes: src/scripts/vpn-watch | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index 08d562b..287bf8f 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -1,6 +1,6 @@ #!/usr/bin/perl ################################################## -##### VPN-Watch.pl Version 0.4a ##### +##### VPN-Watch.pl Version 0.4b ##### ################################################## # # # VPN-Watch is part of the IPFire Firewall # @@ -54,7 +54,7 @@ foreach (@vpnsettings){ if ( $established eq '' || $connected eq '' ){ logger("Remote IP for host $remotehostname has changed or no connection is established, restarting connection to $remoteip."); - system("/usr/local/bin/ipsecctrl S $settings[0]"); + system("/usr/local/bin/ipsecctrl S"); last; #all connections will reloaded } } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 90070fc927c8d8a3a37d0eb818a2c611c4e62fc7
by git＠ipfire.org 21 Jun '10

21 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a4c768798014c7f9b3bf54ee37eef44944765786
by git＠ipfire.org 21 Jun '10

21 Jun '10

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, master has been updated via a4c768798014c7f9b3bf54ee37eef44944765786 (commit) from 05a347c0ddab059ce337756c57634c664d7f6fe8 (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 a4c768798014c7f9b3bf54ee37eef44944765786 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jun 21 22:42:08 2010 +0200 Even if the ssl may never be used for this, the entry should be correct. ----------------------------------------------------------------------- Summary of changes: config/httpd/vhosts.d/ipfire-interface-ssl.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index f328f0e..7b10832 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -78,7 +78,7 @@ Allow from all </Directory> - Alias /urlrepo/ /var/urlrepo/ + Alias /repository/ /var/urlrepo/ <Directory /var/urlrepo> Options ExecCGI AllowOverride None hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 05a347c0ddab059ce337756c57634c664d7f6fe8
by git＠ipfire.org 21 Jun '10

21 Jun '10

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, master has been updated via 05a347c0ddab059ce337756c57634c664d7f6fe8 (commit) via 7e6204874286ae06847aad9f8313791f03991633 (commit) via 03baaf780efa355effe618233e7c67eb347f1567 (commit) from 0bc58278b943bcdb98ca783d155db1c411594caa (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 05a347c0ddab059ce337756c57634c664d7f6fe8 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jun 21 21:04:17 2010 +0200 Added the missing functions.pl for the 2nd theme to the updated commit 7e6204874286ae06847aad9f8313791f03991633 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jun 21 21:03:20 2010 +0200 Added urlrepo for local file redirection to httpd alias. commit 03baaf780efa355effe618233e7c67eb347f1567 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jun 21 21:02:43 2010 +0200 Fixed some file does not exists output ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 2 +- config/httpd/vhosts.d/ipfire-interface-ssl.conf | 8 ++++++++ config/rootfiles/core/38/filelists/files | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 3418c68..c300b0a 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1042,7 +1042,7 @@ sub updatecpufreqgraph { # Generate the Thermal Zone Temp CPU Graph sub updatethermaltempgraph { - my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* | wc -l`; + my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* | wc -l 2>/dev/null`; my $period = $_[0]; my @command = ( "-", diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 08ba2b3..f328f0e 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -77,4 +77,12 @@ Order deny,allow Allow from all </Directory> + + Alias /urlrepo/ /var/urlrepo/ + <Directory /var/urlrepo> + Options ExecCGI + AllowOverride None + Order deny,allow + Allow from all + </Directory> </VirtualHost> diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 74b1eac..fc9e6c0 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -39,6 +39,7 @@ srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/functions.pl var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0bc58278b943bcdb98ca783d155db1c411594caa
by git＠ipfire.org 21 Jun '10

21 Jun '10

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, master has been updated via 0bc58278b943bcdb98ca783d155db1c411594caa (commit) from 1b37278adbca2710dedadf494c0ff5b60df494a6 (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 0bc58278b943bcdb98ca783d155db1c411594caa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jun 21 20:45:33 2010 +0200 Fix update acclerator file download at webif. bug #0000667 ----------------------------------------------------------------------- Summary of changes: config/httpd/vhosts.d/ipfire-interface-ssl.conf | 8 ++++++++ config/rootfiles/core/38/filelists/files | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 0d0fa98..08ba2b3 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -69,4 +69,12 @@ downgrade-1.0 force-response-1.0 CustomLog /var/log/httpd/ssl_request_log \ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" + + Alias /updatecache/ /var/updatecache/ + <Directory /var/updatecache> + Options ExecCGI + AllowOverride None + Order deny,allow + Allow from all + </Directory> </VirtualHost> diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 5ac8fa4..74b1eac 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/e2fsck.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/rc.d/init.d/leds etc/rc.d/init.d/rc etc/rc.d/init.d/snort hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1b37278adbca2710dedadf494c0ff5b60df494a6
by git＠ipfire.org 21 Jun '10

21 Jun '10

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, master has been updated via 1b37278adbca2710dedadf494c0ff5b60df494a6 (commit) from 841f013e264d21dd6d3a725325623dbc21aac4f9 (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 1b37278adbca2710dedadf494c0ff5b60df494a6 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jun 21 19:03:10 2010 +0200 Fixed Guardian deactivate bug #0000664 ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/snort | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index d22cbc4..87c034e 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -118,7 +118,7 @@ case "$1" in rm /var/run/snort_* >/dev/null 2>/dev/null - if [ -r /var/ipfire/guardian/enable ]; then + if ([ -r /var/ipfire/guardian/enable ] || [ -n $(pidofproc /usr/local/bin/guardian.pl) ]); then boot_mesg "Stopping Guardian..." killproc /usr/local/bin/guardian.pl fi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 76deda33df494d4534f79c87e4f4d4318fcc8f14
by git＠ipfire.org 20 Jun '10

20 Jun '10

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 3.x development tree". The branch, master has been updated via 76deda33df494d4534f79c87e4f4d4318fcc8f14 (commit) via fcac373bfe8023285c79b281a15c0a874973be96 (commit) via bb1e26b422d0f3b8701ccc937dfff1cf8e2f9c0d (commit) via 05a00e41860561a43e33e931ab990c4cd85ec9e4 (commit) via f51811572b7ca28f07d62a2fe284ca745aa878db (commit) from 38d3d0ec08ef15868fe73afc6c4192568ddc54c3 (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 76deda33df494d4534f79c87e4f4d4318fcc8f14 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 19 11:49:53 2010 +0200 module-init-tools: Update to 3.12. commit fcac373bfe8023285c79b281a15c0a874973be96 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 18 17:51:24 2010 +0200 libssh2: Update to 1.2.6. commit bb1e26b422d0f3b8701ccc937dfff1cf8e2f9c0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 18 16:27:41 2010 +0200 libtiff: Update to 4.0.0beta6. commit 05a00e41860561a43e33e931ab990c4cd85ec9e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 18 16:06:01 2010 +0200 pango: Update to 1.28.1. commit f51811572b7ca28f07d62a2fe284ca745aa878db Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 18 15:55:19 2010 +0200 cairo: Update to 1.8.10. ----------------------------------------------------------------------- Summary of changes: pkgs/core/cairo/cairo.nm | 6 +----- pkgs/core/libssh2/libssh2.nm | 2 +- pkgs/core/libtiff/libtiff.nm | 2 +- pkgs/core/module-init-tools/module-init-tools.nm | 2 +- pkgs/core/pango/pango.nm | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) Difference in files: diff --git a/pkgs/core/cairo/cairo.nm b/pkgs/core/cairo/cairo.nm index 1808536..fe34c29 100644 --- a/pkgs/core/cairo/cairo.nm +++ b/pkgs/core/cairo/cairo.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = cairo -PKG_VER = 1.8.4 +PKG_VER = 1.8.10 PKG_REL = 0 PKG_MAINTAINER = @@ -45,7 +45,3 @@ define PKG_DESCRIPTION endef PKG_TARBALL = $(THISAPP).tar.gz - -define STAGE_PREPARE_CMDS - cd $(DIR_APP) && sed -e "s/libpng12/& libpng14/g" -i configure -endef diff --git a/pkgs/core/libssh2/libssh2.nm b/pkgs/core/libssh2/libssh2.nm index e1e2d73..7002b2c 100644 --- a/pkgs/core/libssh2/libssh2.nm +++ b/pkgs/core/libssh2/libssh2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libssh2 -PKG_VER = 1.2.5 +PKG_VER = 1.2.6 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/libtiff/libtiff.nm b/pkgs/core/libtiff/libtiff.nm index 3e74dc6..ee610c9 100644 --- a/pkgs/core/libtiff/libtiff.nm +++ b/pkgs/core/libtiff/libtiff.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libtiff -PKG_VER = 3.9.1 +PKG_VER = 4.0.0beta6 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/module-init-tools/module-init-tools.nm b/pkgs/core/module-init-tools/module-init-tools.nm index 92562ec..4fd794d 100644 --- a/pkgs/core/module-init-tools/module-init-tools.nm +++ b/pkgs/core/module-init-tools/module-init-tools.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = module-init-tools -PKG_VER = 3.11.1 +PKG_VER = 3.12 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/pango/pango.nm b/pkgs/core/pango/pango.nm index 61c2898..43c2ea3 100644 --- a/pkgs/core/pango/pango.nm +++ b/pkgs/core/pango/pango.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = pango -PKG_VER = 1.27.1 +PKG_VER = 1.28.1 PKG_REL = 0 PKG_MAINTAINER = @@ -42,7 +42,7 @@ define PKG_DESCRIPTION emphasis on internationalization. endef -PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz CONFIGURE_OPTIONS += \ --sysconfdir=/etc hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 841f013e264d21dd6d3a725325623dbc21aac4f9
by git＠ipfire.org 20 Jun '10

20 Jun '10

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, master has been updated via 841f013e264d21dd6d3a725325623dbc21aac4f9 (commit) from 9c3b24502ab3b29f67301248527341aaa8d69d27 (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 841f013e264d21dd6d3a725325623dbc21aac4f9 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Sun Jun 20 20:15:08 2010 +0200 Fixed guardian gateway detection - this fixes bug #0000665 ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.pl | 5 +++-- lfs/guardian | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index 5c42186..b5c3f9c 100644 --- a/config/guardian/guardian.pl +++ b/config/guardian/guardian.pl @@ -34,12 +34,13 @@ if ($hostipaddr !~ /\d+\.\d+\.\d+\.\d+/) { $networkaddr = $hostipaddr; $networkaddr =~ s/\d+$/0/; -$gatewayaddr = $hostipaddr; -$gatewayaddr =~ s/\d+$/$hostgatewaybyte/; +$gatewayaddr = `cat /var/ipfire/red/remote-ipaddress 2>/dev/null`; $broadcastaddr = $hostipaddr; $broadcastaddr =~ s/\d+$/255/; &build_ignore_hash; +print "My gatewayaddess is: $gatewayaddr\n"; + # This is the target hash. If a packet was destened to any of these, then the # sender of that packet will get denied, unless it is on the ignore list.. diff --git a/lfs/guardian b/lfs/guardian index f3118f6..e08a469 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -30,7 +30,7 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 3 +PAK_VER = 4 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9c3b24502ab3b29f67301248527341aaa8d69d27
by git＠ipfire.org 20 Jun '10

20 Jun '10

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, master has been updated via 9c3b24502ab3b29f67301248527341aaa8d69d27 (commit) via b29c22a433ed2e9bf6e6d0b3379210d7f4e32502 (commit) from e2e106be5633b49ac9391ea187c39f6f777596d3 (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 9c3b24502ab3b29f67301248527341aaa8d69d27 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 20 13:48:26 2010 +0200 Don't report fail if mISDN hardware is in use at shutdown. commit b29c22a433ed2e9bf6e6d0b3379210d7f4e32502 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 20 13:46:10 2010 +0200 Updated mISDN,mISDNuser (25.5.2010) and lcr (1.7). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/mISDN | 40 ++++++++------ config/rootfiles/common/mISDNuser | 31 +++++++---- config/rootfiles/core/38/filelists/mISDN | 1 + .../{oldcore/28 => core/38}/filelists/mISDNuser | 0 config/rootfiles/core/38/update.sh | 6 ++- doc/packages-list.txt | 8 ++- lfs/lcr | 10 ++-- lfs/linux | 11 ++--- lfs/{kqemu => mISDN} | 36 ++++++++----- lfs/mISDNuser | 9 ++-- make.sh | 2 + src/initscripts/init.d/mISDN | 11 ++--- src/patches/mISDN-hfcusb_bchannels.patch | 56 -------------------- 13 files changed, 96 insertions(+), 125 deletions(-) create mode 120000 config/rootfiles/core/38/filelists/mISDN copy config/rootfiles/{oldcore/28 => core/38}/filelists/mISDNuser (100%) copy lfs/{kqemu => mISDN} (75%) delete mode 100644 src/patches/mISDN-hfcusb_bchannels.patch Difference in files: diff --git a/config/rootfiles/common/mISDN b/config/rootfiles/common/mISDN index 84697b3..4cf067a 100644 --- a/config/rootfiles/common/mISDN +++ b/config/rootfiles/common/mISDN @@ -1,17 +1,23 @@ -#lib/modules/2.6.27.21-ipfire/mISDN -#lib/modules/2.6.27.21-ipfire/mISDN/hfcmulti.ko -#lib/modules/2.6.27.21-ipfire/mISDN/hfcpci.ko -#lib/modules/2.6.27.21-ipfire/mISDN/hfcsusb.ko -#lib/modules/2.6.27.21-ipfire/mISDN/l1oip.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_core.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_kb1ec.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_mec2.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_mg2ec.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_octwareec.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_oslec.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dtmf.ko -#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_l1loop.ko -#lib/modules/2.6.27.21-ipfire/mISDN/octvqe -#lib/modules/2.6.27.21-ipfire/mISDN/octvqe/octvqe.ko -#lib/modules/2.6.27.21-ipfire/mISDN/xhfc.ko +etc/modprobe.d/mISDN +#lib/modules/2.6.32.15-ipfire/mISDN +#lib/modules/2.6.32.15-ipfire/mISDN/avmfritz.ko +#lib/modules/2.6.32.15-ipfire/mISDN/hfcmulti.ko +#lib/modules/2.6.32.15-ipfire/mISDN/hfcpci.ko +#lib/modules/2.6.32.15-ipfire/mISDN/hfcsusb.ko +#lib/modules/2.6.32.15-ipfire/mISDN/l1oip.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_core.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_kb1ec.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_mec2.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_mg2ec.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_octwareec.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_oslec.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_l1loop.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDNinfineon.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDNipac.ko +#lib/modules/2.6.32.15-ipfire/mISDN/mISDNisar.ko +#lib/modules/2.6.32.15-ipfire/mISDN/octvqe +#lib/modules/2.6.32.15-ipfire/mISDN/octvqe/octvqe.ko +#lib/modules/2.6.32.15-ipfire/mISDN/speedfax.ko +#lib/modules/2.6.32.15-ipfire/mISDN/w6692.ko +#lib/modules/2.6.32.15-ipfire/mISDN/xhfc.ko diff --git a/config/rootfiles/common/mISDNuser b/config/rootfiles/common/mISDNuser index 6e5b152..d75a666 100644 --- a/config/rootfiles/common/mISDNuser +++ b/config/rootfiles/common/mISDNuser @@ -1,18 +1,25 @@ -etc/rc.d/init.d/mISDN usr/bin/l1oipctrl usr/bin/misdn_bridge -usr/bin/misdn_cleanl2 usr/bin/misdn_info usr/bin/misdn_log -usr/bin/misdn_rename -#usr/include/mISDNuser -#usr/include/mISDNuser/compat_af_isdn.h -#usr/include/mISDNuser/isdn_net.h -#usr/include/mISDNuser/l3dss1.h -#usr/include/mISDNuser/mISDNif.h -#usr/include/mISDNuser/mbuffer.h -#usr/include/mISDNuser/mlayer3.h -#usr/include/mISDNuser/q931.h +#usr/include/mISDN +#usr/include/mISDN/l3dss1.h +#usr/include/mISDN/mISDNcompat.h +#usr/include/mISDN/mISDNif.h +#usr/include/mISDN/mbuffer.h +#usr/include/mISDN/mlayer3.h +#usr/include/mISDN/q931.h +#usr/include/mISDN/suppserv.h #usr/lib/libmisdn.a +#usr/lib/libmisdn.la usr/lib/libmisdn.so -#usr/lib/libmisdn_pic.a +usr/lib/libmisdn.so.0 +usr/lib/libmisdn.so.0.2.1 +#usr/lib/libsuppserv.a +#usr/lib/libsuppserv.la +usr/lib/libsuppserv.so +usr/lib/libsuppserv.so.0 +usr/lib/libsuppserv.so.0.1.1 +usr/sbin/misdn_cleanl2 +usr/sbin/misdn_rename +etc/rc.d/init.d/mISDN diff --git a/config/rootfiles/core/38/filelists/mISDN b/config/rootfiles/core/38/filelists/mISDN new file mode 120000 index 0000000..5707154 --- /dev/null +++ b/config/rootfiles/core/38/filelists/mISDN @@ -0,0 +1 @@ +../../../common/mISDN \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/mISDNuser b/config/rootfiles/core/38/filelists/mISDNuser new file mode 120000 index 0000000..78537d4 --- /dev/null +++ b/config/rootfiles/core/38/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 3cb9654..8882021 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -95,7 +95,11 @@ rm -rf /usr/libexec/ipsec # rm -rf /usr/lib/snort_* rm -rf /etc/snort - +# +# mISDN Files that was moved to sbin +# +rm -rf /usr/bin/misdn_rename +rm -rf /usr/bin/misdn_cleanl2 # # Backup grub.conf # diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 3cef4ed..42a483d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -1,4 +1,4 @@ -== List of softwares used to build IPFire Version: 2.6 == +== List of softwares used to build IPFire Version: 2.7 == * Archive-Tar-1.29 * Archive-Zip-1.16 * BerkeleyDB-0.27 @@ -169,7 +169,7 @@ * l7-protocols-2009-05-10 * lame-3.97 * lcd4linux-0.10.1-RC2 -* lcr_20090906 +* lcr-20100601 * less-394 * libaal-1.0.5 * libart_lgpl-2.3.17 @@ -209,7 +209,9 @@ * lynis-1.2.9 * lzo-2.02 * m4-1.4.4 -* mISDNuser_20090906 +* mISDN-20100525-kmod-2.6.32.15-ipfire +* mISDN-20100525-kmod-2.6.32.15-ipfire-xen +* mISDNuser-20100525 * madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire * madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen * make-3.81 diff --git a/lfs/lcr b/lfs/lcr index 935a457..b743fdd 100644 --- a/lfs/lcr +++ b/lfs/lcr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # # # # 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,15 +24,15 @@ include Config -VER = 20090906 +VER = 20100601 -THISAPP = lcr_$(VER) +THISAPP = lcr-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcr -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 18554fbe046d349b81113dd90732fdaa +$(DL_FILE)_MD5 = 68ccdcbe741df38c0f79d14c1b5473f5 install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index 8e1c702..fa0ec1e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -141,10 +141,6 @@ endif # Squashfs LZMA support cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1 - # mISDN hfcusb fixes - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb_bchannels.patch - # Add some more LED triggers cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch @@ -184,9 +180,9 @@ endif mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \ /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko -# # Remove mISDN modules -# rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN -# rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN + # Remove mISDN modules + rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN + rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN ifneq "$(XEN)" "1" # Blacklist matroxfb_base @@ -205,6 +201,7 @@ ifneq "$(XEN)" "1" for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \ done + sed -i -e "s|.ko||g" /etc/modprobe.d/isdn endif @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-* diff --git a/lfs/mISDN b/lfs/mISDN new file mode 100644 index 0000000..a6dd753 --- /dev/null +++ b/lfs/mISDN @@ -0,0 +1,97 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +ifeq "$(XEN)" "1" + VERSUFIX=ipfire-xen +else + VERSUFIX=ipfire +endif + +VER = 20100525 + +THISAPP = mISDN-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch + cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux + cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules + cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \ + INSTALL_PREFIX=$(DIR_SRC)/mISDN/dest/ \ + modules-install + mv $(DIR_SRC)/mISDN/dest/lib/modules/*/extra \ + /lib/modules/$(KVER)-$(VERSUFIX)/mISDN + +ifneq "$(XEN)" "1" + # Blacklist misdn modules + for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN ; \ + done + sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN +endif + + @rm -rf $(DIR_SRC)/mISDN* + @$(POSTBUILD) diff --git a/lfs/mISDNuser b/lfs/mISDNuser index 0347b06..22183a6 100644 --- a/lfs/mISDNuser +++ b/lfs/mISDNuser @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # # # # 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,9 +24,9 @@ include Config -VER = 20090906 +VER = 20100525 -THISAPP = mISDNuser_$(VER) +THISAPP = mISDNuser-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = afc28383ac908eddd0219c5efb9b8178 +$(DL_FILE)_MD5 = 8e9b507c3f576cefb857329f72e62318 install : $(TARGET) @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/mISDNuser && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_SRC)/mISDNuser && ./configure --prefix=/usr --with-AF_ISDN=34 cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux @$(POSTBUILD) diff --git a/make.sh b/make.sh index 9eca589..319c9ff 100755 --- a/make.sh +++ b/make.sh @@ -347,6 +347,7 @@ buildipfire() { ipfiremake kqemu XEN=1 ipfiremake v4l-dvb XEN=1 ipfiremake madwifi XEN=1 + ipfiremake mISDN XEN=1 ipfiremake dahdi XEN=1 KMOD=1 ipfiremake cryptodev XEN=1 ipfiremake compat-wireless XEN=1 @@ -361,6 +362,7 @@ buildipfire() { ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 + ipfiremake mISDN ipfiremake dahdi KMOD=1 ipfiremake cryptodev ipfiremake compat-wireless diff --git a/src/initscripts/init.d/mISDN b/src/initscripts/init.d/mISDN index 3437bf9..49f00b0 100644 --- a/src/initscripts/init.d/mISDN +++ b/src/initscripts/init.d/mISDN @@ -26,6 +26,7 @@ case "${1}" in done modprobe mISDN_dsp + modprobe mISDN_dsp_oslec if [ ${?} = 0 ]; then echo_ok; else @@ -39,16 +40,12 @@ case "${1}" in boot_mesg "Stopping mISDNv2 ... " # unload mISDN hardware modules - for module in mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do + for module in mISDN_dsp_oslec mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do rmmod $module > /dev/null 2>&1; done - rmmod mISDN_core - if [ ${?} = 0 ]; then - echo_ok; - else - echo_failure; - fi + rmmod mISDN_core > /dev/null 2>&1 + echo_ok; exit 0; ;; diff --git a/src/patches/mISDN-hfcusb_bchannels.patch b/src/patches/mISDN-hfcusb_bchannels.patch deleted file mode 100644 index 322239d..0000000 --- a/src/patches/mISDN-hfcusb_bchannels.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: mbachem <info(a)colognechip.com> -Date: Thu, 17 Dec 2009 01:45:58 +0000 (+0100) -Subject: mISDN: Bugfix hfcsusb: usb endpoint activation/deactivation -X-Git-Url: http://git.misdn.org/?p=mISDN.git;a=commitdiff_plain;h=e29960990df531faff42… - -mISDN: Bugfix hfcsusb: usb endpoint activation/deactivation - -fixed activation/deactivation of B1/B2's USB endpoints - -Signed-off-by: mbachem <info(a)colognechip.com> ---- - -diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c -index c5f29db..e8c5754 100644 ---- a/drivers/isdn/hardware/mISDN/hfcsusb.c -+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c -@@ -36,7 +36,7 @@ - #include <linux/isdn_compat.h> - #include "hfcsusb.h" - --static const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05"; -+static const char *hfcsusb_rev = "Revision: 0.3.4 (socket), 2009-12-16"; - - static unsigned int debug; - static int poll = DEFAULT_TRANSP_BURST_SZ; -@@ -239,7 +239,7 @@ hfcusb_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb) - return ret; - case PH_ACTIVATE_REQ: - if (!test_and_set_bit(FLG_ACTIVE, &bch->Flags)) { -- hfcsusb_start_endpoint(hw, bch->nr); -+ hfcsusb_start_endpoint(hw, bch->nr-1); - ret = hfcsusb_setup_bch(bch, ch->protocol); - } else - ret = 0; -@@ -502,12 +502,6 @@ open_bchannel(struct hfcsusb *hw, struct channel_req *rq) - bch->ch.protocol = rq->protocol; - rq->ch = &bch->ch; - -- /* start USB endpoint for bchannel */ -- if (rq->adr.channel == 1) -- hfcsusb_start_endpoint(hw, HFC_CHAN_B1); -- else -- hfcsusb_start_endpoint(hw, HFC_CHAN_B2); -- - if (!try_module_get(THIS_MODULE)) - printk(KERN_WARNING "%s: %s:cannot get module\n", - hw->name, __func__); -@@ -1813,7 +1807,7 @@ deactivate_bchannel(struct bchannel *bch) - mISDN_clear_bchannel(bch); - spin_unlock_irqrestore(&hw->lock, flags); - hfcsusb_setup_bch(bch, ISDN_P_NONE); -- hfcsusb_stop_endpoint(hw, bch->nr); -+ hfcsusb_stop_endpoint(hw, bch->nr-1); - } - - /* hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e2e106be5633b49ac9391ea187c39f6f777596d3
by git＠ipfire.org 19 Jun '10

19 Jun '10

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2010