IPFire-SCM February 2019

ipfire-scm@lists.ipfire.org

1 participants
49 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6957b699b374b8053c8de66a0e61a489c982bb34
by Arne Fitzenreiter 22 Feb '19

22 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6957b699b374b8053c8de66a0e61a489c982bb34 (commit) via 710153a89cf95ed2cf0c1440969dc03f89758790 (commit) from 4a25ada199d26bf5da93c05150c6d85b82efce74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6957b699b374b8053c8de66a0e61a489c982bb34 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 22 18:02:45 2019 +0100 kernel: apu leds: add more id's Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 710153a89cf95ed2cf0c1440969dc03f89758790 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 22 18:01:18 2019 +0100 partresize: add "apu1" for apus with new bios. ----------------------------------------------------------------------- Summary of changes: src/initscripts/system/partresize | 2 +- src/patches/linux/linux-4.14-apu_leds.patch | 42 ++++++++++++++++------------- 2 files changed, 24 insertions(+), 20 deletions(-) Difference in files: diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index f3e3c0f0d..e2df11ee0 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -36,7 +36,7 @@ case "${1}" in fi IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name; case ${DMI_PRODUCT_NAME} in - APU|apu[2-4]|PC\ Engines\ apu[1-4] ) + APU|apu[1-4]|PC\ Engines\ apu[1-4] ) scon="on"; ;; esac diff --git a/src/patches/linux/linux-4.14-apu_leds.patch b/src/patches/linux/linux-4.14-apu_leds.patch index dc63fd261..7013f6e6a 100644 --- a/src/patches/linux/linux-4.14-apu_leds.patch +++ b/src/patches/linux/linux-4.14-apu_leds.patch @@ -1,6 +1,6 @@ -diff -Naur linux-4.14.101.org/arch/x86/Kconfig linux-4.14.101/arch/x86/Kconfig ---- linux-4.14.101.org/arch/x86/Kconfig 2019-02-15 09:08:56.000000000 +0100 -+++ linux-4.14.101/arch/x86/Kconfig 2019-02-18 22:24:00.682722072 +0100 +diff -Naur linux-4.14.102.org/arch/x86/Kconfig linux-4.14.102/arch/x86/Kconfig +--- linux-4.14.102.org/arch/x86/Kconfig 2019-02-20 10:20:56.000000000 +0100 ++++ linux-4.14.102/arch/x86/Kconfig 2019-02-22 17:56:37.185202293 +0100 @@ -2715,6 +2715,7 @@ - AC adapter status updates - Battery status updates @@ -28,10 +28,10 @@ diff -Naur linux-4.14.101.org/arch/x86/Kconfig linux-4.14.101/arch/x86/Kconfig config AMD_NB def_bool y depends on CPU_SUP_AMD && PCI -diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/arch/x86/platform/apu/apu2-led.c ---- linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.14.101/arch/x86/platform/apu/apu2-led.c 2019-02-18 22:30:08.503059825 +0100 -@@ -0,0 +1,183 @@ +diff -Naur linux-4.14.102.org/arch/x86/platform/apu/apu2-led.c linux-4.14.102/arch/x86/platform/apu/apu2-led.c +--- linux-4.14.102.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.102/arch/x86/platform/apu/apu2-led.c 2019-02-22 17:58:52.795665744 +0100 +@@ -0,0 +1,185 @@ +/* + * LEDs driver for PCEngines apu2/3/4 + * @@ -178,7 +178,9 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/ar + if (!product || ( strcmp(product, "PC Engines apu2") && + strcmp(product, "PC Engines apu3") && + strcmp(product, "PC Engines apu4") && -+ strcmp(product, "apu2") ) ) // apu2 on early bios relases ++ strcmp(product, "apu2") && ++ strcmp(product, "apu3") && ++ strcmp(product, "apu4") ) ) + goto out; + + printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", @@ -215,10 +217,10 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/ar +MODULE_AUTHOR("Arne Fitzenreiter"); +MODULE_DESCRIPTION("PCEngines apu2/3/4 LED driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arch/x86/platform/apu/apu-led.c ---- linux-4.14.101.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.14.101/arch/x86/platform/apu/apu-led.c 2019-02-18 22:24:00.686721439 +0100 -@@ -0,0 +1,181 @@ +diff -Naur linux-4.14.102.org/arch/x86/platform/apu/apu-led.c linux-4.14.102/arch/x86/platform/apu/apu-led.c +--- linux-4.14.102.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.102/arch/x86/platform/apu/apu-led.c 2019-02-22 17:57:45.062504777 +0100 +@@ -0,0 +1,183 @@ +/* + * LEDs driver for PCEngines apu + * @@ -363,7 +365,9 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arc + goto out; + + product = dmi_get_system_info(DMI_PRODUCT_NAME); -+ if (!product || strcmp(product, "APU")) ++ if (!product || ( strcmp(product, "APU") && ++ strcmp(product, "apu1") && ++ strcmp(product, "PC Engines apu1") )) + goto out; + + printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", @@ -400,15 +404,15 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arc +MODULE_AUTHOR("Christian Herzog"); +MODULE_DESCRIPTION("PCEngines apu LED driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-4.14.101.org/arch/x86/platform/apu/Makefile linux-4.14.101/arch/x86/platform/apu/Makefile ---- linux-4.14.101.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.14.101/arch/x86/platform/apu/Makefile 2019-02-18 22:24:00.686721439 +0100 +diff -Naur linux-4.14.102.org/arch/x86/platform/apu/Makefile linux-4.14.102/arch/x86/platform/apu/Makefile +--- linux-4.14.102.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.102/arch/x86/platform/apu/Makefile 2019-02-22 17:56:37.185202293 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_APULED) += apu-led.o +obj-$(CONFIG_APU2LED) += apu2-led.o -diff -Naur linux-4.14.101.org/arch/x86/platform/Makefile linux-4.14.101/arch/x86/platform/Makefile ---- linux-4.14.101.org/arch/x86/platform/Makefile 2019-02-15 09:08:56.000000000 +0100 -+++ linux-4.14.101/arch/x86/platform/Makefile 2019-02-18 22:24:00.686721439 +0100 +diff -Naur linux-4.14.102.org/arch/x86/platform/Makefile linux-4.14.102/arch/x86/platform/Makefile +--- linux-4.14.102.org/arch/x86/platform/Makefile 2019-02-20 10:20:56.000000000 +0100 ++++ linux-4.14.102/arch/x86/platform/Makefile 2019-02-22 17:56:37.185202293 +0100 @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Platform specific code goes here hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4a25ada199d26bf5da93c05150c6d85b82efce74
by Arne Fitzenreiter 21 Feb '19

