ExcludeArch: %{ix86}

Signed-off-by: Dave Cantrell <dcantrell@redhat.com>

sources

@@ -1 +1 @@
-8f2e41f3f7eaa8543a2440454637f3c3  x11-ssh-askpass-1.2.4.1.tar.gz
+SHA512 (x11-ssh-askpass-1.2.4.1.tar.gz) = 293c0bc623400d3359a920eca491930daa110685936cfcaf9eea07e439fc29de64413f4df4a18523cd8fdfce44794c55d7e3abafb904e8e90891b22d38f01a2f

x11-ssh-askpass-1.2.4.1-gcc-14.x-warnings.patch

@@ -0,0 +1,34 @@
+diff -up x11-ssh-askpass-1.2.4.1/dynlist.c.orig x11-ssh-askpass-1.2.4.1/dynlist.c
+--- x11-ssh-askpass-1.2.4.1/dynlist.c.orig	2024-06-03 10:49:57.507301439 -0400
++++ x11-ssh-askpass-1.2.4.1/dynlist.c	2024-06-03 10:58:55.209151568 -0400
+@@ -92,7 +92,7 @@ int append_to_buf(char **buf, unsigned c
+         {
+           return(APPEND_FAILURE);
+         }
+-       *buf_rnd = tmp_buf;
++       *buf_rnd = (unsigned char *) tmp_buf;
+ #ifdef DEBUG
+        printf("-->Allocated buffer of size %d\n", *buflen);
+ #endif /* DEBUG */
+diff -up x11-ssh-askpass-1.2.4.1/x11-ssh-askpass.c.orig x11-ssh-askpass-1.2.4.1/x11-ssh-askpass.c
+--- x11-ssh-askpass-1.2.4.1/x11-ssh-askpass.c.orig	2024-06-03 10:49:57.507301439 -0400
++++ x11-ssh-askpass-1.2.4.1/x11-ssh-askpass.c	2024-06-03 10:54:21.186737584 -0400
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <err.h>
+ 
+ /* For (get|set)rlimit() ... */
+ #include <sys/time.h>
+@@ -1453,7 +1454,9 @@ initRandom()
+    unsigned int	seed;
+ 
+    if (fd!=-1) {
+-     read(fd, &seed, sizeof seed);
++     if (read(fd, &seed, sizeof seed) == -1) {
++       warn("read");
++     }
+      close(fd);
+    }
+ 

x11-ssh-askpass.spec

@@ -1,27 +1,43 @@
-%global __alternatives /usr/sbin/alternatives
 %global appdefaultsdir /usr/share/X11/app-defaults
 
-%{!?release_func:%global release_func() %1%{?dist}}
+# Required packages to build the program are no longer available on
+# 32-bit x86
+ExcludeArch: %{ix86}
 
-Name:           x11-ssh-askpass
-Version:        1.2.4.1
-Release:        %release_func 39
-Summary:        A passphrase dialog for X and not only for OpenSSH
+Name:               x11-ssh-askpass
+Version:            1.2.4.1
+Release:            46%{?dist}
+Summary:            A passphrase dialog for X and not only for OpenSSH
+License:            LicenseRef-Fedora-Public-Domain
 
+# The original site has disappeared, but the source itself has
+# reappeared on github.  The original site was:
+#
+# http://www.jmknoble.net/software/x11-ssh-askpass/
+#
+# We will use the github mirror of the original source from now on.
+%global forgeurl    https://github.com/sigmavirus24/x11-ssh-askpass/
+%global tag         %{version}
+%global archivename %{name}-%{tag}
+%global archiveext  tar.gz
+%global archiveurl  %{forgeurl}/archive/refs/tags/%{tag}.%{archiveext}
+%forgemeta
 
-License:        Public Domain
-URL:            http://www.jmknoble.net/software/x11-ssh-askpass/
-Source0:        http://www.jmknoble.net/software/x11-ssh-askpass/%name-%version.tar.gz
-Source10:       x11-ssh-askpass.csh
-Source11:       x11-ssh-askpass.sh
-Patch0:         x11-ssh-askpass-1.2.4-random.patch
+URL:                %{forgeurl}
+Source0:            %{forgesource}
+Source1:            x11-ssh-askpass.csh
+Source2:            x11-ssh-askpass.sh
+Patch0:             x11-ssh-askpass-1.2.4-random.patch
+Patch1:             x11-ssh-askpass-1.2.4.1-gcc-14.x-warnings.patch
 
-Provides:       openssh-askpass-x11
+Provides:           openssh-askpass-x11
 
-BuildRequires:  make
-BuildRequires:  gcc
-BuildRequires:  imake
-BuildRequires:  libXt-devel
+BuildRequires:      make
+BuildRequires:      gcc
+BuildRequires:      imake
+BuildRequires:      libXt-devel
+BuildRequires:      coreutils
+BuildRequires:      sed
 
 %description
 x11-ssh-askpass is a lightweight passphrase dialog for OpenSSH or
@@ -34,34 +50,61 @@ its user interface. This reduces its dependencies on external libraries
 (such as GNOME or Perl/Tk). See the README for further information.
 
 %prep
-%setup -q
-%patch0 -p1 -b .random
+%forgeautosetup
 
-%global makeflags XAPPLOADDIR='%{appdefaultsdir}'
 %build
-export LDFLAGS='-Wl,--as-needed'
-%configure --libexecdir=%{_libexecdir}/openssh
+env LDFLAGS='-Wl,--as-needed' %configure --libexecdir=%{_libexecdir}/openssh --with-app-defaults-dir=%{appdefaultsdir}
 xmkmf
-make includes %{makeflags}
-make %{?_smp_mflags} %{makeflags}
+# Modernize the features.h macros
+sed -i -e 's|-D_XOPEN_SOURCE||g' Makefile
+sed -i -e 's|-D_BSD_SOURCE|-D_DEFAULT_SOURCE|g' Makefile
+make includes
+%make_build
 
 %install
-make install install.man DESTDIR=%{buildroot} %{makeflags}
+%make_install install.man DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -p -m0644 %{SOURCE10} %{SOURCE11} %{buildroot}%{_sysconfdir}/profile.d/
+install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/%(basename %{SOURCE1})
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%(basename %{SOURCE2})
 
-rm -f %{buildroot}%{_libexecdir}/openssh/ssh-askpass*
-rm -f %{buildroot}%{_mandir}/man1/ssh-askpass*
+rm -f %{buildroot}%{_libexecdir}/openssh/ssh-askpass
+rm -f %{buildroot}%{_mandir}/man1/ssh-askpass.1x*
 
 %files
 %doc ChangeLog README TODO *.ad
-%config(noreplace) %{_sysconfdir}/profile.d/*
-%{appdefaultsdir}/*
-%{_libexecdir}/openssh
-%{_mandir}/*/*
+%config(noreplace) %{_sysconfdir}/profile.d/x11-ssh-askpass.csh
+%config(noreplace) %{_sysconfdir}/profile.d/x11-ssh-askpass.sh
+%{appdefaultsdir}/SshAskpass
+%dir %{_libexecdir}/openssh
+%{_libexecdir}/openssh/x11-ssh-askpass
+%{_mandir}/man1/x11-ssh-askpass.1x.gz
 
 %changelog
+* Wed Jul 22 2026 Dave Cantrell <dcantrell@redhat.com> - 1.2.4.1-46
+- ExcludeArch: %%{ix86}
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4.1-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4.1-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4.1-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4.1-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4.1-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jun 03 2024 David Cantrell <dcantrell@redhat.com> - 1.2.4.1-40
+- Modernize the spec file with newer macros
+- Pull source from github using forge macros since the original site
+  has disappeared
+- Patched for latest glibc and gcc to handle warnings
+- Use SPDX license expression for the License tag
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4.1-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild