OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Jul-2003 10:55:30
Branch: HEAD Handle: 2003070109552901
Modified files:
openpkg-src/ntp fsl.ntp ntp.spec rc.ntp
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-src/ntp/fsl.ntp
1.35 +37 -10 openpkg-src/ntp/ntp.spec
1.9 +1 -4 openpkg-src/ntp/rc.ntp
1.5114 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/fsl.ntp
============================================================================
$ cvs diff -u -r1.1 -r1.2 fsl.ntp
--- openpkg-src/ntp/fsl.ntp 1 Jul 2003 06:53:29 -0000 1.1
+++ openpkg-src/ntp/fsl.ntp 1 Jul 2003 08:55:30 -0000 1.2
@@ -2,7 +2,7 @@
## fsl.ntp -- OSSP fsl configuration
##
-ident ((ntp.*|dcfd|adjtimed)/.+)/.+ q{
+ident (ntp.*|dcfd|adjtimed)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 ntp.spec
--- openpkg-src/ntp/ntp.spec 28 Mar 2003 12:06:20 -0000 1.34
+++ openpkg-src/ntp/ntp.spec 1 Jul 2003 08:55:30 -0000 1.35
@@ -33,20 +33,28 @@
Group: Network
License: BSD-style
Version: 4.1.1b
-Release: 20030328
+Release: 20030701
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-%{version}.tar.gz
Source1: ntp-doc.tar.gz
Source2: ntp.conf
Source3: rc.ntp
+Source4: fsl.ntp
Patch0: ntp.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -73,6 +81,8 @@
( cd ntp-%{version}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix}
%{l_shtool} subst \
@@ -95,15 +105,32 @@
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/ntp
%{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE ntp.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/ntp/
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
- %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_susr@;%{l_susr};g' \
- -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
- %{SOURCE rc.ntp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/ntp/ntpd.stat
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config %{l_prefix}/etc/ntp/ntp.conf'
+
+ # Creating run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_mgrp@;%{l_mgrp};g' \
+ -e 's;@l_musr@;%{l_musr};g' \
+ -e 's;@l_susr@;%{l_susr};g' \
+ %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # OSSP fake syslog library
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.%{name}} \
+ $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.%{name}' \
+ '%config %{l_prefix}/etc/ntp/ntp.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/rc.ntp
============================================================================
$ cvs diff -u -r1.8 -r1.9 rc.ntp
--- openpkg-src/ntp/rc.ntp 24 Jun 2003 12:07:55 -0000 1.8
+++ openpkg-src/ntp/rc.ntp 1 Jul 2003 08:55:30 -0000 1.9
@@ -31,7 +31,6 @@
@l_prefix@/bin/ntpd \
-p @l_prefix@/var/ntp/ntpd.pid \
-f @l_prefix@/var/ntp/ntpd.drift \
- -l @l_prefix@/var/ntp/ntpd.log \
-s @l_prefix@/var/ntp/ntpd.stat/
%stop -p 200 -u @l_susr@
@@ -46,7 +45,6 @@
@l_prefix@/bin/ntpd \
-p @l_prefix@/var/ntp/ntpd.pid \
-f @l_prefix@/var/ntp/ntpd.drift \
- -l @l_prefix@/var/ntp/ntpd.log \
-s @l_prefix@/var/ntp/ntpd.stat/
%hourly -u @l_susr@
@@ -78,7 +76,7 @@
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
-P "$prolog" \
-E "$epilog" \
- @l_prefix@/var/ntp/ntpd.log
+ @l_prefix@/var/ntp/ntp.log
if [ ".`cat $hintfile`" = ".epilog" ]; then
ntp_signal TERM
sleep 2
@@ -86,7 +84,6 @@
@l_prefix@/bin/ntpd \
-p @l_prefix@/var/ntp/ntpd.pid \
-f @l_prefix@/var/ntp/ntpd.drift \
- -l @l_prefix@/var/ntp/ntpd.log \
-s @l_prefix@/var/ntp/ntpd.stat/
fi
opTmpDirDel ntp
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5113 -r1.5114 news.txt
--- openpkg-web/news.txt 1 Jul 2003 06:46:45 -0000 1.5113
+++ openpkg-web/news.txt 1 Jul 2003 08:55:29 -0000 1.5114
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P<ntp-4.1.1b-20030701>
01-Jul-2003: Upgraded package: P<perl-dbi-20030701-20030701>
30-Jun-2003: Upgraded package: P<openpkg-tool-20030630-20030630>
30-Jun-2003: Upgraded package: P<gcc33-3.3.1s20030630-20030630>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
