From 02070ce84cf9767f36f45834d5af394ffee980cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 9 Jan 2020 17:06:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=82=D1=87=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app-emulation/vpcs/.calculate_directory | 1 - .../app-emulation/vpcs/vpcs-0.6-gcc71.patch | 15 - .../fix_date_xlsx_export-5.4.2.patch | 122 ------- .../dev-lang/.calculate_directory | 1 - .../dev-lang/erlang/.calculate_directory | 1 - .../dev-lang/erlang/erlang-15-ncurses.patch | 14 - .../dev-libs/ace/.calculate_directory | 1 - .../dev-libs/ace/ace-5.7-cpu_set.patch | 16 - .../dev-libs/efl/.calculate_directory | 1 - .../dev-libs/efl/efl-GLintptr.patch | 37 --- .../dev-libs/libqtxdg/.calculate_directory | 1 - .../libqtxdg-3.2.0-fix_drag_uri.patch | 14 - .../dev-python/sudsds/.calculate_directory | 1 - .../dev-python/sudsds/openssl-1.1.patch | 37 --- .../kde-apps/.calculate_directory | 1 - .../kde-apps/umbrello/.calculate_directory | 1 - .../umbrello-18.08.3-compile_fix.patch | 31 -- .../kde-base/.calculate_directory | 1 - .../kde-base/kdelibs/.calculate_directory | 1 - .../kdelibs/inherit_generic_fallback.patch | 18 -- .../kde-base/kdelibs/samba-icon.patch | 20 -- .../kde-plasma/.calculate_directory | 1 - .../kde-plasma/kwin/.calculate_directory | 1 - .../kwin/kwin-5.10.5-fix_import.patch | 13 - .../lxqt-config/.calculate_directory | 1 - .../lxqt-config/lxqt-config-0.9.0.patch | 20 -- .../mail-filter/.calculate_directory | 1 - .../mail-filter/clamsmtp/.calculate_directory | 1 - .../mail-filter/clamsmtp/include_order.patch | 63 ---- .../media-gfx/darktable/.calculate_directory | 1 - .../darktable-2.6.0-i686_fix_sse_wit.patch | 14 - .../media-gfx/gimp/.calculate_directory | 1 - .../media-gfx/gimp/remove_wilber-2.8.6.patch | 28 -- .../media-gfx/nomacs/.calculate_directory | 1 - .../media-gfx/nomacs/libqpsd_fix.patch | 77 ----- .../allegro/allegro-5.2.4-fix_mesa1.patch | 25 -- .../allegro/allegro-5.2.4-fix_mesa2.patch | 45 --- .../media-plugins/.calculate_directory | 1 - .../.calculate_directory | 1 - ...vr-mediaportal-tvserver-2.4.19-glibc.patch | 14 - .../kodi-pvr-stalker/.calculate_directory | 1 - .../kodi-pvr-stalker-2.8.6-gcc73.patch | 13 - .../media-sound/.calculate_directory | 1 - .../clementine/.calculate_directory | 1 - .../clementine/compile_error.patch | 20 -- .../net-im/ejabberd/.calculate_directory | 1 - .../net-im/ejabberd/README.txt | 3 - .../net-im/ejabberd/mod_logxml-16.01.patch | 278 ---------------- .../net-im/ejabberd/mod_logxml-16.02.patch | 278 ---------------- .../net-im/ejabberd/mod_logxml-16.04.patch | 300 ------------------ .../net-im/ejabberd/mod_logxml-16.09.patch | 278 ---------------- .../net-im/ejabberd/mod_logxml.patch | 266 ---------------- .../net-libs/webkit-gtk/.calculate_directory | 1 - .../webkit-gtk/webkit-gtk-JSStringRef.patch | 20 -- .../webkit-gtk/webkit-gtk-WKString.patch | 20 -- .../net-misc/netkit-rwho/.calculate_directory | 1 - .../netkit-rwho-0.17-fixglibc.patch | 13 - .../broadcom-sta/.calculate_directory | 1 - .../0009-add-support-for-linux-3.10.0.patch | 116 ------- .../0009-add-support-for-linux-4.4.patch | 14 - .../ndiswrapper/.calculate_directory | 1 - .../ndiswrapper-1.61-linux-4.15.patch | 200 ------------ .../sys-apps/portage/.calculate_directory | 1 - .../portage-2.2.20-fix_binpkg_fetcher.patch | 14 - .../sys-apps/v86d/.calculate_directory | 1 - .../sys-apps/v86d/v86d-0.1.10-atomic.patch | 12 - .../sys-boot/grub/2.00/.calculate_directory | 1 - .../sys-boot/grub/2.00/grub2-chroot.patch | 147 --------- .../sys-boot/grub/2.00/grub2-lvm.patch | 57 ---- .../grub/2.00/grub2_fix_loadvideo.patch | 26 -- .../grub/2.00_p5107/.calculate_directory | 1 - .../grub/2.00_p5107/grub2-initrd.patch | 23 -- .../grub/2.00_p5107/grub2_fix_loadvideo.patch | 26 -- .../sys-boot/os-prober/chroot.patch | 43 --- .../sys-kernel/dracut/dracut-038.patch | 19 -- .../dracut/dracut-prelink-040.patch | 16 - .../sys-kernel/dracut/dracut-prelink.patch | 16 - .../www-client/.calculate_directory | 1 - .../www-client/firefox/.calculate_directory | 1 - .../www-client/firefox/firefox-68-i686.patch | 14 - .../nvidia-340-kernel-4.9+.patch | 15 - .../nvidia-340.102-kernel-4.10.patch | 132 -------- .../nvidia-340.102-kernel-4.11.patch | 212 ------------- .../nvidia-340.104-kernel-4.11+.patch | 39 --- .../nvidia-340.104-kernel-4.14.patch | 50 --- .../nvidia-340.106-kernel-4.14.patch | 31 -- .../nvidia-387.34-kernel-4.18-amd64.patch | 204 ------------ .../nvidia-387.34-kernel-4.18-x86.patch | 191 ----------- .../nvidia-390.42-kernel-4.16.patch | 19 -- .../light-locker-1.4.0-translate.patch | 29 -- ...1.8.0-lid.patch => light-locker-lid.patch} | 0 ...iting.patch => light-locker-waiting.patch} | 0 .../lightdm-gtk-greeter-1.6.1-translate.patch | 41 --- ...ghtdm-gtk-greeter-2.0.1-cursor_theme.patch | 50 --- ...dm-gtk-greeter-2.0.1-kill-on-sigterm.patch | 14 - ...lightdm-gtk-greeter-fix_laptop_open.patch} | 0 .../lightdm/lightdm-1.18-cleanup-script.patch | 17 - .../lightdm/lightdm-1.26-cleanup-script.patch | 32 -- .../lightdm-1.8.5-cleanup-script.patch | 16 - ... mate-notification-daemon-set_class.patch} | 0 .../x11-misc/sddm/.calculate_directory | 2 +- .../sddm/sddm-0.11.0-login-logout.patch | 145 --------- .../sddm/sddm-0.12.0-login-logout.patch | 140 -------- ...n-logout.patch => sddm-login_logout.patch} | 0 .../xscreensaver/.calculate_directory | 2 +- .../{branding.patch => branding-5.21.patch} | 2 +- .../garcon/garcon-0.6.1-fix_bigicon.patch | 74 ----- ...te.patch => garcon-cache_invalidate.patch} | 0 .../xfce4-mixer/.calculate_directory | 1 - .../xfce4-mixer-4.10-change_icon.sh | 8 - .../font-flag-patch-0.7.patch | 43 --- ...ont-patch-0.8.1.patch => font-patch.patch} | 2 +- 112 files changed, 4 insertions(+), 4397 deletions(-) delete mode 100644 profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/vpcs-0.6-gcc71.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-lang/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/ace-5.7-cpu_set.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/efl-GLintptr.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/libqtxdg-3.2.0-fix_drag_uri.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-apps/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/umbrello-18.08.3-compile_fix.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-base/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-plasma/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/mail-filter/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/darktable-2.6.0-i686_fix_sse_wit.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa1.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa2.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-plugins/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19-glibc.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6-gcc73.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-sound/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/compile_error.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/README.txt delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/netkit-rwho-0.17-fixglibc.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/ndiswrapper-1.61-linux-4.15.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/chroot.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/www-client/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/www-client/firefox/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/www-client/firefox/firefox-68-i686.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-387.34-kernel-4.18-amd64.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-387.34-kernel-4.18-x86.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch rename profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/{light-locker-1.8.0-lid.patch => light-locker-lid.patch} (100%) rename profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/{light-locker-1.4.0-waiting.patch => light-locker-waiting.patch} (100%) delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch rename profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/{lightdm-gtk-greeter-2.0.1-fix_laptop_open.patch => lightdm-gtk-greeter-fix_laptop_open.patch} (100%) delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.26-cleanup-script.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch rename profiles/templates/3.6/6_ac_install_patch/x11-misc/mate-notification-daemon/{mate-notification-daemon-1.22-set_class.patch => mate-notification-daemon-set_class.patch} (100%) delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch rename profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/{sddm-0.14.0-login-logout.patch => sddm-login_logout.patch} (100%) rename profiles/templates/3.6/6_ac_install_patch/x11-misc/xscreensaver/{branding.patch => branding-5.21.patch} (99%) delete mode 100644 profiles/templates/3.6/6_ac_install_patch/xfce-base/garcon/garcon-0.6.1-fix_bigicon.patch rename profiles/templates/3.6/6_ac_install_patch/xfce-base/garcon/{garcon-0.3.0-cache_invalidate.patch => garcon-cache_invalidate.patch} (100%) delete mode 100644 profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh delete mode 100644 profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch rename profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/{font-patch-0.8.1.patch => font-patch.patch} (85%) diff --git a/profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/vpcs-0.6-gcc71.patch b/profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/vpcs-0.6-gcc71.patch deleted file mode 100644 index f0cd99a68..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/app-emulation/vpcs/vpcs-0.6-gcc71.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Calculate format=diff merge(app-emulation/vpcs)=>0.6,0.7 -diff --git a/src/getopt.h b/src/getopt.h -index 4394aa2..bf59e10 100644 ---- a/src/getopt.h -+++ b/src/getopt.h -@@ -49,9 +49,6 @@ extern int optind; - extern int opterr; - extern int optopt; - --#ifndef FreeBSD --int getopt(int argc, char** argv, char* optstr); --#endif - int arg_to_int(const char* arg, int min, int max, int defalt); - - #ifdef __cplusplus diff --git a/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch b/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch deleted file mode 100644 index 5c833e066..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch +++ /dev/null @@ -1,122 +0,0 @@ -# Calculate format=diff merge(app-office/libreoffice)=>5.4.2.2,5.4.4 -From 985523eee724f41eefb3aa84edcfcd1a4a3cf3db Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Fri, 17 Nov 2017 00:16:17 +0100 -Subject: Resolves: tdf#113889 no date particle reordering when exporting to - Excel -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I45667a67c6c69106d86755ed41438f23e019dfea -(cherry picked from commit eb8bd7f21103ed2349b44c954db977709de2e4ec) -Reviewed-on: https://gerrit.libreoffice.org/44841 -Tested-by: Jenkins -Reviewed-by: Caolán McNamara -Tested-by: Caolán McNamara ---- - include/svl/zforlist.hxx | 3 ++- - svl/source/numbers/zforlist.cxx | 7 ++++--- - svl/source/numbers/zforscan.cxx | 6 +++++- - svl/source/numbers/zforscan.hxx | 4 +++- - 4 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx -index f6f3389..82e30ce 100644 ---- a/include/svl/zforlist.hxx -+++ b/include/svl/zforlist.hxx -@@ -390,7 +390,8 @@ public: - language/country eNewLnge */ - bool PutandConvertEntry( OUString& rString, sal_Int32& nCheckPos, - short& nType, sal_uInt32& nKey, -- LanguageType eLnge, LanguageType eNewLnge ); -+ LanguageType eLnge, LanguageType eNewLnge, -+ bool bForExcelExport = false ); - - /** Same as PutandConvertEntry but the format code string - is considered to be of the System language/country eLnge and is -diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx -index 7db6810..9a2e443 100644 ---- a/svl/source/numbers/zforlist.cxx -+++ b/svl/source/numbers/zforlist.cxx -@@ -636,14 +636,15 @@ bool SvNumberFormatter::PutandConvertEntry(OUString& rString, - short& nType, - sal_uInt32& nKey, - LanguageType eLnge, -- LanguageType eNewLnge) -+ LanguageType eNewLnge, -+ bool bForExcelExport ) - { - bool bRes; - if (eNewLnge == LANGUAGE_DONTKNOW) - { - eNewLnge = IniLnge; - } -- pFormatScanner->SetConvertMode(eLnge, eNewLnge); -+ pFormatScanner->SetConvertMode(eLnge, eNewLnge, false, bForExcelExport); - bRes = PutEntry(rString, nCheckPos, nType, nKey, eLnge); - pFormatScanner->SetConvertMode(false); - return bRes; -@@ -821,7 +822,7 @@ OUString SvNumberFormatter::GetFormatStringForExcel( sal_uInt32 nKey, const NfKe - short nType = css::util::NumberFormat::DEFINED; - sal_uInt32 nTempKey; - OUString aTemp( pEntry->GetFormatstring()); -- rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US); -+ rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US, true); - SAL_WARN_IF( nCheckPos != 0, "svl.numbers", - "SvNumberFormatter::GetFormatStringForExcel - format code not convertible"); - if (nTempKey != NUMBERFORMAT_ENTRY_NOT_FOUND) -diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx -index b3fae53..cd09a44 100644 ---- a/svl/source/numbers/zforscan.cxx -+++ b/svl/source/numbers/zforscan.cxx -@@ -47,6 +47,7 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP ) - pFormatter = pFormatterP; - xNFC = css::i18n::NumberFormatMapper::create( pFormatter->GetComponentContext() ); - bConvertMode = false; -+ mbConvertForExcelExport = false; - bConvertSystemToSystem = false; - //! All keywords MUST be UPPERCASE! - sKeyword[NF_KEY_E] = "E"; // Exponent -@@ -1580,7 +1581,10 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) - pLoc = pFormatter->GetLocaleData(); - //! init new keywords - InitKeywords(); -- bNewDateOrder = (eOldDateOrder != pLoc->getDateOrder()); -+ // Adapt date order to target locale, but Excel does not handle date -+ // particle re-ordering for the target locale when loading documents, -+ // though it does exchange separators, tdf#113889 -+ bNewDateOrder = (!mbConvertForExcelExport && eOldDateOrder != pLoc->getDateOrder()); - } - const CharClass* pChrCls = pFormatter->GetCharClass(); - -diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx -index 13d5b1a..5e5d981 100644 ---- a/svl/source/numbers/zforscan.hxx -+++ b/svl/source/numbers/zforscan.hxx -@@ -124,12 +124,13 @@ public: - } - - void SetConvertMode(LanguageType eTmpLge, LanguageType eNewLge, -- bool bSystemToSystem = false ) -+ bool bSystemToSystem = false, bool bForExcelExport = false) - { - bConvertMode = true; - eNewLnge = eNewLge; - eTmpLnge = eTmpLge; - bConvertSystemToSystem = bSystemToSystem; -+ mbConvertForExcelExport = bForExcelExport; - } - // Only changes the bool variable, in order to temporarily pause the convert mode - void SetConvertMode(bool bMode) { bConvertMode = bMode; } -@@ -183,6 +184,7 @@ private: // Private section - OUString sErrStr; // String for error output - - bool bConvertMode; // Set in the convert mode -+ bool mbConvertForExcelExport; // Set in the convert mode whether to convert for Excel export - - LanguageType eNewLnge; // Language/country which the scanned string is converted to (for Excel filter) - LanguageType eTmpLnge; // Language/country which the scanned string is converted from (for Excel filter) --- -cgit v1.1 - diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-lang/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-lang/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-lang/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/.calculate_directory deleted file mode 100644 index c44da5032..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()=>15,17 diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch b/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch deleted file mode 100644 index 15900b940..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate format=diff -diff --git a/otp_src_R15B03/erts/configure b/otp_src_R15B03/erts/configure -index 166f716..d01d32f 100755 ---- a/otp_src_R15B03/erts/configure -+++ b/otp_src_R15B03/erts/configure -@@ -18337,7 +18337,7 @@ TERMCAP_LIB= - if test "x$with_termcap" != "xno" && - test "X$host" != "Xwin32"; then - # try these libs -- termcap_libs="ncurses curses termcap termlib" -+ termcap_libs="tinfo ncurses curses termcap termlib" - - for termcap_lib in $termcap_libs; do - as_ac_Lib=`echo "ac_cv_lib_$termcap_lib''_tgetent" | $as_tr_sh` diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/ace-5.7-cpu_set.patch b/profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/ace-5.7-cpu_set.patch deleted file mode 100644 index 7c3f5f356..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-libs/ace/ace-5.7-cpu_set.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Calculate format=diff -diff --git a/ace/os_include/os_sched.h b/ace/os_include/os_sched.h -index f06541b..6d0c07d 100644 ---- a/ace/os_include/os_sched.h -+++ b/ace/os_include/os_sched.h -@@ -41,10 +41,6 @@ extern "C" - typedef cpuset_t cpu_set_t; - #else - # define ACE_CPU_SETSIZE 1024 -- typedef struct -- { -- ACE_UINT32 bit_array_[ACE_CPU_SETSIZE / (8 * sizeof (ACE_UINT32))]; -- } cpu_set_t; - #endif - #endif /* !ACE_HAS_CPU_SET_T || !__cpu_set_t_defined */ - diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/efl-GLintptr.patch b/profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/efl-GLintptr.patch deleted file mode 100644 index aaba76e55..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-libs/efl/efl-GLintptr.patch +++ /dev/null @@ -1,37 +0,0 @@ -# Calculate format=diff merge(dev-libs/efl)<1.22 -From 0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573 Mon Sep 17 00:00:00 2001 -From: "Carsten Haitzler (Rasterman)" -Date: Sat, 15 Dec 2018 16:19:01 +0000 -Subject: evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5 fix - typedef - -It seems that GL_VERSION_1_5 define == these provided by gl already. At -least reading the mesa headers I do, so this should fix T7502 - -@fix ---- - src/lib/evas/Evas_GL.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -(limited to 'src/lib/evas/Evas_GL.h') - -diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h -index b6b642400f..4f67b1695f 100644 ---- a/src/lib/evas/Evas_GL.h -+++ b/src/lib/evas/Evas_GL.h -@@ -4272,9 +4272,11 @@ typedef signed int GLfixed; // Changed khronos_int32_t - - #ifndef GL_ES_VERSION_2_0 - /* GL types for handling large vertex buffer objects */ --#include -+# ifndef GL_VERSION_1_5 -+# include - typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t - typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t -+# endif - #endif - - /* Some definitions from GLES 3.0. --- -cgit v1.2.1 - diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/libqtxdg-3.2.0-fix_drag_uri.patch b/profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/libqtxdg-3.2.0-fix_drag_uri.patch deleted file mode 100644 index 30f3f4bc3..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-libs/libqtxdg/libqtxdg-3.2.0-fix_drag_uri.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate format=diff merge(dev-libs/libqtxdg)=>3.2.0,3.2.1 -diff --git a/qtxdg/xdgmenuwidget.cpp b/qtxdg/xdgmenuwidget.cpp -index 3756b34..b4be855 100644 ---- a/qtxdg/xdgmenuwidget.cpp -+++ b/qtxdg/xdgmenuwidget.cpp -@@ -170,7 +170,7 @@ void XdgMenuWidgetPrivate::mouseMoveEvent(QMouseEvent *event) - return; - - QList urls; -- urls << QUrl(a->desktopFile().fileName()); -+ urls << QUrl::fromLocalFile(a->desktopFile().fileName()); - - QMimeData *mimeData = new QMimeData(); - mimeData->setUrls(urls); diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch b/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch deleted file mode 100644 index 541e4d8e6..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch +++ /dev/null @@ -1,37 +0,0 @@ -# Calculate format=diff -diff --git a/transport/http.py b/transport/http.py -index e2a2717..ee539c9 100644 ---- a/transport/http.py -+++ b/transport/http.py -@@ -304,7 +304,7 @@ class HttpTransport(Transport): - # the workaround breaks things on other systems, so it is applied - # on an on-demand basis - log.warning("Activating SSL workaround") -- CheckingHTTPSConnection.FORCE_SSL_VERSION = ssl.PROTOCOL_SSLv3 -+ CheckingHTTPSConnection.FORCE_SSL_VERSION = ssl.PROTOCOL_SSLv23 - elif "ASN1_item_verify:unknown message digest algorithm" in str(e): - # this bug was reported but is present for now - # see: http://bugs.python.org/issue8484 -diff --git a/transport/pyopenssl_wrapper.py b/transport/pyopenssl_wrapper.py -index 790b6d9..35fd8bd 100644 ---- a/transport/pyopenssl_wrapper.py -+++ b/transport/pyopenssl_wrapper.py -@@ -11,8 +11,8 @@ import _ssl # if we can't import it, let the error propagate - - from _ssl import SSLError - from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED --from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1 --from _ssl import RAND_status, RAND_egd, RAND_add -+from _ssl import PROTOCOL_SSLv23, PROTOCOL_TLSv1 -+from _ssl import RAND_status, RAND_add - from _ssl import \ - SSL_ERROR_ZERO_RETURN, \ - SSL_ERROR_WANT_READ, \ -@@ -39,7 +39,6 @@ _ssl_to_openssl_cert_op_remap = { - } - - _ssl_to_openssl_version_remap = { -- PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD, - PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD, - PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD, - } diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-apps/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-apps/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-apps/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/umbrello-18.08.3-compile_fix.patch b/profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/umbrello-18.08.3-compile_fix.patch deleted file mode 100644 index cd3ded44a..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-apps/umbrello/umbrello-18.08.3-compile_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Calculate format=diff merge(kde-apps/umbrello)=>18.08.3,18.08.4 -From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001 -From: Ralf Habacker -Date: Thu, 6 Dec 2018 13:36:34 +0100 -Subject: [PATCH] Fix KDE CI compile error with Qt 5.10 on linux - -The error was "specialization of template -struct QMetaTypeId in different namespace [-fpermissive]" - -The Qt 5.10 related issue is fixed by using another approach -to exclude KF5 class KAboutData. ---- - umbrello/main.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/umbrello/main.cpp b/umbrello/main.cpp -index e3315fa09..9d2acd820 100644 ---- a/umbrello/main.cpp -+++ b/umbrello/main.cpp -@@ -19,9 +19,8 @@ - - // kde includes - #if QT_VERSION > 0x050000 --namespace dummy { --#include --} -+// prevent including of -+#define KABOUTDATA_H - #include - #define KAboutData K4AboutData - #include diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-base/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-base/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-base/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/.calculate_directory deleted file mode 100644 index ca782ecca..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()>=4 append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch b/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch deleted file mode 100644 index d8bf79026..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch +++ /dev/null @@ -1,18 +0,0 @@ -# Calculate format=diff -diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp -index ef54230..af3ef94 100644 ---- a/kdeui/icons/kiconloader.cpp -+++ b/kdeui/icons/kiconloader.cpp -@@ -1041,6 +1041,10 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const - } - #endif - if (genericFallback) -+ { -+ // restore genericFallback flag -+ genericFallback = name.endsWith(QLatin1String("-x-generic")); - // we already tested the base name - break; -+ } - - int rindex = currentName.lastIndexOf('-'); - if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch b/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch deleted file mode 100644 index 61d6614e5..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Calculate format=diff ---- kdelibs-4.3.1.orig/kdecore/services/kfoldermimetype.cpp -+++ kdelibs-4.3.1/kdecore/services/kfoldermimetype.cpp -@@ -77,11 +77,11 @@ QString KFolderMimeTypePrivate::iconName( const KUrl& _url ) const - // There are also other directories with 0 size, such as /proc, that may - // be mounted, but those are unlikely to contain .directory (and checking - // this would require KMountPoint from kio). -- KDE_struct_stat buff; -- if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0 -- && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) { -- return KMimeTypePrivate::iconName( _url ); -- } -+ //KDE_struct_stat buff; -+ //if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0 -+ // && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) { -+ // return KMimeTypePrivate::iconName( _url ); -+ //} - - KUrl u( _url ); - u.addPath( ".directory" ); diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-plasma/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-plasma/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-plasma/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/.calculate_directory deleted file mode 100644 index a15adf959..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()=>5.10,5.11 diff --git a/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch b/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch deleted file mode 100644 index d53f8cea3..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate format=diff -diff --git a/wayland_server.cpp b/wayland_server.cpp -index 3f273ca..837be8b 100644 ---- a/wayland_server.cpp -+++ b/wayland_server.cpp -@@ -34,6 +34,7 @@ along with this program. If not, see . - // Server - #include - #include -+#include - #include - #include - #include diff --git a/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory deleted file mode 100644 index 8650b7218..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()==0.9.0 diff --git a/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch deleted file mode 100644 index de5f8a58f..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Calculate format=diff -diff --git a/lxqt-config-monitor/monitor.h b/lxqt-config-monitor/monitor.h -index 01d313c..6674fbe 100644 ---- a/lxqt-config-monitor/monitor.h -+++ b/lxqt-config-monitor/monitor.h -@@ -20,6 +20,7 @@ - #ifndef _MONITOR_H_ - #define _MONITOR_H_ - -+#include - #include - #include - #include -@@ -79,4 +80,4 @@ public: - /**Gets size from string rate. String rate format is "widthxheight". Example: 800x600*/ - QSize sizeFromString(QString str); - --#endif // _MONITOR_H_ -\ No newline at end of file -+#endif // _MONITOR_H_ diff --git a/profiles/templates/3.6/6_ac_install_patch/mail-filter/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/mail-filter/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/mail-filter/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch b/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch deleted file mode 100644 index 4a978e95a..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch +++ /dev/null @@ -1,63 +0,0 @@ -# Calculate format=diff ---- clamsmtp-1.10/common/usuals.h 2007-05-27 01:57:56.000000000 +0200 -+++ clamsmtp-patched/common/usuals.h 2015-03-01 16:48:10.684201573 +0100 -@@ -39,10 +39,10 @@ - #ifndef __USUALS_H__ - #define __USUALS_H__ - --#include -- - #include "config.h" - -+#include -+ - #include - #include - #include -diff -Nru clamsmtp-1.10/configure.in clamsmtp-patched/configure.in ---- clamsmtp-1.10/configure.in 2008-06-30 19:01:48.000000000 +0200 -+++ clamsmtp-patched/configure.in 2015-03-01 16:40:02.278986882 +0100 -@@ -51,6 +51,8 @@ - AC_PROG_LN_S - AC_PROG_MAKE_SET - -+AC_USE_SYSTEM_EXTENSIONS -+ - # Debug mode - AC_ARG_ENABLE(debug,=20 - AC_HELP_STRING([--enable-debug], - -diff -Nru clamsmtp-1.10/common/smtppass.c clamsmtp-patched/common/smtppass.c ---- clamsmtp-1.10/common/smtppass.c 2015-03-02 09:36:27.793398352 +0100 -+++ clamsmtp-patched/common/smtppass.c 2015-03-02 09:38:50.843467581 +0100 -@@ -38,6 +38,8 @@ - * Olivier Beyssac - */ - -+#include "usuals.h" -+ - #include - #include - #include -@@ -58,17 +58,15 @@ - #include - #include - --#include "usuals.h" -- --#ifdef LINUX_TRANSPARENT_PROXY --#include --#endif -- - #include "compat.h" - #include "sock_any.h" - #include "stringx.h" - #include "sppriv.h" - -+#ifdef LINUX_TRANSPARENT_PROXY -+#include -+#endif -+ - /* ----------------------------------------------------------------------- - * STRUCTURES - */ diff --git a/profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/darktable-2.6.0-i686_fix_sse_wit.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/darktable-2.6.0-i686_fix_sse_wit.patch deleted file mode 100644 index ccc296e81..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-gfx/darktable/darktable-2.6.0-i686_fix_sse_wit.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate format=diff merge(media-gfx/darktable)==2.6.0&&os_install_arch_machine==i686 -diff --git a/src/iop/filmic.c b/src/iop/filmic.c -index fd6a176..99096ca 100644 ---- a/src/iop/filmic.c -+++ b/src/iop/filmic.c -@@ -584,7 +584,7 @@ void process_sse2(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, c - - } - -- rgb = luma + _mm_set1_ps(concavity) * (rgb - luma); -+ rgb = _mm_set1_ps(luma) + _mm_set1_ps(concavity) * (rgb - _mm_set1_ps(luma)); - rgb = _mm_max_ps(rgb, zero); - rgb = _mm_min_ps(rgb, one); - diff --git a/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch deleted file mode 100644 index b863c2b11..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch +++ /dev/null @@ -1,28 +0,0 @@ -# Calculate format=diff merge(media-gfx/gimp)>=2.8.6 -diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c -index a1fc464..223762c 100644 ---- a/app/config/gimpguiconfig.c -+++ b/app/config/gimpguiconfig.c -@@ -197,7 +197,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) - GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER, - "toolbox-wilber", - TOOLBOX_WILBER_BLURB, -- TRUE, -+ FALSE, - GIMP_PARAM_STATIC_STRINGS); - path = gimp_config_build_data_path ("themes"); - GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH, -diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c -index 62fe06f..d991adb 100644 ---- a/app/widgets/gimpcairo-wilber.c -+++ b/app/widgets/gimpcairo-wilber.c -@@ -37,8 +37,7 @@ - * It works best if you combine all paths into one. Inkscape has a - * function to do that. - */ --static const gchar wilber_path[] = -- "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z "; -+static const gchar wilber_path[] = ""; - - static cairo_path_t *wilber_cairo_path = NULL; - static gdouble wilber_x1, wilber_y1; diff --git a/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch deleted file mode 100644 index 6181c9037..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch +++ /dev/null @@ -1,77 +0,0 @@ -# Calculate format=diff merge(media-gfx/nomacs)==3.8.0 -commit 92a95cd288dd64829e33aeb5d8c6e9725219e6bd -Author: Raphael Kubo da Costa -Date: Mon Jan 29 12:01:50 2018 +0100 - - cmake: Stop calling QT5_WRAP_CPP() when building quazip and libqpsd. - - cmake/Utils.cmake already sets CMAKE_AUTOMOC to on. - - Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and - LIBQPSD_MOC_SRC were never actually added as source dependencies in - MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own - automoc infrastructure was actually being used and the moc invocations from - QT5_WRAP_CPP() were not being made at all. - - Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property - on the macro's input files, which means neither CMake's automoc - infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up - with several 'undefined reference to vtable' errors when linking. - -diff --git a/ImageLounge/cmake/Mac.cmake b/ImageLounge/cmake/Mac.cmake -index 73c01430..14e9494d 100644 ---- a/ImageLounge/cmake/Mac.cmake -+++ b/ImageLounge/cmake/Mac.cmake -@@ -104,7 +104,6 @@ unset(QUAZIP_LIBRARIES CACHE) - - unset(QUAZIP_HEADERS CACHE) - unset(QUAZIP_SOURCES CACHE) --unset(QUAZIP_MOCS CACHE) - unset(QT_ROOT CACHE) - - if(ENABLE_QUAZIP) -@@ -123,9 +122,7 @@ if(ENABLE_QUAZIP) - - file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp") - file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h") -- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h") - -- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS}) - add_definitions(-DWITH_QUAZIP) - endif(USE_SYSTEM_QUAZIP) - endif(ENABLE_QUAZIP) -@@ -134,5 +131,3 @@ endif(ENABLE_QUAZIP) - # add libqpsd - file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp") - file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") --file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") --QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS}) -diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake -index 4cf2c0ec..5297d48c 100644 ---- a/ImageLounge/cmake/Unix.cmake -+++ b/ImageLounge/cmake/Unix.cmake -@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE) - - unset(QUAZIP_HEADERS CACHE) - unset(QUAZIP_SOURCES CACHE) --unset(QUAZIP_MOCS CACHE) - unset(QT_ROOT CACHE) - - if(ENABLE_QUAZIP) -@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP) - - file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp") - file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h") -- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h") - -- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS}) - add_definitions(-DWITH_QUAZIP) - endif(USE_SYSTEM_QUAZIP) - endif(ENABLE_QUAZIP) -@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD) - ELSE() - file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp") - file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") -- file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") -- QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS}) - ENDIF(USE_SYSTEM_LIBQPSD) diff --git a/profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa1.patch b/profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa1.patch deleted file mode 100644 index 99308d75e..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa1.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Calculate format=diff merge(media-libs/allegro)=>5.2.4,5.2.5 -commit fd29999446c0d29177b6902443c3732057cf4049 -Author: Christian Mauduit (ufoot) -Date: Sun Dec 23 09:10:27 2018 +0100 - - Added ifdef to prevent hard ref to glXCreateContextAttribsARB - -diff --git a/src/x/xglx_config.c b/src/x/xglx_config.c -index eebe2a0a7..ab9636914 100644 ---- a/src/x/xglx_config.c -+++ b/src/x/xglx_config.c -@@ -491,8 +491,12 @@ static GLXContext create_context_new(int ver, Display *dpy, GLXFBConfig fb, - GCCA_PROC _xglx_glXCreateContextAttribsARB = NULL; - - if (ver >= 140) { -- /* GLX 1.4 should have this */ -+ /* GLX 1.4 should have this, if it's defined, use it directly. */ -+ /* OTOH it *could* be there but only available through dynamic loading. */ -+ /* In that case, fallback to calling glxXGetProcAddress. */ -+#ifdef glXCreateContextAttribsARB - _xglx_glXCreateContextAttribsARB = glXCreateContextAttribsARB; -+#endif // glXCreateContextAttribsARB - } - if (!_xglx_glXCreateContextAttribsARB) { - /* Load the extension manually. */ diff --git a/profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa2.patch b/profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa2.patch deleted file mode 100644 index 4042c0dd0..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-libs/allegro/allegro-5.2.4-fix_mesa2.patch +++ /dev/null @@ -1,45 +0,0 @@ -# Calculate format=diff merge(media-libs/allegro)=>5.2.4,5.2.5 -commit a40d30e21802ecf5c9382cf34af9b01bd3781e47 -Author: Sebastian Krzyszkowiak -Date: Fri Dec 7 03:23:44 2018 +0100 - - opengl: fix compilation with Mesa 18.2.5 and later - - Mesa headers have been updated and changed some defines that Allegro - is hackily relying on. - - https://gitlab.freedesktop.org/mesa/mesa/commit/f7d42ee7d319256608ad60778f6787c140badada - -diff --git a/include/allegro5/allegro_opengl.h b/include/allegro5/allegro_opengl.h -index 0f86a6768..652dd024e 100644 ---- a/include/allegro5/allegro_opengl.h -+++ b/include/allegro5/allegro_opengl.h -@@ -103,10 +103,14 @@ - - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glext_h_ -+#define __gl_glext_h_ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glext_h_ -+#undef __gl_glext_h_ - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - -diff --git a/include/allegro5/opengl/GLext/glx_ext_defs.h b/include/allegro5/opengl/GLext/glx_ext_defs.h -index 49c502091..fba8aea5d 100644 ---- a/include/allegro5/opengl/GLext/glx_ext_defs.h -+++ b/include/allegro5/opengl/GLext/glx_ext_defs.h -@@ -1,7 +1,9 @@ - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define _ALLEGRO_GLX_VERSION_1_3 diff --git a/profiles/templates/3.6/6_ac_install_patch/media-plugins/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-plugins/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-plugins/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19-glibc.patch b/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19-glibc.patch deleted file mode 100644 index 4473739c5..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19-glibc.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate format=diff merge(media-plugins/kodi-pvr-mediaportal-tvserver)=>2.4.19,2.5 -diff --git a/src/lib/live555/liveMedia/include/Locale.hh b/src/lib/live555/liveMedia/include/Locale.hh -index b327948..44ea81c 100644 ---- a/src/lib/live555/liveMedia/include/Locale.hh -+++ b/src/lib/live555/liveMedia/include/Locale.hh -@@ -43,7 +43,7 @@ along with this library; if not, write to the Free Software Foundation, Inc., - - #ifndef LOCALE_NOT_USED - #include --#ifndef XLOCALE_NOT_USED -+#if !defined(XLOCALE_NOT_USED) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 26)) - #include // because, on some systems, doesn't include ; this makes sure that we get both - #endif - #endif diff --git a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6-gcc73.patch b/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6-gcc73.patch deleted file mode 100644 index f9bf3516a..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6-gcc73.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate format=diff merge(media-plugins/kodi-pvr-stalker)=>2.8.6,2.9 -diff --git a/src/CWatchdog.h b/src/CWatchdog.h -index c465e91..239d95d 100644 ---- a/src/CWatchdog.h -+++ b/src/CWatchdog.h -@@ -22,6 +22,7 @@ - */ - - #include -+#include - - #include "SAPI.h" - diff --git a/profiles/templates/3.6/6_ac_install_patch/media-sound/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-sound/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-sound/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/.calculate_directory deleted file mode 100644 index 814015784..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()==1.3.1-r6 diff --git a/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/compile_error.patch b/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/compile_error.patch deleted file mode 100644 index 97646b9d0..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/compile_error.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Calculate format=diff -commit 2d1b425493797b24bca9e190f9b57fb694a04f2e -Author: Jacob Henner -Date: Tue Mar 14 13:23:16 2017 -0400 - - Fixes #5660 - compile error - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2243d4481..f0a8a569b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1199,7 +1199,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/version.h) - --qt4_wrap_cpp(MOC ${HEADERS}) -+qt4_wrap_cpp(MOC ${HEADERS} OPTIONS "-D_SYS_SYSMACROS_H_OUTER") - qt4_wrap_ui(UIC ${UI}) - qt4_add_resources(QRC ${RESOURCES}) - diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/.calculate_directory deleted file mode 100644 index 0dcdf8384..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()>=2.1.8 diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/README.txt b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/README.txt deleted file mode 100644 index 3246d2003..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate append=skip -Модуль взят из репозитория https://github.com/processone/ejabberd-contrib. -Необходим для работы сохраниения переписки ejabberd. diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch deleted file mode 100644 index ce00288fb..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch +++ /dev/null @@ -1,278 +0,0 @@ -# Calculate format=diff merge(net-im/ejabberd)=>16.01,16.02 -diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl -new file mode 100644 -index 0000000..ac822c1 ---- /dev/null -+++ b/src/mod_logxml.erl -@@ -0,0 +1,271 @@ -+%%%---------------------------------------------------------------------- -+%%% File : mod_logxml.erl -+%%% Author : Badlop -+%%% Purpose : Log XMPP packets to XML file -+%%% Created : -+%%% Id : -+%%%---------------------------------------------------------------------- -+ -+-module(mod_logxml). -+-author('badlop@ono.com'). -+ -+-behaviour(gen_mod). -+ -+-export([start/2, init/7, stop/1, -+ send_packet/4, receive_packet/5]). -+ -+-include("ejabberd.hrl"). -+-include("jlib.hrl"). -+ -+-define(PROCNAME, ejabberd_mod_logxml). -+ -+%% ------------------- -+%% Module control -+%% ------------------- -+ -+start(Host, Opts) -> -+ Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"), -+ -+ Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1), -+ Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rf1 -> Rf1*1024*1024 -+ end, -+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rp1 -> Rp1*1000 -+ end, -+ RotateO = {Rd, Rf, Rp}, -+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1), -+ -+ Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local), -+ -+ Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]), -+ Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]), -+ Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]), -+ FilterO = { -+ {orientation, Orientation}, -+ {stanza, Stanza}, -+ {direction, Direction}}, -+ ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false), -+ -+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ register(gen_mod:get_module_proc(Host, ?PROCNAME), -+ spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP, -+ Timezone, ShowIP, FilterO])). -+ -+stop(Host) -> -+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! stop, -+ {wait, Proc}. -+ -+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) -> -+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone), -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day, -+ Timezone, ShowIP, FilterO). -+ -+%% ------------------- -+%% Main -+%% ------------------- -+ -+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC, -+ Gregorian_day_log, Timezone) -> -+ {RO_days, RO_size, RO_packets} = RotateO, -+ -+ Rotate1 = case RO_packets of -+ no -> false; -+ PacketC -> true; -+ _ -> false -+ end, -+ -+ Filesize = filelib:file_size(Filename), -+ Rotate2 = if -+ RO_size == no -> false; -+ Filesize >= RO_size -> true; -+ true -> false -+ end, -+ -+ Gregorian_day_today = get_gregorian_day(), -+ Rotate3 = if -+ RO_days == no -> false; -+ (Gregorian_day_today - Gregorian_day_log) >= RO_days -> -+ true; -+ true -> false -+ end, -+ -+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of -+ true -> -+ {IoDevice2, Filename2, Gregorian_day2} = -+ rotate_log(IoDevice, Logdir, Host, Timezone), -+ {IoDevice2, Filename2, Gregorian_day2, 0}; -+ false -> -+ {IoDevice, Filename, Gregorian_day_log, PacketC+1} -+ end. -+ -+filter(FilterO, E) -> -+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} = -+ FilterO, -+ {Orientation, From, To, Packet} = E, -+ -+ {xmlel, Stanza_str, _Attrs, _Els} = Packet, -+ Stanza = list_to_atom(binary_to_list(Stanza_str)), -+ -+ Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end), -+ {Host_local, Host_remote} = case Orientation of -+ send -> {From#jid.lserver, To#jid.lserver}; -+ recv -> {To#jid.lserver, From#jid.lserver} -+ end, -+ Direction = case Host_remote of -+ Host_local -> internal; -+ _ -> -+ case lists:member(Host_remote, Hosts_all) of -+ true -> vhosts; -+ false -> external -+ end -+ end, -+ -+ {lists:all(fun(O) -> O end, -+ [lists:member(Orientation, OrientationO), -+ lists:member(Stanza, StanzaO), -+ lists:member(Direction, DirectionO)]), -+ {Orientation, Stanza, Direction}}. -+ -+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -> -+ receive -+ {addlog, E} -> -+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} = -+ case filter(FilterO, E) of -+ {true, OSD} -> -+ Div = calc_div(PacketC, CheckRKP), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} = -+ case Div==round(Div) of -+ true -> -+ manage_rotate(Host, IoDevice, Filename, -+ Logdir, RotateO, PacketC, -+ Gregorian_day, Timezone); -+ false -> -+ {IoDevice, Filename, Gregorian_day, -+ PacketC+1} -+ end, -+ add_log(IoDevice2, Timezone, ShowIP, E, OSD), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2}; -+ _ -> -+ {IoDevice, Filename, Gregorian_day, PacketC} -+ end, -+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO, -+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO); -+ stop -> -+ close_file(IoDevice), -+ ok; -+ _ -> -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -+ end. -+ -+send_packet(P, _C2SState, FromJID, ToJID) -> -+ Host = FromJID#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {send, FromJID, ToJID, P}}, -+ P. -+ -+receive_packet(P, _C2SState, _JID, From, To) -> -+ Host = To#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {recv, From, To, P}}, -+ P. -+ -+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) -> -+ %%{Orientation, Stanza, Direction} = OSD, -+ LocalJID = case Orientation of -+ send -> From; -+ recv -> To -+ end, -+ LocalIPS = case ShowIP of -+ true -> -+ case ejabberd_sm:get_user_ip( -+ LocalJID#jid.user, -+ LocalJID#jid.server, -+ LocalJID#jid.resource) of -+ {UserIP, _Port} -> -+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]); -+ undefined -> "lip=\"undefined\" " -+ end; -+ false -> "" -+ end, -+ TimestampISO = get_now_iso(Timezone), -+ io:fwrite(Io, "~s~n", -+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS, -+ TimestampISO, binary_to_list(xml:element_to_binary(Packet))]). -+ -+%% ------------------- -+%% File -+%% ------------------- -+ -+open_file(Logdir, Host, Timezone) -> -+ TimeStamp = get_now_iso(Timezone), -+ Year = string:substr(TimeStamp, 1, 4), -+ Month = string:substr(TimeStamp, 5, 2), -+ Day = string:substr(TimeStamp, 7, 2), -+ Hour = string:substr(TimeStamp, 10, 2), -+ Min = string:substr(TimeStamp, 13, 2), -+ Sec = string:substr(TimeStamp, 16, 2), -+ S = "-", -+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec, -+ ".xml"]), -+ Filename = filename:join([Logdir, Logname]), -+ -+ Gregorian_day = get_gregorian_day(), -+ -+ %% Open file, create if it does not exist, create parent dirs if needed -+ case file:read_file_info(Filename) of -+ {ok, _} -> -+ {ok, IoDevice} = file:open(Filename, [append]); -+ {error, enoent} -> -+ make_dir_rec(Logdir), -+ {ok, IoDevice} = file:open(Filename, [append]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]) -+ end, -+ {IoDevice, Filename, Gregorian_day}. -+ -+close_file(IoDevice) -> -+ io:fwrite(IoDevice, "~s~n", [""]), -+ file:close(IoDevice). -+ -+rotate_log(IoDevice, Logdir, Host, Timezone) -> -+ close_file(IoDevice), -+ open_file(Logdir, Host, Timezone). -+ -+make_dir_rec(Dir) -> -+ case file:read_file_info(Dir) of -+ {ok, _} -> -+ ok; -+ {error, enoent} -> -+ DirS = filename:split(Dir), -+ DirR = lists:sublist(DirS, length(DirS)-1), -+ make_dir_rec(filename:join(DirR)), -+ file:make_dir(Dir) -+ end. -+ -+%% ------------------- -+%% Utils -+%% ------------------- -+ -+get_gregorian_day() -> calendar:date_to_gregorian_days(date()). -+ -+get_now_iso(Timezone) -> -+ TimeStamp = case Timezone of -+ local -> calendar:now_to_local_time(now()); -+ universal -> calendar:now_to_universal_time(now()) -+ end, -+ binary_to_list(jlib:timestamp_to_iso(TimeStamp)). -+ -+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) -> -+ A/B; -+calc_div(_A, _B) -> -+ 0.5. %% This ensures that no rotation is performed diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch deleted file mode 100644 index 7c8316814..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch +++ /dev/null @@ -1,278 +0,0 @@ -# Calculate format=diff merge(net-im/ejabberd)=>16.02,16.04 -diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl -new file mode 100644 -index 0000000..ac822c1 ---- /dev/null -+++ b/src/mod_logxml.erl -@@ -0,0 +1,271 @@ -+%%%---------------------------------------------------------------------- -+%%% File : mod_logxml.erl -+%%% Author : Badlop -+%%% Purpose : Log XMPP packets to XML file -+%%% Created : -+%%% Id : -+%%%---------------------------------------------------------------------- -+ -+-module(mod_logxml). -+-author('badlop@ono.com'). -+ -+-behaviour(gen_mod). -+ -+-export([start/2, init/7, stop/1, -+ send_packet/4, receive_packet/5]). -+ -+-include("ejabberd.hrl"). -+-include("jlib.hrl"). -+ -+-define(PROCNAME, ejabberd_mod_logxml). -+ -+%% ------------------- -+%% Module control -+%% ------------------- -+ -+start(Host, Opts) -> -+ Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"), -+ -+ Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1), -+ Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rf1 -> Rf1*1024*1024 -+ end, -+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rp1 -> Rp1*1000 -+ end, -+ RotateO = {Rd, Rf, Rp}, -+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1), -+ -+ Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local), -+ -+ Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]), -+ Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]), -+ Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]), -+ FilterO = { -+ {orientation, Orientation}, -+ {stanza, Stanza}, -+ {direction, Direction}}, -+ ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false), -+ -+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ register(gen_mod:get_module_proc(Host, ?PROCNAME), -+ spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP, -+ Timezone, ShowIP, FilterO])). -+ -+stop(Host) -> -+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! stop, -+ {wait, Proc}. -+ -+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) -> -+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone), -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day, -+ Timezone, ShowIP, FilterO). -+ -+%% ------------------- -+%% Main -+%% ------------------- -+ -+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC, -+ Gregorian_day_log, Timezone) -> -+ {RO_days, RO_size, RO_packets} = RotateO, -+ -+ Rotate1 = case RO_packets of -+ no -> false; -+ PacketC -> true; -+ _ -> false -+ end, -+ -+ Filesize = filelib:file_size(Filename), -+ Rotate2 = if -+ RO_size == no -> false; -+ Filesize >= RO_size -> true; -+ true -> false -+ end, -+ -+ Gregorian_day_today = get_gregorian_day(), -+ Rotate3 = if -+ RO_days == no -> false; -+ (Gregorian_day_today - Gregorian_day_log) >= RO_days -> -+ true; -+ true -> false -+ end, -+ -+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of -+ true -> -+ {IoDevice2, Filename2, Gregorian_day2} = -+ rotate_log(IoDevice, Logdir, Host, Timezone), -+ {IoDevice2, Filename2, Gregorian_day2, 0}; -+ false -> -+ {IoDevice, Filename, Gregorian_day_log, PacketC+1} -+ end. -+ -+filter(FilterO, E) -> -+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} = -+ FilterO, -+ {Orientation, From, To, Packet} = E, -+ -+ {xmlel, Stanza_str, _Attrs, _Els} = Packet, -+ Stanza = list_to_atom(binary_to_list(Stanza_str)), -+ -+ Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end), -+ {Host_local, Host_remote} = case Orientation of -+ send -> {From#jid.lserver, To#jid.lserver}; -+ recv -> {To#jid.lserver, From#jid.lserver} -+ end, -+ Direction = case Host_remote of -+ Host_local -> internal; -+ _ -> -+ case lists:member(Host_remote, Hosts_all) of -+ true -> vhosts; -+ false -> external -+ end -+ end, -+ -+ {lists:all(fun(O) -> O end, -+ [lists:member(Orientation, OrientationO), -+ lists:member(Stanza, StanzaO), -+ lists:member(Direction, DirectionO)]), -+ {Orientation, Stanza, Direction}}. -+ -+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -> -+ receive -+ {addlog, E} -> -+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} = -+ case filter(FilterO, E) of -+ {true, OSD} -> -+ Div = calc_div(PacketC, CheckRKP), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} = -+ case Div==round(Div) of -+ true -> -+ manage_rotate(Host, IoDevice, Filename, -+ Logdir, RotateO, PacketC, -+ Gregorian_day, Timezone); -+ false -> -+ {IoDevice, Filename, Gregorian_day, -+ PacketC+1} -+ end, -+ add_log(IoDevice2, Timezone, ShowIP, E, OSD), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2}; -+ _ -> -+ {IoDevice, Filename, Gregorian_day, PacketC} -+ end, -+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO, -+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO); -+ stop -> -+ close_file(IoDevice), -+ ok; -+ _ -> -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -+ end. -+ -+send_packet(P, _C2SState, FromJID, ToJID) -> -+ Host = FromJID#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {send, FromJID, ToJID, P}}, -+ P. -+ -+receive_packet(P, _C2SState, _JID, From, To) -> -+ Host = To#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {recv, From, To, P}}, -+ P. -+ -+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) -> -+ %%{Orientation, Stanza, Direction} = OSD, -+ LocalJID = case Orientation of -+ send -> From; -+ recv -> To -+ end, -+ LocalIPS = case ShowIP of -+ true -> -+ case ejabberd_sm:get_user_ip( -+ LocalJID#jid.user, -+ LocalJID#jid.server, -+ LocalJID#jid.resource) of -+ {UserIP, _Port} -> -+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]); -+ undefined -> "lip=\"undefined\" " -+ end; -+ false -> "" -+ end, -+ TimestampISO = get_now_iso(Timezone), -+ io:fwrite(Io, "~s~n", -+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS, -+ TimestampISO, binary_to_list(fxml:element_to_binary(Packet))]). -+ -+%% ------------------- -+%% File -+%% ------------------- -+ -+open_file(Logdir, Host, Timezone) -> -+ TimeStamp = get_now_iso(Timezone), -+ Year = string:substr(TimeStamp, 1, 4), -+ Month = string:substr(TimeStamp, 5, 2), -+ Day = string:substr(TimeStamp, 7, 2), -+ Hour = string:substr(TimeStamp, 10, 2), -+ Min = string:substr(TimeStamp, 13, 2), -+ Sec = string:substr(TimeStamp, 16, 2), -+ S = "-", -+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec, -+ ".xml"]), -+ Filename = filename:join([Logdir, Logname]), -+ -+ Gregorian_day = get_gregorian_day(), -+ -+ %% Open file, create if it does not exist, create parent dirs if needed -+ case file:read_file_info(Filename) of -+ {ok, _} -> -+ {ok, IoDevice} = file:open(Filename, [append]); -+ {error, enoent} -> -+ make_dir_rec(Logdir), -+ {ok, IoDevice} = file:open(Filename, [append]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]) -+ end, -+ {IoDevice, Filename, Gregorian_day}. -+ -+close_file(IoDevice) -> -+ io:fwrite(IoDevice, "~s~n", [""]), -+ file:close(IoDevice). -+ -+rotate_log(IoDevice, Logdir, Host, Timezone) -> -+ close_file(IoDevice), -+ open_file(Logdir, Host, Timezone). -+ -+make_dir_rec(Dir) -> -+ case file:read_file_info(Dir) of -+ {ok, _} -> -+ ok; -+ {error, enoent} -> -+ DirS = filename:split(Dir), -+ DirR = lists:sublist(DirS, length(DirS)-1), -+ make_dir_rec(filename:join(DirR)), -+ file:make_dir(Dir) -+ end. -+ -+%% ------------------- -+%% Utils -+%% ------------------- -+ -+get_gregorian_day() -> calendar:date_to_gregorian_days(date()). -+ -+get_now_iso(Timezone) -> -+ TimeStamp = case Timezone of -+ local -> calendar:now_to_local_time(now()); -+ universal -> calendar:now_to_universal_time(now()) -+ end, -+ binary_to_list(jlib:timestamp_to_legacy(TimeStamp)). -+ -+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) -> -+ A/B; -+calc_div(_A, _B) -> -+ 0.5. %% This ensures that no rotation is performed diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch deleted file mode 100644 index a93e41400..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch +++ /dev/null @@ -1,300 +0,0 @@ -# Calculate format=diff merge(net-im/ejabberd)=>16.04,16.09 -diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl -new file mode 100644 -index 0000000..ac822c1 ---- /dev/null -+++ b/src/mod_logxml.erl -@@ -0,0 +1,271 @@ -+%%%---------------------------------------------------------------------- -+%%% File : mod_logxml.erl -+%%% Author : Badlop -+%%% Purpose : Log XMPP packets to XML file -+%%% Created : -+%%% Id : -+%%%---------------------------------------------------------------------- -+ -+-module(mod_logxml). -+-author('badlop@ono.com'). -+ -+-behaviour(gen_mod). -+ -+-export([start/2, init/7, stop/1, -+ send_packet/4, receive_packet/5]). -+ -+-include("ejabberd.hrl"). -+-include("jlib.hrl"). -+ -+-define(PROCNAME, ejabberd_mod_logxml). -+ -+%% ------------------- -+%% Module control -+%% ------------------- -+ -+start(Host, Opts) -> -+ Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"), -+ -+ Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1), -+ Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rf1 -> Rf1*1024*1024 -+ end, -+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rp1 -> Rp1*1000 -+ end, -+ RotateO = {Rd, Rf, Rp}, -+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1), -+ -+ Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local), -+ -+ Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]), -+ Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]), -+ Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]), -+ FilterO = { -+ {orientation, Orientation}, -+ {stanza, Stanza}, -+ {direction, Direction}}, -+ ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false), -+ -+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ register(gen_mod:get_module_proc(Host, ?PROCNAME), -+ spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP, -+ Timezone, ShowIP, FilterO])). -+ -+stop(Host) -> -+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! stop, -+ {wait, Proc}. -+ -+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) -> -+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone), -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day, -+ Timezone, ShowIP, FilterO). -+ -+%% ------------------- -+%% Main -+%% ------------------- -+ -+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC, -+ Gregorian_day_log, Timezone) -> -+ {RO_days, RO_size, RO_packets} = RotateO, -+ -+ Rotate1 = case RO_packets of -+ no -> false; -+ PacketC -> true; -+ _ -> false -+ end, -+ -+ Filesize = filelib:file_size(Filename), -+ Rotate2 = if -+ RO_size == no -> false; -+ Filesize >= RO_size -> true; -+ true -> false -+ end, -+ -+ Gregorian_day_today = get_gregorian_day(), -+ Rotate3 = if -+ RO_days == no -> false; -+ (Gregorian_day_today - Gregorian_day_log) >= RO_days -> -+ true; -+ true -> false -+ end, -+ -+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of -+ true -> -+ {IoDevice2, Filename2, Gregorian_day2} = -+ rotate_log(IoDevice, Logdir, Host, Timezone), -+ {IoDevice2, Filename2, Gregorian_day2, 0}; -+ false -> -+ {IoDevice, Filename, Gregorian_day_log, PacketC+1} -+ end. -+ -+filter(FilterO, E) -> -+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} = -+ FilterO, -+ {Orientation, From, To, Packet} = E, -+ -+ {xmlel, Stanza_str, _Attrs, _Els} = Packet, -+ Stanza = list_to_atom(binary_to_list(Stanza_str)), -+ -+ Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end), -+ {Host_local, Host_remote} = case Orientation of -+ send -> {From#jid.lserver, To#jid.lserver}; -+ recv -> {To#jid.lserver, From#jid.lserver} -+ end, -+ Direction = case Host_remote of -+ Host_local -> internal; -+ _ -> -+ case lists:member(Host_remote, Hosts_all) of -+ true -> vhosts; -+ false -> external -+ end -+ end, -+ -+ {lists:all(fun(O) -> O end, -+ [lists:member(Orientation, OrientationO), -+ lists:member(Stanza, StanzaO), -+ lists:member(Direction, DirectionO)]), -+ {Orientation, Stanza, Direction}}. -+ -+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -> -+ receive -+ {addlog, E} -> -+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} = -+ case filter(FilterO, E) of -+ {true, OSD} -> -+ Div = calc_div(PacketC, CheckRKP), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} = -+ case Div==round(Div) of -+ true -> -+ manage_rotate(Host, IoDevice, Filename, -+ Logdir, RotateO, PacketC, -+ Gregorian_day, Timezone); -+ false -> -+ {IoDevice, Filename, Gregorian_day, -+ PacketC+1} -+ end, -+ add_log(IoDevice2, Timezone, ShowIP, E, OSD), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2}; -+ _ -> -+ {IoDevice, Filename, Gregorian_day, PacketC} -+ end, -+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO, -+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO); -+ stop -> -+ close_file(IoDevice), -+ ok; -+ _ -> -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -+ end. -+ -+send_packet(P, _C2SState, FromJID, ToJID) -> -+ Host = FromJID#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {send, FromJID, ToJID, P}}, -+ P. -+ -+receive_packet(P, _C2SState, _JID, From, To) -> -+ Host = To#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {recv, From, To, P}}, -+ P. -+ -+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) -> -+ %%{Orientation, Stanza, Direction} = OSD, -+ LocalJID = case Orientation of -+ send -> From; -+ recv -> To -+ end, -+ LocalIPS = case ShowIP of -+ true -> -+ case ejabberd_sm:get_user_ip( -+ LocalJID#jid.user, -+ LocalJID#jid.server, -+ LocalJID#jid.resource) of -+ {UserIP, _Port} -> -+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]); -+ undefined -> "lip=\"undefined\" " -+ end; -+ false -> "" -+ end, -+ TimestampISO = get_now_iso(Timezone), -+ io:fwrite(Io, "~s~n", -+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS, -+ TimestampISO, binary_to_list(fxml:element_to_binary(Packet))]). -+ -+%% ------------------- -+%% File -+%% ------------------- -+ -+open_file(Logdir, Host, Timezone) -> -+ TimeStamp = get_now_iso(Timezone), -+ Year = string:substr(TimeStamp, 1, 4), -+ Month = string:substr(TimeStamp, 5, 2), -+ Day = string:substr(TimeStamp, 7, 2), -+ Hour = string:substr(TimeStamp, 10, 2), -+ Min = string:substr(TimeStamp, 13, 2), -+ Sec = string:substr(TimeStamp, 16, 2), -+ S = "-", -+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec, -+ ".xml"]), -+ Filename = filename:join([Logdir, Logname]), -+ -+ Gregorian_day = get_gregorian_day(), -+ -+ %% Open file, create if it does not exist, create parent dirs if needed -+ case file:read_file_info(Filename) of -+ {ok, _} -> -+ {ok, IoDevice} = file:open(Filename, [append]); -+ {error, enoent} -> -+ make_dir_rec(Logdir), -+ {ok, IoDevice} = file:open(Filename, [append]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]) -+ end, -+ {IoDevice, Filename, Gregorian_day}. -+ -+close_file(IoDevice) -> -+ io:fwrite(IoDevice, "~s~n", [""]), -+ file:close(IoDevice). -+ -+rotate_log(IoDevice, Logdir, Host, Timezone) -> -+ close_file(IoDevice), -+ open_file(Logdir, Host, Timezone). -+ -+make_dir_rec(Dir) -> -+ case file:read_file_info(Dir) of -+ {ok, _} -> -+ ok; -+ {error, enoent} -> -+ DirS = filename:split(Dir), -+ DirR = lists:sublist(DirS, length(DirS)-1), -+ make_dir_rec(filename:join(DirR)), -+ file:make_dir(Dir) -+ end. -+ -+%% ------------------- -+%% Utils -+%% ------------------- -+ -+get_gregorian_day() -> calendar:date_to_gregorian_days(date()). -+ -+get_now_iso(Timezone) -> -+ TimeStamp = case Timezone of -+ local -> calendar:now_to_local_time(now()); -+ universal -> calendar:now_to_universal_time(now()) -+ end, -+ binary_to_list(jlib:timestamp_to_legacy(TimeStamp)). -+ -+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) -> -+ A/B; -+calc_div(_A, _B) -> -+ 0.5. %% This ensures that no rotation is performed -diff --git a/src/gen_mod.erl b/src/gen_mod.erl -index efbfc08..8a432b4 100644 ---- a/src/gen_mod.erl -+++ b/src/gen_mod.erl -@@ -301,7 +301,7 @@ validate_opts(Module, Opts) -> - db_type(Opts, Module) when is_list(Opts) -> - db_type(global, Opts, Module); - db_type(Host, Module) when is_atom(Module) -> -- case Module:mod_opt_type(db_type) of -+ case catch Module:mod_opt_type(db_type) of - F when is_function(F) -> - case get_module_opt(Host, Module, db_type, F) of - undefined -> ejabberd_config:default_db(Host, Module); -@@ -314,7 +314,7 @@ db_type(Host, Module) when is_atom(Module) -> - -spec db_type(binary(), opts(), module()) -> db_type(). - - db_type(Host, Opts, Module) -> -- case Module:mod_opt_type(db_type) of -+ case catch Module:mod_opt_type(db_type) of - F when is_function(F) -> - case get_opt(db_type, Opts, F) of - undefined -> ejabberd_config:default_db(Host, Module); diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch deleted file mode 100644 index 3263db363..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch +++ /dev/null @@ -1,278 +0,0 @@ -# Calculate format=diff merge(net-im/ejabberd)>=16.09 -diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl -new file mode 100644 -index 0000000..ac822c1 ---- /dev/null -+++ b/src/mod_logxml.erl -@@ -0,0 +1,271 @@ -+%%%---------------------------------------------------------------------- -+%%% File : mod_logxml.erl -+%%% Author : Badlop -+%%% Purpose : Log XMPP packets to XML file -+%%% Created : -+%%% Id : -+%%%---------------------------------------------------------------------- -+ -+-module(mod_logxml). -+-author('badlop@ono.com'). -+ -+-behaviour(gen_mod). -+ -+-export([start/2, init/7, stop/1, -+ send_packet/4, receive_packet/5]). -+ -+-include("ejabberd.hrl"). -+-include("jlib.hrl"). -+ -+-define(PROCNAME, ejabberd_mod_logxml). -+ -+%% ------------------- -+%% Module control -+%% ------------------- -+ -+start(Host, Opts) -> -+ Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"), -+ -+ Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1), -+ Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rf1 -> Rf1*1024*1024 -+ end, -+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of -+ no -> no; -+ Rp1 -> Rp1*1000 -+ end, -+ RotateO = {Rd, Rf, Rp}, -+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1), -+ -+ Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local), -+ -+ Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]), -+ Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]), -+ Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]), -+ FilterO = { -+ {orientation, Orientation}, -+ {stanza, Stanza}, -+ {direction, Direction}}, -+ ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false), -+ -+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ register(gen_mod:get_module_proc(Host, ?PROCNAME), -+ spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP, -+ Timezone, ShowIP, FilterO])). -+ -+stop(Host) -> -+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! stop, -+ {wait, Proc}. -+ -+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) -> -+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone), -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day, -+ Timezone, ShowIP, FilterO). -+ -+%% ------------------- -+%% Main -+%% ------------------- -+ -+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC, -+ Gregorian_day_log, Timezone) -> -+ {RO_days, RO_size, RO_packets} = RotateO, -+ -+ Rotate1 = case RO_packets of -+ no -> false; -+ PacketC -> true; -+ _ -> false -+ end, -+ -+ Filesize = filelib:file_size(Filename), -+ Rotate2 = if -+ RO_size == no -> false; -+ Filesize >= RO_size -> true; -+ true -> false -+ end, -+ -+ Gregorian_day_today = get_gregorian_day(), -+ Rotate3 = if -+ RO_days == no -> false; -+ (Gregorian_day_today - Gregorian_day_log) >= RO_days -> -+ true; -+ true -> false -+ end, -+ -+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of -+ true -> -+ {IoDevice2, Filename2, Gregorian_day2} = -+ rotate_log(IoDevice, Logdir, Host, Timezone), -+ {IoDevice2, Filename2, Gregorian_day2, 0}; -+ false -> -+ {IoDevice, Filename, Gregorian_day_log, PacketC+1} -+ end. -+ -+filter(FilterO, E) -> -+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} = -+ FilterO, -+ {Orientation, From, To, Packet} = E, -+ -+ {xmlel, Stanza_str, _Attrs, _Els} = Packet, -+ Stanza = list_to_atom(binary_to_list(Stanza_str)), -+ -+ Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end), -+ {Host_local, Host_remote} = case Orientation of -+ send -> {From#jid.lserver, To#jid.lserver}; -+ recv -> {To#jid.lserver, From#jid.lserver} -+ end, -+ Direction = case Host_remote of -+ Host_local -> internal; -+ _ -> -+ case lists:member(Host_remote, Hosts_all) of -+ true -> vhosts; -+ false -> external -+ end -+ end, -+ -+ {lists:all(fun(O) -> O end, -+ [lists:member(Orientation, OrientationO), -+ lists:member(Stanza, StanzaO), -+ lists:member(Direction, DirectionO)]), -+ {Orientation, Stanza, Direction}}. -+ -+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -> -+ receive -+ {addlog, E} -> -+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} = -+ case filter(FilterO, E) of -+ {true, OSD} -> -+ Div = calc_div(PacketC, CheckRKP), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} = -+ case Div==round(Div) of -+ true -> -+ manage_rotate(Host, IoDevice, Filename, -+ Logdir, RotateO, PacketC, -+ Gregorian_day, Timezone); -+ false -> -+ {IoDevice, Filename, Gregorian_day, -+ PacketC+1} -+ end, -+ add_log(IoDevice2, Timezone, ShowIP, E, OSD), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2}; -+ _ -> -+ {IoDevice, Filename, Gregorian_day, PacketC} -+ end, -+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO, -+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO); -+ stop -> -+ close_file(IoDevice), -+ ok; -+ _ -> -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -+ end. -+ -+send_packet(P, _C2SState, FromJID, ToJID) -> -+ Host = FromJID#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {send, FromJID, ToJID, P}}, -+ P. -+ -+receive_packet(P, _C2SState, _JID, From, To) -> -+ Host = To#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {recv, From, To, P}}, -+ P. -+ -+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) -> -+ %%{Orientation, Stanza, Direction} = OSD, -+ LocalJID = case Orientation of -+ send -> From; -+ recv -> To -+ end, -+ LocalIPS = case ShowIP of -+ true -> -+ case ejabberd_sm:get_user_ip( -+ LocalJID#jid.user, -+ LocalJID#jid.server, -+ LocalJID#jid.resource) of -+ {UserIP, _Port} -> -+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]); -+ undefined -> "lip=\"undefined\" " -+ end; -+ false -> "" -+ end, -+ TimestampISO = get_now_iso(Timezone), -+ io:fwrite(Io, "~s~n", -+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS, -+ TimestampISO, binary_to_list(fxml:element_to_binary(Packet))]). -+ -+%% ------------------- -+%% File -+%% ------------------- -+ -+open_file(Logdir, Host, Timezone) -> -+ TimeStamp = get_now_iso(Timezone), -+ Year = string:substr(TimeStamp, 1, 4), -+ Month = string:substr(TimeStamp, 5, 2), -+ Day = string:substr(TimeStamp, 7, 2), -+ Hour = string:substr(TimeStamp, 10, 2), -+ Min = string:substr(TimeStamp, 13, 2), -+ Sec = string:substr(TimeStamp, 16, 2), -+ S = "-", -+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec, -+ ".xml"]), -+ Filename = filename:join([Logdir, Logname]), -+ -+ Gregorian_day = get_gregorian_day(), -+ -+ %% Open file, create if it does not exist, create parent dirs if needed -+ case file:read_file_info(Filename) of -+ {ok, _} -> -+ {ok, IoDevice} = file:open(Filename, [append]); -+ {error, enoent} -> -+ make_dir_rec(Logdir), -+ {ok, IoDevice} = file:open(Filename, [append]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]) -+ end, -+ {IoDevice, Filename, Gregorian_day}. -+ -+close_file(IoDevice) -> -+ io:fwrite(IoDevice, "~s~n", [""]), -+ file:close(IoDevice). -+ -+rotate_log(IoDevice, Logdir, Host, Timezone) -> -+ close_file(IoDevice), -+ open_file(Logdir, Host, Timezone). -+ -+make_dir_rec(Dir) -> -+ case file:read_file_info(Dir) of -+ {ok, _} -> -+ ok; -+ {error, enoent} -> -+ DirS = filename:split(Dir), -+ DirR = lists:sublist(DirS, length(DirS)-1), -+ make_dir_rec(filename:join(DirR)), -+ file:make_dir(Dir) -+ end. -+ -+%% ------------------- -+%% Utils -+%% ------------------- -+ -+get_gregorian_day() -> calendar:date_to_gregorian_days(date()). -+ -+get_now_iso(Timezone) -> -+ TimeStamp = case Timezone of -+ local -> calendar:now_to_local_time(now()); -+ universal -> calendar:now_to_universal_time(now()) -+ end, -+ binary_to_list(jlib:timestamp_to_legacy(TimeStamp)). -+ -+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) -> -+ A/B; -+calc_div(_A, _B) -> -+ 0.5. %% This ensures that no rotation is performed diff --git a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch deleted file mode 100644 index bba4fcf28..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch +++ /dev/null @@ -1,266 +0,0 @@ -# Calculate format=diff merge(net-im/ejabberd)=>2,3 -diff -uNr ejabberd-2.0.2-beta1.ORIG/src/mod_logxml.erl ejabberd-2.0.2-beta1/src/mod_logxml.erl ---- mod_logxml.erl -+++ mod_logxml.erl -@@ -0,0 +1,261 @@ -+%%%---------------------------------------------------------------------- -+%%% File : mod_logxml.erl -+%%% Author : Badlop -+%%% Purpose : Log XMPP packets to XML file -+%%% Created : -+%%% Id : -+%%%---------------------------------------------------------------------- -+ -+-module(mod_logxml). -+-author('badlop@ono.com'). -+ -+-behaviour(gen_mod). -+ -+-export([start/2, init/7, stop/1, -+ send_packet/3, receive_packet/4]). -+ -+-include("ejabberd.hrl"). -+-include("jlib.hrl"). -+ -+-define(PROCNAME, ejabberd_mod_logxml). -+ -+%% ------------------- -+%% Module control -+%% ------------------- -+ -+start(Host, Opts) -> -+ Logdir = gen_mod:get_opt(logdir, Opts, "/tmp/jabberlogs/"), -+ -+ Rd = gen_mod:get_opt(rotate_days, Opts, 1), -+ Rf = case gen_mod:get_opt(rotate_megs, Opts, 10) of -+ no -> no; -+ Rf1 -> Rf1*1024*1024 -+ end, -+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, 10) of -+ no -> no; -+ Rp1 -> Rp1*1000 -+ end, -+ RotateO = {Rd, Rf, Rp}, -+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, 1), -+ -+ Timezone = gen_mod:get_opt(timezone, Opts, local), -+ -+ Orientation = gen_mod:get_opt(orientation, Opts, [send, recv]), -+ Stanza = gen_mod:get_opt(stanza, Opts, [iq, message, presence, other]), -+ Direction = gen_mod:get_opt(direction, Opts, [internal, vhosts, external]), -+ FilterO = { -+ {orientation, Orientation}, -+ {stanza, Stanza}, -+ {direction, Direction}}, -+ ShowIP = gen_mod:get_opt(show_ip, Opts, false), -+ -+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ register(gen_mod:get_module_proc(Host, ?PROCNAME), -+ spawn(?MODULE, init, [Host, Logdir, RotateO, CheckRKP, -+ Timezone, ShowIP, FilterO])). -+ -+stop(Host) -> -+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90), -+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90), -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! stop, -+ {wait, Proc}. -+ -+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) -> -+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone), -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day, -+ Timezone, ShowIP, FilterO). -+ -+%% ------------------- -+%% Main -+%% ------------------- -+ -+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC, -+ Gregorian_day_log, Timezone) -> -+ {RO_days, RO_size, RO_packets} = RotateO, -+ -+ Rotate1 = case RO_packets of -+ no -> false; -+ PacketC -> true; -+ _ -> false -+ end, -+ -+ Filesize = filelib:file_size(Filename), -+ Rotate2 = if -+ RO_size == no -> false; -+ Filesize >= RO_size -> true; -+ true -> false -+ end, -+ -+ Gregorian_day_today = get_gregorian_day(), -+ Rotate3 = if -+ RO_days == no -> false; -+ (Gregorian_day_today - Gregorian_day_log) >= RO_days -> -+ true; -+ true -> false -+ end, -+ -+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of -+ true -> -+ {IoDevice2, Filename2, Gregorian_day2} = -+ rotate_log(IoDevice, Logdir, Host, Timezone), -+ {IoDevice2, Filename2, Gregorian_day2, 0}; -+ false -> -+ {IoDevice, Filename, Gregorian_day_log, PacketC+1} -+ end. -+ -+filter(FilterO, E) -> -+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} = -+ FilterO, -+ {Orientation, From, To, Packet} = E, -+ -+ {xmlelement, Stanza_str, _Attrs, _Els} = Packet, -+ Stanza = list_to_atom(Stanza_str), -+ -+ Hosts_all = ejabberd_config:get_global_option(hosts), -+ {Host_local, Host_remote} = case Orientation of -+ send -> {From#jid.lserver, To#jid.lserver}; -+ recv -> {To#jid.lserver, From#jid.lserver} -+ end, -+ Direction = case Host_remote of -+ Host_local -> internal; -+ _ -> -+ case lists:member(Host_remote, Hosts_all) of -+ true -> vhosts; -+ false -> external -+ end -+ end, -+ -+ {lists:all(fun(O) -> O end, -+ [lists:member(Orientation, OrientationO), -+ lists:member(Stanza, StanzaO), -+ lists:member(Direction, DirectionO)]), -+ {Orientation, Stanza, Direction}}. -+ -+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -> -+ receive -+ {addlog, E} -> -+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} = -+ case filter(FilterO, E) of -+ {true, OSD} -> -+ Div = PacketC/CheckRKP, -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} = -+ case Div==round(Div) of -+ true -> -+ manage_rotate(Host, IoDevice, Filename, -+ Logdir, RotateO, PacketC, -+ Gregorian_day, Timezone); -+ false -> -+ {IoDevice, Filename, Gregorian_day, -+ PacketC+1} -+ end, -+ add_log(IoDevice2, Timezone, ShowIP, E, OSD), -+ {IoDevice2, Filename2, Gregorian_day2, PacketC2}; -+ _ -> -+ {IoDevice, Filename, Gregorian_day, PacketC} -+ end, -+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO, -+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO); -+ stop -> -+ close_file(IoDevice), -+ ok; -+ _ -> -+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC, -+ Gregorian_day, Timezone, ShowIP, FilterO) -+ end. -+ -+send_packet(FromJID, ToJID, P) -> -+ Host = FromJID#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {send, FromJID, ToJID, P}}. -+ -+receive_packet(_JID, From, To, P) -> -+ Host = To#jid.lserver, -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ Proc ! {addlog, {recv, From, To, P}}. -+ -+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) -> -+ %%{Orientation, Stanza, Direction} = OSD, -+ LocalJID = case Orientation of -+ send -> From; -+ recv -> To -+ end, -+ LocalIPS = case ShowIP of -+ true -> -+ {UserIP, _Port} = ejabberd_sm:get_user_ip( -+ LocalJID#jid.user, -+ LocalJID#jid.server, -+ LocalJID#jid.resource), -+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]); -+ false -> "" -+ end, -+ TimestampISO = get_now_iso(Timezone), -+ io:fwrite(Io, "~s~n", -+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS, -+ TimestampISO, xml:element_to_string(Packet)]). -+ -+%% ------------------- -+%% File -+%% ------------------- -+ -+open_file(Logdir, Host, Timezone) -> -+ TimeStamp = get_now_iso(Timezone), -+ Year = string:substr(TimeStamp, 1, 4), -+ Month = string:substr(TimeStamp, 5, 2), -+ Day = string:substr(TimeStamp, 7, 2), -+ Hour = string:substr(TimeStamp, 10, 2), -+ Min = string:substr(TimeStamp, 13, 2), -+ Sec = string:substr(TimeStamp, 16, 2), -+ S = "-", -+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec, -+ ".xml"]), -+ Filename = filename:join([Logdir, Logname]), -+ -+ Gregorian_day = get_gregorian_day(), -+ -+ %% Open file, create if it does not exist, create parent dirs if needed -+ case file:read_file_info(Filename) of -+ {ok, _} -> -+ {ok, IoDevice} = file:open(Filename, [append]); -+ {error, enoent} -> -+ make_dir_rec(Logdir), -+ {ok, IoDevice} = file:open(Filename, [append]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]), -+ io:fwrite(IoDevice, "~s~n", [""]) -+ end, -+ {IoDevice, Filename, Gregorian_day}. -+ -+close_file(IoDevice) -> -+ io:fwrite(IoDevice, "~s~n", [""]), -+ file:close(IoDevice). -+ -+rotate_log(IoDevice, Logdir, Host, Timezone) -> -+ close_file(IoDevice), -+ open_file(Logdir, Host, Timezone). -+ -+make_dir_rec(Dir) -> -+ case file:read_file_info(Dir) of -+ {ok, _} -> -+ ok; -+ {error, enoent} -> -+ DirS = filename:split(Dir), -+ DirR = lists:sublist(DirS, length(DirS)-1), -+ make_dir_rec(filename:join(DirR)), -+ file:make_dir(Dir) -+ end. -+ -+%% ------------------- -+%% Utils -+%% ------------------- -+ -+get_gregorian_day() -> calendar:date_to_gregorian_days(date()). -+ -+get_now_iso(Timezone) -> -+ TimeStamp = case Timezone of -+ local -> calendar:now_to_local_time(now()); -+ universal -> calendar:now_to_universal_time(now()) -+ end, -+ jlib:timestamp_to_iso(TimeStamp). diff --git a/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory deleted file mode 100644 index 5035eb889..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()=>2.4.11,2.4.12 diff --git a/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch b/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch deleted file mode 100644 index bd0434313..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Calculate format=diff ---- webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.h 2016-04-10 08:48:36.000000000 +0200 -+++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.h 2017-12-20 23:04:55.000000000 +0100 -@@ -27,6 +27,7 @@ - #define JSStringRef_h - - #include -+#include - - #ifndef __cplusplus - #include -@@ -43,7 +44,7 @@ - @typedef JSChar - @abstract A Unicode character. - */ -- typedef unsigned short JSChar; -+ typedef char16_t JSChar; - #else - typedef wchar_t JSChar; - #endif diff --git a/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch b/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch deleted file mode 100644 index 2cee3eecf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Calculate format=diff ---- webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.h 2016-04-10 08:48:37.000000000 +0200 -+++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.h 2017-12-20 22:14:19.097225121 +0100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - #ifndef __cplusplus - #include -@@ -39,7 +40,7 @@ - - #if !defined(WIN32) && !defined(_WIN32) \ - && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ -- typedef unsigned short WKChar; -+ typedef char16_t WKChar; - #else - typedef wchar_t WKChar; - #endif diff --git a/profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/.calculate_directory deleted file mode 100644 index 5c965ea54..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/netkit-rwho-0.17-fixglibc.patch b/profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/netkit-rwho-0.17-fixglibc.patch deleted file mode 100644 index 7efbb0a11..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-misc/netkit-rwho/netkit-rwho-0.17-fixglibc.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate format=diff merge(net-misc/netkit-rwho)=>0.17,0.18 -diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c -index 16a43c0..f22d637 100644 ---- a/rwhod/rwhod.c -+++ b/rwhod/rwhod.c -@@ -75,6 +75,7 @@ char rcsid[] = - #include - #include - #include -+#include - - #include "../version.h" - diff --git a/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch b/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch deleted file mode 100644 index e2c46addf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch +++ /dev/null @@ -1,116 +0,0 @@ -# Calculate format=diff pkg(sys-kernel/calculate-sources)=>3.10,3.11&&merge(net-wireless/broadcom-sta)=>6.30.223.30,6.30.223.31 -diff -ru build.3.9/src/wl/sys/wl_linux.c build/src/wl/sys/wl_linux.c ---- build.3.9/src/wl/sys/wl_linux.c 2013-06-18 13:48:04.109167642 +0000 -+++ build/src/wl/sys/wl_linux.c 2013-06-18 14:24:33.448198331 +0000 -@@ -3236,7 +3236,7 @@ - void - wl_tkip_printstats(wl_info_t *wl, bool group_key) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - char debug_buf[512]; - int idx; - if (wl->tkipmodops) { -@@ -3409,6 +3409,7 @@ - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) - { -@@ -3463,19 +3464,90 @@ - return length; - } - -+#else -+ -+static int -+wl_proc_read(struct seq_file *seq, void *offset) -+{ -+ wl_info_t * wl = (wl_info_t *)seq->private; -+ int bcmerror, to_user; -+ -+ WL_LOCK(wl); -+ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ seq_printf(seq, "%d\n", to_user); -+ return bcmerror; -+} -+ -+static ssize_t wl_proc_write(struct file *file, const char __user *buff, -+ size_t length, loff_t *ppos) -+{ -+ struct seq_file *seq = file->private_data; -+ wl_info_t * wl = (wl_info_t *)seq->private; -+ int bcmerror, from_user = 0; -+ -+ if (length != 1) { -+ WL_ERROR(("%s: Invalid data length\n", __FUNCTION__)); -+ return -EIO; -+ } -+ -+ if (copy_from_user(&from_user, buff, 1)) { -+ WL_ERROR(("%s: copy from user failed\n", __FUNCTION__)); -+ return -EFAULT; -+ } -+ -+ if (from_user >= 0x30) -+ from_user -= 0x30; -+ -+ WL_LOCK(wl); -+ bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ if (bcmerror < 0) { -+ WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); -+ return -EIO; -+ } -+ *ppos += length; -+ return length; -+} -+ -+static int wl_proc_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, wl_proc_read, PDE_DATA(inode)); -+} -+ -+static const struct file_operations wl_proc_fops = { -+ .owner = THIS_MODULE, -+ .open = wl_proc_open, -+ .read = seq_read, -+ .write = wl_proc_write, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+#endif -+ - static int - wl_reg_proc_entry(wl_info_t *wl) - { - char tmp[32]; - sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); -- if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ wl->proc_entry = create_proc_entry(tmp, 0644, NULL); -+ if (wl->proc_entry) { -+ wl->proc_entry->read_proc = wl_proc_read; -+ wl->proc_entry->write_proc = wl_proc_write; -+ wl->proc_entry->data = wl; -+ } -+#else -+ wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl); -+#endif -+ if (!wl->proc_entry) { - WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); - ASSERT(0); - return -1; - } -- wl->proc_entry->read_proc = wl_proc_read; -- wl->proc_entry->write_proc = wl_proc_write; -- wl->proc_entry->data = wl; - return 0; - } - #ifdef WLOFFLD diff --git a/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch b/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch deleted file mode 100644 index c1ae650d7..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate format=diff pkg(sys-kernel/calculate-sources)=>4.3,4.5&&merge(net-wireless/broadcom-sta)=>6.30.223.271,6.30.223.272&&os_arch_machine==i686 -diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c -index f879398..c098234 100644 ---- a/src/shared/linux_osl.c -+++ b/src/shared/linux_osl.c -@@ -932,7 +932,7 @@ osl_getcycles(void) - uint cycles; - - #if defined(__i386__) -- cycles = (u32)native_read_tsc(); -+ cycles = (u32)rdtsc(); - #else - cycles = 0; - #endif diff --git a/profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/ndiswrapper-1.61-linux-4.15.patch b/profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/ndiswrapper-1.61-linux-4.15.patch deleted file mode 100644 index 8c12648f5..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/net-wireless/ndiswrapper/ndiswrapper-1.61-linux-4.15.patch +++ /dev/null @@ -1,200 +0,0 @@ -# Calculate format=diff merge(net-wireless/ndiswrapper)>=1.61 -From: Seth Forshee -Date: Wed, 13 Dec 2017 15:53:31 -0600 -Subject: [PATCH] Build fixes for Linux 4.15 - -Fixes two build issues for 4.15: - - - init_timer() was eliminated in 4.15, and all callers were - converted to using timer_setup(). The callback prototype has - also changed to pass a timer_list argument instead of callback - data, and from_timer() must be used to get to the object in - which the timer is embedded. - - - usb_get_status() was changed to take an additional argument, - and usb_get_std_status() was added as a wrapper for callers to - use as a replacment. Call the wrapper in 4.15 and later. - -LP: #1737749 ---- - driver/ntoskernel.c | 19 ++++++++++++++++++- - driver/usb.c | 10 ++++++++-- - driver/wrapndis.c | 28 ++++++++++++++++++++++++++++ - 3 files changed, 54 insertions(+), 3 deletions(-) - -diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c -index 4fe0dc1..156c688 100644 ---- a/driver/ntoskernel.c -+++ b/driver/ntoskernel.c -@@ -77,7 +77,6 @@ u64 wrap_ticks_to_boot; - #if defined(CONFIG_X86_64) - static struct timer_list shared_data_timer; - struct kuser_shared_data kuser_shared_data; --static void update_user_shared_data_proc(unsigned long data); - #endif - - WIN_SYMBOL_MAP("KeTickCount", &jiffies) -@@ -91,7 +90,11 @@ DEFINE_PER_CPU(struct irql_info, irql_info); - #endif - - #if defined(CONFIG_X86_64) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - static void update_user_shared_data_proc(unsigned long data) -+#else -+static void update_user_shared_data_proc(struct timer_list *t) -+#endif - { - /* timer is supposed to be scheduled every 10ms, but bigger - * intervals seem to work (tried up to 50ms) */ -@@ -407,9 +410,15 @@ static void initialize_object(struct dispatcher_header *dh, enum dh_type type, - InitializeListHead(&dh->wait_blocks); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - static void timer_proc(unsigned long data) - { - struct wrap_timer *wrap_timer = (struct wrap_timer *)data; -+#else -+static void timer_proc(struct timer_list *t) -+{ -+ struct wrap_timer *wrap_timer = from_timer(wrap_timer, t, timer); -+#endif - struct nt_timer *nt_timer; - struct kdpc *kdpc; - -@@ -452,9 +461,13 @@ void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type, - return; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - init_timer(&wrap_timer->timer); - wrap_timer->timer.data = (unsigned long)wrap_timer; - wrap_timer->timer.function = timer_proc; -+#else -+ timer_setup(&wrap_timer->timer, timer_proc, 0); -+#endif - wrap_timer->nt_timer = nt_timer; - #ifdef TIMER_DEBUG - wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC; -@@ -2559,9 +2572,13 @@ int ntoskernel_init(void) - #if defined(CONFIG_X86_64) - memset(&kuser_shared_data, 0, sizeof(kuser_shared_data)); - *((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601(); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - init_timer(&shared_data_timer); - shared_data_timer.function = update_user_shared_data_proc; - shared_data_timer.data = 0; -+#else -+ timer_setup(&shared_data_timer, update_user_shared_data_proc, 0); -+#endif - #endif - return 0; - } -diff --git a/driver/usb.c b/driver/usb.c -index 3e7021a..e55c2c6 100644 ---- a/driver/usb.c -+++ b/driver/usb.c -@@ -750,6 +750,12 @@ static USBD_STATUS wrap_set_clear_feature(struct usb_device *udev, - USBEXIT(return NT_URB_STATUS(nt_urb)); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) -+#define wrap_usb_get_status usb_get_status -+#else -+#define wrap_usb_get_status usb_get_std_status -+#endif -+ - static USBD_STATUS wrap_get_status_request(struct usb_device *udev, - struct irp *irp) - { -@@ -776,8 +782,8 @@ static USBD_STATUS wrap_get_status_request(struct usb_device *udev, - return NT_URB_STATUS(nt_urb); - } - assert(status_req->transfer_buffer_length == sizeof(u16)); -- ret = usb_get_status(udev, type, status_req->index, -- status_req->transfer_buffer); -+ ret = wrap_usb_get_status(udev, type, status_req->index, -+ status_req->transfer_buffer); - if (ret >= 0) { - assert(ret <= status_req->transfer_buffer_length); - status_req->transfer_buffer_length = ret; -diff --git a/driver/wrapndis.c b/driver/wrapndis.c -index 870e4c2..f653440 100644 ---- a/driver/wrapndis.c -+++ b/driver/wrapndis.c -@@ -1093,9 +1093,15 @@ send_assoc_event: - EXIT2(return); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - static void iw_stats_timer_proc(unsigned long data) - { - struct ndis_device *wnd = (struct ndis_device *)data; -+#else -+static void iw_stats_timer_proc(struct timer_list *t) -+{ -+ struct ndis_device *wnd = from_timer(wnd, t, iw_stats_timer); -+#endif - - ENTER2("%d", wnd->iw_stats_interval); - if (wnd->iw_stats_interval > 0) { -@@ -1111,8 +1117,12 @@ static void add_iw_stats_timer(struct ndis_device *wnd) - return; - if (wnd->iw_stats_interval < 0) - wnd->iw_stats_interval *= -1; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - wnd->iw_stats_timer.data = (unsigned long)wnd; - wnd->iw_stats_timer.function = iw_stats_timer_proc; -+#else -+ timer_setup(&wnd->iw_stats_timer, iw_stats_timer_proc, 0); -+#endif - mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval); - } - -@@ -1124,9 +1134,15 @@ static void del_iw_stats_timer(struct ndis_device *wnd) - EXIT2(return); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - static void hangcheck_proc(unsigned long data) - { - struct ndis_device *wnd = (struct ndis_device *)data; -+#else -+static void hangcheck_proc(struct timer_list *t) -+{ -+ struct ndis_device *wnd = from_timer(wnd, t, hangcheck_timer); -+#endif - - ENTER3("%d", wnd->hangcheck_interval); - if (wnd->hangcheck_interval > 0) { -@@ -1147,8 +1163,12 @@ void hangcheck_add(struct ndis_device *wnd) - wnd->hangcheck_interval = hangcheck_interval * HZ; - if (wnd->hangcheck_interval < 0) - wnd->hangcheck_interval *= -1; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - wnd->hangcheck_timer.data = (unsigned long)wnd; - wnd->hangcheck_timer.function = hangcheck_proc; -+#else -+ timer_setup(&wnd->hangcheck_timer, hangcheck_proc, 0); -+#endif - mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval); - EXIT2(return); - } -@@ -2138,9 +2158,17 @@ static NTSTATUS ndis_add_device(struct driver_object *drv_obj, - wnd->dma_map_count = 0; - wnd->dma_map_addr = NULL; - wnd->nick[0] = 0; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - init_timer(&wnd->hangcheck_timer); -+#else -+ timer_setup(&wnd->hangcheck_timer, NULL, 0); -+#endif - wnd->scan_timestamp = 0; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - init_timer(&wnd->iw_stats_timer); -+#else -+ timer_setup(&wnd->iw_stats_timer, NULL, 0); -+#endif - wnd->iw_stats_interval = 10 * HZ; - wnd->ndis_pending_work = 0; - memset(&wnd->essid, 0, sizeof(wnd->essid)); diff --git a/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/.calculate_directory deleted file mode 100644 index 180413da1..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()==2.2.20.1,2.2.23 diff --git a/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch b/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch deleted file mode 100644 index accbf7d09..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate format=diff -diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py -index a7f2d44..91d24e0 100644 ---- a/pym/_emerge/BinpkgFetcher.py -+++ b/pym/_emerge/BinpkgFetcher.py -@@ -133,7 +133,7 @@ class BinpkgFetcher(SpawnProcess): - if bintree._remote_has_index: - remote_mtime = bintree._remotepkgs[ - bintree.dbapi._instance_key( -- self.pkg.cpv)].get("MTIME") -+ self.pkg.cpv)].get("_mtime_") - if remote_mtime is not None: - try: - remote_mtime = long(remote_mtime) diff --git a/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch b/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch deleted file mode 100644 index 1a01b7fa8..000000000 --- a/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Calculate format=diff ---- v86d-0.1.10-orig/v86.h -+++ v86d-0.1.10/v86.h -@@ -19,6 +19,8 @@ - - struct completion; - -+typedef struct { int counter; } atomic_t; -+ - #include