21 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4a25ada199d26bf5da93c05150c6d85b82efce74 (commit) via a2d49659f3947e5a5a77cbc1bf384eb0b2760ca9 (commit) via 8c8b4b21545338efea26df2c1285d89793e1b77c (commit) via 8f49959d70210f4a2d6d1bbf2f6936d4e3e28f6b (commit) from 17872019ba56d6ec81742fc61218933f25988f7e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4a25ada199d26bf5da93c05150c6d85b82efce74 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 21 19:23:05 2019 +0100 core128: add kernel to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a2d49659f3947e5a5a77cbc1bf384eb0b2760ca9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 21 19:13:27 2019 +0100 kernel: cleanup unused rpi patch Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8c8b4b21545338efea26df2c1285d89793e1b77c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 21 10:50:15 2019 +0100 kernel: update to 4.14.102 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8f49959d70210f4a2d6d1bbf2f6936d4e3e28f6b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 19 13:48:12 2019 +0100 partresize: enable serial console on PC Engines APU Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../124 => core/128}/filelists/aarch64/linux | 0 .../128}/filelists/aarch64/linux-initrd | 0 .../128}/filelists/armv5tel/linux-initrd-kirkwood | 0 .../128}/filelists/armv5tel/linux-initrd-multi | 0 .../128}/filelists/armv5tel/linux-kirkwood | 0 .../128}/filelists/armv5tel/linux-multi | 0 config/rootfiles/core/128/filelists/files | 1 + .../{oldcore/100 => core/128}/filelists/i586/linux | 0 .../100 => core/128}/filelists/i586/linux-initrd | 0 .../100 => core/128}/filelists/x86_64/linux | 0 .../100 => core/128}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/128/update.sh | 87 ++++++++++++++++++- lfs/linux | 10 +-- src/initscripts/system/partresize | 14 ++- ...ux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch | 99 ---------------------- 15 files changed, 102 insertions(+), 109 deletions(-) copy config/rootfiles/{oldcore/124 => core/128}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/124 => core/128}/filelists/aarch64/linux-initrd (100%) copy config/rootfiles/{oldcore/121 => core/128}/filelists/armv5tel/linux-initrd-kirkwood (100%) copy config/rootfiles/{oldcore/121 => core/128}/filelists/armv5tel/linux-initrd-multi (100%) copy config/rootfiles/{oldcore/100 => core/128}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/100 => core/128}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/100 => core/128}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/128}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/100 => core/128}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/128}/filelists/x86_64/linux-initrd (100%) delete mode 100644 src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch Difference in files: diff --git a/config/rootfiles/core/128/filelists/aarch64/linux b/config/rootfiles/core/128/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/128/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/aarch64/linux-initrd b/config/rootfiles/core/128/filelists/aarch64/linux-initrd new file mode 120000 index 000000000..8acdb0f31 --- /dev/null +++ b/config/rootfiles/core/128/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-kirkwood new file mode 120000 index 000000000..39c5591b7 --- /dev/null +++ b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 000000000..0b1b4530a --- /dev/null +++ b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/128/filelists/armv5tel/linux-kirkwood new file mode 120000 index 000000000..72171071e --- /dev/null +++ b/config/rootfiles/core/128/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-multi b/config/rootfiles/core/128/filelists/armv5tel/linux-multi new file mode 120000 index 000000000..204eb4c43 --- /dev/null +++ b/config/rootfiles/core/128/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files index 9a34f756b..568413342 100644 --- a/config/rootfiles/core/128/filelists/files +++ b/config/rootfiles/core/128/filelists/files @@ -5,6 +5,7 @@ var/ipfire/langs etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws etc/rc.d/init.d/firewall +etc/rc.d/init.d/partresize etc/rc.d/init.d/unbound etc/ssl/openssl.cnf etc/sysctl.conf diff --git a/config/rootfiles/core/128/filelists/i586/linux b/config/rootfiles/core/128/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/128/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/i586/linux-initrd b/config/rootfiles/core/128/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/128/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/x86_64/linux b/config/rootfiles/core/128/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/128/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/x86_64/linux-initrd b/config/rootfiles/core/128/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/128/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh index 99c036d60..bc15679c5 100644 --- a/config/rootfiles/core/128/update.sh +++ b/config/rootfiles/core/128/update.sh @@ -26,11 +26,59 @@ core=128 +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 80000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules +rm -f /etc/sysconfig/lm_sensors + # Stop services # Remove files @@ -43,7 +91,6 @@ rm -vf \ /.rnd \ /root/.rnd - # Extract files extract_files @@ -64,8 +111,42 @@ fi /etc/init.d/apache restart /etc/init.d/unbound restart -# This update needs a reboot... -touch /var/run/need_reboot +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + rm -rf /opt/pakfire/db/rootfiles/linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + touch /var/run/need_reboot + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + else + touch /var/run/need_reboot + fi + ;; + *) + # This update needs a reboot... + touch /var/run/need_reboot + ;; +esac # Finish /etc/init.d/fireinfo start diff --git a/lfs/linux b/lfs/linux index 38c8fdec9..8092381b6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.101 -ARM_PATCHES = 4.14.101-ipfire0 +VER = 4.14.102 +ARM_PATCHES = 4.14.102-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = fd0952d086222e6267588c12c8d6fab1 +$(DL_FILE)_MD5 = 8e45ababe805901139c58a0af3711f90 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 1cda52264dad96fcba65bd335fbbfa95 install : $(TARGET) @@ -153,13 +153,11 @@ endif ifeq "$(KCFG)" "-multi" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch - endif + ifeq "$(BUILD_ARCH)" "aarch64" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 2fad11251..f3e3c0f0d 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -29,10 +29,22 @@ case "${1}" in (exit ${failed}) evaluate_retval + # check if serial console enabled + scon="off"; + if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then + scon="on"; + fi + IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name; + case ${DMI_PRODUCT_NAME} in + APU|apu[2-4]|PC\ Engines\ apu[1-4] ) + scon="on"; + ;; + esac + mount /boot > /dev/null if [ -e /boot/grub/grub.cfg ]; then # swtich permanent to serial console if it was selected on first boot - if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then + if [ "${scon}" = "on" ]; then # Enable also serial console on GRUB echo "GRUB_TERMINAL=\"serial console\"" >> /etc/default/grub echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub diff --git a/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch b/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch deleted file mode 100644 index e4c8b9982..000000000 --- a/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a44147a09baf8c46cc0b02332df3a4656e0659d5 Mon Sep 17 00:00:00 2001 -From: Arne Fitzenreiter <arne_f(a)ipfire.org> -Date: Mon, 10 Dec 2018 13:12:00 +0100 -Subject: [PATCH] Revert "usb: dwc2: Fix DMA alignment to start at allocated - boundary" - -This reverts commit 68fc92a0f3913d539d1ac68a861f895e34099e46. ---- - drivers/usb/dwc2/hcd.c | 44 +++++++++++++++++++++----------------------- - 1 file changed, 21 insertions(+), 23 deletions(-) - -diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c -index fa20ec4..4b81d08 100644 ---- a/drivers/usb/dwc2/hcd.c -+++ b/drivers/usb/dwc2/hcd.c -@@ -2644,29 +2644,34 @@ static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg, - - #define DWC2_USB_DMA_ALIGN 4 - -+struct dma_aligned_buffer { -+ void *kmalloc_ptr; -+ void *old_xfer_buffer; -+ u8 data[0]; -+}; -+ - static void dwc2_free_dma_aligned_buffer(struct urb *urb) - { -- void *stored_xfer_buffer; -+ struct dma_aligned_buffer *temp; - - if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER)) - return; - -- /* Restore urb->transfer_buffer from the end of the allocated area */ -- memcpy(&stored_xfer_buffer, urb->transfer_buffer + -- urb->transfer_buffer_length, sizeof(urb->transfer_buffer)); -+ temp = container_of(urb->transfer_buffer, -+ struct dma_aligned_buffer, data); - - if (usb_urb_dir_in(urb)) -- memcpy(stored_xfer_buffer, urb->transfer_buffer, -+ memcpy(temp->old_xfer_buffer, temp->data, - urb->transfer_buffer_length); -- kfree(urb->transfer_buffer); -- urb->transfer_buffer = stored_xfer_buffer; -+ urb->transfer_buffer = temp->old_xfer_buffer; -+ kfree(temp->kmalloc_ptr); - - urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER; - } - - static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags) - { -- void *kmalloc_ptr; -+ struct dma_aligned_buffer *temp, *kmalloc_ptr; - size_t kmalloc_size; - - if (urb->num_sgs || urb->sg || -@@ -2674,29 +2679,22 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags) - !((uintptr_t)urb->transfer_buffer & (DWC2_USB_DMA_ALIGN - 1))) - return 0; - -- /* -- * Allocate a buffer with enough padding for original transfer_buffer -- * pointer. This allocation is guaranteed to be aligned properly for -- * DMA -- */ -+ /* Allocate a buffer with enough padding for alignment */ - kmalloc_size = urb->transfer_buffer_length + -- sizeof(urb->transfer_buffer); -+ sizeof(struct dma_aligned_buffer) + DWC2_USB_DMA_ALIGN - 1; - - kmalloc_ptr = kmalloc(kmalloc_size, mem_flags); - if (!kmalloc_ptr) - return -ENOMEM; - -- /* -- * Position value of original urb->transfer_buffer pointer to the end -- * of allocation for later referencing -- */ -- memcpy(kmalloc_ptr + urb->transfer_buffer_length, -- &urb->transfer_buffer, sizeof(urb->transfer_buffer)); -- -+ /* Position our struct dma_aligned_buffer such that data is aligned */ -+ temp = PTR_ALIGN(kmalloc_ptr + 1, DWC2_USB_DMA_ALIGN) - 1; -+ temp->kmalloc_ptr = kmalloc_ptr; -+ temp->old_xfer_buffer = urb->transfer_buffer; - if (usb_urb_dir_out(urb)) -- memcpy(kmalloc_ptr, urb->transfer_buffer, -+ memcpy(temp->data, urb->transfer_buffer, - urb->transfer_buffer_length); -- urb->transfer_buffer = kmalloc_ptr; -+ urb->transfer_buffer = temp->data; - - urb->transfer_flags |= URB_ALIGNED_TEMP_BUFFER; - --- -2.7.4 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 17872019ba56d6ec81742fc61218933f25988f7e
by Arne Fitzenreiter 19 Feb '19

