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 46c8316642fe90df99de1c0b735f7f4ed9a44464 (commit) via 4fe645dfed32cb08416246269d74a5bf54622f6b (commit) via f82a4492c9f014ebacbc356e4e566c30b13bfaf0 (commit) via a87bea7d39d83a66f90bf626a376c754bc725261 (commit) via 8e82fd2187275b0c881607ae8e013e48c4506fa9 (commit) via a6039dc9d192908c26bf9e81c5133a61edd042b3 (commit) via bf99f427ca1d00acb333e0fd38b616c2f6fd5a3f (commit) via 97b155a15c6d797f3440b6d84957a970c611890c (commit) via 1a44c7a638d3129c0fa5507d4640ba30ebda4647 (commit) from 271e3b6a0ea30fb01b1b9705617db8b276c314f9 (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 46c8316642fe90df99de1c0b735f7f4ed9a44464 Author: Peter Müller peter.mueller@ipfire.org Date: Sun Jul 9 15:11:34 2023 +0000
Core Updte 177: Ship and restart Squid
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 4fe645dfed32cb08416246269d74a5bf54622f6b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 7 21:25:27 2023 +0200
squid: Update to 6.1
For details see: http://lists.squid-cache.org/pipermail/squid-users/2023-July/025929.html
"The Squid HTTP Proxy team is very pleased to announce the availability of the Squid-6.1 release!
This release is we believe, stable enough for general production use.
Support for Squid-5 bug fixes has now officially ceased. Bugs in 5.x will continue to be fixed, however the fixes will be added to the 6.x series. All users of Squid-5.x are encouraged to plan for upgrades."
And: http://www.squid-cache.org/Versions/v6/RELEASENOTES.html
v6 is running since 6.0.1 here in production use without any seen problems...
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit f82a4492c9f014ebacbc356e4e566c30b13bfaf0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jul 7 01:53:32 2023 +0200
samba: update to 4.18.4
commit a87bea7d39d83a66f90bf626a376c754bc725261 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Jul 4 21:17:33 2023 +0200
cups: Remove 5 minutes delay in start_service line in install.sh paks file
- When cups is installed (including when doing a Core Update that includes a cups update) the 5 min delay for starting cups means that it has not restarted by the time that the reboot for the CU has been started. There are then error messages that say that cups couldn't be stopped as it was not running. - When a normal reboot is carried out withoutr any update of cups then the startup has no delay and it starts without any trouble. - This patch removes the 300 secs delay from the start_service line in the install.sh paks file. - The PAK_VER is bumped to ensure that this change is shipped
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 8e82fd2187275b0c881607ae8e013e48c4506fa9 Author: Peter Müller peter.mueller@ipfire.org Date: Sun Jul 9 15:07:07 2023 +0000
Core Update 177: Remove dropped squidclamav add-on, if installed
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit a6039dc9d192908c26bf9e81c5133a61edd042b3 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Jul 4 15:08:19 2023 +0200
squidclamav: Remove package from IPFire as agreed in dev video call 3rd Jul 2023
- Removal of lfs file - Removal of rootfile - Removal of backup includes file - Removal of three patches - Removal of paks files - Adjustment of make.sh to remove squidclamav
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit bf99f427ca1d00acb333e0fd38b616c2f6fd5a3f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jul 6 06:59:46 2023 +0200
memtest: update to 6.20
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 97b155a15c6d797f3440b6d84957a970c611890c Author: Peter Müller peter.mueller@ipfire.org Date: Sun Jul 9 15:00:17 2023 +0000
Core Update 177: Ship kernel and regenerate initial ramdisks locally
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 1a44c7a638d3129c0fa5507d4640ba30ebda4647 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jul 6 07:00:34 2023 +0200
kernel: update to 6.1.37
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/squidclamav | 1 - config/kernel/kernel.config.aarch64-ipfire | 9 +- config/kernel/kernel.config.x86_64-ipfire | 12 +- config/rootfiles/common/aarch64/linux | 37 +++-- config/rootfiles/common/x86_64/linux | 37 +++-- .../124 => core/177}/filelists/aarch64/linux | 0 .../{oldcore/100 => core/177}/filelists/squid | 0 .../100 => core/177}/filelists/x86_64/linux | 0 config/rootfiles/core/177/update.sh | 82 ++++++++- config/rootfiles/packages/squidclamav | 14 -- config/squidclamav/squidclamav.conf | 39 ----- lfs/cups | 2 +- lfs/linux | 4 +- lfs/memtest | 4 +- lfs/samba | 6 +- lfs/squid | 5 +- lfs/squidclamav | 95 ----------- make.sh | 1 - src/paks/cups/install.sh | 2 +- src/paks/squidclamav/install.sh | 27 --- src/paks/squidclamav/uninstall.sh | 28 ---- src/paks/squidclamav/update.sh | 53 ------ src/patches/squidclamav-5.11-dont_use_ipv6.patch | 13 -- ...dclamav-5.11-source-address-parsing-issue.patch | 13 -- .../squidclamav-5.11-squid-helper-protocol.patch | 185 --------------------- 25 files changed, 145 insertions(+), 524 deletions(-) delete mode 100644 config/backup/includes/squidclamav copy config/rootfiles/{oldcore/124 => core/177}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/100 => core/177}/filelists/squid (100%) copy config/rootfiles/{oldcore/100 => core/177}/filelists/x86_64/linux (100%) delete mode 100644 config/rootfiles/packages/squidclamav delete mode 100644 config/squidclamav/squidclamav.conf delete mode 100644 lfs/squidclamav delete mode 100644 src/paks/squidclamav/install.sh delete mode 100644 src/paks/squidclamav/uninstall.sh delete mode 100644 src/paks/squidclamav/update.sh delete mode 100644 src/patches/squidclamav-5.11-dont_use_ipv6.patch delete mode 100644 src/patches/squidclamav-5.11-source-address-parsing-issue.patch delete mode 100644 src/patches/squidclamav-5.11-squid-helper-protocol.patch
Difference in files: diff --git a/config/backup/includes/squidclamav b/config/backup/includes/squidclamav deleted file mode 100644 index bacc23b67..000000000 --- a/config/backup/includes/squidclamav +++ /dev/null @@ -1 +0,0 @@ -/etc/squidclamav.conf diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 2261c22dc..a2c852654 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.30-ipfire Kernel Configuration +# Linux/arm64 6.1.37-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 @@ -954,6 +954,7 @@ CONFIG_MAPPING_DIRTY_HELPERS=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set # CONFIG_LRU_GEN is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y
# # Data Access Monitoring @@ -7835,7 +7836,7 @@ CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y -CONFIG_SMBFS_COMMON=m +CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 121d1cda9..0017a6f54 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.30-ipfire Kernel Configuration +# Linux/x86 6.1.37-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 @@ -996,6 +996,7 @@ CONFIG_MAPPING_DIRTY_HELPERS=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set # CONFIG_LRU_GEN is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y
# # Data Access Monitoring @@ -6523,9 +6524,8 @@ CONFIG_AMILO_RFKILL=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_TABLET is not set # CONFIG_GPD_POCKET_FAN is not set -# CONFIG_HP_ACCEL is not set +# CONFIG_X86_PLATFORM_DRIVERS_HP is not set # CONFIG_WIRELESS_HOTKEY is not set -CONFIG_HP_WMI=m # CONFIG_IBM_RTL is not set CONFIG_IDEAPAD_LAPTOP=m CONFIG_SENSORS_HDAPS=m @@ -7047,7 +7047,7 @@ CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y -CONFIG_SMBFS_COMMON=m +CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 243eb8d46..49bbc7c57 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6277,9 +6277,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/fs/ceph #lib/modules/KVER-ipfire/build/fs/ceph/Kconfig #lib/modules/KVER-ipfire/build/fs/ceph/Makefile -#lib/modules/KVER-ipfire/build/fs/cifs -#lib/modules/KVER-ipfire/build/fs/cifs/Kconfig -#lib/modules/KVER-ipfire/build/fs/cifs/Makefile #lib/modules/KVER-ipfire/build/fs/coda #lib/modules/KVER-ipfire/build/fs/coda/Kconfig #lib/modules/KVER-ipfire/build/fs/coda/Makefile @@ -6370,9 +6367,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/fs/kernfs #lib/modules/KVER-ipfire/build/fs/kernfs/Kconfig #lib/modules/KVER-ipfire/build/fs/kernfs/Makefile -#lib/modules/KVER-ipfire/build/fs/ksmbd -#lib/modules/KVER-ipfire/build/fs/ksmbd/Kconfig -#lib/modules/KVER-ipfire/build/fs/ksmbd/Makefile #lib/modules/KVER-ipfire/build/fs/lockd #lib/modules/KVER-ipfire/build/fs/lockd/Makefile #lib/modules/KVER-ipfire/build/fs/minix @@ -6462,8 +6456,17 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/fs/romfs #lib/modules/KVER-ipfire/build/fs/romfs/Kconfig #lib/modules/KVER-ipfire/build/fs/romfs/Makefile -#lib/modules/KVER-ipfire/build/fs/smbfs_common -#lib/modules/KVER-ipfire/build/fs/smbfs_common/Makefile +#lib/modules/KVER-ipfire/build/fs/smb +#lib/modules/KVER-ipfire/build/fs/smb/Kconfig +#lib/modules/KVER-ipfire/build/fs/smb/Makefile +#lib/modules/KVER-ipfire/build/fs/smb/client +#lib/modules/KVER-ipfire/build/fs/smb/client/Kconfig +#lib/modules/KVER-ipfire/build/fs/smb/client/Makefile +#lib/modules/KVER-ipfire/build/fs/smb/common +#lib/modules/KVER-ipfire/build/fs/smb/common/Makefile +#lib/modules/KVER-ipfire/build/fs/smb/server +#lib/modules/KVER-ipfire/build/fs/smb/server/Kconfig +#lib/modules/KVER-ipfire/build/fs/smb/server/Makefile #lib/modules/KVER-ipfire/build/fs/squashfs #lib/modules/KVER-ipfire/build/fs/squashfs/Kconfig #lib/modules/KVER-ipfire/build/fs/squashfs/Makefile @@ -8796,6 +8799,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/LOCKD_V4 #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT #lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE +#lib/modules/KVER-ipfire/build/include/config/LOCK_MM_AND_FIND_VMA #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER #lib/modules/KVER-ipfire/build/include/config/LOGO #lib/modules/KVER-ipfire/build/include/config/LOGO_LINUX_CLUT224 @@ -10429,7 +10433,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SLICOSS #lib/modules/KVER-ipfire/build/include/config/SLUB #lib/modules/KVER-ipfire/build/include/config/SLUB_CPU_PARTIAL -#lib/modules/KVER-ipfire/build/include/config/SMBFS_COMMON +#lib/modules/KVER-ipfire/build/include/config/SMBFS #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_CHECK_CAP_NET_ADMIN #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_KERBEROS5 @@ -21694,8 +21698,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/fs/btrfs/btrfs.ko.xz #lib/modules/KVER-ipfire/kernel/fs/cachefiles #lib/modules/KVER-ipfire/kernel/fs/cachefiles/cachefiles.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/cifs -#lib/modules/KVER-ipfire/kernel/fs/cifs/cifs.ko.xz #lib/modules/KVER-ipfire/kernel/fs/configfs #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko.xz #lib/modules/KVER-ipfire/kernel/fs/efivarfs @@ -21711,8 +21713,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/fs/fuse #lib/modules/KVER-ipfire/kernel/fs/fuse/cuse.ko.xz #lib/modules/KVER-ipfire/kernel/fs/fuse/fuse.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/ksmbd -#lib/modules/KVER-ipfire/kernel/fs/ksmbd/ksmbd.ko.xz #lib/modules/KVER-ipfire/kernel/fs/lockd #lib/modules/KVER-ipfire/kernel/fs/lockd/lockd.ko.xz #lib/modules/KVER-ipfire/kernel/fs/netfs @@ -21787,9 +21787,14 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/fs/ntfs3/ntfs3.ko.xz #lib/modules/KVER-ipfire/kernel/fs/reiserfs #lib/modules/KVER-ipfire/kernel/fs/reiserfs/reiserfs.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_arc4.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_md4.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb +#lib/modules/KVER-ipfire/kernel/fs/smb/client +#lib/modules/KVER-ipfire/kernel/fs/smb/client/cifs.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb/common +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_arc4.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_md4.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb/server +#lib/modules/KVER-ipfire/kernel/fs/smb/server/ksmbd.ko.xz #lib/modules/KVER-ipfire/kernel/fs/udf #lib/modules/KVER-ipfire/kernel/fs/udf/udf.ko.xz #lib/modules/KVER-ipfire/kernel/fs/xfs diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index f5e7ced10..2da7da282 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6112,9 +6112,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/fs/ceph #lib/modules/KVER-ipfire/build/fs/ceph/Kconfig #lib/modules/KVER-ipfire/build/fs/ceph/Makefile -#lib/modules/KVER-ipfire/build/fs/cifs -#lib/modules/KVER-ipfire/build/fs/cifs/Kconfig -#lib/modules/KVER-ipfire/build/fs/cifs/Makefile #lib/modules/KVER-ipfire/build/fs/coda #lib/modules/KVER-ipfire/build/fs/coda/Kconfig #lib/modules/KVER-ipfire/build/fs/coda/Makefile @@ -6205,9 +6202,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/fs/kernfs #lib/modules/KVER-ipfire/build/fs/kernfs/Kconfig #lib/modules/KVER-ipfire/build/fs/kernfs/Makefile -#lib/modules/KVER-ipfire/build/fs/ksmbd -#lib/modules/KVER-ipfire/build/fs/ksmbd/Kconfig -#lib/modules/KVER-ipfire/build/fs/ksmbd/Makefile #lib/modules/KVER-ipfire/build/fs/lockd #lib/modules/KVER-ipfire/build/fs/lockd/Makefile #lib/modules/KVER-ipfire/build/fs/minix @@ -6297,8 +6291,17 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/fs/romfs #lib/modules/KVER-ipfire/build/fs/romfs/Kconfig #lib/modules/KVER-ipfire/build/fs/romfs/Makefile -#lib/modules/KVER-ipfire/build/fs/smbfs_common -#lib/modules/KVER-ipfire/build/fs/smbfs_common/Makefile +#lib/modules/KVER-ipfire/build/fs/smb +#lib/modules/KVER-ipfire/build/fs/smb/Kconfig +#lib/modules/KVER-ipfire/build/fs/smb/Makefile +#lib/modules/KVER-ipfire/build/fs/smb/client +#lib/modules/KVER-ipfire/build/fs/smb/client/Kconfig +#lib/modules/KVER-ipfire/build/fs/smb/client/Makefile +#lib/modules/KVER-ipfire/build/fs/smb/common +#lib/modules/KVER-ipfire/build/fs/smb/common/Makefile +#lib/modules/KVER-ipfire/build/fs/smb/server +#lib/modules/KVER-ipfire/build/fs/smb/server/Kconfig +#lib/modules/KVER-ipfire/build/fs/smb/server/Makefile #lib/modules/KVER-ipfire/build/fs/squashfs #lib/modules/KVER-ipfire/build/fs/squashfs/Kconfig #lib/modules/KVER-ipfire/build/fs/squashfs/Makefile @@ -8671,6 +8674,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/LOCKUP_DETECTOR #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT #lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE +#lib/modules/KVER-ipfire/build/include/config/LOCK_MM_AND_FIND_VMA #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER #lib/modules/KVER-ipfire/build/include/config/LOGO #lib/modules/KVER-ipfire/build/include/config/LOGO_LINUX_CLUT224 @@ -10406,7 +10410,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SLS #lib/modules/KVER-ipfire/build/include/config/SLUB #lib/modules/KVER-ipfire/build/include/config/SLUB_CPU_PARTIAL -#lib/modules/KVER-ipfire/build/include/config/SMBFS_COMMON +#lib/modules/KVER-ipfire/build/include/config/SMBFS #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_CHECK_CAP_NET_ADMIN #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_KERBEROS5 @@ -22267,8 +22271,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/fs/btrfs/btrfs.ko.xz #lib/modules/KVER-ipfire/kernel/fs/cachefiles #lib/modules/KVER-ipfire/kernel/fs/cachefiles/cachefiles.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/cifs -#lib/modules/KVER-ipfire/kernel/fs/cifs/cifs.ko.xz #lib/modules/KVER-ipfire/kernel/fs/configfs #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko.xz #lib/modules/KVER-ipfire/kernel/fs/dlm @@ -22286,8 +22288,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/fs/fuse #lib/modules/KVER-ipfire/kernel/fs/fuse/cuse.ko.xz #lib/modules/KVER-ipfire/kernel/fs/fuse/fuse.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/ksmbd -#lib/modules/KVER-ipfire/kernel/fs/ksmbd/ksmbd.ko.xz #lib/modules/KVER-ipfire/kernel/fs/lockd #lib/modules/KVER-ipfire/kernel/fs/lockd/lockd.ko.xz #lib/modules/KVER-ipfire/kernel/fs/netfs @@ -22362,9 +22362,14 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/fs/ntfs3/ntfs3.ko.xz #lib/modules/KVER-ipfire/kernel/fs/reiserfs #lib/modules/KVER-ipfire/kernel/fs/reiserfs/reiserfs.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_arc4.ko.xz -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_md4.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb +#lib/modules/KVER-ipfire/kernel/fs/smb/client +#lib/modules/KVER-ipfire/kernel/fs/smb/client/cifs.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb/common +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_arc4.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_md4.ko.xz +#lib/modules/KVER-ipfire/kernel/fs/smb/server +#lib/modules/KVER-ipfire/kernel/fs/smb/server/ksmbd.ko.xz #lib/modules/KVER-ipfire/kernel/fs/udf #lib/modules/KVER-ipfire/kernel/fs/udf/udf.ko.xz #lib/modules/KVER-ipfire/kernel/fs/xfs diff --git a/config/rootfiles/core/177/filelists/aarch64/linux b/config/rootfiles/core/177/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/177/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/177/filelists/squid b/config/rootfiles/core/177/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/177/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/177/filelists/x86_64/linux b/config/rootfiles/core/177/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/177/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh index 43f9a02f6..ebe2b4fe5 100644 --- a/config/rootfiles/core/177/update.sh +++ b/config/rootfiles/core/177/update.sh @@ -26,12 +26,76 @@
core=177
+exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + + # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done
# Stop services +/etc/rc.d/init.d/squid stop + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + +# Remove dropped squidclamav add-on, if installed +if [ -e "/opt/pakfire/db/installed/meta-squidclamav" ]; then + stop_service "squidclamav" + for i in $(</opt/pakfire/db/rootfiles/squidclamav); do + rm -rfv "/${i}" + done +fi +rm -f \ + /opt/pakfire/db/installed/meta-squidclamav \ + /opt/pakfire/db/meta/meta-squidclamav \ + /opt/pakfire/db/rootfiles/squidclamav
# Extract files extract_files @@ -56,10 +120,10 @@ ldconfig # Start services /etc/init.d/ntp restart if [ -f /var/ipfire/proxy/enable ]; then - /etc/init.d/squid restart + /etc/init.d/squid start fi
-# Rebuild initial ramdisk to apply microcode updates +# Rebuild initial ramdisks dracut --regenerate-all --force KVER="xxxKVERxxx" case "$(uname -m)" in @@ -69,6 +133,20 @@ case "$(uname -m)" in ;; esac
+# remove lm_sensor config after collectd was started +# to re-search sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + # This update needs a reboot... touch /var/run/need_reboot
diff --git a/config/rootfiles/packages/squidclamav b/config/rootfiles/packages/squidclamav deleted file mode 100644 index 5976a0c47..000000000 --- a/config/rootfiles/packages/squidclamav +++ /dev/null @@ -1,14 +0,0 @@ -etc/squidclamav.conf -usr/bin/squidclamav -#usr/libexec/squidclamav -#usr/libexec/squidclamav/clwarn.cgi -#usr/libexec/squidclamav/clwarn.cgi.de_DE -#usr/libexec/squidclamav/clwarn.cgi.en_EN -#usr/libexec/squidclamav/clwarn.cgi.fr_FR -#usr/libexec/squidclamav/clwarn.cgi.pt_BR -#usr/libexec/squidclamav/clwarn.cgi.ru_RU -#usr/share/man/man1/squidclamav.1 -#usr/share/squidclamav -#usr/share/squidclamav/README -var/ipfire/backup/addons/includes/squidclamav -srv/web/ipfire/html/clwarn.cgi diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf deleted file mode 100644 index 2b8f5dc02..000000000 --- a/config/squidclamav/squidclamav.conf +++ /dev/null @@ -1,39 +0,0 @@ -squid_ip 127.0.0.1 -squid_port 800 -# -logfile /var/log/squid/squidclamav.log -redirect http://127.0.0.1:81/clwarn.cgi -# -debug 0 -stat 0 -# -clamd_local /var/run/clamav/clamd -#clamd_ip 192.168.1.5 -#clamd_port 3310 -# -maxsize 5000000 -maxredir 30 -timeout 60 -trust_cache 1 -# -# Do not scan standard HTTP images -abort ^.*.(ico|gif|png|jpg)$ -abortcontent ^image/.*$ -# -# Do not scan text and javascript files -abort ^.*.(css|xml|xsl|js|html|jsp)$ -abortcontent ^text/.*$ -abortcontent ^application/x-javascript$ -# -# Do not scan streaming videos -abortcontent ^video/mp4$ -abortcontent ^video/x-flv$ -# -# Do not scan pdf and flash -#abort ^.*.(pdf|swf)$ -# -# Do not scan sequence of framed Microsoft Media Server (MMS) data packets -abortcontent ^.*application/x-mms-framed.*$ -# -# White list some sites -whitelist .*.clamav.net diff --git a/lfs/cups b/lfs/cups index 70839736f..cae829432 100644 --- a/lfs/cups +++ b/lfs/cups @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 36 +PAK_VER = 37
DEPS = avahi cups-filters dbus ghostscript libexif
diff --git a/lfs/linux b/lfs/linux index b30a28fff..87442185a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.1.30 +VER = 6.1.37
ARM_PATCHES = 6.1.y-ipfire2
@@ -76,7 +76,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_BLAKE2 = d3c4cda0bbd978ad7e39a44e03789f38b7a48a92405312f90fd944a670ca438e1dd212af2b075820896b25405027be92071dbd24455331de742aa5c9f2ac3407 +$(DL_FILE)_BLAKE2 = 9ea4b47123c21b658923f46d3f7d6b911f49e8616f038feefef860b3bb8756b2cbd0b097640b18333d79951b99c37dc32c1a4357263ff69641580c4d3ab4bc56 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
install : $(TARGET) diff --git a/lfs/memtest b/lfs/memtest index a26beaef4..d5baca8ca 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -24,7 +24,7 @@
include Config
-VER = 6.10 +VER = 6.20
THISAPP = memtest86plus-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 +$(DL_FILE)_BLAKE2 = 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966
install : $(TARGET)
diff --git a/lfs/samba b/lfs/samba index cda2a2820..9e104f64a 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@
include Config
-VER = 4.18.1 +VER = 4.18.4 SUMMARY = A SMB/CIFS File, Print, and Authentication Server
THISAPP = samba-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 93 +PAK_VER = 94
DEPS = avahi cups perl-Parse-Yapp perl-JSON
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f8df6582044ff802766a397cc2a9216eb41c9353822d94281b86fb6b833b23eeaf3eb5a0d32e3f2079e59d098a16f87406cf1da65f58818a73767f27b7f7dc1f +$(DL_FILE)_BLAKE2 = 1f1aab7eb933111b9b1c72af8c3dd379fe34014085129e9d5cc400b4e434742e1c08ad4fdf2a98291d6063ce9b2ddc811e9ab5dbb133a85e97f2158f83dd7c96
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid index bc0682031..26b8249cc 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 5.9 +VER = 6.1
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 898a34357f8019291379ea37c66fa312e1a6437e8f643987dd4e54d7d52728248e16129b00195c5f6e0378c0f32c9f9ade3f98ca0ec4bb952f9f443357face82 +$(DL_FILE)_BLAKE2 = 840ea8b09f8518f6e3b92a22cc6e6d3befc08b9e9650e13a54b607b398a967f1bc2b30e5b52cae5423a49ee02d0cfc13d3488c2b9ece3b3c0d4df689de390adf
install : $(TARGET)
@@ -117,6 +117,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-build-info \ --enable-eui \ --enable-async-io=16 \ + --enable-translation \ --enable-unlinkd \ --enable-internal-dns \ --enable-epoll \ diff --git a/lfs/squidclamav b/lfs/squidclamav deleted file mode 100644 index 06133c5de..000000000 --- a/lfs/squidclamav +++ /dev/null @@ -1,95 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -SUMMARY = Antivirus redirector for Squid based on ClamAv - -VER = 5.11 - -THISAPP = squidclamav-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = squidclamav -PAK_VER = 22 - -DEPS = clamav - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 5f180f49685df355c1f142beac6f10161830b6e274cc9efac81564010f751edead9afce6118ddb5308297b6d3eb621f97a567b4f9cf096e08df833f70e03d24f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-squid-helper-protocol.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-source-address-parsing-issue.patch - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make install - install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf - chown -v root:nobody /etc/squidclamav.conf - install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav - chmod 755 /srv/web/ipfire/html/clwarn.cgi - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index db9ee9a97..57b6c6f15 100755 --- a/make.sh +++ b/make.sh @@ -1532,7 +1532,6 @@ buildipfire() { lfsmake2 perl-Authen-SASL lfsmake2 perl-MIME-Lite lfsmake2 perl-Email-Date-Format - lfsmake2 squidclamav lfsmake2 vnstat lfsmake2 iw lfsmake2 wpa_supplicant diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index cc5866971..f1d45b697 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -25,7 +25,7 @@ extract_files restore_backup "${NAME}" /etc/init.d/messagebus reload -start_service --delay 300 --background ${NAME} +start_service --background ${NAME} ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups ln -svf ../init.d/cups /etc/rc.d/rc6.d/K00cups diff --git a/src/paks/squidclamav/install.sh b/src/paks/squidclamav/install.sh deleted file mode 100644 index 42bd5ba36..000000000 --- a/src/paks/squidclamav/install.sh +++ /dev/null @@ -1,27 +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 2 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) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -/etc/init.d/squid restart diff --git a/src/paks/squidclamav/uninstall.sh b/src/paks/squidclamav/uninstall.sh deleted file mode 100644 index d2aa435e3..000000000 --- a/src/paks/squidclamav/uninstall.sh +++ /dev/null @@ -1,28 +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 2 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) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/etc/init.d/squid stop -make_backup ${NAME} -remove_files -/etc/init.d/squid start diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh deleted file mode 100644 index 43760856c..000000000 --- a/src/paks/squidclamav/update.sh +++ /dev/null @@ -1,53 +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 2 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) 2010 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -extract_files - -VERSION=$(cat /opt/pakfire/db/installed/meta-squidclamav | grep Release | cut -d" " -f2) - -if [ "$VERSION" -gt "10" ]; then - restore_backup ${NAME} -fi - -if [ "$VERSION" -lt "11" ]; then - sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf -fi - -if [ "$VERSION" -lt "16" ]; then - sed -i /etc/squidclamav.conf \ - -e "s/proxy none//g" \ - -e "s/^#squid_ip 127.0.0.1/squid_ip 127.0.0.1/g" \ - -e "s/^#squid_port 3128/squid_port 800/g" \ - -e "s/^#trust_cache 1/trust_cache 1/g" - - # Fix permissions. - chmod 664 /etc/squidclamav.conf - chown root.nobody /etc/squidclamav.conf - - # Regenerate configuration files. - perl /srv/web/ipfire/cgi-bin/proxy.cgi -fi - -/etc/init.d/squid restart diff --git a/src/patches/squidclamav-5.11-dont_use_ipv6.patch b/src/patches/squidclamav-5.11-dont_use_ipv6.patch deleted file mode 100644 index 45889625f..000000000 --- a/src/patches/squidclamav-5.11-dont_use_ipv6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur a/src/squidclamav.c b/src/squidclamav.c ---- a/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 -+++ b/src/squidclamav.c 2013-07-06 19:10:56.375292374 +0200 -@@ -413,6 +413,9 @@ - /* Suppress error: SSL certificate problem, verify that the CA cert is OK */ - curl_easy_setopt (eh, CURLOPT_SSL_VERIFYHOST, 0); - curl_easy_setopt (eh, CURLOPT_SSL_VERIFYPEER, 0); -+ -+ /* Prevent squidclamav from using IPv6 - fix by Nico Prenzel */ -+ curl_easy_setopt (eh, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); - } - } - /* create a squidguard child process and setup pipes */ diff --git a/src/patches/squidclamav-5.11-source-address-parsing-issue.patch b/src/patches/squidclamav-5.11-source-address-parsing-issue.patch deleted file mode 100644 index 4031c733d..000000000 --- a/src/patches/squidclamav-5.11-source-address-parsing-issue.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- squidclamav-5.11/src/pattern.c~ 2014-10-29 13:08:05.658143495 +0000 -+++ squidclamav-5.11/src/pattern.c 2014-10-29 13:08:20.964642365 +0000 -@@ -151,10 +151,6 @@ - return 1; - } - -- /* extract source ipaddress and source fqdn */ -- if (parseSourceAddress(in_buff.src_address, "/") != 0) { -- } -- - if (debug != 0) - logit(log_file, "DEBUG Parsed request: %s %s/%s %s %s\n", in_buff.url, in_buff.ipaddress, in_buff.fqdn, in_buff.ident, in_buff.method); - diff --git a/src/patches/squidclamav-5.11-squid-helper-protocol.patch b/src/patches/squidclamav-5.11-squid-helper-protocol.patch deleted file mode 100644 index e64bcafef..000000000 --- a/src/patches/squidclamav-5.11-squid-helper-protocol.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -Naur squidclamav-5.11.org/src/squidclamav.c squidclamav-5.11/src/squidclamav.c ---- squidclamav-5.11.org/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 -+++ squidclamav-5.11/src/squidclamav.c 2014-06-03 12:26:36.215696508 +0200 -@@ -483,7 +483,7 @@ - aren't appropriate, then just echo back the line from stdin */ - if (buff_status == 1) { - logit(log_file, "DEBUG Invalid input buffer, aborting: %s\n", sbuff); -- puts(""); -+ puts("BH message="Invalid input buffer""); - fflush(stdout); - continue; - } -@@ -496,7 +496,7 @@ - logit(log_file, "DEBUG No squidguard and no antivir check (TRUSTUSER match) for user: %s\n", in_buff.ident); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="TRUSTUSER match""); - fflush(stdout); - continue; - } -@@ -508,7 +508,7 @@ - logit(log_file, "DEBUG No squidguard and no antivir check (TRUSTCLIENT match) for address: %s/%s\n",in_buff.ipaddress, in_buff.fqdn); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="TRUSTCLIENT match""); - fflush(stdout); - continue; - } -@@ -520,7 +520,7 @@ - logit(log_file, "DEBUG No squidguard and no antivir check (WHITELIST match) for url: %s\n", in_buff.url); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="WHITLIST match""); - fflush(stdout); - continue; - } -@@ -536,7 +536,7 @@ - if ((sockd = dconnect ()) < 0) - { - logit(log_file, "ERROR Can't connect to Clamd daemon, fallback to Squid.\n"); -- puts(""); -+ puts("BH message="Cannot connect to clamd""); - fflush(stdout); - continue; - } -@@ -546,7 +546,7 @@ - if (write (sockd, "zINSTREAM", 10) <= 0) - { - logit(log_file, "ERROR Can't write to Clamd socket.\n"); -- puts(""); -+ puts("BG message="Cannot write to clamd socket""); - fflush(stdout); - continue; - } -@@ -614,8 +614,7 @@ - logit(log_file, "Squid Cache purged of url %s.\n", in_buff.url); - } - } -- fprintf (stdout, "%s %s %s %s\n", urlredir, -- in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK rewrite-url="%s"\n", urlredir); - fflush(stdout); - xfree(urlredir); - if (debug != 0) -@@ -675,7 +674,7 @@ - continue operation (so that Squid still works!), - we simply echo stdin to stdout - i.e. "bridge mode" :-) */ - if (bridge_mode == 1) { -- puts(""); -+ puts("ERR message="brigde mode""); - fflush(stdout); - continue; - } -@@ -685,7 +684,7 @@ - if (buff_status == -1) { - if (debug > 2) - logit(log_file, "DEBUG method is not GET skipping virus scan.\n"); -- puts(""); -+ puts("ERR message="method is not GET skipping virus scan""); - fflush(stdout); - continue; - } -@@ -699,7 +698,7 @@ - timeit(g_start, "Total"); - - /* no replacement for the URL was found */ -- puts(""); -+ puts("ERR message="ABORT match""); - fflush(stdout); - continue; - -@@ -750,7 +749,7 @@ - logit(log_file, "DEBUG HIT Cache found, trust cache enabled, skipping...\n"); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="cache hit found""); - fflush(stdout); - continue; - } -@@ -762,7 +761,7 @@ - logit(log_file, "ERROR No content length from url %s\n", in_buff.url); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="no content length from URL""); - fflush(stdout); - continue; - } -@@ -775,7 +774,7 @@ - logit(log_file, "DEBUG No antivir check (Content length is upper than maxsize): %'.2f > %'.2f\n", usize, maxsize); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="content length is upper than maxsize""); - fflush(stdout); - continue; - } -@@ -787,7 +786,7 @@ - in_buff.url); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="no content type from URL""); - fflush(stdout); - continue; - } -@@ -799,7 +798,7 @@ - logit(log_file, "DEBUG No antivir check (ABORTCONTENT match) for content-type: %s\n", content_type); - if (statit == 1) - timeit(g_start, "Total"); -- puts(""); -+ puts("ERR message="ABORTCONTENT match""); - fflush(stdout); - continue; - } -@@ -814,7 +813,7 @@ - if ((sockd = dconnect ()) < 0) - { - logit(log_file, "ERROR Can't connect to Clamd daemon, fallback to Squid.\n"); -- puts(""); -+ puts("BH message="cannot connect clamd daemon""); - fflush(stdout); - continue; - } -@@ -824,7 +823,7 @@ - if (write (sockd, "zINSTREAM", 10) <= 0) - { - logit(log_file, "ERROR Can't write to Clamd socket.\n"); -- puts(""); -+ puts("BH message="cannot write to clamd socket""); - fflush(stdout); - continue; - } -@@ -844,7 +843,7 @@ - close (sockd); - if (debug > 1) - logit(log_file, "DEBUG Connection to clamd closed.\n"); -- puts(""); -+ puts("ERR message="connection to clamd closed""); - fflush(stdout); - if (statit == 1) - timeit(g_start, "Total"); -@@ -892,8 +891,7 @@ - logit(log_file, "Squid Cache purged of url %s.\n", in_buff.url); - } - } -- fprintf (stdout, "%s %s %s %s\n", urlredir, -- in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK rewrite-url="%s"\n", urlredir); - fflush(stdout); - xfree(urlredir); - if (debug != 0) -@@ -911,7 +909,7 @@ - if (virusfound == 0) { - if (debug != 0) - logit(log_file, "DEBUG No virus detected.\n"); -- puts(""); -+ puts("ERR message="no virus detected""); - fflush(stdout); - } - }
hooks/post-receive -- IPFire 2.x development tree