webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid

Browse Source
This commit is contained in:
Michael Tremer
2014-09-16 20:45:35 +02:00
parent 7f6e04258a cce37f04af
commit f5fe98fead
9 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/cfgroot/general-functions.pl
View File

@@ -286,7 +286,7 @@ sub validip
sub validmask {
my $mask = shift;
return &Network::check_netmask($mask) or &Network::check_prefix($mask);
return &Network::check_netmask($mask) || &Network::check_prefix($mask);
}
sub validipormask
@@ -388,7 +388,9 @@ sub iporsubtocidr
}
sub getnetworkip {
return &Network::get_netaddress(shift);
my $arg = join("/", @_);
return &Network::get_netaddress($arg);
}
sub getccdbc

1
config/rootfiles/core/82/filelists/openssl-compat Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openssl-compat

6
config/rootfiles/packages/perl-PDF-API2
View File

@@ -129,9 +129,9 @@ usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/uniglyph.txt
usr/lib/perl5/site_perl/5.12.3/PDF/API2/UniWrap.pm
usr/lib/perl5/site_perl/5.12.3/PDF/API2/Util.pm
usr/lib/perl5/site_perl/5.12.3/PDF/API2/Win32.pm
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2/.packlist
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF/API2
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF/API2/.packlist
#usr/share/man/man3/PDF::API2.3
#usr/share/man/man3/PDF::API2::Annotation.3
#usr/share/man/man3/PDF::API2::Basic::PDF::Array.3

3
config/xen-image/README
View File

@@ -19,6 +19,7 @@ other usefull commands from the Dom0:
- reset the fire: "xm destroy ipfire-xen"
- look what is going on: "xm top" or "xm list"
This script can also build a Citrix XenCenter xva image.
This script can also build a Citrix XenCenter xva image. (Need xz-aware
xen version. Tested with Citrix Xen Server 6.2.5 beta)
- run "XEN_IMG_TYPE=xva sh xen-image-maker.sh" to build an xva image.
- import the vm with "xe vm-import file=ipfire.xfa"

6
lfs/openssl-compat
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 IPFire Team <info@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,7 +24,7 @@
include Config
VER = 0.9.8y
VER = 0.9.8zb
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 47c7fb37f78c970f1d30aa2f9e9e26d8
$(DL_FILE)_MD5 = 65c5f42734f8ecd58990b12a9afa6453
install : $(TARGET)

6
lfs/rsync
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.1.0
VER = 3.1.1
THISAPP = rsync-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rsync
PAK_VER = 8
PAK_VER = 9
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3be148772a33224771a8d4d2a028b132
$(DL_FILE)_MD5 = 43bd6676f0b404326eee2d63be3cdcfe
install : $(TARGET)

2
lfs/samba
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 58
PAK_VER = 59
DEPS = "cups krb5"

4
lfs/sane
View File

@@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/sane-backends-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = sane
PAK_VER = 3
PAK_VER = 4
DEPS = "libtiff"
DEPS = "cups libtiff"
###############################################################################
# Top-level Rules

1
src/squid-accounting/acct-lib.pl
View File

@@ -460,7 +460,6 @@ sub pdf2 {
$lines->linewidth('0.5');
#Fill BILL DATA into PDF
setlocale(LC_ALL, "$mainsettings{'LANGUAGE'}_$uplang");
foreach (@billar) {
my ($a1,$a2) = split( /\,/, $_ );
$a2=sprintf"%.2f",($a2/1024/1024);