19 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 17872019ba56d6ec81742fc61218933f25988f7e (commit) from 9bc17600521eabca8238fc9116d1fae47800a6af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 17872019ba56d6ec81742fc61218933f25988f7e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 19 01:04:19 2019 +0100 kernel: update apu led patch for apu3 and 4 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- ....8-apu_leds.patch => linux-4.14-apu_leds.patch} | 52 ++++++++++++---------- 2 files changed, 29 insertions(+), 25 deletions(-) rename src/patches/linux/{linux-4.9.8-apu_leds.patch => linux-4.14-apu_leds.patch} (83%) Difference in files: diff --git a/lfs/linux b/lfs/linux index 36af790d1..38c8fdec9 100644 --- a/lfs/linux +++ b/lfs/linux @@ -141,7 +141,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch # Add PC Engines APU led support - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-apu_leds.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-apu_leds.patch # Fix uevent PHYSDEVDRIVER cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch diff --git a/src/patches/linux/linux-4.9.8-apu_leds.patch b/src/patches/linux/linux-4.14-apu_leds.patch similarity index 83% rename from src/patches/linux/linux-4.9.8-apu_leds.patch rename to src/patches/linux/linux-4.14-apu_leds.patch index 27da2f166..dc63fd261 100644 --- a/src/patches/linux/linux-4.9.8-apu_leds.patch +++ b/src/patches/linux/linux-4.14-apu_leds.patch @@ -1,7 +1,7 @@ -diff -Naur linux-4.9.8.org/arch/x86/Kconfig linux-4.9.8/arch/x86/Kconfig ---- linux-4.9.8.org/arch/x86/Kconfig 2017-02-04 09:47:29.000000000 +0100 -+++ linux-4.9.8/arch/x86/Kconfig 2017-02-09 19:29:59.244945360 +0100 -@@ -2604,6 +2604,7 @@ +diff -Naur linux-4.14.101.org/arch/x86/Kconfig linux-4.14.101/arch/x86/Kconfig +--- linux-4.14.101.org/arch/x86/Kconfig 2019-02-15 09:08:56.000000000 +0100 ++++ linux-4.14.101/arch/x86/Kconfig 2019-02-18 22:24:00.682722072 +0100 +@@ -2715,6 +2715,7 @@ - AC adapter status updates - Battery status updates @@ -9,7 +9,7 @@ diff -Naur linux-4.9.8.org/arch/x86/Kconfig linux-4.9.8/arch/x86/Kconfig config ALIX bool "PCEngines ALIX System Support (LED setup)" select GPIOLIB -@@ -2642,6 +2643,18 @@ +@@ -2753,6 +2754,18 @@ endif # X86_32 @@ -20,20 +20,20 @@ diff -Naur linux-4.9.8.org/arch/x86/Kconfig linux-4.9.8/arch/x86/Kconfig + This option enables system support for the PCEngines APU1. + +config APU2LED -+ bool "PCEngines APU2 Led Support" ++ bool "PCEngines APU2/3/4 Led Support" + depends on DMI + ---help--- -+ This option enables system support for the PCEngines APU2. ++ This option enables system support for the PCEngines APU2/3/4. + config AMD_NB def_bool y depends on CPU_SUP_AMD && PCI -diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86/platform/apu/apu2-led.c ---- linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.9.8/arch/x86/platform/apu/apu2-led.c 2017-02-09 19:29:59.244945360 +0100 -@@ -0,0 +1,180 @@ +diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/arch/x86/platform/apu/apu2-led.c +--- linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.101/arch/x86/platform/apu/apu2-led.c 2019-02-18 22:30:08.503059825 +0100 +@@ -0,0 +1,183 @@ +/* -+ * LEDs driver for PCEngines apu2 ++ * LEDs driver for PCEngines apu2/3/4 + * + * this basic driver only set the output, configuration + * has already done by bios/coreboot. @@ -175,7 +175,10 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86 + goto out; + + product = dmi_get_system_info(DMI_PRODUCT_NAME); -+ if (!product || (strcmp(product, "PC Engines apu2") && strcmp(product, "apu2")) ) ++ if (!product || ( strcmp(product, "PC Engines apu2") && ++ strcmp(product, "PC Engines apu3") && ++ strcmp(product, "PC Engines apu4") && ++ strcmp(product, "apu2") ) ) // apu2 on early bios relases + goto out; + + printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", @@ -210,11 +213,11 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86 +module_exit(apu2_led_exit); + +MODULE_AUTHOR("Arne Fitzenreiter"); -+MODULE_DESCRIPTION("PCEngines apu2 LED driver"); ++MODULE_DESCRIPTION("PCEngines apu2/3/4 LED driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu-led.c linux-4.9.8/arch/x86/platform/apu/apu-led.c ---- linux-4.9.8.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.9.8/arch/x86/platform/apu/apu-led.c 2017-02-09 19:29:59.244945360 +0100 +diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arch/x86/platform/apu/apu-led.c +--- linux-4.14.101.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.101/arch/x86/platform/apu/apu-led.c 2019-02-18 22:24:00.686721439 +0100 @@ -0,0 +1,181 @@ +/* + * LEDs driver for PCEngines apu @@ -397,16 +400,17 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu-led.c linux-4.9.8/arch/x86/ +MODULE_AUTHOR("Christian Herzog"); +MODULE_DESCRIPTION("PCEngines apu LED driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-4.9.8.org/arch/x86/platform/apu/Makefile linux-4.9.8/arch/x86/platform/apu/Makefile ---- linux-4.9.8.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.9.8/arch/x86/platform/apu/Makefile 2017-02-09 19:29:59.244945360 +0100 +diff -Naur linux-4.14.101.org/arch/x86/platform/apu/Makefile linux-4.14.101/arch/x86/platform/apu/Makefile +--- linux-4.14.101.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.101/arch/x86/platform/apu/Makefile 2019-02-18 22:24:00.686721439 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_APULED) += apu-led.o +obj-$(CONFIG_APU2LED) += apu2-led.o -diff -Naur linux-4.9.8.org/arch/x86/platform/Makefile linux-4.9.8/arch/x86/platform/Makefile ---- linux-4.9.8.org/arch/x86/platform/Makefile 2017-02-04 09:47:29.000000000 +0100 -+++ linux-4.9.8/arch/x86/platform/Makefile 2017-02-09 19:32:31.768269470 +0100 -@@ -1,4 +1,5 @@ +diff -Naur linux-4.14.101.org/arch/x86/platform/Makefile linux-4.14.101/arch/x86/platform/Makefile +--- linux-4.14.101.org/arch/x86/platform/Makefile 2019-02-15 09:08:56.000000000 +0100 ++++ linux-4.14.101/arch/x86/platform/Makefile 2019-02-18 22:24:00.686721439 +0100 +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 # Platform specific code goes here +obj-y += apu/ obj-y += atom/ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9bc17600521eabca8238fc9116d1fae47800a6af
by Michael Tremer 17 Feb '19

17 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9bc17600521eabca8238fc9116d1fae47800a6af (commit) from 256070e92fed192f80c0c4fcdbbf9102fdc8e6b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9bc17600521eabca8238fc9116d1fae47800a6af Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 17 13:46:51 2019 +0000 unbound: Drop certificates for local control connection These are a cause of worry because they are sometimes generated with an invalid timestamp and therefore render unbound being unusable. There is no strong reason to use self-signed certificates for extra security here. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/128/filelists/files | 2 ++ config/rootfiles/core/128/update.sh | 1 + config/unbound/unbound.conf | 6 +----- src/initscripts/system/unbound | 5 ----- 4 files changed, 4 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files index 1998a08c0..9a34f756b 100644 --- a/config/rootfiles/core/128/filelists/files +++ b/config/rootfiles/core/128/filelists/files @@ -5,8 +5,10 @@ var/ipfire/langs etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws etc/rc.d/init.d/firewall +etc/rc.d/init.d/unbound etc/ssl/openssl.cnf etc/sysctl.conf +etc/unbound/unbound.conf srv/web/ipfire/cgi-bin/proxy.cgi usr/local/bin/xt_geoip_update var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh index dc185ed70..99c036d60 100644 --- a/config/rootfiles/core/128/update.sh +++ b/config/rootfiles/core/128/update.sh @@ -62,6 +62,7 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then fi /etc/init.d/sshd restart /etc/init.d/apache restart +/etc/init.d/unbound restart # This update needs a reboot... touch /var/run/need_reboot diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf index 2cc5bab8a..e20c3330d 100644 --- a/config/unbound/unbound.conf +++ b/config/unbound/unbound.conf @@ -83,12 +83,8 @@ server: remote-control: control-enable: yes - control-use-cert: yes + control-use-cert: no control-interface: 127.0.0.1 - server-key-file: "/etc/unbound/unbound_server.key" - server-cert-file: "/etc/unbound/unbound_server.pem" - control-key-file: "/etc/unbound/unbound_control.key" - control-cert-file: "/etc/unbound/unbound_control.pem" # Import any local configurations include: "/etc/unbound/local.d/*.conf" diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index 08007f50a..2ef994e96 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -507,11 +507,6 @@ case "$1" in eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - # Create control keys at first run - if [ ! -r "/etc/unbound/unbound_control.key" ]; then - unbound-control-setup -d /etc/unbound &>/dev/null - fi - # Update configuration files write_tuning_conf write_forward_conf hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 256070e92fed192f80c0c4fcdbbf9102fdc8e6b4
by Michael Tremer 17 Feb '19

17 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 256070e92fed192f80c0c4fcdbbf9102fdc8e6b4 (commit) via 34f4af78a800b250dd3766747607231d3872d40f (commit) from 56ec56a8193ebccb7c32469e0870849f820b0d14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 256070e92fed192f80c0c4fcdbbf9102fdc8e6b4 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Feb 10 20:21:22 2019 +0100 Added 'CONFIG_X86_MSR=y for 'powertop' to i586 and x86_64 builds for fixing #11997 Triggered by: https://forum.ipfire.org/viewtopic.php?f=69&t=22274 This - probably - fixes Bug #11997. Needs testing on 64bit installations! Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 34f4af78a800b250dd3766747607231d3872d40f Author: Rob Brewer <ipfire-devel(a)grantura.co.uk> Date: Wed Feb 13 22:49:11 2019 +0000 Fix ownership of sendEmail script The script used to be owned by a non-privileged user and it should just be owned by root.root like any other binary. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/sendEmail | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index aa7b0ed34..d54e8b8b6 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -529,7 +529,7 @@ CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -# CONFIG_X86_MSR is not set +CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 781bb87e5..d86520155 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -542,7 +542,7 @@ CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -# CONFIG_X86_MSR is not set +CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_NOHIGHMEM is not set # CONFIG_HIGHMEM4G is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index ed0f31c24..e6598c8d8 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -532,7 +532,7 @@ CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -# CONFIG_X86_MSR is not set +CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_X86_5LEVEL is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y diff --git a/lfs/sendEmail b/lfs/sendEmail index 28646ef93..171f7ab91 100644 --- a/lfs/sendEmail +++ b/lfs/sendEmail @@ -17,7 +17,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sendEmail -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -63,6 +63,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp -pvf sendEmail /usr/local/bin + chown root.root /usr/local/bin/sendEmail chmod 755 /usr/local/bin/sendEmail @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 56ec56a8193ebccb7c32469e0870849f820b0d14
by Arne Fitzenreiter 16 Feb '19

