New version
Resolves: rhbz#1378260 - Updated / de-fuzzified patches
This commit is contained in:
Jaroslav Škarvada
parent
f80a396d81
commit
5033fd53fb
6 changed files with 31 additions and 20 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
/ampr-ripd-1.11.tgz
|
||||
/ampr-ripd-1.13.tgz
|
||||
/ampr-ripd-1.15.tgz
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ index 6d585b8..5c9c3a1 100755
|
|||
-
|
||||
#
|
||||
# Running ampr-ripd without any options except debug and the interface name
|
||||
# allows you to find your RIPv2 password
|
||||
# You need to adapt the interface name to your setup
|
||||
# allows you to find your RIPv2 password if it ever changes from the default.
|
||||
# You need to adapt the interface name to your setup.
|
||||
#
|
||||
|
||||
-./ampr-ripd -d -i ampr0
|
||||
|
|
@ -1,24 +1,26 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index ac8146d..f9956c5 100644
|
||||
index e461218..7c5e255 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -2,13 +2,9 @@
|
||||
@@ -2,14 +2,10 @@
|
||||
# Makefile for ampr-ripd
|
||||
#
|
||||
|
||||
-BASEDIR = /usr
|
||||
+BASEDIR = $(DESTDIR)/usr
|
||||
SBINDIR = $(BASEDIR)/sbin
|
||||
-MANDIR = $(BASEDIR)/man/man1
|
||||
-SCACHEDIR = /var/lib/ampr-ripd
|
||||
-
|
||||
-# no need to run dx-broadcast as root
|
||||
-# no need to run ampr-ripd as root
|
||||
-OWN = daemon
|
||||
-GRP = daemon
|
||||
+MANDIR = $(BASEDIR)/share/man/man1
|
||||
+SCACHEDIR = $(DESTDIR)/var/lib/ampr-ripd
|
||||
|
||||
CC = gcc
|
||||
|
||||
@@ -22,11 +18,11 @@ CC = gcc
|
||||
@@ -23,11 +19,11 @@ CC = gcc
|
||||
# Full debug
|
||||
#DOPT = -Wall -O2 -D HAVE_DEBUG
|
||||
|
||||
|
|
@ -33,12 +35,14 @@ index ac8146d..f9956c5 100644
|
|||
|
||||
all: ampr-ripd
|
||||
|
||||
@@ -34,6 +30,5 @@
|
||||
@@ -35,7 +31,6 @@ clean:
|
||||
rm -f ampr-ripd
|
||||
|
||||
install: ampr-ripd
|
||||
- strip ampr-ripd
|
||||
- install -m 755 -o $(OWN) -g $(GRP) -d $(SCACHEDIR)
|
||||
- install -m 755 -o $(OWN) -g $(GRP) ampr-ripd $(SBINDIR)
|
||||
- install -m 755 -o $(OWN) -g $(GRP) -d $(SCACHEDIR)
|
||||
- install -m 755 -o $(OWN) -g $(GRP) ampr-ripd $(SBINDIR)
|
||||
- install -m 644 -o $(OWN) -g $(GRP) ampr-ripd.1 $(MANDIR)
|
||||
+ install -m 755 -p -D -d $(SCACHEDIR)
|
||||
+ install -m 755 -p -D ampr-ripd $(SBINDIR)/ampr-ripd
|
||||
+ install -m 644 -p -D ampr-ripd.1 $(MANDIR)/ampr-ripd.1
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/ampr-ripd.c b/ampr-ripd.c
|
||||
index a9c75c3..d376961 100644
|
||||
index b9609f6..9ec7058 100644
|
||||
--- a/ampr-ripd.c
|
||||
+++ b/ampr-ripd.c
|
||||
@@ -110,6 +110,8 @@
|
||||
@@ -114,6 +114,8 @@
|
||||
|
||||
#define RTAB_FILE "/etc/iproute2/rt_tables" /* route tables */
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ index a9c75c3..d376961 100644
|
|||
#define BUFFERSIZE 8192
|
||||
#define MYIPSIZE 25 /* max number of local interface IPs */
|
||||
#define MAXIGNORE 10 /* max number of hosts in the ignore list */
|
||||
@@ -1474,6 +1476,7 @@ static void on_term(int sig)
|
||||
@@ -1454,6 +1456,7 @@ static void on_term(int sig)
|
||||
#ifdef HAVE_DEBUG
|
||||
if (debug && verbose) fprintf(stderr, "SIGTERM/SIGKILL received.\n");
|
||||
#endif
|
||||
|
|
@ -19,7 +19,7 @@ index a9c75c3..d376961 100644
|
|||
close(fwsd);
|
||||
close(tunsd);
|
||||
route_delete_all();
|
||||
@@ -1615,6 +1618,7 @@ int main(int argc, char **argv)
|
||||
@@ -1594,6 +1597,7 @@ int main(int argc, char **argv)
|
||||
char *pload;
|
||||
int len, plen;
|
||||
int lval;
|
||||
|
|
@ -27,7 +27,7 @@ index a9c75c3..d376961 100644
|
|||
|
||||
while ((p = getopt(argc, argv, "dvsrh?i:a:p:t:m:w:f:e:x:")) != -1)
|
||||
{
|
||||
@@ -1848,6 +1852,10 @@ int main(int argc, char **argv)
|
||||
@@ -1752,6 +1756,10 @@ int main(int argc, char **argv)
|
||||
signal(SIGHUP, on_hup);
|
||||
signal(SIGALRM, on_alarm);
|
||||
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
Summary: Routing daemon for the ampr network
|
||||
Name: ampr-ripd
|
||||
Version: 1.13
|
||||
Release: 3%{?dist}
|
||||
Version: 1.15
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/Communications
|
||||
URL: http://www.yo2loj.ro/hamprojects/
|
||||
|
|
@ -19,9 +19,9 @@ Requires(preun): systemd
|
|||
Requires(postun): systemd
|
||||
Source0: http://www.yo2loj.ro/hamprojects/%{name}-%{version}.tgz
|
||||
Source1: ampr-ripd.service
|
||||
Patch0: ampr-ripd-1.11-install-fix.patch
|
||||
Patch1: ampr-ripd-1.11-examples-noshebang.patch
|
||||
Patch2: ampr-ripd-1.13-pidfile.patch
|
||||
Patch0: ampr-ripd-1.15-install-fix.patch
|
||||
Patch1: ampr-ripd-1.15-examples-noshebang.patch
|
||||
Patch2: ampr-ripd-1.15-pidfile.patch
|
||||
|
||||
%description
|
||||
Routing daemon written in C similar to Hessu's rip44d including optional
|
||||
|
|
@ -60,9 +60,15 @@ install -Dpm 644 -t %{buildroot}%{_datadir}/%{name} ampr-run.sh find_pass.sh
|
|||
|
||||
%{_sbindir}/ampr-ripd
|
||||
%{_datadir}/%{name}
|
||||
%{_mandir}/man1/*
|
||||
%{_unitdir}/%{name}.service
|
||||
|
||||
%changelog
|
||||
* Thu Sep 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 1.15-1
|
||||
- New version
|
||||
Resolves: rhbz#1378260
|
||||
- Updated / de-fuzzified patches
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
099b87afe8aa152d54cba525de495633 ampr-ripd-1.13.tgz
|
||||
720e3d3cffa893a230096e52df5a95ad ampr-ripd-1.15.tgz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue