IPFire-SCM March 2016

ipfire-scm@lists.ipfire.org

1 participants
61 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core100, updated. ae04f2400a66b8a5f7fdeb4fb940898c1572220f
by git＠ipfire.org 27 Mar '16

27 Mar '16

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, core100 has been updated via ae04f2400a66b8a5f7fdeb4fb940898c1572220f (commit) from ed974e08c54b293afb71405dc71e2cc56779fc9b (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 ae04f2400a66b8a5f7fdeb4fb940898c1572220f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 27 11:04:49 2016 +0200 memtest: use always precompiled version gcc-4.9.3 build a corrupted version Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/memtest | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) Difference in files: diff --git a/lfs/memtest b/lfs/memtest index cef29d6..c92fab6 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 # @@ -73,17 +73,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -mkdir -p /usr/lib/memtest86+ -ifeq "$(MACHINE)" "i586" - # Enable SMP as default - cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h - cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile - cd $(DIR_APP) && make $(EXTRA_MAKE) - cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ -else +# gcc-4.9.3 produce a corrupted version of memtest +# we use the precomp version at the moment + +#ifeq "$(MACHINE)" "i586" +# # Enable SMP as default +# cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h +# cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile +# cd $(DIR_APP) && make $(EXTRA_MAKE) +# cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ +#else # 64bit only systems cannot link mentest without 32bit gcc libs # so we use the precompiled binary from memtest author cd $(DIR_APP) && cp -f precomp.bin /usr/lib/memtest86+/memtest.bin -endif +#endif @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core100, updated. ed974e08c54b293afb71405dc71e2cc56779fc9b
by git＠ipfire.org 26 Mar '16