16 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 56ec56a8193ebccb7c32469e0870849f820b0d14 (commit) from 2caca412176a5de89fa4b359cf33766be552c447 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 56ec56a8193ebccb7c32469e0870849f820b0d14 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 16 22:49:47 2019 +0100 borgbackup: fix build on armv5tel Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/{ => armv5tel}/borgbackup | 10 +++++----- config/rootfiles/packages/{i586 => armv5tel}/python3-llfuse | 2 +- config/rootfiles/packages/{ => armv5tel}/python3-msgpack | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) copy config/rootfiles/packages/{ => armv5tel}/borgbackup (95%) copy config/rootfiles/packages/{i586 => armv5tel}/python3-llfuse (85%) copy config/rootfiles/packages/{ => armv5tel}/python3-msgpack (85%) Difference in files: diff --git a/config/rootfiles/packages/armv5tel/borgbackup b/config/rootfiles/packages/armv5tel/borgbackup new file mode 100644 index 000000000..ca9ce0990 --- /dev/null +++ b/config/rootfiles/packages/armv5tel/borgbackup @@ -0,0 +1,109 @@ +usr/bin/borg +usr/lib/python3.6/site-packages/borg +usr/lib/python3.6/site-packages/borg/__init__.py +usr/lib/python3.6/site-packages/borg/__main__.py +usr/lib/python3.6/site-packages/borg/__pycache__ +usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc +usr/lib/python3.6/site-packages/borg/_chunker.c +usr/lib/python3.6/site-packages/borg/_hashindex.c +usr/lib/python3.6/site-packages/borg/_version.py +usr/lib/python3.6/site-packages/borg/archive.py +usr/lib/python3.6/site-packages/borg/archiver.py +usr/lib/python3.6/site-packages/borg/cache.py +usr/lib/python3.6/site-packages/borg/chunker.c +usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/borg/chunker.pyx +usr/lib/python3.6/site-packages/borg/compress.c +usr/lib/python3.6/site-packages/borg/compress.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/borg/compress.pyx +usr/lib/python3.6/site-packages/borg/crypto.c +usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/borg/crypto.pyx +usr/lib/python3.6/site-packages/borg/fuse.py +usr/lib/python3.6/site-packages/borg/hashindex.c +usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/borg/hashindex.pyx +usr/lib/python3.6/site-packages/borg/helpers.py +usr/lib/python3.6/site-packages/borg/key.py +usr/lib/python3.6/site-packages/borg/keymanager.py +usr/lib/python3.6/site-packages/borg/locking.py +usr/lib/python3.6/site-packages/borg/logger.py +usr/lib/python3.6/site-packages/borg/lrucache.py +usr/lib/python3.6/site-packages/borg/paperkey.html +usr/lib/python3.6/site-packages/borg/platform.py +usr/lib/python3.6/site-packages/borg/platform_darwin.c +usr/lib/python3.6/site-packages/borg/platform_darwin.pyx +usr/lib/python3.6/site-packages/borg/platform_freebsd.c +usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx +usr/lib/python3.6/site-packages/borg/platform_linux.c +usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/borg/platform_linux.pyx +usr/lib/python3.6/site-packages/borg/remote.py +usr/lib/python3.6/site-packages/borg/repository.py +usr/lib/python3.6/site-packages/borg/shellpattern.py +#usr/lib/python3.6/site-packages/borg/testsuite +#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__ +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc +#usr/lib/python3.6/site-packages/borg/testsuite/archive.py +#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py +#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz +#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py +#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py +#usr/lib/python3.6/site-packages/borg/testsuite/compress.py +#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py +#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py +#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py +#usr/lib/python3.6/site-packages/borg/testsuite/key.py +#usr/lib/python3.6/site-packages/borg/testsuite/locking.py +#usr/lib/python3.6/site-packages/borg/testsuite/logger.py +#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py +#usr/lib/python3.6/site-packages/borg/testsuite/platform.py +#usr/lib/python3.6/site-packages/borg/testsuite/repository.py +#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py +#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py +#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py +usr/lib/python3.6/site-packages/borg/upgrader.py +usr/lib/python3.6/site-packages/borg/xattr.py +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt +usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt diff --git a/config/rootfiles/packages/armv5tel/python3-llfuse b/config/rootfiles/packages/armv5tel/python3-llfuse new file mode 100644 index 000000000..d3d720243 --- /dev/null +++ b/config/rootfiles/packages/armv5tel/python3-llfuse @@ -0,0 +1,7 @@ +usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info +usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO +usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt +usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt +usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt +usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe +usr/lib/python3.6/site-packages/llfuse.cpython-36m-arm-linux-gnueabi.so diff --git a/config/rootfiles/packages/armv5tel/python3-msgpack b/config/rootfiles/packages/armv5tel/python3-msgpack new file mode 100644 index 000000000..2961b80df --- /dev/null +++ b/config/rootfiles/packages/armv5tel/python3-msgpack @@ -0,0 +1,17 @@ +#usr/lib/python3.6/site-packages/msgpack +usr/lib/python3.6/site-packages/msgpack/__init__.py +usr/lib/python3.6/site-packages/msgpack/__pycache__ +usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc +usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc +usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc +usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc +usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-arm-linux-gnueabi.so +usr/lib/python3.6/site-packages/msgpack/_version.py +usr/lib/python3.6/site-packages/msgpack/exceptions.py +usr/lib/python3.6/site-packages/msgpack/fallback.py +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2c1f97395f8903765d7129afc4ee1ab9947dd069
by Michael Tremer 16 Feb '19

