webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

A small number of buildfixes by Maniac.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@999 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-10-26 14:02:15 +00:00
parent 3d1f6a3556
commit 2c42fe6ada
6 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/backup
View File

@@ -1,3 +1,4 @@
var/ipfire/backup/addons
#var/ipfire/backup/bin #var/ipfire/backup/bin
var/ipfire/backup/bin/backup.pl var/ipfire/backup/bin/backup.pl
var/ipfire/backup/exclude var/ipfire/backup/exclude

4
config/rootfiles/common/ntfs-3g
View File

@@ -2,8 +2,8 @@ bin/ntfs-3g
#lib/libntfs-3g.a #lib/libntfs-3g.a
#lib/libntfs-3g.la #lib/libntfs-3g.la
lib/libntfs-3g.so lib/libntfs-3g.so
lib/libntfs-3g.so.9 lib/libntfs-3g.so.13
lib/libntfs-3g.so.9.0.0 lib/libntfs-3g.so.13.0.0
sbin/mount.ntfs-3g sbin/mount.ntfs-3g
#usr/include/ntfs-3g #usr/include/ntfs-3g
#usr/include/ntfs-3g/attrib.h #usr/include/ntfs-3g/attrib.h

6
config/rootfiles/packages/nfs
View File

@@ -19,14 +19,8 @@
#usr/man/man8/statd.8 #usr/man/man8/statd.8
usr/sbin/exportfs usr/sbin/exportfs
usr/sbin/nfsstat 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.mountd
usr/sbin/rpc.nfsd usr/sbin/rpc.nfsd
usr/sbin/rpc.rquotad
usr/sbin/rpc.statd usr/sbin/rpc.statd
usr/sbin/showmount usr/sbin/showmount
#var/lib/nfs #var/lib/nfs

19
html/cgi-bin/connections.cgi
View File

@@ -48,10 +48,20 @@ open (ACTIVE, 'iptstate -1rbt |') or die 'Unable to open ip_conntrack';
my @active = <ACTIVE>; my @active = <ACTIVE>;
close (ACTIVE); close (ACTIVE);
if (open(IP, "${General::swroot}/red/local-ipaddress")) {
my $redip = <IP>;
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}'`; my @vpn = ` route -n | grep ipsec | awk '{ print \$1" "\$3}'`;
foreach my $route (@vpn) { foreach my $route (@vpn) {
chomp($route); chomp($route);
my @temp = split(/[\t ]+/, $route); my @temp = split(/[\t ]+/, $route);
if ( $temp[0] eq '$redip' ){next;}
push(@network, $temp[0]); push(@network, $temp[0]);
push(@masklen, $temp[1]); push(@masklen, $temp[1]);
push(@colour, ${Header::colourvpn} ); push(@colour, ${Header::colourvpn} );
@@ -178,15 +188,6 @@ if ( $vpn[0] ne 'none' ) {
push(@colour, ${Header::colourvpn} ); push(@colour, ${Header::colourvpn} );
} }
} }
if (open(IP, "${General::swroot}/red/local-ipaddress")) {
my $redip = <IP>;
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 #Establish simple filtering&sorting boxes on top of table

2
lfs/mldonkey
View File

@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d7b92ae3e8782a3c4adeb0e7870c07dc $(DL_FILE)_MD5 = 457564a0baedabe262254de660420c1c
install : $(TARGET) install : $(TARGET)

1
lfs/openssl
View File

@@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf /etc/ssl @rm -rf /etc/ssl
cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config 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) && 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) && ./config --openssldir=/etc/ssl --prefix=/usr shared
cd $(DIR_APP) && make MANDIR=/usr/share/man cd $(DIR_APP) && make MANDIR=/usr/share/man
cd $(DIR_APP) && make MANDIR=/usr/share/man install cd $(DIR_APP) && make MANDIR=/usr/share/man install