IPFire-SCM June 2016

ipfire-scm@lists.ipfire.org

1 participants
22 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 795147c7d97b5fc691c6528bb5754f2b917a49c7
by git＠ipfire.org 30 Jun '16

30 Jun '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 795147c7d97b5fc691c6528bb5754f2b917a49c7 (commit) via 484e62046ee462af0c102a131b0c7d47ae7f33e8 (commit) via 01e38218c9193c9747ae9fca2a48345ff262af9e (commit) from dc2e0320d3bfdaf0f2c51f6ed7297c3140806482 (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 795147c7d97b5fc691c6528bb5754f2b917a49c7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 30 20:29:40 2016 +0200 kernel: arm7-multi: enable ohci_hcd needed for usb1.1 support on BananaPi Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 484e62046ee462af0c102a131b0c7d47ae7f33e8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 29 17:04:28 2016 +0200 kernel: update to 3.14.74 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 01e38218c9193c9747ae9fca2a48345ff262af9e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 29 17:00:29 2016 +0200 backports: r8152 add lenovo and nvidia usb id this id's are blacklisted in new cdc_ether module because the r8152 module should used but the 3.14 module not know this id's. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 4 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 9 ++- config/kernel/kernel.config.armv5tel-ipfire-rpi | 2 +- config/kernel/kernel.config.i586-ipfire | 4 +- config/kernel/kernel.config.i586-ipfire-pae | 4 +- config/kernel/kernel.config.x86_64-ipfire | 4 +- config/rootfiles/common/armv5tel/linux-kirkwood | 1 + config/rootfiles/common/armv5tel/linux-multi | 1 + config/rootfiles/common/i586/linux | 1 + config/rootfiles/common/x86_64/linux | 1 + config/rootfiles/packages/linux-pae | 1 + lfs/linux | 18 ++--- .../backports-4.2.6-1-add_usbnet_modules.patch | 87 ++++++++++++---------- 13 files changed, 77 insertions(+), 60 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 91f90c6..4b53732 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.64 Kernel Configuration +# Linux/arm 3.14.73 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1390,7 +1390,7 @@ CONFIG_HP_ILO=m # CONFIG_SENSORS_APDS990X is not set # CONFIG_HMC6352 is not set CONFIG_DS1682=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 0bb4a76..0a380c9 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 3.14.64 Kernel Configuration +# Linux/arm 3.14.73 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -1573,7 +1573,7 @@ CONFIG_ENCLOSURE_SERVICES=m # CONFIG_HMC6352 is not set CONFIG_DS1682=m CONFIG_ARM_CHARLCD=y -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m @@ -4412,7 +4412,10 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m CONFIG_USB_FOTG210_HCD=m -# CONFIG_USB_OHCI_HCD is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_OMAP3=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_UHCI_HCD=y CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y CONFIG_USB_UHCI_PLATFORM=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 3c354e2..ae7d1dd 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.64 Kernel Configuration +# Linux/arm 3.14.73 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 11230e3..3c027e0 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.64 Kernel Configuration +# Linux/x86 3.14.73 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1454,7 +1454,7 @@ CONFIG_HP_ILO=m # CONFIG_HMC6352 is not set CONFIG_DS1682=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index cfc3a6a..1e6f545 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.64 Kernel Configuration +# Linux/x86 3.14.73 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1470,7 +1470,7 @@ CONFIG_HP_ILO=m # CONFIG_HMC6352 is not set CONFIG_DS1682=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index d3bdcf0..f3772dc 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.64 Kernel Configuration +# Linux/x86 3.14.73 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1411,7 +1411,7 @@ CONFIG_HP_ILO=m # CONFIG_HMC6352 is not set CONFIG_DS1682=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index f5ae585..443daf9 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -1117,6 +1117,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/altera-stapl #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/altera-stapl/altera-stapl.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/bmp085-i2c.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/bmp085.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/cb710 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/cb710/cb710.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/ds1682.ko diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index c2d3cd2..162768f 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -1142,6 +1142,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/altera-stapl #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/altera-stapl/altera-stapl.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/bmp085-i2c.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/bmp085.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/ds1682.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/dummy-irq.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/eeprom diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index ff17a62..ead8fe2 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -1334,6 +1334,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/misc/altera-stapl #lib/modules/KVER-ipfire/kernel/drivers/misc/altera-stapl/altera-stapl.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/bmp085-i2c.ko +#lib/modules/KVER-ipfire/kernel/drivers/misc/bmp085.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/cb710 #lib/modules/KVER-ipfire/kernel/drivers/misc/cb710/cb710.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/cs5535-mfgpt.ko diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 2cae007..65c080e 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -1336,6 +1336,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/misc/altera-stapl #lib/modules/KVER-ipfire/kernel/drivers/misc/altera-stapl/altera-stapl.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/bmp085-i2c.ko +#lib/modules/KVER-ipfire/kernel/drivers/misc/bmp085.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/cb710 #lib/modules/KVER-ipfire/kernel/drivers/misc/cb710/cb710.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/cs5535-mfgpt.ko diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 511b0f3..db876f7 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -1332,6 +1332,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/altera-stapl #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/altera-stapl/altera-stapl.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/bmp085-i2c.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/bmp085.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/cb710 #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/cb710/cb710.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/cs5535-mfgpt.ko diff --git a/lfs/linux b/lfs/linux index 8e1536c..ed94c63 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.14.65 -RPI_PATCHES = 3.14.65-grsec-ipfire1 -A7M_PATCHES = 3.14.65-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.65-v1.patch.xz +VER = 3.14.73 +RPI_PATCHES = 3.14.73-grsec-ipfire1 +A7M_PATCHES = 3.14.73-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.73-v1.patch.xz THISAPP = linux-$(VER) @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 68 +PAK_VER = 69 DEPS = "" KERNEL_ARCH = $(MACHINE) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = cfc70821a04acb80ded45e408e9faf36 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 0d1059c18f4810abbe9aafb6beab445b -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 589eb8703fa2ba2944b2f925b7f7ffb3 -$(GRS_PATCHES)_MD5 = 548571a2c70219cce9728eb8b8949030 +$(DL_FILE)_MD5 = a106b304ff78301a6b0a02febb80d5db +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 91a164fe6f0b1d0a44beb95ea50a2541 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = bf2ab77300c0013613a7676d965f8074 +$(GRS_PATCHES)_MD5 = 018bf34ca2c57f73603312872049a6ff install : $(TARGET) diff --git a/src/patches/backports-4.2.6-1-add_usbnet_modules.patch b/src/patches/backports-4.2.6-1-add_usbnet_modules.patch index 660ef8c..7ee228d 100644 --- a/src/patches/backports-4.2.6-1-add_usbnet_modules.patch +++ b/src/patches/backports-4.2.6-1-add_usbnet_modules.patch @@ -1,6 +1,6 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix_common.c backports-4.2.6-1/drivers/net/usb/asix_common.c --- backports-4.2.6-1.org/drivers/net/usb/asix_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/asix_common.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/asix_common.c 2016-06-28 14:35:17.965307221 +0200 @@ -0,0 +1,584 @@ +/* + * ASIX AX8817X based USB 2.0 Ethernet Devices @@ -588,7 +588,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix_common.c backports-4.2.6-1 +} diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix_devices.c backports-4.2.6-1/drivers/net/usb/asix_devices.c --- backports-4.2.6-1.org/drivers/net/usb/asix_devices.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/asix_devices.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/asix_devices.c 2016-06-28 14:35:17.965307221 +0200 @@ -0,0 +1,1107 @@ +/* + * ASIX AX8817X based USB 2.0 Ethernet Devices @@ -1699,7 +1699,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix_devices.c backports-4.2.6- + diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix.h backports-4.2.6-1/drivers/net/usb/asix.h --- backports-4.2.6-1.org/drivers/net/usb/asix.h 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/asix.h 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/asix.h 2016-06-28 14:35:17.965307221 +0200 @@ -0,0 +1,234 @@ +/* + * ASIX AX8817X based USB 2.0 Ethernet Devices @@ -1937,7 +1937,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix.h backports-4.2.6-1/driver +#endif /* _ASIX_H */ diff -Naur backports-4.2.6-1.org/drivers/net/usb/ax88172a.c backports-4.2.6-1/drivers/net/usb/ax88172a.c --- backports-4.2.6-1.org/drivers/net/usb/ax88172a.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/ax88172a.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/ax88172a.c 2016-06-28 14:35:17.965307221 +0200 @@ -0,0 +1,422 @@ +/* + * ASIX AX88172A based USB 2.0 Ethernet Devices @@ -2363,7 +2363,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/ax88172a.c backports-4.2.6-1/dr +}; diff -Naur backports-4.2.6-1.org/drivers/net/usb/ax88179_178a.c backports-4.2.6-1/drivers/net/usb/ax88179_178a.c --- backports-4.2.6-1.org/drivers/net/usb/ax88179_178a.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/ax88179_178a.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/ax88179_178a.c 2016-06-28 14:35:17.968640554 +0200 @@ -0,0 +1,1756 @@ +/* + * ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet Devices @@ -4123,7 +4123,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/ax88179_178a.c backports-4.2.6- +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/catc.c backports-4.2.6-1/drivers/net/usb/catc.c --- backports-4.2.6-1.org/drivers/net/usb/catc.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/catc.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/catc.c 2016-06-28 14:35:17.975307221 +0200 @@ -0,0 +1,965 @@ +/* + * Copyright (c) 2001 Vojtech Pavlik @@ -5092,7 +5092,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/catc.c backports-4.2.6-1/driver +module_usb_driver(catc_driver); diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc_eem.c backports-4.2.6-1/drivers/net/usb/cdc_eem.c --- backports-4.2.6-1.org/drivers/net/usb/cdc_eem.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/cdc_eem.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/cdc_eem.c 2016-06-28 14:35:17.975307221 +0200 @@ -0,0 +1,381 @@ +/* + * USB CDC EEM network interface driver @@ -5477,7 +5477,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc_eem.c backports-4.2.6-1/dri +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc-phonet.c backports-4.2.6-1/drivers/net/usb/cdc-phonet.c --- backports-4.2.6-1.org/drivers/net/usb/cdc-phonet.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/cdc-phonet.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/cdc-phonet.c 2016-06-28 14:35:17.975307221 +0200 @@ -0,0 +1,466 @@ +/* + * phonet.c -- USB CDC Phonet host driver @@ -5947,7 +5947,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc-phonet.c backports-4.2.6-1/ +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc_subset.c backports-4.2.6-1/drivers/net/usb/cdc_subset.c --- backports-4.2.6-1.org/drivers/net/usb/cdc_subset.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/cdc_subset.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/cdc_subset.c 2016-06-28 14:35:17.975307221 +0200 @@ -0,0 +1,369 @@ +/* + * Simple "CDC Subset" USB Networking Links @@ -6320,7 +6320,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc_subset.c backports-4.2.6-1/ +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/cx82310_eth.c backports-4.2.6-1/drivers/net/usb/cx82310_eth.c --- backports-4.2.6-1.org/drivers/net/usb/cx82310_eth.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/cx82310_eth.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/cx82310_eth.c 2016-06-28 14:35:17.978640554 +0200 @@ -0,0 +1,353 @@ +/* + * Driver for USB ethernet port of Conexant CX82310-based ADSL routers @@ -6677,7 +6677,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/cx82310_eth.c backports-4.2.6-1 +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/dm9601.c backports-4.2.6-1/drivers/net/usb/dm9601.c --- backports-4.2.6-1.org/drivers/net/usb/dm9601.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/dm9601.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/dm9601.c 2016-06-28 14:35:17.978640554 +0200 @@ -0,0 +1,647 @@ +/* + * Davicom DM96xx USB 10/100Mbps ethernet devices @@ -7328,7 +7328,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/dm9601.c backports-4.2.6-1/driv +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/gl620a.c backports-4.2.6-1/drivers/net/usb/gl620a.c --- backports-4.2.6-1.org/drivers/net/usb/gl620a.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/gl620a.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/gl620a.c 2016-06-28 14:35:17.978640554 +0200 @@ -0,0 +1,242 @@ +/* + * GeneSys GL620USB-A based links @@ -7574,7 +7574,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/gl620a.c backports-4.2.6-1/driv + diff -Naur backports-4.2.6-1.org/drivers/net/usb/hso.c backports-4.2.6-1/drivers/net/usb/hso.c --- backports-4.2.6-1.org/drivers/net/usb/hso.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/hso.c 2016-01-27 15:03:25.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/hso.c 2016-06-28 14:35:17.981973887 +0200 @@ -0,0 +1,3322 @@ +/****************************************************************************** + * @@ -10900,7 +10900,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/hso.c backports-4.2.6-1/drivers +module_param(disable_net, int, S_IRUGO | S_IWUSR); diff -Naur backports-4.2.6-1.org/drivers/net/usb/huawei_cdc_ncm.c backports-4.2.6-1/drivers/net/usb/huawei_cdc_ncm.c --- backports-4.2.6-1.org/drivers/net/usb/huawei_cdc_ncm.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/huawei_cdc_ncm.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/huawei_cdc_ncm.c 2016-06-28 14:35:17.981973887 +0200 @@ -0,0 +1,224 @@ +/* huawei_cdc_ncm.c - handles Huawei devices using the CDC NCM protocol as + * transport layer. @@ -11128,7 +11128,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/huawei_cdc_ncm.c backports-4.2. +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/int51x1.c backports-4.2.6-1/drivers/net/usb/int51x1.c --- backports-4.2.6-1.org/drivers/net/usb/int51x1.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/int51x1.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/int51x1.c 2016-06-28 14:35:17.985307220 +0200 @@ -0,0 +1,199 @@ +/* + * Copyright (c) 2009 Peter Holik @@ -11331,7 +11331,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/int51x1.c backports-4.2.6-1/dri +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/ipheth.c backports-4.2.6-1/drivers/net/usb/ipheth.c --- backports-4.2.6-1.org/drivers/net/usb/ipheth.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/ipheth.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/ipheth.c 2016-06-28 14:35:17.985307220 +0200 @@ -0,0 +1,588 @@ +/* + * ipheth.c - Apple iPhone USB Ethernet driver @@ -11923,7 +11923,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/ipheth.c backports-4.2.6-1/driv +MODULE_LICENSE("Dual BSD/GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/kalmia.c backports-4.2.6-1/drivers/net/usb/kalmia.c --- backports-4.2.6-1.org/drivers/net/usb/kalmia.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/kalmia.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/kalmia.c 2016-06-28 14:35:17.985307220 +0200 @@ -0,0 +1,366 @@ +/* + * USB network interface driver for Samsung Kalmia based LTE USB modem like the @@ -12293,7 +12293,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/kalmia.c backports-4.2.6-1/driv +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/kaweth.c backports-4.2.6-1/drivers/net/usb/kaweth.c --- backports-4.2.6-1.org/drivers/net/usb/kaweth.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/kaweth.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/kaweth.c 2016-06-28 14:35:17.988640553 +0200 @@ -0,0 +1,1331 @@ +/**************************************************************** + * @@ -13628,7 +13628,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/kaweth.c backports-4.2.6-1/driv +module_usb_driver(kaweth_driver); diff -Naur backports-4.2.6-1.org/drivers/net/usb/Kconfig backports-4.2.6-1/drivers/net/usb/Kconfig --- backports-4.2.6-1.org/drivers/net/usb/Kconfig 2015-11-15 22:19:40.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/Kconfig 2016-01-27 15:58:23.159192032 +0100 ++++ backports-4.2.6-1/drivers/net/usb/Kconfig 2016-06-28 14:35:17.991973886 +0200 @@ -13,7 +13,6 @@ if USB_NET_DRIVERS @@ -13852,7 +13852,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/Kconfig backports-4.2.6-1/drive called VL600. This driver only handles the ethernet diff -Naur backports-4.2.6-1.org/drivers/net/usb/Kconfig.orig backports-4.2.6-1/drivers/net/usb/Kconfig.orig --- backports-4.2.6-1.org/drivers/net/usb/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/Kconfig.orig 2015-11-15 22:19:40.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/Kconfig.orig 2016-06-28 14:35:17.991973886 +0200 @@ -0,0 +1,638 @@ +# +# USB Network devices configuration @@ -14494,7 +14494,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/Kconfig.orig backports-4.2.6-1/ +endif # USB_NET_DRIVERS diff -Naur backports-4.2.6-1.org/drivers/net/usb/lg-vl600.c backports-4.2.6-1/drivers/net/usb/lg-vl600.c --- backports-4.2.6-1.org/drivers/net/usb/lg-vl600.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/lg-vl600.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/lg-vl600.c 2016-06-28 14:35:17.991973886 +0200 @@ -0,0 +1,353 @@ +/* + * Ethernet interface part of the LG VL600 LTE modem (4G dongle) @@ -14851,7 +14851,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/lg-vl600.c backports-4.2.6-1/dr +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/Makefile backports-4.2.6-1/drivers/net/usb/Makefile --- backports-4.2.6-1.org/drivers/net/usb/Makefile 2015-11-15 22:19:40.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/Makefile 2016-01-27 15:53:50.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/Makefile 2016-06-28 14:35:17.991973886 +0200 @@ -1,39 +1,40 @@ # # Makefile for USB Network drivers @@ -14923,7 +14923,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/Makefile backports-4.2.6-1/driv diff -Naur backports-4.2.6-1.org/drivers/net/usb/mcs7830.c backports-4.2.6-1/drivers/net/usb/mcs7830.c --- backports-4.2.6-1.org/drivers/net/usb/mcs7830.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/mcs7830.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/mcs7830.c 2016-06-28 14:35:17.995307218 +0200 @@ -0,0 +1,643 @@ +/* + * MOSCHIP MCS7830 based (7730/7830/7832) USB 2.0 Ethernet Devices @@ -15570,7 +15570,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/mcs7830.c backports-4.2.6-1/dri +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/net1080.c backports-4.2.6-1/drivers/net/usb/net1080.c --- backports-4.2.6-1.org/drivers/net/usb/net1080.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/net1080.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/net1080.c 2016-06-28 14:35:17.995307218 +0200 @@ -0,0 +1,544 @@ +/* + * Net1080 based USB host-to-host cables @@ -16118,7 +16118,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/net1080.c backports-4.2.6-1/dri +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/pegasus.c backports-4.2.6-1/drivers/net/usb/pegasus.c --- backports-4.2.6-1.org/drivers/net/usb/pegasus.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/pegasus.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/pegasus.c 2016-06-28 14:35:17.995307218 +0200 @@ -0,0 +1,1335 @@ +/* + * Copyright (c) 1999-2013 Petko Manolov (petkan(a)nucleusys.com) @@ -17457,7 +17457,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/pegasus.c backports-4.2.6-1/dri +module_exit(pegasus_exit); diff -Naur backports-4.2.6-1.org/drivers/net/usb/pegasus.h backports-4.2.6-1/drivers/net/usb/pegasus.h --- backports-4.2.6-1.org/drivers/net/usb/pegasus.h 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/pegasus.h 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/pegasus.h 2016-06-28 14:35:17.998640551 +0200 @@ -0,0 +1,308 @@ +/* + * Copyright (c) 1999-2013 Petko Manolov (petkan(a)nucleusys.com) @@ -17769,7 +17769,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/pegasus.h backports-4.2.6-1/dri +#endif /* PEGASUS_DEV */ diff -Naur backports-4.2.6-1.org/drivers/net/usb/plusb.c backports-4.2.6-1/drivers/net/usb/plusb.c --- backports-4.2.6-1.org/drivers/net/usb/plusb.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/plusb.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/plusb.c 2016-06-28 14:35:17.998640551 +0200 @@ -0,0 +1,162 @@ +/* + * PL-2301/2302 USB host-to-host link cables @@ -17935,8 +17935,8 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/plusb.c backports-4.2.6-1/drive +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/r8152.c backports-4.2.6-1/drivers/net/usb/r8152.c --- backports-4.2.6-1.org/drivers/net/usb/r8152.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/r8152.c 2016-01-27 12:43:25.000000000 +0100 -@@ -0,0 +1,2847 @@ ++++ backports-4.2.6-1/drivers/net/usb/r8152.c 2016-06-28 14:45:32.005250978 +0200 +@@ -0,0 +1,2856 @@ +/* + * Copyright (c) 2014 Realtek Semiconductor Corp. All rights reserved. + * @@ -18385,6 +18385,13 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/r8152.c backports-4.2.6-1/drive +#define VENDOR_ID_SAMSUNG 0x04e8 +#define PRODUCT_ID_SAMSUNG 0xa101 + ++#define VENDOR_ID_LENOVO 0x17ef ++#define PRODUCT_ID_LENOVO 0x7205 ++ ++#define VENDOR_ID_NVIDIA 0x0955 ++#define PRODUCT_ID_NVIDIA 0x09ff ++ ++ +#define MCU_TYPE_PLA 0x0100 +#define MCU_TYPE_USB 0x0000 + @@ -20764,6 +20771,8 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/r8152.c backports-4.2.6-1/drive + {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8152)}, + {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8153)}, + {USB_DEVICE(VENDOR_ID_SAMSUNG, PRODUCT_ID_SAMSUNG)}, ++ {USB_DEVICE(VENDOR_ID_LENOVO, PRODUCT_ID_LENOVO)}, ++ {USB_DEVICE(VENDOR_ID_NVIDIA, PRODUCT_ID_NVIDIA)}, + {} +}; + @@ -20786,7 +20795,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/r8152.c backports-4.2.6-1/drive +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/rtl8150.c backports-4.2.6-1/drivers/net/usb/rtl8150.c --- backports-4.2.6-1.org/drivers/net/usb/rtl8150.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/rtl8150.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/rtl8150.c 2016-06-28 14:35:18.001973885 +0200 @@ -0,0 +1,949 @@ +/* + * Copyright (c) 2002 Petko Manolov (petkan(a)users.sourceforge.net) @@ -21739,7 +21748,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/rtl8150.c backports-4.2.6-1/dri +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc75xx.c backports-4.2.6-1/drivers/net/usb/smsc75xx.c --- backports-4.2.6-1.org/drivers/net/usb/smsc75xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/smsc75xx.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/smsc75xx.c 2016-06-28 14:35:18.008640551 +0200 @@ -0,0 +1,2286 @@ + /*************************************************************************** + * @@ -24029,7 +24038,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc75xx.c backports-4.2.6-1/dr +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc75xx.h backports-4.2.6-1/drivers/net/usb/smsc75xx.h --- backports-4.2.6-1.org/drivers/net/usb/smsc75xx.h 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/smsc75xx.h 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/smsc75xx.h 2016-06-28 14:35:18.008640551 +0200 @@ -0,0 +1,421 @@ + /*************************************************************************** + * @@ -24454,7 +24463,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc75xx.h backports-4.2.6-1/dr +#endif /* _SMSC75XX_H */ diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc95xx.c backports-4.2.6-1/drivers/net/usb/smsc95xx.c --- backports-4.2.6-1.org/drivers/net/usb/smsc95xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/smsc95xx.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/smsc95xx.c 2016-06-28 14:35:18.011973884 +0200 @@ -0,0 +1,2032 @@ + /*************************************************************************** + * @@ -26490,7 +26499,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc95xx.c backports-4.2.6-1/dr +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc95xx.h backports-4.2.6-1/drivers/net/usb/smsc95xx.h --- backports-4.2.6-1.org/drivers/net/usb/smsc95xx.h 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/smsc95xx.h 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/smsc95xx.h 2016-06-28 14:35:18.011973884 +0200 @@ -0,0 +1,290 @@ + /*************************************************************************** + * @@ -26784,7 +26793,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc95xx.h backports-4.2.6-1/dr +#endif /* _SMSC95XX_H */ diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9700.c backports-4.2.6-1/drivers/net/usb/sr9700.c --- backports-4.2.6-1.org/drivers/net/usb/sr9700.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/sr9700.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/sr9700.c 2016-06-28 14:35:18.011973884 +0200 @@ -0,0 +1,559 @@ +/* + * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices @@ -27347,7 +27356,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9700.c backports-4.2.6-1/driv +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9700.h backports-4.2.6-1/drivers/net/usb/sr9700.h --- backports-4.2.6-1.org/drivers/net/usb/sr9700.h 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/sr9700.h 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/sr9700.h 2016-06-28 14:35:18.011973884 +0200 @@ -0,0 +1,173 @@ +/* + * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices @@ -27524,7 +27533,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9700.h backports-4.2.6-1/driv +#endif /* _SR9700_H */ diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9800.c backports-4.2.6-1/drivers/net/usb/sr9800.c --- backports-4.2.6-1.org/drivers/net/usb/sr9800.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/sr9800.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/sr9800.c 2016-06-28 14:35:18.015307217 +0200 @@ -0,0 +1,875 @@ +/* CoreChip-sz SR9800 one chip USB 2.0 Ethernet Devices + * @@ -28403,7 +28412,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9800.c backports-4.2.6-1/driv +MODULE_LICENSE("GPL"); diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9800.h backports-4.2.6-1/drivers/net/usb/sr9800.h --- backports-4.2.6-1.org/drivers/net/usb/sr9800.h 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/sr9800.h 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/sr9800.h 2016-06-28 14:35:18.015307217 +0200 @@ -0,0 +1,202 @@ +/* CoreChip-sz SR9800 one chip USB 2.0 Ethernet Devices + * @@ -28609,7 +28618,7 @@ diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9800.h backports-4.2.6-1/driv +#endif /* _SR9800_H */ diff -Naur backports-4.2.6-1.org/drivers/net/usb/zaurus.c backports-4.2.6-1/drivers/net/usb/zaurus.c --- backports-4.2.6-1.org/drivers/net/usb/zaurus.c 1970-01-01 01:00:00.000000000 +0100 -+++ backports-4.2.6-1/drivers/net/usb/zaurus.c 2015-11-09 23:37:56.000000000 +0100 ++++ backports-4.2.6-1/drivers/net/usb/zaurus.c 2016-06-28 14:35:18.015307217 +0200 @@ -0,0 +1,385 @@ +/* + * Copyright (C) 2002 Pavel Machek <pavel(a)ucw.cz> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc2e0320d3bfdaf0f2c51f6ed7297c3140806482
by git＠ipfire.org 27 Jun '16