16 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 2c1f97395f8903765d7129afc4ee1ab9947dd069 (commit) via 5d5a5f4d2f64c714ad62ff11d40e883974af73fc (commit) via 9f6c4072e30d7faf5caf816e67368760cf7cf275 (commit) via 988db099886b1800c5d2da96bba37b366ed4156d (commit) via 6c10b70c4bc6a6207398ce8ed5667a0cf5de9050 (commit) via 21635482436b8a51d92ed8d7e8b7d7ebae96407f (commit) via 70436f85babf8ac27168dfbad1d4e3aef9a598fb (commit) via 8c0d00c7806453bc8f0b5c59b8d9e37d9b97a910 (commit) via 4a041b2bd621a28814556fa5978fb74201d3e8b3 (commit) via 8473cdce15d2225609ccdbe306997a28af4d667d (commit) via 39401781d559ecd1144ae553ac30d282be1ab0a3 (commit) via 678f98543efec5ddca146111c188b110ca7fe683 (commit) via 8c00dee0fc7d8df3b2be836a9f6659796dc247d3 (commit) via fea1090ed192b5289a52035e63b3aab0b695f78e (commit) via 53f15303ef41f288d7ba3540a271fe9ed41ab9a7 (commit) via f7554b2ee1967b7c75140a2c72ff103b048bc503 (commit) via 462f5bb3d1cf44e171e088c7f8f6fe45600e5c0f (commit) via e50a591608098e542448bebc90a6b13282c53191 (commit) from 69b2f2ab8e05bb1b4af5e97a62b4038cb764e795 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2c1f97395f8903765d7129afc4ee1ab9947dd069 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 16 20:36:58 2019 +0000 gnutls: Update to 3.6.6 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d5a5f4d2f64c714ad62ff11d40e883974af73fc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 16 20:36:29 2019 +0000 libtasn1: Update to 4.13 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9f6c4072e30d7faf5caf816e67368760cf7cf275 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 16 20:35:12 2019 +0000 libunistring: Update to 0.9.10 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 988db099886b1800c5d2da96bba37b366ed4156d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 16 20:34:37 2019 +0000 nettle: Update to 3.4.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6c10b70c4bc6a6207398ce8ed5667a0cf5de9050 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 16 17:53:23 2019 +0000 xz: Update to 5.2.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 21635482436b8a51d92ed8d7e8b7d7ebae96407f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 16 17:42:28 2019 +0000 grep: Update to 3.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 70436f85babf8ac27168dfbad1d4e3aef9a598fb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 21:33:26 2019 +0000 tcpdump: Update to 4.9.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c0d00c7806453bc8f0b5c59b8d9e37d9b97a910 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 21:21:22 2019 +0000 transifex-client: Drop package We no longer use this Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4a041b2bd621a28814556fa5978fb74201d3e8b3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 21:15:38 2019 +0000 mpfr: Update to 4.0.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8473cdce15d2225609ccdbe306997a28af4d667d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 21:02:16 2019 +0000 mtr: Update to 0.92 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 39401781d559ecd1144ae553ac30d282be1ab0a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 20:59:47 2019 +0000 curl: Update to 7.64.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 678f98543efec5ddca146111c188b110ca7fe683 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 20:56:40 2019 +0000 flex: Update to 2.6.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c00dee0fc7d8df3b2be836a9f6659796dc247d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 20:08:21 2019 +0000 glibc: Update to 2.29 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fea1090ed192b5289a52035e63b3aab0b695f78e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 20:05:38 2019 +0000 bison: Update to 3.3.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 53f15303ef41f288d7ba3540a271fe9ed41ab9a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 18:03:31 2019 +0000 coreutils: Update to 8.30 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f7554b2ee1967b7c75140a2c72ff103b048bc503 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 16:33:43 2019 +0000 unbound: Update to 1.9.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 462f5bb3d1cf44e171e088c7f8f6fe45600e5c0f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 16:27:11 2019 +0000 pcre: Enable JIT Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e50a591608098e542448bebc90a6b13282c53191 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 16:26:58 2019 +0000 htop: Update to 2.2.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: bison/bison.nm | 4 +- coreutils/coreutils.nm | 2 +- curl/curl.nm | 6 +- curl/patches/0101-curl-7.32.0-multilib.patch | 83 ---------------------- curl/patches/0102-curl-7.29.0-debug.patch | 65 ----------------- curl/patches/0104-curl-7.19.7-localhost6.patch | 51 ------------- flex/flex.nm | 9 ++- ...fixes-Do-not-use-obsolete-bison-construct.patch | 79 -------------------- .../flex-2.6.4-build-fix-reallocarray.patch | 57 +++++++++++++++ glibc/glibc.nm | 9 +-- gnutls/gnutls.nm | 12 ++-- grep/grep.nm | 2 +- htop/htop.nm | 2 +- libtasn1/libtasn1.nm | 4 +- libunistring/libunistring.nm | 4 +- mpfr/mpfr.nm | 2 +- mtr/mtr.nm | 5 +- nettle/nettle.nm | 4 +- pcre/pcre.nm | 4 +- tcpdump/tcpdump.nm | 2 +- transifex-client/transifex-client.nm | 41 ----------- unbound/unbound.nm | 2 +- xz/xz.nm | 2 +- 23 files changed, 98 insertions(+), 353 deletions(-) delete mode 100644 curl/patches/0101-curl-7.32.0-multilib.patch delete mode 100644 curl/patches/0102-curl-7.29.0-debug.patch delete mode 100644 curl/patches/0104-curl-7.19.7-localhost6.patch delete mode 100644 flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch create mode 100644 flex/patches/flex-2.6.4-build-fix-reallocarray.patch delete mode 100644 transifex-client/transifex-client.nm Difference in files: diff --git a/bison/bison.nm b/bison/bison.nm index bedeeaed2..cbbb0da69 100644 --- a/bison/bison.nm +++ b/bison/bison.nm @@ -4,8 +4,8 @@ ############################################################################### name = bison -version = 3.0.4 -release = 2 +version = 3.3.2 +release = 1 groups = Development/Tools url = http://www.gnu.org/software/bison/ diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 9e3db3f30..a85b6a872 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = coreutils -version = 8.29 +version = 8.30 release = 1 groups = System/Base diff --git a/curl/curl.nm b/curl/curl.nm index ae5916283..b9e5bff9d 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,11 +4,11 @@ ############################################################################### name = curl -version = 7.48.0 +version = 7.64.0 release = 1 groups = Application/Internet -url = http://www.curl.haxx.se/ +url = https://curl.haxx.se/ license = MIT summary = A utility for getting files from remote servers (FTP, HTTP, and others). @@ -20,7 +20,7 @@ description user authentication, FTP upload, HTTP post, and file transfer resume. end -source_dl = http://curl.haxx.se/download/ +source_dl = https://curl.haxx.se/download/ build requires diff --git a/curl/patches/0101-curl-7.32.0-multilib.patch b/curl/patches/0101-curl-7.32.0-multilib.patch deleted file mode 100644 index 9e9b56bae..000000000 --- a/curl/patches/0101-curl-7.32.0-multilib.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 2a4754a3a7cf60ecc36d83cbe50b8c337cb87632 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka(a)redhat.com> -Date: Fri, 12 Apr 2013 12:04:05 +0200 -Subject: [PATCH] prevent multilib conflicts on the curl-config script - ---- - curl-config.in | 21 +++------------------ - docs/curl-config.1 | 4 +++- - libcurl.pc.in | 1 + - 3 files changed, 7 insertions(+), 19 deletions(-) - -diff --git a/curl-config.in b/curl-config.in -index 150004d..95d0759 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -75,7 +75,7 @@ while test $# -gt 0; do - ;; - - --cc) -- echo "@CC@" -+ echo "gcc" - ;; - - --prefix) -@@ -142,29 +142,14 @@ while test $# -gt 0; do - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -- else -- CURLLIBDIR="" -- fi -- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then -- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ -- else -- echo ${CURLLIBDIR}-lcurl -- fi -+ pkg-config libcurl --libs - ;; - - --static-libs) -- if test "X@ENABLE_STATIC@" != "Xno" ; then -- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ -- else -- echo "curl was built with static libraries disabled" >&2 -- exit 1 -- fi - ;; - - --configure) -- echo @CONFIGURE_OPTIONS@ -+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' - ;; - - *) -diff --git a/docs/curl-config.1 b/docs/curl-config.1 -index 14a9d2b..ffcc004 100644 ---- a/docs/curl-config.1 -+++ b/docs/curl-config.1 -@@ -65,7 +65,9 @@ be listed using uppercase and are separated by newlines. There may be none, - one, or several protocols in the list. (Added in 7.13.0) - .IP "--static-libs" - Shows the complete set of libs and other linker options you will need in order --to link your application with libcurl statically. (Added in 7.17.1) -+to link your application with libcurl statically. Note that Fedora/RHEL libcurl -+packages do not provide any static libraries, thus cannot be linked statically. -+(Added in 7.17.1) - .IP "--version" - Outputs version information about the installed libcurl. - .IP "--vernum" -diff --git a/libcurl.pc.in b/libcurl.pc.in -index 2ba9c39..f8f8b00 100644 ---- a/libcurl.pc.in -+++ b/libcurl.pc.in -@@ -29,6 +29,7 @@ libdir=@libdir@ - includedir=@includedir@ - supported_protocols="@SUPPORT_PROTOCOLS@" - supported_features="@SUPPORT_FEATURES@" -+configure_options=@CONFIGURE_OPTIONS@ - - Name: libcurl - URL: http://curl.haxx.se/ diff --git a/curl/patches/0102-curl-7.29.0-debug.patch b/curl/patches/0102-curl-7.29.0-debug.patch deleted file mode 100644 index 7f7053008..000000000 --- a/curl/patches/0102-curl-7.29.0-debug.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka(a)redhat.com> -Date: Wed, 31 Oct 2012 11:38:30 +0100 -Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778) - ---- - configure | 13 +++---------- - m4/curl-compilers.m4 | 13 +++---------- - 2 files changed, 6 insertions(+), 20 deletions(-) - -diff --git a/configure b/configure -index 8f079a3..53b4774 100755 ---- a/configure -+++ b/configure -@@ -15759,18 +15759,11 @@ $as_echo "yes" >&6; } - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" - flags_dbg_off="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - - if test -z "$SED"; then -diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 -index 0cbba7a..9175b5b 100644 ---- a/m4/curl-compilers.m4 -+++ b/m4/curl-compilers.m4 -@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" - flags_dbg_off="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - CURL_CHECK_DEF([_WIN32], [], [silent]) - else --- -1.7.1 - diff --git a/curl/patches/0104-curl-7.19.7-localhost6.patch b/curl/patches/0104-curl-7.19.7-localhost6.patch deleted file mode 100644 index 4f664d3dc..000000000 --- a/curl/patches/0104-curl-7.19.7-localhost6.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/tests/data/test1083 b/tests/data/test1083 -index e441278..b0958b6 100644 ---- a/tests/data/test1083 -+++ b/tests/data/test1083 -@@ -33,13 +33,13 @@ ipv6 - http-ipv6 - </server> - <name> --HTTP-IPv6 GET with ip6-localhost --interface -+HTTP-IPv6 GET with localhost6 --interface - </name> - <command> ---g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost -+-g "http://%HOST6IP:%HTTP6PORT/1083" --interface localhost6 - </command> - <precheck> --perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}" -+perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 localhost6'; print 'Cannot run precheck resolve';}" - </precheck> - </client> - -diff --git a/tests/data/test241 b/tests/data/test241 -index 46eae1f..4e1632c 100644 ---- a/tests/data/test241 -+++ b/tests/data/test241 -@@ -30,13 +30,13 @@ ipv6 - http-ipv6 - </server> - <name> --HTTP-IPv6 GET (using ip6-localhost) -+HTTP-IPv6 GET (using localhost6) - </name> - <command> ---g "http://ip6-localhost:%HTTP6PORT/241" -+-g "http://localhost6:%HTTP6PORT/241" - </command> - <precheck> --./server/resolve --ipv6 ip6-localhost -+./server/resolve --ipv6 localhost6 - </precheck> - </client> - -@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost) - </strip> - <protocol> - GET /241 HTTP/1.1 --Host: ip6-localhost:%HTTP6PORT -+Host: localhost6:%HTTP6PORT - Accept: */* - - </protocol> diff --git a/flex/flex.nm b/flex/flex.nm index 4c5b55559..4fc7cfe88 100644 --- a/flex/flex.nm +++ b/flex/flex.nm @@ -4,8 +4,8 @@ ############################################################################### name = flex -version = 2.5.39 -release = 2.1 +version = 2.6.4 +release = 1 groups = Development/Tools url = http://flex.sourceforge.net/ @@ -24,12 +24,15 @@ description build process. end -source_dl = http://prdownloads.sourceforge.net/flex/ +source_dl = https://github.com/westes/flex/releases/download/v%{version}/ build requires + autoconf + automake bison gcc-c++ + help2man m4 end diff --git a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch b/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch deleted file mode 100644 index eb46be34e..000000000 --- a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 35aba3d6e3c99fcd527c677bef8efeb59963fe8a Mon Sep 17 00:00:00 2001 -Message-Id: <35aba3d6e3c99fcd527c677bef8efeb59963fe8a.1397340102.git.srivasta(a)golden-gryphon.com> -From: Manoj Srivastava <srivasta(a)golden-gryphon.com> -Date: Wed, 9 Apr 2014 00:23:07 -0700 -Subject: [PATCH 1/1] [bison-test-fixes] Do not use obsolete bison constructs in tests. - -In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been -removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or -%param. This commit fixes the tests so they still work. - -Signed-off-by: Manoj Srivastava <srivasta(a)golden-gryphon.com> ---- - tests/test-bison-yylloc/parser.y | 4 ++-- - tests/test-bison-yylval/parser.y | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - 50.0% tests/test-bison-yylloc/ - 50.0% tests/test-bison-yylval/ - -diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y -index e8f4e56..224d252 100644 ---- a/tests/test-bison-yylloc/parser.y -+++ b/tests/test-bison-yylloc/parser.y -@@ -22,6 +22,7 @@ - */ - - %parse-param { void* scanner } -+%lex-param { void* scanner } - - /* - How to compile: -@@ -34,7 +35,6 @@ - #include "config.h" - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - extern int testget_lineno(void*); - -@@ -52,7 +52,7 @@ int process_text(char* s) { - - %} - --%pure_parser -+%pure-parser - - %union { - int lineno; -diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.y -index 0ffdb89..626c5e7 100644 ---- a/tests/test-bison-yylval/parser.y -+++ b/tests/test-bison-yylval/parser.y -@@ -26,6 +26,7 @@ - bison --defines --output-file="parser.c" --name-prefix="test" parser.y - */ - %parse-param { void* scanner } -+%lex-param { void* scanner } - %{ - #include <stdio.h> - #include <stdlib.h> -@@ -33,7 +34,6 @@ - #include "config.h" - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - - /* A dummy function. A check against seg-faults in yylval->str. */ -@@ -49,7 +49,7 @@ int process_text(char* s) { - - %} - --%pure_parser -+%pure-parser - - %union { - long unused; --- -1.9.2 - diff --git a/flex/patches/flex-2.6.4-build-fix-reallocarray.patch b/flex/patches/flex-2.6.4-build-fix-reallocarray.patch new file mode 100644 index 000000000..186e4d77a --- /dev/null +++ b/flex/patches/flex-2.6.4-build-fix-reallocarray.patch @@ -0,0 +1,57 @@ +From 23797fd0b0908dd2c5775e6135728c7384f4e952 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <wiz(a)NetBSD.org> +Date: Fri, 19 May 2017 10:22:44 +0200 +Subject: [PATCH] Use reallocarr() when available. + +Fixes https://github.com/westes/flex/issues/219 +--- + configure.ac | 1 + + src/misc.c | 16 ++++++++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 55e774b0..d0f3b7da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,6 +166,7 @@ strtol dnl + AC_CHECK_FUNCS([dnl + pow dnl Used only by "examples/manual/expr" + setlocale dnl Needed only if NLS is enabled ++reallocarr dnl NetBSD function. Use reallocarray if not available. + reallocarray dnl OpenBSD function. We have replacement if not available. + ]) + +diff --git a/src/misc.c b/src/misc.c +index ef27833c..39483ea8 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -142,7 +142,14 @@ void add_action (const char *new_text) + void *allocate_array (int size, size_t element_size) + { + void *mem; +-#if HAVE_REALLOCARRAY ++#if HAVE_REALLOCARR ++ mem = NULL; ++ if (reallocarr(&mem, (size_t) size, element_size)) ++ flexfatal (_ ++ ("memory allocation failed in allocate_array()")); ++ ++ return mem; ++#elif HAVE_REALLOCARRAY + /* reallocarray has built-in overflow detection */ + mem = reallocarray(NULL, (size_t) size, element_size); + #else +@@ -659,7 +666,12 @@ char *readable_form (int c) + void *reallocate_array (void *array, int size, size_t element_size) + { + void *new_array; +-#if HAVE_REALLOCARRAY ++#if HAVE_REALLOCARR ++ if (reallocarr(&array, (size_t) size, element_size)) ++ flexfatal (_("attempt to increase array size failed")); ++ ++ return array; ++#elif HAVE_REALLOCARRAY + /* reallocarray has built-in overflow detection */ + new_array = reallocarray(array, (size_t) size, element_size); + #else diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 012e5b3d8..eb3f7e2cc 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ############################################################################### name = glibc -version = 2.28 -release = 2 +version = 2.29 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -23,7 +23,7 @@ description Linux system will not function. end -source_dl = http://ftp.gnu.org/gnu/glibc/ +source_dl = https://ftp.gnu.org/gnu/glibc/ sources = %{thisapp}.tar.xz build @@ -38,9 +38,10 @@ build gcc >= 8 gettext kernel-headers >= %{OPTIMIZED_KERNEL} - make >= 4.0 libcap-devel libstdc++-static + make >= 4.0 + python3 >= 3.4 texinfo end diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index f30c2b8de..0c5d68a4c 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -5,8 +5,8 @@ name = gnutls version = %{ver_maj}.%{ver_min} -ver_maj = 3.5 -ver_min = 4 +ver_maj = 3.6 +ver_min = 6 release = 1 groups = System/Libraries @@ -30,10 +30,11 @@ build gettext libgcrypt-devel libidn-devel - libtasn1-devel >= 3.2 + libtasn1-devel >= 4.9 + libunistring-devel lzo-devel net-tools - nettle-devel >= 3.2 + nettle-devel >= 3.4.1 perl p11-kit-devel >= 0.23.1 readline-devel @@ -47,7 +48,6 @@ build configure_options += \ --with-included-libcfg \ --disable-openssl-compatibility \ - --disable-srp-authentication \ --disable-non-suiteb-curves \ --disable-guile @@ -61,7 +61,7 @@ end packages package %{name} requires - nettle >= 2.7 + nettle >= 3.4.1 p11-kit >= 0.14 end end diff --git a/grep/grep.nm b/grep/grep.nm index ca5db45f8..d20076202 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,7 +4,7 @@ ############################################################################### name = grep -version = 3.0 +version = 3.3 release = 1 groups = Applications/Text diff --git a/htop/htop.nm b/htop/htop.nm index 186335157..03e9d8faf 100644 --- a/htop/htop.nm +++ b/htop/htop.nm @@ -4,7 +4,7 @@ ############################################################################### name = htop -version = 1.0.3 +version = 2.2.0 release = 1 groups = Applications/System diff --git a/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm index 2f85b28be..f5ca1ff9c 100644 --- a/libtasn1/libtasn1.nm +++ b/libtasn1/libtasn1.nm @@ -4,7 +4,7 @@ ############################################################################### name = libtasn1 -version = 4.8 +version = 4.13 release = 1 groups = System/Libraries @@ -17,7 +17,7 @@ description be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org. end -source_dl = http://ftp.gnu.org/gnu/libtasn1/ +source_dl = https://ftp.gnu.org/gnu/libtasn1/ build requires diff --git a/libunistring/libunistring.nm b/libunistring/libunistring.nm index d238fbdc9..6ff472274 100644 --- a/libunistring/libunistring.nm +++ b/libunistring/libunistring.nm @@ -4,7 +4,7 @@ ############################################################################### name = libunistring -version = 0.9.6 +version = 0.9.10 release = 1 groups = System/Libraries @@ -20,7 +20,7 @@ description case folding and regular expressions). end -source_dl = ftp://ftp.gnu.org/gnu/libunistring/ +source_dl = https://ftp.gnu.org/gnu/libunistring/ build configure_options += \ diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index bebcd7a0c..a2df35ee2 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,7 +4,7 @@ ############################################################################### name = mpfr -version = 4.0.0 +version = 4.0.2 release = 1 groups = System/Libraries diff --git a/mtr/mtr.nm b/mtr/mtr.nm index 0af23d8f1..f9d292c85 100644 --- a/mtr/mtr.nm +++ b/mtr/mtr.nm @@ -4,7 +4,7 @@ ############################################################################### name = mtr -version = 0.85 +version = 0.92 release = 1 groups = Applications/Internet @@ -21,8 +21,11 @@ source_dl = ftp://ftp.bitwizard.nl/mtr/ build requires + autoconf + automake ncurses-devel glib2-devel + libcap-devel end configure_options += \ diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 1c0695f44..330689413 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,7 +4,7 @@ ############################################################################### name = nettle -version = 3.3 +version = 3.4.1 release = 1 groups = System/Libraries @@ -19,7 +19,7 @@ description or even in kernel space. end -source_dl = http://www.lysator.liu.se/~nisse/archive/ +source_dl = https://ftp.gnu.org/gnu/nettle/ build requires diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 6f54208e9..cc845faf2 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -5,7 +5,7 @@ name = pcre version = 8.41 -release = 1 +release = 2 groups = System/Libraries url = http://www.pcre.org/ @@ -31,7 +31,7 @@ build configure_options += \ --disable-static \ --docdir=/usr/share/doc/pcre-%{version} \ - --disable-jit \ + --enable-jit \ --enable-pcre8 \ --enable-pcre16 \ --enable-pcre32 \ diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 68fc555a2..c1326d056 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -4,7 +4,7 @@ ############################################################################### name = tcpdump -version = 4.7.4 +version = 4.9.2 release = 1 groups = Networking/Sniffer diff --git a/transifex-client/transifex-client.nm b/transifex-client/transifex-client.nm deleted file mode 100644 index b3f0e74a6..000000000 --- a/transifex-client/transifex-client.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = transifex-client -version = 0.7.3 -release = 2 -arch = noarch - -groups = Development/Tools -url = http://transifex.org -license = GPLv2 -summary = Command line tool for Transifex translation management. - -description - The Transifex Command-line Client is a command line tool that enables - you to easily manage your translations within a project without the - need of an elaborate UI system. -end - -source_dl = http://pypi.python.org/packages/source/t/transifex-client - -build - requires - python-devel - python-setuptools >= 0.6.28 - end - - build - python setup.py build - end - - install - python setup.py install -O1 --skip-build --root %{BUILDROOT} - end -end - -packages - package %{name} -end diff --git a/unbound/unbound.nm b/unbound/unbound.nm index f5c4e9c4e..ca4fddc0b 100644 --- a/unbound/unbound.nm +++ b/unbound/unbound.nm @@ -4,7 +4,7 @@ ############################################################################### name = unbound -version = 1.7.3 +version = 1.9.0 release = 1 groups = System/Daemons diff --git a/xz/xz.nm b/xz/xz.nm index 9a278042f..c815baed2 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -4,7 +4,7 @@ ############################################################################### name = xz -version = 5.2.3 +version = 5.2.4 release = 1 groups = Applications/Compression hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2caca412176a5de89fa4b359cf33766be552c447
by Arne Fitzenreiter 16 Feb '19

