rpms/aprsd/devel aprsd.logrotate, NONE, 1.1 aprsd-2.2.5-15-sysconfdir.patch, 1.1, 1.2 aprsd.init, 1.1, 1.2 aprsd.spec, 1.1, 1.2

Lucian Langa (lucilanga) fedora-extras-commits at redhat.com
Mon Mar 10 06:09:12 UTC 2008


Author: lucilanga

Update of /cvs/pkgs/rpms/aprsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14594/devel

Modified Files:
	aprsd-2.2.5-15-sysconfdir.patch aprsd.init aprsd.spec 
Added Files:
	aprsd.logrotate 
Log Message:
aprsd-2.2.5-15.3 for devel


--- NEW FILE aprsd.logrotate ---
/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
}

aprsd-2.2.5-15-sysconfdir.patch:

Index: aprsd-2.2.5-15-sysconfdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd-2.2.5-15-sysconfdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd-2.2.5-15-sysconfdir.patch	1 Mar 2008 07:55:06 -0000	1.1
+++ aprsd-2.2.5-15-sysconfdir.patch	10 Mar 2008 06:09:00 -0000	1.2
@@ -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");


Index: aprsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd.init	1 Mar 2008 07:55:06 -0000	1.1
+++ aprsd.init	10 Mar 2008 06:09:00 -0000	1.2
@@ -32,7 +32,7 @@
                         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 @@
         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 @@
         RETVAL=$?
         ;;
   condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
+        if [ -f /var/lock/subsys/aprsd ]; then
             stop
             start
             RETVAL=$?


Index: aprsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd.spec	1 Mar 2008 07:55:06 -0000	1.1
+++ aprsd.spec	10 Mar 2008 06:09:00 -0000	1.2
@@ -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 @@
 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 @@
 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 @@
 %{_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 @@
 %doc doc/qalgorithm.html
 
 %changelog
+* Fri Mar  8 2008 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.3
+- Patched to localstatedir
+- Added logrotation support
+
 * Fri Feb 22 2008 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.2
 - Patched homedir to obey default sysconfdir
 - Patched to compile for gcc-4.3




More information about the fedora-extras-commits mailing list