Commit Graph

6150 Commits

Author SHA1 Message Date
Stefan Schantl
3983aebdec ids.cgi: Rework CGI logic to download a new ruleset
* Drop function to show a notice about snort is working.
* Introduce the log_error function which is responsible for log any
  error messages. Currently it writes it to a tempory file, which will
  be read by the WUI, the message will be displayed and the temporary file
  will be released again.
* Introduce a tiny function to easily perform a reload of the generated
  webpage.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-26 11:58:01 +02:00
Stefan Schantl
25f5cb0d4b ids.cgi: Move function to call oinkmaster to ids-functions.pl
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-26 11:56:45 +02:00
Stefan Schantl
eea2670b39 ids.cgi: Move downloader code to ids-functions.pl
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-26 11:56:28 +02:00
Stefan Schantl
8dcebe5342 IDS: Introduce ids-functions.pl.
This library will contain a set of functions used by the IDS CGI script
and the planned update script for auto-updating the snort ruleset.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-26 11:54:25 +02:00
Stefan Schantl
c6bcdda1af snort: Introduce ruleset-sources.list
This file contains the ruleset vendors and download urls and
will be used by the ids.cgi.

If an url or filename changes, we easily can adjust this file. In most
cases this will be needed when performing a snort update.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-26 11:50:11 +02:00
Stefan Schantl
9f5247f60c general-functions.pl: readhash() Add code to handle optional comments in files
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-26 11:49:56 +02:00
Arne Fitzenreiter
948d660c10 syslinux: update i586 rootfile
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-07-21 16:39:46 +02:00
Stefan Schantl
ca745a2978 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-21 14:14:53 +02:00
Michael Tremer
befc040497 Move update-bootloader script into installer
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-20 12:03:09 +00:00
Arne Fitzenreiter
f8f4ef0795 Merge branch 'next' into efi
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Conflicts:
	config/kernel/kernel.config.aarch64-ipfire
2018-07-20 12:24:31 +01:00
Stefan Schantl
b5ea63f85c Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-19 18:10:23 +02:00
Arne Fitzenreiter
413149f80d kernel: aarch64: enable virtio drivers
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-07-19 13:26:06 +01:00
Arne Fitzenreiter
0487a49fec u-boot: boot aarch64 kernel without -multi extension
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-07-19 09:29:44 +01:00
Michael Tremer
479d82d1b8 Rootfile update
We don't have EFI on i586

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-16 22:31:11 +01:00
Michael Tremer
37dc79434a kernel: Enable EFI on aarch64
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 14:05:09 +01:00
Michael Tremer
701c891b40 Build efibootmgr and efivars only for x86_64 and aarch64
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:53 +01:00
Michael Tremer
7c80f8c5cc syslinux: Update to 6.04-pre1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:53 +01:00
Michael Tremer
2c49856ead Rootfile update for parted
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:52 +01:00
Michael Tremer
b62f71f7f2 Build GRUB on aarch64
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:52 +01:00
Michael Tremer
8a06ff80c4 grub: Don't explicitely set the font
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:52 +01:00
Michael Tremer
24e811b03a grub: Don't install an empty EFI configuration file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:51 +01:00
Michael Tremer
fd80e500df Add efibootmgr and efivar
These packages are required to manage EFI boot options

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:51 +01:00
Michael Tremer
b6a0fd5839 cdrom: Select installation as default
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:51 +01:00
Michael Tremer
5765b49bff cdrom: Add grub.cfg that allows to install IPFire
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:51 +01:00
Michael Tremer
5f387a1b86 cdrom: Install GRUB into EFI image
This will start GRUB on EFI systems when booting from CD

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:50 +01:00
Michael Tremer
308af080f6 grub: Build new version in EFI mode
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:50 +01:00
Michael Tremer
df26133793 syslinux: Update to 6.03
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:50 +01:00
Michael Tremer
8a9605840c Remove dvdrtools for cdrkit
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:49 +01:00
Michael Tremer
0268380764 ipfire-netboot: Ship EFI image
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:49 +01:00
Michael Tremer
7fbbd2aebc Enable EFI on x86_64
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:49 +01:00
Michael Tremer
784cd5cbd7 Enhance the flash image to support EFI
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:49 +01:00
Michael Tremer
0927eadc52 Rootfile update for aarch64 kernel
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:13 +01:00
Michael Tremer
68a36e26b1 aarch64: Remove -multi suffix from kernel
This gets in the way for authoring the CD and we will
never have any other kernels but the main one.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-12 14:03:03 +01:00
Michael Tremer
820e90db0f iptables: Ship all modules
These have been all disabled with the last update of
the iptables package.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-12 10:04:37 +01:00
Michael Tremer
7471256910 Rootfile update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-12 10:03:34 +01:00
Michael Tremer
1413006b5b aws: Create "setup" user to run setup
Amazon does not permit that a user logs in as root directly.
Instead they insist on using sudo.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-10 18:40:06 +01:00
Stefan Schantl
fb22c9ffd9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-08 08:34:37 +02:00
Michael Tremer
9aefd1ed07 usbutils: Update rootfile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-03 20:01:46 +01:00
Arne Fitzenreiter
716c4751e7 spice-protocol: rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-07-03 16:03:37 +01:00
Arne Fitzenreiter
904ae7929a libgcrypt: rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-07-03 16:01:35 +01:00
Arne Fitzenreiter
37458540bf collect: fix cpufreq graph on some machines.
the file cpuinfo_cur_freq does not exist on all systems that support collect
cpufreq data.

