Thomas Lotterer 22 anos atrás
pai
commit
0d2e737e40
4 arquivos alterados com 32 adições e 3 exclusões
  1. 1 1
      qpopper/fsl.qpopper
  2. 22 0
      qpopper/qpopper.patch
  3. 8 1
      qpopper/qpopper.spec
  4. 1 1
      qpopper/rc.qpopper

+ 1 - 1
qpopper/fsl.qpopper

@@ -9,7 +9,7 @@ ident .*(qpopper)/.+ q{
     -> {
         debug: file(
             path="@l_prefix@/var/qpopper/qpopper.log",
-            perm=0644
+            perm=0664
         )
     }
 };

+ 22 - 0
qpopper/qpopper.patch

@@ -135,3 +135,25 @@ Index: popper/main.c
      }
  
      TRACE ( trace_file, POP_DEBUG, HERE,
+Index: pop_dropcopy.c
+--- popper/pop_dropcopy.c.orig	2003-01-02 03:39:02.000000000 +0100
++++ popper/pop_dropcopy.c	2003-10-01 17:33:31.000000000 +0200
+@@ -1231,6 +1231,10 @@
+             return pop_msg ( p, POP_FAILURE, HERE,
+                              "[SYS/TEMP] Unable to get temp drop name" );
+         
++        /*
++         *  OpenPKG: enforce usage of "spool-dir" configuration option
++         */
++#if 0
+         if ( stat ( p->temp_drop, &mybuf ) == -1 || mybuf.st_size <= 0 ) {
+             if ( genpath ( p, 
+                            p->temp_drop, 
+@@ -1239,6 +1243,7 @@
+                 return pop_msg ( p, POP_FAILURE, HERE,
+                                  "[SYS/TEMP] Unable to get temp drop name" );
+         }
++#endif
+     }
+     else {
+         /*

+ 8 - 1
qpopper/qpopper.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      GPL
 Version:      4.0.5
-Release:      20030918
+Release:      20031001
 
 #   package options
 %option       with_fsl  yes
@@ -86,6 +86,8 @@ Conflicts:    teapop
     ./configure \
         --prefix=%{l_prefix} \
         --sbindir=%{l_prefix}/sbin \
+        --enable-cache-dir=%{l_prefix}/var/qpopper/cache \
+        --enable-spool-dir=%{l_prefix}/var/qpopper/spool \
         --disable-bulldb \
         --enable-servermode \
         --enable-standalone \
@@ -115,10 +117,15 @@ Conflicts:    teapop
         $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
         $RPM_BUILD_ROOT%{l_prefix}/var/qpopper \
         $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper
+    %{l_shtool} mkdir -f -p -m 775 \
+        $RPM_BUILD_ROOT%{l_prefix}/var/qpopper/cache \
+        $RPM_BUILD_ROOT%{l_prefix}/var/qpopper/spool
 
     #   install qpopper
     %{l_shtool} install -c -m 644 \
         -e 's;^# \(set home-dir-mail[^=]*=\).*;\1 ".mail/inbox";' \
+        -e 's;^# \(set cache-dir[^=]*=\).*;\1 "%{l_prefix}/var/qpopper/cache";' \
+        -e 's;^# \(set spool-dir[^=]*=\).*;\1 "%{l_prefix}/var/qpopper/spool";' \
         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

+ 1 - 1
qpopper/rc.qpopper

@@ -52,7 +52,7 @@
     #   rotate logfile
     shtool rotate -f \
         -n ${qpopper_log_numfiles} -s ${qpopper_log_minsize} -d \
-        -z ${qpopper_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+        -z ${qpopper_log_complevel} -m 664 -o @l_susr@ -g @l_mgrp@ \
         -P "${qpopper_log_prolog}" \
         -E "${qpopper_log_epilog} && rc qpopper restart" \
         $POP_logfile