New version
Resolves: rhbz#1438615 Updated patches
This commit is contained in:
Jaroslav Škarvada
parent
35bb7e594d
commit
dbf4446d13
6 changed files with 24 additions and 19 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
/ampr-ripd-1.11.tgz
|
||||
/ampr-ripd-1.13.tgz
|
||||
/ampr-ripd-1.15.tgz
|
||||
/ampr-ripd-1.16.tgz
|
||||
|
|
|
|||
|
|
@ -21,5 +21,5 @@ index 6d585b8..5c9c3a1 100755
|
|||
# You need to adapt the interface name to your setup.
|
||||
#
|
||||
|
||||
-./ampr-ripd -d -i ampr0
|
||||
+ampr-ripd -d -i ampr0
|
||||
-./ampr-ripd -d -v -i ampr0
|
||||
+ampr-ripd -d -v -i ampr0
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index e461218..7c5e255 100644
|
||||
index 1f4f3fa..ae18749 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -2,14 +2,10 @@
|
||||
|
|
@ -9,13 +9,12 @@ index e461218..7c5e255 100644
|
|||
-BASEDIR = /usr
|
||||
+BASEDIR = $(DESTDIR)/usr
|
||||
SBINDIR = $(BASEDIR)/sbin
|
||||
-MANDIR = $(BASEDIR)/man/man1
|
||||
MANDIR = $(BASEDIR)/share/man/man1
|
||||
-SCACHEDIR = /var/lib/ampr-ripd
|
||||
-
|
||||
-# 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
|
||||
|
|
@ -43,6 +42,6 @@ index e461218..7c5e255 100644
|
|||
- 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 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 b9609f6..9ec7058 100644
|
||||
index 72d3685..69cc45e 100644
|
||||
--- a/ampr-ripd.c
|
||||
+++ b/ampr-ripd.c
|
||||
@@ -114,6 +114,8 @@
|
||||
@@ -120,6 +120,8 @@
|
||||
|
||||
#define RTAB_FILE "/etc/iproute2/rt_tables" /* route tables */
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ index b9609f6..9ec7058 100644
|
|||
#define BUFFERSIZE 8192
|
||||
#define MYIPSIZE 25 /* max number of local interface IPs */
|
||||
#define MAXIGNORE 10 /* max number of hosts in the ignore list */
|
||||
@@ -1454,6 +1456,7 @@ static void on_term(int sig)
|
||||
@@ -1511,6 +1513,7 @@ static void on_term(int sig)
|
||||
#ifdef HAVE_DEBUG
|
||||
if (debug && verbose) fprintf(stderr, "SIGTERM/SIGKILL received.\n");
|
||||
#endif
|
||||
|
|
@ -19,15 +19,15 @@ index b9609f6..9ec7058 100644
|
|||
close(fwsd);
|
||||
close(tunsd);
|
||||
route_delete_all();
|
||||
@@ -1594,6 +1597,7 @@ int main(int argc, char **argv)
|
||||
@@ -1651,6 +1654,7 @@ int main(int argc, char **argv)
|
||||
char *pload;
|
||||
int len, plen;
|
||||
int lval;
|
||||
+ FILE *pidfile;
|
||||
|
||||
while ((p = getopt(argc, argv, "dvsrh?i:a:p:t:m:w:f:e:x:")) != -1)
|
||||
while ((p = getopt(argc, argv, "dvsrh?i:a:p:t:m:w:f:e:x:g:")) != -1)
|
||||
{
|
||||
@@ -1752,6 +1756,10 @@ int main(int argc, char **argv)
|
||||
@@ -1825,6 +1829,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.15
|
||||
Release: 2%{?dist}
|
||||
Version: 1.16
|
||||
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.15-install-fix.patch
|
||||
Patch1: ampr-ripd-1.15-examples-noshebang.patch
|
||||
Patch2: ampr-ripd-1.15-pidfile.patch
|
||||
Patch0: ampr-ripd-1.16-install-fix.patch
|
||||
Patch1: ampr-ripd-1.16-examples-noshebang.patch
|
||||
Patch2: ampr-ripd-1.16-pidfile.patch
|
||||
|
||||
%description
|
||||
Routing daemon written in C similar to Hessu's rip44d including optional
|
||||
|
|
@ -64,6 +64,11 @@ install -Dpm 644 -t %{buildroot}%{_datadir}/%{name} ampr-run.sh find_pass.sh
|
|||
%{_unitdir}/%{name}.service
|
||||
|
||||
%changelog
|
||||
* Tue Apr 4 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 1.16-1
|
||||
- New version
|
||||
Resolves: rhbz#1438615
|
||||
- Updated patches
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
720e3d3cffa893a230096e52df5a95ad ampr-ripd-1.15.tgz
|
||||
SHA512 (ampr-ripd-1.16.tgz) = 3d988c69aa6e35990f3bc7ee8d5e9868f307dc6e66cba804ff9146da2ed1f9aa4417411cf76ede3ddb1c6c36b3638f83fb698504fd97e5f284ecc3c221ed1b00
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue