From 6a5fdf14afe2bab90a33551f405d0f0bb036692e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 4 Nov 2023 23:06:04 +0900 Subject: [PATCH 01/41] update to the latest git --- ngspice.spec | 14 +++++++------- sources | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index f976e1c..c674202 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -20,13 +20,13 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -# master -%global gitcommit 2275fb85da31a8c802ebf9730935c8c00d6cdea0 -%global gitdate 20230814 +# pre-master-42 +%global gitcommit 04c68d5f30f5fd7bbf64e7431ad6e8c2adcb64ce +%global gitdate 20231028 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230816 -%global tarballtime 0753 +%global tarballdate 20231104 +%global tarballtime 2255 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 6630f0a..d13259d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-41.tar.gz) = fb0960cc9fcde1871fad82571cacebb1f5cce09ee3297cc938a24b88173ed102a2cb3f246599cdfbde7275e45e3d551edd0368e3ba6e79c592937c4cc466325e -SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 +SHA512 (ngspice-20231104T2255.tar.gz) = 238dd512adc8fe3dcdce10b79dcf39ffefa36a5613ad2f9cfccd1ebd8d5c19bff8d73b6c8b77f75b4555a4bb7dc69e783ec1492c84b6ededc9599a562f119ccd SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 7149c6d64e5822b9b3e30ab870ef642a27830da6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 4 Nov 2023 23:16:20 +0900 Subject: [PATCH 02/41] update to the latest git --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index d13259d..485de46 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (ngspice-20231104T2255.tar.gz) = 238dd512adc8fe3dcdce10b79dcf39ffefa36a5613ad2f9cfccd1ebd8d5c19bff8d73b6c8b77f75b4555a4bb7dc69e783ec1492c84b6ededc9599a562f119ccd SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 +SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 From a682309834d53acb5230075715f344dc0f2defa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 09:37:25 +0900 Subject: [PATCH 03/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c674202..df08a7e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-42 -%global gitcommit 04c68d5f30f5fd7bbf64e7431ad6e8c2adcb64ce -%global gitdate 20231028 +%global gitcommit 4e1452cdb7f9f1e6eb9678b74524a36b9e9bfcea +%global gitdate 20231104 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231104 -%global tarballtime 2255 +%global tarballdate 20231106 +%global tarballtime 0930 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 485de46..71bf0d7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20231104T2255.tar.gz) = 238dd512adc8fe3dcdce10b79dcf39ffefa36a5613ad2f9cfccd1ebd8d5c19bff8d73b6c8b77f75b4555a4bb7dc69e783ec1492c84b6ededc9599a562f119ccd +SHA512 (ngspice-20231106T0930.tar.gz) = b929f85b36808879d9042bc044f3190112d11a83e91817c78a89a043ad975be7371048f2e6a87e1f3da8440ef686e9b82fbe31f1ddda55fc7c9bfa64c42799c1 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 From 6ce601b283dcd61078ab9dd89577de4d4a31ea48 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 21:58:42 +0900 Subject: [PATCH 04/41] trial fix --- ngspice-42dev-adms-admst-revert.patch | 13 +++++++++++++ ngspice.spec | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ngspice-42dev-adms-admst-revert.patch diff --git a/ngspice-42dev-adms-admst-revert.patch b/ngspice-42dev-adms-admst-revert.patch new file mode 100644 index 0000000..167d02c --- /dev/null +++ b/ngspice-42dev-adms-admst-revert.patch @@ -0,0 +1,13 @@ +diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +index eca9991f1..725d6d51e 100644 +--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml ++++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +@@ -280,8 +280,6 @@ typedef struct s$(module)instance { + + + +-#define $(module)numStates 0 +- + #ifdef KLU + + diff --git a/ngspice.spec b/ngspice.spec index df08a7e..c405083 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -60,6 +60,7 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +Patch1: ngspice-42dev-adms-admst-revert.patch BuildRequires: make BuildRequires: gcc @@ -73,7 +74,7 @@ BuildRequires: libICE-devel BuildRequires: libXaw-devel BuildRequires: libGL-devel BuildRequires: libXt-devel -# From ngspice 32 +# From ngspice 32s BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: libXft-devel @@ -189,6 +190,8 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +%patch -P1 -p1 +git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... for nonUTF8 in \ From 976dfbd62be42da1d121f5894672bc6d0aab0bca Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 22:03:50 +0900 Subject: [PATCH 05/41] undo typo --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index c405083..bf5f600 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -74,7 +74,7 @@ BuildRequires: libICE-devel BuildRequires: libXaw-devel BuildRequires: libGL-devel BuildRequires: libXt-devel -# From ngspice 32s +# From ngspice 32 BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: libXft-devel From 23cdbb13a841406e40bb2417163a09a988ed205e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 23:48:12 +0900 Subject: [PATCH 06/41] more revert --- ngspice-42dev-xspice-icm-revert.patch | 13 +++++++++++++ ngspice.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 ngspice-42dev-xspice-icm-revert.patch diff --git a/ngspice-42dev-xspice-icm-revert.patch b/ngspice-42dev-xspice-icm-revert.patch new file mode 100644 index 0000000..a8d15d5 --- /dev/null +++ b/ngspice-42dev-xspice-icm-revert.patch @@ -0,0 +1,13 @@ +diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in +index 78e578e99..7c01c9b26 100644 +--- a/src/xspice/icm/GNUmakefile.in ++++ b/src/xspice/icm/GNUmakefile.in +@@ -102,7 +102,7 @@ cm-descr := \ + cm-clean : + -rm -f $(cm)/$(cm).cm + -rm -f $(cm-descr) $(cm-objs) $(cm-gens) +- -rm -f $(cm)/*/*.o $(cm)/*/*.c $(cm)/*/.deps/* ++ -rm -f $(cm)/*/*.o $(cm)/*/.deps/* + -rm -f $(cm-deps) + + cm-distclean : diff --git a/ngspice.spec b/ngspice.spec index bf5f600..4e574ac 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -61,6 +61,7 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch Patch1: ngspice-42dev-adms-admst-revert.patch +Patch2: ngspice-42dev-xspice-icm-revert.patch BuildRequires: make BuildRequires: gcc @@ -191,6 +192,7 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a %patch -P1 -p1 +%patch -P2 -p1 git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... From 3ea15aa50fadde9ba9fa96ef17301793fb7d6ddf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Nov 2023 22:42:04 +0900 Subject: [PATCH 07/41] update to the latest git --- ngspice-42dev-xspice-icm-revert.patch | 13 ------------- ngspice.spec | 12 ++++++------ sources | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 ngspice-42dev-xspice-icm-revert.patch diff --git a/ngspice-42dev-xspice-icm-revert.patch b/ngspice-42dev-xspice-icm-revert.patch deleted file mode 100644 index a8d15d5..0000000 --- a/ngspice-42dev-xspice-icm-revert.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in -index 78e578e99..7c01c9b26 100644 ---- a/src/xspice/icm/GNUmakefile.in -+++ b/src/xspice/icm/GNUmakefile.in -@@ -102,7 +102,7 @@ cm-descr := \ - cm-clean : - -rm -f $(cm)/$(cm).cm - -rm -f $(cm-descr) $(cm-objs) $(cm-gens) -- -rm -f $(cm)/*/*.o $(cm)/*/*.c $(cm)/*/.deps/* -+ -rm -f $(cm)/*/*.o $(cm)/*/.deps/* - -rm -f $(cm-deps) - - cm-distclean : diff --git a/ngspice.spec b/ngspice.spec index 4e574ac..188b5d5 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-42 -%global gitcommit 4e1452cdb7f9f1e6eb9678b74524a36b9e9bfcea -%global gitdate 20231104 +%global gitcommit c87df54f24969de0c9d503c349258d9953ae208a +%global gitdate 20231111 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231106 -%global tarballtime 0930 +%global tarballdate 20231112 +%global tarballtime 1636 %endif %if 0%{?userelease} >= 1 @@ -61,7 +61,6 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch Patch1: ngspice-42dev-adms-admst-revert.patch -Patch2: ngspice-42dev-xspice-icm-revert.patch BuildRequires: make BuildRequires: gcc @@ -192,7 +191,6 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a %patch -P1 -p1 -%patch -P2 -p1 git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... @@ -280,6 +278,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --disable-silent-rules \ --enable-adms \ --enable-xspice \ + --enable-klu \ --enable-osdi \ --enable-maintainer-mode \ --enable-dependency-tracking \ @@ -320,6 +319,7 @@ do --enable-adms \ --enable-xspice \ --enable-osdi \ + --enable-klu \ --enable-maintainer-mode \ --enable-dependency-tracking \ --enable-cider \ diff --git a/sources b/sources index 71bf0d7..3bb3d30 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20231106T0930.tar.gz) = b929f85b36808879d9042bc044f3190112d11a83e91817c78a89a043ad975be7371048f2e6a87e1f3da8440ef686e9b82fbe31f1ddda55fc7c9bfa64c42799c1 +SHA512 (ngspice-20231112T1636.tar.gz) = b6a560e0c4d9f7d6fec7f8b069849cb812a37f3982fb5c202749e1a4501140fe22c1b28567991ffa1134f2a71715a9b7fe412cf477f23dc7742dd64c4e673662 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 From c7e34909cdbb3fb448f45a75affd2eb58d41d75a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 12:38:21 +0900 Subject: [PATCH 08/41] Update to ngspice 42 --- ngspice-42dev-adms-admst-revert.patch | 13 ----------- ngspice.spec | 31 ++++++++++++++++++++------- 2 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 ngspice-42dev-adms-admst-revert.patch diff --git a/ngspice-42dev-adms-admst-revert.patch b/ngspice-42dev-adms-admst-revert.patch deleted file mode 100644 index 167d02c..0000000 --- a/ngspice-42dev-adms-admst-revert.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml -index eca9991f1..725d6d51e 100644 ---- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml -+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml -@@ -280,8 +280,6 @@ typedef struct s$(module)instance { - - - --#define $(module)numStates 0 -- - #ifdef KLU - - diff --git a/ngspice.spec b/ngspice.spec index 188b5d5..5521929 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,17 +5,17 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global majorver 41 +%global majorver 42 #%%global minorver 3 -%global docver 41 +%global docver 42 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -36,6 +36,8 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif +%bcond_with adms + %undefine _changelog_trimtime Name: ngspice @@ -60,7 +62,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -Patch1: ngspice-42dev-adms-admst-revert.patch BuildRequires: make BuildRequires: gcc @@ -171,6 +172,7 @@ git config user.email "%{name}-maintainers@fedoraproject.org" git checkout -b %{name}-%{majorver}-fedora %{gitcommit} %endif +%if %{with adms} pushd src/spicelib/devices/adms %if 0%{?userelease} >= 1 7za x %{SOURCE2} @@ -186,12 +188,12 @@ do test -f $f || exit 1 done %endif + popd +%endif %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -%patch -P1 -p1 -git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -240,7 +242,11 @@ sed -i \ git commit -m "Fix include path" -a export ACLOCAL_FLAGS=-Im4 -./autogen.sh --adms +./autogen.sh \ +%if %{with adms} + --adms \ +%endif + %{nil} git commit -m "Execute autogen" -a || : chmod +x configure @@ -276,7 +282,9 @@ export CPPFLAGS=-DUSE_INTERP_RESULT # by the request from the upstream %configure \ --disable-silent-rules \ +%if %{with adms} --enable-adms \ +%endif --enable-xspice \ --enable-klu \ --enable-osdi \ @@ -316,7 +324,9 @@ do %configure \ --disable-silent-rules \ ${SHARED_OPT} \ +%if %{with adms} --enable-adms \ +%endif --enable-xspice \ --enable-osdi \ --enable-klu \ @@ -457,6 +467,11 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Dec 29 2023 Mamoru TASAKA - 42-1 +- Update to 42 +- Kill --with-adms +- Enable --with-klu + * Wed Aug 16 2023 Mamoru TASAKA - 41-1 - Update to 41 From a935e39f317fe757f21e59bcb6e79d1615d620f6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 12:40:01 +0900 Subject: [PATCH 09/41] remove adms source file --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index 5521929..01488ff 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -55,7 +55,9 @@ Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ma Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-%{docver}-manual.pdf +%if %{with adms} Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-adms-va.7z +%endif Source10: create-ngspice-git-bare-tarball.sh From 935d270f73e58823100c4b2ada242a4541d32ae5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 12:44:14 +0900 Subject: [PATCH 10/41] upload source --- sources | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3bb3d30..1ec5334 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (ngspice-20231112T1636.tar.gz) = b6a560e0c4d9f7d6fec7f8b069849cb812a37f3982fb5c202749e1a4501140fe22c1b28567991ffa1134f2a71715a9b7fe412cf477f23dc7742dd64c4e673662 -SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 +SHA512 (ngspice-42.tar.gz) = 37fbabd8e537ac8efe02731e54a0c586588e48010a8022daeeb53442b8ebdf3f1ea866e8d6eb180c130cabba2ae6675bc8741208ad2a20091d2c753eec9b4d55 +SHA512 (ngspice-42-manual.pdf) = 9251231fb3e33e5961e10cd2d2317003bc3d72f211224f7db743fe6f80f20ef7f25daad84810b3869239d248a04e97dd6fa375416c6b0180370904fb5e5cdd74 From ad61317e3833980ee92a9757886906a40e61977d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Jan 2024 17:14:01 +0900 Subject: [PATCH 11/41] Fix compilation with -Werror=incompatible-pointer-types --- ngspice-42-pointer-type-cast-c99.patch | 11 +++++++++++ ngspice.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ngspice-42-pointer-type-cast-c99.patch diff --git a/ngspice-42-pointer-type-cast-c99.patch b/ngspice-42-pointer-type-cast-c99.patch new file mode 100644 index 0000000..606505c --- /dev/null +++ b/ngspice-42-pointer-type-cast-c99.patch @@ -0,0 +1,11 @@ +--- ngspice-42/src/tclspice.c.type 2023-12-28 03:58:03.000000000 +0900 ++++ ngspice-42/src/tclspice.c 2024-01-21 15:53:13.123052910 +0900 +@@ -2433,7 +2433,7 @@ tmeasure TCL_CMDPROCARGS(clientData, int + return TCL_ERROR; + } + +- wl = wl_build((char **)argv); ++ wl = wl_build((const char * const *)argv); + + get_measure2(wl, &mvalue, NULL, FALSE); + diff --git a/ngspice.spec b/ngspice.spec index 01488ff..e20e146 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -42,9 +42,10 @@ Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A mixed level/signal circuit simulator +# ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause License: BSD URL: http://ngspice.sourceforge.net @@ -64,6 +65,8 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +# Fix compilation with C99 -Werror=incompatible-pointer-types +Patch1: ngspice-42-pointer-type-cast-c99.patch BuildRequires: make BuildRequires: gcc @@ -196,6 +199,8 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +%patch -P1 -p1 -b .type +git commit -m "Fix pointer cast for -Werror=incompatible-pointer-types" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -469,6 +474,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Jan 21 2024 Mamoru TASAKA - 42-2 +- Fix compilation with -Werror=incompatible-pointer-types + * Fri Dec 29 2023 Mamoru TASAKA - 42-1 - Update to 42 - Kill --with-adms From 9a77728f1b626e1daf90b8e295d4c5e0ec6cdcbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:59:22 +0000 Subject: [PATCH 12/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index e20e146..97888af 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -42,7 +42,7 @@ Name: ngspice Version: %{fedoraver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -474,6 +474,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 42-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Mamoru TASAKA - 42-2 - Fix compilation with -Werror=incompatible-pointer-types From a8d6bf0885b405a6e10c62aa8d8710c2ea09ae13 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 2 Feb 2024 16:35:24 +0900 Subject: [PATCH 13/41] add reference --- ngspice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ngspice.spec b/ngspice.spec index 97888af..27d4d2c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -66,6 +66,7 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch # Fix compilation with C99 -Werror=incompatible-pointer-types +# https://sourceforge.net/p/ngspice/bugs/659/ Patch1: ngspice-42-pointer-type-cast-c99.patch BuildRequires: make From 0aa55a0368bccc4c463fb8eb8dbc6390a05a71c5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Mar 2024 14:42:59 +0900 Subject: [PATCH 14/41] once save --- License-analysis.txt | 127 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 License-analysis.txt diff --git a/License-analysis.txt b/License-analysis.txt new file mode 100644 index 0000000..9d8ae27 --- /dev/null +++ b/License-analysis.txt @@ -0,0 +1,127 @@ +CC-BY-SA-4.0 +COPYING +FAQ +manal.pdf + +??? +src/frontend/get_phys_mem_size.c +src/frontend/get_resident_set_size.c + +GPL-2.0-or-later +src/xspice/icm/table/table2D/cfunc.mod +src/xspice/icm/table/table3D/cfunc.mod +src/spicelib/devices/adms/admst/COPYING +src/spicelib/devices/adms/admst/ngspice*.xml +src/xspice/icm/table/mada/alloc.c +src/xspice/icm/table/mada/eno.c +src/xspice/icm/table/mada/eno2.c +src/xspice/icm/table/mada/eno3.c + +GPL-2.0-only +src/xspice/icm/table/table2D/ifspec.ifs +src/xspice/icm/table/table3D/ifspec.ifs + +GPL-3.0-or-later +src/frontend/parse-bison.c +src/frontend/parse-bison.h +src/spicelib/parser/inpptree-parser.c +src/spicelib/parser/inpptree-parser.h +src/xspice/cmpp/ifs_yacc.c +src/xspice/cmpp/ifs_yacc.h +src/xspice/cmpp/mod_yacc.c +src/xspice/cmpp/mod_yacc.h + +LGPL-2.1-or-later +README.tcl +src/frontend/numparam/mystring.c +src/frontend/numparam/readme.txt +src/frontend/numparam/spicenum.c +src/frontend/numparam/xpressn.c +src/maths/KLU/colamd.c +src/spicelib/devices/adms/admst/COPYING + +LGPL-2.1-only +src/maths/KLU/colamd_global.c +src/tclspice.c + +MPL-2.0 +src/include/cppduals/duals/dual +src/osdi/ + +ECL-2.0 +examples/osdi/EKV2.6/ekv26_mod.va +src/spicelib/devices/bsim4/ + +HPND +src/maths/sparse/ + +BSD-4-Clause +src/misc/getopt_bsd.h + +BSD-3-Clause +src/frontend/com_wr_ic.c +src/frontend/com_wr_ic.h +src/frontend/get_avail_mem_size.c +src/frontend/inpcom.c + +src/frontend/inpcompat.c (BCD) +src/frontend/inpcompat.h (BCD) +src/frontend/inpc_probe.c +src/include/ngspice/sharedspice.h +src/misc/dstring.c +src/sharedspice.c +src/spicelib/analysis/optran.c +src/spicelib/devices/cpl/cpldelete.c +src/spicelib/devices/cpl/cplhash.c +src/spicelib/devices/cpl/cplhash.h +src/spicelib/devices/cpl/cplmdel.c +src/spicelib/devices/hicum2/ +src/spicelib/parser/inpgmod.c +src/winmain.c +src/xspice/icm/digital/d_process/cfunc.mod +src/xspice/icm/dlmain.c +src/xspice/icm/dlmain.h +src/xspice/icm/xtradev/pswitch/cfunc.mod +src/xspice/icm/xtradev/sidiode/cfunc.mod +src/xspice/icm/xtradev/sidiode/ifspec.ifs + + + +BSD-2-Clause +src/misc/getopt_long_bsd.c + +??? +examples/p-to-n-examples/MCP6041.txt + +??? +examples/probe/TLC555.LIB + +??? +src/frontend/commands.c + +??? +src/spicelib/devices/bsim3/B3TERMS_OF_USE +src/spicelib/devices/bsim3soi_dd/BsimTerms_use +src/spicelib/devices/bsim3soi_fd/BsimTerms_use +src/spicelib/devices/bsim3soi_pd/BsimTerms_use +src/spicelib/devices/bsim3v32/B3TERMS_OF_USE +src/spicelib/devices/bsim4/B4TERMS_OF_USEs +src/spicelib/devices/bsim4v5/B4TERMS_OF_USE +src/spicelib/devices/bsim4v6/B4TERMS_OF_USE +src/spicelib/devices/bsim4v7/B4TERMS_OF_USE +src/spicelib/devices/bsimsoi/BsimTerms_use + +??? +src/spicelib/devices/dev.c + +??? +src/spicelib/devices/hisim/ +src/spicelib/devices/hisimhv2/ + +??? +src/spicelib/devices/hisimhv1/ + + +??? +src/spicelib/devices/soi3/README + From 67864ee918e42db1b38bdfd52d5534bb0d723b62 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Mar 2024 15:08:49 +0900 Subject: [PATCH 15/41] once save --- License-analysis.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/License-analysis.txt b/License-analysis.txt index 9d8ae27..d5459fa 100644 --- a/License-analysis.txt +++ b/License-analysis.txt @@ -3,7 +3,7 @@ COPYING FAQ manal.pdf -??? +CC-BY-3.0 src/frontend/get_phys_mem_size.c src/frontend/get_resident_set_size.c @@ -86,7 +86,6 @@ src/xspice/icm/xtradev/sidiode/cfunc.mod src/xspice/icm/xtradev/sidiode/ifspec.ifs - BSD-2-Clause src/misc/getopt_long_bsd.c @@ -96,10 +95,11 @@ examples/p-to-n-examples/MCP6041.txt ??? examples/probe/TLC555.LIB -??? +NOT_IN_SPDX src/frontend/commands.c +src/spicelib/devices/dev.c -??? +NOT_IN_SPDX src/spicelib/devices/bsim3/B3TERMS_OF_USE src/spicelib/devices/bsim3soi_dd/BsimTerms_use src/spicelib/devices/bsim3soi_fd/BsimTerms_use @@ -111,11 +111,9 @@ src/spicelib/devices/bsim4v6/B4TERMS_OF_USE src/spicelib/devices/bsim4v7/B4TERMS_OF_USE src/spicelib/devices/bsimsoi/BsimTerms_use -??? -src/spicelib/devices/dev.c ??? -src/spicelib/devices/hisim/ +src/spicelib/devices/hisim2/ src/spicelib/devices/hisimhv2/ ??? From 7777750ae0ecaa0f13a424ed971bb09e73b2d959 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Jul 2024 20:47:27 +0900 Subject: [PATCH 16/41] Update to 43 --- ngspice-42-pointer-type-cast-c99.patch | 11 ----------- ngspice.spec | 14 ++++++-------- sources | 4 ++-- 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 ngspice-42-pointer-type-cast-c99.patch diff --git a/ngspice-42-pointer-type-cast-c99.patch b/ngspice-42-pointer-type-cast-c99.patch deleted file mode 100644 index 606505c..0000000 --- a/ngspice-42-pointer-type-cast-c99.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ngspice-42/src/tclspice.c.type 2023-12-28 03:58:03.000000000 +0900 -+++ ngspice-42/src/tclspice.c 2024-01-21 15:53:13.123052910 +0900 -@@ -2433,7 +2433,7 @@ tmeasure TCL_CMDPROCARGS(clientData, int - return TCL_ERROR; - } - -- wl = wl_build((char **)argv); -+ wl = wl_build((const char * const *)argv); - - get_measure2(wl, &mvalue, NULL, FALSE); - diff --git a/ngspice.spec b/ngspice.spec index 27d4d2c..aba11ad 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,9 +13,9 @@ %global userelease 1 %endif -%global majorver 42 +%global majorver 43 #%%global minorver 3 -%global docver 42 +%global docver 43 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -42,7 +42,7 @@ Name: ngspice Version: %{fedoraver} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -65,9 +65,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -# Fix compilation with C99 -Werror=incompatible-pointer-types -# https://sourceforge.net/p/ngspice/bugs/659/ -Patch1: ngspice-42-pointer-type-cast-c99.patch BuildRequires: make BuildRequires: gcc @@ -200,8 +197,6 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -%patch -P1 -p1 -b .type -git commit -m "Fix pointer cast for -Werror=incompatible-pointer-types" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -475,6 +470,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Jul 14 2024 Mamoru TASAKA - 43-1 +- Update to 43 + * Thu Jan 25 2024 Fedora Release Engineering - 42-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 1ec5334..71dd2a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-42.tar.gz) = 37fbabd8e537ac8efe02731e54a0c586588e48010a8022daeeb53442b8ebdf3f1ea866e8d6eb180c130cabba2ae6675bc8741208ad2a20091d2c753eec9b4d55 -SHA512 (ngspice-42-manual.pdf) = 9251231fb3e33e5961e10cd2d2317003bc3d72f211224f7db743fe6f80f20ef7f25daad84810b3869239d248a04e97dd6fa375416c6b0180370904fb5e5cdd74 +SHA512 (ngspice-43.tar.gz) = ad938e6ea8f9874c04d1033599bf39d3728e763fbd42ba77bd036b6c00271600695b3656f3f34547c39153382f55e7d7d5d6cb732f272d149cdbe21988c0d636 +SHA512 (ngspice-43-manual.pdf) = 01bd68983c10ca8ef2a399354290032a0e9a9881159a3781459c576e662efa91af403ef191e846694ef418a8aec3e867d8e916d8a41a6d616d3169daf22be444 From 5b35268337f087128887d6f654f0917bade379a4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:05:51 +0900 Subject: [PATCH 17/41] try sanitizer --- ngspice.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index aba11ad..84bc165 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,6 +19,8 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') +%global mainrelease 1 + %if 0%{?usegitbare} >= 1 # pre-master-42 %global gitcommit c87df54f24969de0c9d503c349258d9953ae208a @@ -36,13 +38,20 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif +%global use_gcc_strict_sanitize 1 + +%global flagrel %{nil} +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif + %bcond_with adms %undefine _changelog_trimtime Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: %{mainrelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -69,6 +78,10 @@ Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif BuildRequires: p7zip BuildRequires: readline-devel @@ -255,6 +268,12 @@ git commit -m "Execute autogen" -a || : chmod +x configure %build +%set_build_flags +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +%endif + %if 0%{?usegitbare} >= 1 cd %{name} %endif From 6fff1cbbaa6287c63a4cae31c70564343492d907 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:09:22 +0900 Subject: [PATCH 18/41] Revert "try sanitizer" This reverts commit 5b35268337f087128887d6f654f0917bade379a4. --- ngspice.spec | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 84bc165..aba11ad 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,8 +19,6 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrelease 1 - %if 0%{?usegitbare} >= 1 # pre-master-42 %global gitcommit c87df54f24969de0c9d503c349258d9953ae208a @@ -38,20 +36,13 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 1 - -%global flagrel %{nil} -%if 0%{?use_gcc_strict_sanitize} >= 1 -%global flagrel %{flagrel}.san -%endif - %bcond_with adms %undefine _changelog_trimtime Name: ngspice Version: %{fedoraver} -Release: %{mainrelease}%{?dist}%{flagrel} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -78,10 +69,6 @@ Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ -%if 0%{?use_gcc_strict_sanitize} -BuildRequires: libasan -BuildRequires: libubsan -%endif BuildRequires: p7zip BuildRequires: readline-devel @@ -268,12 +255,6 @@ git commit -m "Execute autogen" -a || : chmod +x configure %build -%set_build_flags -%if 0%{?use_gcc_strict_sanitize} -export CC="${CC} -fsanitize=address -fsanitize=undefined" -export CXX="${CXX} -fsanitize=address -fsanitize=undefined" -%endif - %if 0%{?usegitbare} >= 1 cd %{name} %endif From d4acaf30dc19d6c878e492514ceb526af24bd0e8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:10:05 +0900 Subject: [PATCH 19/41] try sanitizer --- ngspice.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index aba11ad..84bc165 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,6 +19,8 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') +%global mainrelease 1 + %if 0%{?usegitbare} >= 1 # pre-master-42 %global gitcommit c87df54f24969de0c9d503c349258d9953ae208a @@ -36,13 +38,20 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif +%global use_gcc_strict_sanitize 1 + +%global flagrel %{nil} +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif + %bcond_with adms %undefine _changelog_trimtime Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: %{mainrelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -69,6 +78,10 @@ Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif BuildRequires: p7zip BuildRequires: readline-devel @@ -255,6 +268,12 @@ git commit -m "Execute autogen" -a || : chmod +x configure %build +%set_build_flags +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +%endif + %if 0%{?usegitbare} >= 1 cd %{name} %endif From 40044a3b31716f608c54ce75c5c46b8b9743c502 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:15:41 +0900 Subject: [PATCH 20/41] disable leak check --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index 84bc165..466341e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -444,6 +444,8 @@ chmod +x %{buildroot}%{_libdir}/ngspice/*.cm chmod +x %{buildroot}%{_libdir}/tclspice/ngspice/*.cm %check +export ASAN_OPTIONS=detect_leaks=0 + %if 0%{?usegitbare} >= 1 cd %{name} %endif From ae3eb82b5560a9d5f78a5c4cad1ca69a5ce2b45a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 09:38:38 +0900 Subject: [PATCH 21/41] suppress leak detection even for %%build --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index 466341e..0db57ba 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -272,6 +272,8 @@ chmod +x configure %if 0%{?use_gcc_strict_sanitize} export CC="${CC} -fsanitize=address -fsanitize=undefined" export CXX="${CXX} -fsanitize=address -fsanitize=undefined" + +export ASAN_OPTIONS=detect_leaks=0 %endif %if 0%{?usegitbare} >= 1 From f1b82bc108e01700896b17106622caa31a9d2faa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 16 Jul 2024 17:05:29 +0900 Subject: [PATCH 22/41] Apply upstream patch for fixing one byte ahead access in string manipulation --- ...x-one-byte-ahead-access-in-dup_strin.patch | 28 +++++++++++++++++++ ngspice.spec | 15 ++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch diff --git a/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch b/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch new file mode 100644 index 0000000..fc577ad --- /dev/null +++ b/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch @@ -0,0 +1,28 @@ +From 38f6bbe5ec0bc77fcf4f564e716acd23372cef3a Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Tue, 16 Jul 2024 15:52:09 +0900 +Subject: [PATCH] misc/string.c: fix one byte ahead access in dup_string + +In dup_string in misc/string.c , even if the destination +buffer is allocated with n_char bytes, +the source buffer `str` can be accessed up to only n_char bytes. +--- + src/misc/string.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/misc/string.c b/src/misc/string.c +index 1374607da..97acd9c92 100644 +--- a/src/misc/string.c ++++ b/src/misc/string.c +@@ -78,7 +78,7 @@ char *dup_string(const char *str, size_t n_char) + char *p = TMALLOC(char, n_char + 1); + + if (p != NULL) { +- (void) memcpy(p, str, n_char + 1); ++ (void) memcpy(p, str, n_char); + p[n_char] = '\0'; + } + return p; +-- +2.45.2 + diff --git a/ngspice.spec b/ngspice.spec index 0db57ba..ab02007 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrelease 1 +%global baserelease 2 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -38,7 +38,7 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global flagrel %{nil} %if 0%{?use_gcc_strict_sanitize} >= 1 @@ -51,7 +51,7 @@ Name: ngspice Version: %{fedoraver} -Release: %{mainrelease}%{?dist}%{flagrel} +Release: %{baserelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -74,6 +74,11 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +# https://sourceforge.net/p/ngspice/bugs/679/ +# https://sourceforge.net/p/ngspice/ngspice/merge-requests/19/ +# misc/string.c: fix one byte ahead access in dup_string +Patch19: MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch + BuildRequires: make BuildRequires: gcc @@ -210,6 +215,7 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +cat %PATCH19 | git am # make sure the examples are UTF-8... for nonUTF8 in \ @@ -493,6 +499,9 @@ popd %{_includedir}/ngspice/ %changelog +* Tue Jul 16 2024 Mamoru TASAKA - 43-2 +- Apply upstream patch for fixing one byte ahead access in string manipulation + * Sun Jul 14 2024 Mamoru TASAKA - 43-1 - Update to 43 From 17e99c1c4777e6cc7f4ce6c32011f36179f1610e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:31:30 +0000 Subject: [PATCH 23/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index ab02007..bfff8a3 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 2 +%global baserelease 3 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -499,6 +499,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 43-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 16 2024 Mamoru TASAKA - 43-2 - Apply upstream patch for fixing one byte ahead access in string manipulation From 25e3b84421693d2cb091410dd955c9c6e552102e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 12:10:23 +0200 Subject: [PATCH 24/41] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ngspice.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index bfff8a3..1f6bb91 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 4 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -55,7 +55,8 @@ Release: %{baserelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://ngspice.sourceforge.net %if 0%{?userelease} >= 1 @@ -499,6 +500,9 @@ popd %{_includedir}/ngspice/ %changelog +* Mon Sep 2 2024 Miroslav Suchý - 43-4 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 43-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4a58d05773c02e5ab3071f13213c815f77bcda82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 31 Dec 2024 09:25:03 +0900 Subject: [PATCH 25/41] Update to 44 --- ...x-one-byte-ahead-access-in-dup_strin.patch | 28 ------------------- ngspice.spec | 22 +++++++++------ sources | 4 +-- 3 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch diff --git a/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch b/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch deleted file mode 100644 index fc577ad..0000000 --- a/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 38f6bbe5ec0bc77fcf4f564e716acd23372cef3a Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Tue, 16 Jul 2024 15:52:09 +0900 -Subject: [PATCH] misc/string.c: fix one byte ahead access in dup_string - -In dup_string in misc/string.c , even if the destination -buffer is allocated with n_char bytes, -the source buffer `str` can be accessed up to only n_char bytes. ---- - src/misc/string.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/misc/string.c b/src/misc/string.c -index 1374607da..97acd9c92 100644 ---- a/src/misc/string.c -+++ b/src/misc/string.c -@@ -78,7 +78,7 @@ char *dup_string(const char *str, size_t n_char) - char *p = TMALLOC(char, n_char + 1); - - if (p != NULL) { -- (void) memcpy(p, str, n_char + 1); -+ (void) memcpy(p, str, n_char); - p[n_char] = '\0'; - } - return p; --- -2.45.2 - diff --git a/ngspice.spec b/ngspice.spec index 1f6bb91..1c9fc86 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,13 +13,13 @@ %global userelease 1 %endif -%global majorver 43 +%global majorver 44 #%%global minorver 3 -%global docver 43 +%global docver 44 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 4 +%global baserelease 1 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -75,10 +75,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -# https://sourceforge.net/p/ngspice/bugs/679/ -# https://sourceforge.net/p/ngspice/ngspice/merge-requests/19/ -# misc/string.c: fix one byte ahead access in dup_string -Patch19: MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch BuildRequires: make @@ -112,6 +108,7 @@ BuildRequires: flex BuildRequires: ImageMagick BuildRequires: mot-adms +BuildRequires: xorg-x11-server-Xvfb BuildRequires: git Requires: %{name}-codemodel%{?_isa} = %{version}-%{release} @@ -216,7 +213,6 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -cat %PATCH19 | git am # make sure the examples are UTF-8... for nonUTF8 in \ @@ -241,6 +237,7 @@ git commit -m "Fix permission" -a || : # Move spinit directory to arch-dependent sed -i configure.ac -e '\@AC_DEFINE_UNQUOTED.*NGSPICEDATADIR@s|echo .dprefix/share/ngspice|echo %{_libdir}/ngspice|' +sed -i configure.ac -e '\@AC_DEFINE_UNQUOTED.*NGSPICELIBDIR@s|echo .dprefix/share/ngspice|echo %{_libdir}/ngspice|' sed -i src/misc/ivars.c -e 's|\(["/]\)share/ngspice|\1%_lib/ngspice|' sed -i src/misc/ivars.c -e 's|\(["/]\)lib/ngspice|\1%_lib/ngspice|' grep -rl "(pkgdatadir)/" . | xargs sed -i -e 's|(pkgdatadir)/|(pkglibdir)/|' @@ -467,12 +464,15 @@ mkdir USERPROFILE echo "set ngbehavior=mc" > USERPROFILE/spice.rc export USERPROFILE=$(pwd)/USERPROFILE -make check +xvfb-run \ + -s "-screen 0 640x480x24" \ + make check popd %files %{_bindir}/* +%{_libdir}/%{name}/ivlng.* %{_mandir}/man1/* %doc %{_pkgdocdir} %license COPYING @@ -484,6 +484,7 @@ popd %{_libdir}/tclspice/libspice*.so* %{_libdir}/tclspice/%{name}/*.cm %{_libdir}/tclspice/%{name}/*.tcl +%{_libdir}/tclspice/%{name}/ivlng.* %{_libdir}/tclspice/%{name}/scripts/ %files codemodel @@ -500,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Mon Dec 30 2024 Mamoru TASAKA - 44-1 +- Update to 44 + * Mon Sep 2 2024 Miroslav Suchý - 43-4 - convert license to SPDX diff --git a/sources b/sources index 71dd2a7..ec8db21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-43.tar.gz) = ad938e6ea8f9874c04d1033599bf39d3728e763fbd42ba77bd036b6c00271600695b3656f3f34547c39153382f55e7d7d5d6cb732f272d149cdbe21988c0d636 -SHA512 (ngspice-43-manual.pdf) = 01bd68983c10ca8ef2a399354290032a0e9a9881159a3781459c576e662efa91af403ef191e846694ef418a8aec3e867d8e916d8a41a6d616d3169daf22be444 +SHA512 (ngspice-44.tar.gz) = 63fc2dd0827dc2dba092b583bf46c97fece3cbdb2f2645a2e1972ca03f5b93b0191e3b65fe0c01abe2ae13355aaec9df0ef18b52e964c3050c5a09e126561a51 +SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From caa9d840f884fc01b87d99ae39c0117a457404ea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Jan 2025 11:16:18 +0900 Subject: [PATCH 26/41] 44.2 --- ngspice.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 1c9fc86..b65e603 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -14,7 +14,7 @@ %endif %global majorver 44 -#%%global minorver 3 +%global minorver 2 %global docver 44 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -60,7 +60,7 @@ License: LicenseRef-Callaway-BSD URL: http://ngspice.sourceforge.net %if 0%{?userelease} >= 1 -Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-%{majorver}.tar.gz +Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}%{?minorver:.%minorver}/ngspice-%{majorver}%{?minorver:.%minorver}.tar.gz %endif %if 0%{?usegitbare} >= 1 Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz @@ -173,7 +173,7 @@ developing applications that use libngspice. %prep %if 0%{?userelease} >= 1 -%setup -q -n %{name}-%{majorver} +%setup -q -n %{name}-%{majorver}%{?minorver:.%minorver} git init git config user.name "%{name} maintainer" git config user.email "%{name}-maintainers@fedoraproject.org" @@ -429,7 +429,7 @@ cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_libdir}/%{name} # Ensuring that all docs are under %%{_pkgdocdir} mkdir -p %{buildroot}%{_pkgdocdir} cp -pr examples/ %{buildroot}%{_pkgdocdir} -install -cpm 0644 %{SOURCE1} %{buildroot}%{_pkgdocdir}/%{name}-%{version}.pdf +install -cpm 0644 %{SOURCE1} %{buildroot}%{_pkgdocdir}/%{name}-%{majorver}.pdf cp -a \ Stuarts_Poly_Notes \ @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Jan 12 2025 Mamoru TASAKA - 44.2-1 +- Update to 44.2 + * Mon Dec 30 2024 Mamoru TASAKA - 44-1 - Update to 44 diff --git a/sources b/sources index ec8db21..2000db3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-44.tar.gz) = 63fc2dd0827dc2dba092b583bf46c97fece3cbdb2f2645a2e1972ca03f5b93b0191e3b65fe0c01abe2ae13355aaec9df0ef18b52e964c3050c5a09e126561a51 +SHA512 (ngspice-44.2.tar.gz) = b6cccf38d460f9aace5379db3b75c247b3aed04b902a2355e27b4ee3a64206b0ac8828c8685da3bf8e57c0746c10f39418849a4f31563e9f5ff7c05de0eb3ae2 SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 059e3a9a41d44f55144c4894f972a9bda1967b9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:07:59 +0000 Subject: [PATCH 27/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index b65e603..c4d197c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 1 +%global baserelease 2 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 44.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Mamoru TASAKA - 44.2-1 - Update to 44.2 From 1c82df6d52e719ea7fe3bbe36b8dd11b1ece9f3a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 31 Jan 2025 10:45:43 +0900 Subject: [PATCH 28/41] Use tk8 explicitly --- ngspice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c4d197c..2279be4 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 2 +%global baserelease 3 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -141,7 +141,7 @@ It can be used for VLSI simulations as well. %package -n tclspice Summary: Tcl/Tk interface for ngspice -BuildRequires: tk-devel +BuildRequires: pkgconfig(tk) <= 8.999 BuildRequires: blt-devel %description -n tclspice @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Jan 31 2025 Mamoru TASAKA - 44.2-3 +- Use tk8 explicitly + * Fri Jan 17 2025 Fedora Release Engineering - 44.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0e77794acae1165ada34b3e90300795e172e7091 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 28 May 2024 23:35:14 -0400 Subject: [PATCH 29/41] Fix flatpak build Installation path macros cannot be used to specify dependency locations. Tcl is part of the runtime and is in /usr even when building flatpaks for /app. BLT is not built for flatpaks (only tclspice needs it), and therefore the buildroot /usr version is used. --- ngspice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 2279be4..a5e56b6 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -222,7 +222,7 @@ for nonUTF8 in \ ChangeLog \ %{nil} do - %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv + iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv %{__mv} -f $nonUTF8.conv $nonUTF8 done git commit -m "Change files to UTF8" -a @@ -286,7 +286,7 @@ cd %{name} # ---- Tclspice ---------------------------------------------------------------- # Adding BLT support -export CFLAGS="%{optflags} -I%{_includedir}/blt" +export CFLAGS="%{optflags} -I$(pkg-config --variable=includedir tcl)/blt" # Make builddir for tclspice %{__mkdir} -p tclspice @@ -326,7 +326,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --enable-predictor \ --enable-shared \ --with-readline=yes \ - --with-tcl=%{_libdir}/ \ + --with-tcl=$(pkg-config --variable=libdir tcl) \ --libdir=%{_libdir}/tclspice \ %{nil} From c483836b6d5049ba34e7b5ea5d49fc570753f107 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:50:19 +0000 Subject: [PATCH 30/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index a5e56b6..3aa7739 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 4 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 44.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 31 2025 Mamoru TASAKA - 44.2-3 - Use tk8 explicitly From 68df1ef9f25a38ef73780488e243146df2a81e90 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 25 Jul 2025 17:22:00 +0900 Subject: [PATCH 31/41] update to the latest git --- ngspice.spec | 18 +++++++++--------- sources | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index a5e56b6..228a891 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -19,16 +19,16 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 1 %if 0%{?usegitbare} >= 1 -# pre-master-42 -%global gitcommit c87df54f24969de0c9d503c349258d9953ae208a -%global gitdate 20231111 +# pre-master-45 +%global gitcommit 35898d186da7d303704a55ad4096b47fd658dd5c +%global gitdate 20250723 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231112 -%global tarballtime 1636 +%global tarballdate 20250724 +%global tarballtime 2037 %endif %if 0%{?userelease} >= 1 @@ -38,7 +38,7 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global flagrel %{nil} %if 0%{?use_gcc_strict_sanitize} >= 1 diff --git a/sources b/sources index 2000db3..41649ee 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ngspice-44.2.tar.gz) = b6cccf38d460f9aace5379db3b75c247b3aed04b902a2355e27b4ee3a64206b0ac8828c8685da3bf8e57c0746c10f39418849a4f31563e9f5ff7c05de0eb3ae2 -SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b +SHA512 (ngspice-20250724T2037.tar.gz) = 2a24a01d5cc00cfa06abc61fcbfce536df53632d67bd61e331d132e2e5ae2c9f80f9d341107fd48e1fa62d5e7453c100bad001cc17282970a5682aa7513d05c6 From 460429b7d76be0fe2687fc5a92c53f4b1c575efd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 25 Jul 2025 18:05:04 +0900 Subject: [PATCH 32/41] again add pdf to source --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 41649ee..2b8c4a6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (ngspice-20250724T2037.tar.gz) = 2a24a01d5cc00cfa06abc61fcbfce536df53632d67bd61e331d132e2e5ae2c9f80f9d341107fd48e1fa62d5e7453c100bad001cc17282970a5682aa7513d05c6 +SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From cdb9c3a5f2f78cf27d65be5f238bf6c3af446258 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 1 Aug 2025 17:07:59 +0900 Subject: [PATCH 33/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 228a891..2cb04e8 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit 35898d186da7d303704a55ad4096b47fd658dd5c -%global gitdate 20250723 +%global gitcommit b5ac0118b4c934cc31a6b7aacfa31b09253652a7 +%global gitdate 20250730 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250724 -%global tarballtime 2037 +%global tarballdate 20250801 +%global tarballtime 1658 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 2b8c4a6..af6b1a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250724T2037.tar.gz) = 2a24a01d5cc00cfa06abc61fcbfce536df53632d67bd61e331d132e2e5ae2c9f80f9d341107fd48e1fa62d5e7453c100bad001cc17282970a5682aa7513d05c6 +SHA512 (ngspice-20250801T1658.tar.gz) = 2b32f6e1b453c206114645942ee8e4a387929a51be351bf78b2722c361faaf3acd62c7e38190a6a4694fbee81108d6f7cad17baa903dd3bc148ae0415a1f9b3a SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 27044e6b403efa7ed5f8b599f33a6f8fdd0dea45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Aug 2025 16:48:47 +0900 Subject: [PATCH 34/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 2cb04e8..a749fae 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit b5ac0118b4c934cc31a6b7aacfa31b09253652a7 -%global gitdate 20250730 +%global gitcommit e5e46c8782aaeaf80c8c3c9b9eb3a063c35461d5 +%global gitdate 20250803 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250801 -%global tarballtime 1658 +%global tarballdate 20250805 +%global tarballtime 1520 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index af6b1a8..104a48b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250801T1658.tar.gz) = 2b32f6e1b453c206114645942ee8e4a387929a51be351bf78b2722c361faaf3acd62c7e38190a6a4694fbee81108d6f7cad17baa903dd3bc148ae0415a1f9b3a +SHA512 (ngspice-20250805T1520.tar.gz) = 2fc1f65b86ed7ee74841c47a4b3c01a1425f34541b7dc7424e90512febdf293a9e0020df6792ad608c61859d6f1f5e869c1eaf1fa306169cecf065577a823c95 SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From fdc6a110fd46058a155512a15af3e9eed25cdbdb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Aug 2025 22:20:00 +0900 Subject: [PATCH 35/41] enable parallel make --- ngspice.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index a749fae..e4b0063 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -330,7 +330,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --libdir=%{_libdir}/tclspice \ %{nil} -%{__make} -k +%make_build -k # Once install to the temp dir rm -rf $(pwd)/../INST-TCLSPICE %{__make} INSTALL="install -p" install DESTDIR=$(pwd)/../INST-TCLSPICE @@ -372,8 +372,7 @@ do %{nil} %{__make} clean -# No parallel make -%{__make} -k +%make_build -k # Once install to the temp dir rm -rf $(pwd)/INST-NGSPICE-${opt} %{__make} INSTALL="install -p" install DESTDIR=$(pwd)/INST-NGSPICE-${opt} From 4db0e42cc195171c9b798d21e18044e292a31312 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Aug 2025 23:23:35 +0900 Subject: [PATCH 36/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index e4b0063..57da658 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit e5e46c8782aaeaf80c8c3c9b9eb3a063c35461d5 -%global gitdate 20250803 +%global gitcommit b44421749abfa61c5df87094d2479b1b90ebed91 +%global gitdate 20250805 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250805 -%global tarballtime 1520 +%global tarballdate 20250811 +%global tarballtime 2318 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 104a48b..c4a2794 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250805T1520.tar.gz) = 2fc1f65b86ed7ee74841c47a4b3c01a1425f34541b7dc7424e90512febdf293a9e0020df6792ad608c61859d6f1f5e869c1eaf1fa306169cecf065577a823c95 +SHA512 (ngspice-20250811T2318.tar.gz) = 521392e8f456f06b454a7974ee19870cd605510b3581896a8f9eb74e8f1b7c3058b4f6d4b99d2339cc1735059ce0750e209820aefbcd8ed508e89bf8c07da916 SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 2d31bd5d93fd2d21f6956cddfbf26c85eb9ceaf2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 14 Aug 2025 18:25:08 +0900 Subject: [PATCH 37/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 57da658..c2aa360 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit b44421749abfa61c5df87094d2479b1b90ebed91 -%global gitdate 20250805 +%global gitcommit e6427cedc2738bed22480f069f96cd05a710ceb7 +%global gitdate 20250813 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250811 -%global tarballtime 2318 +%global tarballdate 20250814 +%global tarballtime 1813 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index c4a2794..fdaf7cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250811T2318.tar.gz) = 521392e8f456f06b454a7974ee19870cd605510b3581896a8f9eb74e8f1b7c3058b4f6d4b99d2339cc1735059ce0750e209820aefbcd8ed508e89bf8c07da916 +SHA512 (ngspice-20250814T1813.tar.gz) = 9491671bf001d63922d4c99b73cec700570aaf105da9df36c19212ee9f5ab5f230c0a3c2af364efe0ba02eaffd2ef5012189bbaa6d7a16ab405d2d2a2363127c SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 956e54007c28204666a3011111452b70e5aa4115 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Aug 2025 15:47:43 +0900 Subject: [PATCH 38/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c2aa360..355689f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit e6427cedc2738bed22480f069f96cd05a710ceb7 -%global gitdate 20250813 +%global gitcommit 5139cbb36c4a6884b9c41ef0dfb1f761bda88009 +%global gitdate 20250818 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250814 -%global tarballtime 1813 +%global tarballdate 20250824 +%global tarballtime 1539 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index fdaf7cf..eb7cd82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250814T1813.tar.gz) = 9491671bf001d63922d4c99b73cec700570aaf105da9df36c19212ee9f5ab5f230c0a3c2af364efe0ba02eaffd2ef5012189bbaa6d7a16ab405d2d2a2363127c +SHA512 (ngspice-20250824T1539.tar.gz) = 1cba17a6b4eea30a03ed36c617779be9c2da14bdd99149036118b1d8b0ec4bb899b8f082c6e6b9a659e507564e28e89db465992aa757df94f578877f4d1109af SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From ca6de1b4cee738ad93c389f9ed2f094602bbfe80 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Aug 2025 22:26:09 +0900 Subject: [PATCH 39/41] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 355689f..ff7b347 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit 5139cbb36c4a6884b9c41ef0dfb1f761bda88009 -%global gitdate 20250818 +%global gitcommit 1d0beb5e266420b1dd756913356a295ddb60fdce +%global gitdate 20250830 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250824 -%global tarballtime 1539 +%global tarballdate 20250831 +%global tarballtime 2034 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index eb7cd82..9a320fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250824T1539.tar.gz) = 1cba17a6b4eea30a03ed36c617779be9c2da14bdd99149036118b1d8b0ec4bb899b8f082c6e6b9a659e507564e28e89db465992aa757df94f578877f4d1109af +SHA512 (ngspice-20250831T2034.tar.gz) = accb8f04603b7b3a1022b424ffa147716c9e63f4ed42079d03f7ab8c04dc59ea2f335084e055314a9d2be138fa04cb8e334c18f1bee62c18e1f355f74e0ea1ab SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 9ba8a88ec405a8372a21ba950c0dd747638fe1c7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Sep 2025 17:31:37 +0900 Subject: [PATCH 40/41] Update to 45 --- ngspice.spec | 15 +++++++++------ sources | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index ff7b347..b9db830 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,17 +5,17 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global majorver 44 -%global minorver 2 -%global docver 44 +%global majorver 45 +%dnl %global minorver 2 +%global docver 45 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -38,7 +38,7 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global flagrel %{nil} %if 0%{?use_gcc_strict_sanitize} >= 1 @@ -500,6 +500,9 @@ popd %{_includedir}/ngspice/ %changelog +* Tue Sep 02 2025 Mamoru TASAKA - 45-1 +- Update to 45 + * Fri Jan 31 2025 Mamoru TASAKA - 44.2-3 - Use tk8 explicitly diff --git a/sources b/sources index 9a320fd..4f86b89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250831T2034.tar.gz) = accb8f04603b7b3a1022b424ffa147716c9e63f4ed42079d03f7ab8c04dc59ea2f335084e055314a9d2be138fa04cb8e334c18f1bee62c18e1f355f74e0ea1ab -SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b +SHA512 (ngspice-45.tar.gz) = a23f41e84d6662aeb33e025693ebf5d77fc430ef39a9c8221fabb825b9163a48815edc5de7aa22ec7a0222d00ba34da1e827a2ba74e88329df6d0bb192a57d17 +SHA512 (ngspice-45-manual.pdf) = 425d9320a01d409c7baab83d111f92643cae7df62a109e06d7e4fd366262441f4fdd62532db63fb4d4af4cb98e478b4f9fca5bd6c63fb89507dba685220f34ab From 604180f0307648b466128412eb5b13e35aadd280 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 7 Sep 2025 22:51:06 +0900 Subject: [PATCH 41/41] 45.2 --- ngspice.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 54d1298..61b80f7 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -14,7 +14,7 @@ %endif %global majorver 45 -%dnl %global minorver 2 +%global minorver 2 %global docver 45 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -500,6 +500,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Sep 07 2025 Mamoru TASAKA - 45.2-1 +- Update to 45.2 + * Tue Sep 02 2025 Mamoru TASAKA - 45-1 - Update to 45 diff --git a/sources b/sources index 4f86b89..a6f3db9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-45.tar.gz) = a23f41e84d6662aeb33e025693ebf5d77fc430ef39a9c8221fabb825b9163a48815edc5de7aa22ec7a0222d00ba34da1e827a2ba74e88329df6d0bb192a57d17 +SHA512 (ngspice-45.2.tar.gz) = 4090e9433457c0b49dc1e7561bc630a5c6a340391f26be8142c6bd514ae13b72137589964fe9ae5a01069c9de7d8457bd41b0811a335b2c93a3c6e07044b35b1 SHA512 (ngspice-45-manual.pdf) = 425d9320a01d409c7baab83d111f92643cae7df62a109e06d7e4fd366262441f4fdd62532db63fb4d4af4cb98e478b4f9fca5bd6c63fb89507dba685220f34ab