OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jul-2003 15:07:41
Branch: HEAD Handle: 2003072314073902
Modified files:
openpkg-src/tftp rc.tftp tftp.patch tftp.spec
openpkg-web news.txt
Log:
%status and pidfile handling, fix configure for regex
Summary:
Revision Changes Path
1.12 +23 -4 openpkg-src/tftp/rc.tftp
1.2 +43 -0 openpkg-src/tftp/tftp.patch
1.27 +3 -1 openpkg-src/tftp/tftp.spec
1.5749 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/rc.tftp
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.tftp
--- openpkg-src/tftp/rc.tftp 22 Jul 2003 08:11:15 -0000 1.11
+++ openpkg-src/tftp/rc.tftp 23 Jul 2003 13:07:41 -0000 1.12
@@ -14,6 +14,21 @@
tftp_log_minsize="1M"
tftp_log_complevel="9"
+%common
+ tftp_pidfile="@l_prefix@/var/tftp/tftpd.pid"
+ tftp_signal () {
+ [ -f $tftp_pidfile ] && kill -$1 `cat $tftp_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ tftp_usable="unknown"
+ tftp_active="no"
+ rcService tftp enable yes && \
+ tftp_signal 0 && tftp_active="yes"
+ echo "tftp_enable=\"$tftp_enable\""
+ echo "tftp_usable=\"$tftp_usable\""
+ echo "tftp_active=\"$tftp_active\""
+
%start -u @l_susr@
rcService tftp enable yes || exit 0
opts="-l -u @l_nusr@ -m @l_prefix@/etc/tftp/tftpd.remap"
@@ -27,10 +42,14 @@
%stop -u @l_susr@
rcService tftp enable yes || exit 0
- if [ -f @l_prefix@/var/tftp/tftpd.pid ]; then
- kill -TERM `cat @l_prefix@/var/tftp/tftpd.pid`
- rm -f @l_prefix@/var/tftp/tftpd.pid >/dev/null 2>&1 || true
- fi
+ tftp_signal TERM
+ rm -f $tftp_pidfile 2>&1 || true
+
+%restart -u @l_susr@
+ rcService tftp enable yes || exit 0
+ rc tftp stop
+ sleep 2
+ rc tftp start
%daily -u @l_susr@
rcService tftp enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 tftp.patch
--- openpkg-src/tftp/tftp.patch 11 Apr 2003 07:27:25 -0000 1.1
+++ openpkg-src/tftp/tftp.patch 23 Jul 2003 13:07:41 -0000 1.2
@@ -23,3 +23,46 @@
}
} else {
/* 0 is our socket descriptor */
+--- configure.dist 2003-07-23 14:56:19.000000000 +0200
++++ configure 2003-07-23 14:58:11.000000000 +0200
+@@ -10629,12 +10629,6 @@
+ LIBXTRA=true LIBOBJS="$LIBOBJS bsdsignal.$ac_objext"
+ fi
+
+-if $LIBXTRA; then
+- LIBS="../lib/libxtra.a $LIBS"
+-fi
+-
+-
+-common_libs="$LIBS"
+
+ echo "$as_me:$LINENO: checking if netinet/in.h defines IPPORT_TFTP" >&5
+ echo $ECHO_N "checking if netinet/in.h defines IPPORT_TFTP... $ECHO_C" >&6
+@@ -11668,8 +11662,11 @@
+ fi
+ fi;
+
+-TFTPD_LIBS="$LIBS"
+-LIBS="$common_libs"
++if $LIBXTRA; then
++ TFTPD_LIBS="../lib/libxtra.a $LIBS"
++else
++ TFTPD_LIBS="$LIBS"
++fi
+
+
+
+@@ -12684,8 +12681,11 @@
+ fi
+ fi;
+
+-TFTP_LIBS="$LIBS"
+-LIBS="$common_libs"
++if $LIBXTRA; then
++ TFTP_LIBS="../lib/libxtra.a $LIBS"
++else
++ TFTP_LIBS="$LIBS"
++fi
+
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 tftp.spec
--- openpkg-src/tftp/tftp.spec 22 Jul 2003 08:11:15 -0000 1.26
+++ openpkg-src/tftp/tftp.spec 23 Jul 2003 13:07:41 -0000 1.27
@@ -33,7 +33,7 @@
Group: Networtk
License: GPL
Version: 0.34
-Release: 20030722
+Release: 20030723
# package options
%option with_fsl yes
@@ -64,6 +64,7 @@
%prep
%setup -q -n tftp-hpa-%{version}
%patch -p0
+ touch acconfig.h.in
%build
CC="%{l_cc}" \
@@ -73,6 +74,7 @@
LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
+ --with-remap \
--without-tcpwrappers \
--without-readline
%{l_make} %{l_mflags -O}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5748 -r1.5749 news.txt
--- openpkg-web/news.txt 23 Jul 2003 12:57:46 -0000 1.5748
+++ openpkg-web/news.txt 23 Jul 2003 13:07:39 -0000 1.5749
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: P<tftp-0.34-20030723>
23-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030723>
23-Jul-2003: Upgraded package: P<spamassassin-2.55-20030723>
23-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