26 Mar '16

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, core100 has been updated via ed974e08c54b293afb71405dc71e2cc56779fc9b (commit) via 36b2adc9ed86e21c9d9c1d9245c02e8f1c58956a (commit) via 545c15b0a1d7cbbe44d1cfec9fb435e73cf26709 (commit) via 9a7a6c52ed256506a4f000364f75b82cc5d899ae (commit) from 7940649e17a7499fbddb5552793294ee394c7541 (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 ed974e08c54b293afb71405dc71e2cc56779fc9b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 26 15:35:31 2016 +0100 hostapd: fix crash at txpower set on ath10k ath10k generate a fault if iwconfig try to set txpower while the device is down. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 36b2adc9ed86e21c9d9c1d9245c02e8f1c58956a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 26 15:24:40 2016 +0100 backports: ath10k fix logspam if channel was not set. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 545c15b0a1d7cbbe44d1cfec9fb435e73cf26709 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 26 10:15:45 2016 +0100 kernel: add PC Engines(TM) APU2 LED driver commit 9a7a6c52ed256506a4f000364f75b82cc5d899ae Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 26 10:08:18 2016 +0100 kernel: k10temp: add family 16h model 30h pci id. used by AMD GX-412TC in PC Engines(TM) APU 2 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 1 + config/kernel/kernel.config.i586-ipfire-pae | 1 + config/kernel/kernel.config.x86_64-ipfire | 1 + lfs/backports | 1 + lfs/hostapd | 4 +- lfs/linux | 5 +- src/initscripts/init.d/hostapd | 4 +- .../backports-4.2.6-1_ath10k_remove_logspam.patch | 12 + src/patches/linux-3.14-apu_leds.patch | 245 ++++++++++++++++++--- .../linux-3.14.65-k10temp_add_16H_M30H_id.patch | 12 + 10 files changed, 255 insertions(+), 31 deletions(-) create mode 100644 src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch create mode 100644 src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index b0d78e1..11230e3 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -682,6 +682,7 @@ CONFIG_ALIX=y CONFIG_NET5501=y CONFIG_GEOS=y CONFIG_APULED=y +CONFIG_APU2LED=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 6272579..f596a44 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -696,6 +696,7 @@ CONFIG_EISA_NAMES=y # CONFIG_NET5501 is not set # CONFIG_GEOS is not set CONFIG_APULED=y +CONFIG_APU2LED=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index b5e1575..d3bdcf0 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -633,6 +633,7 @@ CONFIG_PCI_LABEL=y # CONFIG_ISA_DMA_API=y CONFIG_APULED=y +CONFIG_APU2LED=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m diff --git a/lfs/backports b/lfs/backports index 39fa9b2..12bd83f 100644 --- a/lfs/backports +++ b/lfs/backports @@ -101,6 +101,7 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch # smsc mac address patch for pandaboard and raspberry pi ifeq "$(KCFG)" "-multi" diff --git a/lfs/hostapd b/lfs/hostapd index e928668..f393d91 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 34 +PAK_VER = 35 DEPS = "" diff --git a/lfs/linux b/lfs/linux index 125228a..f7782ff 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 65 +PAK_VER = 66 DEPS = "" KERNEL_ARCH = $(MACHINE) @@ -160,6 +160,9 @@ endif # Add PC Engines APU led support cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch + # Add APU2 SoC ID to k10temp + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch + # Fix uevent PHYSDEVDRIVER cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd index 209f969..02e8c16 100644 --- a/src/initscripts/init.d/hostapd +++ b/src/initscripts/init.d/hostapd @@ -73,7 +73,9 @@ case "${1}" in /usr/sbin/iw reg set $COUNTRY /usr/sbin/iwconfig $INTERFACE channel $CHANNEL 2>/dev/null - /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER + + ip link set ${INTERFACE} up 2>/dev/null + /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER 2>/dev/null /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 & diff --git a/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch b/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch new file mode 100644 index 0000000..bdb1534 --- /dev/null +++ b/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch @@ -0,0 +1,12 @@ +diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htt_rx.c backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htt_rx.c +--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htt_rx.c 2015-11-15 22:19:40.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htt_rx.c 2016-03-26 10:48:17.189430101 +0100 +@@ -1476,7 +1476,7 @@ + */ + + if (!rx_status->freq) { +- ath10k_warn(ar, "no channel configured; ignoring frame(s)!\n"); ++ ath10k_dbg(ar,ATH10K_DBG_DATA ,"no channel configured; ignoring frame(s)!\n"); + return false; + } + diff --git a/src/patches/linux-3.14-apu_leds.patch b/src/patches/linux-3.14-apu_leds.patch index 13d7c76..e887adc 100644 --- a/src/patches/linux-3.14-apu_leds.patch +++ b/src/patches/linux-3.14-apu_leds.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig ---- linux-3.14.43.org/arch/x86/Kconfig 2015-05-17 18:54:01.000000000 +0200 -+++ linux-3.14.43/arch/x86/Kconfig 2015-09-19 20:14:52.436654988 +0200 +diff -Naur linux-3.14.65.org/arch/x86/Kconfig linux-3.14.65/arch/x86/Kconfig +--- linux-3.14.65.org/arch/x86/Kconfig 2016-03-16 16:42:30.000000000 +0100 ++++ linux-3.14.65/arch/x86/Kconfig 2016-03-25 14:36:22.953256019 +0100 @@ -2287,6 +2287,7 @@ - AC adapter status updates - Battery status updates @@ -9,7 +9,7 @@ diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig config ALIX bool "PCEngines ALIX System Support (LED setup)" select GPIOLIB -@@ -2325,6 +2326,12 @@ +@@ -2325,6 +2326,18 @@ endif # X86_32 @@ -17,14 +17,204 @@ diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig + bool "PCEngines APU Led Support" + depends on DMI + ---help--- -+ This option enables system support for the PCEngines APU. ++ This option enables system support for the PCEngines APU1. ++ ++config APU2LED ++ bool "PCEngines APU2 Led Support" ++ depends on DMI ++ ---help--- ++ This option enables system support for the PCEngines APU2. + config AMD_NB def_bool y depends on CPU_SUP_AMD && PCI -diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/x86/platform/apu/apu-led.c ---- linux-3.14.43.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.43/arch/x86/platform/apu/apu-led.c 2015-09-19 20:12:20.520647636 +0200 +diff -Naur linux-3.14.65.org/arch/x86/platform/apu/apu2-led.c linux-3.14.65/arch/x86/platform/apu/apu2-led.c +--- linux-3.14.65.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.14.65/arch/x86/platform/apu/apu2-led.c 2016-03-25 15:04:34.476689422 +0100 +@@ -0,0 +1,180 @@ ++/* ++ * LEDs driver for PCEngines apu2 ++ * ++ * this basic driver only set the output, configuration ++ * has already done by bios/coreboot. ++ * suspend/resume was not tested because IPFire not use it. ++ * ++ * Copyright (C) 2016 Arne Fitzenreiter <arne_f(a)ipfire.org> , ++ * based on Christian Herzog's apu_led. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/leds.h> ++#include <linux/err.h> ++#include <asm/io.h> ++#include <linux/dmi.h> ++ ++#define DRVNAME "apu2-led" ++#define BASEADDR (0xFED81610) ++ ++static struct platform_device *pdev; ++unsigned int *apu2_led_p1; ++unsigned int *apu2_led_p2; ++unsigned int *apu2_led_p3; ++ ++static void apu2_led_set_1(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite32((ioread32(apu2_led_p1)&~BIT(22)), apu2_led_p1); ++ else ++ iowrite32((ioread32(apu2_led_p1)|BIT(22)), apu2_led_p1); ++} ++ ++static void apu2_led_set_2(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite32((ioread32(apu2_led_p2)&~BIT(22)), apu2_led_p2); ++ else ++ iowrite32((ioread32(apu2_led_p2)|BIT(22)), apu2_led_p2); ++} ++ ++static void apu2_led_set_3(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite32((ioread32(apu2_led_p3)&~BIT(22)), apu2_led_p3); ++ else ++ iowrite32((ioread32(apu2_led_p3)|BIT(22)), apu2_led_p3); ++} ++ ++static struct led_classdev apu2_led_1 = { ++ .name = "apu:1", ++ .brightness_set = apu2_led_set_1, ++}; ++ ++static struct led_classdev apu2_led_2 = { ++ .name = "apu:2", ++ .brightness_set = apu2_led_set_2, ++}; ++ ++static struct led_classdev apu2_led_3 = { ++ .name = "apu:3", ++ .brightness_set = apu2_led_set_3, ++}; ++ ++ ++#ifdef CONFIG_PM ++static int apu2_led_suspend(struct platform_device *dev, ++ pm_message_t state) ++{ ++ led_classdev_suspend(&apu2_led_1); ++ led_classdev_suspend(&apu2_led_2); ++ led_classdev_suspend(&apu2_led_3); ++ return 0; ++} ++ ++static int apu2_led_resume(struct platform_device *dev) ++{ ++ led_classdev_resume(&apu2_led_1); ++ led_classdev_resume(&apu2_led_2); ++ led_classdev_resume(&apu2_led_3); ++ return 0; ++} ++#else ++#define apu2_led_suspend NULL ++#define apu2_led_resume NULL ++#endif ++ ++static int apu2_led_probe(struct platform_device *pdev) ++{ ++ int ret; ++ ++ ret = led_classdev_register(&pdev->dev, &apu2_led_1); ++ if (ret == 0) ++ { ++ ret = led_classdev_register(&pdev->dev, &apu2_led_2); ++ if (ret >= 0) ++ { ++ ret = led_classdev_register(&pdev->dev, &apu2_led_3); ++ if (ret < 0) ++ led_classdev_unregister(&apu2_led_2); ++ } ++ if (ret < 0) ++ led_classdev_unregister(&apu2_led_1); ++ } ++ return ret; ++} ++ ++static int apu2_led_remove(struct platform_device *pdev) ++{ ++ led_classdev_unregister(&apu2_led_1); ++ led_classdev_unregister(&apu2_led_2); ++ led_classdev_unregister(&apu2_led_3); ++ return 0; ++} ++ ++static struct platform_driver apu2_led_driver = { ++ .probe = apu2_led_probe, ++ .remove = apu2_led_remove, ++ .suspend = apu2_led_suspend, ++ .resume = apu2_led_resume, ++ .driver = { ++ .name = DRVNAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init apu2_led_init(void) ++{ ++ int ret=0; ++ const char *vendor, *product; ++ ++ vendor = dmi_get_system_info(DMI_SYS_VENDOR); ++ if (!vendor || strcmp(vendor, "PC Engines")) ++ goto out; ++ ++ product = dmi_get_system_info(DMI_PRODUCT_NAME); ++ if (!product || strcmp(product, "apu2")) ++ goto out; ++ ++ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", ++ KBUILD_MODNAME, vendor, product); ++ ++ ret = platform_driver_register(&apu2_led_driver); ++ if (ret < 0) ++ goto out; ++ ++ pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0); ++ if (IS_ERR(pdev)) { ++ ret = PTR_ERR(pdev); ++ platform_driver_unregister(&apu2_led_driver); ++ goto out; ++ } ++ ++ apu2_led_p1 = ioremap(BASEADDR, 4); ++ apu2_led_p2 = ioremap(BASEADDR+4, 4); ++ apu2_led_p3 = ioremap(BASEADDR+8, 4); ++ ++out: ++ return ret; ++} ++ ++static void __exit apu2_led_exit(void) ++{ ++ platform_device_unregister(pdev); ++ platform_driver_unregister(&apu2_led_driver); ++} ++ ++module_init(apu2_led_init); ++module_exit(apu2_led_exit); ++ ++MODULE_AUTHOR("Arne Fitzenreiter"); ++MODULE_DESCRIPTION("PCEngines apu2 LED driver"); ++MODULE_LICENSE("GPL"); +diff -Naur linux-3.14.65.org/arch/x86/platform/apu/apu-led.c linux-3.14.65/arch/x86/platform/apu/apu-led.c +--- linux-3.14.65.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.14.65/arch/x86/platform/apu/apu-led.c 2016-03-25 15:05:35.776693425 +0100 @@ -0,0 +1,181 @@ +/* + * LEDs driver for PCEngines apu @@ -55,32 +245,32 @@ diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/ +#define LEDOFF (0xC8) + +static struct platform_device *pdev; -+unsigned int *p1; -+unsigned int *p2; -+unsigned int *p3; ++unsigned int *apu_led_p1; ++unsigned int *apu_led_p2; ++unsigned int *apu_led_p3; + +static void apu_led_set_1(struct led_classdev *led_cdev, + enum led_brightness value) { + if (value) -+ iowrite8(LEDON, p1); ++ iowrite8(LEDON, apu_led_p1); + else -+ iowrite8(LEDOFF, p1); ++ iowrite8(LEDOFF, apu_led_p1); +} + +static void apu_led_set_2(struct led_classdev *led_cdev, + enum led_brightness value) { + if (value) -+ iowrite8(LEDON, p2); ++ iowrite8(LEDON, apu_led_p2); + else -+ iowrite8(LEDOFF, p2); ++ iowrite8(LEDOFF, apu_led_p2); +} + +static void apu_led_set_3(struct led_classdev *led_cdev, + enum led_brightness value) { + if (value) -+ iowrite8(LEDON, p3); ++ iowrite8(LEDON, apu_led_p3); + else -+ iowrite8(LEDOFF, p3); ++ iowrite8(LEDOFF, apu_led_p3); +} + +static struct led_classdev apu_led_1 = { @@ -187,9 +377,9 @@ diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/ + goto out; + } + -+ p1 = ioremap(BASEADDR, 1); -+ p2 = ioremap(BASEADDR+1, 1); -+ p3 = ioremap(BASEADDR+2, 1); ++ apu_led_p1 = ioremap(BASEADDR, 1); ++ apu_led_p2 = ioremap(BASEADDR+1, 1); ++ apu_led_p3 = ioremap(BASEADDR+2, 1); + +out: + return ret; @@ -207,14 +397,15 @@ diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/ +MODULE_AUTHOR("Christian Herzog"); +MODULE_DESCRIPTION("PCEngines apu LED driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.14.43.org/arch/x86/platform/apu/Makefile linux-3.14.43/arch/x86/platform/apu/Makefile ---- linux-3.14.43.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.43/arch/x86/platform/apu/Makefile 2015-09-19 20:12:20.520647636 +0200 -@@ -0,0 +1 @@ +diff -Naur linux-3.14.65.org/arch/x86/platform/apu/Makefile linux-3.14.65/arch/x86/platform/apu/Makefile +--- linux-3.14.65.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.14.65/arch/x86/platform/apu/Makefile 2016-03-25 14:35:30.506585952 +0100 +@@ -0,0 +1,2 @@ +obj-$(CONFIG_APULED) += apu-led.o -diff -Naur linux-3.14.43.org/arch/x86/platform/Makefile linux-3.14.43/arch/x86/platform/Makefile ---- linux-3.14.43.org/arch/x86/platform/Makefile 2015-05-17 18:54:01.000000000 +0200 -+++ linux-3.14.43/arch/x86/platform/Makefile 2015-09-19 20:12:20.520647636 +0200 ++obj-$(CONFIG_APU2LED) += apu2-led.o +diff -Naur linux-3.14.65.org/arch/x86/platform/Makefile linux-3.14.65/arch/x86/platform/Makefile +--- linux-3.14.65.org/arch/x86/platform/Makefile 2016-03-16 16:42:30.000000000 +0100 ++++ linux-3.14.65/arch/x86/platform/Makefile 2016-03-25 14:31:04.079903947 +0100 @@ -1,4 +1,5 @@ # Platform specific code goes here +obj-y += apu/ diff --git a/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch b/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch new file mode 100644 index 0000000..878f44e --- /dev/null +++ b/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.14.65.org/drivers/hwmon/k10temp.c linux-3.14.65/drivers/hwmon/k10temp.c +--- linux-3.14.65.org/drivers/hwmon/k10temp.c 2016-03-16 16:42:30.000000000 +0100 ++++ linux-3.14.65/drivers/hwmon/k10temp.c 2016-03-25 15:52:21.920190727 +0100 +@@ -212,6 +212,8 @@ + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, ++// { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, ++ { PCI_VDEVICE(AMD, 0x1583) }, + {} + }; + MODULE_DEVICE_TABLE(pci, k10temp_id_table); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a27324ba2fad5539093ff44199b2cf651b7bf1e7
by git＠ipfire.org 26 Mar '16

26 Mar '16

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. cad653aee39b9bd295fde607a99f732a29289dde
by git＠ipfire.org 24 Mar '16

24 Mar '16

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 cad653aee39b9bd295fde607a99f732a29289dde (commit) from 5354877414fd0703556d481b299ef9635dd5d99b (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 cad653aee39b9bd295fde607a99f732a29289dde Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 24 19:57:50 2016 +0000 strongswan: Update to 5.4.0 Introduces a new configuration interface (VICI) and fixes several other bugs. Fixes #11080 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: strongswan/patches/strongswan-swanctl-1193106.patch | 10 ---------- strongswan/strongswan.nm | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 strongswan/patches/strongswan-swanctl-1193106.patch Difference in files: diff --git a/strongswan/patches/strongswan-swanctl-1193106.patch b/strongswan/patches/strongswan-swanctl-1193106.patch deleted file mode 100644 index cecef1f..0000000 --- a/strongswan/patches/strongswan-swanctl-1193106.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -urNp strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in ---- strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in 2014-09-26 09:04:24.000000000 -0400 -+++ strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in 2015-02-20 09:42:17.822480297 -0500 -@@ -7,3 +7,6 @@ Type=notify - ExecStart=@SBINDIR@/charon-systemd - ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt - ExecReload=@SBINDIR@/swanctl --reload -+ -+[Install] -+WantedBy=multi-user.target diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index b8488e4..54b4f7d 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,8 +4,8 @@ ############################################################################### name = strongswan -version = 5.3.3 -release = 3 +version = 5.4.0 +release = 1 groups = Networking/VPN url = http://www.strongswan.org/ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2347f49bb32f81437bf01053afb7aeb96518c7b
by git＠ipfire.org 24 Mar '16

24 Mar '16

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 e2347f49bb32f81437bf01053afb7aeb96518c7b (commit) from 84fce430a3d5ee7dc7693f995143437d20f52742 (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 e2347f49bb32f81437bf01053afb7aeb96518c7b Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Thu Mar 24 15:59:11 2016 +0100 git: update to 2.7.4 Remote Code Execution in all git versions: CVE-2016-2324 and CVE-2016-2315 Git version 2.7.4 was released with the fixes for all known vulnerabilities https://github.com/git/git/tree/master/Documentation/RelNotes Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/git | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/git b/lfs/git index 032907b..564bc09 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@ include Config -VER = 2.7.1 +VER = 2.7.4 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 12 +PAK_VER = 13 DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eece7b1e87983271621a0cb6aab37a25 +$(DL_FILE)_MD5 = b0219fcb6d73104361f4fbdba3741d00 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5354877414fd0703556d481b299ef9635dd5d99b
by git＠ipfire.org 24 Mar '16

24 Mar '16

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 5354877414fd0703556d481b299ef9635dd5d99b (commit) from b4a362e851b1eb4adc7cd36ac365256edcfef426 (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 5354877414fd0703556d481b299ef9635dd5d99b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 24 19:31:59 2016 +0000 Revert "ghostscript: Update to 9.18" This reverts commit 127490ed041d0e9b4e9de4b4a9a0941edf8e2dd0. ----------------------------------------------------------------------- Summary of changes: ghostscript/ghostscript.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm index 649bedb..9bda982 100644 --- a/ghostscript/ghostscript.nm +++ b/ghostscript/ghostscript.nm @@ -4,7 +4,7 @@ ############################################################################### name = ghostscript -version = 9.18 +version = 9.14 release = 1 groups = Applications/Printing hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b4a362e851b1eb4adc7cd36ac365256edcfef426
by git＠ipfire.org 24 Mar '16

24 Mar '16

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 b4a362e851b1eb4adc7cd36ac365256edcfef426 (commit) via 9f3127eee2245e5142ec0ea1929fe78b719768de (commit) via 1b4addc9f788c200f0e07b8b7abcf6af650be0e0 (commit) via be5e2724ecb6d3c373ee14a66bea45021b396f4e (commit) via b1334efa100362a22ce98ccc0ba6006ff82c258e (commit) via ca2fd787f1abbda38120e6f803bfdfc34179d6fa (commit) via ec36d5bb1ebb217c7181b28fdef73715e06879cb (commit) via 0ba0165983cffe0e1eb0936bd7008772dddeb281 (commit) via 7ae3bd0562ac13bc46dd5d6ccecb7fde95d4d21a (commit) via b3d470d3b64c5c568fca3392c8b672cdd735238d (commit) via 27b94ebbca87185c72f1ee18ad718b5c205265aa (commit) via 55348d2a985e4753a2211711cf7cba017b6b91e0 (commit) via 7be85cfbd8604e35832308b0af88c583b90c0620 (commit) via 438446b56a64ddff44bfa35056356e6c1f062376 (commit) via cc54a3175db31cedf36cc61ee39009ea79e2c0ae (commit) via aaf503b989872ef8e24d001983801d450ad7cc7d (commit) via 3297e610d5dac205843d5946f694603e728aec8a (commit) via 9237f504dc236d288e3cb1a7004e15c345d42c54 (commit) via ca76f051e14723d202fc94ed7974bd6fdbd98721 (commit) via 30ef5b7298225907ce4e14026a7f6b1bfc73aed5 (commit) via 127490ed041d0e9b4e9de4b4a9a0941edf8e2dd0 (commit) from e49c3c69d2dc745f1a9a41d4dbdbcc1cd7803b45 (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 b4a362e851b1eb4adc7cd36ac365256edcfef426 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 23 15:46:15 2016 +0100 lvm2: Update to 2.02.147 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9f3127eee2245e5142ec0ea1929fe78b719768de Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 09:52:37 2016 +0100 glib2: Update to 2.48.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1b4addc9f788c200f0e07b8b7abcf6af650be0e0 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 09:53:42 2016 +0100 gmp: Update to 6.1.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit be5e2724ecb6d3c373ee14a66bea45021b396f4e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 10:01:19 2016 +0100 gnome-themes-standard: Update to 3.20 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b1334efa100362a22ce98ccc0ba6006ff82c258e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 10:09:14 2016 +0100 gnupg2: Update to 2.1.9 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ca2fd787f1abbda38120e6f803bfdfc34179d6fa Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 10:15:36 2016 +0100 gpgme: Update to 1.6.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ec36d5bb1ebb217c7181b28fdef73715e06879cb Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 10:18:52 2016 +0100 gsettings-desktop-schemas: Update to 3.20.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0ba0165983cffe0e1eb0936bd7008772dddeb281 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 11:08:32 2016 +0100 gssdp: Update to 0.14.14 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7ae3bd0562ac13bc46dd5d6ccecb7fde95d4d21a Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 11:14:06 2016 +0100 vala: Update to 0.32.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b3d470d3b64c5c568fca3392c8b672cdd735238d Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 12:03:26 2016 +0100 harfbuzz: Update to 1.2.4 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 27b94ebbca87185c72f1ee18ad718b5c205265aa Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 12:04:19 2016 +0100 hdparm: Update to 9.48 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 55348d2a985e4753a2211711cf7cba017b6b91e0 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 12:05:18 2016 +0100 help2man: Update to 1.47.3 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7be85cfbd8604e35832308b0af88c583b90c0620 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 12:06:07 2016 +0100 hostapd: Update to 2.5 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 438446b56a64ddff44bfa35056356e6c1f062376 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:02:07 2016 +0100 gupnp: Update to 0.20.16 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc54a3175db31cedf36cc61ee39009ea79e2c0ae Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:02:06 2016 +0100 libsoup: Update to 2.54.0.1 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aaf503b989872ef8e24d001983801d450ad7cc7d Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:00:17 2016 +0100 gtk3: Update to version 3.20.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3297e610d5dac205843d5946f694603e728aec8a Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:00:16 2016 +0100 libepoxy: New package Required by gtk3 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9237f504dc236d288e3cb1a7004e15c345d42c54 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:00:15 2016 +0100 mesa: Enable building libEGL Required by libepoxy for gtk3 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ca76f051e14723d202fc94ed7974bd6fdbd98721 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:03:32 2016 +0100 hwdata: Update to 0.287 General update of the hardware databases. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 30ef5b7298225907ce4e14026a7f6b1bfc73aed5 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 24 16:15:01 2016 +0100 c_icap: Create devel package Also updated dependency packages Fixes: #11074 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 127490ed041d0e9b4e9de4b4a9a0941edf8e2dd0 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 23 11:02:21 2016 +0100 ghostscript: Update to 9.18 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: c_icap/c_icap.nm | 6 ++- c_icap_modules/c_icap_modules.nm | 4 +- ghostscript/ghostscript.nm | 2 +- glib2/glib2.nm | 4 +- gmp/gmp.nm | 2 +- gnome-themes-standard/gnome-themes-standard.nm | 5 +-- gnupg2/gnupg2.nm | 2 +- gpgme/gpgme.nm | 4 +- .../gsettings-desktop-schemas.nm | 4 +- gssdp/gssdp.nm | 8 +++- gtk3/gtk3.nm | 12 ++++-- gupnp/gupnp.nm | 11 ++++-- harfbuzz/harfbuzz.nm | 2 +- hdparm/hdparm.nm | 2 +- help2man/help2man.nm | 2 +- hostapd/hostapd.nm | 2 +- hwdata/hwdata.nm | 10 ++--- libepoxy/libepoxy.nm | 44 ++++++++++++++++++++++ libsoup/libsoup.nm | 5 ++- lvm2/lvm2.nm | 4 +- mesa/mesa.nm | 16 +++++++- vala/vala.nm | 9 +++-- 22 files changed, 116 insertions(+), 44 deletions(-) create mode 100644 libepoxy/libepoxy.nm Difference in files: diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm index e031b43..37c9db4 100644 --- a/c_icap/c_icap.nm +++ b/c_icap/c_icap.nm @@ -5,7 +5,7 @@ name = c_icap version = 0.4.2 -release = 1 +release = 2 groups = Networking/Daemons url = http://c-icap.sourceforge.net @@ -58,6 +58,10 @@ packages end end + package %{name}-devel + template DEVEL + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm index 8e1123f..acde841 100644 --- a/c_icap_modules/c_icap_modules.nm +++ b/c_icap_modules/c_icap_modules.nm @@ -5,7 +5,7 @@ name = c_icap_modules version = 0.4.2 -release = 1 +release = 2 groups = Networking/Daemons url = http://c-icap.sourceforge.net @@ -24,7 +24,7 @@ build requires autoconf automake - c_icap >= 0.4.0 + c_icap-devel >= 0.4.0 clamav-devel libdb-devel libtool-devel diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm index 9bda982..649bedb 100644 --- a/ghostscript/ghostscript.nm +++ b/ghostscript/ghostscript.nm @@ -4,7 +4,7 @@ ############################################################################### name = ghostscript -version = 9.14 +version = 9.18 release = 1 groups = Applications/Printing diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 372a695..444a2d1 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -4,8 +4,8 @@ ############################################################################### name = glib2 -ver_major = 2.42 -ver_minor = 2 +ver_major = 2.48 +ver_minor = 0 version = %{ver_major}.%{ver_minor} release = 1 thisapp = glib-%{version} diff --git a/gmp/gmp.nm b/gmp/gmp.nm index a3cd0f2..b81cd6a 100644 --- a/gmp/gmp.nm +++ b/gmp/gmp.nm @@ -4,7 +4,7 @@ ############################################################################### name = gmp -version = 6.0.0 +version = 6.1.0 release = 1 groups = System/Libraries diff --git a/gnome-themes-standard/gnome-themes-standard.nm b/gnome-themes-standard/gnome-themes-standard.nm index d1030e8..e5f1fc2 100644 --- a/gnome-themes-standard/gnome-themes-standard.nm +++ b/gnome-themes-standard/gnome-themes-standard.nm @@ -4,9 +4,8 @@ ############################################################################### name = gnome-themes-standard -ver_major = 3.11 -ver_minor = 5 -version = %{ver_major}.%{ver_minor} +ver_major = 3.20 +version = %{ver_major} release = 1 groups = diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm index b930a64..18b668a 100644 --- a/gnupg2/gnupg2.nm +++ b/gnupg2/gnupg2.nm @@ -4,7 +4,7 @@ ############################################################################### name = gnupg2 -version = 2.1.6 +version = 2.1.9 release = 1 thisapp = gnupg-%{version} diff --git a/gpgme/gpgme.nm b/gpgme/gpgme.nm index 93b3061..48d8d9e 100644 --- a/gpgme/gpgme.nm +++ b/gpgme/gpgme.nm @@ -4,8 +4,8 @@ ############################################################################### name = gpgme -version = 1.5.3 -release = 2 +version = 1.6.0 +release = 1 groups = Applications/System url = http://www.gnupg.org/related_software/gpgme/ diff --git a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm index ca34a80..1c28ab6 100644 --- a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm +++ b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm @@ -5,8 +5,8 @@ name = gsettings-desktop-schemas version = %{ver_maj}.%{ver_min} -ver_maj = 3.7 -ver_min = 5 +ver_maj = 3.20 +ver_min = 0 release = 1 groups = System/Libraries diff --git a/gssdp/gssdp.nm b/gssdp/gssdp.nm index 6331c7c..e8e08b1 100644 --- a/gssdp/gssdp.nm +++ b/gssdp/gssdp.nm @@ -4,7 +4,9 @@ ############################################################################### name = gssdp -version = 0.7.0 +ver_major = 0.14 +ver_minor = 14 +version = %{ver_major}.%{ver_minor} release = 1 groups = System/Libraries @@ -16,7 +18,9 @@ description GSSDP implements resource discovery and announcement over SSDP. end -source_dl = +source_dl = https://download.gnome.org/sources/gssdp/%{ver_major}/ +sources = %{thisapp}.tar.xz + build requires diff --git a/gtk3/gtk3.nm b/gtk3/gtk3.nm index dc556ac..33f88bf 100644 --- a/gtk3/gtk3.nm +++ b/gtk3/gtk3.nm @@ -5,7 +5,7 @@ name = gtk3 version = %{ver_major}.%{ver_minor} -ver_major = 3.10 +ver_major = 3.20 ver_minor = 0 release = 1 @@ -28,16 +28,20 @@ build requires atk-devel >= 2.7.5 at-spi2-atk-devel - cairo-gobject-devel - gdk-pixbuf2-devel >= 2.26 + cairo-devel >= 1.14.0 + cairo-gobject-devel >= 1.14.0 + fontconfig-devel + gdk-pixbuf2-devel >= 2.30.0 + gettext-devel >= 0.18.3 glib2-devel >= 2.35.3 gobject-introspection-devel >= 1.39.0 - pango-devel >= 1.32.4 + libepoxy-devel >= 1.0 libXi-devel libXrandr-devel libXrender-devel libXfixes-devel libXdamage-devel + pango-devel >= 1.37.3 end configure_options += \ diff --git a/gupnp/gupnp.nm b/gupnp/gupnp.nm index 02a28ed..2d82384 100644 --- a/gupnp/gupnp.nm +++ b/gupnp/gupnp.nm @@ -4,7 +4,9 @@ ############################################################################### name = gupnp -version = 0.13.1 +ver_major = 0.20 +ver_minor = 16 +version = %{ver_major}.%{ver_minor} release = 1 groups = System/Libraries @@ -18,13 +20,14 @@ description The GUPnP API is intended to be easy to use, efficient and flexible. end -source_dl = +source_dl = https://download.gnome.org/sources/gupnp/%{ver_major}/ +sources = %{thisapp}.tar.xz build requires glib2-devel - gssdp-devel - libsoup-devel + gssdp-devel >= 0.14.13 + libsoup-devel >= 2.48 libuuid-devel libxml2-devel end diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm index c899b8d..1ccd287 100644 --- a/harfbuzz/harfbuzz.nm +++ b/harfbuzz/harfbuzz.nm @@ -4,7 +4,7 @@ ############################################################################### name = harfbuzz -version = 0.9.12 +version = 1.2.4 release = 1 groups = System/Libraries diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index 9e445b8..785946b 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -4,7 +4,7 @@ ############################################################################### name = hdparm -version = 9.43 +version = 9.48 release = 1 groups = Applications/Hardware diff --git a/help2man/help2man.nm b/help2man/help2man.nm index 9c5e3ea..1bb5cd2 100644 --- a/help2man/help2man.nm +++ b/help2man/help2man.nm @@ -4,7 +4,7 @@ ############################################################################### name = help2man -version = 1.46.4 +version = 1.47.3 release = 1 arch = noarch diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm index 93987d1..d169c5c 100644 --- a/hostapd/hostapd.nm +++ b/hostapd/hostapd.nm @@ -4,7 +4,7 @@ ############################################################################### name = hostapd -version = 2.4 +version = 2.5 release = 1 groups = Networking/Tools diff --git a/hwdata/hwdata.nm b/hwdata/hwdata.nm index 049f410..36678e4 100644 --- a/hwdata/hwdata.nm +++ b/hwdata/hwdata.nm @@ -4,7 +4,7 @@ ############################################################################### name = hwdata -version = 0.232 +version = 0.287 release = 1 arch = noarch @@ -18,12 +18,12 @@ description such as the pci.ids database and MonitorsDb databases. end -source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = https://git.fedorahosted.org/cgit/hwdata.git/snapshot/ +sources = %{thisapp}.tar.gz build - build - : # Nothing to do + requires + git end end diff --git a/libepoxy/libepoxy.nm b/libepoxy/libepoxy.nm new file mode 100644 index 0000000..b7729ac --- /dev/null +++ b/libepoxy/libepoxy.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libepoxy +version = 1.3.1 +release = 1 + +groups = System/Libraries +url = https://github.com/anholt/libepoxy +license = MIT +summary = Epoxy is a library for handling OpenGL function pointer management + +description + Epoxy is a library for handling OpenGL function pointer management for you. + + It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(), + eglGetProcAddress(), etc. from the app developer, with very little + knowledge needed on their part. They get to read GL specs and write + code using undecorated function names like glCompileShader(). +end + +source_dl = https://github.com/anholt/libepoxy/releases/download/v%{version}/ +sources = %{thisapp}.tar.bz2 + +build + requires + libEGL-devel + xorg-x11-util-macros + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm index c21ce96..4c2008f 100644 --- a/libsoup/libsoup.nm +++ b/libsoup/libsoup.nm @@ -5,8 +5,8 @@ name = libsoup version = %{ver_major}.%{ver_minor} -ver_major = 2.41 -ver_minor = 5 +ver_major = 2.54 +ver_minor = 0.1 release = 1 groups = System/Libraries @@ -35,6 +35,7 @@ build pkg-config sqlite-devel zlib-devel + vala-devel >= 0.32 end configure_options += \ diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm index babc5d7..02e4f84 100644 --- a/lvm2/lvm2.nm +++ b/lvm2/lvm2.nm @@ -4,8 +4,8 @@ ############################################################################### name = lvm2 -version = 2.02.95 -release = 2 +version = 2.02.147 +release = 1 thisapp = LVM2.%{version} groups = System/Base diff --git a/mesa/mesa.nm b/mesa/mesa.nm index 48a9e5d..6f242a3 100644 --- a/mesa/mesa.nm +++ b/mesa/mesa.nm @@ -5,7 +5,7 @@ name = mesa version = 9.0.2 -release = 1.1 +release = 2 groups = Development/Tools url = http://www.mesa3d.org @@ -53,12 +53,12 @@ build --enable-selinux \ --enable-pic \ --enable-dri \ + --enable-egl \ --with-dri-drivers="nouveau,radeon,r200%{platform_drivers}" \ --with-gallium-drivers=swrast \ --disable-asm \ --disable-gallium-llvm \ --disable-gallium-egl \ - --disable-egl \ --disable-static \ --without-demos @@ -89,6 +89,17 @@ packages end end + package libEGL + summary = Mesa libEGL runtime library. + description + This package contains the Mesa libEGL runtime libraries. + end + + files + %{libdir}/libEGL.so.* + end + end + package libGL summary = Mesa libGL runtime library. description @@ -123,6 +134,7 @@ packages template DEVEL provides + libEGL-devel = %{thisver} libGL-devel = %{thisver} end diff --git a/vala/vala.nm b/vala/vala.nm index 015c06a..fac4714 100644 --- a/vala/vala.nm +++ b/vala/vala.nm @@ -4,8 +4,9 @@ ############################################################################### name = vala -version = 0.11.2 -major_ver = 0.11 +ver_major = 0.32 +ver_minor = 0 +version = %{ver_major}.%{ver_minor} release = 1 groups = Development/Languages @@ -20,8 +21,8 @@ description ABI compared to applications and libraries written in C. end -source_dl = http://download.gnome.org/sources/vala/%{major_ver}/ -sources = %{thisapp}.tar.bz2 +source_dl = http://artfiles.org/gnome.org/sources/vala/0.32/ +sources = %{thisapp}.tar.xz build requires hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e49c3c69d2dc745f1a9a41d4dbdbcc1cd7803b45
by git＠ipfire.org 23 Mar '16

23 Mar '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 84fce430a3d5ee7dc7693f995143437d20f52742
by git＠ipfire.org 22 Mar '16

22 Mar '16

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 84fce430a3d5ee7dc7693f995143437d20f52742 (commit) via 677fa734b8c0505744d19afba56d1717d7c66616 (commit) via bda83227aa0ea509e5b78c11ce607fa8c4e34aa8 (commit) via d5f7b3aad9c260ce633d16d5a130ca21967d6717 (commit) via 52c277d917188a860ab050012e5df8685320fa56 (commit) via b336f14656d9979d059284d9bc827c499230596d (commit) via a82348347b2f7622f97f171f2ed67a96129300c6 (commit) via 4d137b36f1c669eddb938b95597f22ce168d7374 (commit) from d5ef73a3953bfc828adfd2c0a73d5e5be3617bfc (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 84fce430a3d5ee7dc7693f995143437d20f52742 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 22 22:21:25 2016 +0000 e2fsprogs: Fix indentation of makefile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 677fa734b8c0505744d19afba56d1717d7c66616 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 22 22:19:25 2016 +0000 e2fsprogs: Only build in own directory This makes it easier to clean up after the build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bda83227aa0ea509e5b78c11ce607fa8c4e34aa8 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Wed Mar 9 07:32:21 2016 +0100 e2fsprogs: update to 1.42.13 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d5f7b3aad9c260ce633d16d5a130ca21967d6717 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Thu Mar 10 17:47:55 2016 +0100 pkg-config: update to 0.29 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 52c277d917188a860ab050012e5df8685320fa56 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Thu Mar 10 18:00:17 2016 +0100 grep: update to 2.23 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b336f14656d9979d059284d9bc827c499230596d Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Sat Feb 20 21:11:03 2016 +0100 asterisk addon: update to 11.21.1 Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a82348347b2f7622f97f171f2ed67a96129300c6 Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Fri Feb 19 23:58:16 2016 +0100 libsrtp: upgrade to 1.5.4 Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4d137b36f1c669eddb938b95597f22ce168d7374 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Tue Mar 22 18:43:01 2016 +0100 git: update to 2.7.1 Fixes CVE-2016-2324 and CVE-2016‑2315 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/e2fsprogs | 4 ++++ config/rootfiles/packages/git | 44 +++++++++++++++++++++------------------ lfs/asterisk | 8 +++---- lfs/e2fsprogs | 28 +++++++++++++++---------- lfs/git | 7 +++---- lfs/grep | 15 ++++++------- lfs/libsrtp | 8 +++---- lfs/pkg-config | 10 ++++----- 8 files changed, 67 insertions(+), 57 deletions(-) Difference in files: diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index 9622e6c..ba4f00a 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -1,4 +1,5 @@ #etc/mke2fs.conf +#etc/mke2fs.conf.e2fsprogs-new lib/libblkid.so.1 lib/libblkid.so.1.0 lib/libcom_err.so.2 @@ -114,6 +115,9 @@ usr/sbin/uuidd #usr/share/man/man3/uuid_unparse.3 #usr/share/man/man5/e2fsck.conf.5 #usr/share/man/man5/mke2fs.conf.5 +#usr/share/man/man5/ext2.5 +#usr/share/man/man5/ext3.5 +#usr/share/man/man5/ext4.5 #usr/share/man/man8/badblocks.8 #usr/share/man/man8/blkid.8 #usr/share/man/man8/debugfs.8 diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index e168483..ea31b20 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -6,26 +6,26 @@ usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk usr/lib/perl5/site_perl/5.12.3/Error.pm -usr/lib/perl5/site_perl/5.12.3/Git +#usr/lib/perl5/site_perl/5.12.3/Git usr/lib/perl5/site_perl/5.12.3/Git.pm usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm -#usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm +usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm #usr/lib/perl5/site_perl/5.12.3/Git/SVN -#usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm +usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist -usr/libexec/git-core -usr/libexec/git-core/git +#usr/libexec/git-core +#usr/libexec/git-core/git usr/libexec/git-core/git-add usr/libexec/git-core/git-add--interactive usr/libexec/git-core/git-am @@ -172,6 +172,7 @@ usr/libexec/git-core/git-stash usr/libexec/git-core/git-status usr/libexec/git-core/git-stripspace usr/libexec/git-core/git-submodule +usr/libexec/git-core/git-submodule--helper usr/libexec/git-core/git-svn usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag @@ -188,8 +189,9 @@ usr/libexec/git-core/git-verify-pack usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse usr/libexec/git-core/git-whatchanged +usr/libexec/git-core/git-worktree usr/libexec/git-core/git-write-tree -usr/libexec/git-core/mergetools +#usr/libexec/git-core/mergetools usr/libexec/git-core/mergetools/araxis usr/libexec/git-core/mergetools/bc usr/libexec/git-core/mergetools/bc3 @@ -212,12 +214,13 @@ usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff usr/libexec/git-core/mergetools/vimdiff2 usr/libexec/git-core/mergetools/vimdiff3 +usr/libexec/git-core/mergetools/winmerge usr/libexec/git-core/mergetools/xxdiff -usr/share/git-core -usr/share/git-core/templates +#usr/share/git-core +#usr/share/git-core/templates usr/share/git-core/templates/branches usr/share/git-core/templates/description -usr/share/git-core/templates/hooks +#usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample usr/share/git-core/templates/hooks/post-update.sample @@ -227,7 +230,7 @@ usr/share/git-core/templates/hooks/pre-push.sample usr/share/git-core/templates/hooks/pre-rebase.sample usr/share/git-core/templates/hooks/prepare-commit-msg.sample usr/share/git-core/templates/hooks/update.sample -usr/share/git-core/templates/info +#usr/share/git-core/templates/info usr/share/git-core/templates/info/exclude #usr/share/git-gui #usr/share/git-gui/lib @@ -315,6 +318,7 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/fr/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/locale/it/LC_MESSAGES/git.mo +#usr/share/locale/ko/LC_MESSAGES/git.mo #usr/share/locale/pt_PT/LC_MESSAGES/git.mo #usr/share/locale/ru/LC_MESSAGES/git.mo #usr/share/locale/sv/LC_MESSAGES/git.mo diff --git a/lfs/asterisk b/lfs/asterisk index 91dc4fd..9fc90ea 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 # @@ -20,7 +20,7 @@ include Config -VER = 11.20.0 +VER = 11.21.1 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 18 +PAK_VER = 19 DEPS = "libsrtp" @@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -$(DL_FILE)_MD5 = d15759b05862250073e2708394ad2f4c +$(DL_FILE)_MD5 = 9594c3cdcf6dc16c719b5abb00dbdd8f asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index dff6393..90e28ac 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.42.6 +VER = 1.42.13 THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c +$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265 install : $(TARGET) @@ -69,12 +69,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC) && mkdir build - cd $(DIR_SRC)/build && $(DIR_APP)/configure --prefix=/usr --with-root-prefix="" \ - --enable-elf-shlibs --disable-evms --disable-nls - cd $(DIR_SRC)/build && make $(MAKETUNING) - cd $(DIR_SRC)/build && make install - cd $(DIR_SRC)/build && make install-libs - @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + -mkdir -pv $(DIR_APP)/build + cd $(DIR_APP)/build && \ + $(DIR_APP)/configure \ + --prefix=/usr \ + --with-root-prefix="" \ + --enable-elf-shlibs \ + --disable-evms \ + --disable-nls + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + cd $(DIR_APP)/build && make install-libs + chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/git b/lfs/git index bbec140..032907b 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@ include Config -VER = 2.4.4 +VER = 2.7.1 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31 +$(DL_FILE)_MD5 = eece7b1e87983271621a0cb6aab37a25 install : $(TARGET) @@ -78,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ + --with-gitconfig=/etc/gitconfig \ --prefix=/usr \ --with-libpcre \ --with-curl \ --with-expat - cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/grep b/lfs/grep index d22b359..9f3a38e 100644 --- a/lfs/grep +++ b/lfs/grep @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.22 +VER = 2.23 THISAPP = grep-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -36,14 +36,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --bindir=/bin --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=/tools --disable-nls \ --disable-perl-regexp --without-included-regex - EXTRA_MAKE = - EXTRA_INSTALL = + endif ############################################################################### @@ -54,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e1015e951a49a82b02e38891026ef5df +$(DL_FILE)_MD5 = f46aa9d0d2577b9212a104348a286787 install : $(TARGET) @@ -85,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libsrtp b/lfs/libsrtp index 47c0cad..cc1eef3 100644 --- a/lfs/libsrtp +++ b/lfs/libsrtp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 # @@ -24,14 +24,14 @@ include Config -VER = 1.5.2 +VER = 1.5.4 THISAPP = libsrtp-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libsrtp -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2309aa6027992810a4285b042c71e644 +$(DL_FILE)_MD5 = 64a9580f86a9c3e1c4986e944e6a5a84 install : $(TARGET) diff --git a/lfs/pkg-config b/lfs/pkg-config index b3db91f..3da8556 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 0.20 +VER = 0.29 THISAPP = pkg-config-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fb42402593e4198bc252ab248dd4158b +$(DL_FILE)_MD5 = 77f27dce7ef88d0634d0d6f90e03a77f install : $(TARGET) @@ -70,8 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(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 - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 07ad0da359865c0195fe8151930c88b7a9040d3f
by git＠ipfire.org 22 Mar '16

22 Mar '16

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 07ad0da359865c0195fe8151930c88b7a9040d3f (commit) via 5be55dfad709b4af26f5bf65f0cd3c9f4b0a143f (commit) from 4c2750b54d0ebd14738ddd8b7bbb4440b0d879e1 (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 07ad0da359865c0195fe8151930c88b7a9040d3f Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 22 07:33:47 2016 +0100 audit: Update to 2.5 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5be55dfad709b4af26f5bf65f0cd3c9f4b0a143f Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 22 07:52:47 2016 +0100 authconfig: Update to 6.2.10 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: audit/audit.nm | 4 ++-- authconfig/authconfig.nm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/audit/audit.nm b/audit/audit.nm index de634d8..094a51b 100644 --- a/audit/audit.nm +++ b/audit/audit.nm @@ -4,8 +4,8 @@ ############################################################################### name = audit -version = 2.2 -release = 2 +version = 2.5 +release = 1 groups = System/Daemons url = http://people.redhat.com/sgrubb/audit/ diff --git a/authconfig/authconfig.nm b/authconfig/authconfig.nm index 1dd4a7e..876b9a1 100644 --- a/authconfig/authconfig.nm +++ b/authconfig/authconfig.nm @@ -4,7 +4,7 @@ ############################################################################### name = authconfig -version = 6.2.5 +version = 6.2.10 release = 1 groups = System/Base hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2016