16 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2caca412176a5de89fa4b359cf33766be552c447 (commit) from ede92473100923d577f3bb4124e8a88da1d30a39 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2caca412176a5de89fa4b359cf33766be552c447 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 16 21:40:50 2019 +0100 kernel: enable PCA953X GPIO extender for ClearFog boards fixes: #12000 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-multi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 3c3ee68d2..9d6389196 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.97-ipfire-multi Kernel Configuration +# Linux/arm 4.14.101-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -3426,7 +3426,8 @@ CONFIG_GPIO_PL061=y CONFIG_GPIO_ADNP=m # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_PCA953X is not set +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_TPIC2810 is not set hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ede92473100923d577f3bb4124e8a88da1d30a39
by Arne Fitzenreiter 15 Feb '19

15 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ede92473100923d577f3bb4124e8a88da1d30a39 (commit) from 5368ccb0fc19d8f7678a292d95334e1855b875d3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ede92473100923d577f3bb4124e8a88da1d30a39 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 15 17:46:54 2019 +0100 kernel: update to 4.14.101 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index b41942803..36af790d1 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.98 -ARM_PATCHES = 4.14.98-ipfire0 +VER = 4.14.101 +ARM_PATCHES = 4.14.101-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 3df5c7536542b6cb3d6158c84f8fc70e -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = b2f6559b08f764c0d974e860660d416a +$(DL_FILE)_MD5 = fd0952d086222e6267588c12c8d6fab1 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 1cda52264dad96fcba65bd335fbbfa95 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5368ccb0fc19d8f7678a292d95334e1855b875d3
by Michael Tremer 13 Feb '19