27 Jun '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 dc2e0320d3bfdaf0f2c51f6ed7297c3140806482 (commit) via a3cab8134a87712723a5a4a76e0e5deee4b02864 (commit) from f7029f205713edc6f523c58685e2f420b5d2852e (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 dc2e0320d3bfdaf0f2c51f6ed7297c3140806482 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 27 23:18:39 2016 +0100 core104: Ship updated libarchive Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a3cab8134a87712723a5a4a76e0e5deee4b02864 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sun Jun 26 09:27:58 2016 +0200 libarchive: update to 3.2.1 Fixes CVE-2016-4301 Libarchive mtree parse_device Code Execution Vulnerability 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/libarchive | 6 +++++- config/rootfiles/core/104/filelists/libarchive | 1 + lfs/libarchive | 12 ++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 120000 config/rootfiles/core/104/filelists/libarchive Difference in files: diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive index 735bf37..80daa2d 100644 --- a/config/rootfiles/common/libarchive +++ b/config/rootfiles/common/libarchive @@ -1,13 +1,15 @@ #usr/bin/bsdcpio +#usr/bin/bsdcat #usr/bin/bsdtar #usr/include/archive.h #usr/include/archive_entry.h #usr/lib/libarchive.la #usr/lib/libarchive.so #usr/lib/libarchive.so.13 -#usr/lib/libarchive.so.13.1.2 +#usr/lib/libarchive.so.13.2.1 #usr/lib/pkgconfig/libarchive.pc #usr/share/man/man1/bsdcpio.1 +#usr/share/man/man1/bsdcat.1 #usr/share/man/man1/bsdtar.1 #usr/share/man/man3/archive_entry.3 #usr/share/man/man3/archive_entry_acl.3 @@ -17,6 +19,7 @@ #usr/share/man/man3/archive_entry_stat.3 #usr/share/man/man3/archive_entry_time.3 #usr/share/man/man3/archive_read.3 +#usr/share/man/man3/archive_read_add_passphrase.3 #usr/share/man/man3/archive_read_data.3 #usr/share/man/man3/archive_read_disk.3 #usr/share/man/man3/archive_read_extract.3 @@ -40,6 +43,7 @@ #usr/share/man/man3/archive_write_new.3 #usr/share/man/man3/archive_write_open.3 #usr/share/man/man3/archive_write_set_options.3 +#usr/share/man/man3/archive_write_set_passphrase.3 #usr/share/man/man3/libarchive.3 #usr/share/man/man3/libarchive_changes.3 #usr/share/man/man3/libarchive_internals.3 diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive new file mode 120000 index 0000000..551f1f7 --- /dev/null +++ b/config/rootfiles/core/104/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/lfs/libarchive b/lfs/libarchive index 43365ee..58b4b6e 100644 --- a/lfs/libarchive +++ b/lfs/libarchive @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# 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 = 3.1.2 +VER = 3.2.1 THISAPP = libarchive-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = efad5a503f66329bb9d2f4308b5de98a +$(DL_FILE)_MD5 = afa257047d1941a565216edbf0171e72 install : $(TARGET) @@ -74,12 +74,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 \ - --disable-static - + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static 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 2.x development tree branch, next, updated. f7029f205713edc6f523c58685e2f420b5d2852e
by git＠ipfire.org 22 Jun '16

