webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,860 Commits 2 Branches 1 Tag
33513817fa4eac7007fc4e39c348d7fffdfac20a
Commit Graph

59 Commits

Author SHA1 Message Date
Arne Fitzenreiter
4a6cfe51a1 Merge remote-tracking branch 'origin/master' into next 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2016-03-04 07:09:02 +01:00
Arne Fitzenreiter
802b916d10 Merge remote-tracking branch 'origin/master' into next 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Conflicts:
	make.sh
 2016-02-17 19:47:50 +01:00
Arne Fitzenreiter
35b24ff8a9 set core to 98 and move 97 to oldcore 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2016-01-28 22:10:11 +01:00
Michael Tremer
665f79926d Merge remote-tracking branch 'origin/master' into next 2016-01-23 00:39:19 +00:00
Michael Tremer
ea155e2d2b Move Core Update 96 to oldcore 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-12-22 11:13:03 +00:00
Arne Fitzenreiter
74e5c32e19 Merge branch 'master' into next 2015-12-02 21:39:20 +01:00
Arne Fitzenreiter
cfac8f9476 start core96 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2015-11-11 14:49:02 +01:00
Arne Fitzenreiter
a14e8d0256 Merge remote-tracking branch 'origin/master' into next 2015-10-25 09:21:12 +01:00
Arne Fitzenreiter
159c9eb9b1 Merge remote-tracking branch 'origin/master' into next 2015-10-22 13:11:17 +02:00
Arne Fitzenreiter
16016ff2b0 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2015-09-28 18:42:57 +02:00
Michael Tremer
4b046d735d Start Core Update 95 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-09-28 14:08:27 +01:00
Arne Fitzenreiter
d2fc4cdb21 move core93 files to oldcore... 2015-08-13 15:17:24 +02:00
Arne Fitzenreiter
75ec398fe9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-08-13 15:13:22 +02:00
Michael Tremer
7383bf2b1b Start Core Update 94 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-08-12 13:59:00 +01:00
Michael Tremer
28aeeb5735 Move Core Update 92 to archive 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-07-14 16:58:47 +02:00
Michael Tremer
15d5073d5b Merge branch 'next' 2015-07-07 10:42:56 +02:00
Michael Tremer
dc0e82e563 Move older core updates to archive 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-17 14:50:40 +02:00
Michael Tremer
970cf33637 Move Core Update 86 and 87 files to oldcore directory 2015-03-05 12:55:32 +01:00
Arne Fitzenreiter
c8de007048 core86 is now core87. 2015-02-20 16:41:18 +01:00
Michael Tremer
11a1a874e9 Create Core Update 85 2014-10-15 19:48:16 +02:00
Michael Tremer
2a3506f349 Create core update 84 2014-09-26 12:25:30 +02:00
Michael Tremer
5f17f9f341 Create core update 83 2014-09-24 20:31:55 +02:00
Michael Tremer
072f4c10cc Move core updates 80 and 81 to oldcore. 2014-08-14 12:27:56 +02:00
Arne Fitzenreiter
581f19ddf1 start core80. 2014-06-14 22:21:08 +02:00
Arne Fitzenreiter
2751238e6f move core75 files to oldcore. 2014-04-16 01:54:14 +02:00
Arne Fitzenreiter
349b93f674 Merge remote-tracking branch 'origin/next' into fifteen 
Conflicts:
	config/rootfiles/core/70/exclude
	config/rootfiles/core/70/meta
	config/rootfiles/core/71/exclude
	config/rootfiles/core/71/meta
	config/rootfiles/core/72/filelists/strongswan
	config/rootfiles/core/72/meta
	config/rootfiles/core/73/exclude
	config/rootfiles/core/73/meta
	config/rootfiles/core/fifteen/exclude
	config/rootfiles/core/fifteen/filelists/strongswan
	config/rootfiles/core/fifteen/meta
	config/rootfiles/oldcore/70/exclude
	config/rootfiles/oldcore/70/meta
	config/rootfiles/oldcore/71/exclude
	config/rootfiles/oldcore/71/meta
	config/rootfiles/oldcore/72/filelists/strongswan
	config/rootfiles/oldcore/72/meta
	config/rootfiles/oldcore/73/exclude
	config/rootfiles/oldcore/73/filelists/GeoIP
	config/rootfiles/oldcore/73/filelists/hwdata
	config/rootfiles/oldcore/73/filelists/openssh
	config/rootfiles/oldcore/73/filelists/php
	config/rootfiles/oldcore/73/meta
 2013-12-30 13:55:34 +01:00
