OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   28-Jan-2005 11:25:02
  Branch: HEAD                             Handle: 2005012810250200

  Modified files:
    openpkg-src/qpopper     qpopper.spec

  Log:
    provide users.* files and set their path; fix sendmail path; enable
    APOP support and install popauth (popauth -init -safe still missing
    because of a strange run-time problem related to getpwnam under
    FreeBSD 5)

  Summary:
    Revision    Changes     Path
    1.72        +17 -3      openpkg-src/qpopper/qpopper.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/qpopper/qpopper.spec
  ============================================================================
  $ cvs diff -u -r1.71 -r1.72 qpopper.spec
  --- openpkg-src/qpopper/qpopper.spec  1 Jan 2005 10:54:11 -0000       1.71
  +++ openpkg-src/qpopper/qpopper.spec  28 Jan 2005 10:25:02 -0000      1.72
  @@ -34,7 +34,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0.5
  -Release:      20040920
  +Release:      20050128
   
   #   package options
   %option       with_fsl  yes
  @@ -96,6 +96,8 @@
           --sbindir=%{l_prefix}/sbin \
           --enable-cache-dir=%{l_prefix}/var/qpopper/cache \
           --enable-spool-dir=%{l_prefix}/var/qpopper/spool \
  +        --enable-apop=%{l_prefix}/etc/qpopper/qpopper.auth \
  +        --enable-popuid=%{l_rusr} \
           --disable-bulldb \
           --enable-servermode \
           --enable-standalone \
  @@ -108,13 +110,14 @@
   %else
           --with-log-facility=LOG_MAIL \
   %endif
  +        --enable-auth-file=%{l_prefix}/etc/qpopper/users.allow \
           --enable-nonauth-file=%{l_prefix}/etc/qpopper/users.deny \
           --with-openssl=%{l_prefix} \
           --disable-nls
       %{l_shtool} subst \
           -e 's;\(MAIL_COMMAND[^"]*"\)[^"]*;\1%{l_prefix}/sbin/sendmail;' \
           config.h
  -    %{l_make} %{l_mflags -O}
  +    %{l_make} %{l_mflags}
   
   %install
       rm -rf $RPM_BUILD_ROOT
  @@ -132,16 +135,26 @@
       #   install qpopper
       %{l_shtool} install -c -m 644 \
           -e 's;^# \(set home-dir-mail[^=]*=\).*;\1 ".mail/inbox";' \
  +        -e 's;^# \(set mail-command[^=]*=\).*;\1 
"%{l_prefix}/sbin/sendmail";' \
           -e 's;^# \(set cache-dir[^=]*=\).*;\1 
"%{l_prefix}/var/qpopper/cache";' \
           -e 's;^# \(set spool-dir[^=]*=\).*;\1 
"%{l_prefix}/var/qpopper/spool";' \
  +        -e 's;^# \(set auth-file[^=]*=\).*;\1 
"%{l_prefix}/etc/qpopper/users.allow";' \
  +        -e 's;^# \(set noauth-file[^=]*=\).*;\1 
"%{l_prefix}/etc/qpopper/users.deny";' \
  +        -e 's;^# \(set clear-text-password[^=]*=\).*;\1 local;' \
           samples/qpopper.config $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/
       %{l_shtool} install -c -s -m 755 \
           popper/popper $RPM_BUILD_ROOT%{l_prefix}/sbin/qpopper
       %{l_shtool} install -c -m 644 \
           man/popper.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/qpopper.8
  +    %{l_shtool} install -c -s -m 755 \
  +        popper/popauth $RPM_BUILD_ROOT%{l_prefix}/sbin/popauth
  +    %{l_shtool} install -c -m 644 \
  +        man/popauth.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/popauth.8
   
       #   add more stuff
       %{l_shtool} install -c -m 644 \
  +        /dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/users.allow
  +    %{l_shtool} install -c -m 644 \
           /dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/users.deny
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  @@ -158,8 +171,9 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  +        '%attr(4755,%{l_rusr},%{l_mgrp}) %{l_prefix}/sbin/popauth' \
           '%config %{l_prefix}/etc/fsl/fsl.qpopper' \
  -        '%config %{l_prefix}/etc/qpopper/qpopper.config'
  +        '%config %{l_prefix}/etc/qpopper/*'
   
   %files -f files
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to