22 Jun '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 f7029f205713edc6f523c58685e2f420b5d2852e (commit) via fee796dcb761b70911644311e7dba98f7727cb79 (commit) via b1e8c4b521d8b8759c63985812f17d7c23ffe753 (commit) from 60ef4f6704c5a0cc2d971dccc90f81d4f0a051ce (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 f7029f205713edc6f523c58685e2f420b5d2852e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jun 22 14:19:24 2016 +0200 core 104: Add updated snort. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit fee796dcb761b70911644311e7dba98f7727cb79 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jun 22 14:18:36 2016 +0200 core 104: Add changed ids.cgi. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit b1e8c4b521d8b8759c63985812f17d7c23ffe753 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jun 22 14:13:49 2016 +0200 snort: Rootfile update. Rootfile update for snort 2.9.8.2 which has been overlocked in commit 5a5e5f04a7cb2a6c39be2a53205d42b99ab80885. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/snort | 1 + config/rootfiles/core/104/filelists/files | 1 + config/rootfiles/{oldcore/95 => core/104}/filelists/snort | 0 config/rootfiles/core/104/update.sh | 1 + 4 files changed, 3 insertions(+) copy config/rootfiles/{oldcore/95 => core/104}/filelists/snort (100%) Difference in files: diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 77208e8..ea29593 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -215,6 +215,7 @@ usr/sbin/snort #usr/share/doc/snort/README.reload #usr/share/doc/snort/README.reputation #usr/share/doc/snort/README.sensitive_data +#usr/share/doc/snort/README.session #usr/share/doc/snort/README.sfportscan #usr/share/doc/snort/README.sip #usr/share/doc/snort/README.ssh diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files index 2fbdb5d..13e547a 100644 --- a/config/rootfiles/core/104/filelists/files +++ b/config/rootfiles/core/104/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/issue opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/core/104/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/104/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh index c21247b..615e797 100644 --- a/config/rootfiles/core/104/update.sh +++ b/config/rootfiles/core/104/update.sh @@ -55,6 +55,7 @@ ldconfig #/usr/local/bin/update-lang-cache # Start services +/etc/init.d/snort restart # This update need a reboot... touch /var/run/need_reboot hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60ef4f6704c5a0cc2d971dccc90f81d4f0a051ce
by git＠ipfire.org 21 Jun '16