Michael Tremer
b71c52dd6f Move Core Updates 70-74 to oldcore directory. 2013-12-30 13:00:13 +01:00
Michael Tremer
0fc392d65d Merge branch 'master' into fifteen 2013-11-20 21:43:20 +01:00
Michael Tremer
ac14b325e0 Merge branch 'master' into fifteen 2013-11-09 14:19:52 +01:00
Michael Tremer
0b7f6aa4d9 Merge branch 'next' into fifteen 2013-10-14 14:13:39 +02:00
Michael Tremer
568438067c Merge branch 'next' into fifteen 2013-10-14 14:12:04 +02:00
Arne Fitzenreiter
2e053370ab Merge remote-tracking branch 'origin/next' into fifteen 2013-10-06 17:07:03 +02:00
Arne Fitzenreiter
189cf1270a core73: add urlfilter.cgi. 2013-10-06 17:04:58 +02:00
Michael Tremer
0203401cf5 Merge remote-tracking branch 'origin/next' into fifteen 
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.tr
	doc/language_missings
 2013-10-03 14:26:33 +02:00
Michael Tremer
2ac39db92e Merge remote-tracking branch 'amarx/firewall' into fifteen 2013-08-28 11:33:20 +02:00
Arne Fitzenreiter
b751cd7a4c move core70-73 to oldcore. 2013-08-27 20:18:53 +02:00
Alexander Marx
adf41e6f37 Forward Firewall: removed outgoingfw.cgi from /config/rootfiles/core/66/filelists/files 2013-08-09 14:04:42 +02:00
Arne Fitzenreiter
39e56fae74 buildsystem: add a check for wrong "etc/init.d/..." entries. 
This will destroy the symlink from /etc/init.d to /etc/rc.d/init.d at unpack.
 2013-06-21 23:17:46 +02:00
Arne Fitzenreiter
2a224f6c10 kernel: update to 3.2.47 and kernel-xen to 2.6.32.61. 2013-06-19 17:18:13 +02:00
Arne Fitzenreiter
cd84561422 core66: moved to oldcore. 2013-03-04 07:57:38 +01:00
Arne Fitzenreiter
fa3f587984 move core60-65 to oldcore. 2012-12-21 13:10:49 +01:00
Michael Tremer
b6bd9a5d57 Move old core updates to archive. 2012-08-22 16:35:04 +02:00
Michael Tremer
7b321c2cbe Merge remote branch 'origin/next' into arm-port 
Conflicts:
	config/rootfiles/common/i586/gcc
	lfs/binutils
	lfs/cleanup-toolchain
	lfs/coreutils
	lfs/gcc
	lfs/glibc
	lfs/groff
	src/pakfire/pakfire.conf
	src/patches/gcc-4.1.2-specs-1.patch
 2011-09-18 02:58:34 +02:00
Michael Tremer
71fe9947da Move old core updates because they cannot be built on ARM. 2011-09-17 15:16:41 +02:00
Arne Fitzenreiter
eae7f77826 kernel: Updated to 2.6.32.26. 2011-07-24 09:43:27 +02:00
Arne Fitzenreiter
1afed8d21d Merge branch 'master' into next 2011-06-12 00:01:26 +02:00
Arne Fitzenreiter
e865603286 Merge branch 'master' into kernel36 
Conflicts:
	config/rootfiles/common/Mail-Tools
 2011-04-10 10:44:33 +02:00
Arne Fitzenreiter
9f0b9436d8 kernel: Updated to 2.6.32.26. 2011-04-02 12:16:53 +02:00
Arne Fitzenreiter
51cac9a1ce Merge commit 'origin/core43' 
Conflicts:
	lfs/openssl
	make.sh
 2010-12-03 18:56:37 +01:00
Arne Fitzenreiter
e95ea70202 Removed core40-42. 2010-11-27 10:08:51 +01:00