13 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5368ccb0fc19d8f7678a292d95334e1855b875d3 (commit) via 2397e51335eb623b65e2ff1176e83d3d920c8ef7 (commit) via 59d673ae44c2319b1a0894d181f5114114de8276 (commit) via 17b3255b7f16a0b62a00d8c244b131047091f7ad (commit) via 17d9d4257139a78162051b71accaf9ff9764230f (commit) via 941a3dec4e69e5081d76682e635cdf47be51af1c (commit) via d5b7f82a40b69a57d6d849c2e6da583c6772fc9a (commit) from 39d43c5b99720c31e4423e3668ea77679954c184 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5368ccb0fc19d8f7678a292d95334e1855b875d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 13 11:32:00 2019 +0000 core128: Ship kdig Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2397e51335eb623b65e2ff1176e83d3d920c8ef7 Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sat Feb 9 08:41:15 2019 +0100 knot: Reduced version of knot with kdig only Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 59d673ae44c2319b1a0894d181f5114114de8276 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 13 11:31:24 2019 +0000 core128: Ship libedit Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 17b3255b7f16a0b62a00d8c244b131047091f7ad Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sat Feb 9 08:41:14 2019 +0100 libedit: A command line editor library Dependency for knot (kdig). Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 17d9d4257139a78162051b71accaf9ff9764230f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Feb 10 20:13:17 2019 +0100 powertop: Update to 2.10 Hi, Triggered by: https://forum.ipfire.org/viewtopic.php?f=69&t=22274 For details see: https://01.org/powertop/downloads/powertop-v2.10 Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 941a3dec4e69e5081d76682e635cdf47be51af1c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 9 10:59:08 2019 +0100 dhcpcd: Update to 7.1.1 For details see: https://roy.marples.name/blog/dhcpcd-7-1-1-released "A minor update, highlights include: IPv4LL: Fixed build with this disabled IPv4LL: Remember last address between carrier resets BSD: Fixed initial link infos reported as LINK_STATE_UNKNOWN FreeBSD: Avoid panicing kernel when RTA_IFP is set for IPv6 prefix routes" Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d5b7f82a40b69a57d6d849c2e6da583c6772fc9a Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 9 10:37:22 2019 +0100 curl: Update to 7.64.0 Hi, For details see: https://curl.haxx.se/changes.html This came rather unexpected - if I'd known, I'd have waited with 7.63.0. "Changes: cookies: leave secure cookies alone hostip: support wildcard hosts http: Implement trailing headers for chunked transfers http: added options for allowing HTTP/0.9 responses timeval: Use high resolution timestamps on Windows Bugfixes: CVE-2018-16890: NTLM type-2 out-of-bounds buffer read CVE-2019-3822: NTLMv2 type-3 header stack buffer overflow CVE-2019-3823: SMTP end-of-response out-of-bounds read FAQ: remove mention of sourceforge for github OS400: handle memory error in list conversion OS400: upgrade ILE/RPG binding. README: add codacy code quality badge Revert http_negotiate: do not close connection THANKS: added several missing names from year <= 2000 build: make 'tidy' target work for metalink builds cmake: added checks for variadic macros cmake: updated check for HAVE_POLL_FINE to match autotools cmake: use lowercase for function name like the rest of the code configure: detect xlclang separately from clang configure: fix recv/send/select detection on Android configure: rewrite --enable-code-coverage conncache_unlock: avoid indirection by changing input argument type cookie: fix comment typo cookies: allow secure override when done over HTTPS cookies: extend domain checks to non psl builds cookies: skip custom cookies when redirecting cross-site curl --xattr: strip credentials from any URL that is stored curl -J: refuse to append to the destination file curl/urlapi.h: include "curl.h" first curl_multi_remove_handle() don't block terminating c-ares requests darwinssl: accept setting max-tls with default min-tls disconnect: separate connections and easy handles better disconnect: set conn->data for protocol disconnect docs/version.d: mention MultiSSL docs: fix the --tls-max description docs: use $(INSTALL_DATA) to install man page docs: use meaningless port number in CURLOPT_LOCALPORT example gopher: always include the entire gopher-path in request http2: clear pause stream id if it gets closed if2ip: remove unused function Curl_if_is_interface_name libssh: do not let libssh create socket libssh: enable CURLOPT_SSH_KNOWNHOSTS and CURLOPT_SSH_KEYFUNCTION for libssh libssh: free sftp_canonicalize_path() data correctly libtest/stub_gssapi: use "real" snprintf mbedtls: use VERIFYHOST multi: multiplexing improvements multi: set the EXPIRE_*TIMEOUT timers at TIMER_STARTSINGLE time ntlm: fix NTMLv2 compliance ntlm_sspi: add support for channel binding openssl: adapt to 3.0.0, OpenSSL_version_num() is deprecated openssl: fix the SSL_get_tlsext_status_ocsp_resp call openvms: fix OpenSSL discovery on VAX openvms: fix typos in documentation os400: add a missing closing bracket os400: fix extra parameter syntax error pingpong: change default response timeout to 120 seconds pingpong: ignore regular timeout in disconnect phase printf: fix format specifiers runtests.pl: Fix perl call to include srcdir schannel: fix compiler warning schannel: preserve original certificate path parameter schannel: stop calling it "winssl" sigpipe: if mbedTLS is used, ignore SIGPIPE smb: fix incorrect path in request if connection reused ssh: log the libssh2 error message when ssh session startup fails test1558: verify CURLINFO_PROTOCOL on file:// transfer test1561: improve test name test1653: make it survive torture tests tests: allow tests to pass by 2037-02-12 tests: move objnames-* from lib into tests timediff: fix math for unsigned time_t timeval: Disable MSVC Analyzer GetTickCount warning tool_cb_prg: avoid integer overflow travis: added cmake build for osx urlapi: Fix port parsing of eol colon urlapi: distinguish possibly empty query urlapi: fix parsing ipv6 with zone index urldata: rename easy_conn to just conn winbuild: conditionally use /DZLIB_WINAPI wolfssl: fix memory-leak in threaded use spnego_sspi: add support for channel binding" Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/curl | 3 + config/rootfiles/common/knot | 93 +++++++++++++++++++++++++++++ config/rootfiles/common/libedit | 50 ++++++++++++++++ config/rootfiles/core/128/filelists/knot | 1 + config/rootfiles/core/128/filelists/libedit | 1 + lfs/curl | 4 +- lfs/dhcpcd | 4 +- lfs/{libtool => knot} | 27 +++++---- lfs/{fping => libedit} | 15 ++--- lfs/powertop | 6 +- make.sh | 2 + 11 files changed, 179 insertions(+), 27 deletions(-) create mode 100644 config/rootfiles/common/knot create mode 100644 config/rootfiles/common/libedit create mode 120000 config/rootfiles/core/128/filelists/knot create mode 120000 config/rootfiles/core/128/filelists/libedit copy lfs/{libtool => knot} (89%) copy lfs/{fping => libedit} (93%) Difference in files: diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 5c616f8da..1eb9f6f37 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -170,6 +170,7 @@ usr/lib/libcurl.so.4.5.0 #usr/share/man/man3/CURLOPT_HEADERDATA.3 #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3 #usr/share/man/man3/CURLOPT_HEADEROPT.3 +#usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3 #usr/share/man/man3/CURLOPT_HTTP200ALIASES.3 #usr/share/man/man3/CURLOPT_HTTPAUTH.3 #usr/share/man/man3/CURLOPT_HTTPGET.3 @@ -340,6 +341,8 @@ usr/lib/libcurl.so.4.5.0 #usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3 #usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3 #usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3 +#usr/share/man/man3/CURLOPT_TRAILERDATA.3 +#usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3 #usr/share/man/man3/CURLOPT_TRANSFERTEXT.3 #usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3 #usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3 diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot new file mode 100644 index 000000000..68d1e702e --- /dev/null +++ b/config/rootfiles/common/knot @@ -0,0 +1,93 @@ +usr/bin/kdig +#usr/bin/khost +#usr/bin/knsec3hash +#usr/bin/knsupdate +#usr/include/knot +#usr/include/knot/module.h +#usr/include/libdnssec +#usr/include/libdnssec/binary.h +#usr/include/libdnssec/crypto.h +#usr/include/libdnssec/dnssec.h +#usr/include/libdnssec/error.h +#usr/include/libdnssec/key.h +#usr/include/libdnssec/keyid.h +#usr/include/libdnssec/keystore.h +#usr/include/libdnssec/keytag.h +#usr/include/libdnssec/list.h +#usr/include/libdnssec/nsec.h +#usr/include/libdnssec/random.h +#usr/include/libdnssec/sign.h +#usr/include/libdnssec/tsig.h +#usr/include/libdnssec/version.h +#usr/include/libknot +#usr/include/libknot/attribute.h +#usr/include/libknot/codes.h +#usr/include/libknot/consts.h +#usr/include/libknot/control +#usr/include/libknot/control/control.h +#usr/include/libknot/cookies.h +#usr/include/libknot/db +#usr/include/libknot/db/db.h +#usr/include/libknot/db/db_lmdb.h +#usr/include/libknot/db/db_trie.h +#usr/include/libknot/descriptor.h +#usr/include/libknot/dname.h +#usr/include/libknot/endian.h +#usr/include/libknot/errcode.h +#usr/include/libknot/error.h +#usr/include/libknot/libknot.h +#usr/include/libknot/lookup.h +#usr/include/libknot/mm_ctx.h +#usr/include/libknot/packet +#usr/include/libknot/packet/compr.h +#usr/include/libknot/packet/pkt.h +#usr/include/libknot/packet/rrset-wire.h +#usr/include/libknot/packet/wire.h +#usr/include/libknot/rdata.h +#usr/include/libknot/rdataset.h +#usr/include/libknot/rrset-dump.h +#usr/include/libknot/rrset.h +#usr/include/libknot/rrtype +#usr/include/libknot/rrtype/dnskey.h +#usr/include/libknot/rrtype/ds.h +#usr/include/libknot/rrtype/naptr.h +#usr/include/libknot/rrtype/nsec.h +#usr/include/libknot/rrtype/nsec3.h +#usr/include/libknot/rrtype/nsec3param.h +#usr/include/libknot/rrtype/opt.h +#usr/include/libknot/rrtype/rdname.h +#usr/include/libknot/rrtype/rrsig.h +#usr/include/libknot/rrtype/soa.h +#usr/include/libknot/rrtype/tsig.h +#usr/include/libknot/tsig-op.h +#usr/include/libknot/tsig.h +#usr/include/libknot/version.h +#usr/include/libknot/wire.h +#usr/include/libknot/yparser +#usr/include/libknot/yparser/yparser.h +#usr/include/libknot/yparser/ypformat.h +#usr/include/libknot/yparser/ypschema.h +#usr/include/libknot/yparser/yptrafo.h +#usr/include/libzscanner +#usr/include/libzscanner/error.h +#usr/include/libzscanner/scanner.h +#usr/include/libzscanner/version.h +#usr/lib/libdnssec.la +#usr/lib/libdnssec.so +usr/lib/libdnssec.so.6 +usr/lib/libdnssec.so.6.0.0 +#usr/lib/libknot.la +#usr/lib/libknot.so +usr/lib/libknot.so.8 +usr/lib/libknot.so.8.0.0 +#usr/lib/libzscanner.la +#usr/lib/libzscanner.so +usr/lib/libzscanner.so.2 +usr/lib/libzscanner.so.2.0.0 +#usr/lib/pkgconfig/libdnssec.pc +#usr/lib/pkgconfig/libknot.pc +#usr/lib/pkgconfig/libzscanner.pc +#usr/share/man/man1/kdig.1 +#usr/share/man/man1/khost.1 +#usr/share/man/man1/knsec3hash.1 +#usr/share/man/man1/knsupdate.1 diff --git a/config/rootfiles/common/libedit b/config/rootfiles/common/libedit new file mode 100644 index 000000000..65b3b86a9 --- /dev/null +++ b/config/rootfiles/common/libedit @@ -0,0 +1,50 @@ +#usr/include/editline +#usr/include/editline/readline.h +#usr/include/histedit.h +#usr/lib/libedit.la +#usr/lib/libedit.so +usr/lib/libedit.so.0 +usr/lib/libedit.so.0.0.59 +#usr/lib/pkgconfig/libedit.pc +#usr/share/man/man3/editline.3 +#usr/share/man/man3/el_deletestr.3 +#usr/share/man/man3/el_end.3 +#usr/share/man/man3/el_get.3 +#usr/share/man/man3/el_getc.3 +#usr/share/man/man3/el_gets.3 +#usr/share/man/man3/el_init.3 +#usr/share/man/man3/el_init_fd.3 +#usr/share/man/man3/el_insertstr.3 +#usr/share/man/man3/el_line.3 +#usr/share/man/man3/el_parse.3 +#usr/share/man/man3/el_push.3 +#usr/share/man/man3/el_reset.3 +#usr/share/man/man3/el_resize.3 +#usr/share/man/man3/el_set.3 +#usr/share/man/man3/el_source.3 +#usr/share/man/man3/el_wdeletestr.3 +#usr/share/man/man3/el_wget.3 +#usr/share/man/man3/el_wgetc.3 +#usr/share/man/man3/el_wgets.3 +#usr/share/man/man3/el_winsertstr.3 +#usr/share/man/man3/el_wline.3 +#usr/share/man/man3/el_wparse.3 +#usr/share/man/man3/el_wpush.3 +#usr/share/man/man3/el_wset.3 +#usr/share/man/man3/history_end.3 +#usr/share/man/man3/history_init.3 +#usr/share/man/man3/history_w.3 +#usr/share/man/man3/history_wend.3 +#usr/share/man/man3/history_winit.3 +#usr/share/man/man3/tok_end.3 +#usr/share/man/man3/tok_init.3 +#usr/share/man/man3/tok_line.3 +#usr/share/man/man3/tok_reset.3 +#usr/share/man/man3/tok_str.3 +#usr/share/man/man3/tok_wend.3 +#usr/share/man/man3/tok_winit.3 +#usr/share/man/man3/tok_wline.3 +#usr/share/man/man3/tok_wreset.3 +#usr/share/man/man3/tok_wstr.3 +#usr/share/man/man5/editrc.5 +#usr/share/man/man7/editline.7 diff --git a/config/rootfiles/core/128/filelists/knot b/config/rootfiles/core/128/filelists/knot new file mode 120000 index 000000000..28e96f878 --- /dev/null +++ b/config/rootfiles/core/128/filelists/knot @@ -0,0 +1 @@ +../../../common/knot \ No newline at end of file diff --git a/config/rootfiles/core/128/filelists/libedit b/config/rootfiles/core/128/filelists/libedit new file mode 120000 index 000000000..03fc483da --- /dev/null +++ b/config/rootfiles/core/128/filelists/libedit @@ -0,0 +1 @@ +../../../common/libedit \ No newline at end of file diff --git a/lfs/curl b/lfs/curl index f00677b5e..e57bbbf45 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@ include Config -VER = 7.63.0 +VER = 7.64.0 THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6121427a7199cd6094fc48c9e31e8992 +$(DL_FILE)_MD5 = a026740d599a32bcbbe6e70679397899 install : $(TARGET) diff --git a/lfs/dhcpcd b/lfs/dhcpcd index cd940ae8b..d7372ea82 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 7.1.0 +VER = 7.1.1 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 918520b171f32f0da97316f3bcf3edc1 +$(DL_FILE)_MD5 = adc0a949cb718b455d81deea9ba2875f install : $(TARGET) diff --git a/lfs/knot b/lfs/knot new file mode 100644 index 000000000..729db9147 --- /dev/null +++ b/lfs/knot @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.7.6 + +THISAPP = knot-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 6afbbaff4e9d93de8d6311958d86b323 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no \ + --disable-daemon \ + --disable-modules \ + --enable-maxminddb=no \ + --disable-documentation + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/libedit b/lfs/libedit new file mode 100644 index 000000000..f3a831b14 --- /dev/null +++ b/lfs/libedit @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 20181209-3.1 + +THISAPP = libedit-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 22e945a0476e388e6f78bfc8d6e1192c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/powertop b/lfs/powertop index de92af56a..f8a12abca 100644 --- a/lfs/powertop +++ b/lfs/powertop @@ -24,7 +24,7 @@ include Config -VER = v2.9 +VER = v2.10 THISAPP = powertop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = powertop -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 583518c5c4434c6e9b9c58c3920950b6 +$(DL_FILE)_MD5 = a69bd55901cf919cc564187402ea2c9c install : $(TARGET) diff --git a/make.sh b/make.sh index f96b74b10..3c08997fb 100755 --- a/make.sh +++ b/make.sh @@ -1588,6 +1588,8 @@ buildipfire() { lfsmake2 dehydrated lfsmake2 shairport-sync lfsmake2 borgbackup + lfsmake2 libedit + lfsmake2 knot } buildinstaller() { hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2019