21 Jun '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 60ef4f6704c5a0cc2d971dccc90f81d4f0a051ce (commit) via 312ba20037df7db21abaeb4fcf5ee687d9c90dbe (commit) via 59232d72251e46011b92501b7538bfe24e869ffa (commit) via 3a376d999ecf485803c270e3d9d6f767c0378ba9 (commit) via 5a5e5f04a7cb2a6c39be2a53205d42b99ab80885 (commit) via 00c2bfe89b236ebbd0306d19965c9087b3aaf485 (commit) via cf074eb256e1254f3463f62d3e1893cca56ca2ff (commit) from 96aeacd808bbde03997e7d699bed16605095c8a8 (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 60ef4f6704c5a0cc2d971dccc90f81d4f0a051ce Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jun 21 12:02:49 2016 +0200 Add updated ddns to core 104. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 312ba20037df7db21abaeb4fcf5ee687d9c90dbe Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jun 21 11:59:18 2016 +0200 ddns: Update to version 010. This update fixes some smaller issues on various dynamic DNS providers and adds support for DuckDNS as new provider. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 59232d72251e46011b92501b7538bfe24e869ffa Merge: 3a376d9 96aeacd Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jun 21 10:08:07 2016 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 3a376d999ecf485803c270e3d9d6f767c0378ba9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 1 07:35:32 2016 +0200 snort 2.9.8.2: update snort download url Update for http://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=0aff7b81965c06756ff42482… Update url is set to 'snortrules-snapshot-2982.tar.gz' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 5a5e5f04a7cb2a6c39be2a53205d42b99ab80885 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 1 08:40:00 2016 +0200 snort: Update to 2.9.8.2 Release notes: 2016-03-09 - Snort 2.9.8.2 [*] New additions * Future-flow and DNS API exposed to lua detector. * Double VLAN tagging support. [*] Improvements * Performance improvements to AppID. * Stability improvements to file and ftp_telnet preprocessor. * Fixed several issues with SDF and obfuscation. * Resolved an issue of improper handling of malformed DNS host in AppID. * HTTP PAF accepts all tokens between method and version strings in a request URI. * Resolved snort build issue with "--disable-perfprofiling" configure option. * Enhanced mime parsing by adding support for detecting files after unknown headers and no headers. * Fixed issue with gzip decompression. If the server response specifies Content-Encoding as GZIP, but no Content-Length field for HTTP ver 1.0. * End of Header(EOH) identification for HTTP response header spanning multiple packets. * Improved packet reassembly for HTTP. * Fixed Flash LZMA decompression issue. For details see: https://www.snort.org/downloads/snort/changelog_2.9.8.2.txt Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 00c2bfe89b236ebbd0306d19965c9087b3aaf485 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Dec 11 19:38:26 2015 +0100 snort 2.9.8.0: Updated rootfile snort 2.9.8.0: Updated rootfile Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit cf074eb256e1254f3463f62d3e1893cca56ca2ff Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 10 07:40:18 2015 +0100 snort: Update to 2.9.8.0 snort: Update to 2.9.8.0 Release notes: https://snort.org/downloads/snort/release_notes_2.9.8.0.txt Changelog: https://snort.org/downloads/snort/changelog_2.9.8.0.txt Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/snort | 2 +- config/rootfiles/{oldcore/95 => core/104}/filelists/ddns | 0 html/cgi-bin/ids.cgi | 4 ++-- lfs/ddns | 4 ++-- lfs/snort | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) copy config/rootfiles/{oldcore/95 => core/104}/filelists/ddns (100%) Difference in files: diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 6dfcdfc..77208e8 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -27,7 +27,6 @@ usr/bin/u2spewfoo #usr/include/snort/dynamic_output/snort_debug.h #usr/include/snort/dynamic_output/stream_api.h #usr/include/snort/dynamic_preproc -#usr/include/snort/dynamic_preproc/appId.h #usr/include/snort/dynamic_preproc/bitop.h #usr/include/snort/dynamic_preproc/cpuclock.h #usr/include/snort/dynamic_preproc/file_api.h @@ -38,6 +37,7 @@ usr/bin/u2spewfoo #usr/include/snort/dynamic_preproc/mpse_methods.h #usr/include/snort/dynamic_preproc/obfuscation.h #usr/include/snort/dynamic_preproc/packet_time.h +#usr/include/snort/dynamic_preproc/perf_indicators.h #usr/include/snort/dynamic_preproc/preprocids.h #usr/include/snort/dynamic_preproc/profiler.h #usr/include/snort/dynamic_preproc/segment_mem.h diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/core/104/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/104/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index f17b16a..e7753aa 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snort…'OINKCODE'}"; + $url=" https://www.snort.org/rules/snortrules-snapshot-2982.tar.gz?oinkcode=$snort…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snort…'OINKCODE'}"; + $url=" https://www.snort.org/rules/snortrules-snapshot-2982.tar.gz?oinkcode=$snort…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'community') { $url=" https://www.snort.org/rules/community"; } else { diff --git a/lfs/ddns b/lfs/ddns index 750c728..422f8e3 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 009 +VER = 010 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 31f949d9f417ee7f801cf8aac849a92e +$(DL_FILE)_MD5 = 51e74b613732c0d7be3adb3348a5ed95 install : $(TARGET) diff --git a/lfs/snort b/lfs/snort index 148f539..53fffbb 100644 --- a/lfs/snort +++ b/lfs/snort @@ -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 # @@ -24,7 +24,7 @@ include Config -VER = 2.9.7.6 +VER = 2.9.8.2 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 65349f3272c4de5b3210f77f1f7ab0e6 +$(DL_FILE)_MD5 = b5005f88a01b42ff7ee0defb94161ffc install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 96aeacd808bbde03997e7d699bed16605095c8a8
by git＠ipfire.org 20 Jun '16

20 Jun '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 96aeacd808bbde03997e7d699bed16605095c8a8 (commit) via 5cc7ae0926454f93998f7c25b931dae7eec0539d (commit) from 1dd61e0594e92155642039d3229e1505f8aea937 (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 96aeacd808bbde03997e7d699bed16605095c8a8 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Jun 17 13:06:41 2016 +0200 Change the default qemu user and group of libvirt Changes the libvirt user to nobody and the group to kvm this is a bit safer as to use root for both. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5cc7ae0926454f93998f7c25b931dae7eec0539d Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Jun 17 13:06:40 2016 +0200 Qemu: add a group kvm to access /dev/kvm eaiser As a normal user, it is not possible to use qemu with KVM. This is bad because it is better when it is possible to start the machine with a less privileged user. To achieve this a group KVM is created and the access to /dev/kvm is allowed for this group. So every user in this group can use qemu with KVM. This change is also useful for libvirt because the VMs can be started with user nobody and group kvm. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/qemu/65-kvm.rules | 2 ++ config/rootfiles/packages/qemu | 1 + lfs/libvirt | 3 ++- lfs/qemu | 4 +++- src/paks/qemu/install.sh | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 config/qemu/65-kvm.rules Difference in files: diff --git a/config/qemu/65-kvm.rules b/config/qemu/65-kvm.rules new file mode 100644 index 0000000..569ded9 --- /dev/null +++ b/config/qemu/65-kvm.rules @@ -0,0 +1,2 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" +KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net" diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 482087b..3b3f361 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,3 +1,4 @@ +lib/udev/rules.d/65-kvm.rules usr/bin/qemu usr/bin/qemu-arm usr/bin/qemu-ga diff --git a/lfs/libvirt b/lfs/libvirt index 3c7413f..5af28cb 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 2 +PAK_VER = 3 DEPS = "libpciaccess libyajl ncat qemu" @@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \ --without-firewalld --without-network -with-interface --with-virtualport --with-macvtap \ --disable-nls --without-avahi --without-test-suite -without-dbus \ + --with-qemu-user=nobody --with-qemu-group=kvm \ --with-storage-dir --without-storage-fs --without-storage-lvm --without-storage-iscsi \ --without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-storage-zfs cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/lfs/qemu b/lfs/qemu index 804ec26..c32953c 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 18 +PAK_VER = 19 DEPS = "sdl spice" @@ -95,6 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) paxctl -m -r /usr/bin/qemu-arm paxctl -m -r /usr/bin/qemu-i386 paxctl -m -r /usr/bin/qemu-x86_64 + # install an udev script to set the permissions of /dev/kvm + cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/paks/qemu/install.sh b/src/paks/qemu/install.sh index a9f7321..e44ba5e 100644 --- a/src/paks/qemu/install.sh +++ b/src/paks/qemu/install.sh @@ -22,6 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +#create the group kvm when they not exist +getent group kvm >/dev/null || groupadd kvm extract_files restore_backup ${NAME} echo shm /dev/shm tmpfs defaults,size=256M 0 0 >> /etc/fstab hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1dd61e0594e92155642039d3229e1505f8aea937
by git＠ipfire.org 19 Jun '16

