Commit Graph

3562 Commits

Author SHA1 Message Date
Michael Tremer
9f35ee8aec fifteen: Add new jquery to update. 2013-10-15 16:51:01 +02:00
Michael Tremer
f99356520c jquery: Add extra jquery package.
Because this is easier to keep up to date.
2013-10-15 16:46:15 +02:00
Michael Tremer
0b7f6aa4d9 Merge branch 'next' into fifteen 2013-10-14 14:13:39 +02:00
Michael Tremer
9a6b4cb648 core73: Fix typo in proxy configuration converter. 2013-10-14 14:13:15 +02:00
Michael Tremer
568438067c Merge branch 'next' into fifteen 2013-10-14 14:12:04 +02:00
Michael Tremer
81c43f61b0 core73: Add transparent proxy port configuration. 2013-10-14 14:06:59 +02:00
Michael Tremer
5b0bc4ca3d Merge commit '3af3ecd319bdcf8db27e9ca14af72383b4754567' into fifteen 2013-10-12 21:01:13 +02:00
Michael Tremer
6b6ef098ae fifteen: Add glibc to update. 2013-10-12 16:07:42 +02:00
Alexander Marx
3af3ecd319 Firewall: fix rules.pl when using custom hosts/networks and services no rule was applied because no protokoll could be found
Also extended JS code to correctly show ICMP Types only, if NO Targetport is selcted
2013-10-09 10:31:35 +02:00
Alexander Marx
90f8339a42 Firewall: Bugfix: WHen using servicegroup with only ICMP services, the ruletable was broken. Also fixed another useless if clause in rules.pl 2013-10-08 10:08:09 +02:00
Alexander Marx
6e62882de6 Firewall: fix senseless if clause in rulecreation 2013-10-07 14:54:57 +02:00
Alexander Marx
58bda09b68 Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen 2013-10-07 07:25:42 +02:00
Alexander Marx
95c86656e7 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-07 07:25:19 +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
Arne Fitzenreiter
c74c84bc6c core73: add database updates. 2013-10-06 16:47:39 +02:00
Alexander Marx
e6e9a81176 Firewall: added some more plausichecks and additional errormessages 2013-10-05 13:50:35 +02:00
Alexander Marx
73c39dd4bd Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-05 13:31:22 +02:00
Arne Fitzenreiter
5c86caac7d kernel: build VLAN_8021Q as modul. 2013-10-04 17:00:27 +02:00
Michael Tremer
4598f16cfd Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen 2013-10-04 14:53:03 +02:00
Michael Tremer
08facb3b22 vim: Update to 7.4. 2013-10-04 14:52:44 +02:00
Michael Tremer
196539512a network-vlans: Remove " from configuration values.
" is an invalid character.
2013-10-04 13:39:26 +02:00
Arne Fitzenreiter
5ae3072a47 remove php from core73.
fifteen branch will not build with this file.
2013-10-04 08:37:49 +02:00
Alexander Marx
9f6da934a3 Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen 2013-10-04 08:09:18 +02:00
Alexander Marx
b4f94285ff Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-04 07:17:15 +02:00
Arne Fitzenreiter
ee1d2d13ee Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen 2013-10-03 14:51:30 +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
2d685e1d4c core73: Add wirelessclient.cgi. 2013-10-03 14:22:59 +02:00
Arne Fitzenreiter
f29eb7ec93 vdr: remove unknown config keys. 2013-10-03 13:44:56 +02:00
Michael Tremer
f35740ac44 core73: Add php to update. 2013-10-03 12:33:08 +02:00
Alexander Marx
a4c7bf6b73 Firewall: Reorganized layout of rulecreationpage
Protocol is now an extra area containing protocol, ICMP-Type and
source/target ports
2013-10-02 21:28:50 +02:00
Alexander Marx
40d505ea08 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-02 21:15:22 +02:00
Arne Fitzenreiter
ad5338015f stage2: rootfile update. 2013-10-02 14:39:16 +02:00
Alexander Marx
285de10662 Firewall: fixed rules.pl (no INPUT rules where created when using port and prot "all")
This is a bug which was raised due to the last commit
2013-10-01 07:45:58 +02:00
Alexander Marx
4c27368a7b Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-01 07:44:29 +02:00
Michael Tremer
d02853e73c Create /etc/system-release in stage2. 2013-09-30 21:16:03 +02:00
Michael Tremer
065c9931ac Write /opt/pakfire/db/core/mine in stage2. 2013-09-30 21:08:44 +02:00
Michael Tremer
e2eb09157e Remove /var/ipfire/firebuild.
This file provides lots of bogous information and information
about the build system that is not of much interest.
2013-09-30 21:00:15 +02:00
Michael Tremer
0d655f6cd5 as86: Remove unused package.
Was needed to build mbr.
2013-09-30 20:52:23 +02:00
Alexander Marx
fadcfb7320 Firewall: moved nat part between source and target and moved protocol dropdown behind target area 2013-09-30 15:43:51 +02:00
Michael Tremer
860ad8cb15 routing.cgi: Fix error in regex that validates "0.0.0.0".
Fixes #10417.
2013-09-27 16:51:17 +02:00
Michael Tremer
439d2a5743 mysql: Update to 5.0.96. 2013-09-27 15:01:10 +02:00
Michael Tremer
1accb4ad4c lzo: Update rootfile. 2013-09-27 15:00:58 +02:00
Alexander Marx
6233483ba7 Forward Firewall: Bugfix: When creating a rule which results in an error, the counters in the firewallgroups where increased.
Bugfix: When using icmp-type "all" there was no rule created

Conflicts:
	html/cgi-bin/forwardfw.cgi
2013-09-27 10:43:01 +02:00
Michael Tremer
b0c1baa588 libxml2: Add package to fifteen update. 2013-09-27 01:46:21 +02:00
Michael Tremer
5a9e26d831 mbr: Remove package, which is not needed any more.
This package was needed to add the MBR to flash images,
which are not available in IPFire 2.15 any more.
2013-09-27 01:45:13 +02:00
Michael Tremer
5a038beb35 iotop: New package. 2013-09-27 00:48:55 +02:00
Michael Tremer
65e7716334 cyrus-sasl: Run autoconf before build. 2013-09-26 19:54:08 +02:00
Michael Tremer
c2741b14ef libxml2: Update to 2.6.32. 2013-09-26 19:52:34 +02:00
Michael Tremer
ec9f81be0c Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen 2013-09-26 16:12:15 +02:00