[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15f78770b1d4ee730dca39166590393e3b24a666
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, next has been updated via 15f78770b1d4ee730dca39166590393e3b24a666 (commit) via 2dd319f5b52848a2feee817d62c590106817435b (commit) via 648e0d03685bcbd6c6a31a6d0b13d936126f3183 (commit) via 3770a2abd160035e9a1d0f59729fe8adbc8c3561 (commit) from 920cc7233335608630a117183b24ee0d5ff2a908 (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 15f78770b1d4ee730dca39166590393e3b24a666 Merge: 2dd319f 920cc72 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 16 08:36:54 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 2dd319f5b52848a2feee817d62c590106817435b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 16 08:35:28 2013 +0200
close core71.
commit 648e0d03685bcbd6c6a31a6d0b13d936126f3183 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 16 00:57:33 2013 +0200
usb-modeswitch-data: update to 20130610.
commit 3770a2abd160035e9a1d0f59729fe8adbc8c3561 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 16 00:56:17 2013 +0200
usb-modeswitch: update to 1.2.6.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/usb_modeswitch_data | 46 +++++++++++++++++++++- .../34 => core/71}/filelists/usb_modeswitch | 0 .../44 => core/71}/filelists/usb_modeswitch_data | 0 config/rootfiles/core/71/update.sh | 4 ++ lfs/usb_modeswitch | 6 +-- lfs/usb_modeswitch_data | 6 +-- make.sh | 4 +- src/pakfire/pakfire.conf | 2 +- 8 files changed, 58 insertions(+), 10 deletions(-) copy config/rootfiles/{oldcore/34 => core/71}/filelists/usb_modeswitch (100%) copy config/rootfiles/{oldcore/44 => core/71}/filelists/usb_modeswitch_data (100%)
Difference in files: diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 448a19e..a454c61 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -5,20 +5,24 @@ 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:0618 usr/share/usb_modeswitch/0421:061d usr/share/usb_modeswitch/0421:0622 usr/share/usb_modeswitch/0421:0627 usr/share/usb_modeswitch/0421:062c +usr/share/usb_modeswitch/0421:0632 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/04cc:225c 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:0010 usr/share/usb_modeswitch/05c6:1000:sVe=GT usr/share/usb_modeswitch/05c6:1000:sVe=Option usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA @@ -27,6 +31,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=DGT usr/share/usb_modeswitch/05c6:1000:uMa=Option usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG usr/share/usb_modeswitch/05c6:1000:uMa=SSE +usr/share/usb_modeswitch/05c6:1000:uMa=StrongRising usr/share/usb_modeswitch/05c6:1000:uMa=Vertex usr/share/usb_modeswitch/05c6:2000 usr/share/usb_modeswitch/05c6:2001 @@ -83,6 +88,7 @@ usr/share/usb_modeswitch/0af0:8700 usr/share/usb_modeswitch/0af0:8800 usr/share/usb_modeswitch/0af0:8900 usr/share/usb_modeswitch/0af0:9000 +usr/share/usb_modeswitch/0af0:9200 usr/share/usb_modeswitch/0af0:c031 usr/share/usb_modeswitch/0af0:c100 usr/share/usb_modeswitch/0af0:d001 @@ -104,7 +110,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:0002:uPr=MT usr/share/usb_modeswitch/0e8d:7109 usr/share/usb_modeswitch/0fce:d0cf usr/share/usb_modeswitch/0fce:d0e1 @@ -115,14 +121,19 @@ usr/share/usb_modeswitch/1004:607f usr/share/usb_modeswitch/1004:613a usr/share/usb_modeswitch/1004:613f usr/share/usb_modeswitch/1004:614e +usr/share/usb_modeswitch/1004:6156 usr/share/usb_modeswitch/1004:6190 +usr/share/usb_modeswitch/1004:61aa usr/share/usb_modeswitch/1004:61dd usr/share/usb_modeswitch/1004:61e7 usr/share/usb_modeswitch/1004:61eb +usr/share/usb_modeswitch/1004:6327 usr/share/usb_modeswitch/1033:0035 usr/share/usb_modeswitch/106c:3b03 usr/share/usb_modeswitch/106c:3b05 usr/share/usb_modeswitch/106c:3b06 +usr/share/usb_modeswitch/106c:3b11 +usr/share/usb_modeswitch/106c:3b14 usr/share/usb_modeswitch/1076:7f40 usr/share/usb_modeswitch/109b:f009 usr/share/usb_modeswitch/1199:0fff @@ -139,6 +150,7 @@ usr/share/usb_modeswitch/12d1:1449 usr/share/usb_modeswitch/12d1:14ad usr/share/usb_modeswitch/12d1:14b5 usr/share/usb_modeswitch/12d1:14b7 +usr/share/usb_modeswitch/12d1:14ba usr/share/usb_modeswitch/12d1:14c1 usr/share/usb_modeswitch/12d1:14c3 usr/share/usb_modeswitch/12d1:14c4 @@ -146,24 +158,33 @@ usr/share/usb_modeswitch/12d1:14c5 usr/share/usb_modeswitch/12d1:14d1 usr/share/usb_modeswitch/12d1:14fe usr/share/usb_modeswitch/12d1:1505 +usr/share/usb_modeswitch/12d1:151a usr/share/usb_modeswitch/12d1:1520 usr/share/usb_modeswitch/12d1:1521 usr/share/usb_modeswitch/12d1:1523 +usr/share/usb_modeswitch/12d1:1526 usr/share/usb_modeswitch/12d1:1553 usr/share/usb_modeswitch/12d1:1557 +usr/share/usb_modeswitch/12d1:155b +usr/share/usb_modeswitch/12d1:1805 usr/share/usb_modeswitch/12d1:1c0b +usr/share/usb_modeswitch/12d1:1c1b usr/share/usb_modeswitch/12d1:1c24 usr/share/usb_modeswitch/12d1:1d50 usr/share/usb_modeswitch/12d1:1da1 usr/share/usb_modeswitch/12d1:1f01 +usr/share/usb_modeswitch/12d1:1f03 +usr/share/usb_modeswitch/12d1:1f11 usr/share/usb_modeswitch/12d1:380b usr/share/usb_modeswitch/1307:1169 usr/share/usb_modeswitch/1410:5010 usr/share/usb_modeswitch/1410:5020 +usr/share/usb_modeswitch/1410:5023 usr/share/usb_modeswitch/1410:5030 usr/share/usb_modeswitch/1410:5031 usr/share/usb_modeswitch/1410:5041 usr/share/usb_modeswitch/1410:5059 +usr/share/usb_modeswitch/1410:7001 usr/share/usb_modeswitch/148e:a000 usr/share/usb_modeswitch/148f:2578 usr/share/usb_modeswitch/15eb:7153 @@ -173,6 +194,7 @@ usr/share/usb_modeswitch/16d8:6804 usr/share/usb_modeswitch/16d8:700a usr/share/usb_modeswitch/16d8:700b usr/share/usb_modeswitch/16d8:f000 +usr/share/usb_modeswitch/1726:f00e usr/share/usb_modeswitch/198a:0003 usr/share/usb_modeswitch/198f:bccd usr/share/usb_modeswitch/19d2:0003 @@ -181,16 +203,20 @@ 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 usr/share/usb_modeswitch/19d2:0115 +usr/share/usb_modeswitch/19d2:0120 usr/share/usb_modeswitch/19d2:0146 usr/share/usb_modeswitch/19d2:0149 +usr/share/usb_modeswitch/19d2:0150 usr/share/usb_modeswitch/19d2:0154 usr/share/usb_modeswitch/19d2:0166 usr/share/usb_modeswitch/19d2:0169 +usr/share/usb_modeswitch/19d2:0266 usr/share/usb_modeswitch/19d2:0325 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 @@ -203,9 +229,13 @@ 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:1227 usr/share/usb_modeswitch/19d2:1514 usr/share/usb_modeswitch/19d2:1517 usr/share/usb_modeswitch/19d2:1520 +usr/share/usb_modeswitch/19d2:1523 +usr/share/usb_modeswitch/19d2:1528 +usr/share/usb_modeswitch/19d2:1542 usr/share/usb_modeswitch/19d2:2000 usr/share/usb_modeswitch/19d2:bccd usr/share/usb_modeswitch/19d2:ffde @@ -216,6 +246,7 @@ usr/share/usb_modeswitch/1a8d:1000 usr/share/usb_modeswitch/1a8d:2000 usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 +usr/share/usb_modeswitch/1bbb:000f usr/share/usb_modeswitch/1bbb:00ca usr/share/usb_modeswitch/1bbb:f000 usr/share/usb_modeswitch/1bbb:f017 @@ -226,6 +257,7 @@ 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:9e08 usr/share/usb_modeswitch/1c9e:f000 usr/share/usb_modeswitch/1da5:f000 usr/share/usb_modeswitch/1dd6:1000 @@ -237,16 +269,28 @@ usr/share/usb_modeswitch/1ee8:0009 usr/share/usb_modeswitch/1ee8:0013 usr/share/usb_modeswitch/1ee8:0040 usr/share/usb_modeswitch/1ee8:004a +usr/share/usb_modeswitch/1ee8:0054 usr/share/usb_modeswitch/1ee8:0060 +usr/share/usb_modeswitch/1ee8:0063 +usr/share/usb_modeswitch/1ee8:0068 usr/share/usb_modeswitch/1f28:0021 usr/share/usb_modeswitch/1fac:0032 usr/share/usb_modeswitch/1fac:0130 +usr/share/usb_modeswitch/1fac:0150 +usr/share/usb_modeswitch/1fac:0151 +usr/share/usb_modeswitch/2001:a706 +usr/share/usb_modeswitch/2001:a707 +usr/share/usb_modeswitch/2001:a708 +usr/share/usb_modeswitch/2001:a805 usr/share/usb_modeswitch/2001:a80b usr/share/usb_modeswitch/201e:1023 usr/share/usb_modeswitch/201e:2009 +usr/share/usb_modeswitch/2020:0002 usr/share/usb_modeswitch/2020:f00e +usr/share/usb_modeswitch/2077:1000 usr/share/usb_modeswitch/2077:f000 usr/share/usb_modeswitch/21f5:1000 +usr/share/usb_modeswitch/22de:6801 usr/share/usb_modeswitch/22de:6803 usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 diff --git a/config/rootfiles/core/71/filelists/usb_modeswitch b/config/rootfiles/core/71/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/71/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/usb_modeswitch_data b/config/rootfiles/core/71/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/71/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh index 0f13c3d..8990b97 100644 --- a/config/rootfiles/core/71/update.sh +++ b/config/rootfiles/core/71/update.sh @@ -41,6 +41,10 @@ cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup /etc/init.d/snort stop
# +#Remove old usb-modeswitch file +rm /usr/share/usb_modeswitch/0e8d:0002 + +# #Extract files extract_files
diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index f8aea5f..0f28078 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2013 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 = 1.2.4 +VER = 1.2.6
THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d +$(DL_FILE)_MD5 = 3cd804ad2dd4cb61fbd77a5cc033496c
install : $(TARGET)
diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 5beecda..709434c 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2013 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 = 20120815 +VER = 20130610
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 = 12d7de3210e45ad6f48791d12bbdbf61 +$(DL_FILE)_MD5 = 52dff3f54e0c01dad02639d642e089e0
install : $(TARGET)
diff --git a/make.sh b/make.sh index b674bb3..88af898 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org. # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org. # # # ############################################################################ # @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number CORE="71" # Core Level (Filename) -PAKFIRE_CORE="70" # Core Level (PAKFIRE) +PAKFIRE_CORE="71" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index be75bf5..1c74f3c 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2013 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 #
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org