19 Jun '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 1dd61e0594e92155642039d3229e1505f8aea937 (commit) via 0204a3c5bff8b22c880b2fb181814a25c2c3e3b9 (commit) via 4787315b6e67b486e813292d45402ee3890a3e7b (commit) from 1bddfa5abf7a970bb6a1df90271bc6e2c67154a5 (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 1dd61e0594e92155642039d3229e1505f8aea937 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 09:54:32 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0204a3c5bff8b22c880b2fb181814a25c2c3e3b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 17 13:07:10 2016 +0100 core104: Ship updated shadow-utils and remove old files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4787315b6e67b486e813292d45402ee3890a3e7b Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Mar 19 08:10:25 2016 +0100 shadow: update to 4.2.1 The "groups" from the coreutils package is used (/usr/bin/groups) 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/linux-atm | 1 + config/rootfiles/common/shadow | 98 ++--- .../{oldcore/66 => core/104}/filelists/shadow | 0 config/rootfiles/core/104/update.sh | 3 + lfs/shadow | 23 +- .../shadow-4.2.1-SHA512_password_hashing.patch | 38 ++ ...dow-4.2.1-suppress_installation_of_groups.patch | 446 +++++++++++++++++++++ 7 files changed, 550 insertions(+), 59 deletions(-) copy config/rootfiles/{oldcore/66 => core/104}/filelists/shadow (100%) create mode 100644 src/patches/shadow-4.2.1-SHA512_password_hashing.patch create mode 100644 src/patches/shadow-4.2.1-suppress_installation_of_groups.patch Difference in files: diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm index db5793a..7cc8323 100644 --- a/config/rootfiles/common/linux-atm +++ b/config/rootfiles/common/linux-atm @@ -21,6 +21,7 @@ usr/lib/libatm.so.1.0.0 #usr/man/man4/atmsigd.conf.4 #usr/man/man7/qos.7 #usr/man/man7/sap.7 +#usr/man/man8 #usr/man/man8/atmaddr.8 #usr/man/man8/atmarp.8 #usr/man/man8/atmarpd.8 diff --git a/config/rootfiles/common/shadow b/config/rootfiles/common/shadow index ec9054e..0b0c83f 100644 --- a/config/rootfiles/common/shadow +++ b/config/rootfiles/common/shadow @@ -1,17 +1,16 @@ -bin/groups bin/login bin/passwd bin/su #etc/.pwd.lock #etc/default +#etc/default/useradd etc/limits etc/login.access etc/login.defs #etc/passwd- etc/shadow #etc/shadow- -lib/libshadow.so.0 -lib/libshadow.so.0.0.0 +sbin/nologin #usr/bin/chage #usr/bin/chfn #usr/bin/chsh @@ -19,64 +18,22 @@ lib/libshadow.so.0.0.0 #usr/bin/faillog #usr/bin/gpasswd #usr/bin/lastlog +#usr/bin/newgidmap #usr/bin/newgrp +#usr/bin/newuidmap #usr/bin/sg -#usr/lib/libshadow.a -#usr/lib/libshadow.la #usr/lib/libshadow.so -#usr/man/man1/chage.1 -#usr/man/man1/chfn.1 -#usr/man/man1/chsh.1 -#usr/man/man1/expiry.1 -#usr/man/man1/gpasswd.1 -#usr/man/man1/login.1 -#usr/man/man1/newgrp.1 -#usr/man/man1/passwd.1 -#usr/man/man1/sg.1 -#usr/man/man1/su.1 -#usr/man/man3/getspnam.3 -#usr/man/man3/shadow.3 -#usr/man/man5/faillog.5 -#usr/man/man5/gshadow.5 -#usr/man/man5/limits.5 -#usr/man/man5/login.access.5 -#usr/man/man5/login.defs.5 -#usr/man/man5/passwd.5 -#usr/man/man5/porttime.5 -#usr/man/man5/shadow.5 -#usr/man/man5/suauth.5 -#usr/man/man8 -#usr/man/man8/chpasswd.8 -#usr/man/man8/faillog.8 -#usr/man/man8/groupadd.8 -#usr/man/man8/groupdel.8 -#usr/man/man8/groupmod.8 -#usr/man/man8/grpck.8 -#usr/man/man8/grpconv.8 -#usr/man/man8/grpunconv.8 -#usr/man/man8/lastlog.8 -#usr/man/man8/logoutd.8 -#usr/man/man8/newusers.8 -#usr/man/man8/nologin.8 -#usr/man/man8/pwck.8 -#usr/man/man8/pwconv.8 -#usr/man/man8/pwunconv.8 -#usr/man/man8/useradd.8 -#usr/man/man8/userdel.8 -#usr/man/man8/usermod.8 -#usr/man/man8/vigr.8 -#usr/man/man8/vipw.8 #usr/sbin/chgpasswd usr/sbin/chpasswd usr/sbin/groupadd usr/sbin/groupdel +usr/sbin/groupmems usr/sbin/groupmod #usr/sbin/grpck usr/sbin/grpconv #usr/sbin/grpunconv #usr/sbin/logoutd #usr/sbin/newusers -#usr/sbin/nologin #usr/sbin/pwck usr/sbin/pwconv #usr/sbin/pwunconv @@ -85,3 +42,48 @@ usr/sbin/userdel usr/sbin/usermod #usr/sbin/vigr #usr/sbin/vipw +#usr/share/man/man1/chage.1 +#usr/share/man/man1/chfn.1 +#usr/share/man/man1/chsh.1 +#usr/share/man/man1/expiry.1 +#usr/share/man/man1/gpasswd.1 +#usr/share/man/man1/login.1 +#usr/share/man/man1/newgidmap.1 +#usr/share/man/man1/newgrp.1 +#usr/share/man/man1/newuidmap.1 +#usr/share/man/man1/passwd.1 +#usr/share/man/man1/sg.1 +#usr/share/man/man1/su.1 +#usr/share/man/man3/shadow.3 +#usr/share/man/man5/faillog.5 +#usr/share/man/man5/gshadow.5 +#usr/share/man/man5/limits.5 +#usr/share/man/man5/login.access.5 +#usr/share/man/man5/login.defs.5 +#usr/share/man/man5/porttime.5 +#usr/share/man/man5/shadow.5 +#usr/share/man/man5/suauth.5 +#usr/share/man/man5/subgid.5 +#usr/share/man/man5/subuid.5 +#usr/share/man/man8/chgpasswd.8 +#usr/share/man/man8/chpasswd.8 +#usr/share/man/man8/faillog.8 +#usr/share/man/man8/groupadd.8 +#usr/share/man/man8/groupdel.8 +#usr/share/man/man8/groupmems.8 +#usr/share/man/man8/groupmod.8 +#usr/share/man/man8/grpck.8 +#usr/share/man/man8/grpconv.8 +#usr/share/man/man8/grpunconv.8 +#usr/share/man/man8/lastlog.8 +#usr/share/man/man8/logoutd.8 +#usr/share/man/man8/newusers.8 +#usr/share/man/man8/nologin.8 +#usr/share/man/man8/pwck.8 +#usr/share/man/man8/pwconv.8 +#usr/share/man/man8/pwunconv.8 +#usr/share/man/man8/useradd.8 +#usr/share/man/man8/userdel.8 +#usr/share/man/man8/usermod.8 +#usr/share/man/man8/vigr.8 +#usr/share/man/man8/vipw.8 diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/core/104/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh index a229864..c21247b 100644 --- a/config/rootfiles/core/104/update.sh +++ b/config/rootfiles/core/104/update.sh @@ -45,6 +45,9 @@ done # Extract files extract_files +# Remove some old files +rm -f /bin/groups /lib/libshadow.so.0* + # update linker config ldconfig diff --git a/lfs/shadow b/lfs/shadow index f281431..b4777b9 100644 --- a/lfs/shadow +++ b/lfs/shadow @@ -24,10 +24,10 @@ include Config -VER = 4.0.15 +VER = 4.2.1 THISAPP = shadow-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e +$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8 install : $(TARGET) @@ -69,11 +69,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --libdir=/lib --enable-shared --without-selinux --disable-nls - cd $(DIR_APP) && sed -i 's/groups$(EXEEXT) //' src/Makefile - cd $(DIR_APP) && find man -name Makefile -exec sed -i '/groups/d' {} \; - cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-SHA512_password_hashing.patch + cd $(DIR_APP) && ./configure --libdir=/lib \ + --sysconfdir=/etc \ + --enable-shared \ + --without-selinux \ + --disable-nls \ + --with-group-name-max-length=32 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -v etc/{limits,login.access} /etc @@ -81,10 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's@/var/spool/mail@/var/mail@' \ etc/login.defs > /etc/login.defs mv -v /usr/bin/passwd /bin - mv -v /lib/libshadow.*a /usr/lib - rm -v /lib/libshadow.so ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so - mkdir -v /etc/default touch /etc/shadow chmod 600 /etc/shadow pwconv diff --git a/src/patches/shadow-4.2.1-SHA512_password_hashing.patch b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch new file mode 100644 index 0000000..7fc5bc9 --- /dev/null +++ b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch @@ -0,0 +1,38 @@ +diff -crB shadow-4.2.1-a/etc/login.defs shadow-4.2.1-b/etc/login.defs +*** shadow-4.2.1-a/etc/login.defs 2014-05-09 10:20:28.000000000 +0000 +--- shadow-4.2.1-b/etc/login.defs 2016-03-13 10:51:09.680171239 +0000 +*************** +*** 118,124 **** + # Directory where mailboxes reside, _or_ name of file, relative to the + # home directory. If you _do_ define both, MAIL_DIR takes precedence. + # +! MAIL_DIR /var/spool/mail + #MAIL_FILE .mail + + # +--- 118,124 ---- + # Directory where mailboxes reside, _or_ name of file, relative to the + # home directory. If you _do_ define both, MAIL_DIR takes precedence. + # +! MAIL_DIR /var/mail + #MAIL_FILE .mail + + # +*************** +*** 317,323 **** + # Note: If you use PAM, it is recommended to use a value consistent with + # the PAM modules configuration. + # +! #ENCRYPT_METHOD DES + + # + # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. +--- 317,323 ---- + # Note: If you use PAM, it is recommended to use a value consistent with + # the PAM modules configuration. + # +! ENCRYPT_METHOD SHA512 + + # + # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. +Only in shadow-4.2.1-b: SHA512_password_hashing.patch diff --git a/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch new file mode 100644 index 0000000..f9f09c4 --- /dev/null +++ b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch @@ -0,0 +1,446 @@ +diff -crB shadow-4.2.1-a/man/cs/Makefile.in shadow-4.2.1-b/man/cs/Makefile.in +*** shadow-4.2.1-a/man/cs/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/cs/Makefile.in 2016-03-13 10:47:55.924166976 +0000 +*************** +*** 300,311 **** + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man1/groups.1 \ + man8/grpck.8 \ + man5/gshadow.5 \ + man8/lastlog.8 \ + man8/nologin.8 \ +! man5/passwd.5 \ + man5/shadow.5 \ + man1/su.1 \ + man8/vipw.8 +--- 300,311 ---- + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man1/ \ + man8/grpck.8 \ + man5/gshadow.5 \ + man8/lastlog.8 \ + man8/nologin.8 \ +! man5/ \ + man5/shadow.5 \ + man1/su.1 \ + man8/vipw.8 +diff -crB shadow-4.2.1-a/man/da/Makefile.in shadow-4.2.1-b/man/da/Makefile.in +*** shadow-4.2.1-a/man/da/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/da/Makefile.in 2016-03-13 10:47:55.928166977 +0000 +*************** +*** 298,304 **** + top_srcdir = @top_srcdir@ + + # 2012.01.28 - activate manpages with more than 50% translated messages +! man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \ + man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = +--- 298,304 ---- + top_srcdir = @top_srcdir@ + + # 2012.01.28 - activate manpages with more than 50% translated messages +! man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \ + man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = +diff -crB shadow-4.2.1-a/man/de/Makefile.in shadow-4.2.1-b/man/de/Makefile.in +*** shadow-4.2.1-a/man/de/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/de/Makefile.in 2016-03-13 10:47:55.916166976 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/es/Makefile.in shadow-4.2.1-b/man/es/Makefile.in +*** shadow-4.2.1-a/man/es/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/es/Makefile.in 2016-03-13 10:47:55.872166975 +0000 +*************** +*** 266,272 **** + # man1/login.1 \ + # man1/newgrp.1 \ + # man1/passwd.1 \ +! # man5/passwd.5 \ + # man1/su.1 \ + # man8/vigr.8 \ + # man8/vipw.8 +--- 266,272 ---- + # man1/login.1 \ + # man1/newgrp.1 \ + # man1/passwd.1 \ +! # man5/ \ + # man1/su.1 \ + # man8/vigr.8 \ + # man8/vipw.8 +diff -crB shadow-4.2.1-a/man/fr/Makefile.in shadow-4.2.1-b/man/fr/Makefile.in +*** shadow-4.2.1-a/man/fr/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/fr/Makefile.in 2016-03-13 10:47:55.984166978 +0000 +*************** +*** 301,311 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 301,311 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/hu/Makefile.in shadow-4.2.1-b/man/hu/Makefile.in +*** shadow-4.2.1-a/man/hu/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/hu/Makefile.in 2016-03-13 10:47:55.972166978 +0000 +*************** +*** 295,306 **** + man_MANS = \ + man1/chsh.1 \ + man1/gpasswd.1 \ +! man1/groups.1 \ + man8/lastlog.8 \ + man1/login.1 \ + man1/newgrp.1 \ + man1/passwd.1 \ +! man5/passwd.5 \ + man1/sg.1 \ + man1/su.1 + +--- 295,306 ---- + man_MANS = \ + man1/chsh.1 \ + man1/gpasswd.1 \ +! man1/ \ + man8/lastlog.8 \ + man1/login.1 \ + man1/newgrp.1 \ + man1/passwd.1 \ +! man5/ \ + man1/sg.1 \ + man1/su.1 + +diff -crB shadow-4.2.1-a/man/it/Makefile.in shadow-4.2.1-b/man/it/Makefile.in +*** shadow-4.2.1-a/man/it/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/it/Makefile.in 2016-03-13 10:47:55.896166976 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/ja/Makefile.in shadow-4.2.1-b/man/ja/Makefile.in +*** shadow-4.2.1-a/man/ja/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/ja/Makefile.in 2016-03-13 10:47:55.932166977 +0000 +*************** +*** 296,305 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \ + man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \ +! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \ + man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \ + man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \ + man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \ + man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) +--- 296,305 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \ + man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \ +! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \ + man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \ + man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \ + man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \ + man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) +diff -crB shadow-4.2.1-a/man/ko/Makefile.in shadow-4.2.1-b/man/ko/Makefile.in +*** shadow-4.2.1-a/man/ko/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/ko/Makefile.in 2016-03-13 10:47:55.940166977 +0000 +*************** +*** 295,303 **** + man_MANS = \ + man1/chfn.1 \ + man1/chsh.1 \ +! man1/groups.1 \ + man1/login.1 \ +! man5/passwd.5 \ + man1/su.1 \ + man8/vigr.8 \ + man8/vipw.8 +--- 295,303 ---- + man_MANS = \ + man1/chfn.1 \ + man1/chsh.1 \ +! man1/ \ + man1/login.1 \ +! man5/ \ + man1/su.1 \ + man8/vigr.8 \ + man8/vipw.8 +diff -crB shadow-4.2.1-a/man/Makefile.in shadow-4.2.1-b/man/Makefile.in +*** shadow-4.2.1-a/man/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/Makefile.in 2016-03-13 10:47:55.880166976 +0000 +*************** +*** 365,375 **** + @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 365,375 ---- + @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/pl/Makefile.in shadow-4.2.1-b/man/pl/Makefile.in +*** shadow-4.2.1-a/man/pl/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/pl/Makefile.in 2016-03-13 10:47:55.912166976 +0000 +*************** +*** 300,307 **** + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \ + man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ + man8/vipw.8 $(am__append_1) +--- 300,307 ---- + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \ + man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ + man8/vipw.8 $(am__append_1) +diff -crB shadow-4.2.1-a/man/pt_BR/Makefile.in shadow-4.2.1-b/man/pt_BR/Makefile.in +*** shadow-4.2.1-a/man/pt_BR/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/pt_BR/Makefile.in 2016-03-13 10:47:55.904166976 +0000 +*************** +*** 297,303 **** + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/passwd.5 \ + man5/shadow.5 + + EXTRA_DIST = $(man_MANS) +--- 297,303 ---- + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/ \ + man5/shadow.5 + + EXTRA_DIST = $(man_MANS) +diff -crB shadow-4.2.1-a/man/ru/Makefile.in shadow-4.2.1-b/man/ru/Makefile.in +*** shadow-4.2.1-a/man/ru/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/ru/Makefile.in 2016-03-13 10:47:55.944166977 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/sv/Makefile.in shadow-4.2.1-b/man/sv/Makefile.in +*** shadow-4.2.1-a/man/sv/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/sv/Makefile.in 2016-03-13 10:47:55.988166978 +0000 +*************** +*** 300,309 **** + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \ +! man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \ + man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = \ +--- 300,309 ---- + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \ +! man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \ + man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = \ +diff -crB shadow-4.2.1-a/man/tr/Makefile.in shadow-4.2.1-b/man/tr/Makefile.in +*** shadow-4.2.1-a/man/tr/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/tr/Makefile.in 2016-03-13 10:47:55.964166977 +0000 +*************** +*** 300,306 **** + man8/groupmod.8 \ + man1/login.1 \ + man1/passwd.1 \ +! man5/passwd.5 \ + man5/shadow.5 \ + man1/su.1 \ + man8/useradd.8 \ +--- 300,306 ---- + man8/groupmod.8 \ + man1/login.1 \ + man1/passwd.1 \ +! man5/ \ + man5/shadow.5 \ + man1/su.1 \ + man8/useradd.8 \ +diff -crB shadow-4.2.1-a/man/zh_CN/Makefile.in shadow-4.2.1-b/man/zh_CN/Makefile.in +*** shadow-4.2.1-a/man/zh_CN/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/zh_CN/Makefile.in 2016-03-13 10:47:55.952166977 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/zh_TW/Makefile.in shadow-4.2.1-b/man/zh_TW/Makefile.in +*** shadow-4.2.1-a/man/zh_TW/Makefile.in 2014-05-09 16:49:48.000000000 +0000 +--- shadow-4.2.1-b/man/zh_TW/Makefile.in 2016-03-13 10:47:55.956166977 +0000 +*************** +*** 302,308 **** + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/passwd.5 \ + man1/su.1 \ + man8/useradd.8 \ + man8/userdel.8 \ +--- 302,308 ---- + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/ \ + man1/su.1 \ + man8/useradd.8 \ + man8/userdel.8 \ +diff -crB shadow-4.2.1-a/src/Makefile.in shadow-4.2.1-b/src/Makefile.in +*** shadow-4.2.1-a/src/Makefile.in 2014-05-09 16:49:48.000000000 +0000 +--- shadow-4.2.1-b/src/Makefile.in 2016-03-13 10:47:38.824166600 +0000 +*************** +*** 78,84 **** + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +! bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT) + sbin_PROGRAMS = nologin$(EXEEXT) + ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ + chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ +--- 78,84 ---- + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +! bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT) + sbin_PROGRAMS = nologin$(EXEEXT) + ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ + chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1bddfa5abf7a970bb6a1df90271bc6e2c67154a5
by git＠ipfire.org 16 Jun '16

