OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Aug-2003 18:13:25
Branch: HEAD Handle: 2003082817132301
Added files:
openpkg-src/msntp fsl.msntp msntp.patch rc.msntp
Modified files:
openpkg-src/msntp msntp.spec
openpkg-web news.txt
Log:
Remove logging replacement hack, add FSL binding, implement features
in ticket #202
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/msntp/fsl.msntp
1.1 +12 -0 openpkg-src/msntp/msntp.patch
1.10 +57 -6 openpkg-src/msntp/msntp.spec
1.1 +58 -0 openpkg-src/msntp/rc.msntp
1.6325 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/msntp/fsl.msntp
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.msntp
--- /dev/null 2003-08-28 18:13:24.000000000 +0200
+++ fsl.msntp 2003-08-28 18:13:25.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.msntp -- OSSP fsl configuration
+##
+
+ident (msntp)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/msntp/msntp.log",
+ perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/msntp/msntp.patch
============================================================================
$ cvs diff -u -r0 -r1.1 msntp.patch
--- /dev/null 2003-08-28 18:13:24.000000000 +0200
+++ msntp.patch 2003-08-28 18:13:25.000000000 +0200
@@ -0,0 +1,12 @@
+diff -Naur msntp-1.6.orig/unix.c msntp-1.6/unix.c
+--- msntp-1.6.orig/unix.c 2003-08-28 17:48:15.000000000 +0200
++++ msntp-1.6/unix.c 2003-08-28 17:49:46.000000000 +0200
+@@ -81,5 +81,7 @@
+ /* Log a message, crudely. This is used in only one place, but could
+ be used more widely. */
+
+- syslog(LOG_DAEMON|LOG_WARNING,"%s",message);
++ openlog("msntp", LOG_PID | LOG_NDELAY, LOG_DAEMON);
++ syslog(LOG_WARNING,"%s",message);
++ closelog();
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/msntp/msntp.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 msntp.spec
--- openpkg-src/msntp/msntp.spec 8 Jul 2003 14:41:02 -0000 1.9
+++ openpkg-src/msntp/msntp.spec 28 Aug 2003 16:13:24 -0000 1.10
@@ -33,16 +33,26 @@
Group: Network
License: OSS-style
Version: 1.6
-Release: 20030703
+Release: 20030828
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://www.hpcf.cam.ac.uk/export/msntp-%{version}.tar.gz
+Source1: rc.msntp
+Source2: fsl.msntp
+Patch0: msntp.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206
PreReq: OpenPKG, openpkg >= 20020206
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl >= 1.2.0
+PreReq: fsl >= 1.2.0
+%endif
AutoReq: no
AutoReqProv: no
@@ -52,13 +62,13 @@
%prep
%setup -q
- %{l_shtool} subst -e 's/syslog(LOG_.*;/return;/' unix.c
+ %patch -p1
%build
CC="%{l_cc}"
CFLAGS="%{l_cflags -O}"
- LDFLAGS=""
- LIBS="-lm"
+ LDFLAGS="%{l_fsl_ldflags}"
+ LIBS="%{l_fsl_libs} -lm"
case "%{l_target}" in
*-solaris* ) LIBS="$LIBS -lsocket -lnsl" ;;
esac
@@ -72,15 +82,56 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
+ $RPM_BUILD_ROOT%{l_prefix}/var/msntp \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+
+ # install program file and manpage
%{l_shtool} install -c -s -m 755 \
msntp $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
msntp.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+ # install run-command script
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE rc.msntp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # install OSSP fsl configuration
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE fsl.msntp} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.msntp'
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} msntp status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} msntp stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$msntp_active" = .yes ] && %{l_rc} msntp start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} msntp stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/msntp/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/msntp/rc.msntp
============================================================================
$ cvs diff -u -r0 -r1.1 rc.msntp
--- /dev/null 2003-08-28 18:13:24.000000000 +0200
+++ rc.msntp 2003-08-28 18:13:25.000000000 +0200
@@ -0,0 +1,58 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.msntp -- Run-Commands
+##
+
+%config
+ msntp_enable="$openpkg_rc_def"
+ msntp_log_prolog="true"
+ msntp_log_epilog="true"
+ msntp_log_numfiles="10"
+ msntp_log_minsize="1M"
+ msntp_log_complevel="9"
+
+%common
+ msntp_pidfile="@l_prefix@/var/msntp/msntp.pid"
+ msntp_signal () {
+ [ -f $msntp_pidfile ] && kill -$1 `cat $msntp_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ msntp_usable="no"
+ msntp_active="no"
+ rcService msntp enable yes && \
+ msntp_signal 0 && msntp_active="yes"
+ echo "msntp_enable=\"$msntp_enable\""
+ echo "msntp_usable=\"$msntp_usable\""
+ echo "msntp_active=\"$msntp_active\""
+
+%start -u @l_susr@
+ rcService msntp enable yes || exit 0
+ rcService msntp active yes && exit 0
+ @l_prefix@/bin/msntp -S &
+ echo $! >$msntp_pidfile
+
+%stop -u @l_susr@
+ rcService msntp enable yes || exit 0
+ rcService msntp active no && exit 0
+ msntp_signal TERM
+ rm -f $msntp_pidfile
+
+%restart -u @l_susr@
+ rcService msntp enable yes || exit 0
+ rcService msntp active no && exit 0
+ rc msntp stop
+ sleep 2
+ rc msntp start
+
+%daily -u @l_susr@
+ rcService msntp enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${msntp_log_numfiles} -s ${msntp_log_minsize} -d \
+ -z ${msntp_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${msntp_log_prolog}" \
+ -E "${msntp_log_epilog} && rc msntp restart" \
+ @l_prefix@/var/msntp/msntp.log
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6324 -r1.6325 news.txt
--- openpkg-web/news.txt 28 Aug 2003 16:03:12 -0000 1.6324
+++ openpkg-web/news.txt 28 Aug 2003 16:13:23 -0000 1.6325
@@ -1,3 +1,4 @@
+28-Aug-2003: Upgraded package: P<msntp-1.6-20030828>
28-Aug-2003: Upgraded package: P<cvsd-0.9.20-20030828>
28-Aug-2003: Upgraded package: P<uvscan-4.24+4290-20030828>
28-Aug-2003: Upgraded package: P<cvs-1.12.1-20030828>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
