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

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5

Browse Source
This commit is contained in:
Michael Tremer
2012-07-15 13:15:11 +02:00
parent 3090c39efd b0c682c06f
commit b829fa10cc
13 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config/rootfiles/common/usb_modeswitch_data
View File

@@ -2,22 +2,26 @@ etc/usb_modeswitch.d
lib/udev/rules.d/40-usb_modeswitch.rules
#usr/share/usb_modeswitch
usr/share/usb_modeswitch/03f0:002a
usr/share/usb_modeswitch/0408:f000
usr/share/usb_modeswitch/0421:060c
usr/share/usb_modeswitch/0421:0610
usr/share/usb_modeswitch/0421:0622
usr/share/usb_modeswitch/0421:0627
usr/share/usb_modeswitch/0421:062c
usr/share/usb_modeswitch/0421:0637
usr/share/usb_modeswitch/0471:1210:uMa=Philips
usr/share/usb_modeswitch/0471:1210:uMa=Wisue
usr/share/usb_modeswitch/0471:1237
usr/share/usb_modeswitch/0482:024d
usr/share/usb_modeswitch/04bb:bccd
usr/share/usb_modeswitch/04e8:680c
usr/share/usb_modeswitch/04e8:689a
usr/share/usb_modeswitch/04e8:f000:sMo=U209
usr/share/usb_modeswitch/057c:84ff
usr/share/usb_modeswitch/05c6:1000:sVe=GT
usr/share/usb_modeswitch/05c6:1000:sVe=Option
usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA
usr/share/usb_modeswitch/05c6:1000:uMa=CELOT
usr/share/usb_modeswitch/05c6:1000:uMa=DGT
usr/share/usb_modeswitch/05c6:1000:uMa=Option
usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
@@ -34,6 +38,7 @@ usr/share/usb_modeswitch/07d1:a804
usr/share/usb_modeswitch/0930:0d46
usr/share/usb_modeswitch/0ace:2011
usr/share/usb_modeswitch/0ace:20ff
usr/share/usb_modeswitch/0af0:4007
usr/share/usb_modeswitch/0af0:6711
usr/share/usb_modeswitch/0af0:6731
usr/share/usb_modeswitch/0af0:6751
@@ -64,6 +69,7 @@ usr/share/usb_modeswitch/0af0:7801
usr/share/usb_modeswitch/0af0:7901
usr/share/usb_modeswitch/0af0:7a01
usr/share/usb_modeswitch/0af0:7a05
usr/share/usb_modeswitch/0af0:8006
usr/share/usb_modeswitch/0af0:8200
usr/share/usb_modeswitch/0af0:8201
usr/share/usb_modeswitch/0af0:8300
@@ -95,6 +101,7 @@ usr/share/usb_modeswitch/0cf3:20ff
usr/share/usb_modeswitch/0d46:45a1
usr/share/usb_modeswitch/0d46:45a5
usr/share/usb_modeswitch/0df7:0800
usr/share/usb_modeswitch/0e8d:0002
usr/share/usb_modeswitch/0e8d:7109
usr/share/usb_modeswitch/0fce:d0cf
usr/share/usb_modeswitch/0fce:d0e1
@@ -114,6 +121,7 @@ usr/share/usb_modeswitch/106c:3b03
usr/share/usb_modeswitch/106c:3b05
usr/share/usb_modeswitch/106c:3b06
usr/share/usb_modeswitch/1076:7f40
usr/share/usb_modeswitch/109b:f009
usr/share/usb_modeswitch/1199:0fff
usr/share/usb_modeswitch/1266:1000
usr/share/usb_modeswitch/12d1:1001
@@ -129,6 +137,7 @@ usr/share/usb_modeswitch/12d1:14ad
usr/share/usb_modeswitch/12d1:14b5
usr/share/usb_modeswitch/12d1:14b7
usr/share/usb_modeswitch/12d1:14c1
usr/share/usb_modeswitch/12d1:14c3
usr/share/usb_modeswitch/12d1:14c4
usr/share/usb_modeswitch/12d1:14c5
usr/share/usb_modeswitch/12d1:14d1
@@ -140,6 +149,7 @@ usr/share/usb_modeswitch/12d1:1523
usr/share/usb_modeswitch/12d1:1553
usr/share/usb_modeswitch/12d1:1557
usr/share/usb_modeswitch/12d1:1c0b
usr/share/usb_modeswitch/12d1:1c24
usr/share/usb_modeswitch/12d1:1d50
usr/share/usb_modeswitch/12d1:1da1
usr/share/usb_modeswitch/12d1:1f01
@@ -164,9 +174,10 @@ usr/share/usb_modeswitch/198f:bccd
usr/share/usb_modeswitch/19d2:0003
usr/share/usb_modeswitch/19d2:0013
usr/share/usb_modeswitch/19d2:0026
usr/share/usb_modeswitch/19d2:0031
usr/share/usb_modeswitch/19d2:0040
usr/share/usb_modeswitch/19d2:0053
usr/share/usb_modeswitch/19d2:0083
usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA
usr/share/usb_modeswitch/19d2:0101
usr/share/usb_modeswitch/19d2:0103
usr/share/usb_modeswitch/19d2:0110
@@ -185,6 +196,7 @@ usr/share/usb_modeswitch/19d2:1179
usr/share/usb_modeswitch/19d2:1201
usr/share/usb_modeswitch/19d2:1216
usr/share/usb_modeswitch/19d2:1224
usr/share/usb_modeswitch/19d2:1514
usr/share/usb_modeswitch/19d2:1517
usr/share/usb_modeswitch/19d2:1520
usr/share/usb_modeswitch/19d2:2000
@@ -203,6 +215,7 @@ usr/share/usb_modeswitch/1c9e:1001
usr/share/usb_modeswitch/1c9e:6061
usr/share/usb_modeswitch/1c9e:9200
usr/share/usb_modeswitch/1c9e:9800
usr/share/usb_modeswitch/1c9e:98ff
usr/share/usb_modeswitch/1c9e:9e00
usr/share/usb_modeswitch/1c9e:f000
usr/share/usb_modeswitch/1da5:f000
@@ -214,13 +227,17 @@ usr/share/usb_modeswitch/1edf:6003
usr/share/usb_modeswitch/1ee8:0009
usr/share/usb_modeswitch/1ee8:0013
usr/share/usb_modeswitch/1ee8:0040
usr/share/usb_modeswitch/1ee8:0060
usr/share/usb_modeswitch/1f28:0021
usr/share/usb_modeswitch/1fac:0032
usr/share/usb_modeswitch/1fac:0130
usr/share/usb_modeswitch/2001:a80b
usr/share/usb_modeswitch/201e:1023
usr/share/usb_modeswitch/201e:2009
usr/share/usb_modeswitch/2020:f00e
usr/share/usb_modeswitch/2077:f000
usr/share/usb_modeswitch/21f5:1000
usr/share/usb_modeswitch/22f4:0021
usr/share/usb_modeswitch/230d:0001
usr/share/usb_modeswitch/230d:0007
usr/share/usb_modeswitch/8888:6500