16 Jun '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 1bddfa5abf7a970bb6a1df90271bc6e2c67154a5 (commit) via e6fd1f2d3876aae2c37051fce718f68712fdee4a (commit) via 77d989a66726dfe8282d00eec25f1cca80aca118 (commit) via 6c2720cac6c4d807e7608d10d15349854714a8e0 (commit) via 6ce32b1d84a539bae4503fbfe0cb043edb919265 (commit) via 51f69a46533e2ed7a9c29de23b9ec791d27cc80b (commit) via 2e45b1125bc54f5376b57905541cd1309364579a (commit) via 44285d92a297f27310b3bf4de3d5c0af15a82462 (commit) via e072f094e6fcb20a718caaef91ba9766258e2377 (commit) via 6118218c192bdd0a957e787114190bfc9c440da0 (commit) via b6c0145236385bcef7b3fa016f2884f64a2bc9f0 (commit) via 6bff907d71e6e4c72d94ffd8657141d54575369e (commit) from 0953c087cf94eedb85fcdf312433493800185c64 (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 1bddfa5abf7a970bb6a1df90271bc6e2c67154a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 16 09:34:24 2016 +0100 core104: Ship updated pakfire functions.sh Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e6fd1f2d3876aae2c37051fce718f68712fdee4a Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Jun 10 10:13:41 2016 +0200 Fix in pakfire functions.sh The if statement in line 89 and 99 are useless with the -e conditional expression because it returns true if the path ist a regular file or a directory. So "/etc/init.d/ " returns true and "/etc/init.d/avahi" return also true, but the statement should return only true if we have a regular file. So -f if the right conditional expression, and we only try to execute the init script if the path "/etc/init.d/${1}" points to a regular file. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 77d989a66726dfe8282d00eec25f1cca80aca118 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Jun 10 10:57:13 2016 +0200 Change the default libvirt remote user to libvirt-remote It is possible to communicate per ssh via a socket with libvirt. It is not a good idea to do this as root, so the remote user is now libvirt-remote. Only this user or users in the group libvirt-remote can communicate with the socket. The user libvirt-remote is created without a password. The users have to set a password for this user after installation. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6c2720cac6c4d807e7608d10d15349854714a8e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 16 09:28:34 2016 +0100 core104: Add ntp update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6ce32b1d84a539bae4503fbfe0cb043edb919265 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Jun 14 12:44:48 2016 +0200 ntp: Update to 4.2.8p8 It addresses 1 high- and 4 low--severity security issues, 4 bugfixes, and contains other improvements over 4.2.8p7. For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 51f69a46533e2ed7a9c29de23b9ec791d27cc80b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 1 12:29:02 2016 +0200 ntp: Update to 4.2.8p7 It addresses 11 low- and medium-severity security issues, 16 bugfixes, and contains other improvements over 4.2.8p6. For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2e45b1125bc54f5376b57905541cd1309364579a Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 6 23:37:50 2016 +0100 ntp: Update to 4.2.8p6 "...addresses 9 low- and medium-severity security issues, 10 bugfixes, and contains other improvements over 4.2.8p5." For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 44285d92a297f27310b3bf4de3d5c0af15a82462 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 16 09:26:55 2016 +0100 core104: Add wget update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e072f094e6fcb20a718caaef91ba9766258e2377 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Jun 14 12:33:00 2016 +0200 wget: Update to 1.18 Excerpt from annoncement: "This version fixes a security vulnerability (CVE-2016-4971) present in all old versions of wget. The vulnerability was discovered by Dawid Golunski which were reported to us by Beyond Security's SecuriTeam. On a server redirect from HTTP to a FTP resource, wget would trust the HTTP server and uses the name in the redirected URL as the destination filename. This behaviour was changed and now it works similarly as a redirect from HTTP to another HTTP resource so the original name is used as the destination file. To keep the previous behaviour the user must provide --trust-server-names." Best, Mat-backfromholidays-thias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6118218c192bdd0a957e787114190bfc9c440da0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Feb 8 14:10:57 2016 +0100 wget: Update to 1.17.1 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b6c0145236385bcef7b3fa016f2884f64a2bc9f0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 16 09:24:22 2016 +0100 Start Core Update 104 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{103 => 104}/exclude | 0 .../{oldcore/88 => core/104}/filelists/files | 1 + .../{oldcore/96 => core/104}/filelists/ntp | 0 .../{oldcore/89 => core/104}/filelists/wget | 0 config/rootfiles/core/{103 => 104}/meta | 0 config/rootfiles/core/{103 => 104}/update.sh | 10 +---- config/rootfiles/oldcore/{102 => 103}/exclude | 0 .../{core => oldcore}/103/filelists/coreutils | 0 .../rootfiles/{core => oldcore}/103/filelists/curl | 0 .../{core => oldcore}/103/filelists/diffutils | 0 .../{core => oldcore}/103/filelists/dnsmasq | 0 .../{core => oldcore}/103/filelists/files | 0 .../{core => oldcore}/103/filelists/findutils | 0 .../rootfiles/{core => oldcore}/103/filelists/gawk | 0 .../{core => oldcore}/103/filelists/gettext | 0 .../rootfiles/{core => oldcore}/103/filelists/grep | 0 .../rootfiles/{core => oldcore}/103/filelists/less | 0 .../{core => oldcore}/103/filelists/ncurses | 0 .../{core => oldcore}/103/filelists/ncurses-compat | 0 .../{core => oldcore}/103/filelists/procps | 0 .../{core => oldcore}/103/filelists/sdparm | 0 .../{core => oldcore}/103/filelists/squid | 0 .../{core => oldcore}/103/filelists/tzdata | 0 .../{core => oldcore}/103/filelists/wpa_supplicant | 0 config/rootfiles/oldcore/{99 => 103}/meta | 0 config/rootfiles/{core => oldcore}/103/update.sh | 5 +++ lfs/libvirt | 3 +- lfs/ntp | 4 +- lfs/wget | 6 +-- make.sh | 2 +- src/pakfire/lib/functions.sh | 4 +- src/paks/libvirt/install.sh | 6 +++ ...hange-options-in-libvirtd.conf-for-IPFire.patch | 43 ++++++++++++++++++++++ 33 files changed, 67 insertions(+), 17 deletions(-) rename config/rootfiles/core/{103 => 104}/exclude (100%) copy config/rootfiles/{oldcore/88 => core/104}/filelists/files (50%) copy config/rootfiles/{oldcore/96 => core/104}/filelists/ntp (100%) copy config/rootfiles/{oldcore/89 => core/104}/filelists/wget (100%) rename config/rootfiles/core/{103 => 104}/meta (100%) copy config/rootfiles/core/{103 => 104}/update.sh (94%) copy config/rootfiles/oldcore/{102 => 103}/exclude (100%) rename config/rootfiles/{core => oldcore}/103/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/103/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/103/filelists/files (100%) rename config/rootfiles/{core => oldcore}/103/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/103/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/103/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/103/filelists/less (100%) rename config/rootfiles/{core => oldcore}/103/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/103/filelists/ncurses-compat (100%) rename config/rootfiles/{core => oldcore}/103/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/103/filelists/sdparm (100%) rename config/rootfiles/{core => oldcore}/103/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/103/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/103/filelists/wpa_supplicant (100%) copy config/rootfiles/oldcore/{99 => 103}/meta (100%) rename config/rootfiles/{core => oldcore}/103/update.sh (94%) create mode 100644 src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch Difference in files: diff --git a/config/rootfiles/core/103/exclude b/config/rootfiles/core/103/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/103/exclude +++ /dev/null @@ -1,28 +0,0 @@ -boot/config.txt -boot/grub/grub.cfg -boot/grub/grubenv -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/103/filelists/coreutils b/config/rootfiles/core/103/filelists/coreutils deleted file mode 120000 index 7351ed2..0000000 --- a/config/rootfiles/core/103/filelists/coreutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/curl b/config/rootfiles/core/103/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/103/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/diffutils b/config/rootfiles/core/103/filelists/diffutils deleted file mode 120000 index a5c02f3..0000000 --- a/config/rootfiles/core/103/filelists/diffutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/dnsmasq b/config/rootfiles/core/103/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/103/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/files b/config/rootfiles/core/103/filelists/files deleted file mode 100644 index 2294a5e..0000000 --- a/config/rootfiles/core/103/filelists/files +++ /dev/null @@ -1,9 +0,0 @@ -etc/system-release -etc/issue -lib/udev/network-hotplug-macvtap -lib/udev/network-hotplug-rename -lib/udev/rules.d/60-net.rules -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -usr/sbin/setup -var/ipfire/general-functions.pl -var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/core/103/filelists/findutils b/config/rootfiles/core/103/filelists/findutils deleted file mode 120000 index 545280a..0000000 --- a/config/rootfiles/core/103/filelists/findutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/gawk b/config/rootfiles/core/103/filelists/gawk deleted file mode 120000 index a3bbe32..0000000 --- a/config/rootfiles/core/103/filelists/gawk +++ /dev/null @@ -1 +0,0 @@ -../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/gettext b/config/rootfiles/core/103/filelists/gettext deleted file mode 120000 index b6c6c6f..0000000 --- a/config/rootfiles/core/103/filelists/gettext +++ /dev/null @@ -1 +0,0 @@ -../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/grep b/config/rootfiles/core/103/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/103/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/less b/config/rootfiles/core/103/filelists/less deleted file mode 120000 index 65c0e07..0000000 --- a/config/rootfiles/core/103/filelists/less +++ /dev/null @@ -1 +0,0 @@ -../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/ncurses b/config/rootfiles/core/103/filelists/ncurses deleted file mode 120000 index 512faef..0000000 --- a/config/rootfiles/core/103/filelists/ncurses +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/ncurses-compat b/config/rootfiles/core/103/filelists/ncurses-compat deleted file mode 120000 index 5ecff53..0000000 --- a/config/rootfiles/core/103/filelists/ncurses-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses-compat \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/procps b/config/rootfiles/core/103/filelists/procps deleted file mode 120000 index e17e8ed..0000000 --- a/config/rootfiles/core/103/filelists/procps +++ /dev/null @@ -1 +0,0 @@ -../../../common/procps \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/sdparm b/config/rootfiles/core/103/filelists/sdparm deleted file mode 120000 index 86d9c24..0000000 --- a/config/rootfiles/core/103/filelists/sdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/squid b/config/rootfiles/core/103/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/103/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/tzdata b/config/rootfiles/core/103/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/103/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/wpa_supplicant b/config/rootfiles/core/103/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/103/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/103/meta b/config/rootfiles/core/103/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/103/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh deleted file mode 100644 index 65a85a2..0000000 --- a/config/rootfiles/core/103/update.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -core=103 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /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 - - -# Stop services - -# Remove checkfstab -rm -f /etc/rc.d/init.d/checkfstab -rm -f /etc/rc.d/rcsysinit.d/S19checkfstab - -# Extract files -extract_files - -# update linker config -ldconfig - -# Update Language cache -#/usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/dnsmasq restart - -sync -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/104/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/104/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files new file mode 100644 index 0000000..2fbdb5d --- /dev/null +++ b/config/rootfiles/core/104/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +opt/pakfire/lib/functions.sh diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/core/104/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/104/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/104/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh new file mode 100644 index 0000000..a229864 --- /dev/null +++ b/config/rootfiles/core/104/update.sh @@ -0,0 +1,71 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=104 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /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 + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +touch /var/run/need_reboot +sync + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/103/exclude b/config/rootfiles/oldcore/103/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/103/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/103/filelists/coreutils b/config/rootfiles/oldcore/103/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/curl b/config/rootfiles/oldcore/103/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/diffutils b/config/rootfiles/oldcore/103/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/dnsmasq b/config/rootfiles/oldcore/103/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/files b/config/rootfiles/oldcore/103/filelists/files new file mode 100644 index 0000000..2294a5e --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/files @@ -0,0 +1,9 @@ +etc/system-release +etc/issue +lib/udev/network-hotplug-macvtap +lib/udev/network-hotplug-rename +lib/udev/rules.d/60-net.rules +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +usr/sbin/setup +var/ipfire/general-functions.pl +var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/oldcore/103/filelists/findutils b/config/rootfiles/oldcore/103/filelists/findutils new file mode 120000 index 0000000..545280a --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/findutils @@ -0,0 +1 @@ +../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/gawk b/config/rootfiles/oldcore/103/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/gettext b/config/rootfiles/oldcore/103/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/grep b/config/rootfiles/oldcore/103/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/less b/config/rootfiles/oldcore/103/filelists/less new file mode 120000 index 0000000..65c0e07 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/ncurses b/config/rootfiles/oldcore/103/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/ncurses-compat b/config/rootfiles/oldcore/103/filelists/ncurses-compat new file mode 120000 index 0000000..5ecff53 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/ncurses-compat @@ -0,0 +1 @@ +../../../common/ncurses-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/procps b/config/rootfiles/oldcore/103/filelists/procps new file mode 120000 index 0000000..e17e8ed --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/procps @@ -0,0 +1 @@ +../../../common/procps \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/sdparm b/config/rootfiles/oldcore/103/filelists/sdparm new file mode 120000 index 0000000..86d9c24 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/sdparm @@ -0,0 +1 @@ +../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/squid b/config/rootfiles/oldcore/103/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/tzdata b/config/rootfiles/oldcore/103/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/wpa_supplicant b/config/rootfiles/oldcore/103/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/meta b/config/rootfiles/oldcore/103/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/103/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/103/update.sh b/config/rootfiles/oldcore/103/update.sh new file mode 100644 index 0000000..3f45eaa --- /dev/null +++ b/config/rootfiles/oldcore/103/update.sh @@ -0,0 +1,82 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=103 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /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 + + +# Stop services +/etc/init.d/squid stop + +# Remove checkfstab +rm -f /etc/rc.d/init.d/checkfstab +rm -f /etc/rc.d/rcsysinit.d/S19checkfstab + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Remove potentially broken squid cache index (will be recreated after the next start) +rm -f /var/log/cache/swap.state + +# Start services +/etc/init.d/dnsmasq restart +/etc/init.d/squid start + +sync +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/lfs/libvirt b/lfs/libvirt index b18364b..3c7413f 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 1 +PAK_VER = 2 DEPS = "libpciaccess libyajl ncat qemu" @@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \ --with-openssl --without-sasl \ --without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \ diff --git a/lfs/ntp b/lfs/ntp index 3393f90..536a4a8 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -24,7 +24,7 @@ include Config -VER = 4.2.8p5 +VER = 4.2.8p8 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9f02b2a0acc1617ce2716d529a58d2d8 +$(DL_FILE)_MD5 = 4a8636260435b230636f053ffd070e34 install : $(TARGET) diff --git a/lfs/wget b/lfs/wget index eef2a25..c22a978 100644 --- a/lfs/wget +++ b/lfs/wget @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.16 +VER = 1.18 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fe102975ab3a6c049777883f1bb9ad07 +$(DL_FILE)_MD5 = af9ca95a4bb8ac4a9bf10aeae66fa5ec install : $(TARGET) diff --git a/make.sh b/make.sh index 1945a55..3d5b4a3 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="103" # Core Level (Filename) +CORE="104" # Core Level (Filename) PAKFIRE_CORE="103" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 3f7dbff..3751697 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -86,7 +86,7 @@ start_service() { esac done - if [ -e "/etc/init.d/${1}" ]; then + if [ -f "/etc/init.d/${1}" ]; then if [ -n "${BACKGROUND}" ]; then (sleep ${DELAY} && /etc/init.d/${1} start) & else @@ -96,7 +96,7 @@ start_service() { } stop_service() { - if [ -e "/etc/init.d/${1}" ]; then + if [ -f "/etc/init.d/${1}" ]; then /etc/init.d/${1} stop fi } diff --git a/src/paks/libvirt/install.sh b/src/paks/libvirt/install.sh index 2832197..2009b0e 100644 --- a/src/paks/libvirt/install.sh +++ b/src/paks/libvirt/install.sh @@ -22,6 +22,12 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh + +# creates a new user and group called libvirt-remote if they not exist +getent group libvirt-remote >/dev/null || groupadd libvirt-remote +getent passwd libvirt-remote >/dev/null || \ +useradd -m -g libvirt-remote -s /bin/bash "libvirt-remote" + extract_files start_service --delay 300 --background ${NAME} ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd diff --git a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch new file mode 100644 index 0000000..ed685e8 --- /dev/null +++ b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch @@ -0,0 +1,43 @@ +From 69d6e8ce6c636f78d1db0eebe7fb1cc02ae4fb9a Mon Sep 17 00:00:00 2001 +From: Jonatan Schlag <jonatan.schlag(a)ipfire.org> +Date: Mon, 6 Jun 2016 19:40:50 +0200 +Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire + +Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> +--- + daemon/libvirtd.conf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf +index ac06cdd..1a41914 100644 +--- a/daemon/libvirtd.conf ++++ b/daemon/libvirtd.conf +@@ -87,14 +87,14 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-#unix_sock_group = "libvirt" ++unix_sock_group = "libvirt-remote" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only + # + # Default allows any user. If setting group ownership, you may want to + # restrict this too. +-#unix_sock_ro_perms = "0777" ++unix_sock_ro_perms = "0770" + + # Set the UNIX socket permissions for the R/W socket. This is used + # for full management of VMs +@@ -104,7 +104,7 @@ + # + # If not using PolicyKit and setting group ownership for access + # control, then you may want to relax this too. +-#unix_sock_rw_perms = "0770" ++unix_sock_rw_perms = "0770" + + # Set the UNIX socket permissions for the admin interface socket. + # +-- +2.1.4 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core103, updated. 6bff907d71e6e4c72d94ffd8657141d54575369e
by git＠ipfire.org 15 Jun '16

