Commit Graph

1493 Commits

Author SHA1 Message Date
Stefan Schantl
2d475a3c6c Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata 2018-09-26 14:49:34 +02:00
Arne Fitzenreiter
0f2186725e core124: finish updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-09-21 15:26:52 +02:00
Stefan Schantl
cb52183c6a Fix merge conflicts during merge of next and the suricata branch 2018-08-23 10:34:17 +02:00
Michael Tremer
046ef135e6 Merge remote-tracking branch 'origin/efi' into next 2018-08-16 12:49:13 +01:00
Michael Tremer
264f34546f Start Core Update 124
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 12:47:06 +01:00
Arne Fitzenreiter
1e1806adce core123: set pakfire version
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-15 07:30:53 +02:00
Michael Tremer
faa5472a2e python3-pyasn1: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 15:00:28 +01:00
Michael Tremer
d45d524725 python3-rsa: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:44:30 +01:00
Michael Tremer
953f6f7332 python3-s3transfer: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:38:11 +01:00
Michael Tremer
d2da17a182 python3-yaml: New paclage as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:19:33 +01:00
Michael Tremer
041d2116c0 python3-docutils: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:11:38 +01:00
Michael Tremer
a33ca4cc6f python3-colorama: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:04:03 +01:00
Michael Tremer
d48ea6b5a7 python3-jmespath: New package as required by python3-botocore
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 13:57:02 +01:00
Michael Tremer
9e25fe5c1b python3-six: New package as required by python3-dateutil
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 13:18:00 +01:00
Michael Tremer
e0a05a8059 python3-dateutil: New package required by python3-botocore
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 13:13:07 +01:00
Michael Tremer
4ab80c5daf python3-botocore: Required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 12:54:23 +01:00
Michael Tremer
280ee7e767 aws-cli: New package
Needed to communicate with AWS services like EC2, S3, etc...

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 12:45:38 +01:00
Michael Tremer
6064cd87cc Revert "avahi: Drop package"
This reverts commit aa6ee515c5.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-10 11:11:48 +01:00
Michael Tremer
1fb7f56e11 make.sh: Add command to update list of contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-05 11:10:28 +01:00
Stefan Schantl
d33874f496 daq: Drop package
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-03 10:20:18 +02:00
Stefan Schantl
843a8c570c snort: Drop package
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-03 10:19:35 +02:00
Stefan Schantl
ef640882ab make.sh: Add ids-ruleset-source
I accidently forgot to commit this file in 1d9b879140

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-02 19:58:41 +02:00
Stefan Schantl
67752a9510 suricata: New package
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-30 21:31:15 +02:00
Stefan Schantl
3498300d87 libhtp: New package
This is build and runtime dependency for suricata.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-29 09:45:05 +02:00
Stefan Schantl
91cc908f84 yaml: New package
This is a build and runtime dependency for suricata.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-07-29 09:44:52 +02:00
Michael Tremer
3755e35809 make.sh: Build popt earlier
efivars depends on it and since it is a very common library
without any dependencies, we can build it very early

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-14 13:43:52 +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
78dd680dfa make.sh: cdrkit required cmake to build
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
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
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
Michael Tremer
4e9000b4d8 nss-myhostname: New package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-30 19:51:38 +01:00
Arne Fitzenreiter
5b17da41c1 kernel: add config for aarch64
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-06-21 06:20:35 +01:00
Arne Fitzenreiter
77350828e8 finish core122
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-06-19 11:04:27 +02:00
Michael Tremer
28aacf565b Start Core Update 123
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-18 16:43:04 +01:00
Arne Fitzenreiter
015b3e08d8 core121: split into core121 and 122
linux firmware and kernel is too large for one core update

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-06-15 08:52:51 +02:00
Michael Tremer
e701e24fb2 make.sh: Bump toolchain date
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-14 07:50:30 +02:00
Michael Tremer
b50b9521fb make.sh: Bump toolchain date
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-06 16:20:36 +01:00
Michael Tremer
fd9a531f71 Bump version to 2.21
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-06 14:03:07 +01:00
Jonatan Schlag
87b5f3711b Add Intel microcode updates
Fixes: #11590
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-29 16:42:51 +01:00
Michael Tremer
b46f951e8a make.sh: Compress toolchain in the same way we compress everything else
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-25 14:25:07 +01:00
Michael Tremer
6b4174133a make.sh: There are no tar.gz images to copy out of the chroot environment
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-23 12:09:07 +01:00
Michael Tremer
92244a40d8 make.sh: Generate checksum files for XZ compressed images
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-23 12:08:23 +01:00
Michael Tremer
212f17c114 make.sh: Refactor XZ compression parameters again
I completely ruined this now and therefore I had to make
it new again:

* I split the parameters into smaller chunks now and added
  comments about why we have chosen those.

* I move it all to configure_build() since we do not need
  to check if the host architecture is 64 bit capable, but
  the architecture we are building for.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-23 12:03:06 +01:00
Michael Tremer
30a42c6df9 make.sh: Remove check for minimum host memory
This won't build on the ARM builders any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 21:31:24 +01:00
Michael Tremer
f03e254f39 make.sh: Let XZ determine how many cores it wants to use
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:46:25 +01:00
Michael Tremer
a92fb74d1a make.sh: Limit XZ memory to 2GB on 32 bit systems
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:46:03 +01:00
Michael Tremer
c8453e8759 make.sh: Use all processor cores for compression
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
5852ad2db7 make.sh: Use exiterror to end script safely
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
2eba1dc954 make.sh: Remove some empty lines
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00