From 2c42fe6ada55025edc1940e5438110b5f44500f4 Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 26 Oct 2007 14:02:15 +0000 Subject: [PATCH] A small number of buildfixes by Maniac. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@999 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/backup | 1 + config/rootfiles/common/ntfs-3g | 4 ++-- config/rootfiles/packages/nfs | 6 ------ html/cgi-bin/connections.cgi | 19 ++++++++++--------- lfs/mldonkey | 2 +- lfs/openssl | 1 - 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/config/rootfiles/common/backup b/config/rootfiles/common/backup index 37c21e1ae..a871499cd 100644 --- a/config/rootfiles/common/backup +++ b/config/rootfiles/common/backup @@ -1,3 +1,4 @@ +var/ipfire/backup/addons #var/ipfire/backup/bin var/ipfire/backup/bin/backup.pl var/ipfire/backup/exclude diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 17383b3d5..9ed59866b 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -2,8 +2,8 @@ bin/ntfs-3g #lib/libntfs-3g.a #lib/libntfs-3g.la lib/libntfs-3g.so -lib/libntfs-3g.so.9 -lib/libntfs-3g.so.9.0.0 +lib/libntfs-3g.so.13 +lib/libntfs-3g.so.13.0.0 sbin/mount.ntfs-3g #usr/include/ntfs-3g #usr/include/ntfs-3g/attrib.h diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index 855ea8eb4..a7b57be85 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -19,14 +19,8 @@ #usr/man/man8/statd.8 usr/sbin/exportfs usr/sbin/nfsstat -usr/sbin/nhfsgraph -usr/sbin/nhfsnums -usr/sbin/nhfsrun -usr/sbin/nhfsstone -usr/sbin/rpc.lockd usr/sbin/rpc.mountd usr/sbin/rpc.nfsd -usr/sbin/rpc.rquotad usr/sbin/rpc.statd usr/sbin/showmount #var/lib/nfs diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 6ab9cab5c..fd95f239b 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -48,10 +48,20 @@ open (ACTIVE, 'iptstate -1rbt |') or die 'Unable to open ip_conntrack'; my @active = ; close (ACTIVE); +if (open(IP, "${General::swroot}/red/local-ipaddress")) { + my $redip = ; + close(IP); + chomp $redip; + push(@network, $redip); + push(@masklen, '255.255.255.255' ); + push(@colour, ${Header::colourfw} ); +} + my @vpn = ` route -n | grep ipsec | awk '{ print \$1" "\$3}'`; foreach my $route (@vpn) { chomp($route); my @temp = split(/[\t ]+/, $route); + if ( $temp[0] eq '$redip' ){next;} push(@network, $temp[0]); push(@masklen, $temp[1]); push(@colour, ${Header::colourvpn} ); @@ -178,15 +188,6 @@ if ( $vpn[0] ne 'none' ) { push(@colour, ${Header::colourvpn} ); } } -if (open(IP, "${General::swroot}/red/local-ipaddress")) { - my $redip = ; - close(IP); - chomp $redip; - push(@network, $redip); - push(@masklen, '255.255.255.255' ); - push(@colour, ${Header::colourfw} ); -} - #Establish simple filtering&sorting boxes on top of table diff --git a/lfs/mldonkey b/lfs/mldonkey index 9a3216a33..6d59aa695 100644 --- a/lfs/mldonkey +++ b/lfs/mldonkey @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d7b92ae3e8782a3c4adeb0e7870c07dc +$(DL_FILE)_MD5 = 457564a0baedabe262254de660420c1c install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index 9aaf62ac0..681e4d792 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf /etc/ssl cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared cd $(DIR_APP) && make MANDIR=/usr/share/man cd $(DIR_APP) && make MANDIR=/usr/share/man install -- 2.39.2