15 Jun '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, core103 has been updated via 6bff907d71e6e4c72d94ffd8657141d54575369e (commit) from 0953c087cf94eedb85fcdf312433493800185c64 (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 6bff907d71e6e4c72d94ffd8657141d54575369e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 15 18:47:29 2016 +0100 core103: Restart squid and rebuild cache The swap.state file may be broken and so we delete this here and let squid rebuild the cache at the next start. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/103/update.sh | 5 +++++ 1 file changed, 5 insertions(+) Difference in files: diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh index 65a85a2..3f45eaa 100644 --- a/config/rootfiles/core/103/update.sh +++ b/config/rootfiles/core/103/update.sh @@ -42,6 +42,7 @@ done # Stop services +/etc/init.d/squid stop # Remove checkfstab rm -f /etc/rc.d/init.d/checkfstab @@ -56,8 +57,12 @@ ldconfig # Update Language cache #/usr/local/bin/update-lang-cache +# Remove potentially broken squid cache index (will be recreated after the next start) +rm -f /var/log/cache/swap.state + # Start services /etc/init.d/dnsmasq restart +/etc/init.d/squid start sync # This update need a reboot... hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6bff907d71e6e4c72d94ffd8657141d54575369e
by git＠ipfire.org 15 Jun '16

15 Jun '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, master has been updated via 6bff907d71e6e4c72d94ffd8657141d54575369e (commit) from 0953c087cf94eedb85fcdf312433493800185c64 (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 6bff907d71e6e4c72d94ffd8657141d54575369e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 15 18:47:29 2016 +0100 core103: Restart squid and rebuild cache The swap.state file may be broken and so we delete this here and let squid rebuild the cache at the next start. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/103/update.sh | 5 +++++ 1 file changed, 5 insertions(+) Difference in files: diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh index 65a85a2..3f45eaa 100644 --- a/config/rootfiles/core/103/update.sh +++ b/config/rootfiles/core/103/update.sh @@ -42,6 +42,7 @@ done # Stop services +/etc/init.d/squid stop # Remove checkfstab rm -f /etc/rc.d/init.d/checkfstab @@ -56,8 +57,12 @@ ldconfig # Update Language cache #/usr/local/bin/update-lang-cache +# Remove potentially broken squid cache index (will be recreated after the next start) +rm -f /var/log/cache/swap.state + # Start services /etc/init.d/dnsmasq restart +/etc/init.d/squid start sync # This update need a reboot... hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.19-core103, created. 0953c087cf94eedb85fcdf312433493800185c64
by git＠ipfire.org 13 Jun '16

13 Jun '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 tag, v2.19-core103 has been created at 0953c087cf94eedb85fcdf312433493800185c64 (commit) - Log ----------------------------------------------------------------- commit 0953c087cf94eedb85fcdf312433493800185c64 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jun 13 21:40:00 2016 +0200 finish core 103 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- 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 June 2016