add fsl support

ntp/fsl.ntp

@@ -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]: "
     ) 

ntp/ntp.spec

@@ -33,20 +33,28 @@ Distribution: OpenPKG [CORE]
 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 @@ AutoReqProv:  no
     ( 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 @@ AutoReqProv:  no
     %{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
 

ntp/rc.ntp

@@ -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 @@
         -o@l_musr@ -g@l_mgrp@ -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