Fix: Several fixes and additions from now reverted PR (#2828)

terrapkg · Dec 31, 2024 · df802b1 · df802b1
1 parent 1b80498
commit df802b1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 98 deletions.
diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec
@@ -1,31 +1,21 @@
-%global commit 478fe3917c2882a1c321f9d1eec808b71698974d
+%global commit 3f7c3afaf947280bd2852626ff4599c02d9fb07e
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date 20241231
 
 Name:           ghostty-nightly
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        A fast, native terminal emulator written in Zig; this is the Tip (nightly) build
+Version:        %{commit_date}.%{shortcommit}
+Release:        2%{?dist}
+Summary:        A fast, native terminal emulator written in Zig; this is the Tip (nightly) build.
 License:        MIT
 URL:            https://ghostty.org/
 Source0:        https://github.com/ghostty-org/ghostty/archive/%{commit}/ghostty-%{commit}.tar.gz
-#Patch0:         pkgconfig-libadwaita-1.diff
-#Patch1:         use-pkg-config.diff
-Patch2:         no-strip.diff
-BuildRequires:  zig
-BuildRequires:  gtk4-devel libadwaita-devel
+Patch0:         no-strip.diff
+BuildRequires:  gtk4-devel
+BuildRequires:  libadwaita-devel
+BuildRequires:  ncurses
+BuildRequires:  ncurses-devel
 BuildRequires:  pandoc-cli
-#BuildRequires:  pkg-config
-#BuildRequires:  pkgconfig(harfbuzz)
-#BuildRequires:  pkgconfig(fontconfig)
-#BuildRequires:  pkgconfig(libpng)
-#BuildRequires:  pkgconfig(zlib)
-#BuildRequires:  pkgconfig(oniguruma)
-#BuildRequires:  pkgconfig(glslang)
-# Not in Fedora
-#BuildRequires:  pkgconfig(spirv-cross)
-#BuildRequires:  pkgconfig(simdutf)
-#BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  zig
 Requires:       %{name}-terminfo = %{version}-%{release}
 Requires:       %{name}-shell-integration = %{version}-%{release}
 Requires:       fontconfig
@@ -47,7 +37,6 @@ Packager:       ShinyGil <rockgrub@protonmail.com>
 
 %package        bash-completion
 Summary:        Ghostty Bash completion
-Requires:       %{name}
 Requires:       bash-completion
 Supplements:    (%{name} and bash-completion)
 
@@ -56,7 +45,6 @@ Supplements:    (%{name} and bash-completion)
 
 %package        fish-completion
 Summary:        Ghostty Fish completion
-Requires:       %{name}
 Requires:       fish
 Supplements:    (%{name} and fish)
 
@@ -65,7 +53,6 @@ Supplements:    (%{name} and fish)
 
 %package        zsh-completion
 Summary:        Ghostty Zsh completion
-Requires:       %{name}
 Requires:       zsh
 Supplements:    (%{name} and zsh)
 
@@ -74,15 +61,13 @@ Supplements:    (%{name} and zsh)
 
 %package        shell-integration
 Summary:        Ghostty shell integration
-Requires:       %{name}
 Supplements:    %{name}
 
 %description    shell-integration
 %summary.
 
 %package        terminfo
 Summary:        Ghostty terminfo
-Requires:       %{name}
 Supplements:    %{name}
 
 %description    terminfo
@@ -98,6 +83,7 @@ zig build \
     --summary all \
     -Doptimize=ReleaseFast --release=fast \
     --prefix %{buildroot}%{_prefix} --verbose \
+    -Dcpu=baseline \
     -Dpie=true \
     -Demit-docs
 
@@ -124,6 +110,7 @@ zig build \
 %_iconsdir/hicolor/256x256/apps/com.mitchellh.ghostty.png
 %_iconsdir/hicolor/256x256@2/apps/com.mitchellh.ghostty.png
 %_iconsdir/hicolor/512x512/apps/com.mitchellh.ghostty.png
+%_iconsdir/hicolor/1024x1024/apps/com.mitchellh.ghostty.png
 %_mandir/man1/ghostty.1.gz
 %_mandir/man5/ghostty.5.gz
 
@@ -153,3 +140,7 @@ zig build \
 %changelog
 * Thu Dec 26 2024 ShinyGil <rockgrub@protonmail.com>
 - Initial package
+* Tue Dec 31 2024 ShinyGil <rockgrub@protonmail.com>
+- Update to 20241231.3f7c3af
+    * High CVE-2003-0063: Allows execution of arbitrary commands
+    * Medium CVE-2003-0070: Allows execution of arbitrary commands
diff --git a/anda/devs/ghostty/nightly/pkgconfig-libadwaita-1.diff b/anda/devs/ghostty/nightly/pkgconfig-libadwaita-1.diff
diff --git a/anda/devs/ghostty/nightly/use-pkg-config.diff b/anda/devs/ghostty/nightly/use-pkg-config.diff
diff --git a/anda/devs/ghostty/stable/ghostty.spec b/anda/devs/ghostty/stable/ghostty.spec
@@ -1,27 +1,17 @@
 Name:           ghostty
 Version:        1.0.1
-Release:        1%?dist
-Summary:        A fast, native terminal emulator written in Zig
+Release:        2%{?dist}
+Summary:        A fast, native terminal emulator written in Zig.
 License:        MIT
 URL:            https://ghostty.org/
 Source0:        https://release.files.ghostty.org/%{version}/ghostty-source.tar.gz
-#Patch0:         pkgconfig-libadwaita-1.diff
-#Patch1:         use-pkg-config.diff
-Patch2:         no-strip.diff
-BuildRequires:  zig
-BuildRequires:  gtk4-devel libadwaita-devel
+Patch0:         no-strip.diff
+BuildRequires:  gtk4-devel
+BuildRequires:  libadwaita-devel
+BuildRequires:  ncurses
+BuildRequires:  ncurses-devel
 BuildRequires:  pandoc-cli
-#BuildRequires:  pkg-config
-#BuildRequires:  pkgconfig(harfbuzz)
-#BuildRequires:  pkgconfig(fontconfig)
-#BuildRequires:  pkgconfig(libpng)
-#BuildRequires:  pkgconfig(zlib)
-#BuildRequires:  pkgconfig(oniguruma)
-#BuildRequires:  pkgconfig(glslang)
-# Not in Fedora
-#BuildRequires:  pkgconfig(spirv-cross)
-#BuildRequires:  pkgconfig(simdutf)
-#BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  zig
 Requires:       %{name}-terminfo = %{version}-%{release}
 Requires:       %{name}-shell-integration = %{version}-%{release}
 Requires:       fontconfig
@@ -42,7 +32,6 @@ Packager:       ShinyGil <rockgrub@protonmail.com>
 
 %package        bash-completion
 Summary:        Ghostty Bash completion
-Requires:       %{name}
 Requires:       bash-completion
 Supplements:    (%{name} and bash-completion)
 
@@ -51,7 +40,6 @@ Supplements:    (%{name} and bash-completion)
 
 %package        fish-completion
 Summary:        Ghostty Fish completion
-Requires:       %{name}
 Requires:       fish
 Supplements:    (%{name} and fish)
 
@@ -60,7 +48,6 @@ Supplements:    (%{name} and fish)
 
 %package        zsh-completion
 Summary:        Ghostty Zsh completion
-Requires:       %{name}
 Requires:       zsh
 Supplements:    (%{name} and zsh)
 
@@ -69,15 +56,13 @@ Supplements:    (%{name} and zsh)
 
 %package        shell-integration
 Summary:        Ghostty shell integration
-Requires:       %{name}
 Supplements:    %{name}
 
 %description    shell-integration
 %summary.
 
 %package        terminfo
 Summary:        Ghostty terminfo
-Requires:       %{name}
 Supplements:    %{name}
 
 %description    terminfo
@@ -120,6 +105,7 @@ zig build \
 %_iconsdir/hicolor/256x256/apps/com.mitchellh.ghostty.png
 %_iconsdir/hicolor/256x256@2/apps/com.mitchellh.ghostty.png
 %_iconsdir/hicolor/512x512/apps/com.mitchellh.ghostty.png
+%_iconsdir/hicolor/1024x1024/apps/com.mitchellh.ghostty.png
 %_mandir/man1/ghostty.1.gz
 %_mandir/man5/ghostty.5.gz
 
@@ -149,3 +135,7 @@ zig build \
 %changelog
 * Thu Dec 26 2024 ShinyGil <rockgrub@protonmail.com>
 - Initial package
+* Tue Dec 31 2024 ShinyGil <rockgrub@protonmail.com>
+- Update to 1.0.1
+    * High CVE-2003-0063: Allows execution of arbitrary commands
+    * Medium CVE-2003-0070: Allows execution of arbitrary commands
diff --git a/anda/devs/ghostty/stable/pkgconfig-libadwaita-1.diff b/anda/devs/ghostty/stable/pkgconfig-libadwaita-1.diff
diff --git a/anda/devs/ghostty/stable/use-pkg-config.diff b/anda/devs/ghostty/stable/use-pkg-config.diff