fixes #11739
2018-07-03 15:09:40 +02:00
Arne Fitzenreiter
64252706ce Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2018-07-03 11:52:18 +01:00
Arne Fitzenreiter
1ac0d5c598 Merge branch 'aarch64' into next
Conflicts:
	config/rootfiles/core/121/filelists/acpid
	config/rootfiles/core/121/filelists/apache2
	config/rootfiles/core/121/filelists/apr
	config/rootfiles/core/121/filelists/aprutil
	config/rootfiles/core/121/filelists/armv5tel/files
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-multi
	config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/121/filelists/armv5tel/u-boot
	config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/121/filelists/beep
	config/rootfiles/core/121/filelists/cmake
	config/rootfiles/core/121/filelists/crda
	config/rootfiles/core/121/filelists/dhcp
	config/rootfiles/core/121/filelists/flex
	config/rootfiles/core/121/filelists/i586/grub
	config/rootfiles/core/121/filelists/i586/intel-microcode
	config/rootfiles/core/121/filelists/i586/linux
	config/rootfiles/core/121/filelists/i586/linux-initrd
	config/rootfiles/core/121/filelists/iw
	config/rootfiles/core/121/filelists/jwhois
	config/rootfiles/core/121/filelists/libidn
	config/rootfiles/core/121/filelists/multipath-tools
	config/rootfiles/core/121/filelists/pcre
	config/rootfiles/core/121/filelists/tar
	config/rootfiles/core/121/filelists/unbound
	config/rootfiles/core/121/filelists/wget
	config/rootfiles/core/121/filelists/x86_64/grub
	config/rootfiles/core/121/filelists/x86_64/intel-microcode
	config/rootfiles/core/121/filelists/x86_64/linux
	config/rootfiles/core/121/filelists/x86_64/linux-initrd
	config/rootfiles/core/122/filelists/aarch64/files
	config/rootfiles/core/122/filelists/acpid
	config/rootfiles/core/122/filelists/apache2
	config/rootfiles/core/122/filelists/apr
	config/rootfiles/core/122/filelists/aprutil
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-multi
	config/rootfiles/core/122/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/122/filelists/armv5tel/u-boot
	config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/122/filelists/beep
	config/rootfiles/core/122/filelists/cmake
	config/rootfiles/core/122/filelists/crda
	config/rootfiles/core/122/filelists/dhcp
	config/rootfiles/core/122/filelists/flex
	config/rootfiles/core/122/filelists/i586/grub
	config/rootfiles/core/122/filelists/i586/intel-microcode
	config/rootfiles/core/122/filelists/i586/linux
	config/rootfiles/core/122/filelists/i586/linux-initrd
	config/rootfiles/core/122/filelists/iw
	config/rootfiles/core/122/filelists/jwhois
	config/rootfiles/core/122/filelists/libidn
	config/rootfiles/core/122/filelists/multipath-tools
	config/rootfiles/core/122/filelists/pcre
	config/rootfiles/core/122/filelists/tar
	config/rootfiles/core/122/filelists/unbound
	config/rootfiles/core/122/filelists/wget
	config/rootfiles/core/122/filelists/x86_64/grub
	config/rootfiles/core/122/filelists/x86_64/intel-microcode
	config/rootfiles/core/122/filelists/x86_64/linux
	config/rootfiles/core/122/filelists/x86_64/linux-initrd
	config/rootfiles/core/123/filelists/unbound
	config/rootfiles/oldcore/121/filelists/acpid
	config/rootfiles/oldcore/121/filelists/apache2
	config/rootfiles/oldcore/121/filelists/apr
	config/rootfiles/oldcore/121/filelists/aprutil
	config/rootfiles/oldcore/121/filelists/armv5tel/files
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/oldcore/121/filelists/beep
	config/rootfiles/oldcore/121/filelists/cmake
	config/rootfiles/oldcore/121/filelists/crda
	config/rootfiles/oldcore/121/filelists/dhcp
	config/rootfiles/oldcore/121/filelists/flex
	config/rootfiles/oldcore/121/filelists/i586/grub
	config/rootfiles/oldcore/121/filelists/i586/intel-microcode
	config/rootfiles/oldcore/121/filelists/i586/linux
	config/rootfiles/oldcore/121/filelists/i586/linux-initrd
	config/rootfiles/oldcore/121/filelists/iw
	config/rootfiles/oldcore/121/filelists/jwhois
	config/rootfiles/oldcore/121/filelists/libidn
	config/rootfiles/oldcore/121/filelists/multipath-tools
	config/rootfiles/oldcore/121/filelists/pcre
	config/rootfiles/oldcore/121/filelists/tar
	config/rootfiles/oldcore/121/filelists/wget
	config/rootfiles/oldcore/121/filelists/x86_64/grub
	config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode
	config/rootfiles/oldcore/121/filelists/x86_64/linux
	config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd
	make.sh
2018-07-03 11:52:05 +01:00
Erik Kapfer
461d78b412 hplip: Update to version 3.18.6
Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-03 10:34:08 +01:00
Michael Tremer
b4208f1845 core123: Ship updated sysctl.conf
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-03 10:33:23 +01:00
Peter Müller
373590b7c3 hide kernel addresses in /proc
Make sure kernel address space is hidden from files somewhere
in /proc . This reduces attack surface and partially addresses #11659.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-03 10:32:56 +01:00
Michael Tremer
a65d07ec6d core123: Ship updated usbutils
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-03 10:32:43 +01:00
Michael Tremer
b06e1f696d core123: Ship updated GeoIP.dat
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-03 10:32:08 +01:00
Michael Tremer
571cfa9718 multipath-tools: Update to 0.7.7
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-02 19:10:36 +01:00
Arne Fitzenreiter
cf7a7a874f Merge remote-tracking branch 'origin/master' into aarch64 2018-07-02 19:07:22 +01:00