2
config/rootfiles/core/61/filelists/files
View File

@@ -1,8 +1,10 @@
etc/system-release
etc/issue
etc/rc.d/init.d/collectd
opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
usr/sbin/redirect_wrapper

1
config/rootfiles/core/61/filelists/fireinfo Symbolic link
View File

@@ -0,0 +1 @@
../../../common/fireinfo

1
config/rootfiles/core/61/filelists/openvpn Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openvpn

1
config/rootfiles/core/61/filelists/pam Symbolic link
View File

@@ -0,0 +1 @@
../../../common/pam

1
config/rootfiles/core/61/filelists/usb_modeswitch_data Symbolic link
View File

@@ -0,0 +1 @@
../../../common/usb_modeswitch_data

4
config/rootfiles/core/61/update.sh
View File

@@ -35,6 +35,10 @@ done
#
#Stop services
#
#Remove old usb_modeswitch_data
rm -rf /usr/share/usb_modeswitch
#
#Extract files
extract_files

10
html/cgi-bin/index.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2012 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 #
@@ -489,6 +489,14 @@ foreach my $file (@files) {
}
}
# Reiser4 warning
my @files = `mount | grep " reiser4 (" 2>/dev/null`;
foreach my $disk (@files) {
chomp ($disk);
$warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
}
if ($warnmessage) {
print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
}

1
langs/de/cgi-bin/de.pl
View File

@@ -581,6 +581,7 @@
'delete share' => 'Freigabe löschen',
'delete user' => 'Benutzer löschen',
'demon login script' => 'Demon-Anmeldeskript',
'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
'description' => 'Beschreibung',
'dest ip and port' => 'Ziel-IP:Port',
'destination' => 'Ziel',

1
langs/en/cgi-bin/en.pl
View File

@@ -602,6 +602,7 @@
'delete share' => 'Delete share',
'delete user' => 'Delete user',
'demon login script' => 'Demon login script',
'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
'description' => 'Description',
'dest ip and port' => 'Dest. IP: Port',
'destination' => 'Destination',

6
lfs/GeoIP
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2012 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 #
@@ -25,7 +25,7 @@
include Config
VER = 1.17
DATVER = 01052012
DATVER = 04072012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
GeoIP.dat-$(DATVER).gz_MD5 = bb073125a92b1ee3dba202b1cec922c4
GeoIP.dat-$(DATVER).gz_MD5 = 1395bec12f8a5f0b1e889581271ed5ce
install : $(TARGET)

6
lfs/usb_modeswitch_data
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2012 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 = 20120120
VER = 20120531
THISAPP = usb-modeswitch-data-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c899cc9c71bb35f3ec600b7cd1455c65
$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3
install : $(TARGET)

9
src/pakfire/lib/functions.sh
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2012 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 #
@@ -28,6 +28,13 @@ extract_files() {
echo "...Finished."
}
extract_backup_includes() {
echo "Extracting backup includes..."
tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
var/ipfire/backup/addons/includes
echo "...Finished."
}
remove_files() {
echo "Removing files..."
for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do