diff --git a/aprsd-2.2.5-15-sysconfdir.patch b/aprsd-2.2.5-15-sysconfdir.patch index 754b3f4..f9e663f 100644 --- a/aprsd-2.2.5-15-sysconfdir.patch +++ b/aprsd-2.2.5-15-sysconfdir.patch @@ -1,6 +1,7 @@ +diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-home/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 -+++ aprsd-home/src/aprsd.cpp 2008-02-22 16:25:22.000000000 +0200 -@@ -97,7 +97,7 @@ ++++ aprsd-home/src/aprsd.cpp 2008-03-08 15:42:46.000000000 +0200 +@@ -97,17 +97,17 @@ string szAprsPath; int msgsn; @@ -8,4 +9,22 @@ +const string HOMEDIR("/etc/aprsd"); const string CONFPATH(""); const string CONFFILE("aprsd.conf"); - const string MAINLOG("aprsd.log"); +-const string MAINLOG("aprsd.log"); +-const string STSMLOG("thirdparty.log"); +-const string RFLOG("rf.log"); +-const string UDPLOG("udp.log"); +-const string ERRORLOG("error.log"); +-const string DEBUGLOG("debug.log"); +-const string REJECTLOG("reject.log"); +-const string LOOPLOG("loop.log"); ++const string MAINLOG("/var/log/aprsd/aprsd.log"); ++const string STSMLOG("/var/log/aprsd/thirdparty.log"); ++const string RFLOG("/var/log/aprsd/rf.log"); ++const string UDPLOG("/var/log/aprsd/udp.log"); ++const string ERRORLOG("/var/log/aprsd/error.log"); ++const string DEBUGLOG("/var/log/aprsd/debug.log"); ++const string REJECTLOG("/var/log/aprsd/reject.log"); ++const string LOOPLOG("/var/log/aprsd/loop.log"); + const string WELCOME("welcome.txt"); + const string TNC_INIT("INIT.TNC"); + const string TNC_RESTORE("RESTORE.TNC"); diff --git a/aprsd.init b/aprsd.init index b707ddd..b388c09 100644 --- a/aprsd.init +++ b/aprsd.init @@ -32,7 +32,7 @@ start() { echo -n $"Starting $prog: " daemon /usr/bin/aprsd -d RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aprsd echo else RETVAL=1 @@ -46,7 +46,7 @@ stop() { killproc $prog RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/aprsd return $RETVAL } @@ -64,7 +64,7 @@ case "$1" in RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/$prog ]; then + if [ -f /var/lock/subsys/aprsd ]; then stop start RETVAL=$? diff --git a/aprsd.logrotate b/aprsd.logrotate new file mode 100644 index 0000000..565f849 --- /dev/null +++ b/aprsd.logrotate @@ -0,0 +1,27 @@ +/var/log/aprsd/aprsd.log { + weekly + rotate 4 +} + +/var/log/aprsd/thirdparty.log { + daily + rotate 4 +} +/var/log/aprsd/udp.log { + daily + rotate 4 +} +/var/log/aprsd/rf.log { + daily + rotate 4 +} + +/var/log/aprsd/loop.log { + daily + rotate 4 +} + +/var/log/aprsd/reject.log { + daily + rotate 2 +} diff --git a/aprsd.spec b/aprsd.spec index 7b45879..76bc898 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.2%{?dist} +Release: %{uprel}.3%{?dist} Group: Applications/Internet License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz @@ -12,6 +12,7 @@ Source3: INIT.TNC Source4: user.deny Source5: welcome.txt Source6: RESTORE.TNC +Source7: aprsd.logrotate Patch0: aprsd-2.2.5-15-compile.patch Patch1: aprsd-2.2.5-15-gcc43-port.patch Patch2: aprsd-2.2.5-15-sysconfdir.patch @@ -42,12 +43,16 @@ rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d} +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC +install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/aprsd +mkdir -p %{buildroot}%{_localstatedir} +mkdir -p %{buildroot}%{_localstatedir}/log/aprsd %clean rm -rf %{buildroot} @@ -67,7 +72,9 @@ fi %{_bindir}/aprspass %{_sysconfdir}/rc.d/init.d/aprsd %dir %{_sysconfdir}/aprsd +%dir %{_localstatedir}/log/aprsd %config(noreplace) %{_sysconfdir}/aprsd/* +%config(noreplace) %{_sysconfdir}/logrotate.d/aprsd %doc AUTHORS %doc COPYING %doc ChangeLog @@ -78,6 +85,10 @@ fi %doc doc/qalgorithm.html %changelog +* Fri Mar 8 2008 Lucian Langa - 2.2.5-15.3 +- Patched to localstatedir +- Added logrotation support + * Fri Feb 22 2008 Lucian Langa - 2.2.5-15.2 - Patched homedir to obey default sysconfdir - Patched to compile for gcc-4.3