Compare commits
No commits in common. "rawhide" and "f24" have entirely different histories.
6 changed files with 24 additions and 202 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1 +1,4 @@
|
|||
/uronode-*.tar.gz
|
||||
/uronode-2.2.tar.gz
|
||||
/uronode-2.3.1.tar.gz
|
||||
/uronode-2.5.1.tgz
|
||||
/uronode-2.6.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (uronode-2.15.tar.gz) = c5f2b652abd9dc0ca09d0f6ec022fc2c658caf09f79547420ed0412a956906ddf7146cd15823de41afa837a8b4c9dd59f25690283471e7b648fe1c37166cee2e
|
||||
e8829f7769e7f1fc602ddfaddefea90e uronode-2.6.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
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);
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/Makefile.in b/Makefile.in
|
||||
index a549299..cacc4d2 100644
|
||||
index daebe36..e1f1d0d 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -27,35 +27,35 @@ CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
|
||||
@@ -27,34 +27,34 @@ CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
install: installbin installman installhelp installconf
|
||||
|
|
@ -41,7 +41,6 @@ index a549299..cacc4d2 100644
|
|||
|
||||
installconf: installhelp
|
||||
- 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)
|
||||
|
|
@ -50,7 +49,6 @@ index a549299..cacc4d2 100644
|
|||
- 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 644 -p etc/uronode.info $(ETC_DIR)
|
||||
|
|
@ -87,10 +85,10 @@ index aca87b5..774d11f 100644
|
|||
ZLIB = @ZLIB@
|
||||
\ No newline at end of file
|
||||
diff --git a/config.h.in b/config.h.in
|
||||
index 5d488af..51dc57c 100644
|
||||
index 6f8845d..a13b18f 100644
|
||||
--- a/config.h.in
|
||||
+++ b/config.h.in
|
||||
@@ -25,14 +25,14 @@
|
||||
@@ -24,14 +24,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"
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
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()
|
||||
163
uronode.spec
163
uronode.spec
|
|
@ -8,16 +8,12 @@
|
|||
|
||||
Summary: Alternative packet radio system for Linux
|
||||
Name: uronode
|
||||
Version: 2.15
|
||||
Release: 13%{?dist}
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
Version: 2.6
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/Communications
|
||||
URL: http://uronode.sourceforge.net
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libax25-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: zlib-devel, libax25-devel, systemd
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
|
@ -28,11 +24,7 @@ Source3: uronode.socket
|
|||
Source4: uronode.xinetd
|
||||
Source5: uronode-README.fedora
|
||||
# Sent upstream
|
||||
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
|
||||
Patch0: uronode-2.5.1-install-fix.patch
|
||||
|
||||
%description
|
||||
URONode is an alternative packet radio system for Linux. It supports
|
||||
|
|
@ -40,7 +32,8 @@ cross-port digipeating, automatic importing of flexnet routing,
|
|||
various IP functions, and ANSI colors.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
%patch0 -p1 -b .install-fix
|
||||
|
||||
# Copy Fedora readme into place
|
||||
cp -p %{SOURCE5} README.fedora
|
||||
|
|
@ -50,13 +43,13 @@ rm -rf include
|
|||
|
||||
%build
|
||||
export NON_INTERACTIVE=1
|
||||
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}
|
||||
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
|
||||
./configure
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags} %{?cflags_harden}" LDFLAGS="%{?__global_ldflags} %{?ldflags_harden}"
|
||||
|
||||
|
|
@ -81,9 +74,6 @@ 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
|
||||
|
||||
|
|
@ -96,7 +86,6 @@ 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
|
||||
|
|
@ -117,128 +106,6 @@ 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue