Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>

.gitignore

@@ -1,2 +1 @@
-/uronode-2.2.tar.gz
-/uronode-2.3.1.tar.gz
+/uronode-*.tar.gz

sources

@@ -1 +1 @@
-ee2f7bde030b1c7d1ea61e4bfeb716ef  uronode-2.3.1.tar.gz
+SHA512 (uronode-2.15.tar.gz) = c5f2b652abd9dc0ca09d0f6ec022fc2c658caf09f79547420ed0412a956906ddf7146cd15823de41afa837a8b4c9dd59f25690283471e7b648fe1c37166cee2e

uronode-2.15-gcc-15-fix.patch

@@ -0,0 +1,21 @@
+diff --git a/command.c b/command.c
+index 99db955..ac9ba50 100644
+--- a/command.c
++++ b/command.c
+@@ -5,6 +5,7 @@
+ #include <unistd.h>
+ #include <time.h>
+ #include <fcntl.h>
++#include <signal.h>
+ #include <sys/utsname.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -29,8 +30,6 @@ struct cmd *Nodecmds = NULL;
+ 
+ int meminfo(const char *s);
+ 
+-int kill();
+-
+ void init_nodecmds(void)
+ {
+   add_internal_cmd(&Nodecmds, "?",        1, do_help);

uronode-2.3.1-override-dirs-in-unattended-install.patch

@@ -1,40 +0,0 @@
-diff --git a/configure b/configure
-index 967ee29..2979b02 100755
---- a/configure
-+++ b/configure
-@@ -14,12 +14,13 @@ echo "Cleaning the directory for a fresh configuration..."
- _sleep 2
- make distclean > make.debug
- 
--ETC_DIR=/usr/local/etc/ax25
--SBIN_DIR=/usr/local/sbin
--BIN_DIR=/usr/local/bin
--LIB_DIR=/usr/local/lib
--MAN_DIR=/usr/local/share/man
--VAR_DIR=/usr/local/var/ax25
-+[ "$ETC_DIR" ] || ETC_DIR=/usr/local/etc/ax25
-+[ "$SBIN_DIR" ] || SBIN_DIR=/usr/local/sbin
-+[ "$BIN_DIR" ] || BIN_DIR=/usr/local/bin
-+[ "$LIB_DIR" ] || LIB_DIR=/usr/local/lib
-+[ "$DATA_DIR" ] || DATA_DIR=/usr/local/share
-+[ "$MAN_DIR" ] || MAN_DIR=$DATA_DIR/man
-+[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/ax25
- 
- echo "Welcome to the configuration utility for URONode. This configure script"
- echo "will very simply and easily guide you into installling URONode with as"
-@@ -185,6 +186,7 @@ sed -e "s~@ARCH@~$ARCH~g; \
- 	s~@BIN_DIR@~$BIN_DIR~g; \
- 	s~@VAR_DIR@~$VAR_DIR~g; \
- 	s~@MAN_DIR@~$MAN_DIR~g; \
-+	s~@DATA_DIR@~$DATA_DIR~g; \
- 	s~@ZLIB@~$ZLIB~g" <Makefile.include.in >Makefile.include
- 
- echo "Creating config.h"
-@@ -195,6 +197,7 @@ sed -e "s~@ETC_DIR@~$ETC_DIR~g; \
- 	s~@BIN_DIR@~$BIN_DIR~g; \
- 	s~@VAR_DIR@~$VAR_DIR~g; \
- 	s~@MAN_DIR@~$MAN_DIR~g; \
-++	s~@DATA_DIR@~$DATA_DIR~g; \
- 	s~@HAVEAX25@~$HAVEAX25~g; \
- 	s~@HAVEFLEX@~$HAVEFLEX~g; \
- 	s~@HAVENETROM@~$HAVENETROM~g; \

uronode-2.7-configure-non-interactive.patch

@@ -0,0 +1,25 @@
+diff --git a/configure b/configure
+index 923f672..f859cc6 100755
+--- a/configure
++++ b/configure
+@@ -1,9 +1,16 @@
+ #!/bin/sh
+ 
+-echo -n "Use interactive mode? [Y/n]: "; read answer
+-if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
+-   then NON_INTERACTIVE=0;
+-       else NON_INTERACTIVE=1;
++if [ "$NON_INTERACTIVE" = 1 ]
++then
++	echo "Using non-interactive installation, if you want interactive mode"
++	echo "unset NON_INTERACTIVE environment variable prior running configure"
++	echo "by e.g.: unset NON_INTERACTIVE"
++else
++	echo -n "Use interactive mode? [Y/n]: "; read answer
++	if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
++	then NON_INTERACTIVE=0;
++	else NON_INTERACTIVE=1;
++	fi
+ fi
+ 
+ _sleep()

uronode-2.7-install-fix.patch

@@ -1,17 +1,17 @@
 diff --git a/Makefile.in b/Makefile.in
-index 750e546..99b5a68 100644
+index a549299..cacc4d2 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -25,33 +25,33 @@ DIGI_OBJS =		$(DIGI_SRC:.c=.o)
+@@ -27,35 +27,35 @@ CALIBRATE_OBJS =	$(CALIBRATE_SRC:.c=.o)
  	$(CC) $(CFLAGS) -c $<
  
  install: installbin installman installhelp installconf
--	install -m 755    -D -d	$(VAR_DIR)
--	install -m 755    -D -d	$(VAR_DIR)/node
--	install -m 644    -p etc/loggedin	$(VAR_DIR)/node
--	install -m 644    -p etc/lastlog	$(VAR_DIR)/node
--	install -m 755    -D -d	$(VAR_DIR)/flex
--	install -m 644    -p etc/gateways	 $(VAR_DIR)/flex
+-	install -b -m 755    -D -d	$(VAR_DIR)
+-	install -b -m 755    -D -d	$(VAR_DIR)/node
+-	install -b -m 644    -p etc/loggedin	$(VAR_DIR)/node
+-	install -b -m 644    -p etc/lastlog	$(VAR_DIR)/node
+-	install -b -m 755    -D -d	$(VAR_DIR)/flex
+-	install -b -m 644    -p etc/gateways	 $(VAR_DIR)/flex
 +	install -m 755    -D -d	$(VAR_DIR)/lib/uronode
 +	install -m 755    -D -d	$(VAR_DIR)/lib/flexd
 +	install -m 755    -D -d	$(VAR_DIR)/log/uronode
@@ -23,32 +23,39 @@ index 750e546..99b5a68 100644
 -	install -m 755 	-s -p	uronode		$(SBIN_DIR)
 -	install -m 755  -s -p	nodeusers	$(SBIN_DIR)
 -	install -m 755  -s -p	axdigi		$(SBIN_DIR)
+-	install -m 755	-s -p	calibrate	$(SBIN_DIR)
 -@IN@	install -m 755  -s -p	flexd		$(SBIN_DIR)
 +	install -m 755 -D -d	$(SBIN_DIR)
 +	install -m 755 	-p	uronode		$(SBIN_DIR)
 +	install -m 755  -p	nodeusers	$(SBIN_DIR)
 +	install -m 755  -p	axdigi		$(SBIN_DIR)
++	install -m 755	-p	calibrate	$(SBIN_DIR)
 +@IN@	install -m 755  -p	flexd		$(SBIN_DIR)
  
  installhelp:
--	install -m 755    -D -d		 $(VAR_DIR)
--	install -m 755    -D -d		 $(VAR_DIR)/node/help
--	install -m 644    -p etc/help/*.hlp $(VAR_DIR)/node/help
+-	install -b -m 755    -D -d		 $(VAR_DIR)
+-	install -b -m 755    -D -d		 $(VAR_DIR)/node/help
+-	install -b -m 644    -p etc/help/*.hlp $(VAR_DIR)/node/help
 +	install -m 755    -D -d		 $(DATA_DIR)/uronode/help
 +	install -m 644    -p etc/help/*.hlp $(DATA_DIR)/uronode/help
  
  installconf: installhelp
- 	install -m 755    -D -d		 $(ETC_DIR)
--	install -m 600    -p etc/uronode.conf  $(ETC_DIR)
+-	install -b -m 755    -D -d		 $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.announce  $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.conf  $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.perms $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.info  $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.motd  $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.users $(ETC_DIR)
+-	install -b -m 600    -p etc/uronode.routes   $(ETC_DIR)
+-	install -b -m 600    -p etc/flexd.conf  $(ETC_DIR)
++	install -m 755    -D -d		 $(ETC_DIR)
++	install -m 644    -p etc/uronode.announce  $(ETC_DIR)
 +	install -m 644    -p etc/uronode.conf  $(ETC_DIR)
- 	install -m 600    -p etc/uronode.perms $(ETC_DIR)
--	install -m 600    -p etc/uronode.info  $(ETC_DIR)
--	install -m 600    -p etc/uronode.motd  $(ETC_DIR)
++	install -m 600    -p etc/uronode.perms $(ETC_DIR)
 +	install -m 644    -p etc/uronode.info  $(ETC_DIR)
 +	install -m 644    -p etc/uronode.motd  $(ETC_DIR)
- 	install -m 600    -p etc/uronode.users $(ETC_DIR)
--	install -m 600    -p etc/uronode.routes   $(ETC_DIR)
--	install -m 600    -p etc/flexd.conf  $(ETC_DIR)
++	install -m 600    -p etc/uronode.users $(ETC_DIR)
 +	install -m 644    -p etc/uronode.routes   $(ETC_DIR)
 +	install -m 644    -p etc/flexd.conf  $(ETC_DIR)
  
@@ -80,10 +87,10 @@ index aca87b5..774d11f 100644
  ZLIB		= @ZLIB@
 \ No newline at end of file
 diff --git a/config.h.in b/config.h.in
-index 76a7e9e..7444bda 100644
+index 5d488af..51dc57c 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -23,14 +23,14 @@
+@@ -25,14 +25,14 @@
  #define AX_ROUTES_FILE          "@ETC_DIR@/uronode.routes"
  #define CONF_USERS_FILE         "@ETC_DIR@/uronode.users"
  #define FLEXD_CONF_FILE         "@ETC_DIR@/flexd.conf"

uronode.spec

@@ -8,12 +8,16 @@
 
 Summary: Alternative packet radio system for Linux
 Name: uronode
-Version: 2.3.1
-Release: 4%{?dist}
-License: GPLv2+
-Group: Applications/Communications
+Version: 2.15
+Release: 13%{?dist}
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License: GPL-2.0-or-later
 URL: http://uronode.sourceforge.net
-BuildRequires: zlib-devel, libax25-devel, systemd
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: zlib-devel
+BuildRequires: libax25-devel
+BuildRequires: systemd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -24,8 +28,11 @@ Source3: uronode.socket
 Source4: uronode.xinetd
 Source5: uronode-README.fedora
 # Sent upstream
-Patch0: uronode-2.3.1-override-dirs-in-unattended-install.patch
-Patch1: uronode-2.3.1-install-fix.patch
+Patch: uronode-2.7-install-fix.patch
+# Sent upstream
+Patch: uronode-2.7-configure-non-interactive.patch
+# Sent upstream
+Patch: uronode-2.15-gcc-15-fix.patch
 
 %description
 URONode is an alternative packet radio system for Linux. It supports
@@ -33,9 +40,7 @@ cross-port digipeating, automatic importing of flexnet routing,
 various IP functions, and ANSI colors.
 
 %prep
-%setup -q
-%patch0 -p1 -b .override-dirs-in-unattended-install
-%patch1 -p1 -b .install-fix
+%autosetup -p1
 
 # Copy Fedora readme into place
 cp -p %{SOURCE5} README.fedora
@@ -45,13 +50,13 @@ rm -rf include
 
 %build
 export NON_INTERACTIVE=1
-export ETC_DIR=/etc/ax25
-export SBIN_DIR=/usr/sbin
-export BIN_DIR=/usr/bin
-export LIB_DIR=/usr/lib
-export DATA_DIR=/usr/share
-export MAN_DIR=$DATA_DIR/man
-export VAR_DIR=/var
+export ETC_DIR=%{_sysconfdir}/ax25
+export SBIN_DIR=%{_sbindir}
+export BIN_DIR=%{_bindir}
+export LIB_DIR=%{_prefix}/lib
+export DATA_DIR=%{_datadir}
+export MAN_DIR=%{_mandir}
+export VAR_DIR=%{_var}
 ./configure
 make %{?_smp_mflags} CFLAGS="%{optflags} %{?cflags_harden}" LDFLAGS="%{?__global_ldflags} %{?ldflags_harden}"
 
@@ -76,6 +81,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations
 %post
 %systemd_post flexd.service uronode.socket
 
+# Create empty database of current users
+[ -f %{_var}/lib/uronode/loggedin ] || touch %{_var}/lib/uronode/loggedin
+
 %preun
 %systemd_preun flexd.service uronode.socket
 
@@ -88,6 +96,7 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations
 %{_sbindir}/*
 %{_mandir}/*/*
 %config(noreplace) %{_sysconfdir}/ax25/flexd.conf
+%config(noreplace) %{_sysconfdir}/ax25/uronode.announce
 %config(noreplace) %{_sysconfdir}/ax25/uronode.conf
 %config(noreplace) %{_sysconfdir}/ax25/uronode.info
 %config(noreplace) %{_sysconfdir}/ax25/uronode.motd
@@ -108,6 +117,149 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations
 %ghost %{_var}/lib/flexd/destinations
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Apr 14 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 2.15-10
+- Fixed FTBFS with gcc-15
+  Resolves: rhbz#2341489
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.15-8
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.15-1
+- New version
+  Resolves: rhbz#2016589
+
+* Fri Oct 15 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.14-1
+- New version
+  Resolves: rhbz#2014224
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.13-3
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 18 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.13-1
+- New version
+  Resolves: rhbz#1917180
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.12-1
+- New version
+  Resolves: rhbz#1855006
+
+* Wed Mar  4 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11-1
+- New version
+  Resolves: rhbz#1809815
+
+* Mon Feb 10 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.10-4
+- Fixed FTBFS with gcc-10
+  Resolves: rhbz#1800224
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Feb  5 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.10-1
+- New version
+  Resolves: rhbz#1669879
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Oct 30 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.9-4
+- Create empty database of current users
+
+* Fri Jul 20 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.9-3
+- Fixed FTBFS by adding gcc requirement
+  Resolves: rhbz#1606621
+- Cleaned leftover files
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon May 28 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.9-1
+- New version
+  Resolves: rhbz#1582969
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Dec  8 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2.8.1-1
+- New version
+  Resolves: rhbz#1523435
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun  1 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2.7-1
+- New version
+  Resolves: rhbz#1457860
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Nov 25 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6-1
+- New version
+  Resolves: rhbz#1398623
+
+* Tue Apr 12 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.1-1
+- New version
+  Resolves: rhbz#1326416
+- Switched to tgz suffix which seems to be the default
+- Dropped override-dirs-in-unattended-install patch (upstreamed)
+- Updated install-fix patch
+- Optimized patch numbering
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Oct 30 2015 Richard Shaw <hobbes1069@gmail.com> 3.2.1-6
+- Rebuilt for updated libax25.
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Tue Apr  7 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.1-4
 - Fixed flexd tmp path