diff --git a/2.2.0.2.tar.gz b/2.2.0.2.tar.gz new file mode 100644 index 0000000..ab2a68f --- /dev/null +++ b/2.2.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcb888a550f1f515ef6a2f7af2dd02605dd5c6da8a23f6c3a52479f8532ac109 +size 13645528 diff --git a/2.2.0.tar.gz b/2.2.0.tar.gz deleted file mode 100644 index b83bf03..0000000 --- a/2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfce6f290b89707a0717789aa0cdea4ca5a96685fa0e65cfc49d70166bd182f2 -size 13837301 diff --git a/librecad-no-date.diff b/librecad-no-date.diff index 98f276c..cff6357 100644 --- a/librecad-no-date.diff +++ b/librecad-no-date.diff @@ -6,9 +6,11 @@ Remove build time references so build-compare can do its work. librecad/src/main/qc_applicationwindow.cpp | 1 - 1 file changed, 1 deletion(-) ---- a/librecad/src/main/qc_applicationwindow.cpp -+++ b/librecad/src/main/qc_applicationwindow.cpp -@@ -2380,7 +2380,6 @@ void QC_ApplicationWindow::showAboutWind +Index: LibreCAD-2.2.0.2/librecad/src/main/qc_applicationwindow.cpp +=================================================================== +--- LibreCAD-2.2.0.2.orig/librecad/src/main/qc_applicationwindow.cpp ++++ LibreCAD-2.2.0.2/librecad/src/main/qc_applicationwindow.cpp +@@ -2883,7 +2883,6 @@ void QC_ApplicationWindow::showAboutWind #elif defined(Q_CC_MSVC) tr("Compiler: Microsoft Visual C++") + "\n" + #endif diff --git a/librecad-plugindir.diff b/librecad-plugindir.diff index 9e2caff..dcdab07 100644 --- a/librecad-plugindir.diff +++ b/librecad-plugindir.diff @@ -9,11 +9,11 @@ Look in the right spot for plugins. librecad/src/lib/engine/rs_system.cpp | 2 ++ 1 file changed, 2 insertions(+) -Index: LibreCAD-2.0.2/librecad/src/lib/engine/rs_system.cpp +Index: LibreCAD-2.2.0.2/librecad/src/lib/engine/rs_system.cpp =================================================================== ---- LibreCAD-2.0.2.orig/librecad/src/lib/engine/rs_system.cpp -+++ LibreCAD-2.0.2/librecad/src/lib/engine/rs_system.cpp -@@ -642,6 +642,9 @@ QStringList RS_System::getDirectoryList( +--- LibreCAD-2.2.0.2.orig/librecad/src/lib/engine/rs_system.cpp ++++ LibreCAD-2.2.0.2/librecad/src/lib/engine/rs_system.cpp +@@ -635,6 +635,9 @@ QStringList RS_System::getDirectoryList( } RS_SETTINGS->endGroup(); diff --git a/librecad-use-system-libdxfrw.patch b/librecad-use-system-libdxfrw.patch index d4357e7..5b4be41 100644 --- a/librecad-use-system-libdxfrw.patch +++ b/librecad-use-system-libdxfrw.patch @@ -7,8 +7,10 @@ build: avoid using bundled libdxfrw librecad/src/src.pro | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) ---- a/libraries/libraries.pro -+++ b/libraries/libraries.pro +Index: LibreCAD-2.2.0.2/libraries/libraries.pro +=================================================================== +--- LibreCAD-2.2.0.2.orig/libraries/libraries.pro ++++ LibreCAD-2.2.0.2/libraries/libraries.pro @@ -9,7 +9,6 @@ TEMPLATE = subdirs TARGET = libraries @@ -17,9 +19,11 @@ build: avoid using bundled libdxfrw jwwlib macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){ ---- a/librecad/src/src.pro -+++ b/librecad/src/src.pro -@@ -35,8 +35,7 @@ greaterThan( QT_MAJOR_VERSION, 4 ) { +Index: LibreCAD-2.2.0.2/librecad/src/src.pro +=================================================================== +--- LibreCAD-2.2.0.2.orig/librecad/src/src.pro ++++ LibreCAD-2.2.0.2/librecad/src/src.pro +@@ -33,8 +33,7 @@ CONFIG += c++11 } GEN_LIB_DIR = ../../generated/lib @@ -29,7 +33,7 @@ build: avoid using bundled libdxfrw DESTDIR = $${INSTALLDIR} -@@ -84,7 +83,7 @@ LIBS += -L../../generated/lib \ +@@ -85,7 +84,7 @@ LIBS += -L../../generated/lib \ -ljwwlib INCLUDEPATH += \ diff --git a/librecad-use-system-shapelib.patch b/librecad-use-system-shapelib.patch deleted file mode 100644 index 5971778..0000000 --- a/librecad-use-system-shapelib.patch +++ /dev/null @@ -1,31 +0,0 @@ -build: avoid using bundled shapelib -[asterios.dramis@gmail.com: imported the patch from Fedora into openSUSE's librecad] - ---- - plugins/importshp/importshp.pro | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - ---- a/plugins/importshp/importshp.pro -+++ b/plugins/importshp/importshp.pro -@@ -17,12 +17,9 @@ include(../../common.pri) - # For plugins - INCLUDEPATH += ../../librecad/src/plugins - --SOURCES += importshp.cpp \ -- shapelib/shpopen.c \ -- shapelib/safileio.c \ -- shapelib/dbfopen.c --HEADERS += importshp.h \ -- shapelib/shapefil.h -+SOURCES += importshp.cpp -+HEADERS += importshp.h -+LIBS += -lshp - - # Installation Directory - win32 { -@@ -36,5 +33,3 @@ unix { - DESTDIR = ../../unix/resources/plugins - } - } -- --INCLUDEPATH += shapelib diff --git a/librecad.changes b/librecad.changes index 686e3cf..9a7e580 100644 --- a/librecad.changes +++ b/librecad.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 4 07:00:05 UTC 2023 - Paolo Stivanin + +- Update to release 2.2.0.2: + * fixes an undetected vulnerability when opening malformed LFF + font files that caused a crash + * fixes format issues in bundled fonts + * fixes regression, finding nearest points on ellipses caused a crash + * plugin Importshp has been removed +- Drop librecad-use-system-shapelib.patch since the plugin has been + removed. +- Rebase patches. + ------------------------------------------------------------------- Sun Feb 19 12:10:12 UTC 2023 - Jan Engelhardt diff --git a/librecad.spec b/librecad.spec index 5bce315..cff3dc1 100644 --- a/librecad.spec +++ b/librecad.spec @@ -16,10 +16,8 @@ # -%define tar_version 2.2.0 - Name: librecad -Version: 2.2.0 +Version: 2.2.0.2 Release: 0 Summary: Computer-aided design (CAD) software package for 2D design and drafting License: (Apache-2.0 OR SUSE-GPL-3.0+-with-font-exception) AND GPL-2.0-only @@ -27,7 +25,7 @@ Group: Productivity/Graphics/CAD URL: http://librecad.org/ #Git-Web: https://github.com/LibreCAD/LibreCAD -Source: https://github.com/LibreCAD/LibreCAD/archive/%tar_version.tar.gz +Source: https://github.com/LibreCAD/LibreCAD/archive/%version.tar.gz # Version is actually 8, not 3 (it is 3 in the filename due to how MediaWiki # works -- see http://wiki.librecad.org/index.php/File:Architect3-LCAD.zip) Source2: https://wiki.librecad.org/images/d/d9/Architect3-LCAD.zip @@ -39,12 +37,10 @@ Patch4: librecad-no-date.diff Patch5: librecad-use-system-libdxfrw.patch Patch6: librecad-install.diff Patch7: librecad-plugindir.diff -Patch8: librecad-use-system-shapelib.patch BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ >= 4.7 BuildRequires: libboost_headers-devel -BuildRequires: libshp-devel BuildRequires: muparser-devel BuildRequires: unzip BuildRequires: update-desktop-files @@ -77,7 +73,7 @@ Collection of parts for LibreCAD, a Qt application to design 2D CAD drawings. %prep -%setup -qn LibreCAD-%tar_version -a2 -a3 -a4 +%setup -qn LibreCAD-%version -a2 -a3 -a4 %autopatch -p1 pc="libdxfrw" @@ -93,7 +89,6 @@ sed -i 's@LRELEASE="lrelease"@LRELEASE="lrelease-qt5"@' scripts/postprocess-unix # Make sure bundled libraries are not used rm -rf libraries/libdxfrw -rm -rf plugins/importshp/shapelib # Fix "wrong-file-end-of-line-encoding" rpmlint warning sed -i 's/\r$//' licenses/{MIT,KST32B_v2,lc_opengost-fonts}.txt