summaryrefslogtreecommitdiffstats
path: root/source/kde/kde
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-08-16 05:28:16 +0000
committer Eric Hameleers <alien@slackware.com>2021-08-16 17:59:55 +0200
commitc6af8d2fd5b54097522f6682b05fd212dcf4bbff (patch)
tree406bd370540d9e86ebe20531836cac0d0b80c890 /source/kde/kde
parent667b86aaab3e72c3c6a80e2b7dcbe2da39c89d71 (diff)
downloadcurrent-c6af8d2fd5b54097522f6682b05fd212dcf4bbff.tar.gz
current-c6af8d2fd5b54097522f6682b05fd212dcf4bbff.tar.xz
Mon Aug 16 05:28:16 UTC 202120210816052816
Hey everyone, long time no see! No, I wasn't out fishing. Sadly, I haven't had a fishing rod in my hand (or even a fishing license in my wallet) for this entire season, but there may yet be a chance for that this year. Along with the usual suspects, I've been trying to clear out the list of things that needed to get done in order to reach the standard of excellence demanded from a Slackware release, and I think we've gotten it pretty close. GCC was bumped to version 11.2.0 (because we just can't send this out 2 versions behind), and everything was verified to build properly or fixed up so that it did. I don't see any benefit to another public mass rebuild, so we're not going to do one. Anyway, without further ado, here is Slackware 15.0 release candidate one. Consider most things frozen and the focus now to be any remaining blocker bugs. We'll more than likely take that next Plasma bugfix release, but it's soon time to get off this treadmill. Enjoy! :-) a/aaa_libraries-15.0-x86_64-8.txz: Rebuilt. Upgraded: libcap.so.2.52, libpcre.so.1.2.13, libboost_atomic.so.1.76.0, libboost_chrono.so.1.76.0, libboost_container.so.1.76.0, libboost_context.so.1.76.0, libboost_contract.so.1.76.0, libboost_coroutine.so.1.76.0, libboost_date_time.so.1.76.0, libboost_fiber.so.1.76.0, libboost_filesystem.so.1.76.0, libboost_graph.so.1.76.0, libboost_iostreams.so.1.76.0, libboost_json.so.1.76.0, libboost_locale.so.1.76.0, libboost_log.so.1.76.0, libboost_log_setup.so.1.76.0, libboost_math_c99.so.1.76.0, libboost_math_c99f.so.1.76.0, libboost_math_c99l.so.1.76.0, libboost_math_tr1.so.1.76.0, libboost_math_tr1f.so.1.76.0, libboost_math_tr1l.so.1.76.0, libboost_nowide.so.1.76.0, libboost_prg_exec_monitor.so.1.76.0, libboost_program_options.so.1.76.0, libboost_python27.so.1.76.0, libboost_python39.so.1.76.0, libboost_random.so.1.76.0, libboost_regex.so.1.76.0, libboost_serialization.so.1.76.0, libboost_stacktrace_addr2line.so.1.76.0, libboost_stacktrace_basic.so.1.76.0, libboost_stacktrace_noop.so.1.76.0, libboost_system.so.1.76.0, libboost_thread.so.1.76.0, libboost_timer.so.1.76.0, libboost_type_erasure.so.1.76.0, libboost_unit_test_framework.so.1.76.0, libboost_wave.so.1.76.0, libboost_wserialization.so.1.76.0, libcares.so.2.4.3, libglib-2.0.so.0.6800.3, libgmodule-2.0.so.0.6800.3, libgobject-2.0.so.0.6800.3, libgthread-2.0.so.0.6800.3, libidn.so.12.6.3, liblber-2.4.so.2.11.7, libldap-2.4.so.2.11.7, libstdc++.so.6.0.29, libtdb.so.1.4.5. a/grep-3.7-x86_64-1.txz: Upgraded. a/kernel-firmware-20210812_24c4a85-noarch-1.txz: Upgraded. a/kernel-generic-5.13.11-x86_64-1.txz: Upgraded. a/kernel-huge-5.13.11-x86_64-1.txz: Upgraded. a/kernel-modules-5.13.11-x86_64-1.txz: Upgraded. a/libgudev-237-x86_64-1.txz: Upgraded. a/lvm2-2.03.13-x86_64-1.txz: Upgraded. ap/linuxdoc-tools-0.9.82-x86_64-1.txz: Upgraded. Thanks to Stuart Winter. ap/mariadb-10.5.12-x86_64-1.txz: Upgraded. Looks like we're still hitting a few regressions in the 10.6 branch. The most obvious one where the version reported by MariaDB is the library version rather than the server version (as previously reported) could be reverted, but this could lead to future problems as fixes for this change land in other projects. It seems that the safest approach at this time is to switch back to the most recent release from the 10.5 branch and keep an eye on the situation. Thanks to richarson and Heinz Wiesinger. ap/mc-4.8.27-x86_64-1.txz: Upgraded. ap/pamixer-1.4-x86_64-11.txz: Rebuilt. Recompiled against boost-1.77.0. ap/slackpkg-15.0.7-noarch-1.txz: Upgraded. Remove ftp://spout.ussg.indiana.edu from mirrorlist. Allow "slackpkg help" to work after slackpkg is upgraded (JK Wood). Thanks to Robby Workman. ap/squashfs-tools-4.5-x86_64-1.txz: Upgraded. ap/vim-8.2.3352-x86_64-1.txz: Upgraded. d/gcc-11.2.0-x86_64-1.txz: Upgraded. d/gcc-brig-11.2.0-x86_64-1.txz: Upgraded. d/gcc-g++-11.2.0-x86_64-1.txz: Upgraded. d/gcc-gdc-11.2.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-11.2.0-x86_64-1.txz: Upgraded. d/gcc-gnat-11.2.0-x86_64-1.txz: Upgraded. d/gcc-go-11.2.0-x86_64-1.txz: Upgraded. d/gcc-objc-11.2.0-x86_64-1.txz: Upgraded. d/help2man-1.48.4-x86_64-1.txz: Upgraded. d/kernel-headers-5.13.11-x86-1.txz: Upgraded. d/libtool-2.4.6-x86_64-18.txz: Rebuilt. Recompiled to update embedded GCC version number. d/meson-0.58.2-x86_64-1.txz: Upgraded. d/parallel-20210722-noarch-1.txz: Upgraded. d/python-pip-21.2.4-x86_64-1.txz: Upgraded. d/slacktrack-2.21-x86_64-1.txz: Upgraded. Thanks to Stuart Winter. k/kernel-source-5.13.11-noarch-1.txz: Upgraded. CC_VERSION_TEXT "gcc (GCC) 10.3.0" -> "gcc (GCC) 11.2.0" GCC_VERSION 100300 -> 110200 +CC_HAS_ASM_GOTO_OUTPUT y +HAVE_KCSAN_COMPILER y +KCSAN n +SND_SOC_INTEL_HDA_DSP_COMMON m +SND_SOC_INTEL_SOF_MAXIM_COMMON m kde/akonadi-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-calendar-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-calendar-tools-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-contacts-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-import-wizard-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-mime-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-notes-21.08.0-x86_64-1.txz: Upgraded. kde/akonadi-search-21.08.0-x86_64-1.txz: Upgraded. kde/akonadiconsole-21.08.0-x86_64-1.txz: Upgraded. kde/akregator-21.08.0-x86_64-1.txz: Upgraded. kde/analitza-21.08.0-x86_64-1.txz: Upgraded. kde/ark-21.08.0-x86_64-1.txz: Upgraded. kde/artikulate-21.08.0-x86_64-1.txz: Upgraded. kde/attica-5.85.0-x86_64-1.txz: Upgraded. kde/audiocd-kio-21.08.0-x86_64-1.txz: Upgraded. kde/baloo-5.85.0-x86_64-1.txz: Upgraded. kde/baloo-widgets-21.08.0-x86_64-1.txz: Upgraded. kde/blinken-21.08.0-x86_64-1.txz: Upgraded. kde/bluez-qt-5.85.0-x86_64-1.txz: Upgraded. kde/bomber-21.08.0-x86_64-1.txz: Upgraded. kde/bovo-21.08.0-x86_64-1.txz: Upgraded. kde/breeze-icons-5.85.0-noarch-1.txz: Upgraded. kde/calendarsupport-21.08.0-x86_64-1.txz: Upgraded. kde/cantor-21.08.0-x86_64-1.txz: Upgraded. kde/cervisia-21.08.0-x86_64-1.txz: Upgraded. kde/dolphin-21.08.0-x86_64-1.txz: Upgraded. kde/dolphin-plugins-21.08.0-x86_64-1.txz: Upgraded. kde/dragon-21.08.0-x86_64-1.txz: Upgraded. kde/elisa-21.08.0-x86_64-1.txz: Upgraded. kde/eventviews-21.08.0-x86_64-1.txz: Upgraded. kde/extra-cmake-modules-5.85.0-x86_64-1.txz: Upgraded. kde/ffmpegthumbs-21.08.0-x86_64-1.txz: Upgraded. kde/filelight-21.08.0-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.85.0-x86_64-1.txz: Upgraded. kde/granatier-21.08.0-x86_64-1.txz: Upgraded. kde/grantlee-editor-21.08.0-x86_64-1.txz: Upgraded. kde/grantleetheme-21.08.0-x86_64-1.txz: Upgraded. kde/gwenview-21.08.0-x86_64-1.txz: Upgraded. kde/incidenceeditor-21.08.0-x86_64-1.txz: Upgraded. kde/itinerary-21.08.0-x86_64-1.txz: Upgraded. kde/juk-21.08.0-x86_64-1.txz: Upgraded. kde/k3b-21.08.0-x86_64-1.txz: Upgraded. kde/kactivities-5.85.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.85.0-x86_64-1.txz: Upgraded. kde/kaddressbook-21.08.0-x86_64-1.txz: Upgraded. kde/kalarm-21.08.0-x86_64-1.txz: Upgraded. kde/kalarmcal-21.08.0-x86_64-1.txz: Upgraded. kde/kalgebra-21.08.0-x86_64-1.txz: Upgraded. kde/kalzium-21.08.0-x86_64-1.txz: Upgraded. kde/kamera-21.08.0-x86_64-1.txz: Upgraded. kde/kamoso-21.08.0-x86_64-1.txz: Upgraded. kde/kanagram-21.08.0-x86_64-1.txz: Upgraded. kde/kapidox-5.85.0-x86_64-1.txz: Upgraded. kde/kapman-21.08.0-x86_64-1.txz: Upgraded. kde/kapptemplate-21.08.0-x86_64-1.txz: Upgraded. kde/karchive-5.85.0-x86_64-1.txz: Upgraded. kde/kate-21.08.0-x86_64-1.txz: Upgraded. kde/katomic-21.08.0-x86_64-1.txz: Upgraded. kde/kauth-5.85.0-x86_64-1.txz: Upgraded. kde/kbackup-21.08.0-x86_64-1.txz: Upgraded. kde/kblackbox-21.08.0-x86_64-1.txz: Upgraded. kde/kblocks-21.08.0-x86_64-1.txz: Upgraded. kde/kbookmarks-5.85.0-x86_64-1.txz: Upgraded. kde/kbounce-21.08.0-x86_64-1.txz: Upgraded. kde/kbreakout-21.08.0-x86_64-1.txz: Upgraded. kde/kbruch-21.08.0-x86_64-1.txz: Upgraded. kde/kcachegrind-21.08.0-x86_64-1.txz: Upgraded. kde/kcalc-21.08.0-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.85.0-x86_64-1.txz: Upgraded. kde/kcalutils-21.08.0-x86_64-1.txz: Upgraded. kde/kcharselect-21.08.0-x86_64-1.txz: Upgraded. kde/kcmutils-5.85.0-x86_64-1.txz: Upgraded. kde/kcodecs-5.85.0-x86_64-1.txz: Upgraded. kde/kcolorchooser-21.08.0-x86_64-1.txz: Upgraded. kde/kcompletion-5.85.0-x86_64-1.txz: Upgraded. kde/kconfig-5.85.0-x86_64-1.txz: Upgraded. kde/kconfigwidgets-5.85.0-x86_64-1.txz: Upgraded. kde/kcontacts-5.85.0-x86_64-1.txz: Upgraded. kde/kcoreaddons-5.85.0-x86_64-1.txz: Upgraded. kde/kcrash-5.85.0-x86_64-1.txz: Upgraded. kde/kcron-21.08.0-x86_64-1.txz: Upgraded. kde/kdav-5.85.0-x86_64-1.txz: Upgraded. kde/kdbusaddons-5.85.0-x86_64-1.txz: Upgraded. kde/kde-dev-scripts-21.08.0-x86_64-1.txz: Upgraded. kde/kde-dev-utils-21.08.0-x86_64-1.txz: Upgraded. kde/kdebugsettings-21.08.0-x86_64-1.txz: Upgraded. kde/kdeclarative-5.85.0-x86_64-1.txz: Upgraded. kde/kdeconnect-kde-21.08.0-x86_64-1.txz: Upgraded. kde/kded-5.85.0-x86_64-1.txz: Upgraded. kde/kdeedu-data-21.08.0-x86_64-1.txz: Upgraded. kde/kdegraphics-mobipocket-21.08.0-x86_64-1.txz: Upgraded. kde/kdegraphics-thumbnailers-21.08.0-x86_64-1.txz: Upgraded. kde/kdelibs4support-5.85.0-x86_64-1.txz: Upgraded. kde/kdenetwork-filesharing-21.08.0-x86_64-1.txz: Upgraded. kde/kdenlive-21.08.0-x86_64-1.txz: Upgraded. kde/kdepim-addons-21.08.0-x86_64-1.txz: Upgraded. kde/kdepim-runtime-21.08.0-x86_64-1.txz: Upgraded. kde/kdesdk-kioslaves-21.08.0-x86_64-1.txz: Upgraded. kde/kdesdk-thumbnailers-21.08.0-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.85.0-x86_64-1.txz: Upgraded. kde/kdesu-5.85.0-x86_64-1.txz: Upgraded. kde/kdewebkit-5.85.0-x86_64-1.txz: Upgraded. kde/kdf-21.08.0-x86_64-1.txz: Upgraded. kde/kdialog-21.08.0-x86_64-1.txz: Upgraded. kde/kdiamond-21.08.0-x86_64-1.txz: Upgraded. kde/kdnssd-5.85.0-x86_64-1.txz: Upgraded. kde/kdoctools-5.85.0-x86_64-1.txz: Upgraded. kde/keditbookmarks-21.08.0-x86_64-1.txz: Upgraded. kde/kemoticons-5.85.0-x86_64-1.txz: Upgraded. kde/kfilemetadata-5.85.0-x86_64-1.txz: Upgraded. kde/kfind-21.08.0-x86_64-1.txz: Upgraded. kde/kfloppy-21.08.0-x86_64-1.txz: Upgraded. kde/kfourinline-21.08.0-x86_64-1.txz: Upgraded. kde/kgeography-21.08.0-x86_64-1.txz: Upgraded. kde/kget-21.08.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.85.0-x86_64-1.txz: Upgraded. kde/kgoldrunner-21.08.0-x86_64-1.txz: Upgraded. kde/kgpg-21.08.0-x86_64-1.txz: Upgraded. kde/kguiaddons-5.85.0-x86_64-1.txz: Upgraded. kde/khangman-21.08.0-x86_64-1.txz: Upgraded. kde/khelpcenter-21.08.0-x86_64-1.txz: Upgraded. kde/kholidays-5.85.0-x86_64-1.txz: Upgraded. kde/khtml-5.85.0-x86_64-1.txz: Upgraded. kde/ki18n-5.85.0-x86_64-1.txz: Upgraded. kde/kiconthemes-5.85.0-x86_64-1.txz: Upgraded. kde/kidentitymanagement-21.08.0-x86_64-1.txz: Upgraded. kde/kidletime-5.85.0-x86_64-1.txz: Upgraded. kde/kig-21.08.0-x86_64-1.txz: Upgraded. kde/kigo-21.08.0-x86_64-1.txz: Upgraded. kde/killbots-21.08.0-x86_64-1.txz: Upgraded. kde/kimageformats-5.85.0-x86_64-1.txz: Upgraded. kde/kimagemapeditor-21.08.0-x86_64-1.txz: Upgraded. kde/kimap-21.08.0-x86_64-1.txz: Upgraded. kde/kinit-5.85.0-x86_64-1.txz: Upgraded. kde/kio-5.85.0-x86_64-1.txz: Upgraded. kde/kio-extras-21.08.0-x86_64-1.txz: Upgraded. kde/kio-gdrive-21.08.0-x86_64-1.txz: Upgraded. kde/kipi-plugins-21.08.0-x86_64-1.txz: Upgraded. kde/kirigami-gallery-21.08.0-x86_64-1.txz: Upgraded. kde/kirigami2-5.85.0-x86_64-1.txz: Upgraded. kde/kiriki-21.08.0-x86_64-1.txz: Upgraded. kde/kitemmodels-5.85.0-x86_64-1.txz: Upgraded. kde/kitemviews-5.85.0-x86_64-1.txz: Upgraded. kde/kiten-21.08.0-x86_64-1.txz: Upgraded. kde/kitinerary-21.08.0-x86_64-1.txz: Upgraded. kde/kjobwidgets-5.85.0-x86_64-1.txz: Upgraded. kde/kjs-5.85.0-x86_64-1.txz: Upgraded. kde/kjsembed-5.85.0-x86_64-1.txz: Upgraded. kde/kjumpingcube-21.08.0-x86_64-1.txz: Upgraded. kde/kldap-21.08.0-x86_64-1.txz: Upgraded. kde/kleopatra-21.08.0-x86_64-1.txz: Upgraded. kde/klickety-21.08.0-x86_64-1.txz: Upgraded. kde/klines-21.08.0-x86_64-1.txz: Upgraded. kde/kmag-21.08.0-x86_64-1.txz: Upgraded. kde/kmahjongg-21.08.0-x86_64-1.txz: Upgraded. kde/kmail-21.08.0-x86_64-1.txz: Upgraded. kde/kmail-account-wizard-21.08.0-x86_64-1.txz: Upgraded. kde/kmailtransport-21.08.0-x86_64-1.txz: Upgraded. kde/kmbox-21.08.0-x86_64-1.txz: Upgraded. kde/kmediaplayer-5.85.0-x86_64-1.txz: Upgraded. kde/kmime-21.08.0-x86_64-1.txz: Upgraded. kde/kmines-21.08.0-x86_64-1.txz: Upgraded. kde/kmix-21.08.0-x86_64-1.txz: Upgraded. kde/kmousetool-21.08.0-x86_64-1.txz: Upgraded. kde/kmouth-21.08.0-x86_64-1.txz: Upgraded. kde/kmplot-21.08.0-x86_64-1.txz: Upgraded. kde/knavalbattle-21.08.0-x86_64-1.txz: Upgraded. kde/knetwalk-21.08.0-x86_64-1.txz: Upgraded. kde/knewstuff-5.85.0-x86_64-1.txz: Upgraded. kde/knights-21.08.0-x86_64-1.txz: Upgraded. kde/knotes-21.08.0-x86_64-1.txz: Upgraded. kde/knotifications-5.85.0-x86_64-1.txz: Upgraded. kde/knotifyconfig-5.85.0-x86_64-1.txz: Upgraded. kde/kolf-21.08.0-x86_64-1.txz: Upgraded. kde/kollision-21.08.0-x86_64-1.txz: Upgraded. kde/kolourpaint-21.08.0-x86_64-1.txz: Upgraded. kde/kompare-21.08.0-x86_64-1.txz: Upgraded. kde/konqueror-21.08.0-x86_64-1.txz: Upgraded. kde/konquest-21.08.0-x86_64-1.txz: Upgraded. kde/konsole-21.08.0-x86_64-1.txz: Upgraded. kde/kontact-21.08.0-x86_64-1.txz: Upgraded. kde/kontactinterface-21.08.0-x86_64-1.txz: Upgraded. kde/kontrast-21.08.0-x86_64-1.txz: Upgraded. kde/konversation-21.08.0-x86_64-1.txz: Upgraded. kde/kopeninghours-21.08.0-x86_64-1.txz: Upgraded. kde/kopete-21.08.0-x86_64-1.txz: Upgraded. kde/korganizer-21.08.0-x86_64-1.txz: Upgraded. kde/kosmindoormap-21.08.0-x86_64-1.txz: Upgraded. kde/kpackage-5.85.0-x86_64-1.txz: Upgraded. kde/kparts-5.85.0-x86_64-1.txz: Upgraded. kde/kpat-21.08.0-x86_64-1.txz: Upgraded. kde/kpeople-5.85.0-x86_64-1.txz: Upgraded. kde/kpimtextedit-21.08.0-x86_64-1.txz: Upgraded. kde/kpkpass-21.08.0-x86_64-1.txz: Upgraded. kde/kplotting-5.85.0-x86_64-1.txz: Upgraded. kde/kpmcore-21.08.0-x86_64-1.txz: Upgraded. kde/kpty-5.85.0-x86_64-1.txz: Upgraded. kde/kpublictransport-21.08.0-x86_64-1.txz: Upgraded. kde/kqtquickcharts-21.08.0-x86_64-1.txz: Upgraded. kde/kquickcharts-5.85.0-x86_64-1.txz: Upgraded. kde/krdc-21.08.0-x86_64-1.txz: Upgraded. kde/kreversi-21.08.0-x86_64-1.txz: Upgraded. kde/krfb-21.08.0-x86_64-1.txz: Upgraded. kde/krita-4.4.7-x86_64-2.txz: Rebuilt. Recompiled against boost-1.77.0. kde/kross-5.85.0-x86_64-1.txz: Upgraded. kde/kross-interpreters-21.08.0-x86_64-1.txz: Upgraded. kde/kruler-21.08.0-x86_64-1.txz: Upgraded. kde/krunner-5.85.0-x86_64-1.txz: Upgraded. kde/kservice-5.85.0-x86_64-1.txz: Upgraded. kde/kshisen-21.08.0-x86_64-1.txz: Upgraded. kde/ksirk-21.08.0-x86_64-1.txz: Upgraded. kde/ksmtp-21.08.0-x86_64-1.txz: Upgraded. kde/ksnakeduel-21.08.0-x86_64-1.txz: Upgraded. kde/kspaceduel-21.08.0-x86_64-1.txz: Upgraded. kde/ksquares-21.08.0-x86_64-1.txz: Upgraded. kde/ksudoku-21.08.0-x86_64-1.txz: Upgraded. kde/ksystemlog-21.08.0-x86_64-1.txz: Upgraded. kde/kteatime-21.08.0-x86_64-1.txz: Upgraded. kde/ktexteditor-5.85.0-x86_64-1.txz: Upgraded. kde/ktextwidgets-5.85.0-x86_64-1.txz: Upgraded. kde/ktimer-21.08.0-x86_64-1.txz: Upgraded. kde/ktnef-21.08.0-x86_64-1.txz: Upgraded. kde/ktorrent-21.08.0-x86_64-1.txz: Upgraded. kde/ktouch-21.08.0-x86_64-1.txz: Upgraded. kde/kturtle-21.08.0-x86_64-1.txz: Upgraded. kde/kubrick-21.08.0-x86_64-1.txz: Upgraded. kde/kunitconversion-5.85.0-x86_64-1.txz: Upgraded. kde/kwallet-5.85.0-x86_64-1.txz: Upgraded. kde/kwalletmanager-21.08.0-x86_64-1.txz: Upgraded. kde/kwave-21.08.0-x86_64-1.txz: Upgraded. kde/kwayland-5.85.0-x86_64-1.txz: Upgraded. kde/kwidgetsaddons-5.85.0-x86_64-1.txz: Upgraded. kde/kwindowsystem-5.85.0-x86_64-1.txz: Upgraded. kde/kwordquiz-21.08.0-x86_64-1.txz: Upgraded. kde/kxmlgui-5.85.0-x86_64-1.txz: Upgraded. kde/kxmlrpcclient-5.85.0-x86_64-1.txz: Upgraded. kde/latte-dock-0.10.0-x86_64-1.txz: Upgraded. kde/libgravatar-21.08.0-x86_64-1.txz: Upgraded. kde/libkcddb-21.08.0-x86_64-1.txz: Upgraded. kde/libkcompactdisc-21.08.0-x86_64-1.txz: Upgraded. kde/libkdcraw-21.08.0-x86_64-1.txz: Upgraded. kde/libkdegames-21.08.0-x86_64-1.txz: Upgraded. kde/libkdepim-21.08.0-x86_64-1.txz: Upgraded. kde/libkeduvocdocument-21.08.0-x86_64-1.txz: Upgraded. kde/libkexiv2-21.08.0-x86_64-1.txz: Upgraded. kde/libkgapi-21.08.0-x86_64-1.txz: Upgraded. kde/libkipi-21.08.0-x86_64-1.txz: Upgraded. kde/libkleo-21.08.0-x86_64-1.txz: Upgraded. kde/libkmahjongg-21.08.0-x86_64-1.txz: Upgraded. kde/libkomparediff2-21.08.0-x86_64-1.txz: Upgraded. kde/libksane-21.08.0-x86_64-1.txz: Upgraded. kde/libksieve-21.08.0-x86_64-1.txz: Upgraded. kde/libktorrent-21.08.0-x86_64-1.txz: Upgraded. kde/lokalize-21.08.0-x86_64-1.txz: Upgraded. kde/lskat-21.08.0-x86_64-1.txz: Upgraded. kde/mailcommon-21.08.0-x86_64-1.txz: Upgraded. kde/mailimporter-21.08.0-x86_64-1.txz: Upgraded. kde/marble-21.08.0-x86_64-1.txz: Upgraded. kde/markdownpart-21.08.0-x86_64-1.txz: Upgraded. kde/mbox-importer-21.08.0-x86_64-1.txz: Upgraded. kde/messagelib-21.08.0-x86_64-1.txz: Upgraded. kde/minuet-21.08.0-x86_64-1.txz: Upgraded. kde/modemmanager-qt-5.85.0-x86_64-1.txz: Upgraded. kde/networkmanager-qt-5.85.0-x86_64-1.txz: Upgraded. kde/okular-21.08.0-x86_64-1.txz: Upgraded. kde/oxygen-icons5-5.85.0-noarch-1.txz: Upgraded. kde/palapeli-21.08.0-x86_64-1.txz: Upgraded. kde/parley-21.08.0-x86_64-1.txz: Upgraded. kde/partitionmanager-21.08.0-x86_64-1.txz: Upgraded. kde/picmi-21.08.0-x86_64-1.txz: Upgraded. kde/pim-data-exporter-21.08.0-x86_64-1.txz: Upgraded. kde/pim-sieve-editor-21.08.0-x86_64-1.txz: Upgraded. kde/pimcommon-21.08.0-x86_64-1.txz: Upgraded. kde/plasma-framework-5.85.0-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.22.4-x86_64-2.txz: Rebuilt. Recompiled against libqalculate-3.20.1. kde/poxml-21.08.0-x86_64-1.txz: Upgraded. kde/print-manager-21.08.0-x86_64-1.txz: Upgraded. kde/prison-5.85.0-x86_64-1.txz: Upgraded. kde/purpose-5.85.0-x86_64-1.txz: Upgraded. kde/qqc2-desktop-style-5.85.0-x86_64-1.txz: Upgraded. kde/rocs-21.08.0-x86_64-1.txz: Upgraded. kde/skanlite-21.08.0-x86_64-3.txz: Rebuilt. kde/solid-5.85.0-x86_64-1.txz: Upgraded. kde/sonnet-5.85.0-x86_64-1.txz: Upgraded. kde/spectacle-21.08.0-x86_64-1.txz: Upgraded. kde/step-21.08.0-x86_64-1.txz: Upgraded. kde/svgpart-21.08.0-x86_64-1.txz: Upgraded. kde/sweeper-21.08.0-x86_64-1.txz: Upgraded. kde/syndication-5.85.0-x86_64-1.txz: Upgraded. kde/syntax-highlighting-5.85.0-x86_64-1.txz: Upgraded. kde/threadweaver-5.85.0-x86_64-1.txz: Upgraded. kde/umbrello-21.08.0-x86_64-1.txz: Upgraded. kde/yakuake-21.08.0-x86_64-1.txz: Upgraded. kde/zeroconf-ioslave-21.08.0-x86_64-1.txz: Upgraded. l/SDL2-2.0.16-x86_64-1.txz: Upgraded. l/atkmm-2.28.2-x86_64-1.txz: Upgraded. l/boost-1.77.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/cryfs-0.10.3-x86_64-3.txz: Rebuilt. Patched for gcc11 and recompiled against boost-1.77.0. l/enchant-2.3.1-x86_64-1.txz: Upgraded. l/gjs-1.68.3-x86_64-1.txz: Upgraded. l/gtk4-4.2.1-x86_64-1.txz: Added. l/gtkmm3-3.24.5-x86_64-1.txz: Upgraded. l/libjpeg-turbo-2.1.1-x86_64-1.txz: Upgraded. l/libqalculate-3.20.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/libwebp-1.2.1-x86_64-1.txz: Upgraded. l/mlt-7.0.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/mozilla-nss-3.69-x86_64-1.txz: Upgraded. l/mozjs78-78.13.0esr-x86_64-1.txz: Upgraded. l/netpbm-10.95.01-x86_64-1.txz: Upgraded. l/ocl-icd-2.3.0-x86_64-2.txz: Rebuilt. Patched to support the latest Khronos headers. l/openexr-2.5.7-x86_64-2.txz: Rebuilt. Recompiled against boost-1.77.0. l/pango-1.48.8-x86_64-1.txz: Upgraded. l/pulseaudio-15.0-x86_64-2.txz: Rebuilt. Ensure that start-pulseaudio-x11 is generated properly when pulseaudio is built using meson. Thanks to davjohn. l/python-pygments-2.10.0-x86_64-1.txz: Upgraded. l/qt5-5.15.2-x86_64-11.txz: Rebuilt. Patched to compile with gcc11 (such as adding #include <limits> to some of the header files shipped in the package). l/tidy-html5-5.8.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/ModemManager-1.16.8-x86_64-1.txz: Upgraded. n/NetworkManager-1.32.6-x86_64-1.txz: Upgraded. n/c-ares-1.17.2-x86_64-1.txz: Upgraded. This update fixes a security issue: Missing input validation on hostnames returned by DNS servers. For more information, see: https://c-ares.haxx.se/adv_20210810.html https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3672 (* Security fix *) n/dhcpcd-9.4.0-x86_64-1.txz: Upgraded. n/fetchmail-6.4.21-x86_64-1.txz: Upgraded. n/nmap-7.92-x86_64-1.txz: Upgraded. n/openresolv-3.12.0-noarch-1.txz: Added. This is needed for wg-quick in the wireguard-tools package. Thanks to synbq Bucharest, Jeremy Hansen, and Daniel Wilkins. n/php-7.4.22-x86_64-2.txz: Rebuilt. Recompiled against tidy-html5-5.8.0. x/ibus-m17n-1.4.7-x86_64-1.txz: Upgraded. x/libepoxy-1.5.9-x86_64-1.txz: Upgraded. x/mesa-21.1.7-x86_64-1.txz: Upgraded. x/vulkan-sdk-1.2.176.1-x86_64-2.txz: Rebuilt. x/xrdb-1.2.1-x86_64-1.txz: Upgraded. xap/mozilla-firefox-91.0-x86_64-1.txz: Upgraded. New ESR release :-) This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/91.0/releasenotes/ https://www.mozilla.org/security/advisories/mfsa2021-33/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29986 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29981 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29988 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29983 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29984 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29980 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29987 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29985 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29982 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29989 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29990 (* Security fix *) xap/mozilla-thunderbird-91.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/91.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-36/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29986 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29981 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29988 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29984 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29980 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29987 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29985 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29982 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29989 (* Security fix *) xap/network-manager-applet-1.22.0-x86_64-1.txz: Upgraded. xap/vim-gvim-8.2.3352-x86_64-1.txz: Upgraded. extra/php8/php8-8.0.9-x86_64-2.txz: Rebuilt. Recompiled against tidy-html5-5.8.0. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/kde/kde')
-rw-r--r--source/kde/kde/build/cantor2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/build/kitinerary2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/ktexteditor2
-rw-r--r--source/kde/kde/build/minuet2
-rw-r--r--source/kde/kde/build/okular2
-rw-r--r--source/kde/kde/build/plasma-workspace2
-rw-r--r--source/kde/kde/modules/all-packaged-applications1
-rw-r--r--source/kde/kde/modules/applications3
-rw-r--r--source/kde/kde/modules/applications-extra1
-rw-r--r--source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff10
-rw-r--r--source/kde/kde/patch/kate/kate_runasroot.patch16
-rw-r--r--source/kde/kde/patch/kitinerary.patch2
-rw-r--r--source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch53
-rw-r--r--source/kde/kde/patch/ktorrent.patch1
-rw-r--r--source/kde/kde/patch/ktorrent/geoip.datbin1242574 -> 2105057 bytes
-rw-r--r--source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch1474
-rw-r--r--source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff12
-rw-r--r--source/kde/kde/patch/plasma-framework.patch2
-rw-r--r--source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch44
21 files changed, 1549 insertions, 86 deletions
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/ktexteditor b/source/kde/kde/build/ktexteditor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/ktexteditor
+++ b/source/kde/kde/build/ktexteditor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/minuet b/source/kde/kde/build/minuet
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/minuet
+++ b/source/kde/kde/build/minuet
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications
index 55d82462e..7b5551eb3 100644
--- a/source/kde/kde/modules/all-packaged-applications
+++ b/source/kde/kde/modules/all-packaged-applications
@@ -206,3 +206,4 @@ libktorrent
ktorrent
kpmcore
partitionmanager
+skanlite
diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications
index ffe7b8236..f4d81d4d9 100644
--- a/source/kde/kde/modules/applications
+++ b/source/kde/kde/modules/applications
@@ -202,3 +202,6 @@ libktorrent
ktorrent
kpmcore
partitionmanager
+
+# New in 21.08.0:
+skanlite
diff --git a/source/kde/kde/modules/applications-extra b/source/kde/kde/modules/applications-extra
index ca77f8909..a8e06a4d7 100644
--- a/source/kde/kde/modules/applications-extra
+++ b/source/kde/kde/modules/applications-extra
@@ -4,7 +4,6 @@ calligraplan
digikam
krita
falkon
-skanlite
kdevelop-pg-qt
kdevelop
kdev-php
diff --git a/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
index 3d78fa30b..1d73328c2 100644
--- a/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
+++ b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
@@ -1,11 +1,11 @@
---- kalgebra-14.12.1.orig/calgebra/CMakeLists.txt 2014-11-13 02:59:40.000000000 +0100
-+++ kalgebra-14.12.1/calgebra/CMakeLists.txt 2015-01-14 14:35:54.702166188 +0100
+--- ./calgebra/CMakeLists.txt.orig 2021-08-04 16:49:56.000000000 -0500
++++ ./calgebra/CMakeLists.txt 2021-08-12 22:13:27.013314656 -0500
@@ -13,7 +13,7 @@
endif()
add_executable(calgebra main.cpp)
--target_link_libraries(calgebra Qt5::Core ${READLINE_LIBRARY} KF5::Analitza)
-+target_link_libraries(calgebra Qt5::Core ${READLINE_LIBRARY} ${CURSES_LIBRARIES} KF5::Analitza)
+-target_link_libraries(calgebra Qt::Core ${READLINE_LIBRARY} KF5::Analitza)
++target_link_libraries(calgebra Qt::Core ${READLINE_LIBRARY} ${CURSES_LIBRARIES} KF5::Analitza)
- install(TARGETS calgebra ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS calgebra ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/source/kde/kde/patch/kate/kate_runasroot.patch b/source/kde/kde/patch/kate/kate_runasroot.patch
index aa067ce61..3cc919faf 100644
--- a/source/kde/kde/patch/kate/kate_runasroot.patch
+++ b/source/kde/kde/patch/kate/kate_runasroot.patch
@@ -1,11 +1,7 @@
---- ./kwrite/main.cpp.orig 2021-04-22 13:26:42.398123759 -0500
-+++ ./kwrite/main.cpp 2021-04-22 13:29:08.356127024 -0500
-@@ -38,20 +38,18 @@
- extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
-- // Prohibit using sudo or kdesu (but allow using the root user directly)
-+ // Warn using sudo or kdesu (but allow using the root user directly)
+--- ./kwrite/main.cpp.orig 2021-08-12 21:30:09.752256555 -0500
++++ ./kwrite/main.cpp 2021-08-12 21:32:05.046259134 -0500
+@@ -41,17 +41,15 @@
+ // Prohibit using sudo or kdesu (but allow using the root user directly)
if (getuid() == 0) {
if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
- std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities. "
@@ -24,8 +20,8 @@
}
}
#endif
---- ./kate/main.cpp.orig 2021-04-22 13:26:42.397123759 -0500
-+++ ./kate/main.cpp 2021-04-22 13:30:18.674128597 -0500
+--- ./kate/main.cpp.orig 2021-08-04 21:13:14.000000000 -0500
++++ ./kate/main.cpp 2021-08-12 21:30:09.753256555 -0500
@@ -49,17 +49,15 @@
// Prohibit using sudo or kdesu (but allow using the root user directly)
if (getuid() == 0) {
diff --git a/source/kde/kde/patch/kitinerary.patch b/source/kde/kde/patch/kitinerary.patch
deleted file mode 100644
index 0ecbe2e43..000000000
--- a/source/kde/kde/patch/kitinerary.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix for recent poppler:
-cat $CWD/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch
deleted file mode 100644
index 1bc9dc377..000000000
--- a/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e99d101e2bd4c32566e238ce1340a93781e19eee Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 2 Aug 2021 01:01:31 +0300
-Subject: [PATCH] Fix build with poppler 21.8.0
-
-parseDateString() now takes "const GooString *" as the date argument in
-order to support unicode date strings. Adjust parsePdfDateTime() to use
-the same string type (instead of "const char *") when compiling against
-poppler 21.8.0.
-
-https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/880
----
- src/lib/pdf/pdfdocument.cpp | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp
-index 8f0f4cd..0eabf45 100644
---- a/src/lib/pdf/pdfdocument.cpp
-+++ b/src/lib/pdf/pdfdocument.cpp
-@@ -201,7 +201,11 @@ int PdfDocument::fileSize() const
- }
-
- #ifdef HAVE_POPPLER
-+#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
-+static QDateTime parsePdfDateTime(const GooString *str)
-+#else
- static QDateTime parsePdfDateTime(const char *str)
-+#endif
- {
- int year, month, day, hour, min, sec, tzHours, tzMins;
- char tz;
-@@ -233,7 +237,9 @@ QDateTime PdfDocument::creationTime() const
- if (!dt) {
- return {};
- }
--#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
-+#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
-+ return parsePdfDateTime(dt.get());
-+#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
- return parsePdfDateTime(dt->c_str());
- #else
- return parsePdfDateTime(dt->getCString());
-@@ -250,7 +256,9 @@ QDateTime PdfDocument::modificationTime() const
- if (!dt) {
- return {};
- }
--#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
-+#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
-+ return parsePdfDateTime(dt.get());
-+#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
- return parsePdfDateTime(dt->c_str());
- #else
- return parsePdfDateTime(dt->getCString());
diff --git a/source/kde/kde/patch/ktorrent.patch b/source/kde/kde/patch/ktorrent.patch
index 11538623c..5cb1cceac 100644
--- a/source/kde/kde/patch/ktorrent.patch
+++ b/source/kde/kde/patch/ktorrent.patch
@@ -1,2 +1,3 @@
# Embed a copy of the GeoIP database since the download link no longer works.
+cat $CWD/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
cat $CWD/patch/ktorrent/ktorrent.use.package.geoip.database.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/ktorrent/geoip.dat b/source/kde/kde/patch/ktorrent/geoip.dat
index be8b031f7..60b1c3574 100644
--- a/source/kde/kde/patch/ktorrent/geoip.dat
+++ b/source/kde/kde/patch/ktorrent/geoip.dat
Binary files differ
diff --git a/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch b/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch
new file mode 100644
index 000000000..b23a20e12
--- /dev/null
+++ b/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch
@@ -0,0 +1,1474 @@
+--- ./plugins/infowidget/GeoIP.h.orig 2021-08-15 00:18:01.329498947 -0500
++++ ./plugins/infowidget/GeoIP.h 2021-08-15 00:18:01.329498947 -0500
+@@ -0,0 +1,148 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
++/* GeoIP.h
++
++ SPDX-FileCopyrightText: 2003 MaxMind LLC
++ SPDX-License-Identifier: GPL-2.0-or-later
++*/
++
++#ifndef GEOIP_H
++#define GEOIP_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/stat.h> /* for fstat */
++#include <sys/types.h> /* for fstat */
++
++#define SEGMENT_RECORD_LENGTH 3
++#define STANDARD_RECORD_LENGTH 3
++#define ORG_RECORD_LENGTH 4
++#define MAX_RECORD_LENGTH 4
++#define NUM_DB_TYPES 16
++
++typedef struct GeoIPTag {
++ FILE *GeoIPDatabase;
++ char *file_path;
++ unsigned char *cache;
++ unsigned char *index_cache;
++ unsigned int *databaseSegments;
++ char databaseType;
++ time_t mtime;
++ int flags;
++ char record_length;
++ int record_iter; /* used in GeoIP_next_record */
++} GeoIP;
++
++typedef struct GeoIPRegionTag {
++ char country_code[3];
++ char region[3];
++} GeoIPRegion;
++
++typedef enum {
++ GEOIP_STANDARD = 0,
++ GEOIP_MEMORY_CACHE = 1,
++ GEOIP_CHECK_CACHE = 2,
++ GEOIP_INDEX_CACHE = 4,
++} GeoIPOptions;
++
++typedef enum {
++ GEOIP_COUNTRY_EDITION = 1,
++ GEOIP_REGION_EDITION_REV0 = 7,
++ GEOIP_CITY_EDITION_REV0 = 6,
++ GEOIP_ORG_EDITION = 5,
++ GEOIP_ISP_EDITION = 4,
++ GEOIP_CITY_EDITION_REV1 = 2,
++ GEOIP_REGION_EDITION_REV1 = 3,
++ GEOIP_PROXY_EDITION = 8,
++ GEOIP_ASNUM_EDITION = 9,
++ GEOIP_NETSPEED_EDITION = 10
++} GeoIPDBTypes;
++
++typedef enum {
++ GEOIP_ANON_PROXY = 1,
++ GEOIP_HTTP_X_FORWARDED_FOR_PROXY = 2,
++ GEOIP_HTTP_CLIENT_IP_PROXY = 3,
++} GeoIPProxyTypes;
++
++typedef enum {
++ GEOIP_UNKNOWN_SPEED = 0,
++ GEOIP_DIALUP_SPEED = 1,
++ GEOIP_CABLEDSL_SPEED = 2,
++ GEOIP_CORPORATE_SPEED = 3,
++} GeoIPNetspeedValues;
++
++extern char **GeoIPDBFileName;
++extern const char *GeoIPDBDescription[NUM_DB_TYPES];
++extern const char *GeoIPCountryDBFileName;
++extern const char *GeoIPRegionDBFileName;
++extern const char *GeoIPCityDBFileName;
++extern const char *GeoIPOrgDBFileName;
++extern const char *GeoIPISPDBFileName;
++
++extern const char GeoIP_country_code[247][3];
++extern const char GeoIP_country_code3[247][4];
++extern const char *GeoIP_country_name[247];
++extern const char GeoIP_country_continent[247][3];
++
++#ifdef DLL
++#define GEOIP_API __declspec(dllexport)
++#else
++#define GEOIP_API
++#endif /* DLL */
++
++GEOIP_API GeoIP *GeoIP_open_type(int type, int flags);
++GEOIP_API GeoIP *GeoIP_new(int flags);
++GEOIP_API GeoIP *GeoIP_open(const char *filename, int flags);
++GEOIP_API int GeoIP_db_avail(int type);
++GEOIP_API void GeoIP_delete(GeoIP *gi);
++GEOIP_API const char *GeoIP_country_code_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API const char *GeoIP_country_code_by_name(GeoIP *gi, const char *host);
++GEOIP_API const char *GeoIP_country_code3_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API const char *GeoIP_country_code3_by_name(GeoIP *gi, const char *host);
++GEOIP_API const char *GeoIP_country_name_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API const char *GeoIP_country_name_by_name(GeoIP *gi, const char *host);
++GEOIP_API const char *GeoIP_country_name_by_ipnum(GeoIP *gi, unsigned long ipnum);
++GEOIP_API const char *GeoIP_country_code_by_ipnum(GeoIP *gi, unsigned long ipnum);
++GEOIP_API const char *GeoIP_country_code3_by_ipnum(GeoIP *gi, unsigned long ipnum);
++
++/* Deprecated - for backwards compatibility only */
++GEOIP_API int GeoIP_country_id_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API int GeoIP_country_id_by_name(GeoIP *gi, const char *host);
++GEOIP_API char *GeoIP_org_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API char *GeoIP_org_by_name(GeoIP *gi, const char *host);
++/* End deprecated */
++
++GEOIP_API int GeoIP_id_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API int GeoIP_id_by_name(GeoIP *gi, const char *host);
++GEOIP_API int GeoIP_id_by_ipnum(GeoIP *gi, unsigned long ipnum);
++
++GEOIP_API GeoIPRegion *GeoIP_region_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API GeoIPRegion *GeoIP_region_by_name(GeoIP *gi, const char *host);
++GEOIP_API GeoIPRegion *GeoIP_region_by_ipnum(GeoIP *gi, unsigned long ipnum);
++
++/* Warning - don't call this after GeoIP_assign_region_by_inetaddr calls */
++GEOIP_API void GeoIPRegion_delete(GeoIPRegion *gir);
++
++GEOIP_API void GeoIP_assign_region_by_inetaddr(GeoIP *gi, unsigned long inetaddr, GeoIPRegion *gir);
++
++/* Used to query GeoIP Organization, ISP and AS Number databases */
++GEOIP_API char *GeoIP_name_by_ipnum(GeoIP *gi, unsigned long ipnum);
++GEOIP_API char *GeoIP_name_by_addr(GeoIP *gi, const char *addr);
++GEOIP_API char *GeoIP_name_by_name(GeoIP *gi, const char *host);
++
++GEOIP_API char *GeoIP_database_info(GeoIP *gi);
++GEOIP_API unsigned char GeoIP_database_edition(GeoIP *gi);
++
++#ifdef BSD
++#define memcpy(dest, src, n) bcopy(src, dest, n)
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* GEOIP_H */
+--- ./plugins/infowidget/geoipmanager.cpp.orig 2021-08-04 21:50:44.000000000 -0500
++++ ./plugins/infowidget/geoipmanager.cpp 2021-08-15 00:18:01.329498947 -0500
+@@ -20,16 +20,47 @@
+
+ namespace kt
+ {
++QUrl GeoIPManager::geoip_url = QUrl(QStringLiteral("http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"));
++
+ GeoIPManager::GeoIPManager(QObject *parent)
+ : QObject(parent)
++ , geo_ip(nullptr)
++ , decompress_thread(nullptr)
+ {
++#ifdef USE_SYSTEM_GEOIP
+ geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
++#else
++ geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("geoip.dat"));
++ if (geoip_data_file.isEmpty())
++ geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat"));
++
++ if (geoip_data_file.isEmpty()) {
++ downloadDataBase();
++ } else {
++ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0);
++ if (geo_ip) {
++ QFileInfo fi(geoip_data_file);
++ QDateTime now = QDateTime::currentDateTime();
++ if (fi.lastModified().daysTo(now) >= 30) {
++ // if the last time the geoip file was modified, was more then
++ // 30 days ago, redownload it
++ downloadDataBase();
++ }
++ }
++ }
++#endif
+ }
+
+ GeoIPManager::~GeoIPManager()
+ {
+ if (geo_ip)
+ GeoIP_delete(geo_ip);
++
++ if (decompress_thread) {
++ decompress_thread->cancel();
++ decompress_thread->wait();
++ delete decompress_thread;
++ }
+ }
+
+ int GeoIPManager::findCountry(const QString &addr)
+@@ -56,4 +87,66 @@
+ return QString();
+ }
+
++void GeoIPManager::downloadDataBase()
++{
++#ifndef USE_SYSTEM_GEOIP
++ Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl;
++ download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName();
++ KIO::CopyJob *job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo);
++ connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished);
++#endif
++}
++
++void GeoIPManager::databaseDownloadFinished(KJob *job)
++{
++ if (job->error()) {
++ Out(SYS_INW | LOG_IMPORTANT) << "Failed to download GeoIP database: " << job->errorString() << endl;
++ return;
++ }
++
++ if (download_destination.endsWith(QLatin1String(".dat")) || download_destination.endsWith(QLatin1String(".DAT"))) {
++ Out(SYS_INW | LOG_NOTICE) << "GeoIP database downloaded, opening ... " << endl;
++ geoip_data_file = download_destination;
++ if (geo_ip) {
++ GeoIP_delete(geo_ip);
++ geo_ip = nullptr;
++ }
++ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0);
++ if (!geo_ip)
++ Out(SYS_INW | LOG_NOTICE) << "Failed to open GeoIP database " << endl;
++ } else {
++ Out(SYS_INW | LOG_NOTICE) << "GeoIP database downloaded, decompressing ... " << endl;
++ // decompress the file
++ decompress_thread = new bt::DecompressThread(download_destination, kt::DataDir() + QLatin1String("geoip.dat"));
++ connect(decompress_thread, &bt::DecompressThread::finished, this, &GeoIPManager::decompressFinished, Qt::QueuedConnection);
++ decompress_thread->start(QThread::IdlePriority);
++ }
++}
++
++void GeoIPManager::decompressFinished()
++{
++ Out(SYS_INW | LOG_NOTICE) << "GeoIP database decompressed, opening ... " << endl;
++ if (!decompress_thread->error()) {
++ geoip_data_file = kt::DataDir() + QLatin1String("geoip.dat");
++ if (geo_ip) {
++ GeoIP_delete(geo_ip);
++ geo_ip = nullptr;
++ }
++ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0);
++ if (!geo_ip)
++ Out(SYS_INW | LOG_NOTICE) << "Failed to open GeoIP database " << endl;
++ }
++
++ decompress_thread->wait();
++ delete decompress_thread;
++ decompress_thread = nullptr;
++}
++
++void GeoIPManager::setGeoIPUrl(const QUrl &url)
++{
++ geoip_url = url;
++}
++
++///////////////////////////////////
++
+ }
+--- ./plugins/infowidget/GeoIP.c.orig 2021-08-15 00:18:01.329498947 -0500
++++ ./plugins/infowidget/GeoIP.c 2021-08-15 00:18:01.329498947 -0500
+@@ -0,0 +1,968 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
++/* GeoIP.c
++ SPDX-FileCopyrightText: 2003 MaxMind LLC All Rights Reserved.
++ SPDX-License-Identifier: GPL-2.0-or-later
++*/
++
++#include "GeoIP.h"
++
++#include <netdb.h>
++#include <sys/socket.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#ifndef _WIN32
++#include <netinet/in.h> /* For ntohl */
++#include <arpa/inet.h>
++#else
++#include <windows.h>
++#endif
++#include <assert.h>
++#include <sys/types.h> /* for fstat */
++#include <sys/stat.h> /* for fstat */
++
++#ifdef HAVE_STDINT_H
++#include <stdint.h> /* For uint32_t */
++#endif
++
++#ifndef INADDR_NONE
++#define INADDR_NONE -1
++#endif
++
++#define COUNTRY_BEGIN 16776960
++#define STATE_BEGIN_REV0 16700000
++#define STATE_BEGIN_REV1 16000000
++#define STRUCTURE_INFO_MAX_SIZE 20
++#define DATABASE_INFO_MAX_SIZE 100
++#define MAX_ORG_RECORD_LENGTH 300
++#define US_OFFSET 1
++#define CANADA_OFFSET 677
++#define WORLD_OFFSET 1353
++#define FIPS_RANGE 360
++
++#define CHECK_ERR(err, msg) { \
++ if (err != Z_OK) { \
++ fprintf(stderr, "%s error: %d\n", msg, err); \
++ exit(1); \
++ } \
++}
++
++const char GeoIP_country_code[247][3] = { "--", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", "FX", "GA", "GB", "GD", "GE", "GF", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IN", "IO", "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", "TK", "TM", "TN", "TO", "TP", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "CS", "ZA", "ZM", "ZR", "ZW", "A1", "A2", "O1"};
++
++const char GeoIP_country_code3[247][4] = { "--", "AP", "EU", "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "ANT", "AGO", "AQ", "ARG", "ASM", "AUT", "AUS", "ABW", "AZE", "BIH", "BRB", "BGD", "BEL", "BFA", "BGR", "BHR", "BDI", "BEN", "BMU", "BRN", "BOL", "BRA", "BHS", "BTN", "BV", "BWA", "BLR", "BLZ", "CAN", "CC", "COD", "CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI", "CUB", "CPV", "CX", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM", "DZA", "ECU", "EST", "EGY", "ESH", "ERI", "ESP", "ETH", "FIN", "FJI", "FLK", "FSM", "FRO", "FRA", "FX", "GAB", "GBR", "GRD", "GEO", "GUF", "GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "GS", "GTM", "GUM", "GNB", "GUY", "HKG", "HM", "HND", "HRV", "HTI", "HUN", "IDN", "IRL", "ISR", "IND", "IO", "IRQ", "IRN", "ISL", "ITA", "JAM", "JOR", "JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA", "PRK", "KOR", "KWT", "CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU", "LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MDG", "MHL", "MKD", "MLI", "MMR", "MNG", "MAC", "MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV", "MWI", "MEX", "MYS", "MOZ", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER", "PYF", "PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW", "PRY", "QAT", "REU", "ROU", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN", "SWE", "SGP", "SHN", "SVN", "SJM", "SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "STP", "SLV", "SYR", "SWZ", "TCA", "TCD", "TF", "TGO", "THA", "TJK", "TKL", "TLS", "TKM", "TUN", "TON", "TUR", "TTO", "TUV", "TWN", "TZA", "UKR", "UGA", "UM", "USA", "URY", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "YT", "SCG", "ZAF", "ZMB", "ZR", "ZWE", "A1", "A2", "O1"};
++
++const char* GeoIP_country_name[247] = {"N/A", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates", "Afghanistan", "Antigua and Barbuda", "Anguilla", "Albania", "Armenia", "Netherlands Antilles", "Angola", "Antarctica", "Argentina", "American Samoa", "Austria", "Australia", "Aruba", "Azerbaijan", "Bosnia and Herzegovina", "Barbados", "Bangladesh", "Belgium", "Burkina Faso", "Bulgaria", "Bahrain", "Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia", "Brazil", "Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize", "Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the", "Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook Islands", "Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape Verde", "Christmas Island", "Cyprus", "Czechia", "Germany", "Djibouti", "Denmark", "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia", "Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji", "Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe Islands", "France", "France, Metropolitan", "Gabon", "United Kingdom", "Grenada", "Georgia", "French Guiana", "Ghana", "Gibraltar", "Greenland", "Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia and the South Sandwich Islands", "Guatemala", "Guam", "Guinea-Bissau", "Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras", "Croatia", "Haiti", "Hungary", "Indonesia", "Ireland", "Israel", "India", "British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of", "Iceland", "Italy", "Jamaica", "Jordan", "Japan", "Kenya", "Kyrgyzstan", "Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis",
++ "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait", "Cayman Islands", "Kazakhstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia", "Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg", "Latvia", "Libyan Arab Jamahiriya", "Morocco", "Monaco", "Moldova, Republic of", "Madagascar", "Marshall Islands", "Macedonia", "Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands", "Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives", "Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia", "Niger", "Norfolk Island", "Nigeria", "Nicaragua", "Netherlands", "Norway", "Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French Polynesia", "Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint Pierre and Miquelon", "Pitcairn Islands", "Puerto Rico", "Palestinian Territory", "Portugal", "Palau", "Paraguay", "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands", "Seychelles", "Sudan", "Sweden", "Singapore", "Saint Helena", "Slovenia", "Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal", "Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab Republic", "Swaziland", "Turks and Caicos Islands", "Chad", "French Southern Territories", "Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan", "Tunisia", "Tonga", "East Timor", "Turkey", "Trinidad and Tobago", "Tuvalu", "Taiwan", "Tanzania, United Republic of", "Ukraine", "Uganda", "United States Minor Outlying Islands", "United States", "Uruguay", "Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the Grenadines", "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.", "Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte", "Serbia and Montenegro", "South Africa", "Zambia", "Zaire", "Zimbabwe",
++ "Anonymous Proxy", "Satellite Provider", "Other"
++ };
++
++const char GeoIP_country_continent[247][3] = {"--", "AS", "EU", "EU", "AS", "AS", "SA", "SA", "EU", "AS", "SA", "AF", "AN", "SA", "OC", "EU", "OC", "SA", "AS", "EU", "SA", "AS", "EU", "AF", "EU", "AS", "AF", "AF", "SA", "AS", "SA", "SA", "SA", "AS", "AF", "AF", "EU", "SA", "NA", "AS", "AF", "AF", "AF", "EU", "AF", "OC", "SA", "AF", "AS", "SA", "SA", "SA", "AF", "AS", "AS", "EU", "EU", "AF", "EU", "SA", "SA", "AF", "SA", "EU", "AF", "AF", "AF", "EU", "AF", "EU", "OC", "SA", "OC", "EU", "EU", "EU", "AF", "EU", "SA", "AS", "SA", "AF", "EU", "SA", "AF", "AF", "SA", "AF", "EU", "SA", "SA", "OC", "AF", "SA", "AS", "AF", "SA", "EU", "SA", "EU", "AS", "EU", "AS", "AS", "AS", "AS", "AS", "EU", "EU", "SA", "AS", "AS", "AF", "AS", "AS", "OC", "AF", "SA", "AS", "AS", "AS", "SA", "AS", "AS", "AS", "SA", "EU", "AS", "AF", "AF", "EU", "EU", "EU", "AF", "AF", "EU", "EU", "AF", "OC", "EU", "AF", "AS", "AS", "AS", "OC", "SA", "AF", "SA", "EU", "AF", "AS", "AF", "NA", "AS", "AF", "AF", "OC", "AF", "OC", "AF", "SA", "EU", "EU", "AS", "OC", "OC", "OC", "AS", "SA", "SA", "OC", "OC", "AS", "AS", "EU", "SA", "OC", "SA", "AS", "EU", "OC", "SA", "AS", "AF", "EU", "AS", "AF", "AS", "OC", "AF", "AF", "EU", "AS", "AF", "EU", "EU", "EU", "AF", "EU", "AF", "AF", "SA", "AF", "SA", "AS", "AF", "SA", "AF", "AF", "AF", "AS", "AS", "OC", "AS", "AF", "OC", "AS", "AS", "SA", "OC", "AS", "AF", "EU", "AF", "OC", "NA", "SA", "AS", "EU", "SA", "SA", "SA", "SA", "AS", "OC", "OC", "OC", "AS", "AF", "EU", "AF", "AF", "AF", "AF"};
++
++const char* GeoIPDBDescription[NUM_DB_TYPES] = {NULL, "GeoIP Country Edition", "GeoIP City Edition, Rev 1", "GeoIP Region Edition, Rev 1", "GeoIP ISP Edition", "GeoIP Organization Edition", "GeoIP City Edition, Rev 0", "GeoIP Region Edition, Rev 0", "GeoIP Proxy Edition", "GeoIP ASNum Edition", "GeoIP Netspeed Edition"};
++
++char* _GeoIP_full_path_to(const char* file_name)
++{
++ char* path = malloc(sizeof(char) * 1024);
++
++#ifndef _WIN32
++ memset(path, 0, sizeof(char) * 1024);
++ snprintf(path, sizeof(char) * 1024 - 1, "%s/%s", "/home/ivan/geoip.dat", file_name);
++#else
++ char buf[MAX_PATH], *p, *q = NULL;
++ int len;
++ memset(buf, 0, sizeof(buf));
++ len = GetModuleFileNameA(GetModuleHandle(NULL), buf, sizeof(buf) - 1);
++ for (p = buf + len; p > buf; p--)
++ if (*p == '\\')
++ {
++ if (!q)
++ q = p;
++ else
++ *p = '/';
++ }
++ *q = 0;
++ memset(path, 0, sizeof(char) * 1024);
++ snprintf(path, sizeof(char) * 1024 - 1, "%s/%s", buf, file_name);
++#endif
++
++ return path;
++}
++
++char** GeoIPDBFileName = NULL;
++
++void _GeoIP_setup_dbfilename()
++{
++ if (NULL == GeoIPDBFileName)
++ {
++ GeoIPDBFileName = malloc(sizeof(char*) * NUM_DB_TYPES);
++ memset(GeoIPDBFileName, 0, sizeof(char*) * NUM_DB_TYPES);
++
++ GeoIPDBFileName[GEOIP_COUNTRY_EDITION] = _GeoIP_full_path_to("GeoIP.dat");
++ GeoIPDBFileName[GEOIP_REGION_EDITION_REV0] = _GeoIP_full_path_to("GeoIPRegion.dat");
++ GeoIPDBFileName[GEOIP_REGION_EDITION_REV1] = _GeoIP_full_path_to("GeoIPRegion.dat");
++ GeoIPDBFileName[GEOIP_CITY_EDITION_REV0] = _GeoIP_full_path_to("GeoIPCity.dat");
++ GeoIPDBFileName[GEOIP_CITY_EDITION_REV1] = _GeoIP_full_path_to("GeoIPCity.dat");
++ GeoIPDBFileName[GEOIP_ISP_EDITION] = _GeoIP_full_path_to("GeoIPISP.dat");
++ GeoIPDBFileName[GEOIP_ORG_EDITION] = _GeoIP_full_path_to("GeoIPOrg.dat");
++ GeoIPDBFileName[GEOIP_PROXY_EDITION] = _GeoIP_full_path_to("GeoIPProxy.dat");
++ GeoIPDBFileName[GEOIP_ASNUM_EDITION] = _GeoIP_full_path_to("GeoIPASNum.dat");
++ GeoIPDBFileName[GEOIP_NETSPEED_EDITION] = _GeoIP_full_path_to("GeoIPNetSpeed.dat");
++ }
++}
++
++static
++int _file_exists(const char* file_name)
++{
++ struct stat file_stat;
++ return((stat(file_name, &file_stat) == 0) ? 1 : 0);
++}
++
++int GeoIP_db_avail(int type)
++{
++ const char* filePath;
++ if (type < 0 || type >= NUM_DB_TYPES)
++ {
++ return 0;
++ }
++ filePath = GeoIPDBFileName[type];
++ if (NULL == filePath)
++ {
++ return 0;
++ }
++ return _file_exists(filePath);
++}
++
++static
++void _setup_segments(GeoIP* gi)
++{
++ int i, j;
++ unsigned char delim[3];
++ unsigned char buf[SEGMENT_RECORD_LENGTH];
++
++ /* default to GeoIP Country Edition */
++ gi->databaseType = GEOIP_COUNTRY_EDITION;
++ gi->record_length = STANDARD_RECORD_LENGTH;
++ fseek(gi->GeoIPDatabase, -3l, SEEK_END);
++ for (i = 0; i < STRUCTURE_INFO_MAX_SIZE; i++)
++ {
++ fread(delim, 1, 3, gi->GeoIPDatabase);
++ if (delim[0] == 255 && delim[1] == 255 && delim[2] == 255)
++ {
++ fread(&gi->databaseType, 1, 1, gi->GeoIPDatabase);
++ if (gi->databaseType >= 106)
++ {
++ /* backwards compatibility with databases from April 2003 and earlier */
++ gi->databaseType -= 105;
++ }
++
++ if (gi->databaseType == GEOIP_REGION_EDITION_REV0)
++ {
++ /* Region Edition, pre June 2003 */
++ gi->databaseSegments = malloc(sizeof(int));
++ gi->databaseSegments[0] = STATE_BEGIN_REV0;
++ }
++ else if (gi->databaseType == GEOIP_REGION_EDITION_REV1)
++ {
++ /* Region Edition, post June 2003 */
++ gi->databaseSegments = malloc(sizeof(int));
++ gi->databaseSegments[0] = STATE_BEGIN_REV1;
++ }
++ else if (gi->databaseType == GEOIP_CITY_EDITION_REV0 ||
++ gi->databaseType == GEOIP_CITY_EDITION_REV1 ||
++ gi->databaseType == GEOIP_ORG_EDITION ||
++ gi->databaseType == GEOIP_ISP_EDITION ||
++ gi->databaseType == GEOIP_ASNUM_EDITION)
++ {
++ /* City/Org Editions have two segments, read offset of second segment */
++ gi->databaseSegments = malloc(sizeof(int));
++ gi->databaseSegments[0] = 0;
++ fread(buf, SEGMENT_RECORD_LENGTH, 1, gi->GeoIPDatabase);
++ for (j = 0; j < SEGMENT_RECORD_LENGTH; j++)
++ {
++ gi->databaseSegments[0] += (buf[j] << (j * 8));
++ }
++ if (gi->databaseType == GEOIP_ORG_EDITION ||
++ gi->databaseType == GEOIP_ISP_EDITION)
++ gi->record_length = ORG_RECORD_LENGTH;
++ }
++ break;
++ }
++ else
++ {
++ fseek(gi->GeoIPDatabase, -4l, SEEK_CUR);
++ }
++ }
++ if (gi->databaseType == GEOIP_COUNTRY_EDITION ||
++ gi->databaseType == GEOIP_PROXY_EDITION ||
++ gi->databaseType == GEOIP_NETSPEED_EDITION)
++ {
++ gi->databaseSegments = malloc(sizeof(int));
++ gi->databaseSegments[0] = COUNTRY_BEGIN;
++ }
++}
++
++static
++int _check_mtime(GeoIP* gi)
++{
++ struct stat buf;
++
++ if (gi->flags & GEOIP_CHECK_CACHE)
++ {
++ if (fstat(fileno(gi->GeoIPDatabase), &buf) != -1)
++ {
++ if (buf.st_mtime > gi->mtime)
++ {
++ /* GeoIP Database file updated */
++ if (gi->flags & GEOIP_MEMORY_CACHE)
++ {
++ /* reload database into memory cache */
++ if (realloc(gi->cache, buf.st_size) != NULL)
++ {
++ if (fread(gi->cache, sizeof(unsigned char), buf.st_size, gi->GeoIPDatabase) != (size_t) buf.st_size)
++ {
++ fprintf(stderr, "Error reading file %s\n", gi->file_path);
++ return -1;
++ }
++ gi->mtime = buf.st_mtime;
++ }
++ }
++ else
++ {
++ /* refresh filehandle */
++ fclose(gi->GeoIPDatabase);
++ if (gi->databaseSegments != NULL)
++ free(gi->databaseSegments);
++ gi->GeoIPDatabase = fopen(gi->file_path, "rb");
++ if (gi->GeoIPDatabase == NULL)
++ {
++ fprintf(stderr, "Error Opening file %s\n", gi->file_path);
++ return -1;
++ }
++ _setup_segments(gi);
++ }
++ }
++ }
++ }
++ return 0;
++}
++
++unsigned int _GeoIP_seek_record(GeoIP* gi, unsigned long ipnum)
++{
++ int depth;
++ unsigned int x;
++ unsigned char stack_buffer[2 * MAX_RECORD_LENGTH];
++ const unsigned char* buf = (gi->cache == NULL) ? stack_buffer : NULL;
++ unsigned int offset = 0;
++
++ const unsigned char* p;
++ int j;
++
++ _check_mtime(gi);
++ for (depth = 31; depth >= 0; depth--)
++ {
++ if (gi->cache == NULL && gi->index_cache == NULL)
++ {
++ /* read from disk */
++ fseek(gi->GeoIPDatabase, (long)gi->record_length * 2 * offset, SEEK_SET);
++ fread(stack_buffer, gi->record_length, 2, gi->GeoIPDatabase);
++ }
++ else if (gi->index_cache == NULL)
++ {
++ /* simply point to record in memory */
++ buf = gi->cache + (long)gi->record_length * 2 * offset;
++ }
++ else
++ {
++ buf = gi->index_cache + (long)gi->record_length * 2 * offset;
++ }
++
++ if (ipnum & (1 << depth))
++ {
++ /* Take the right-hand branch */
++ if (gi->record_length == 3)
++ {
++ /* Most common case is completely unrolled and uses constants. */
++ x = (buf[3 * 1 + 0] << (0 * 8))
++ + (buf[3 * 1 + 1] << (1 * 8))
++ + (buf[3 * 1 + 2] << (2 * 8));
++
++ }
++ else
++ {
++ /* General case */
++ j = gi->record_length;
++ p = &buf[2 * j];
++ x = 0;
++ do
++ {
++ x <<= 8;
++ x += *(--p);
++ }
++ while (--j);
++ }
++
++ }
++ else
++ {
++ /* Take the left-hand branch */
++ if (gi->record_length == 3)
++ {
++ /* Most common case is completely unrolled and uses constants. */
++ x = (buf[3 * 0 + 0] << (0 * 8))
++ + (buf[3 * 0 + 1] << (1 * 8))
++ + (buf[3 * 0 + 2] << (2 * 8));
++ }
++ else
++ {
++ /* General case */
++ j = gi->record_length;
++ p = &buf[1 * j];
++ x = 0;
++ do
++ {
++ x <<= 8;
++ x += *(--p);
++ }
++ while (--j);
++ }
++ }
++
++ if (x >= gi->databaseSegments[0])
++ {
++ return x;
++ }
++ offset = x;
++ }
++
++ /* shouldn't reach here */
++ fprintf(stderr, "Error Traversing Database for ipnum = %lu - Perhaps database is corrupt?\n", ipnum);
++ return 0;
++}
++
++unsigned long _GeoIP_addr_to_num(const char* addr)
++{
++ int i;
++ char tok[4];
++ int octet;
++ int j = 0, k = 0;
++ unsigned long ipnum = 0;
++ char c = 0;
++
++ for (i = 0; i < 4; i++)
++ {
++ for (;;)
++ {
++ c = addr[k++];
++ if (c == '.' || c == '\0')
++ {
++ tok[j] = '\0';
++ octet = atoi(tok);
++ if (octet > 255)
++ return 0;
++ ipnum += (octet << ((3 - i) * 8));
++ j = 0;
++ break;
++ }
++ else if (c >= '0' && c <= '9')
++ {
++ if (j > 2)
++ {
++ return 0;
++ }
++ tok[j++] = c;
++ }
++ else
++ {
++ return 0;
++ }
++ }
++ if (c == '\0' && i < 3)
++ {
++ return 0;
++ }
++ }
++ return ipnum;
++}
++
++GeoIP* GeoIP_open_type(int type, int flags)
++{
++ GeoIP* gi;
++ const char* filePath;
++ if (type < 0 || type >= NUM_DB_TYPES)
++ {
++ printf("Invalid database type %d\n", type);
++ return NULL;
++ }
++ _GeoIP_setup_dbfilename();
++ filePath = GeoIPDBFileName[type];
++ if (filePath == NULL)
++ {
++ printf("Invalid database type %d\n", type);
++ return NULL;
++ }
++ gi = GeoIP_open(filePath, flags);
++ return gi;
++}
++
++GeoIP* GeoIP_new(int flags)
++{
++ GeoIP* gi;
++ _GeoIP_setup_dbfilename();
++ gi = GeoIP_open(GeoIPDBFileName[GEOIP_COUNTRY_EDITION], flags);
++ return gi;
++}
++
++GeoIP* GeoIP_open(const char* filename, int flags)
++{
++ struct stat buf;
++#ifdef _WIN32
++ WSADATA wsa;
++ if (WSAStartup(MAKEWORD(1, 1), &wsa) != 0)
++ return NULL;
++#endif
++ {
++ GeoIP* gi = (GeoIP*)malloc(sizeof(GeoIP));
++ if (gi == NULL)
++ return NULL;
++ gi->file_path = malloc(sizeof(char) * (strlen(filename) + 1));
++ if (gi->file_path == NULL)
++ return NULL;
++ strcpy(gi->file_path, filename);
++ gi->GeoIPDatabase = fopen(filename, "rb");
++ if (gi->GeoIPDatabase == NULL)
++ {
++ fprintf(stderr, "Error Opening file %s\n", filename);
++ free(gi->file_path);
++ free(gi);
++ return NULL;
++ }
++ else
++ {
++ if (flags & GEOIP_MEMORY_CACHE)
++ {
++ if (fstat(fileno(gi->GeoIPDatabase), &buf) == -1)
++ {
++ fprintf(stderr, "Error stating file %s\n", filename);
++ free(gi->file_path);
++ free(gi);
++ return NULL;
++ }
++ gi->mtime = buf.st_mtime;
++ gi->cache = (unsigned char*) malloc(sizeof(unsigned char) * buf.st_size);
++ if (gi->cache != NULL)
++ {
++ if (fread(gi->cache, sizeof(unsigned char), buf.st_size, gi->GeoIPDatabase) != (size_t) buf.st_size)
++ {
++ fprintf(stderr, "Error reading file %s\n", filename);
++ free(gi->cache);
++ free(gi);
++ return NULL;
++ }
++ }
++ }
++ else
++ {
++ if (flags & GEOIP_CHECK_CACHE)
++ {
++ if (fstat(fileno(gi->GeoIPDatabase), &buf) == -1)
++ {
++ fprintf(stderr, "Error stating file %s\n", filename);
++ free(gi);
++ return NULL;
++ }
++ gi->mtime = buf.st_mtime;
++ }
++ gi->cache = NULL;
++ }
++ gi->flags = flags;
++ _setup_segments(gi);
++ if (flags & GEOIP_INDEX_CACHE)
++ {
++ gi->index_cache = (unsigned char*) malloc(sizeof(unsigned char) * ((gi->databaseSegments[0] * (long)gi->record_length * 2)));
++ if (gi->index_cache != NULL)
++ {
++ fseek(gi->GeoIPDatabase, 0, SEEK_SET);
++ if (fread(gi->index_cache, sizeof(unsigned char), gi->databaseSegments[0] * (long)gi->record_length * 2, gi->GeoIPDatabase) != (size_t)(gi->databaseSegments[0] * (long)gi->record_length * 2))
++ {
++ fprintf(stderr, "Error reading file %s\n", filename);
++ free(gi->index_cache);
++ free(gi);
++ return NULL;
++ }
++ }
++ }
++ else
++ {
++ gi->index_cache = NULL;
++ }
++ return gi;
++ }
++ }
++}
++
++void GeoIP_delete(GeoIP* gi)
++{
++ if (gi->GeoIPDatabase != NULL)
++ fclose(gi->GeoIPDatabase);
++ if (gi->cache != NULL)
++ free(gi->cache);
++ if (gi->index_cache != NULL)
++ free(gi->index_cache);
++ if (gi->file_path != NULL)
++ free(gi->file_path);
++ if (gi->databaseSegments != NULL)
++ free(gi->databaseSegments);
++ free(gi);
++}
++
++const char* GeoIP_country_code_by_name(GeoIP* gi, const char* name)
++{
++ int country_id;
++ country_id = GeoIP_id_by_name(gi, name);
++ return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
++}
++
++const char* GeoIP_country_code3_by_name(GeoIP* gi, const char* name)
++{
++ int country_id;
++ country_id = GeoIP_id_by_name(gi, name);
++ return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
++}
++
++const char* GeoIP_country_name_by_name(GeoIP* gi, const char* name)
++{
++ int country_id;
++ country_id = GeoIP_id_by_name(gi, name);
++ return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
++}
++
++unsigned long _GeoIP_lookupaddress(const char* host)
++{
++ unsigned long addr = inet_addr(host);
++ struct hostent phe2;
++ struct hostent* phe = &phe2;
++ char* buf = NULL;
++ int buflength = 16384;
++ int herr = 0;
++ int result = 0;
++#ifdef HAVE_GETHOSTBYNAME_R
++ buf = malloc(buflength);
++#endif
++ if (addr == INADDR_NONE)
++ {
++#ifdef HAVE_GETHOSTBYNAME_R
++ while (1)
++ {
++ /* we use gethostbyname_r here because it is thread-safe and gethostbyname is not */
++#ifdef GETHOSTBYNAME_R_RETURNS_INT
++ result = gethostbyname_r(host, &phe2, buf, buflength, &phe, &herr);
++#else
++ phe = gethostbyname_r(host, &phe2, buf, buflength, &herr);
++#endif
++ if (herr != ERANGE)
++ break;
++ if (result == 0)
++ break;
++ /* double the buffer if the buffer is too small */
++ buflength = buflength * 2;
++ buf = realloc(buf, buflength);
++ }
++#endif
++#ifndef HAVE_GETHOSTBYNAME_R
++ /* Some systems do not support gethostbyname_r, such as Mac OS X */
++ phe = gethostbyname(host);
++#endif
++ if (!phe || result != 0)
++ {
++ free(buf);
++ return 0;
++ }
++ addr = *((unsigned long*) phe->h_addr_list[0]);
++ }
++#ifdef HAVE_GETHOSTBYNAME_R
++ free(buf);
++#endif
++ return ntohl(addr);
++}
++
++int GeoIP_id_by_name(GeoIP* gi, const char* name)
++{
++ unsigned long ipnum;
++ int ret;
++ if (name == NULL)
++ {
++ return 0;
++ }
++ if (gi->databaseType != GEOIP_COUNTRY_EDITION && gi->databaseType != GEOIP_PROXY_EDITION && gi->databaseType != GEOIP_NETSPEED_EDITION)
++ {
++ printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_COUNTRY_EDITION]);
++ return 0;
++ }
++ if (!(ipnum = _GeoIP_lookupaddress(name)))
++ return 0;
++ ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
++ return ret;
++
++}
++
++const char* GeoIP_country_code_by_addr(GeoIP* gi, const char* addr)
++{
++ int country_id;
++ country_id = GeoIP_id_by_addr(gi, addr);
++ return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
++}
++
++const char* GeoIP_country_code3_by_addr(GeoIP* gi, const char* addr)
++{
++ int country_id;
++ country_id = GeoIP_id_by_addr(gi, addr);
++ return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
++ return GeoIP_country_code3[country_id];
++}
++
++const char* GeoIP_country_name_by_addr(GeoIP* gi, const char* addr)
++{
++ int country_id;
++ country_id = GeoIP_id_by_addr(gi, addr);
++ return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
++ return GeoIP_country_name[country_id];
++}
++
++const char* GeoIP_country_name_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ int country_id;
++ country_id = GeoIP_id_by_ipnum(gi, ipnum);
++ return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
++}
++
++const char* GeoIP_country_code_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ int country_id;
++ country_id = GeoIP_id_by_ipnum(gi, ipnum);
++ return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
++}
++
++const char* GeoIP_country_code3_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ int country_id;
++ country_id = GeoIP_id_by_ipnum(gi, ipnum);
++ return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
++}
++
++int GeoIP_country_id_by_addr(GeoIP* gi, const char* addr)
++{
++ return GeoIP_id_by_addr(gi, addr);
++}
++
++int GeoIP_country_id_by_name(GeoIP* gi, const char* host)
++{
++ return GeoIP_id_by_name(gi, host);
++}
++
++int GeoIP_id_by_addr(GeoIP* gi, const char* addr)
++{
++ unsigned long ipnum;
++ int ret;
++ if (addr == NULL)
++ {
++ return 0;
++ }
++ if (gi->databaseType != GEOIP_COUNTRY_EDITION &&
++ gi->databaseType != GEOIP_PROXY_EDITION &&
++ gi->databaseType != GEOIP_NETSPEED_EDITION)
++ {
++ printf("Invalid database type %s, expected %s\n",
++ GeoIPDBDescription[(int)gi->databaseType],
++ GeoIPDBDescription[GEOIP_COUNTRY_EDITION]);
++ return 0;
++ }
++ ipnum = _GeoIP_addr_to_num(addr);
++ ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
++ return ret;
++}
++
++int GeoIP_id_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ int ret;
++ if (ipnum == 0)
++ {
++ return 0;
++ }
++ if (gi->databaseType != GEOIP_COUNTRY_EDITION &&
++ gi->databaseType != GEOIP_PROXY_EDITION &&
++ gi->databaseType != GEOIP_NETSPEED_EDITION)
++ {
++ printf("Invalid database type %s, expected %s\n",
++ GeoIPDBDescription[(int)gi->databaseType],
++ GeoIPDBDescription[GEOIP_COUNTRY_EDITION]);
++ return 0;
++ }
++ ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
++ return ret;
++}
++
++char* GeoIP_database_info(GeoIP* gi)
++{
++ int i;
++ unsigned char buf[3];
++ char* retval;
++ int hasStructureInfo = 0;
++
++ if (gi == NULL)
++ return NULL;
++
++ _check_mtime(gi);
++ fseek(gi->GeoIPDatabase, -3l, SEEK_END);
++
++ /* first get past the database structure information */
++ for (i = 0; i < STRUCTURE_INFO_MAX_SIZE; i++)
++ {
++ fread(buf, 1, 3, gi->GeoIPDatabase);
++ if (buf[0] == 255 && buf[1] == 255 && buf[2] == 255)
++ {
++ hasStructureInfo = 1;
++ break;
++ }
++ fseek(gi->GeoIPDatabase, -4l, SEEK_CUR);
++ }
++ if (hasStructureInfo == 1)
++ {
++ fseek(gi->GeoIPDatabase, -3l, SEEK_CUR);
++ }
++ else
++ {
++ /* no structure info, must be pre Sep 2002 database, go back to end */
++ fseek(gi->GeoIPDatabase, -3l, SEEK_END);
++ }
++
++ for (i = 0; i < DATABASE_INFO_MAX_SIZE; i++)
++ {
++ fread(buf, 1, 3, gi->GeoIPDatabase);
++ if (buf[0] == 0 && buf[1] == 0 && buf[2] == 0)
++ {
++ retval = malloc(sizeof(char) * (i + 1));
++ if (retval == NULL)
++ {
++ return NULL;
++ }
++ fread(retval, 1, i, gi->GeoIPDatabase);
++ retval[i] = '\0';
++ return retval;
++ }
++ fseek(gi->GeoIPDatabase, -4l, SEEK_CUR);
++ }
++ return NULL;
++}
++
++/* GeoIP Region Edition functions */
++
++void GeoIP_assign_region_by_inetaddr(GeoIP* gi, unsigned long inetaddr, GeoIPRegion* region)
++{
++ unsigned int seek_region;
++
++ /* This also writes in the terminating NULs (if you decide to
++ * keep them) and clear any fields that are not set. */
++ memset(region, 0, sizeof(GeoIPRegion));
++
++ seek_region = _GeoIP_seek_record(gi, ntohl(inetaddr));
++
++ if (gi->databaseType == GEOIP_REGION_EDITION_REV0)
++ {
++ /* Region Edition, pre June 2003 */
++ seek_region -= STATE_BEGIN_REV0;
++ if (seek_region >= 1000)
++ {
++ region->country_code[0] = 'U';
++ region->country_code[1] = 'S';
++ region->region[0] = (char)((seek_region - 1000) / 26 + 65);
++ region->region[1] = (char)((seek_region - 1000) % 26 + 65);
++ }
++ else
++ {
++ memcpy(region->country_code, GeoIP_country_code[seek_region], 2);
++ }
++ }
++ else if (gi->databaseType == GEOIP_REGION_EDITION_REV1)
++ {
++ /* Region Edition, post June 2003 */
++ seek_region -= STATE_BEGIN_REV1;
++ if (seek_region < US_OFFSET)
++ {
++ /* Unknown */
++ /* we don't need to do anything here b/c we memset region to 0 */
++ }
++ else if (seek_region < CANADA_OFFSET)
++ {
++ /* USA State */
++ region->country_code[0] = 'U';
++ region->country_code[1] = 'S';
++ region->region[0] = (char)((seek_region - US_OFFSET) / 26 + 65);
++ region->region[1] = (char)((seek_region - US_OFFSET) % 26 + 65);
++ }
++ else if (seek_region < WORLD_OFFSET)
++ {
++ /* Canada Province */
++ region->country_code[0] = 'C';
++ region->country_code[1] = 'A';
++ region->region[0] = (char)((seek_region - CANADA_OFFSET) / 26 + 65);
++ region->region[1] = (char)((seek_region - CANADA_OFFSET) % 26 + 65);
++ }
++ else
++ {
++ /* Not US or Canada */
++ memcpy(region->country_code, GeoIP_country_code[(seek_region - WORLD_OFFSET) / FIPS_RANGE], 2);
++ }
++ }
++}
++
++static
++GeoIPRegion* _get_region(GeoIP* gi, unsigned long ipnum)
++{
++ GeoIPRegion* region;
++
++ region = malloc(sizeof(GeoIPRegion));
++ if (region)
++ {
++ GeoIP_assign_region_by_inetaddr(gi, htonl(ipnum), region);
++ }
++ return region;
++}
++
++GeoIPRegion* GeoIP_region_by_addr(GeoIP* gi, const char* addr)
++{
++ unsigned long ipnum;
++ if (addr == NULL)
++ {
++ return 0;
++ }
++ if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
++ gi->databaseType != GEOIP_REGION_EDITION_REV1)
++ {
++ printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
++ return 0;
++ }
++ ipnum = _GeoIP_addr_to_num(addr);
++ return _get_region(gi, ipnum);
++}
++
++GeoIPRegion* GeoIP_region_by_name(GeoIP* gi, const char* name)
++{
++ unsigned long ipnum;
++ if (name == NULL)
++ {
++ return 0;
++ }
++ if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
++ gi->databaseType != GEOIP_REGION_EDITION_REV1)
++ {
++ printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
++ return 0;
++ }
++ if (!(ipnum = _GeoIP_lookupaddress(name)))
++ return 0;
++ return _get_region(gi, ipnum);
++}
++
++GeoIPRegion* GeoIP_region_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
++ gi->databaseType != GEOIP_REGION_EDITION_REV1)
++ {
++ printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
++ return 0;
++ }
++ return _get_region(gi, ipnum);
++}
++
++void GeoIPRegion_delete(GeoIPRegion* gir)
++{
++ free(gir);
++}
++
++/* GeoIP Organization, ISP and AS Number Edition private method */
++static
++char* _get_name(GeoIP* gi, unsigned long ipnum)
++{
++ int seek_org;
++ char buf[MAX_ORG_RECORD_LENGTH];
++ char* org_buf, * buf_pointer;
++ int record_pointer;
++
++ if (gi->databaseType != GEOIP_ORG_EDITION &&
++ gi->databaseType != GEOIP_ISP_EDITION &&
++ gi->databaseType != GEOIP_ASNUM_EDITION)
++ {
++ printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
++ return 0;
++ }
++
++ seek_org = _GeoIP_seek_record(gi, ipnum);
++ if (seek_org == (int) gi->databaseSegments[0])
++ return NULL;
++
++ record_pointer = seek_org + (2 * gi->record_length - 1) * gi->databaseSegments[0];
++
++ if (gi->cache == NULL)
++ {
++ fseek(gi->GeoIPDatabase, record_pointer, SEEK_SET);
++ fread(buf, sizeof(char), MAX_ORG_RECORD_LENGTH, gi->GeoIPDatabase);
++ org_buf = malloc(sizeof(char) * (strlen(buf) + 1));
++ strcpy(org_buf, buf);
++ }
++ else
++ {
++ buf_pointer = (char*)gi->cache + (long)record_pointer;
++ org_buf = malloc(sizeof(char) * (strlen(buf_pointer) + 1));
++ strcpy(org_buf, buf_pointer);
++ }
++ return org_buf;
++}
++
++char* GeoIP_name_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ return _get_name(gi, ipnum);
++}
++
++char* GeoIP_name_by_addr(GeoIP* gi, const char* addr)
++{
++ unsigned long ipnum;
++ if (addr == NULL)
++ {
++ return 0;
++ }
++ ipnum = _GeoIP_addr_to_num(addr);
++ return _get_name(gi, ipnum);
++}
++
++char* GeoIP_name_by_name(GeoIP* gi, const char* name)
++{
++ unsigned long ipnum;
++ if (name == NULL)
++ {
++ return 0;
++ }
++ if (!(ipnum = _GeoIP_lookupaddress(name)))
++ return 0;
++ return _get_name(gi, ipnum);
++}
++
++char* GeoIP_org_by_ipnum(GeoIP* gi, unsigned long ipnum)
++{
++ return GeoIP_name_by_ipnum(gi, ipnum);
++}
++
++char* GeoIP_org_by_addr(GeoIP* gi, const char* addr)
++{
++ return GeoIP_name_by_addr(gi, addr);
++}
++
++char* GeoIP_org_by_name(GeoIP* gi, const char* name)
++{
++ return GeoIP_name_by_name(gi, name);
++}
++
++unsigned char GeoIP_database_edition(GeoIP* gi)
++{
++ return gi->databaseType;
++}
+--- ./plugins/infowidget/CMakeLists.txt.orig 2021-08-04 21:50:44.000000000 -0500
++++ ./plugins/infowidget/CMakeLists.txt 2021-08-15 00:20:25.218503074 -0500
+@@ -1,23 +1,30 @@
+-# Add an option to compile & link against system GeoIP
+-option(BUILD_WITH_GEOIP
++# Add an option to compile & link against system GeoIP (off by default)
++option(WITH_SYSTEM_GEOIP
+ "Link InfoWidget plugin against system GeoIP library and use system-wide default GeoIP Country database"
+- ON)
++ OFF)
+
+-if (BUILD_WITH_GEOIP)
++if (WITH_SYSTEM_GEOIP)
+ find_path(GEOIP_INCLUDE_DIR NAMES GeoIP.h PATHS / ${INCLUDE_INSTALL_DIR}/)
+- find_library(GEOIP_LIBRARY NAMES GeoIP PATHS ${LIB_INSTALL_DIR})
++ find_library(GEOIP_LIBRARY NAMES GeoIP PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+
+ if (NOT GEOIP_INCLUDE_DIR OR NOT GEOIP_LIBRARY)
+- set(BUILD_WITH_GEOIP OFF CACHE BOOL
++ set(WITH_SYSTEM_GEOIP OFF CACHE BOOL
+ "GeoIP development files could not be found on this system. Forcing this option to OFF"
+ FORCE)
+- message(WARNING "GeoIP library development files could not be found on your system.")
+- else()
+- message(STATUS " Linking InfoWidget against system GeoIP library")
+- include_directories(GEOIP_INCLUDE_DIR)
+- set(geoip_link ${GEOIP_LIBRARY})
+- endif()
+-endif(BUILD_WITH_GEOIP)
++ message(SEND_ERROR
++ "GeoIP library development files could not be found on your system. Embedding a local copy of GeoIP instead")
++ endif(NOT GEOIP_INCLUDE_DIR OR NOT GEOIP_LIBRARY)
++endif(WITH_SYSTEM_GEOIP)
++
++if (WITH_SYSTEM_GEOIP)
++ message(STATUS " Linking InfoWidget against system GeoIP library")
++ add_definitions( -DUSE_SYSTEM_GEOIP )
++ include_directories(GEOIP_INCLUDE_DIR)
++ set(geoip_link ${GEOIP_LIBRARY})
++else(WITH_SYSTEM_GEOIP)
++ message(STATUS " Compiling GeoIP support directly into InfoWidget plugin")
++ set(geoip_src GeoIP.c)
++endif(WITH_SYSTEM_GEOIP)
+
+ add_library(ktorrent_infowidget MODULE)
+
+@@ -36,19 +43,14 @@
+ trackerview.cpp
+ trackermodel.cpp
+ addtrackersdialog.cpp
++ ${geoip_src}
++ geoipmanager.cpp
+ flagdb.cpp
+ iwfiletreemodel.cpp
+ iwfilelistmodel.cpp
+ webseedstab.cpp
+ webseedsmodel.cpp)
+
+-if (BUILD_WITH_GEOIP)
+- target_sources(ktorrent_infowidget PRIVATE geoipmanager.cpp)
+- add_definitions(-DBUILD_WITH_GEOIP=1)
+-else()
+- add_definitions(-DBUILD_WITH_GEOIP=0)
+-endif()
+-
+ ki18n_wrap_ui(ktorrent_infowidget iwprefpage.ui statustab.ui chunkdownloadview.ui trackerview.ui webseedstab.ui)
+ kconfig_add_kcfg_files(ktorrent_infowidget infowidgetpluginsettings.kcfgc)
+
+--- ./plugins/infowidget/geoipmanager.h.orig 2021-08-04 21:50:44.000000000 -0500
++++ ./plugins/infowidget/geoipmanager.h 2021-08-15 00:18:01.330498947 -0500
+@@ -7,7 +7,21 @@
+ #define KT_GEOIPMANAGER_H
+
+ #include <QObject>
++#include <QThread>
++#include <QUrl>
++
++#ifdef USE_SYSTEM_GEOIP
+ #include <GeoIP.h>
++#else
++#include "GeoIP.h"
++#endif
++
++class KJob;
++
++namespace bt
++{
++class DecompressThread;
++}
+
+ namespace kt
+ {
+@@ -42,8 +56,28 @@
+ */
+ QString countryCode(int country_id);
+
++ /// Get the database URL
++ static QUrl geoIPUrl()
++ {
++ return geoip_url;
++ }
++
++ /// Set the database URL
++ static void setGeoIPUrl(const QUrl &url);
++
++ /// Download the database
++ void downloadDataBase();
++
++private Q_SLOTS:
++ void databaseDownloadFinished(KJob *job);
++ void decompressFinished();
++
+ private:
+ GeoIP *geo_ip;
++ QString geoip_data_file;
++ QString download_destination;
++ bt::DecompressThread *decompress_thread;
++ static QUrl geoip_url;
+ };
+
+ }
+--- ./plugins/infowidget/peerviewmodel.cpp.orig 2021-08-04 21:50:44.000000000 -0500
++++ ./plugins/infowidget/peerviewmodel.cpp 2021-08-15 00:18:01.330498947 -0500
+@@ -13,13 +13,10 @@
+ #include <KLocalizedString>
+
+ #include "flagdb.h"
++#include "geoipmanager.h"
+ #include <interfaces/torrentinterface.h>
+ #include <util/functions.h>
+
+-#if BUILD_WITH_GEOIP
+-#include "geoipmanager.h"
+-#endif
+-
+ using namespace bt;
+
+ namespace kt
+@@ -28,12 +25,7 @@
+ static bool icons_loaded = false;
+ static FlagDB flagDB(22, 18);
+
+-PeerViewModel::Item::Item(bt::PeerInterface *peer
+-#if BUILD_WITH_GEOIP
+- ,
+- GeoIPManager *geo_ip
+-#endif
+- )
++PeerViewModel::Item::Item(bt::PeerInterface *peer, GeoIPManager *geo_ip)
+ : peer(peer)
+ {
+ stats = peer->getStats();
+@@ -47,13 +39,13 @@
+ flagDB.addFlagSource(path + QStringLiteral("/%1/flag.png"));
+ }
+
+-#if BUILD_WITH_GEOIP
+- int country_id = geo_ip->findCountry(stats.ip_address);
+- if (country_id > 0) {
+- country = geo_ip->countryName(country_id);
+- flag = flagDB.getFlag(geo_ip->countryCode(country_id));
++ if (geo_ip) {
++ int country_id = geo_ip->findCountry(stats.ip_address);
++ if (country_id > 0) {
++ country = geo_ip->countryName(country_id);
++ flag = flagDB.getFlag(geo_ip->countryCode(country_id));
++ }
+ }
+-#endif
+ }
+
+ bool PeerViewModel::Item::changed() const
+@@ -191,10 +183,9 @@
+
+ PeerViewModel::PeerViewModel(QObject *parent)
+ : QAbstractTableModel(parent)
++ , geo_ip(nullptr)
+ {
+-#if BUILD_WITH_GEOIP
+ geo_ip = new GeoIPManager(this);
+-#endif
+ }
+
+ PeerViewModel::~PeerViewModel()
+@@ -204,12 +195,7 @@
+
+ void PeerViewModel::peerAdded(bt::PeerInterface *peer)
+ {
+- items.append(new Item(peer
+-#if BUILD_WITH_GEOIP
+- ,
+- geo_ip
+-#endif
+- ));
++ items.append(new Item(peer, geo_ip));
+ insertRow(items.count() - 1);
+ }
+
+--- ./plugins/infowidget/infowidgetplugin.cpp.orig 2021-08-04 21:50:44.000000000 -0500
++++ ./plugins/infowidget/infowidgetplugin.cpp 2021-08-15 00:18:01.330498947 -0500
+@@ -18,6 +18,7 @@
+
+ #include "chunkdownloadview.h"
+ #include "fileview.h"
++#include "geoipmanager.h"
+ #include "infowidgetpluginsettings.h"
+ #include "iwprefpage.h"
+ #include "monitor.h"
+--- ./plugins/infowidget/peerviewmodel.h.orig 2021-08-04 21:50:44.000000000 -0500
++++ ./plugins/infowidget/peerviewmodel.h 2021-08-15 00:18:01.331498947 -0500
+@@ -61,12 +61,7 @@
+ QString country;
+ QIcon flag;
+
+- Item(bt::PeerInterface *peer
+-#if BUILD_WITH_GEOIP
+- ,
+- GeoIPManager *geo_ip
+-#endif
+- );
++ Item(bt::PeerInterface *peer, GeoIPManager *geo_ip);
+
+ bool changed() const;
+ QVariant data(int col) const;
+@@ -76,9 +71,7 @@
+
+ private:
+ QVector<Item *> items;
+-#if BUILD_WITH_GEOIP
+- GeoIPManager *geo_ip = nullptr;
+-#endif
++ GeoIPManager *geo_ip;
+ };
+
+ }
diff --git a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
index 3b2407acf..8b45be434 100644
--- a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
+++ b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
@@ -1,6 +1,6 @@
---- ./plugins/infowidget/geoipmanager.cpp.orig 2021-06-05 16:25:43.000000000 -0500
-+++ ./plugins/infowidget/geoipmanager.cpp 2021-06-10 15:57:49.201091341 -0500
-@@ -45,7 +45,7 @@
+--- ./plugins/infowidget/geoipmanager.cpp.orig 2021-08-15 00:22:42.578507015 -0500
++++ ./plugins/infowidget/geoipmanager.cpp 2021-08-15 00:26:18.456513207 -0500
+@@ -30,7 +30,7 @@
#ifdef USE_SYSTEM_GEOIP
geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
#else
@@ -9,7 +9,7 @@
if (geoip_data_file.isEmpty())
geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat"));
-@@ -56,11 +56,6 @@
+@@ -41,11 +41,6 @@
if (geo_ip) {
QFileInfo fi(geoip_data_file);
QDateTime now = QDateTime::currentDateTime();
@@ -21,12 +21,10 @@
}
}
#endif
-@@ -104,14 +99,6 @@
+@@ -89,12 +84,6 @@
void GeoIPManager::downloadDataBase()
{
-- Out(SYS_INW | LOG_IMPORTANT) << "The download GeoIP database loading is defunct, skipping download" << endl;
-- return;
-#ifndef USE_SYSTEM_GEOIP
- Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl;
- download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName();
diff --git a/source/kde/kde/patch/plasma-framework.patch b/source/kde/kde/patch/plasma-framework.patch
new file mode 100644
index 000000000..b10b4a5e3
--- /dev/null
+++ b/source/kde/kde/patch/plasma-framework.patch
@@ -0,0 +1,2 @@
+# Fix icon sizing regression:
+cat $CWD/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch b/source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch
new file mode 100644
index 000000000..9c0e90464
--- /dev/null
+++ b/source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch
@@ -0,0 +1,44 @@
+From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 15 Aug 2021 09:33:10 -0600
+Subject: [PATCH] Fix Plasma (non-Qt) icon scaling with integer scale factors
+
+An embarrassing error in 4edb830f53aac4833ece024df59441029b01fde6
+caused the function which returns an appropriate scale factor for icons
+to both take and return integer values rather than floating point
+values, preventing it from working properly with any scale factor other
+than an integer scale factor (e.g. 200%). This commit fixes that issue.
+---
+ src/declarativeimports/core/units.cpp | 2 +-
+ src/declarativeimports/core/units.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
+index 6788ed952..fbcc6d888 100644
+--- a/src/declarativeimports/core/units.cpp
++++ b/src/declarativeimports/core/units.cpp
+@@ -174,7 +174,7 @@ int Units::roundToIconSize(int size)
+ }
+ }
+
+-int Units::bestIconScaleForDevicePixelRatio(const int ratio)
++qreal Units::bestIconScaleForDevicePixelRatio(const qreal ratio)
+ {
+ if (ratio < 1.5) {
+ return 1;
+diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h
+index c19cf0dd8..855738e7d 100644
+--- a/src/declarativeimports/core/units.h
++++ b/src/declarativeimports/core/units.h
+@@ -271,7 +271,7 @@ private:
+ * Note that this function is only relevant when using Plasma scaling and
+ * when using Qt scaling, it always returns 1.
+ */
+- static int bestIconScaleForDevicePixelRatio(const int ratio);
++ static qreal bestIconScaleForDevicePixelRatio(const qreal ratio);
+
+ /**
+ * @return The dpi-adjusted size for a given icon size
+--
+GitLab
+
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-28 12:25:30 +0000