D24358: SVN_SILENT made messages (.desktop file) - always resolve ours

[Arjen Hiemstra]

ahiemstra created this revision.
Herald added a project: Plasma.
Herald added a subscriber: plasma-devel.
ahiemstra requested review of this revision.

REVISION SUMMARY
  In case of conflict in i18n, keep the version of the branch "ours"
  To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  
  SVN_SILENT made messages (.desktop file) - always resolve ours
  
  In case of conflict in i18n, keep the version of the branch "ours"
  To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  
  SVN_SILENT made messages (.desktop file) - always resolve ours
  
  In case of conflict in i18n, keep the version of the branch "ours"
  To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  
  SVN_SILENT made messages (.desktop file) - always resolve ours
  
  In case of conflict in i18n, keep the version of the branch "ours"
  To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  
  SVN_SILENT made messages (.desktop file) - always resolve ours
  
  In case of conflict in i18n, keep the version of the branch "ours"
  To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  
  SVN_SILENT made messages (.desktop file) - always resolve ours
  
  In case of conflict in i18n, keep the version of the branch "ours"
  To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  
  networkhelper: Properly lock access to Accumulator::m_data
  
  Since there are different threads accessing it.
  
  Fixes OpenSuse Bug 1152634
  
  networkhelper: Close the pcap instance when stop() is called
  
  This prevents leaking of the pcap instance should start() ever be called
  again after stop().
  
  This fixes most of OpenSuse Bug 1152638
  
  networkhelper: Limit maximum size of incoming packet queue
  
  Should there be so much traffic that the rest of the code cannot keep
  up, there now should be no risk that memory usage will keep growing.
  
  Fixes OpenSuse Bug 1152639
  
  networkhelper: Remove unused m_active member
  
  It was a leftover from when we manually did the loop.
  
  Fixes OpenSuse Bug 1152641
  
  networkhelper: Ensure readlinkat results in a null terminated string
  
  Apparently, readlinkat() will not ensure the result is null terminated,
  so decrease write size by one so the terminating null does not get
  overwritten.
  
  Fixes OpenSuse Bug 1152642
  
  networkhelper: Check for data length before trying to access packet parts
  
  This ensures we actually have packet data with the required length
  instead of just assuming it does.
  
  Fixes OpenSuse Bug 1152644
  
  networkhelper: Do not call pcap_freecode when compilation failed
  
  Since the structure will be empty in that case.
  
  Fixes OpenSuse Bug 1152646
  
  networkhelper: Properly convert IPv6 u8 array to u32
  
  And-ing the parts would result in empty bytes and implcit conversion
  might fail.
  
  Fixes Comment 3 of OpenSuse Bug 1151190

REPOSITORY
  R106 KSysguard

BRANCH
  secteam_fixes

REVISION DETAIL
  https://phabricator.kde.org/D24358

AFFECTED FILES
  plugins/process/network/helper/Accumulator.cpp
  plugins/process/network/helper/Accumulator.h
  plugins/process/network/helper/Capture.cpp
  plugins/process/network/helper/Capture.h
  plugins/process/network/helper/ConnectionMapping.cpp
  plugins/process/network/helper/Packet.cpp
  plugins/process/network/helper/Packet.h
  plugins/process/network/networkplugin.json

To: ahiemstra
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20191002/e6a084f1/attachment.html>