Commit Graph

3589 Commits

Author SHA1 Message Date
Michael Tremer
ac14b325e0 Merge branch 'master' into fifteen 2013-11-09 14:19:52 +01:00
Michael Tremer
340a567eae Ship paxctl with the distribution. 2013-11-08 14:55:23 +01:00
Michael Tremer
d3527a38c1 Multiple CGI files: Check if BLUE or ORANGE are actually configured. 2013-11-08 14:32:08 +01:00
Alexander Marx
cbc6219852 Firewall: Fix typo in backup script which stops the conversion of old firewallrules 2013-11-08 13:41:25 +01:00
Alexander Marx
84ac1131b1 Firewall: remove /var/ipfire/portfw as it is not used anymore 2013-11-08 13:39:38 +01:00
Alexander Marx
68f6312ac5 Firewall: Show IP-Adresses in NAT-Source dropdown 2013-10-30 13:41:33 +01:00
Michael Tremer
47a83092b5 Merge branch 'next' into fifteen 2013-10-27 13:12:12 +01:00
Michael Tremer
69460bba80 cups: Update to 1.7.0. 2013-10-27 13:09:30 +01:00
Michael Tremer
8b69a1135e libusbx: New package. 2013-10-24 22:11:41 +02:00
Michael Tremer
cc9a325708 strongswan: Rootfile update. 2013-10-24 19:41:17 +02:00
Michael Tremer
663e748907 gutenprint: Update to 5.2.9. 2013-10-24 18:14:22 +02:00
Michael Tremer
b91712acc5 foomatic: Update to 4.0.9/4.0.17 (20131023). 2013-10-24 15:21:42 +02:00
Michael Tremer
f3604e1192 cups: Update to 1.6.4. 2013-10-24 15:21:33 +02:00
Michael Tremer
64c5bbc453 mpage: New package.
Required for foomatic 4.x.
2013-10-24 15:20:48 +02:00
Alexander Marx
85f129fe3c Firewall: fix deleted files from core fifteen firewall 2013-10-24 14:16:03 +02:00
Alexander Marx
8039a71099 Firewall: renamed forwardfwctrl to firewallctrl 2013-10-24 09:42:42 +02:00
Alexander Marx
6d8eb5dec7 Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall 2013-10-24 09:24:12 +02:00
Alexander Marx
6921f0ea0a Firewall: renamed /config/forwardfw to config/firewall 2013-10-24 08:15:48 +02:00
Alexander Marx
b161bfa868 FIREWALL: renamed forwardfw.cgi in firewall.cgi 2013-10-23 16:32:26 +02:00
Alexander Marx
f0befbc378 Firewall: Make it possible to use NAT rules with servicegroups. 2013-10-23 16:30:23 +02:00
Michael Tremer
0e43079789 firewall: Cleanup rules reloading.
This has been messed up a lot because there were multiple
files which indicated that a reload is needed; shell commands
were used to create and remove the indicator file; some
functions were duplicated.
2013-10-22 18:53:48 +02:00
Michael Tremer
78e35c82dc strongswan: Update to 5.1.1dr4. 2013-10-22 15:01:24 +02:00
Michael Tremer
77117e740c Merge remote-tracking branch 'morlix/check_mk' into next 2013-10-22 13:15:36 +02:00
Timo Eissler
2d490a7304 Merge branch 'master' into check_mk 2013-10-20 00:46:53 +02:00
Alexander Marx
86a921ee47 Firewall: Some changes in Strings and languagefiles 2013-10-17 11:27:48 +02:00
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